@gi-tcg/gts-runtime 0.4.6 → 0.6.0

package/dist/index.d.ts

@@ -1,4 +1,10 @@
 //#region src/attribute_return.d.ts
+type Computed<T, Constraint = any> = T extends Constraint ? { [K in keyof T]: T[K] } : never;
+interface AttributePositionalReturnBase {
+  key?: string;
+  rewriteMeta?: any;
+  namedDefinition: AttributeBlockDefinition;
+}
 declare namespace AttributeReturn {
   type This<TMeta> = {
     "~meta": TMeta;
@@ -18,8 +24,8 @@ declare namespace AttributeReturn {
     };
     rewriteMeta: NewMeta;
   };
-  type WithRewriteMeta<VM extends IViewModel<any, any, any>, NewMeta> = {
-    namedDefinition: VM["~namedDefinition"];
+  type WithRewriteMeta<NewMeta, VM extends IViewModel<any, any, any>, TMeta = VM["~namedDefinition"]["~meta"]> = {
+    namedDefinition: BlockDefinitionRewriteMeta<VM["~namedDefinition"], TMeta>;
     rewriteMeta: NewMeta;
   };
 }
@@ -28,7 +34,6 @@ declare namespace AttributeReturn {
 type Meta = "~meta";
 type Action = "~action";
 type NamedDefinition = "~namedDefinition";
-type Prelude = "~prelude";
 //#endregion
 //#region src/view.d.ts
 type AttributeName = string | symbol;
@@ -59,13 +64,11 @@ declare function createBinding(rootVM: IViewModel<any, any, any>, node: SingleAt
 //#endregion
 //#region src/view_model.d.ts
 interface AttributeBlockDefinition {
-  "~action"?: AttributeDefinition | undefined;
   "~meta": any;
 }
-type Computed<T> = T extends infer U extends { [K in keyof T]: unknown } ? U : never;
 type BlockDefinitionRewriteMeta<BlockDef extends AttributeBlockDefinition, NewMeta> = Computed<Omit<BlockDef, Meta> & {
   "~meta": NewMeta;
-}> extends infer R extends AttributeBlockDefinition ? R : never;
+}, AttributeBlockDefinition>;
 interface IViewModel<ModelT, BlockDef extends AttributeBlockDefinition, CtorArgs extends any[]> {
   parse(view: View<BlockDefinitionRewriteMeta<BlockDef, unknown>>, ...args: CtorArgs): ModelT;
   /**
@@ -76,8 +79,11 @@ interface IViewModel<ModelT, BlockDef extends AttributeBlockDefinition, CtorArgs
   * This is useful for creating binding ViewModels directly that forwards
   * the binding logic to inner ViewModels.
   */
-  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]>(): IViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, CtorArgs>;
+  bind<NewMeta = BlockDef[Meta]>(...args: CtorArgs): IViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, []>;
+  extend<ChildT extends ModelT, const ChildBlockDef extends Partial<Record<string | Action, AttributeDefinition>>, ChildCtorArgs extends any[] = []>(Ctor: new (...args: ChildCtorArgs) => ChildT, modelDefFn: (helper: AttributeDefHelper<ChildT>) => ChildBlockDef): IViewModel<ChildT, Computed<Omit<BlockDef, keyof ChildBlockDef> & ChildBlockDef & {
+    "~meta": BlockDef[Meta];
+  }>, ChildCtorArgs>;
   "~namedDefinition": BlockDef;
 }
 type LazyAttributeActionOrBinder<ModelT> = (model: ModelT, positionals: () => unknown[], named: View<any>) => unknown;
@@ -87,8 +93,11 @@ 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<NewMeta = BlockDef[Meta]>(): ViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, CtorArgs>;
-  bind<NewMeta = BlockDef[Meta]>(...args: CtorArgs): ViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, []>;
+  bind<NewMeta = BlockDef[Meta]>(): IViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, CtorArgs>;
+  bind<NewMeta = BlockDef[Meta]>(...args: CtorArgs): IViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, []>;
+  extend<ChildT extends ModelT, const ChildBlockDef extends Partial<Record<string | Action, AttributeDefinition>>, ChildCtorArgs extends any[] = []>(Ctor: new (...args: ChildCtorArgs) => ChildT, modelDefFn: (helper: AttributeDefHelper<ChildT>) => ChildBlockDef): IViewModel<ChildT, Computed<Omit<BlockDef, keyof ChildBlockDef> & ChildBlockDef & {
+    "~meta": BlockDef[Meta];
+  }>, ChildCtorArgs>;
 }
 interface SimpleAttributeOptions {
   required?: true;
@@ -134,10 +143,7 @@ interface AttributeDefinition {
   as?(): any;
   required?(): boolean;
   uniqueKey?(): string;
-}
-interface AttributePositionalReturnBase {
-  rewriteMeta?: any;
-  namedDefinition: AttributeBlockDefinition;
+  mergeMeta?(meta: any, subMeta: any): any;
 }
 type OverloadedParameters<T extends (...args: any[]) => any> = T extends {
   (...args: infer A1): any;
@@ -256,12 +262,14 @@ type SimpleViewModelAttribute<ValueT, Options extends SimpleViewModelOptions> =
 } : Options["booleanSwitch"] extends true ? [true] extends [ValueT] ? {
   (): AttributeReturn.Done;
 } : {} : {} : {});
