@gi-tcg/gts-runtime 0.4.0 → 0.4.2

package/dist/index.d.ts

@@ -139,11 +139,15 @@ type BlockDefinitionRewriteMeta<BlockDef extends AttributeBlockDefinition, NewMe
 interface IViewModel<ModelT, BlockDef extends AttributeBlockDefinition, CtorArgs extends any[]> {
   parse(view: View<BlockDefinitionRewriteMeta<BlockDef, unknown>>, ...args: CtorArgs): ModelT;
   /**
-  * Creates a new ViewModel with the same actions and binders, but with a different constructor 
-  * that accepts the specified arguments. This is useful for creating binding ViewModels directly
-  * that forwards the binding logic to inner ViewModels.
+  * Creates a new ViewModel with the same actions and binders, but with
+  * - a different constructor that accepts the specified arguments, and/or
+  * - a different initial Meta.
+  *
+  * This is useful for creating binding ViewModels directly that forwards
+  * the binding logic to inner ViewModels.
   */
-  bind(...args: CtorArgs): ViewModel<ModelT, BlockDef, []>;
+  bind<NewMeta = BlockDef[Meta]>(): ViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, CtorArgs>;
+  bind<NewMeta = BlockDef[Meta]>(...args: CtorArgs): ViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, []>;
   "~namedDefinition": BlockDef;
 }
 type LazyAttributeActionOrBinder<ModelT> = (model: ModelT, positionals: () => unknown[], named: View<any>) => unknown;
@@ -153,7 +157,8 @@ declare class ViewModel<ModelT, BlockDef extends AttributeBlockDefinition, CtorA
   constructor(Ctor: new (...args: CtorArgs) => ModelT);
   "~setActionOrBinder"(context: "action" | "binder", name: PropertyKey, action: LazyAttributeActionOrBinder<ModelT>): void;
   parse(view: View<BlockDefinitionRewriteMeta<BlockDef, unknown>>, ...args: CtorArgs): ModelT;
