@atscript/typescript 0.0.15 → 0.0.17

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"));
@@ -204,7 +204,7 @@ function wrapProp(name) {
 	return name;
 }
 function escapeQuotes(str) {
-	return str.replace(/"/g, "\\\"");
+	return str.replace(/"/g, "\\\"").replace(/\\/g, "\\\\");
 }
 
 //#endregion
@@ -219,7 +219,7 @@ var TypeRenderer = class extends BaseRenderer {
 		this.writeln(" * Do not edit this file!");
 		this.writeln(" */");
 		this.writeln();
-		this.writeln("import type { TAtscriptTypeObject, TAtscriptTypeComplex, TAtscriptTypeFinal, TAtscriptTypeArray, TMetadataMap, Validator } from \"@atscript/typescript\"");
+		this.writeln("import type { TAtscriptTypeObject, TAtscriptTypeComplex, TAtscriptTypeFinal, TAtscriptTypeArray, TMetadataMap, Validator, TAtscriptAnnotatedTypeConstructor, TValidatorOptions } from \"@atscript/typescript\"");
 	}
 	post() {
 		this.writeln("// prettier-ignore-end");
@@ -278,10 +278,10 @@ var TypeRenderer = class extends BaseRenderer {
 			this.writeln();
 		}
 		if (asClass) {
-			this.writeln("static __is_anscript_annotated_type: true");
+			this.writeln("static __is_atscript_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: <TT extends TAtscriptAnnotatedTypeConstructor = ${asClass}>(opts?: TValidatorOptions) => Validator<TT>`);
 		}
 		this.pop();
 	}
@@ -315,15 +315,15 @@ 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";
 		}
