@atscript/core 0.1.14 → 0.1.16

package/dist/index.cjs

@@ -443,8 +443,8 @@ var SemanticPrimitiveNode = class SemanticPrimitiveNode extends SemanticNode {
 			});
 		}
 		if (this.type === "string") {
-			if (this.config.expect?.filled === true) this.annotations.push({
-				name: "expect.filled",
+			if (this.config.expect?.required === true) this.annotations.push({
+				name: "meta.required",
 				token: dummyToken,
 				args: []
 			});
@@ -478,6 +478,13 @@ var SemanticPrimitiveNode = class SemanticPrimitiveNode extends SemanticNode {
 				args: []
 			});
 		}
+		if (this.type === "boolean") {
+			if (this.config.expect?.required === true) this.annotations.push({
+				name: "meta.required",
+				token: dummyToken,
+				args: []
+			});
+		}
 	}
 	get key() {
 		return this.parentKey ? `${this.parentKey}.${this._id}` : this._id;
@@ -857,7 +864,8 @@ var AnnotationSpec = class {
 			message: `Multiple "${mainToken.text}" annotations are not allowed.`,
 			range: mainToken.range
 		});
-		if (this.config.nodeType && this.config.nodeType.length > 0 && !this.config.nodeType.includes(mainToken.parentNode.entity)) messages.push({
+		const effectiveEntity = mainToken.parentNode.entity === "ref" && this.config.nodeType?.includes("prop") ? "prop" : mainToken.parentNode.entity;
+		if (this.config.nodeType && this.config.nodeType.length > 0 && !this.config.nodeType.includes(effectiveEntity)) messages.push({
 			severity: 1,
 			message: `${mainToken.text} applies only to ${this.config.nodeType.join(", ")} nodes.`,
 			range: mainToken.range
@@ -3078,6 +3086,16 @@ const metaAnnotations = {
 		nodeType: ["prop"],
 		multiple: false
 	}),
+	required: new AnnotationSpec({
+		description: "Marks a field as required for form validation. For strings: must contain at least one non-whitespace character. For booleans: must be true.\n\n**Example:**```atscript@meta.requiredname: string\n@meta.required \"You must accept the terms\"agreed: boolean```",
+		defType: ["string", "boolean"],
+		argument: [{
+			name: "message",
+			optional: true,
+			type: "string",
+			description: "Optional error message to display if the validation fails."
+		}]
+	}),
 	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"],
@@ -3168,9 +3186,9 @@ const primitives = {
 					message: "Invalid UUID format."
 				}
 			},
-			filled: {
+			required: {
 				documentation: "Non-empty string that contains at least one non-whitespace character.",
-				expect: { filled: true }
+				expect: { required: true }
 			}
 		}
 	},
@@ -3202,6 +3220,10 @@ const primitives = {
 		type: "boolean",
 		documentation: "Represents true/false values.",
 		extensions: {
+			required: {
+				documentation: "Boolean that must be true. Useful for checkboxes like \"accept terms\".",
+				expect: { required: true }
+			},
 			true: { documentation: "Represents a true value." },
 			false: { documentation: "Represents a false value." }
 		}
@@ -3287,16 +3309,6 @@ const expectAnnotations = {
 		description: "Validates that a number is an integer (no decimal places).\n\n**Example:**```atscript@expect.intage: number```",
 		defType: ["number"]
 	}),
-	filled: new AnnotationSpec({
-		description: "Validates that a string is not empty and contains at least one non-whitespace character.\n\n**Example:**```atscript@expect.filledname: string```",
-		defType: ["string"],
-		argument: [{
-			name: "message",
-			optional: true,
-			type: "string",
-			description: "Optional error message to display if the validation fails."
-		}]
-	}),
 	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"],

package/dist/index.d.ts

@@ -239,7 +239,7 @@ interface TPrimitiveBaseConfig {
         minLength?: number;
         maxLength?: number;
         pattern?: string | RegExp | (string | RegExp)[];
-        filled?: boolean;
+        required?: boolean;
         message?: string;
     };
 }

