@atscript/typescript 0.0.28 → 0.0.30

package/dist/cli.cjs

@@ -154,7 +154,7 @@ var BaseRenderer = class extends CodePrinter {
 	renderInterface(node) {}
 	renderType(node) {}
 	transformFromPath(path$3) {
-		return path$3 + ".as";
+		return `${path$3}.as`;
 	}
 	renderImport(node) {
 		const def = node.getDefinition();
@@ -204,7 +204,7 @@ function wrapProp(name) {
 	return name;
 }
 function escapeQuotes(str) {
-	return str.replace(/"/g, "\\\"").replace(/\\/g, "\\\\");
+	return str.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
 }
 
 //#endregion
@@ -219,7 +219,7 @@ function _define_property$3(obj, key, value) {
 else obj[key] = value;
 	return obj;
 }
-var TypeRenderer = class extends BaseRenderer {
+var TypeRenderer = class TypeRenderer extends BaseRenderer {
 	pre() {
 		this.writeln("// prettier-ignore-start");
 		this.writeln("/* eslint-disable */");
@@ -229,11 +229,16 @@ 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, TAtscriptAnnotatedTypeConstructor, TValidatorOptions } from \"@atscript/typescript\"");
+		this.writeln("import type { TAtscriptTypeObject, TAtscriptTypeComplex, TAtscriptTypeFinal, TAtscriptTypeArray, TMetadataMap, Validator, TAtscriptAnnotatedTypeConstructor, TValidatorOptions } from \"@atscript/typescript/utils\"");
 	}
 	post() {
 		this.writeln("// prettier-ignore-end");
 	}
+	renderTypeDefString(def) {
+		const newThis = new TypeRenderer(this.doc, this.opts);
+		newThis.renderTypeDef(def);
+		return newThis.toString();
+	}
 	renderTypeDef(def) {
 		if (!def) {
 			this.write("unknown");
@@ -282,33 +287,33 @@ var TypeRenderer = class extends BaseRenderer {
 	renderStructure(struct, asClass) {
 		this.blockln("{}");
 		const patterns = [];
-		let hasProp = false;
+		const propsDefs = new Set();
 		for (const prop of Array.from(struct.props.values())) {
 			if (prop.token("identifier")?.pattern) {
 				patterns.push(prop);
 				continue;
 			}
-			hasProp = true;
 			const optional = !!prop.token("optional");
 			this.write(wrapProp(prop.id), optional ? "?" : "", ": ");
-			this.renderTypeDef(prop.getDefinition());
-			this.writeln();
+			const renderedDef = this.renderTypeDefString(prop.getDefinition());
+			propsDefs.add(renderedDef);
+			renderedDef.split("\n").forEach((l) => this.writeln(l));
 		}
 		if (patterns.length) {
 			this.write(`[key: string]: `);
-			if (hasProp) this.writeln("any");
-else if (patterns.length === 1) {
-				this.renderTypeDef(patterns[0].getDefinition());
-				this.writeln();
-			} else {
-				this.indent();
-				for (const prop of patterns) {
+			if (patterns.length > 0) {
+				for (const prop of patterns) propsDefs.add(this.renderTypeDefString(prop.getDefinition()));
+				const defs = Array.from(propsDefs);
+				if (defs.length > 1) {
+					this.indent();
+					for (const def of defs) {
+						this.writeln();
+						this.write("| ");
+						def.split("\n").forEach((l) => this.write(l.trim()));
+					}
+					this.unindent();
 					this.writeln();
-					this.write("| ");
-					this.renderTypeDef(prop.getDefinition());
-				}
-				this.unindent();
-				this.writeln();
+				} else defs[0].split("\n").forEach((l) => this.writeln(l));
 			}
 		}
 		if (asClass) {
@@ -359,7 +364,7 @@ else if ((0, __atscript_core.isPrimitive)(realDef)) typeDef = "TAtscriptTypeFina
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
 		this.writeln(`const validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${node.id}>(opts?: Partial<TValidatorOptions>) => Validator<TT>`);
-		if (this.opts?.jsonSchema) this.writeln("const toJsonSchema: () => any");
+		this.writeln("const toJsonSchema: () => any");
 		this.popln();
 	}
 	renderJsDoc(node) {
@@ -497,7 +502,7 @@ var Validator = class {
 	}
 	validateTuple(def, value) {
 		if (!Array.isArray(value) || value.length !== def.type.items.length) {
-			this.error("Expected array of length " + def.type.items.length);
+			this.error(`Expected array of length ${def.type.items.length}`);
 			return false;
 		}
 		let i = 0;
@@ -550,7 +555,7 @@ var Validator = class {
 		const typeKeys = new Set();
 		const skipList = new Set();
 		if (this.opts.skipList) {
-			const path$3 = this.stackPath.length > 1 ? this.path + "." : "";
+			const path$3 = this.stackPath.length > 1 ? `${this.path}.` : "";
 			this.opts.skipList.forEach((item) => {
 				if (item.startsWith(path$3)) {
 					const key = item.slice(path$3.length);
@@ -940,7 +945,7 @@ var JsRenderer = class extends BaseRenderer {
 		this.writeln("/* eslint-disable */");
 		const imports = ["defineAnnotatedType as $"];
 		if (!this.opts?.preRenderJsonSchema) imports.push("buildJsonSchema as $$");
-		this.writeln(`import { ${imports.join(", ")} } from "@atscript/typescript"`);
+		this.writeln(`import { ${imports.join(", ")} } from "@atscript/typescript/utils"`);
 	}
 	post() {
 		for (const node of this.postAnnotate) {
@@ -985,7 +990,7 @@ var JsRenderer = class extends BaseRenderer {
 		this.writeln("static __is_atscript_annotated_type = true");
 		this.writeln("static type = {}");
 		this.writeln("static metadata = new Map()");
-		if (this.opts?.jsonSchema) if (typeof this.opts.jsonSchema === "object" && this.opts.jsonSchema.preRender) {
+		if (this.opts?.preRenderJsonSchema) {
 			const schema = JSON.stringify(buildJsonSchema(this.toAnnotatedType(node)));
 			this.writeln(`static _jsonSchema = ${schema}`);
 			this.writeln("static toJsonSchema() {");

package/dist/index.cjs

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, '__esModule', { value: true });
 //#region rolldown:runtime
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -152,7 +151,7 @@ var BaseRenderer = class extends CodePrinter {
 	renderInterface(node) {}
 	renderType(node) {}
 	transformFromPath(path$2) {
-		return path$2 + ".as";
+		return `${path$2}.as`;
 	}
 	renderImport(node) {
 		const def = node.getDefinition();
@@ -202,7 +201,7 @@ function wrapProp(name) {
 	return name;
 }
 function escapeQuotes(str) {
-	return str.replace(/"/g, "\\\"").replace(/\\/g, "\\\\");
+	return str.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
 }
 
 //#endregion
@@ -217,7 +216,7 @@ function _define_property$2(obj, key, value) {
 else obj[key] = value;
 	return obj;
 }
-var TypeRenderer = class extends BaseRenderer {
+var TypeRenderer = class TypeRenderer extends BaseRenderer {
 	pre() {
 		this.writeln("// prettier-ignore-start");
 		this.writeln("/* eslint-disable */");
@@ -227,11 +226,16 @@ 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, TAtscriptAnnotatedTypeConstructor, TValidatorOptions } from \"@atscript/typescript\"");
+		this.writeln("import type { TAtscriptTypeObject, TAtscriptTypeComplex, TAtscriptTypeFinal, TAtscriptTypeArray, TMetadataMap, Validator, TAtscriptAnnotatedTypeConstructor, TValidatorOptions } from \"@atscript/typescript/utils\"");
 	}
 	post() {
 		this.writeln("// prettier-ignore-end");
 	}
+	renderTypeDefString(def) {
+		const newThis = new TypeRenderer(this.doc, this.opts);
+		newThis.renderTypeDef(def);
+		return newThis.toString();
+	}
 	renderTypeDef(def) {
 		if (!def) {
 			this.write("unknown");
@@ -280,33 +284,33 @@ var TypeRenderer = class extends BaseRenderer {
 	renderStructure(struct, asClass) {
 		this.blockln("{}");
 		const patterns = [];
-		let hasProp = false;
+		const propsDefs = new Set();
 		for (const prop of Array.from(struct.props.values())) {
 			if (prop.token("identifier")?.pattern) {
 				patterns.push(prop);
 				continue;
 			}
-			hasProp = true;
 			const optional = !!prop.token("optional");
 			this.write(wrapProp(prop.id), optional ? "?" : "", ": ");
-			this.renderTypeDef(prop.getDefinition());
-			this.writeln();
+			const renderedDef = this.renderTypeDefString(prop.getDefinition());
+			propsDefs.add(renderedDef);
+			renderedDef.split("\n").forEach((l) => this.writeln(l));
 		}
 		if (patterns.length) {
 			this.write(`[key: string]: `);
-			if (hasProp) this.writeln("any");
-else if (patterns.length === 1) {
-				this.renderTypeDef(patterns[0].getDefinition());
-				this.writeln();
-			} else {
-				this.indent();
-				for (const prop of patterns) {
+			if (patterns.length > 0) {
+				for (const prop of patterns) propsDefs.add(this.renderTypeDefString(prop.getDefinition()));
+				const defs = Array.from(propsDefs);
+				if (defs.length > 1) {
+					this.indent();
+					for (const def of defs) {
+						this.writeln();
+						this.write("| ");
+						def.split("\n").forEach((l) => this.write(l.trim()));
+					}
+					this.unindent();
 					this.writeln();
-					this.write("| ");
-					this.renderTypeDef(prop.getDefinition());
-				}
-				this.unindent();
-				this.writeln();
+				} else defs[0].split("\n").forEach((l) => this.writeln(l));
 			}
 		}
 		if (asClass) {
@@ -357,7 +361,7 @@ else if ((0, __atscript_core.isPrimitive)(realDef)) typeDef = "TAtscriptTypeFina
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
 		this.writeln(`const validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${node.id}>(opts?: Partial<TValidatorOptions>) => Validator<TT>`);
-		if (this.opts?.jsonSchema) this.writeln("const toJsonSchema: () => any");
+		this.writeln("const toJsonSchema: () => any");
 		this.popln();
 	}
 	renderJsDoc(node) {
@@ -495,7 +499,7 @@ var Validator = class {
 	}
 	validateTuple(def, value) {
 		if (!Array.isArray(value) || value.length !== def.type.items.length) {
-			this.error("Expected array of length " + def.type.items.length);
+			this.error(`Expected array of length ${def.type.items.length}`);
 			return false;
 		}
 		let i = 0;
@@ -548,7 +552,7 @@ var Validator = class {
 		const typeKeys = new Set();
 		const skipList = new Set();
 		if (this.opts.skipList) {
-			const path$2 = this.stackPath.length > 1 ? this.path + "." : "";
+			const path$2 = this.stackPath.length > 1 ? `${this.path}.` : "";
 			this.opts.skipList.forEach((item) => {
 				if (item.startsWith(path$2)) {
 					const key = item.slice(path$2.length);
@@ -838,19 +842,6 @@ else this.$metadata.set(key, value);
 	};
 	return handle;
 }
-function isAnnotatedTypeOfPrimitive(t) {
-	if (["array", "object"].includes(t.type.kind)) return false;
-	if (!t.type.kind) return true;
-	if ([
-		"union",
-		"tuple",
-		"intersection"
-	].includes(t.type.kind)) {
-		for (const item of t.type.items) if (!isAnnotatedTypeOfPrimitive(item)) return false;
-		return true;
-	}
-	return false;
-}
 
 //#endregion
 //#region packages/typescript/src/json-schema.ts
@@ -951,7 +942,7 @@ var JsRenderer = class extends BaseRenderer {
 		this.writeln("/* eslint-disable */");
 		const imports = ["defineAnnotatedType as $"];
 		if (!this.opts?.preRenderJsonSchema) imports.push("buildJsonSchema as $$");
-		this.writeln(`import { ${imports.join(", ")} } from "@atscript/typescript"`);
+		this.writeln(`import { ${imports.join(", ")} } from "@atscript/typescript/utils"`);
 	}
 	post() {
 		for (const node of this.postAnnotate) {
@@ -996,7 +987,7 @@ var JsRenderer = class extends BaseRenderer {
 		this.writeln("static __is_atscript_annotated_type = true");
 		this.writeln("static type = {}");
 		this.writeln("static metadata = new Map()");
-		if (this.opts?.jsonSchema) if (typeof this.opts.jsonSchema === "object" && this.opts.jsonSchema.preRender) {
+		if (this.opts?.preRenderJsonSchema) {
 			const schema = JSON.stringify(buildJsonSchema(this.toAnnotatedType(node)));
 			this.writeln(`static _jsonSchema = ${schema}`);
 			this.writeln("static toJsonSchema() {");
@@ -1354,10 +1345,4 @@ else return t.optional ? `${t.type} | true` : t.type;
 var src_default = tsPlugin;
 
 //#endregion
-exports.Validator = Validator
-exports.ValidatorError = ValidatorError
-exports.buildJsonSchema = buildJsonSchema
-exports.default = src_default
-exports.defineAnnotatedType = defineAnnotatedType
-exports.isAnnotatedType = isAnnotatedType
-exports.isAnnotatedTypeOfPrimitive = isAnnotatedTypeOfPrimitive
+module.exports = src_default;

package/dist/index.d.ts

@@ -8,135 +8,4 @@ interface TTsPluginOptions {
 }
 declare const tsPlugin: (opts?: TTsPluginOptions) => TAtscriptPlugin;
 
-interface TError {
-    path: string;
-    message: string;
-    details?: TError[];
-}
-type TValidatorPlugin = (ctx: TValidatorPluginContext, def: TAtscriptAnnotatedType, value: any) => boolean | undefined;
-interface TValidatorOptions {
-    partial: boolean | 'deep' | ((type: TAtscriptAnnotatedType<TAtscriptTypeObject>, path: string) => boolean);
-    replace?: (type: TAtscriptAnnotatedType, path: string) => TAtscriptAnnotatedType;
-    plugins: TValidatorPlugin[];
-    unknwonProps: 'strip' | 'ignore' | 'error';
-    errorLimit: number;
-    skipList?: Set<string>;
-}
-interface TValidatorPluginContext {
-    opts: Validator<any>['opts'];
-    validateAnnotatedType: Validator<any>['validateAnnotatedType'];
-    error: Validator<any>['error'];
-    path: Validator<any>['path'];
-}
-declare class Validator<T extends TAtscriptAnnotatedTypeConstructor> {
-    protected readonly def: T | TAtscriptAnnotatedType<any>;
-    protected opts: TValidatorOptions;
-    constructor(def: T | TAtscriptAnnotatedType<any>, opts?: Partial<TValidatorOptions>);
-    errors: TError[];
-    protected stackErrors: TError[][];
-    protected stackPath: string[];
-    protected isLimitExceeded(): boolean;
-    protected push(name: string): void;
-    protected pop(saveErrors: boolean): TError[] | undefined;
-    protected clear(): void;
-    protected error(message: string, path?: string, details?: TError[]): void;
-    protected throw(): void;
-    validate<TT = T>(value: any, safe?: boolean): value is TT;
-    protected validateSafe(def: TAtscriptAnnotatedType, value: any): boolean;
-    protected get path(): string;
-    protected validateAnnotatedType(def: TAtscriptAnnotatedType, value: any): boolean;
-    protected validateUnion(def: TAtscriptAnnotatedType<TAtscriptTypeComplex>, value: any): boolean;
-    protected validateIntersection(def: TAtscriptAnnotatedType<TAtscriptTypeComplex>, value: any): boolean;
-    protected validateTuple(def: TAtscriptAnnotatedType<TAtscriptTypeComplex>, value: any): boolean;
-    protected validateArray(def: TAtscriptAnnotatedType<TAtscriptTypeArray>, value: any): boolean;
-    protected validateObject(def: TAtscriptAnnotatedType<TAtscriptTypeObject>, value: any): boolean;
-    protected validatePrimitive(def: TAtscriptAnnotatedType<TAtscriptTypeFinal>, value: any): boolean;
-    protected validateString(def: TAtscriptAnnotatedType<TAtscriptTypeFinal>, value: string): boolean;
-    protected validateNumber(def: TAtscriptAnnotatedType<TAtscriptTypeFinal>, value: number): boolean;
-}
-declare class ValidatorError extends Error {
-    readonly errors: TError[];
-    name: string;
-    constructor(errors: TError[]);
-}
-
-interface TAtscriptTypeComplex {
-    kind: 'union' | 'intersection' | 'tuple';
-    items: TAtscriptAnnotatedType[];
-    tags: Set<AtscriptPrimitiveTags>;
-}
-interface TAtscriptTypeArray {
-    kind: 'array';
-    of: TAtscriptAnnotatedType;
-    tags: Set<AtscriptPrimitiveTags>;
-}
-interface TAtscriptTypeObject<K extends string = string> {
-    kind: 'object';
-    props: Map<K, TAtscriptAnnotatedType>;
-    propsPatterns: {
-        pattern: RegExp;
-        def: TAtscriptAnnotatedType;
-    }[];
-    tags: Set<AtscriptPrimitiveTags>;
-}
-interface TAtscriptTypeFinal {
-    kind: '';
-    /**
-     * design type
-     */
-    designType: 'string' | 'number' | 'boolean' | 'undefined' | 'null' | 'object' | 'any' | 'never';
-    /**
-     * value for literals
-     */
-    value?: string | number | boolean;
-    tags: Set<AtscriptPrimitiveTags>;
-}
-type TAtscriptTypeDef = TAtscriptTypeComplex | TAtscriptTypeFinal | TAtscriptTypeArray | TAtscriptTypeObject<string>;
-interface TAtscriptAnnotatedType<T = TAtscriptTypeDef> {
-    __is_atscript_annotated_type: true;
-    type: T;
-    validator: <TT extends TAtscriptAnnotatedTypeConstructor>(opts?: Partial<TValidatorOptions>) => Validator<TT>;
-    metadata: TMetadataMap<AtscriptMetadata>;
-    optional?: boolean;
-}
-type TAtscriptAnnotatedTypeConstructor = TAtscriptAnnotatedType & (new (...args: any[]) => any);
-/**
- * Type Guard to check if a type is atscript-annotated
- */
-declare function isAnnotatedType(type: any): type is TAtscriptAnnotatedType;
-type TKind = '' | 'array' | 'object' | 'union' | 'intersection' | 'tuple';
-declare function defineAnnotatedType(_kind?: TKind, base?: any): TAnnotatedTypeHandle;
-/**
- * Atscript Metadata Map with typed setters/getters
- */
-interface TMetadataMap<O extends object> extends Map<keyof O, O[keyof O]> {
-    get<K extends keyof O>(key: K): O[K] | undefined;
-    set<K extends keyof O>(key: K, value: O[K]): this;
-}
-interface TAnnotatedTypeHandle {
-    $type: TAtscriptAnnotatedType;
-    $def: {
-        kind: TKind;
-    } & Omit<TAtscriptTypeComplex, 'kind'> & Omit<TAtscriptTypeFinal, 'kind'> & Omit<TAtscriptTypeArray, 'kind'> & Omit<TAtscriptTypeObject<string>, 'kind'>;
-    $metadata: TMetadataMap<AtscriptMetadata>;
-    _existingObject: TAtscriptAnnotatedType | undefined;
-    tags(...tags: string[]): TAnnotatedTypeHandle;
-    designType(value: TAtscriptTypeFinal['designType']): TAnnotatedTypeHandle;
-    value(value: string | number | boolean): TAnnotatedTypeHandle;
-    of(value: TAtscriptAnnotatedType): TAnnotatedTypeHandle;
-    item(value: TAtscriptAnnotatedType): TAnnotatedTypeHandle;
-    prop(name: string, value: TAtscriptAnnotatedType): TAnnotatedTypeHandle;
-    propPattern(pattern: RegExp, value: TAtscriptAnnotatedType): TAnnotatedTypeHandle;
-    optional(value?: boolean): TAnnotatedTypeHandle;
-    copyMetadata(fromMetadata: TMetadataMap<AtscriptMetadata>): TAnnotatedTypeHandle;
-    refTo(type: TAtscriptAnnotatedType & {
-        name?: string;
-    }, chain?: string[]): TAnnotatedTypeHandle;
-    annotate(key: keyof AtscriptMetadata, value: any, asArray?: boolean): TAnnotatedTypeHandle;
-}
-declare function isAnnotatedTypeOfPrimitive(t: TAtscriptAnnotatedType): boolean;
-
-type TJsonSchema = Record<string, any>;
-declare function buildJsonSchema(type: TAtscriptAnnotatedType): TJsonSchema;
-
-export { type TAnnotatedTypeHandle, type TAtscriptAnnotatedType, type TAtscriptAnnotatedTypeConstructor, type TAtscriptTypeArray, type TAtscriptTypeComplex, type TAtscriptTypeDef, type TAtscriptTypeFinal, type TAtscriptTypeObject, type TJsonSchema, type TMetadataMap, type TValidatorOptions, type TValidatorPlugin, type TValidatorPluginContext, Validator, ValidatorError, buildJsonSchema, tsPlugin as default, defineAnnotatedType, isAnnotatedType, isAnnotatedTypeOfPrimitive };
+export { tsPlugin as default };

package/dist/index.mjs

@@ -127,7 +127,7 @@ var BaseRenderer = class extends CodePrinter {
 	renderInterface(node) {}
 	renderType(node) {}
 	transformFromPath(path$1) {
-		return path$1 + ".as";
+		return `${path$1}.as`;
 	}
 	renderImport(node) {
 		const def = node.getDefinition();
@@ -177,7 +177,7 @@ function wrapProp(name) {
 	return name;
 }
 function escapeQuotes(str) {
-	return str.replace(/"/g, "\\\"").replace(/\\/g, "\\\\");
+	return str.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
 }
 
 //#endregion
@@ -192,7 +192,7 @@ function _define_property$2(obj, key, value) {
 else obj[key] = value;
 	return obj;
 }
-var TypeRenderer = class extends BaseRenderer {
+var TypeRenderer = class TypeRenderer extends BaseRenderer {
 	pre() {
 		this.writeln("// prettier-ignore-start");
 		this.writeln("/* eslint-disable */");
@@ -202,11 +202,16 @@ 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, TAtscriptAnnotatedTypeConstructor, TValidatorOptions } from \"@atscript/typescript\"");
+		this.writeln("import type { TAtscriptTypeObject, TAtscriptTypeComplex, TAtscriptTypeFinal, TAtscriptTypeArray, TMetadataMap, Validator, TAtscriptAnnotatedTypeConstructor, TValidatorOptions } from \"@atscript/typescript/utils\"");
 	}
 	post() {
 		this.writeln("// prettier-ignore-end");
 	}
+	renderTypeDefString(def) {
+		const newThis = new TypeRenderer(this.doc, this.opts);
+		newThis.renderTypeDef(def);
+		return newThis.toString();
+	}
 	renderTypeDef(def) {
 		if (!def) {
 			this.write("unknown");
@@ -255,33 +260,33 @@ var TypeRenderer = class extends BaseRenderer {
 	renderStructure(struct, asClass) {
 		this.blockln("{}");
 		const patterns = [];
-		let hasProp = false;
+		const propsDefs = new Set();
 		for (const prop of Array.from(struct.props.values())) {
 			if (prop.token("identifier")?.pattern) {
 				patterns.push(prop);
 				continue;
 			}
-			hasProp = true;
 			const optional = !!prop.token("optional");
 			this.write(wrapProp(prop.id), optional ? "?" : "", ": ");
-			this.renderTypeDef(prop.getDefinition());
-			this.writeln();
+			const renderedDef = this.renderTypeDefString(prop.getDefinition());
+			propsDefs.add(renderedDef);
+			renderedDef.split("\n").forEach((l) => this.writeln(l));
 		}
 		if (patterns.length) {
 			this.write(`[key: string]: `);
-			if (hasProp) this.writeln("any");
-else if (patterns.length === 1) {
-				this.renderTypeDef(patterns[0].getDefinition());
-				this.writeln();
-			} else {
-				this.indent();
-				for (const prop of patterns) {
+			if (patterns.length > 0) {
+				for (const prop of patterns) propsDefs.add(this.renderTypeDefString(prop.getDefinition()));
+				const defs = Array.from(propsDefs);
+				if (defs.length > 1) {
+					this.indent();
+					for (const def of defs) {
+						this.writeln();
+						this.write("| ");
+						def.split("\n").forEach((l) => this.write(l.trim()));
+					}
+					this.unindent();
 					this.writeln();
-					this.write("| ");
-					this.renderTypeDef(prop.getDefinition());
-				}
-				this.unindent();
-				this.writeln();
+				} else defs[0].split("\n").forEach((l) => this.writeln(l));
 			}
 		}
 		if (asClass) {
@@ -332,7 +337,7 @@ else if (isPrimitive(realDef)) typeDef = "TAtscriptTypeFinal";
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
 		this.writeln(`const validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${node.id}>(opts?: Partial<TValidatorOptions>) => Validator<TT>`);
-		if (this.opts?.jsonSchema) this.writeln("const toJsonSchema: () => any");
+		this.writeln("const toJsonSchema: () => any");
 		this.popln();
 	}
 	renderJsDoc(node) {
@@ -470,7 +475,7 @@ var Validator = class {
 	}
 	validateTuple(def, value) {
 		if (!Array.isArray(value) || value.length !== def.type.items.length) {
-			this.error("Expected array of length " + def.type.items.length);
+			this.error(`Expected array of length ${def.type.items.length}`);
 			return false;
 		}
 		let i = 0;
@@ -523,7 +528,7 @@ var Validator = class {
 		const typeKeys = new Set();
 		const skipList = new Set();
 		if (this.opts.skipList) {
-			const path$1 = this.stackPath.length > 1 ? this.path + "." : "";
+			const path$1 = this.stackPath.length > 1 ? `${this.path}.` : "";
 			this.opts.skipList.forEach((item) => {
 				if (item.startsWith(path$1)) {
 					const key = item.slice(path$1.length);
@@ -813,19 +818,6 @@ else this.$metadata.set(key, value);
 	};
 	return handle;
 }
-function isAnnotatedTypeOfPrimitive(t) {
-	if (["array", "object"].includes(t.type.kind)) return false;
-	if (!t.type.kind) return true;
-	if ([
-		"union",
-		"tuple",
-		"intersection"
-	].includes(t.type.kind)) {
-		for (const item of t.type.items) if (!isAnnotatedTypeOfPrimitive(item)) return false;
-		return true;
-	}
-	return false;
-}
 
 //#endregion
 //#region packages/typescript/src/json-schema.ts
@@ -926,7 +918,7 @@ var JsRenderer = class extends BaseRenderer {
 		this.writeln("/* eslint-disable */");
 		const imports = ["defineAnnotatedType as $"];
 		if (!this.opts?.preRenderJsonSchema) imports.push("buildJsonSchema as $$");
-		this.writeln(`import { ${imports.join(", ")} } from "@atscript/typescript"`);
+		this.writeln(`import { ${imports.join(", ")} } from "@atscript/typescript/utils"`);
 	}
 	post() {
 		for (const node of this.postAnnotate) {
@@ -971,7 +963,7 @@ var JsRenderer = class extends BaseRenderer {
 		this.writeln("static __is_atscript_annotated_type = true");
 		this.writeln("static type = {}");
 		this.writeln("static metadata = new Map()");
-		if (this.opts?.jsonSchema) if (typeof this.opts.jsonSchema === "object" && this.opts.jsonSchema.preRender) {
+		if (this.opts?.preRenderJsonSchema) {
 			const schema = JSON.stringify(buildJsonSchema(this.toAnnotatedType(node)));
 			this.writeln(`static _jsonSchema = ${schema}`);
 			this.writeln("static toJsonSchema() {");
@@ -1329,4 +1321,4 @@ else return t.optional ? `${t.type} | true` : t.type;
 var src_default = tsPlugin;
 
 //#endregion
-export { Validator, ValidatorError, buildJsonSchema, src_default as default, defineAnnotatedType, isAnnotatedType, isAnnotatedTypeOfPrimitive };
+export { src_default as default };