-		this.writeln(`const __is_anscript_annotated_type: true`);
+		this.writeln(`const __is_atscript_annotated_type: true`);
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
-		this.writeln(`const validator: () => Validator`);
+		this.writeln(`static validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${node.id}>(opts?: TValidatorOptions) => Validator<TT>`);
 		this.popln();
 	}
 	renderJsDoc(node) {
@@ -382,7 +382,7 @@ var JsRenderer = class extends BaseRenderer {
 		this.write(exported ? "export " : "");
 		this.write(`class ${node.id} `);
 		this.blockln("{}");
-		this.writeln("static __is_anscript_annotated_type = true");
+		this.writeln("static __is_atscript_annotated_type = true");
 		this.writeln("static type = {}");
 		this.writeln("static metadata = new Map()");
 		this.popln();
@@ -395,7 +395,7 @@ var JsRenderer = class extends BaseRenderer {
 		this.write(exported ? "export " : "");
 		this.write(`class ${node.id} `);
 		this.blockln("{}");
-		this.writeln("static __is_anscript_annotated_type = true");
+		this.writeln("static __is_atscript_annotated_type = true");
 		this.writeln("static type = {}");
 		this.writeln("static metadata = new Map()");
 		this.popln();
@@ -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

@@ -202,7 +202,7 @@ function wrapProp(name) {
 	return name;
 }
 function escapeQuotes(str) {
-	return str.replace(/"/g, "\\\"");
+	return str.replace(/"/g, "\\\"").replace(/\\/g, "\\\\");
 }
 
 //#endregion
@@ -217,7 +217,7 @@ var TypeRenderer = class extends BaseRenderer {
 		this.writeln(" * Do not edit this file!");
 		this.writeln(" */");
 		this.writeln();
-		this.writeln("import type { TAtscriptTypeObject, TAtscriptTypeComplex, TAtscriptTypeFinal, TAtscriptTypeArray, TMetadataMap, Validator } from \"@atscript/typescript\"");
+		this.writeln("import type { TAtscriptTypeObject, TAtscriptTypeComplex, TAtscriptTypeFinal, TAtscriptTypeArray, TMetadataMap, Validator, TAtscriptAnnotatedTypeConstructor, TValidatorOptions } from \"@atscript/typescript\"");
 	}
 	post() {
 		this.writeln("// prettier-ignore-end");
@@ -276,10 +276,10 @@ var TypeRenderer = class extends BaseRenderer {
 			this.writeln();
 		}
 		if (asClass) {
-			this.writeln("static __is_anscript_annotated_type: true");
+			this.writeln("static __is_atscript_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: <TT extends TAtscriptAnnotatedTypeConstructor = ${asClass}>(opts?: TValidatorOptions) => Validator<TT>`);
 		}
 		this.pop();
 	}
@@ -313,15 +313,15 @@ 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";
 		}
-		this.writeln(`const __is_anscript_annotated_type: true`);
+		this.writeln(`const __is_atscript_annotated_type: true`);
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
-		this.writeln(`const validator: () => Validator`);
+		this.writeln(`static validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${node.id}>(opts?: TValidatorOptions) => Validator<TT>`);
 		this.popln();
 	}
 	renderJsDoc(node) {
@@ -380,7 +380,7 @@ var JsRenderer = class extends BaseRenderer {
 		this.write(exported ? "export " : "");
 		this.write(`class ${node.id} `);
 		this.blockln("{}");
-		this.writeln("static __is_anscript_annotated_type = true");
+		this.writeln("static __is_atscript_annotated_type = true");
 		this.writeln("static type = {}");
 		this.writeln("static metadata = new Map()");
 		this.popln();
@@ -393,7 +393,7 @@ var JsRenderer = class extends BaseRenderer {
 		this.write(exported ? "export " : "");
 		this.write(`class ${node.id} `);
 		this.blockln("{}");
-		this.writeln("static __is_anscript_annotated_type = true");
+		this.writeln("static __is_atscript_annotated_type = true");
 		this.writeln("static type = {}");
 		this.writeln("static metadata = new Map()");
 		this.popln();
@@ -763,10 +763,24 @@ var Validator = class {
 		let passed = true;
 		const valueKeys = new Set(Object.keys(value));
 		const typeKeys = new Set();
+		const skipList = new Set();
+		if (this.opts.skipList) {
+			const path$2 = this.stackPath.length > 1 ? this.stackPath.slice(1).join(".") + "." : "";
+			this.opts.skipList.forEach((item) => {
+				if (item.startsWith(path$2)) {
+					const key = item.slice(path$2.length);
+					skipList.add(key);
+					valueKeys.delete(key);
+				}
+			});
+		}
+		let partialFunctionMatched = false;
+		if (typeof this.opts.partial === "function") partialFunctionMatched = this.opts.partial(def, this.stackPath.join(".").slice(1));
 		for (const [key, item] of def.type.props.entries()) {
+			if (skipList.has(key)) continue;
 			typeKeys.add(key);
 			if (value[key] === undefined) {
-				if (this.opts.partial === "deep" || this.opts.partial === true && this.stackPath.length <= 1) continue;
+				if (partialFunctionMatched || this.opts.partial === "deep" || this.opts.partial === true && this.stackPath.length <= 1) continue;
 			}
 			this.push(key);
 			if (this._validate(item, value[key])) this.pop(false);
@@ -908,7 +922,7 @@ var ValidatorError = class extends Error {
 //#endregion
 //#region packages/typescript/src/annotated-type.ts
 function isAnnotatedType(type) {
-	return type && type.__is_anscript_annotated_type;
+	return type && type.__is_atscript_annotated_type;
 }
 function defineAnnotatedType(_kind, base) {
 	const kind = _kind || "";
@@ -923,7 +937,7 @@ function defineAnnotatedType(_kind, base) {
 	type.tags = new Set();
 	const metadata = base?.metadata || new Map();
 	if (base) Object.assign(base, {
-		__is_anscript_annotated_type: true,
+		__is_atscript_annotated_type: true,
 		metadata,
 		type,
 		validator(opts) {
@@ -931,7 +945,7 @@ function defineAnnotatedType(_kind, base) {
 		}
 	});
 else base = {
-		__is_anscript_annotated_type: true,
+		__is_atscript_annotated_type: true,
 		metadata,
 		type,
 		validator(opts) {
@@ -984,7 +998,7 @@ else throw new Error(`Can't find prop ${typeName}${keys}`);
 				if (!newBase && keys) throw new Error(`Can't find prop ${typeName}${keys}`);
 else if (!newBase) throw new Error(`"${typeName}" is not annotated type`);
 				this.$type = {
-					__is_anscript_annotated_type: true,
+					__is_atscript_annotated_type: true,
 					type: newBase.type,
 					metadata,
 					validator(opts) {

package/dist/index.d.ts

@@ -8,14 +8,15 @@ interface TError {
     details?: TError[];
 }
 interface TValidatorOptions {
-    partial: boolean | 'deep';
+    partial: boolean | 'deep' | ((type: TAtscriptAnnotatedType<TAtscriptTypeObject>, path: string) => boolean);
     unknwonProps: 'strip' | 'ignore' | 'error';
     errorLimit: number;
+    skipList?: Set<string>;
 }
-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 +26,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 = 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;
@@ -65,12 +66,13 @@ interface TAtscriptTypeFinal {
 }
 type TAtscriptTypeDef = TAtscriptTypeComplex | TAtscriptTypeFinal | TAtscriptTypeArray | TAtscriptTypeObject<string>;
 interface TAtscriptAnnotatedType<T = TAtscriptTypeDef> {
-    __is_anscript_annotated_type: true;
+    __is_atscript_annotated_type: true;
     type: T;
-    validator: (opts?: TValidatorOptions) => Validator;
+    validator: <TT extends TAtscriptAnnotatedTypeConstructor>(opts?: Partial<TValidatorOptions>) => Validator<TT>;
     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 +97,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

@@ -177,7 +177,7 @@ function wrapProp(name) {
 	return name;
 }
 function escapeQuotes(str) {
-	return str.replace(/"/g, "\\\"");
+	return str.replace(/"/g, "\\\"").replace(/\\/g, "\\\\");
 }
 
 //#endregion
@@ -192,7 +192,7 @@ var TypeRenderer = class extends BaseRenderer {
 		this.writeln(" * Do not edit this file!");
 		this.writeln(" */");
 		this.writeln();
-		this.writeln("import type { TAtscriptTypeObject, TAtscriptTypeComplex, TAtscriptTypeFinal, TAtscriptTypeArray, TMetadataMap, Validator } from \"@atscript/typescript\"");
+		this.writeln("import type { TAtscriptTypeObject, TAtscriptTypeComplex, TAtscriptTypeFinal, TAtscriptTypeArray, TMetadataMap, Validator, TAtscriptAnnotatedTypeConstructor, TValidatorOptions } from \"@atscript/typescript\"");
 	}
 	post() {
 		this.writeln("// prettier-ignore-end");
@@ -251,10 +251,10 @@ var TypeRenderer = class extends BaseRenderer {
 			this.writeln();
 		}
 		if (asClass) {
-			this.writeln("static __is_anscript_annotated_type: true");
+			this.writeln("static __is_atscript_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: <TT extends TAtscriptAnnotatedTypeConstructor = ${asClass}>(opts?: TValidatorOptions) => Validator<TT>`);
 		}
 		this.pop();
 	}
@@ -288,15 +288,15 @@ 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";
 		}
-		this.writeln(`const __is_anscript_annotated_type: true`);
+		this.writeln(`const __is_atscript_annotated_type: true`);
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
-		this.writeln(`const validator: () => Validator`);
+		this.writeln(`static validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${node.id}>(opts?: TValidatorOptions) => Validator<TT>`);
 		this.popln();
 	}
 	renderJsDoc(node) {
@@ -355,7 +355,7 @@ var JsRenderer = class extends BaseRenderer {
 		this.write(exported ? "export " : "");
 		this.write(`class ${node.id} `);
 		this.blockln("{}");
-		this.writeln("static __is_anscript_annotated_type = true");
+		this.writeln("static __is_atscript_annotated_type = true");
 		this.writeln("static type = {}");
 		this.writeln("static metadata = new Map()");
 		this.popln();
@@ -368,7 +368,7 @@ var JsRenderer = class extends BaseRenderer {
 		this.write(exported ? "export " : "");
 		this.write(`class ${node.id} `);
 		this.blockln("{}");
-		this.writeln("static __is_anscript_annotated_type = true");
+		this.writeln("static __is_atscript_annotated_type = true");
 		this.writeln("static type = {}");
 		this.writeln("static metadata = new Map()");
 		this.popln();
@@ -738,10 +738,24 @@ var Validator = class {
 		let passed = true;
 		const valueKeys = new Set(Object.keys(value));
 		const typeKeys = new Set();
+		const skipList = new Set();
+		if (this.opts.skipList) {
+			const path$1 = this.stackPath.length > 1 ? this.stackPath.slice(1).join(".") + "." : "";
+			this.opts.skipList.forEach((item) => {
+				if (item.startsWith(path$1)) {
+					const key = item.slice(path$1.length);
+					skipList.add(key);
+					valueKeys.delete(key);
+				}
+			});
+		}
+		let partialFunctionMatched = false;
+		if (typeof this.opts.partial === "function") partialFunctionMatched = this.opts.partial(def, this.stackPath.join(".").slice(1));
 		for (const [key, item] of def.type.props.entries()) {
+			if (skipList.has(key)) continue;
 			typeKeys.add(key);
 			if (value[key] === undefined) {
-				if (this.opts.partial === "deep" || this.opts.partial === true && this.stackPath.length <= 1) continue;
+				if (partialFunctionMatched || this.opts.partial === "deep" || this.opts.partial === true && this.stackPath.length <= 1) continue;
 			}
 			this.push(key);
 			if (this._validate(item, value[key])) this.pop(false);
@@ -883,7 +897,7 @@ var ValidatorError = class extends Error {
 //#endregion
 //#region packages/typescript/src/annotated-type.ts
 function isAnnotatedType(type) {
-	return type && type.__is_anscript_annotated_type;
+	return type && type.__is_atscript_annotated_type;
 }
 function defineAnnotatedType(_kind, base) {
 	const kind = _kind || "";
@@ -898,7 +912,7 @@ function defineAnnotatedType(_kind, base) {
 	type.tags = new Set();
 	const metadata = base?.metadata || new Map();
 	if (base) Object.assign(base, {
-		__is_anscript_annotated_type: true,
+		__is_atscript_annotated_type: true,
 		metadata,
 		type,
 		validator(opts) {
@@ -906,7 +920,7 @@ function defineAnnotatedType(_kind, base) {
 		}
 	});
 else base = {
-		__is_anscript_annotated_type: true,
+		__is_atscript_annotated_type: true,
 		metadata,
 		type,
 		validator(opts) {
@@ -959,7 +973,7 @@ else throw new Error(`Can't find prop ${typeName}${keys}`);
 				if (!newBase && keys) throw new Error(`Can't find prop ${typeName}${keys}`);
 else if (!newBase) throw new Error(`"${typeName}" is not annotated type`);
 				this.$type = {
-					__is_anscript_annotated_type: true,
+					__is_atscript_annotated_type: true,
 					type: newBase.type,
 					metadata,
 					validator(opts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/typescript",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "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.17"
   },
   "devDependencies": {
     "vitest": "^3.0.0"