Fixes

roblox-aurora · Oct 12, 2021 · 2f87117 · 2f87117
1 parent c146b80
commit 2f87117
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 29 deletions.
diff --git a/example/server/index.server.ts b/example/server/index.server.ts
@@ -31,7 +31,7 @@ const ExistingEnum = ZirconServer.Registry.RegisterEnum(new ZirconEnumBuilder("t
 
 ZirconServer.Registry.RegisterFunction(
 	new ZirconFunctionBuilder("kill")
-		.AddArguments("player?")
+		.AddArgument("player?")
 		.AddDescription("testing lol")
 		.Bind((context, player) => {
 			const target = player ?? context.GetExecutor();
@@ -42,7 +42,7 @@ ZirconServer.Registry.RegisterFunction(
 );
 
 ZirconServer.Registry.RegisterFunction(
-	new ZirconFunctionBuilder("test_enum").AddArguments(TestEnum).Bind((context, value) => {
+	new ZirconFunctionBuilder("test_enum").AddArgument(TestEnum).Bind((context, value) => {
 		value.Match({
 			Value2: () => {
 				Log.Info("Got given enum item 2 (member)");
@@ -64,15 +64,15 @@ ZirconServer.Registry.RegisterFunction(
 );
 
 ZirconServer.Registry.RegisterFunction(
-	new ZirconFunctionBuilder("test_enum2").AddArguments(ExistingEnum.GetMemberType()).Bind((context, value) => {
+	new ZirconFunctionBuilder("test_enum2").AddArgument(ExistingEnum.GetMemberType()).Bind((context, value) => {
 		Log.Info("Got {NumberValue} ({StringValue})", ExistingEnumType[value.GetName()], value.GetName());
 	}),
 	[ZirconServer.Registry.User],
 );
 
 ZirconServer.Registry.RegisterFunction(
 	new ZirconFunctionBuilder("print_message")
-		.AddArguments("string")
+		.AddArgument("string")
 		.Bind((context, message) => Log.Info("Zircon says {Message} from {Player}", message, context.GetExecutor())),
 	[ZirconServer.Registry.User],
 );

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rbxts/zircon",
-  "version": "0.20.0-beta.0",
+  "version": "0.12.0-beta.0",
   "description": "",
   "main": "out/init.lua",
   "scripts": {
@@ -34,7 +34,7 @@
     "rbxts-transform-debug": "1.0.0-rc.1",
     "rbxts-transform-env": "1.0.0-rc.0",
     "rbxts-transformer-services": "^1.0.0",
-    "roblox-ts": "^1.1.1",
+    "roblox-ts": "^1.2.3",
     "typescript": "=4.3.5"
   },
   "dependencies": {

diff --git a/src/Class/ZirconFunctionBuilder.ts b/src/Class/ZirconFunctionBuilder.ts
@@ -18,22 +18,6 @@ export class ZirconFunctionBuilder<V extends ZirconValidator<unknown, unknown>[]
 
 	public constructor(private name: string) {}
 
-	/**
-	 * Adds these arguments to this function
-	 * @param args The arguments
-	 * @returns
-	 */
-	public AddArguments<TValidation extends Validator[]>(...args: TValidation) {
-		if (this.hasVaradic) {
-			throw `Cannot add argument past varadic argument`;
-		}
-
-		for (const argValidator of args) {
-			this.AddArgument(argValidator);
-		}
-		return (this as unknown) as ZirconFunctionBuilder<[...V, ...InferValidators<TValidation>]>;
-	}
-
 	/**
 	 * Adds an argnument to this zircon function
 	 * @param argValidator The argument type/validator
@@ -60,7 +44,7 @@ export class ZirconFunctionBuilder<V extends ZirconValidator<unknown, unknown>[]
 
 		return (this as unknown) as Omit<
 			ZirconFunctionBuilder<[...V, ...InferValidator<TValidation>[]]>,
-			"AddArguments" | "AddVaradicArgument"
+			"AddVaradicArgument"
 		>;
 	}
 

diff --git a/src/Class/ZirconTypeValidator.ts b/src/Class/ZirconTypeValidator.ts
@@ -118,9 +118,7 @@ export type BuiltInValidators = typeof BuiltInValidators;
 export type Validator = keyof typeof BuiltInValidators | ZirconValidator<any, any> | ZirconEnum<any>;
 
 export type InferValidators<T extends ReadonlyArray<Validator>> = {
-	readonly // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-	/** @ts-ignore Because otherwise we can't get this working. */
-	[P in keyof T]: InferValidator<T[P]>;
+	readonly [P in keyof T]: T[P] extends Validator ? InferValidator<T[P]> : never;
 };
 
 // export type InferArguments<T extends ReadonlyArray<Validator>> = {
@@ -136,9 +134,7 @@ export type IWantToStabMyselfWithAFuckingFork<T> = T extends keyof BuiltInValida
 export type InferArguments<T extends readonly ZirconValidator<any, any>[]> = T extends []
 	? [...(readonly (ZrValue | ZrUndefined)[])]
 	: {
-			readonly // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-			/** @ts-ignore */
-			[P in keyof T]: InferTypeFromValidator2<T[P]>;
+			readonly [P in keyof T]: T[P] extends ZirconValidator<any, any> ? InferTypeFromValidator2<T[P]> : never;
 	  };
 
 export type InferValidator<T extends Validator> = T extends keyof BuiltInValidators