package/dist/index.mjs

@@ -419,8 +419,8 @@ var SemanticPrimitiveNode = class SemanticPrimitiveNode extends SemanticNode {
 			});
 		}
 		if (this.type === "string") {
-			if (this.config.expect?.filled === true) this.annotations.push({
-				name: "expect.filled",
+			if (this.config.expect?.required === true) this.annotations.push({
+				name: "meta.required",
 				token: dummyToken,
 				args: []
 			});
@@ -454,6 +454,13 @@ var SemanticPrimitiveNode = class SemanticPrimitiveNode extends SemanticNode {
 				args: []
 			});
 		}
+		if (this.type === "boolean") {
+			if (this.config.expect?.required === true) this.annotations.push({
+				name: "meta.required",
+				token: dummyToken,
+				args: []
+			});
+		}
 	}
 	get key() {
 		return this.parentKey ? `${this.parentKey}.${this._id}` : this._id;
@@ -833,7 +840,8 @@ var AnnotationSpec = class {
 			message: `Multiple "${mainToken.text}" annotations are not allowed.`,
 			range: mainToken.range
 		});
-		if (this.config.nodeType && this.config.nodeType.length > 0 && !this.config.nodeType.includes(mainToken.parentNode.entity)) messages.push({
+		const effectiveEntity = mainToken.parentNode.entity === "ref" && this.config.nodeType?.includes("prop") ? "prop" : mainToken.parentNode.entity;
+		if (this.config.nodeType && this.config.nodeType.length > 0 && !this.config.nodeType.includes(effectiveEntity)) messages.push({
 			severity: 1,
 			message: `${mainToken.text} applies only to ${this.config.nodeType.join(", ")} nodes.`,
 			range: mainToken.range
@@ -3054,6 +3062,16 @@ const metaAnnotations = {
 		nodeType: ["prop"],
 		multiple: false
 	}),
+	required: new AnnotationSpec({
+		description: "Marks a field as required for form validation. For strings: must contain at least one non-whitespace character. For booleans: must be true.\n\n**Example:**```atscript@meta.requiredname: string\n@meta.required \"You must accept the terms\"agreed: boolean```",
+		defType: ["string", "boolean"],
+		argument: [{
+			name: "message",
+			optional: true,
+			type: "string",
+			description: "Optional error message to display if the validation fails."
+		}]
+	}),
 	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"],
@@ -3144,9 +3162,9 @@ const primitives = {
 					message: "Invalid UUID format."
 				}
 			},
-			filled: {
+			required: {
 				documentation: "Non-empty string that contains at least one non-whitespace character.",
-				expect: { filled: true }
+				expect: { required: true }
 			}
 		}
 	},
@@ -3178,6 +3196,10 @@ const primitives = {
 		type: "boolean",
 		documentation: "Represents true/false values.",
 		extensions: {
+			required: {
+				documentation: "Boolean that must be true. Useful for checkboxes like \"accept terms\".",
+				expect: { required: true }
+			},
 			true: { documentation: "Represents a true value." },
 			false: { documentation: "Represents a false value." }
 		}
@@ -3263,16 +3285,6 @@ const expectAnnotations = {
 		description: "Validates that a number is an integer (no decimal places).\n\n**Example:**```atscript@expect.intage: number```",
 		defType: ["number"]
 	}),
-	filled: new AnnotationSpec({
-		description: "Validates that a string is not empty and contains at least one non-whitespace character.\n\n**Example:**```atscript@expect.filledname: string```",
-		defType: ["string"],
-		argument: [{
-			name: "message",
-			optional: true,
-			type: "string",
-			description: "Optional error message to display if the validation fails."
-		}]
-	}),
 	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"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/core",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "Core library for Atscript parsing and file generation.",
   "type": "module",
   "main": "dist/index.mjs",