-type SimpleViewModel<T, Options extends SimpleViewModelOptions = {}> = IViewModel<T, { [K in keyof T]-?: SimpleViewModelAttribute<T[K], Options> & {
+interface SimpleViewModel<T, Options extends SimpleViewModelOptions = {}> extends IViewModel<T, { [K in keyof T]-?: SimpleViewModelAttribute<T[K], Options> & {
   uniqueKey(): K;
   required(): {} extends Pick<T, K> ? false : true;
 } } & {
   "~meta": undefined;
-}, []>;
+}, []> {
+  Model: new () => T;
+}
 declare function defineSimpleViewModel<const T extends StandardJSONSchemaV1, const Options extends SimpleViewModelOptions = {}>(schema: T, options?: Options): SimpleViewModel<StandardJSONSchemaV1.InferInput<T>, Options>;
 //#endregion
-export { type AttributeReturn as AR, type AttributeReturn, type Action, type AttributeDefinition, type IViewModel, type Meta, type NamedAttributesNode, type NamedDefinition, type Prelude, type SimpleViewModel, type SimpleViewModelOptions, type SingleAttributeNode, type View, createBinding, createDefine, defineSimpleViewModel, defineViewModel };
+export { type AttributeReturn as AR, type AttributeReturn, type Action, type AttributeBlockDefinition, type AttributeDefinition, type IViewModel, type Meta, type NamedAttributesNode, type NamedDefinition, type SimpleAttributeOptions, type SimpleViewModel, type SimpleViewModelOptions, type SingleAttributeNode, type View, createBinding, createDefine, defineSimpleViewModel, defineViewModel };

package/dist/index.js

@@ -74,6 +74,15 @@ var ViewModel = class ViewModel {
 		};
 		return newModel;
 	}