-  bind(...args: CtorArgs): ViewModel<ModelT, BlockDef, []>;
+  bind<NewMeta = BlockDef[Meta]>(): ViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, CtorArgs>;
+  bind<NewMeta = BlockDef[Meta]>(...args: CtorArgs): ViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, []>;
 }
 interface SimpleAttributeOptions {
   required?: true;
@@ -212,10 +217,23 @@ interface AttributePositionalReturnBase {
   rewriteMeta?: any;
   namedDefinition: AttributeBlockDefinition;
 }
-type AttributeAction<Model, T extends AttributeDefinition> = (model: Model, positional: Parameters<T>, named: View<ReturnType<T>["namedDefinition"] extends AttributeBlockDefinition ? ReturnType<T>["namedDefinition"] : {
+type OverloadedParameters<T extends (...args: any[]) => any> = T extends {
+  (...args: infer A1): any;
+  (...args: infer A2): any;
+  (...args: infer A3): any;
+  (...args: infer A4): any;
+} ? A1 | A2 | A3 | A4 : T extends {
+  (...args: infer A1): any;
+  (...args: infer A2): any;
+  (...args: infer A3): any;
+} ? A1 | A2 | A3 : T extends {
+  (...args: infer A1): any;
+  (...args: infer A2): any;
+} ? A1 | A2 : T extends ((...args: infer A) => any) ? A : never;
+type AttributeAction<Model, T extends AttributeDefinition> = (model: Model, positional: OverloadedParameters<T>, named: View<ReturnType<T>["namedDefinition"] extends AttributeBlockDefinition ? ReturnType<T>["namedDefinition"] : {
   "~meta": void;
 }>) => void;
-type AttributeBinder<Model, T extends AttributeDefinition> = (model: Model, positional: Parameters<T>, named: View<ReturnType<T>["namedDefinition"] extends AttributeBlockDefinition ? ReturnType<T>["namedDefinition"] : {
+type AttributeBinder<Model, T extends AttributeDefinition> = (model: Model, positional: OverloadedParameters<T>, named: View<ReturnType<T>["namedDefinition"] extends AttributeBlockDefinition ? ReturnType<T>["namedDefinition"] : {
   "~meta": void;
 }>) => T["as"] extends (() => infer U) ? U : void;
 //#endregion

package/dist/index.js

@@ -64,6 +64,7 @@ var ViewModel = class ViewModel {
 		return newVM;
 	}
 	bind(...args) {
+		if (args.length === 0) return this;
 		const newModel = this.#clone();
 		newModel.#Ctor = class extends this.#Ctor {
 			constructor() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gi-tcg/gts-runtime",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/piovium/gts.git"

package/src/view_model.ts

@@ -31,11 +31,21 @@ export interface IViewModel<
     ...args: CtorArgs
   ): ModelT;
   /**
-   * Creates a new ViewModel with the same actions and binders, but with a different constructor 
-   * that accepts the specified arguments. This is useful for creating binding ViewModels directly
-   * that forwards the binding logic to inner ViewModels.
+   * Creates a new ViewModel with the same actions and binders, but with
+   * - a different constructor that accepts the specified arguments, and/or
+   * - a different initial Meta.
+   *
+   * This is useful for creating binding ViewModels directly that forwards
+   * the binding logic to inner ViewModels.
    */
-  bind(...args: CtorArgs): ViewModel<ModelT, BlockDef, []>;
+  bind<NewMeta = BlockDef[Meta]>(): ViewModel<
+    ModelT,
+    BlockDefinitionRewriteMeta<BlockDef, NewMeta>,
+    CtorArgs
+  >;
+  bind<NewMeta = BlockDef[Meta]>(
+    ...args: CtorArgs
+  ): ViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, []>;
   "~namedDefinition": BlockDef;
 }
 
@@ -109,11 +119,22 @@ class ViewModel<
     return newVM;
   }
 
-  bind(...args: CtorArgs): ViewModel<ModelT, BlockDef, []> {
-    const newModel = this.#clone() as ViewModel<any, BlockDef, any>;
-    newModel.#Ctor = class extends (
-      (this.#Ctor as new (...args: CtorArgs) => any)
-    ) {
+  bind<NewMeta = BlockDef[Meta]>(): ViewModel<
+    ModelT,
+    BlockDefinitionRewriteMeta<BlockDef, NewMeta>,
+    CtorArgs
+  >;
+  bind<NewMeta = BlockDef[Meta]>(
+    ...args: CtorArgs
+  ): ViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, []>;
+  bind<NewMeta = BlockDef[Meta]>(
+    ...args: any[]
+  ): ViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, any> {
+    if (args.length === 0) {
+      return this as any;
+    }
+    const newModel = this.#clone() as ViewModel<any, any, any>;
+    newModel.#Ctor = class extends (this.#Ctor as new (...args: any[]) => any) {
       constructor() {
         super(...args);
       }
@@ -303,7 +324,7 @@ export function defineSimpleViewModel<const T extends StandardJSONSchemaV1>(
     });
   }
   helper["~assignActions"](defResult);
-  return vm;
+  return vm as any;
 }
 
 export interface AttributeDefinition {
@@ -318,9 +339,28 @@ interface AttributePositionalReturnBase {
   namedDefinition: AttributeBlockDefinition;
 }
 
+type OverloadedParameters<T extends (...args: any[]) => any> = T extends {
+  (...args: infer A1): any;
+  (...args: infer A2): any;
+  (...args: infer A3): any;
+  (...args: infer A4): any;
+}
+  ? A1 | A2 | A3 | A4
+  : T extends {
+        (...args: infer A1): any;
+        (...args: infer A2): any;
+        (...args: infer A3): any;
+      }
+    ? A1 | A2 | A3
+    : T extends { (...args: infer A1): any; (...args: infer A2): any }
+      ? A1 | A2
+      : T extends (...args: infer A) => any
+        ? A
+        : never;
+
 export type AttributeAction<Model, T extends AttributeDefinition> = (
   model: Model,
-  positional: Parameters<T>,
+  positional: OverloadedParameters<T>,
   named: View<
     ReturnType<T>["namedDefinition"] extends AttributeBlockDefinition
       ? ReturnType<T>["namedDefinition"]
@@ -330,7 +370,7 @@ export type AttributeAction<Model, T extends AttributeDefinition> = (
 
 export type AttributeBinder<Model, T extends AttributeDefinition> = (
   model: Model,
-  positional: Parameters<T>,
+  positional: OverloadedParameters<T>,
   named: View<
     ReturnType<T>["namedDefinition"] extends AttributeBlockDefinition
       ? ReturnType<T>["namedDefinition"]