@atscript/core 0.1.17 → 0.1.18

package/dist/index.mjs

@@ -7,8 +7,8 @@ import { BasicNode } from "@prostojs/parser";
 import path$1 from "path";
 import { URL } from "url";
 import { defu } from "defu";
-import { glob } from "glob";
 import { mkdir, writeFile } from "fs/promises";
+import { glob } from "glob";
 
 //#region packages/core/src/parser/nodes/semantic-node.ts
 function _define_property$14(obj, key, value) {
@@ -346,7 +346,7 @@ var Token = class Token {
 		return this._data.children || [];
 	}
 	get hasChildren() {
-		return Boolean(this._data.children?.length);
+		return (this._data.children?.length ?? 0) > 0;
 	}
 	/**
 	* This is truth if the text token was ended with a newline character
@@ -424,7 +424,7 @@ var SemanticPrimitiveNode = class SemanticPrimitiveNode extends SemanticNode {
 				token: dummyToken,
 				args: []
 			});
-			if (typeof this.config.expect?.pattern !== "undefined") {
+			if (this.config.expect?.pattern !== undefined) {
 				const patterns = Array.isArray(this.config.expect.pattern) ? this.config.expect.pattern : [this.config.expect.pattern];
 				for (const p of patterns) {
 					const args = typeof p === "string" ? [text$1(p)] : [text$1(p.source), text$1(p.flags)];
@@ -1351,19 +1351,6 @@ const PunctuationToken = new BasicNode({
 	context.customData.type = "punctuation";
 });
 
-//#endregion
-//#region packages/core/src/tokenizer/tokens/text.node.ts
-const TextToken = new BasicNode({
-	icon: "T",
-	tokens: [RegExp("(?<quote>[\"'])", "u"), (context) => new RegExp(`(?<end>${context.getCustomData().quote || ""}|\\n)`)],
-	backSlash: "-ignore",
-	tokenOE: "omit-omit"
-}).mapContent("text", "join-clear").onMatch((context) => {
-	context.customData.type = "text";
-}).onPop((context) => {
-	context.customData.multiline = context.customData.end === "\n";
-});
-
 //#endregion
 //#region packages/core/src/tokenizer/tokens/regexp.token.ts
 const REGEXP_LITERAL_RE = /\/(?![/*])(?:\\.|\[.*?]|[^/\\\n\r[])*\/[dgimsuy]*/;
@@ -1377,6 +1364,19 @@ const RegExpToken = new BasicNode({
 	ctx.customData.text = ctx.matched[0];
 });
 
+//#endregion
+//#region packages/core/src/tokenizer/tokens/text.node.ts
+const TextToken = new BasicNode({
+	icon: "T",
+	tokens: [RegExp("(?<quote>[\"'])", "u"), (context) => new RegExp(`(?<end>${context.getCustomData().quote || ""}|\\n)`)],
+	backSlash: "-ignore",
+	tokenOE: "omit-omit"
+}).mapContent("text", "join-clear").onMatch((context) => {
+	context.customData.type = "text";
+}).onPop((context) => {
+	context.customData.multiline = context.customData.end === "\n";
+});
+
 //#endregion
 //#region packages/core/src/tokenizer/tokens/index.ts
 const tokens = {
@@ -1924,13 +1924,14 @@ function propName() {
 	return { handler(ni, target) {
 		switch (ni.$?.type) {
 			case "identifier":
-			case "text":
+			case "text": {
 				target.node.saveToken(new Token(ni.$), "identifier");
 				ni.accepted();
 				ni.move();
 				ni.skip(["\n"]);
 				return true;
-			case "block":
+			}
+			case "block": {
 				const childrenLength = ni.$.children?.length || 0;
 				const firstText = ni.$.children?.[0]?.text;
 				if (ni.$.text === "[" && ni.$.children?.[0]?.type === "unknown" && childrenLength === 1 && ni.$.children[0].text === "*" || ni.$.text === "[" && ni.$.children?.[0]?.type === "regexp" && childrenLength === 1) {
@@ -1940,8 +1941,8 @@ function propName() {
 					});
 					try {
 						t.pattern = firstText === "*" ? /./ : parseRegExpLiteral(firstText);
-					} catch (e) {
-						ni.unexpected(false, e.message);
+					} catch (error) {
+						ni.unexpected(false, error.message);
 						return false;
 					}
 					target.node.saveToken(t, "identifier");
@@ -1954,9 +1955,11 @@ function propName() {
 				if (ni.$.text === "[" && childrenLength > 1) ni.unexpected(false, firstText?.startsWith("/") ? "Invalid Regular Expression" : "To many arguments in prop pattern []");
 else ni.unexpected(false, "Unexpected identifier at property name");
 				return false;
-			default:
+			}
+			default: {
 				ni.unexpected(false, "Unexpected identifier at property name");
 				return false;
+			}
 		}
 	} };
 }
@@ -2329,12 +2332,14 @@ var AtscriptDoc = class {
 		} else {
 			let severity = 0;
 			switch (this.config.unknownAnnotation) {
-				case "warn":
+				case "warn": {
 					severity = 2;
 					break;
-				case "error":
+				}
+				case "error": {
 					severity = 1;
 					break;
+				}
 				default:
 			}
 			if (severity > 0) this.registerMessage(mainToken, `Unknown annotation "${mainToken.text}"`, severity, "dim");
@@ -2659,22 +2664,26 @@ else if (isStructure(def) || isInterface(def) || isPrimitive(def)) def = def.pro
 		let sc = "";
 		let banner = "[atscript]";
 		switch (m.severity) {
-			case TSeverity.Error:
+			case TSeverity.Error: {
 				sc = c.red;
 				banner += "[Error]";
 				break;
-			case TSeverity.Warning:
+			}
+			case TSeverity.Warning: {
 				sc = c.yellow;
 				banner += "[Warning]";
 				break;
-			case TSeverity.Info:
+			}
+			case TSeverity.Info: {
 				sc = "";
 				banner += "[Info]";
 				break;
-			case TSeverity.Hint:
+			}
+			case TSeverity.Hint: {
 				sc = c.dim;
 				banner += "[Hint]";
 				break;
+			}
 			default: sc = "";
 		}
 		const n = m.range.start.line + 1;
@@ -2697,12 +2706,12 @@ else if (isStructure(def) || isInterface(def) || isPrimitive(def)) def = def.pro
 			].filter(Boolean);
 			const nl = String(n).length + 1;
 			for (const { l, i } of renderLines) {
-				const prefix = `${c.dim + c.cyan}${("0" + i).slice(-nl)} | ${c.reset}`;
+				const prefix = `${c.dim + c.cyan}${`0${i}`.slice(-nl)} | ${c.reset}`;
 				out += `\n${prefix}${l}${c.reset}`;
 			}
 			out += `\n${" ".repeat(nl + 3 + m.range.start.character)}${c.red}${"^".repeat(m.range.end.character - m.range.start.character)}${c.reset}`;
 		}
-		return out + "\n";
+		return `${out}\n`;
 	}
 	getDiagMessages() {
 		if (!this._allMessages) {
@@ -2762,7 +2771,7 @@ else if (isStructure(def) || isInterface(def) || isPrimitive(def)) def = def.pro
 					}
 					if (isPrimitive(def) && def.config.isContainer) this._allMessages.push({
 						severity: 1,
-						message: `"${t.parentNode.id}${t.parentNode.hasChain ? "." + t.parentNode.chain.map((c) => c.text).join(".") : ""}" is a container type — use one of its extensions`,
+						message: `"${t.parentNode.id}${t.parentNode.hasChain ? `.${t.parentNode.chain.map((c) => c.text).join(".")}` : ""}" is a container type — use one of its extensions`,
 						range: t.range
 					});
 					if (t.parentNode.hasChain) {
@@ -2929,7 +2938,7 @@ else if (isStructure(def) || isInterface(def) || isPrimitive(def)) def = def.pro
 		}
 		for (const a of left || []) {
 			const spec = this.resolveAnnotation(a.name);
-			let append = spec && spec.config.multiple && spec.config.mergeStrategy === "append";
+			const append = spec && spec.config.multiple && spec.config.mergeStrategy === "append";
 			if (append || !savedAnnotations.has(a.name)) annotations$1.push(a);
 		}
 		return annotations$1;
@@ -3006,6 +3015,181 @@ const zeroRange = {
 	}
 };
 
+//#endregion
+//#region packages/core/src/defaults/emit-annotations.ts
+const emitAnnotations = { jsonSchema: new AnnotationSpec({
+	nodeType: ["interface"],
+	description: "Pre-compute and embed JSON Schema at build time for this interface, regardless of the global jsonSchema plugin option."
+}) };
+
+//#endregion
+//#region packages/core/src/defaults/expect-annotations.ts
+const expectAnnotations = {
+	minLength: new AnnotationSpec({
+		description: "Validates that a string or array has a minimum length.\n\n**Example:**```atscript@expect.minLength 5name: string```",
+		defType: ["array", "string"],
+		argument: [{
+			name: "length",
+			type: "number",
+			description: "The minimum length of the string or array."
+		}, {
+			name: "message",
+			optional: true,
+			type: "string",
+			description: "Optional error message to display if the validation fails."
+		}]
+	}),
+	maxLength: new AnnotationSpec({
+		description: "Validates that a string or array has a maximum length.\n\n**Example:**```atscript@expect.maxLength 5name: string```",
+		defType: ["array", "string"],
+		argument: [{
+			name: "length",
+			type: "number",
+			description: "The maximum length of the string or array."
+		}, {
+			name: "message",
+			optional: true,
+			type: "string",
+			description: "Optional error message to display if the validation fails."
+		}]
+	}),
+	min: new AnnotationSpec({
+		description: "Validates that a number is greater than or equal to a minimum value.\n\n**Example:**```atscript@expect.min 18age: number```",
+		defType: ["number"],
+		argument: [{
+			name: "minValue",
+			type: "number",
+			description: "The minimum value."
+		}, {
+			name: "message",
+			optional: true,
+			type: "string",
+			description: "Optional error message to display if the validation fails."
+		}]
+	}),
+	max: new AnnotationSpec({
+		description: "Validates that a number is less than or equal to a maximum value.\n\n**Example:**```atscript@expect.max 10count: number```",
+		defType: ["number"],
+		argument: [{
+			name: "maxValue",
+			type: "number",
+			description: "The maximum value."
+		}, {
+			name: "message",
+			optional: true,
+			type: "string",
+			description: "Optional error message to display if the validation fails."
+		}]
+	}),
+	int: new AnnotationSpec({
+		description: "Validates that a number is an integer (no decimal places).\n\n**Example:**```atscript@expect.intage: number```",
+		defType: ["number"]
+	}),
+	pattern: new AnnotationSpec({
+		description: "Validates that a string matches a specific pattern.\n\n**Example:**```atscript@expect.pattern \"[a-z]+\", \"u\"name: string```",
+		defType: ["string"],
+		multiple: true,
+		mergeStrategy: "append",
+		argument: [
+			{
+				name: "pattern",
+				type: "string",
+				description: "The regular expression pattern to match."
+			},
+			{
+				name: "flags",
+				optional: true,
+				type: "string",
+				values: [
+					"g",
+					"gi",
+					"gim",
+					"gims",
+					"gimsu",
+					"gimsuy",
+					"gimsy",
+					"gimu",
+					"gimuy",
+					"gimy",
+					"gis",
+					"gisu",
+					"gisuy",
+					"gisy",
+					"giu",
+					"giuy",
+					"giy",
+					"gm",
+					"gms",
+					"gmsu",
+					"gmsuy",
+					"gmsy",
+					"gmu",
+					"gmuy",
+					"gmy",
+					"gs",
+					"gsu",
+					"gsuy",
+					"gsy",
+					"gu",
+					"guy",
+					"gy",
+					"i",
+					"im",
+					"ims",
+					"imsu",
+					"imsuy",
+					"imsy",
+					"imu",
+					"imuy",
+					"imy",
+					"is",
+					"isu",
+					"isuy",
+					"isy",
+					"iu",
+					"iuy",
+					"iy",
+					"m",
+					"ms",
+					"msu",
+					"msuy",
+					"msy",
+					"mu",
+					"muy",
+					"my",
+					"s",
+					"su",
+					"suy",
+					"sy",
+					"u",
+					"uy",
+					"y"
+				],
+				description: "Optional flags for the regular expression."
+			},
+			{
+				name: "message",
+				optional: true,
+				type: "string",
+				description: "Optional error message to display if the validation fails."
+			}
+		],
+		validate(mainToken, args) {
+			if (args[0]) try {
+				new RegExp(args[0].text);
+				return [];
+			} catch (error) {
+				return [{
+					message: "Invalid regular expression",
+					range: args[0].range,
+					severity: 1
+				}];
+			}
+			return [];
+		}
+	})
+};
+
 //#endregion
 //#region packages/core/src/defaults/meta-annotations.ts
 const metaAnnotations = {
@@ -3045,7 +3229,7 @@ const metaAnnotations = {
 	}),
 	placeholder: new AnnotationSpec({
 		description: "Defines a **default placeholder value** for UI input fields.\n\n**Example:**```atscript@meta.placeholder \"Enter your name\"name: string```",
-		nodeType: ["prop"],
+		nodeType: ["prop", "type"],
 		argument: {
 			name: "text",
 			type: "string",
@@ -3054,12 +3238,12 @@ const metaAnnotations = {
 	}),
 	sensitive: new AnnotationSpec({
 		description: "Marks a field as **sensitive** (e.g., passwords, API keys), ensuring it is hidden in logs and UI.\n\n**Example:**```atscript@meta.sensitivepassword: string```",
-		nodeType: ["prop"],
+		nodeType: ["prop", "type"],
 		multiple: false
 	}),
 	readonly: new AnnotationSpec({
 		description: "Marks a field as **read-only**.\n\n**Example:**```atscript@meta.readonlycreatedAt: string.date```",
-		nodeType: ["prop"],
+		nodeType: ["prop", "type"],
 		multiple: false
 	}),
 	required: new AnnotationSpec({
@@ -3074,7 +3258,7 @@ const metaAnnotations = {
 	}),
 	isKey: new AnnotationSpec({
 		description: "Marks a **key field** inside an array. This annotation is used to identify unique fields within an array that can be used as **lookup keys**.\n\n\n\n**Example:**\n```atscript\nexport interface User {\n  id: string\n  profiles: {\n    @meta.isKey\n    profileId: string\n    name: string\n  }[]\n}\n```\n",
-		nodeType: ["prop"],
+		nodeType: ["prop", "type"],
 		multiple: false,
 		validate(token, args, doc) {
 			const field = token.parentNode;
@@ -3222,181 +3406,6 @@ const primitives = {
 	}
 };
 
-//#endregion
-//#region packages/core/src/defaults/expect-annotations.ts
-const expectAnnotations = {
-	minLength: new AnnotationSpec({
-		description: "Validates that a string or array has a minimum length.\n\n**Example:**```atscript@expect.minLength 5name: string```",
-		defType: ["array", "string"],
-		argument: [{
-			name: "length",
-			type: "number",
-			description: "The minimum length of the string or array."
-		}, {
-			name: "message",
-			optional: true,
-			type: "string",
-			description: "Optional error message to display if the validation fails."
-		}]
-	}),
-	maxLength: new AnnotationSpec({
-		description: "Validates that a string or array has a maximum length.\n\n**Example:**```atscript@expect.maxLength 5name: string```",
-		defType: ["array", "string"],
-		argument: [{
-			name: "length",
-			type: "number",
-			description: "The maximum length of the string or array."
-		}, {
-			name: "message",
-			optional: true,
-			type: "string",
-			description: "Optional error message to display if the validation fails."
-		}]
-	}),
-	min: new AnnotationSpec({
-		description: "Validates that a number is greater than or equal to a minimum value.\n\n**Example:**```atscript@expect.min 18age: number```",
-		defType: ["number"],
-		argument: [{
-			name: "minValue",
-			type: "number",
-			description: "The minimum value."
-		}, {
-			name: "message",
-			optional: true,
-			type: "string",
-			description: "Optional error message to display if the validation fails."
-		}]
-	}),
-	max: new AnnotationSpec({
-		description: "Validates that a number is less than or equal to a maximum value.\n\n**Example:**```atscript@expect.max 10count: number```",
-		defType: ["number"],
-		argument: [{
-			name: "maxValue",
-			type: "number",
-			description: "The maximum value."
-		}, {
-			name: "message",
-			optional: true,
-			type: "string",
-			description: "Optional error message to display if the validation fails."
-		}]
-	}),
-	int: new AnnotationSpec({
-		description: "Validates that a number is an integer (no decimal places).\n\n**Example:**```atscript@expect.intage: number```",
-		defType: ["number"]
-	}),
-	pattern: new AnnotationSpec({
-		description: "Validates that a string matches a specific pattern.\n\n**Example:**```atscript@expect.pattern \"[a-z]+\", \"u\"name: string```",
-		defType: ["string"],
-		multiple: true,
-		mergeStrategy: "append",
-		argument: [
-			{
-				name: "pattern",
-				type: "string",
-				description: "The regular expression pattern to match."
-			},
-			{
-				name: "flags",
-				optional: true,
-				type: "string",
-				values: [
-					"g",
-					"gi",
-					"gim",
-					"gims",
-					"gimsu",
-					"gimsuy",
-					"gimsy",
-					"gimu",
-					"gimuy",
-					"gimy",
-					"gis",
-					"gisu",
-					"gisuy",
-					"gisy",
-					"giu",
-					"giuy",
-					"giy",
-					"gm",
-					"gms",
-					"gmsu",
-					"gmsuy",
-					"gmsy",
-					"gmu",
-					"gmuy",
-					"gmy",
-					"gs",
-					"gsu",
-					"gsuy",
-					"gsy",
-					"gu",
-					"guy",
-					"gy",
-					"i",
-					"im",
-					"ims",
-					"imsu",
-					"imsuy",
-					"imsy",
-					"imu",
-					"imuy",
-					"imy",
-					"is",
-					"isu",
-					"isuy",
-					"isy",
-					"iu",
-					"iuy",
-					"iy",
-					"m",
-					"ms",
-					"msu",
-					"msuy",
-					"msy",
-					"mu",
-					"muy",
-					"my",
-					"s",
-					"su",
-					"suy",
-					"sy",
-					"u",
-					"uy",
-					"y"
-				],
-				description: "Optional flags for the regular expression."
-			},
-			{
-				name: "message",
-				optional: true,
-				type: "string",
-				description: "Optional error message to display if the validation fails."
-			}
-		],
-		validate(mainToken, args) {
-			if (args[0]) try {
-				new RegExp(args[0].text);
-				return [];
-			} catch (e) {
-				return [{
-					message: "Invalid regular expression",
-					range: args[0].range,
-					severity: 1
-				}];
-			}
-			return [];
-		}
-	})
-};
-
-//#endregion
-//#region packages/core/src/defaults/emit-annotations.ts
-const emitAnnotations = { jsonSchema: new AnnotationSpec({
-	nodeType: ["interface"],
-	description: "Pre-compute and embed JSON Schema at build time for this interface, regardless of the global jsonSchema plugin option."
-}) };
-
 //#endregion
 //#region packages/core/src/default-atscript-config.ts
 function getDefaultAtscriptConfig() {
@@ -3476,8 +3485,8 @@ var PluginManager = class {
 		const content = await readFile(filePath, "utf8");
 		return content.toString();
 	}
-	async onDocumnet(doc) {
-		for (const plugin of this.plugins) if (plugin.onDocumnet) await plugin.onDocumnet(doc);
+	async onDocument(doc) {
+		for (const plugin of this.plugins) if (plugin.onDocument) await plugin.onDocument(doc);
 	}
 	async render(doc, format) {
 		const files = [];
@@ -3571,8 +3580,8 @@ else types.push({ type: "boolean" });
 			for (const { name, token, args } of awaited.annotations) {
 				if (annotations$1[name]?.fromSpec) continue;
 				if (!annotations$1[name]) {
-					let types = [];
-					let multiple = false;
+					const types = [];
+					const multiple = false;
 					annotations$1[name] = {
 						multiple,
 						fromSpec: false,
@@ -3674,10 +3683,10 @@ else types.push({ type: "boolean" });
 		const newId = await manager.resolve(id);
 		if (!newId) throw new Error(`Document not resolved: ${id}`);
 		const content = text$2 || await manager.load(newId);
-		if (typeof content !== "string") throw new Error(`Document not found: ${newId}`);
+		if (typeof content !== "string") throw new TypeError(`Document not found: ${newId}`);
 		const atscript = new AtscriptDoc(id, await manager.getDocConfig(), manager);
 		atscript.update(content);
-		await manager.onDocumnet(atscript);
+		await manager.onDocument(atscript);
 		return atscript;
 	}
 	async checkDoc(atscript) {
@@ -3749,6 +3758,7 @@ else types.push({ type: "boolean" });
 
 //#endregion
 //#region packages/core/src/plugin/types.ts
+const DEFAULT_FORMAT = "__default__";
 const createAtscriptPlugin = (plugin) => plugin;
 
 //#endregion
@@ -3780,7 +3790,7 @@ else {
 		entries.push(...found);
 	}
 	const documents = [];
-	for (const entry of entries) documents.push(await repo.openDocument("file://" + entry));
+	for (const entry of entries) documents.push(await repo.openDocument(`file://${entry}`));
 	return new BuildRepo(rootDir, repo, documents.filter(Boolean));
 }
 var BuildRepo = class {
@@ -3834,4 +3844,4 @@ var BuildRepo = class {
 };
 
 //#endregion
-export { $n, AnnotationSpec, AtscriptDoc, AtscriptRepo, BuildRepo, PluginManager, SemanticAnnotateNode, SemanticArrayNode, SemanticConstNode, SemanticGroup, SemanticImportNode, SemanticInterfaceNode, SemanticNode, SemanticPrimitiveNode, SemanticPropNode, SemanticRefNode, SemanticStructureNode, SemanticTupleNode, SemanticTypeNode, Token, build, createAtscriptPlugin, defineConfig, getRelPath, isAnnotate, isAnnotationSpec, isArray, isConst, isGroup, isImport, isInterface, isPrimitive, isProp, isRef, isStructure, isTuple, isType, loadConfig, loadTsConfig, resolveAnnotation, resolveAtscriptFromPath, resolveConfigFile };
+export { $n, AnnotationSpec, AtscriptDoc, AtscriptRepo, BuildRepo, DEFAULT_FORMAT, PluginManager, SemanticAnnotateNode, SemanticArrayNode, SemanticConstNode, SemanticGroup, SemanticImportNode, SemanticInterfaceNode, SemanticNode, SemanticPrimitiveNode, SemanticPropNode, SemanticRefNode, SemanticStructureNode, SemanticTupleNode, SemanticTypeNode, Token, build, createAtscriptPlugin, defineConfig, getRelPath, isAnnotate, isAnnotationSpec, isArray, isConst, isGroup, isImport, isInterface, isPrimitive, isProp, isRef, isStructure, isTuple, isType, loadConfig, loadTsConfig, resolveAnnotation, resolveAtscriptFromPath, resolveConfigFile };

package/package.json

@@ -1,39 +1,39 @@
 {
   "name": "@atscript/core",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "description": "Core library for Atscript parsing and file generation.",
-  "type": "module",
-  "main": "dist/index.mjs",
-  "types": "dist/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
-    },
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "dist"
-  ],
   "keywords": [
-    "atscript",
     "annotations",
+    "atscript",
+    "code-generation",
     "interfaces",
-    "runtime",
-    "code-generation"
+    "runtime"
   ],
+  "homepage": "https://github.com/moostjs/atscript/tree/main/packages/core#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/core"
   },
-  "bugs": {
-    "url": "https://github.com/moostjs/atscript/issues"
+  "files": [
+    "dist"
+  ],
+  "type": "module",
+  "main": "dist/index.mjs",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs"
+    },
+    "./package.json": "./package.json"
   },
-  "homepage": "https://github.com/moostjs/atscript/tree/main/packages/core#readme",
-  "license": "ISC",
   "dependencies": {
     "@prostojs/parser": "^0.5.11",
     "defu": "^6.1.4",