@atscript/typescript 0.0.15 → 0.0.16

package/dist/cli.cjs

@@ -22,8 +22,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-const moost = __toESM(require("moost"));
 const __moostjs_event_cli = __toESM(require("@moostjs/event-cli"));
+const moost = __toESM(require("moost"));
 const path = __toESM(require("path"));
 const __atscript_core = __toESM(require("@atscript/core"));
 const fs = __toESM(require("fs"));
@@ -281,7 +281,7 @@ var TypeRenderer = class extends BaseRenderer {
 			this.writeln("static __is_anscript_annotated_type: true");
 			this.writeln(`static type: TAtscriptTypeObject<keyof ${asClass}>`);
 			this.writeln(`static metadata: TMetadataMap<AtscriptMetadata>`);
-			this.writeln(`static validator: () => Validator`);
+			this.writeln(`static validator: () => Validator<${asClass}>`);
 		}
 		this.pop();
 	}
@@ -315,7 +315,7 @@ else this.writeln("{}");
 			let realDef = def;
 			if ((0, __atscript_core.isRef)(def)) realDef = this.doc.unwindType(def.id, def.chain)?.def || realDef;
 			realDef = this.doc.mergeIntersection(realDef);
-			if ((0, __atscript_core.isStructure)(realDef) || (0, __atscript_core.isInterface)(realDef)) typeDef = `TAtscriptTypeObject<keyof ${node.id}}>`;
+			if ((0, __atscript_core.isStructure)(realDef) || (0, __atscript_core.isInterface)(realDef)) typeDef = `TAtscriptTypeObject<keyof ${node.id}>`;
 else if ((0, __atscript_core.isGroup)(realDef)) typeDef = "TAtscriptTypeComplex";
 else if ((0, __atscript_core.isArray)(realDef)) typeDef = "TAtscriptTypeArray";
 else if ((0, __atscript_core.isPrimitive)(realDef)) typeDef = "TAtscriptTypeFinal";
