@atscript/typescript 0.1.16 → 0.1.18

package/dist/utils.cjs

@@ -140,7 +140,7 @@ var Validator = class {
 		}
 		let i = 0;
 		for (const item of def.type.items) {
-			this.push(`[${i}]`);
+			this.push(String(i));
 			if (!this.validateSafe(item, value[i])) {
 				this.pop(true);
 				return false;
@@ -176,7 +176,7 @@ var Validator = class {
 		let i = 0;
 		let passed = true;
 		for (const item of value) {
-			this.push(`[${i}]`);
+			this.push(String(i));
 			if (!this.validateSafe(def.type.of, item)) {
 				passed = false;
 				this.pop(true);
@@ -228,7 +228,7 @@ else {
 				pattern,
 				def: propDef
 			});
-			if (matched.length) {
+			if (matched.length > 0) {
 				let keyPassed = false;
 				for (const { def: def$1 } of matched) if (this.validateSafe(def$1, value[key])) {
 					this.pop(false);
@@ -255,7 +255,7 @@ else {
 		return passed;
 	}
 	validatePrimitive(def, value) {
-		if (typeof def.type.value !== "undefined") {
+		if (def.type.value !== undefined) {
 			if (value !== def.type.value) {
 				this.error(`Expected ${def.type.value}, got ${value}`);
 				return false;
@@ -264,40 +264,46 @@ else {
 		}
 		const typeOfValue = Array.isArray(value) ? "array" : typeof value;
 		switch (def.type.designType) {
-			case "never":
+			case "never": {
 				this.error(`This type is impossible, must be an internal problem`);
 				return false;
+			}
 			case "any": return true;
-			case "string":
+			case "string": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateString(def, value);
-			case "number":
+			}
+			case "number": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateNumber(def, value);
-			case "boolean":
+			}
+			case "boolean": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateBoolean(def, value);
-			case "undefined":
+			}
+			case "undefined": {
 				if (value !== undefined) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return true;
-			case "null":
+			}
+			case "null": {
 				if (value !== null) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return true;
+			}
 			default: throw new Error(`Unknown type "${def.type.designType}"`);
 		}
 	}
@@ -509,7 +515,6 @@ 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`);
-				for (const [k, v] of newBase.metadata.entries()) if (!metadata.has(k)) metadata.set(k, Array.isArray(v) ? [...v] : v);
 				this.$type = {
 					__is_atscript_annotated_type: true,
 					type: newBase.type,
@@ -566,7 +571,7 @@ function buildJsonSchema(type) {
 					type: "object",
 					properties
 				};
-				if (required.length) schema.required = required;
+				if (required.length > 0) schema.required = required;
 				return schema;
 			},
 			array(d) {
@@ -743,28 +748,32 @@ else flatUnion.item(existing);
 			}
 			case "union":
 			case "intersection":
-			case "tuple":
+			case "tuple": {
 				for (const item of def.type.items) flattenArray(item, name);
 				break;
-			case "array":
+			}
+			case "array": {
 				flattenArray(def.type.of, name);
 				break;
+			}
 			default:
 		}
 	}
 	function flattenType(def, prefix = "", inComplexTypeOrArray = false) {
 		switch (def.type.kind) {
-			case "object":
+			case "object": {
 				addFieldToFlatMap(prefix || "", def);
 				for (const [key, value] of def.type.props.entries()) {
 					if (skipPhantom && isPhantomType(value)) continue;
 					flattenType(value, prefix ? `${prefix}.${key}` : key, inComplexTypeOrArray);
 				}
 				break;
+			}
 			case "array": {
 				let typeArray = def;
 				if (!inComplexTypeOrArray) {
 					typeArray = defineAnnotatedType().refTo(def).copyMetadata(def.metadata).$type;
+					if (def.optional) typeArray.optional = def.optional;
 					if (options?.topLevelArrayTag) typeArray.metadata.set(options.topLevelArrayTag, true);
 				}
 				addFieldToFlatMap(prefix || "", typeArray);
@@ -773,10 +782,19 @@ else flatUnion.item(existing);
 			}
 			case "intersection":
 			case "tuple":
-			case "union": for (const item of def.type.items) flattenType(item, prefix, true);
-			default:
+			case "union": {
+				for (const item of def.type.items) flattenType(item, prefix, true);
 				addFieldToFlatMap(prefix || "", def);
+				if (def.optional) {
+					const entry = flatMap.get(prefix || "");
+					if (entry) entry.optional = def.optional;
+				}
 				break;
+			}
+			default: {
+				addFieldToFlatMap(prefix || "", def);
+				break;
+			}
 		}
 		if (prefix) options?.onField?.(prefix, def, def.metadata);
 	}

package/dist/utils.d.ts

@@ -119,10 +119,10 @@ interface TAtscriptTypeArray<DataType = unknown[]> {
 interface TAtscriptTypeObject<K extends string = string, DataType = Record<K, unknown>> {
     kind: 'object';
     props: Map<K, TAtscriptAnnotatedType>;
-    propsPatterns: {
+    propsPatterns: Array<{
         pattern: RegExp;
         def: TAtscriptAnnotatedType;
-    }[];
+    }>;
     tags: Set<AtscriptPrimitiveTags>;
     /** @internal phantom — carries the DataType at the type level, never set at runtime */
     __dataType?: DataType;
@@ -176,7 +176,7 @@ declare function isAnnotatedType(type: any): type is TAtscriptAnnotatedType;
  * Standalone annotate function that handles both replace and append (array) strategies.
  * Used by the handle's .annotate() method and by generated mutation statements.
  */
-declare function annotate<K extends keyof AtscriptMetadata>(metadata: TMetadataMap<AtscriptMetadata> | undefined, key: K, value: AtscriptMetadata[K] extends (infer E)[] ? E : AtscriptMetadata[K], asArray?: boolean): void;
+declare function annotate<K extends keyof AtscriptMetadata>(metadata: TMetadataMap<AtscriptMetadata> | undefined, key: K, value: AtscriptMetadata[K] extends Array<infer E> ? E : AtscriptMetadata[K], asArray?: boolean): void;
 type TKind = '' | 'array' | 'object' | 'union' | 'intersection' | 'tuple';
 /**
  * Creates a builder handle for constructing a {@link TAtscriptAnnotatedType} at runtime.
@@ -368,13 +368,13 @@ interface TSerializedTypeFinal {
 interface TSerializedTypeObject {
     kind: 'object';
     props: Record<string, TSerializedAnnotatedTypeInner>;
-    propsPatterns: {
+    propsPatterns: Array<{
         pattern: {
             source: string;
             flags: string;
         };
         def: TSerializedAnnotatedTypeInner;
-    }[];
+    }>;
     tags: string[];
 }
 interface TSerializedTypeArray {

package/dist/utils.mjs

@@ -139,7 +139,7 @@ var Validator = class {
 		}
 		let i = 0;
 		for (const item of def.type.items) {
-			this.push(`[${i}]`);
+			this.push(String(i));
 			if (!this.validateSafe(item, value[i])) {
 				this.pop(true);
 				return false;
@@ -175,7 +175,7 @@ var Validator = class {
 		let i = 0;
 		let passed = true;
 		for (const item of value) {
-			this.push(`[${i}]`);
+			this.push(String(i));
 			if (!this.validateSafe(def.type.of, item)) {
 				passed = false;
 				this.pop(true);
@@ -227,7 +227,7 @@ else {
 				pattern,
 				def: propDef
 			});
-			if (matched.length) {
+			if (matched.length > 0) {
 				let keyPassed = false;
 				for (const { def: def$1 } of matched) if (this.validateSafe(def$1, value[key])) {
 					this.pop(false);
@@ -254,7 +254,7 @@ else {
 		return passed;
 	}
 	validatePrimitive(def, value) {
-		if (typeof def.type.value !== "undefined") {
+		if (def.type.value !== undefined) {
 			if (value !== def.type.value) {
 				this.error(`Expected ${def.type.value}, got ${value}`);
 				return false;
@@ -263,40 +263,46 @@ else {
 		}
 		const typeOfValue = Array.isArray(value) ? "array" : typeof value;
 		switch (def.type.designType) {
-			case "never":
+			case "never": {
 				this.error(`This type is impossible, must be an internal problem`);
 				return false;
+			}
 			case "any": return true;
-			case "string":
+			case "string": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateString(def, value);
-			case "number":
+			}
+			case "number": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateNumber(def, value);
-			case "boolean":
+			}
+			case "boolean": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateBoolean(def, value);
-			case "undefined":
+			}
+			case "undefined": {
 				if (value !== undefined) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return true;
-			case "null":
+			}
+			case "null": {
 				if (value !== null) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return true;
+			}
 			default: throw new Error(`Unknown type "${def.type.designType}"`);
 		}
 	}
@@ -508,7 +514,6 @@ 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`);
-				for (const [k, v] of newBase.metadata.entries()) if (!metadata.has(k)) metadata.set(k, Array.isArray(v) ? [...v] : v);
 				this.$type = {
 					__is_atscript_annotated_type: true,
 					type: newBase.type,
@@ -565,7 +570,7 @@ function buildJsonSchema(type) {
 					type: "object",
 					properties
 				};
-				if (required.length) schema.required = required;
+				if (required.length > 0) schema.required = required;
 				return schema;
 			},
 			array(d) {
@@ -742,28 +747,32 @@ else flatUnion.item(existing);
 			}
 			case "union":
 			case "intersection":
-			case "tuple":
+			case "tuple": {
 				for (const item of def.type.items) flattenArray(item, name);
 				break;
-			case "array":
+			}
+			case "array": {
 				flattenArray(def.type.of, name);
 				break;
+			}
 			default:
 		}
 	}
 	function flattenType(def, prefix = "", inComplexTypeOrArray = false) {
 		switch (def.type.kind) {
-			case "object":
+			case "object": {
 				addFieldToFlatMap(prefix || "", def);
 				for (const [key, value] of def.type.props.entries()) {
 					if (skipPhantom && isPhantomType(value)) continue;
 					flattenType(value, prefix ? `${prefix}.${key}` : key, inComplexTypeOrArray);
 				}
 				break;
+			}
 			case "array": {
 				let typeArray = def;
 				if (!inComplexTypeOrArray) {
 					typeArray = defineAnnotatedType().refTo(def).copyMetadata(def.metadata).$type;
+					if (def.optional) typeArray.optional = def.optional;
 					if (options?.topLevelArrayTag) typeArray.metadata.set(options.topLevelArrayTag, true);
 				}
 				addFieldToFlatMap(prefix || "", typeArray);
@@ -772,10 +781,19 @@ else flatUnion.item(existing);
 			}
 			case "intersection":
 			case "tuple":
-			case "union": for (const item of def.type.items) flattenType(item, prefix, true);
-			default:
+			case "union": {
+				for (const item of def.type.items) flattenType(item, prefix, true);
 				addFieldToFlatMap(prefix || "", def);
+				if (def.optional) {
+					const entry = flatMap.get(prefix || "");
+					if (entry) entry.optional = def.optional;
+				}
 				break;
+			}
+			default: {
+				addFieldToFlatMap(prefix || "", def);
+				break;
+			}
 		}
 		if (prefix) options?.onField?.(prefix, def, def.metadata);
 	}

package/package.json

@@ -1,10 +1,43 @@
 {
   "name": "@atscript/typescript",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "Atscript: typescript-gen support.",
+  "keywords": [
+    "annotations",
+    "atscript",
+    "typescript"
+  ],
+  "homepage": "https://github.com/moostjs/atscript/tree/main/packages/typescript#readme",
+  "bugs": {
+    "url": "https://github.com/moostjs/atscript/issues"
+  },
+  "license": "ISC",
+  "author": "Artem Maltsev",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/moostjs/atscript.git",
+    "directory": "packages/typescript"
+  },
+  "bin": {
+    "asc": "./cli.cjs"
+  },
+  "files": [
+    "dist",
+    "cli.cjs"
+  ],
   "type": "module",
   "main": "dist/index.mjs",
   "types": "dist/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "utils": [
+        "dist/utils.d.ts"
+      ],
+      "": [
+        "dist/index.d.ts"
+      ]
+    }
+  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -20,22 +53,15 @@
     },
     "./package.json": "./package.json"
   },