+	extend(Ctor, modelDefFn) {
+		const newVM = new ViewModel(Ctor);
+		for (const [name, action] of this.#registeredActions) newVM["~setActionOrBinder"]("action", name, action);
+		for (const [name, binder] of this.#registeredBinders) newVM["~setActionOrBinder"]("binder", name, binder);
+		const helper = new AttributeDefHelper(newVM);
+		const defResult = modelDefFn(helper);
+		helper["~assignActions"](defResult);
+		return newVM;
+	}
 };
 var AttributeDefHelper = class AttributeDefHelper {
 	#viewModel;
@@ -150,7 +159,8 @@ function extractObjectSchema(propSchema) {
 	return null;
 }
 function createSimpleViewModelFromJsonSchema(jsonSchema, options) {
-	const vm = new ViewModel(class SimpleViewModel {});
+	const Ctor = class SimpleViewModel {};
+	const vm = new ViewModel(Ctor);
 	const helper = new AttributeDefHelper(vm);
 	const defResult = {};
 	for (const key of Object.keys(jsonSchema.properties ?? {})) {
@@ -159,6 +169,12 @@ function createSimpleViewModelFromJsonSchema(jsonSchema, options) {
 		defResult[key] = registerAttribute(helper, key, propSchema, options);
 	}
 	helper["~assignActions"](defResult);
+	Object.defineProperty(vm, "Model", {
+		value: Ctor,
+		writable: false,
+		enumerable: true,
+		configurable: true
+	});
 	return vm;
 }
 function registerAttribute(helper, key, propSchema, options) {

package/package.json

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

package/src/attribute_return.ts

@@ -1,4 +1,18 @@
-import type { BlockDefinitionRewriteMeta, IViewModel } from "./view_model.ts";
+import type {
+  AttributeBlockDefinition,
+  BlockDefinitionRewriteMeta,
+  IViewModel,
+} from "./view_model.ts";
+
+export type Computed<T, Constraint = any> = T extends Constraint
+  ? { [K in keyof T]: T[K] }
+  : never;
+
+export interface AttributePositionalReturnBase {
+  key?: string;
+  rewriteMeta?: any;
+  namedDefinition: AttributeBlockDefinition;
+}
 
 export namespace AttributeReturn {
   export type This<TMeta> = {
@@ -25,8 +39,12 @@ export namespace AttributeReturn {
     rewriteMeta: NewMeta;
   };
 
-  export type WithRewriteMeta<VM extends IViewModel<any, any, any>, NewMeta> = {
-    namedDefinition: VM["~namedDefinition"];
+  export type WithRewriteMeta<
+    NewMeta,
+    VM extends IViewModel<any, any, any>,
+    TMeta = VM["~namedDefinition"]["~meta"],
+  > = {
+    namedDefinition: BlockDefinitionRewriteMeta<VM["~namedDefinition"], TMeta>;
     rewriteMeta: NewMeta;
   };
 }

package/src/index.ts

@@ -2,6 +2,8 @@ export {
   defineViewModel,
   type AttributeDefinition,
   type IViewModel,
+  type SimpleAttributeOptions,
+  type AttributeBlockDefinition,
 } from "./view_model.ts";
 export {
   defineSimpleViewModel,
@@ -9,7 +11,7 @@ export {
   type SimpleViewModelOptions,
 } from "./simple_view_model.ts";
 export type { AttributeReturn, AR } from "./attribute_return.ts";
-export type { Action, Prelude, Meta, NamedDefinition } from "./symbols.ts";
+export type { Action, Meta, NamedDefinition } from "./symbols.ts";
 
 export {
   createBinding,

package/src/simple_view_model.ts

@@ -44,10 +44,10 @@ type SimpleViewModelAttribute<
       : {}
   : {});
 
-export type SimpleViewModel<
+export interface SimpleViewModel<
   T,
   Options extends SimpleViewModelOptions = {},
-> = IViewModel<
+> extends IViewModel<
   T,
   {
     [K in keyof T]-?: SimpleViewModelAttribute<T[K], Options> & {
@@ -58,7 +58,9 @@ export type SimpleViewModel<
     "~meta": undefined;
   },
   []
->;
+> {
+  Model: new () => T;
+}
 
 const ajv = new Ajv2020({ strict: false });
 
@@ -91,7 +93,7 @@ function extractObjectSchema(
 function createSimpleViewModelFromJsonSchema(
   jsonSchema: Record<string, unknown>,
   options: SimpleViewModelOptions,
-): IViewModel<any, any, []> {
+): SimpleViewModel<any, any> {
   const Ctor = class SimpleViewModel {};
   const vm = new ViewModel<any, any, []>(Ctor);
   const helper = new AttributeDefHelper(vm);
@@ -109,6 +111,12 @@ function createSimpleViewModelFromJsonSchema(
     );
   }
   helper["~assignActions"](defResult);
+  Object.defineProperty(vm, "Model", {
+    value: Ctor,
+    writable: false,
+    enumerable: true,
+    configurable: true,
+  });
   return vm as any;
 }
 
@@ -120,7 +128,10 @@ function registerAttribute(
 ): unknown {
   let objectSchema: Record<string, unknown> | null = null;
   if (options.recursive && (objectSchema = extractObjectSchema(propSchema))) {
-    const subVM = createSimpleViewModelFromJsonSchema(objectSchema, options);
+    const subVM: IViewModel<any, any, []> = createSimpleViewModelFromJsonSchema(
+      objectSchema,
+      options,
+    );
     return helper.attribute((model, positionals, named) => {
       if (positionals.length > 0) {
         model[key] = positionals[0];
@@ -156,5 +167,8 @@ export function defineSimpleViewModel<
   const jsonSchema = schema["~standard"].jsonSchema.input({
     target: "draft-2020-12",
   });
-  return createSimpleViewModelFromJsonSchema(jsonSchema, resolvedOptions);
+  return createSimpleViewModelFromJsonSchema(
+    jsonSchema,
+    resolvedOptions,
+  ) as SimpleViewModel<StandardJSONSchemaV1.InferInput<T>, Options>;
 }

package/src/symbols.ts

@@ -1,6 +1,3 @@
 export type Meta = "~meta";
 export type Action = "~action";
 export type NamedDefinition = "~namedDefinition";
-export type Prelude = "~prelude";
-export type Query = "~query";
-export type QueryAll = "~queryAll";

package/src/view_model.ts

@@ -1,24 +1,22 @@
-import type { AttributeReturn } from "./attribute_return.ts";
-import type { Action, Meta, NamedDefinition } from "./symbols.ts";
+import type {
+  AttributePositionalReturnBase,
+  AttributeReturn,
+  Computed,
+} from "./attribute_return.ts";
+import type { Action, Meta } from "./symbols.ts";
 import { View } from "./view.ts";
 
 export interface AttributeBlockDefinition {
-  "~action"?: AttributeDefinition | undefined;
   "~meta": any;
 }
 
-type Computed<T> = T extends infer U extends { [K in keyof T]: unknown }
-  ? U
-  : never;
-
 export type BlockDefinitionRewriteMeta<
   BlockDef extends AttributeBlockDefinition,
   NewMeta,
-> =
-  Computed<Omit<BlockDef, Meta> & { "~meta": NewMeta }> extends infer R extends
-    AttributeBlockDefinition
-    ? R
-    : never;
+> = Computed<
+  Omit<BlockDef, Meta> & { "~meta": NewMeta },
+  AttributeBlockDefinition
+>;
 
 export interface IViewModel<
   ModelT,
@@ -37,14 +35,31 @@ export interface IViewModel<
    * This is useful for creating binding ViewModels directly that forwards
    * the binding logic to inner ViewModels.
    */
-  bind<NewMeta = BlockDef[Meta]>(): ViewModel<
+  bind<NewMeta = BlockDef[Meta]>(): IViewModel<
     ModelT,
     BlockDefinitionRewriteMeta<BlockDef, NewMeta>,
     CtorArgs
   >;
   bind<NewMeta = BlockDef[Meta]>(
     ...args: CtorArgs
-  ): ViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, []>;
+  ): IViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, []>;
+  extend<
+    ChildT extends ModelT,
+    const ChildBlockDef extends Partial<
+      Record<string | Action, AttributeDefinition>
+    >,
+    ChildCtorArgs extends any[] = [],
+  >(
+    Ctor: new (...args: ChildCtorArgs) => ChildT,
+    modelDefFn: (helper: AttributeDefHelper<ChildT>) => ChildBlockDef,
+  ): IViewModel<
+    ChildT,
+    Computed<
+      Omit<BlockDef, keyof ChildBlockDef> &
+        ChildBlockDef & { "~meta": BlockDef[Meta] }
+    >,
+    ChildCtorArgs
+  >;
   "~namedDefinition": BlockDef;
 }
 
@@ -118,17 +133,17 @@ export class ViewModel<
     return newVM;
   }
 
-  bind<NewMeta = BlockDef[Meta]>(): ViewModel<
+  bind<NewMeta = BlockDef[Meta]>(): IViewModel<
     ModelT,
     BlockDefinitionRewriteMeta<BlockDef, NewMeta>,
     CtorArgs
   >;
   bind<NewMeta = BlockDef[Meta]>(
     ...args: CtorArgs
-  ): ViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, []>;
+  ): IViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, []>;
   bind<NewMeta = BlockDef[Meta]>(
     ...args: any[]
-  ): ViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, any> {
+  ): IViewModel<ModelT, BlockDefinitionRewriteMeta<BlockDef, NewMeta>, any> {
     if (args.length === 0) {
       return this as any;
     }
@@ -138,11 +153,41 @@ export class ViewModel<
         super(...args);
       }
     };
-    return newModel;
+    return newModel as IViewModel<any, any, any>;
+  }
+
+  extend<
+    ChildT extends ModelT,
+    const ChildBlockDef extends Partial<
+      Record<string | Action, AttributeDefinition>
+    >,
+    ChildCtorArgs extends any[] = [],
+  >(
+    Ctor: new (...args: ChildCtorArgs) => ChildT,
+    modelDefFn: (helper: AttributeDefHelper<ChildT>) => ChildBlockDef,
+  ): IViewModel<
+    ChildT,
+    Computed<
+      Omit<BlockDef, keyof ChildBlockDef> &
+        ChildBlockDef & { "~meta": BlockDef[Meta] }
+    >,
+    ChildCtorArgs
+  > {
+    const newVM = new ViewModel<ChildT, any, ChildCtorArgs>(Ctor);
+    for (const [name, action] of this.#registeredActions) {
+      newVM["~setActionOrBinder"]("action", name, action as any);
+    }
+    for (const [name, binder] of this.#registeredBinders) {
+      newVM["~setActionOrBinder"]("binder", name, binder as any);
+    }
+    const helper = new AttributeDefHelper(newVM);
+    const defResult = modelDefFn(helper);
+    helper["~assignActions"](defResult);
+    return newVM as any;
   }
 }
 
-interface SimpleAttributeOptions {
+export interface SimpleAttributeOptions {
   required?: true;
   uniqueKey?: string;
 }
@@ -300,11 +345,7 @@ export interface AttributeDefinition {
   as?(): any;
   required?(): boolean;
   uniqueKey?(): string;
-}
-
-interface AttributePositionalReturnBase {
-  rewriteMeta?: any;
-  namedDefinition: AttributeBlockDefinition;
+  mergeMeta?(meta: any, subMeta: any): any;
 }
 
 type OverloadedParameters<T extends (...args: any[]) => any> = T extends {