@@ -323,7 +323,7 @@ else if ((0, __atscript_core.isPrimitive)(realDef)) typeDef = "TAtscriptTypeFina
 		this.writeln(`const __is_anscript_annotated_type: true`);
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
-		this.writeln(`const validator: () => Validator`);
+		this.writeln(`const validator: () => Validator<${node.id}>`);
 		this.popln();
 	}
 	renderJsDoc(node) {
@@ -706,21 +706,9 @@ Commands = _ts_decorate([
 
 //#endregion
 //#region packages/typescript/src/cli/cli.ts
-const app = new moost.Moost();
-const cli = new __moostjs_event_cli.MoostCli({
-	debug: false,
-	wooksCli: { cliHelp: { name: "asc" } },
-	globalCliOptions: [{
-		keys: ["help"],
-		description: "Display instructions for the command."
-	}]
-});
-app.adapter(cli);
-app.registerControllers(Commands);
-app.applyGlobalInterceptors((0, __moostjs_event_cli.cliHelpInterceptor)({
-	colors: true,
-	lookupLevel: 3
-}));
-app.init();
+new __moostjs_event_cli.CliApp().controllers(Commands).useHelp({ name: "asc" }).useOptions([{
+	keys: ["help"],
+	description: "Display instructions for the command."
+}]).start();
 
 //#endregion

package/dist/index.cjs

@@ -279,7 +279,7 @@ var TypeRenderer = class extends BaseRenderer {
 			this.writeln("static __is_anscript_annotated_type: true");
 			this.writeln(`static type: TAtscriptTypeObject<keyof ${asClass}>`);
 			this.writeln(`static metadata: TMetadataMap<AtscriptMetadata>`);
-			this.writeln(`static validator: () => Validator`);
+			this.writeln(`static validator: () => Validator<${asClass}>`);
 		}
 		this.pop();
 	}
@@ -313,7 +313,7 @@ else this.writeln("{}");
 			let realDef = def;
 			if ((0, __atscript_core.isRef)(def)) realDef = this.doc.unwindType(def.id, def.chain)?.def || realDef;
 			realDef = this.doc.mergeIntersection(realDef);
-			if ((0, __atscript_core.isStructure)(realDef) || (0, __atscript_core.isInterface)(realDef)) typeDef = `TAtscriptTypeObject<keyof ${node.id}}>`;
+			if ((0, __atscript_core.isStructure)(realDef) || (0, __atscript_core.isInterface)(realDef)) typeDef = `TAtscriptTypeObject<keyof ${node.id}>`;
 else if ((0, __atscript_core.isGroup)(realDef)) typeDef = "TAtscriptTypeComplex";
 else if ((0, __atscript_core.isArray)(realDef)) typeDef = "TAtscriptTypeArray";
 else if ((0, __atscript_core.isPrimitive)(realDef)) typeDef = "TAtscriptTypeFinal";
@@ -321,7 +321,7 @@ else if ((0, __atscript_core.isPrimitive)(realDef)) typeDef = "TAtscriptTypeFina
 		this.writeln(`const __is_anscript_annotated_type: true`);
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
-		this.writeln(`const validator: () => Validator`);
+		this.writeln(`const validator: () => Validator<${node.id}>`);
 		this.popln();
 	}
 	renderJsDoc(node) {

package/dist/index.d.ts

@@ -12,10 +12,10 @@ interface TValidatorOptions {
     unknwonProps: 'strip' | 'ignore' | 'error';
     errorLimit: number;
 }
-declare class Validator {
-    protected readonly def: TAtscriptAnnotatedType;
+declare class Validator<T extends TAtscriptAnnotatedTypeConstructor> {
+    protected readonly def: T;
     protected opts: TValidatorOptions;
-    constructor(def: TAtscriptAnnotatedType, opts?: Partial<TValidatorOptions>);
+    constructor(def: T, opts?: Partial<TValidatorOptions>);
     errors: TError[];
     protected stackErrors: TError[][];
     protected stackPath: string[];
@@ -25,7 +25,7 @@ declare class Validator {
     protected clear(): void;
     protected error(message: string, path?: string, details?: TError[]): void;
     protected throw(): void;
-    validate(value: any, safe?: boolean): boolean;
+    validate<TT = InstanceType<T>>(value: any, safe?: boolean): value is TT;
     protected _validate(def: TAtscriptAnnotatedType, value: any): boolean;
     protected validateUnion(def: TAtscriptAnnotatedType<TAtscriptTypeComplex>, value: any): boolean;
     protected validateIntersection(def: TAtscriptAnnotatedType<TAtscriptTypeComplex>, value: any): boolean;
@@ -67,10 +67,11 @@ type TAtscriptTypeDef = TAtscriptTypeComplex | TAtscriptTypeFinal | TAtscriptTyp
 interface TAtscriptAnnotatedType<T = TAtscriptTypeDef> {
     __is_anscript_annotated_type: true;
     type: T;
-    validator: (opts?: TValidatorOptions) => Validator;
+    validator: (opts?: TValidatorOptions) => Validator<any>;
     metadata: TMetadataMap<AtscriptMetadata>;
     optional?: boolean;
 }
+type TAtscriptAnnotatedTypeConstructor = TAtscriptAnnotatedType & (new (...args: any[]) => any);
 declare function isAnnotatedType(type: any): type is TAtscriptAnnotatedType;
 type TKind = '' | 'array' | 'object' | 'union' | 'intersection' | 'tuple';
 declare function defineAnnotatedType(_kind?: TKind, base?: any): {
@@ -95,4 +96,4 @@ interface TMetadataMap<O extends object> extends Map<keyof O, O[keyof O]> {
     set<K extends keyof O>(key: K, value: O[K]): this;
 }
 
-export { type TAtscriptAnnotatedType, type TAtscriptTypeArray, type TAtscriptTypeComplex, type TAtscriptTypeDef, type TAtscriptTypeFinal, type TAtscriptTypeObject, type TMetadataMap, type TValidatorOptions, Validator, ValidatorError, tsPlugin as default, defineAnnotatedType, isAnnotatedType };
+export { type TAtscriptAnnotatedType, type TAtscriptAnnotatedTypeConstructor, type TAtscriptTypeArray, type TAtscriptTypeComplex, type TAtscriptTypeDef, type TAtscriptTypeFinal, type TAtscriptTypeObject, type TMetadataMap, type TValidatorOptions, Validator, ValidatorError, tsPlugin as default, defineAnnotatedType, isAnnotatedType };

package/dist/index.mjs

@@ -254,7 +254,7 @@ var TypeRenderer = class extends BaseRenderer {
 			this.writeln("static __is_anscript_annotated_type: true");
 			this.writeln(`static type: TAtscriptTypeObject<keyof ${asClass}>`);
 			this.writeln(`static metadata: TMetadataMap<AtscriptMetadata>`);
-			this.writeln(`static validator: () => Validator`);
+			this.writeln(`static validator: () => Validator<${asClass}>`);
 		}
 		this.pop();
 	}
@@ -288,7 +288,7 @@ else this.writeln("{}");
 			let realDef = def;
 			if (isRef(def)) realDef = this.doc.unwindType(def.id, def.chain)?.def || realDef;
 			realDef = this.doc.mergeIntersection(realDef);
-			if (isStructure(realDef) || isInterface(realDef)) typeDef = `TAtscriptTypeObject<keyof ${node.id}}>`;
+			if (isStructure(realDef) || isInterface(realDef)) typeDef = `TAtscriptTypeObject<keyof ${node.id}>`;
 else if (isGroup(realDef)) typeDef = "TAtscriptTypeComplex";
 else if (isArray(realDef)) typeDef = "TAtscriptTypeArray";
 else if (isPrimitive(realDef)) typeDef = "TAtscriptTypeFinal";
@@ -296,7 +296,7 @@ else if (isPrimitive(realDef)) typeDef = "TAtscriptTypeFinal";
 		this.writeln(`const __is_anscript_annotated_type: true`);
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
-		this.writeln(`const validator: () => Validator`);
+		this.writeln(`const validator: () => Validator<${node.id}>`);
 		this.popln();
 	}
 	renderJsDoc(node) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/typescript",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "Atscript: typescript-gen support.",
   "type": "module",
   "main": "dist/index.mjs",
@@ -47,9 +47,9 @@
   "homepage": "https://github.com/moostjs/atscript/tree/main/packages/typescript#readme",
   "license": "ISC",
   "dependencies": {
-    "@moostjs/event-cli": "^0.5.21",
-    "moost": "^0.5.21",
-    "@atscript/core": "^0.0.15"
+    "@moostjs/event-cli": "^0.5.26",
+    "moost": "^0.5.26",
+    "@atscript/core": "^0.0.16"
   },
   "devDependencies": {
     "vitest": "^3.0.0"