-  "typesVersions": {
-    "*": {
-      "utils": [
-        "dist/utils.d.ts"
-      ],
-      "": [
-        "dist/index.d.ts"
-      ]
-    }
+  "dependencies": {
+    "@moostjs/event-cli": "^0.5.32",
+    "moost": "^0.5.32"
   },
-  "files": [
-    "dist",
-    "cli.cjs"
-  ],
-  "bin": {
-    "asc": "./cli.cjs"
+  "devDependencies": {
+    "vitest": "3.2.4"
+  },
+  "peerDependencies": {
+    "@atscript/core": "^0.1.18"
   },
   "build": [
     {},
@@ -53,32 +79,6 @@
       "dts": false
     }
   ],
-  "keywords": [
-    "atscript",
-    "annotations",
-    "typescript"
-  ],
-  "author": "Artem Maltsev",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/moostjs/atscript.git",
-    "directory": "packages/typescript"
-  },
-  "bugs": {
-    "url": "https://github.com/moostjs/atscript/issues"
-  },
-  "homepage": "https://github.com/moostjs/atscript/tree/main/packages/typescript#readme",
-  "license": "ISC",
-  "peerDependencies": {
-    "@atscript/core": "^0.1.16"
-  },
-  "dependencies": {
-    "@moostjs/event-cli": "^0.5.32",
-    "moost": "^0.5.32"
-  },
-  "devDependencies": {
-    "vitest": "3.2.4"
-  },
   "scripts": {
     "pub": "pnpm publish --access public",
     "test": "vitest"