@coldsmirk/abacus-core 0.9.0 → 0.11.0

package/dist/index.js

@@ -360,7 +360,7 @@ function isZenConsistentNumber(value) {
 const SUBJECT_PATTERN = /^[A-Z_$][\w$]*(?:\.[A-Z_$][\w$]*|\[\d+\])*$/i;
 const SUBJECT_IDENTIFIER_PATTERN = /[A-Z_$][\w$]*/gi;
 const SUBJECT_INDEX_PATTERN = /\[(?<index>\d+)\]/g;
-const ZEN_ROOT_RESERVED_WORDS = new Set([
+const ZEN_RESERVED_WORDS = new Set([
 	"and",
 	"or",
 	"not",
@@ -370,10 +370,13 @@ const ZEN_ROOT_RESERVED_WORDS = new Set([
 	"null"
 ]);
 const ZEN_MEMBER_RESERVED_WORDS = new Set(["true", "false"]);
+function isZenReservedWord(word) {
+	return ZEN_RESERVED_WORDS.has(word);
+}
 function isIdentifierPath(subject) {
 	if (!SUBJECT_PATTERN.test(subject)) return false;
 	const [root, ...members] = subject.match(SUBJECT_IDENTIFIER_PATTERN) ?? [];
-	if (root === void 0 || ZEN_ROOT_RESERVED_WORDS.has(root) || members.some((member) => ZEN_MEMBER_RESERVED_WORDS.has(member))) return false;
+	if (root === void 0 || isZenReservedWord(root) || members.some((member) => ZEN_MEMBER_RESERVED_WORDS.has(member))) return false;
 	for (const match of subject.matchAll(SUBJECT_INDEX_PATTERN)) if (match.groups?.index === void 0 || !isZenUnsignedIntegerText(match.groups.index)) return false;
 	return true;
 }
@@ -639,14 +642,14 @@ function compileRule(rule) {
 function matchesOperatorArity(rule) {
 	switch (conditionOperatorArity(rule.operator)) {
 		case "scalar": return isConditionScalar(rule.right);
-		case "array": return isScalarArray(rule.right);
+		case "array": return isConditionScalarArray(rule.right);
 		case "none": return rule.right === void 0;
 	}
 }
 function isConditionScalar(value) {
 	return typeof value === "string" || typeof value === "number" || typeof value === "boolean";
 }
-function isScalarArray(value) {
+function isConditionScalarArray(value) {
 	return isArray(value) && value.every((item) => isConditionScalar(item));
 }
 const TWO_CHAR_PUNCTUATION = new Set([
@@ -671,7 +674,7 @@ const IDENT_PART = /[\w$]/;
 const DIGIT = /\d/;
 const NUMBER_PATTERN = /^\d+(?:\.\d+)?(?:e[+-]?\d+)?/i;
 const INTEGER_PATTERN = /^\d+$/;
-function parseCanonicalNumber(text) {
+function parseCanonicalZenNumber(text) {
 	const value = Number(text);
 	return String(value) === text && isZenRepresentableNumber(value) ? value : null;
 }
@@ -733,7 +736,7 @@ function liftConditionTree(expression) {
 			return token.value;
 		}
 		if (token.kind === "number") {
-			const value = parseCanonicalNumber(token.value);
+			const value = parseCanonicalZenNumber(token.value);
 			if (value === null) return null;
 			pos += 1;
 			return value;
@@ -752,7 +755,7 @@ function liftConditionTree(expression) {
 		if (token.kind === "punct" && token.value === "-") {
 			const digits = peek(1);
 			if (digits === void 0 || digits.kind !== "number") return null;
-			const value = parseCanonicalNumber(digits.value);
+			const value = parseCanonicalZenNumber(digits.value);
 			if (value === null || value === 0 || !isZenRepresentableNumber(-value)) return null;
 			pos += 2;
 			return -value;
@@ -1257,6 +1260,23 @@ async function satisfiesType(actual, expected) {
 function satisfiesTypeSync(actual, expected) {
 	return getEngineSync().satisfies(actual, expected);
 }
+function fieldType(field) {
+	switch (field.type) {
+		case "string": return "String";
+		case "number": return "Number";
+		case "integer": return "Number";
+		case "boolean": return "Bool";
+		case "object": return { Object: fieldRecord(field.children) };
+		case "array": return { Array: field.items === null ? "Any" : fieldType(field.items) };
+		case "any": return "Any";
+	}
+}
+function fieldRecord(fields) {
+	return Object.fromEntries(fields.filter((field) => field.name.trim() !== "" || field.preserveBlankName === true).map((field) => [field.name, fieldType(field)]));
+}
+function schemaTreeToExpressionType(tree) {
+	return { Object: fieldRecord(tree.fields) };
+}
 const HOLE_PATTERN = /\{\{(?<expression>[^{}]*)\}\}/g;
 function parseTemplateHoles(source) {
 	const holes = [];
@@ -1317,293 +1337,4 @@ async function getTemplateDiagnostics(source) {
 	await loadEngine();
 	return getTemplateDiagnosticsSync(source);
 }
-function fieldType(field) {
-	switch (field.type) {
-		case "string": return "String";
-		case "number": return "Number";
-		case "integer": return "Number";
-		case "boolean": return "Bool";
-		case "object": return { Object: fieldRecord(field.children) };
-		case "array": return { Array: field.items === null ? "Any" : fieldType(field.items) };
-		case "any": return "Any";
-	}
-}
-function fieldRecord(fields) {
-	return Object.fromEntries(fields.filter((field) => field.name.trim() !== "" || field.preserveBlankName === true).map((field) => [field.name, fieldType(field)]));
-}
-function schemaTreeToExpressionType(tree) {
-	return { Object: fieldRecord(tree.fields) };
-}
-function mergeSchemas(a, b) {
-	if (a.type === "object" && b.type === "object") {
-		const left = a.properties ?? {};
-		const right = b.properties ?? {};
-		const entries = [];
-		const keys = new Set([...Object.keys(left), ...Object.keys(right)]);
-		for (const key of keys) {
-			const hasLeft = Object.hasOwn(left, key);
-			const hasRight = Object.hasOwn(right, key);
-			entries.push([key, hasLeft && hasRight ? mergeSchemas(left[key], right[key]) : hasLeft ? left[key] : right[key]]);
-		}
-		const properties = Object.fromEntries(entries);
-		return Object.keys(properties).length > 0 ? {
-			type: "object",
-			properties
-		} : { type: "object" };
-	}
-	if (a.type === "array" && b.type === "array") return a.items !== void 0 && b.items !== void 0 ? {
-		type: "array",
-		items: mergeSchemas(a.items, b.items)
-	} : { type: "array" };
-	return JSON.stringify(a) === JSON.stringify(b) ? a : {};
-}
-function inferSchema(sample) {
-	if (sample === null) return {};
-	if (Array.isArray(sample)) {
-		if (sample.length === 0) return { type: "array" };
-		return {
-			type: "array",
-			items: sample.map((element) => inferSchema(element)).reduce((left, right) => mergeSchemas(left, right))
-		};
-	}
-	if (typeof sample === "string") return { type: "string" };
-	if (typeof sample === "number") return { type: "number" };
-	if (typeof sample === "boolean") return { type: "boolean" };
-	const properties = Object.fromEntries(Object.entries(sample).map(([key, value]) => [key, inferSchema(value)]));
-	return Object.keys(properties).length > 0 ? {
-		type: "object",
-		properties
-	} : { type: "object" };
-}
-const SCHEMA_DIALECT_2020_12 = "https://json-schema.org/draft/2020-12/schema";
-const fieldIdRealm = Math.random().toString(36).slice(2, 7);
-let fieldIdCounter = 0;
-function newSchemaTreeField(overrides = {}) {
-	fieldIdCounter += 1;
-	return {
-		id: `sf-${fieldIdRealm}-${fieldIdCounter}`,
-		name: "",
-		type: "string",
-		required: false,
-		description: "",
-		children: [],
-		items: null,
-		...overrides
-	};
-}
-const SCALAR_TYPES = new Set([
-	"string",
-	"number",
-	"integer",
-	"boolean"
-]);
-const ROOT_KEYS = new Set([
-	"$schema",
-	"type",
-	"properties",
-	"required",
-	"description"
-]);
-const SUBSCHEMA_KEYS = new Set([
-	"type",
-	"properties",
-	"required",
-	"items",
-	"description"
-]);
-var Unsupported = class extends Error {
-	issue;
-	constructor(issue) {
-		super(issue.code);
-		this.issue = issue;
-	}
-};
-function asPlainObject(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
-}
-function checkKeys(schema, allowed) {
-	for (const key of Object.keys(schema)) if (!allowed.has(key)) throw new Unsupported({
-		code: "unsupported-keyword",
-		keyword: key
-	});
-}
-function parseObjectFields(schema) {
-	const properties = schema.properties === void 0 ? null : asPlainObject(schema.properties);
-	if (schema.properties !== void 0 && properties === null) throw new Unsupported({ code: "invalid-properties" });
-	const fields = [];
-	const entries = Object.entries(properties ?? {});
-	for (const [name, subschema] of entries) fields.push({
-		...parseSubschema(subschema, name),
-		name,
-		...name.trim() === "" && { preserveBlankName: true }
-	});
-	if (schema.required !== void 0) {
-		if (!Array.isArray(schema.required)) throw new Unsupported({ code: "invalid-required" });
-		for (const entry of schema.required) {
-			if (typeof entry !== "string") throw new Unsupported({ code: "invalid-required" });
-			const field = fields.find((candidate) => candidate.name === entry);
-			if (field === void 0) throw new Unsupported({
-				code: "unknown-required-field",
-				field: entry
-			});
-			field.required = true;
-		}
-	}
-	return fields;
-}
-function parseDescription(schema) {
-	if (schema.description === void 0) return "";
-	if (typeof schema.description !== "string") throw new Unsupported({ code: "invalid-description" });
-	return schema.description;
-}
-function ensureAbsent(schema, key, holder) {
-	if (schema[key] !== void 0) throw new Unsupported({
-		code: "misplaced-keyword",
-		keyword: key,
-		holder
-	});
-}
-function parseSubschema(value, name) {
-	const schema = asPlainObject(value);
-	if (schema === null) throw new Unsupported({
-		code: "invalid-field-definition",
-		field: name
-	});
-	checkKeys(schema, SUBSCHEMA_KEYS);
-	const { type } = schema;
-	if (type !== void 0 && typeof type !== "string") throw new Unsupported({
-		code: "invalid-field-type",
-		field: name
-	});
-	const description = parseDescription(schema);
-	if (type === "object" || type === void 0 && (schema.properties !== void 0 || schema.required !== void 0)) {
-		ensureAbsent(schema, "items", "array");
-		return newSchemaTreeField({
-			type: "object",
-			description,
-			children: parseObjectFields(schema),
-			explicitType: type === "object"
-		});
-	}
-	if (type === "array" || type === void 0 && schema.items !== void 0) {
-		ensureAbsent(schema, "properties", "object");
-		ensureAbsent(schema, "required", "object");
-		return newSchemaTreeField({
-			type: "array",
-			description,
-			items: schema.items === void 0 ? null : parseSubschema(schema.items, name),
-			explicitType: type === "array"
-		});
-	}
-	if (type === void 0) {
-		ensureAbsent(schema, "items", "array");
-		return newSchemaTreeField({
-			type: "any",
-			description
-		});
-	}
-	if (!SCALAR_TYPES.has(type)) throw new Unsupported({
-		code: "unsupported-field-type",
-		field: name,
-		type
-	});
-	ensureAbsent(schema, "properties", "object");
-	ensureAbsent(schema, "required", "object");
-	ensureAbsent(schema, "items", "array");
-	return newSchemaTreeField({
-		type,
-		description
-	});
-}
-function parseSchemaTree(text) {
-	if (text.trim() === "") return {
-		ok: true,
-		tree: {
-			fields: [],
-			dialect: false,
-			description: ""
-		}
-	};
-	let parsed;
-	try {
-		parsed = JSON.parse(text);
-	} catch {
-		return {
-			ok: false,
-			issue: { code: "invalid-json" }
-		};
-	}
-	try {
-		const root = asPlainObject(parsed);
-		if (root === null) throw new Unsupported({ code: "root-not-object" });
-		checkKeys(root, ROOT_KEYS);
-		const dialect = root.$schema !== void 0;
-		if (dialect && root.$schema !== "https://json-schema.org/draft/2020-12/schema") throw new Unsupported({ code: "unsupported-dialect" });
-		if (root.type !== void 0 && root.type !== "object") throw new Unsupported({ code: "root-not-object" });
-		return {
-			ok: true,
-			tree: {
-				fields: parseObjectFields(root),
-				dialect,
-				description: parseDescription(root),
-				explicitType: root.type === "object"
-			}
-		};
-	} catch (error) {
-		if (error instanceof Unsupported) return {
-			ok: false,
-			issue: error.issue
-		};
-		throw error;
-	}
-}
-function serializeObjectBody(fields) {
-	const named = fields.filter((field) => field.name.trim() !== "" || field.preserveBlankName === true);
-	const finalByName = /* @__PURE__ */ new Map();
-	const finalFields = [];
-	const body = {};
-	for (const field of named) finalByName.set(field.name, field);
-	finalByName.forEach((field) => {
-		finalFields.push(field);
-	});
-	if (finalFields.length > 0) body.properties = Object.fromEntries(finalFields.map((field) => [field.name, serializeField(field)]));
-	const required = finalFields.filter((field) => field.required).map((field) => field.name);
-	if (required.length > 0) body.required = required;
-	return body;
-}
-function serializeField(field) {
-	const description = field.description === "" ? {} : { description: field.description };
-	switch (field.type) {
-		case "any": return { ...description };
-		case "object": return {
-			...field.explicitType !== false && { type: "object" },
-			...description,
-			...serializeObjectBody(field.children)
-		};
-		case "array": {
-			const type = field.explicitType === false ? {} : { type: "array" };
-			return field.items === null || field.items.type === "any" && field.items.description === "" ? {
-				...type,
-				...description
-			} : {
-				...type,
-				...description,
-				items: serializeField(field.items)
-			};
-		}
-		default: return {
-			type: field.type,
-			...description
-		};
-	}
-}
-function serializeSchemaTree(tree) {
-	const root = {
-		...tree.dialect && { $schema: "https://json-schema.org/draft/2020-12/schema" },
-		...tree.explicitType !== false && { type: "object" },
-		...tree.description !== "" && { description: tree.description },
-		...serializeObjectBody(tree.fields)
-	};
-	return `${JSON.stringify(root, null, 2)}\n`;
-}
-export { CONDITION_OPERATORS, CONDITION_TREE_OPERATORS, ExpressionError, ExpressionNotReadyError, MAX_CONDITION_TREE_DEPTH, SCHEMA_DIALECT_2020_12, analyzeTemplate, analyzeTemplateSync, analyzeTypes, analyzeTypesSync, compileBranch, compileCondition, compileConditionTree, compileGroup, conditionOperatorArity, configureEngine, configureExpressionMessages, emptyConditionGroup, enMessages, ensureConditionNodeIds, evaluate, evaluateSync, evaluateUnary, evaluateUnarySync, getCompletionItems, getCompletionItemsSync, getDiagnostics, getDiagnosticsSync, getEngineError, getEngineSync, getExpressionMessages, getTemplateDiagnostics, getTemplateDiagnosticsSync, inferSchema, isEngineReady, isZenRepresentableNumber, liftConditionTree, loadEngine, newConditionNodeId, newSchemaTreeField, parseSchemaTree, parseTemplateHoles, registerExpressionLocale, resetEngine, satisfiesType, satisfiesTypeSync, schemaTreeToExpressionType, selectBranch, selectBranchWith, serializeSchemaTree, subscribeExpressionMessages, templateHoleAt, toZenLiteral, zhCNMessages };
+export { CONDITION_OPERATORS, CONDITION_TREE_OPERATORS, ExpressionError, ExpressionNotReadyError, MAX_CONDITION_TREE_DEPTH, analyzeTemplate, analyzeTemplateSync, analyzeTypes, analyzeTypesSync, compileBranch, compileCondition, compileConditionTree, compileGroup, conditionOperatorArity, configureEngine, configureExpressionMessages, emptyConditionGroup, enMessages, ensureConditionNodeIds, evaluate, evaluateSync, evaluateUnary, evaluateUnarySync, getCompletionItems, getCompletionItemsSync, getDiagnostics, getDiagnosticsSync, getEngineError, getEngineSync, getExpressionMessages, getTemplateDiagnostics, getTemplateDiagnosticsSync, isConditionScalarArray, isEngineReady, isZenRepresentableNumber, isZenReservedWord, liftConditionTree, loadEngine, newConditionNodeId, parseCanonicalZenNumber, parseTemplateHoles, registerExpressionLocale, resetEngine, satisfiesType, satisfiesTypeSync, schemaTreeToExpressionType, selectBranch, selectBranchWith, subscribeExpressionMessages, templateHoleAt, toZenLiteral, zhCNMessages };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coldsmirk/abacus-core",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "Framework-agnostic ZEN expression engine: compile, evaluate, and type-analyze expressions over the GoRules ZEN WASM engine.",
   "keywords": [
     "zen",
@@ -43,6 +43,7 @@
     "dist"
   ],
   "dependencies": {
+    "@coldsmirk/caliper-core": "^0.1.0",
     "@gorules/zen-engine-wasm": "^0.23.1"
   },
   "engines": {