@djvlc/contracts-types 1.8.0 → 1.8.2

package/dist/index.js

@@ -993,7 +993,7 @@ var ALL_BUILTIN_FUNCTIONS = [
 ];
 var ALLOWED_FUNCTION_NAMES = ALL_BUILTIN_FUNCTIONS.map((f) => f.name);
 var DEFAULT_EXPRESSION_VALIDATION_CONFIG = {
-  allowedContextPaths: ["state", "binding", "context", "props", "event"],
+  allowedContextPaths: ["state", "binding", "local", "props", "event"],
   allowedFunctions: ALLOWED_FUNCTION_NAMES,
   maxDepth: 10,
   maxLength: 1e3,
@@ -1002,49 +1002,147 @@ var DEFAULT_EXPRESSION_VALIDATION_CONFIG = {
 };
 
 // src/page/expression.ts
+var DEPENDENCY_PREFIX = {
+  /** 页面状态依赖前缀 */
+  STATE: "state",
+  /** 数据绑定依赖前缀 */
+  BINDING: "binding",
+  /** 局部变量依赖前缀 */
+  LOCAL: "local",
+  /** 组件属性依赖前缀 */
+  PROPS: "props",
+  /** 事件上下文依赖前缀 */
+  EVENT: "event"
+};
+function dep(prefix, path) {
+  return `${prefix}.${path}`;
+}
 function createExpressionContext(partial) {
   return {
     state: {},
     binding: {},
-    context: {},
+    local: {},
     ...partial
   };
 }
-function createLoopContext(item, index, extras) {
+function createLoopLocal(item, index, extras) {
   return {
+    ...extras,
     item,
-    index,
-    ...extras
+    index
   };
 }
-function literal(value) {
-  return value;
-}
 function stateRef(path, fallback) {
   return {
     type: "state",
     value: path,
     fallback,
-    meta: { dependencies: [`state.${path}`] }
+    meta: { dependencies: [dep(DEPENDENCY_PREFIX.STATE, path)] }
   };
 }
+var BINDING_ID_PATTERN = /^[A-Za-z_][A-Za-z0-9_-]*$/;
 function bindingRef(bindingId, path, fallback) {
+  if (!BINDING_ID_PATTERN.test(bindingId)) {
+    throw new Error(
+      `Invalid bindingId: "${bindingId}". Must match pattern [A-Za-z_][A-Za-z0-9_-]* (no dots allowed).`
+    );
+  }
   return {
     type: "binding",
     value: `${bindingId}.${path}`,
     fallback,
-    meta: { dependencies: [`binding.${bindingId}.${path}`] }
+    meta: { dependencies: [dep(DEPENDENCY_PREFIX.BINDING, `${bindingId}.${path}`)] }
   };
 }
-function template(templateString, fallback) {
-  const dependencies = [];
+function localRef(path, fallback) {
+  return {
+    type: "local",
+    value: path,
+    fallback,
+    meta: { dependencies: [dep(DEPENDENCY_PREFIX.LOCAL, path)] }
+  };
+}
+var FULL_REF_PATTERN = /\b(state|binding|local|props|event)\.[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\.\d+|\[\d+\])*/g;
+var BARE_PATH_PATTERN = /\b[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\.\d+|\[\d+\])*\b/g;
+var RESERVED_WORDS = /* @__PURE__ */ new Set([
+  "true",
+  "false",
+  "null",
+  "undefined",
+  "NaN",
+  "Infinity",
+  // 常见运算符相关
+  "typeof",
+  "instanceof",
+  "new",
+  "void",
+  "delete",
+  // 常见内置对象（不应作为依赖）
+  "Math",
+  "Date",
+  "JSON",
+  "Array",
+  "Object",
+  "String",
+  "Number",
+  "Boolean"
+]);
+var KNOWN_PREFIXES = ["state", "binding", "local", "props", "event"];
+function extractFullRefs(content) {
+  const set = /* @__PURE__ */ new Set();
+  for (const match of content.matchAll(FULL_REF_PATTERN)) {
+    set.add(match[0]);
+  }
+  return [...set];
+}
+function findBarePaths(content) {
+  const set = /* @__PURE__ */ new Set();
+  for (const match of content.matchAll(BARE_PATH_PATTERN)) {
+    const token = match[0];
+    if (RESERVED_WORDS.has(token)) continue;
+    if (KNOWN_PREFIXES.some((prefix) => token.startsWith(`${prefix}.`))) {
+      continue;
+    }
+    if (KNOWN_PREFIXES.includes(token)) {
+      continue;
+    }
+    set.add(token);
+  }
+  return [...set];
+}
+var TemplateParseError = class extends Error {
+  constructor(message, bareVariables, expression) {
+    super(message);
+    this.bareVariables = bareVariables;
+    this.expression = expression;
+    this.name = "TemplateParseError";
+  }
+};
+function parseTemplateDependencies(templateString, mode = "strict") {
+  const depSet = /* @__PURE__ */ new Set();
   const pattern = /\$\{([^}]+)\}/g;
-  let match;
-  while ((match = pattern.exec(templateString)) !== null) {
-    if (match[1]) {
-      dependencies.push(match[1]);
+  for (const match of templateString.matchAll(pattern)) {
+    const content = (match[1] ?? "").trim();
+    if (!content) continue;
+    const fullRefs = extractFullRefs(content);
+    for (const ref of fullRefs) {
+      depSet.add(ref);
+    }
+    if (mode === "strict") {
+      const bare = findBarePaths(content);
+      if (bare.length > 0) {
+        throw new TemplateParseError(
+          `Template variable must use prefix (state./binding./local./props./event.). Found bare variables: ${bare.join(", ")} in \${${content}}`,
+          bare,
+          content
+        );
+      }
     }
   }
+  return [...depSet];
+}
+function template(templateString, fallback) {
+  const dependencies = parseTemplateDependencies(templateString, "strict");
   return {
     type: "template",
     value: templateString,
@@ -1052,9 +1150,6 @@ function template(templateString, fallback) {
     meta: { dependencies }
   };
 }
-function queryRef(queryId, path, fallback) {
-  return bindingRef(queryId, path, fallback);
-}
 
 // src/component/meta.ts
 var CURRENT_COMPONENT_META_VERSION = "2.0.0";
@@ -1081,27 +1176,21 @@ var CURRENT_ACTION_SPEC_VERSION = "2.0.0";
 var CURRENT_DATA_QUERY_SPEC_VERSION = "2.0.0";
 
 // src/index.ts
-var VERSION = "2.1.0";
+var VERSION = "2.0.0";
 var PROTOCOL_VERSION = "2.0.0";
-var PAGE_SCHEMA_VERSION = "2.0.0";
-var COMPONENT_META_SCHEMA_VERSION = "2.0.0";
-var ACTION_SPEC_VERSION = "2.0.0";
-var DATA_QUERY_SPEC_VERSION = "2.0.0";
 
-exports.ACTION_SPEC_VERSION = ACTION_SPEC_VERSION;
 exports.ALLOWED_FUNCTION_NAMES = ALLOWED_FUNCTION_NAMES;
 exports.ALL_BUILTIN_FUNCTIONS = ALL_BUILTIN_FUNCTIONS;
 exports.ARRAY_FUNCTIONS = ARRAY_FUNCTIONS;
 exports.ActionType = ActionType;
 exports.AuditAction = AuditAction;
-exports.COMPONENT_META_SCHEMA_VERSION = COMPONENT_META_SCHEMA_VERSION;
 exports.CURRENT_ACTION_SPEC_VERSION = CURRENT_ACTION_SPEC_VERSION;
 exports.CURRENT_COMPONENT_META_VERSION = CURRENT_COMPONENT_META_VERSION;
 exports.CURRENT_DATA_QUERY_SPEC_VERSION = CURRENT_DATA_QUERY_SPEC_VERSION;
 exports.CURRENT_SCHEMA_VERSION = CURRENT_SCHEMA_VERSION;
-exports.DATA_QUERY_SPEC_VERSION = DATA_QUERY_SPEC_VERSION;
 exports.DATE_FUNCTIONS = DATE_FUNCTIONS;
 exports.DEFAULT_EXPRESSION_VALIDATION_CONFIG = DEFAULT_EXPRESSION_VALIDATION_CONFIG;
+exports.DEPENDENCY_PREFIX = DEPENDENCY_PREFIX;
 exports.ErrorCategory = ErrorCategory;
 exports.ErrorCode = ErrorCode;
 exports.ErrorCodeToHttpStatus = ErrorCodeToHttpStatus;
@@ -1109,21 +1198,21 @@ exports.ErrorMessages = ErrorMessages;
 exports.FORMAT_FUNCTIONS = FORMAT_FUNCTIONS;
 exports.LOGIC_FUNCTIONS = LOGIC_FUNCTIONS;
 exports.NUMBER_FUNCTIONS = NUMBER_FUNCTIONS;
-exports.PAGE_SCHEMA_VERSION = PAGE_SCHEMA_VERSION;
 exports.PROTOCOL_VERSION = PROTOCOL_VERSION;
 exports.PageStatus = PageStatus;
 exports.PublishChannel = PublishChannel;
 exports.PublishStatus = PublishStatus;
 exports.STRING_FUNCTIONS = STRING_FUNCTIONS;
+exports.TemplateParseError = TemplateParseError;
 exports.UTILITY_FUNCTIONS = UTILITY_FUNCTIONS;
 exports.VERSION = VERSION;
 exports.VersionStatus = VersionStatus;
 exports.bindingRef = bindingRef;
 exports.createDjvlcError = createDjvlcError;
 exports.createExpressionContext = createExpressionContext;
-exports.createLoopContext = createLoopContext;
+exports.createLoopLocal = createLoopLocal;
+exports.dep = dep;
 exports.isDjvlcError = isDjvlcError;
-exports.literal = literal;
-exports.queryRef = queryRef;
+exports.localRef = localRef;
 exports.stateRef = stateRef;
 exports.template = template;

package/dist/index.mjs

@@ -991,7 +991,7 @@ var ALL_BUILTIN_FUNCTIONS = [
 ];
 var ALLOWED_FUNCTION_NAMES = ALL_BUILTIN_FUNCTIONS.map((f) => f.name);
 var DEFAULT_EXPRESSION_VALIDATION_CONFIG = {
-  allowedContextPaths: ["state", "binding", "context", "props", "event"],
+  allowedContextPaths: ["state", "binding", "local", "props", "event"],
   allowedFunctions: ALLOWED_FUNCTION_NAMES,
   maxDepth: 10,
   maxLength: 1e3,
@@ -1000,49 +1000,147 @@ var DEFAULT_EXPRESSION_VALIDATION_CONFIG = {
 };
 
 // src/page/expression.ts
+var DEPENDENCY_PREFIX = {
+  /** 页面状态依赖前缀 */
+  STATE: "state",
+  /** 数据绑定依赖前缀 */
+  BINDING: "binding",
+  /** 局部变量依赖前缀 */
+  LOCAL: "local",
+  /** 组件属性依赖前缀 */
+  PROPS: "props",
+  /** 事件上下文依赖前缀 */
+  EVENT: "event"
+};
+function dep(prefix, path) {
+  return `${prefix}.${path}`;
+}
 function createExpressionContext(partial) {
   return {
     state: {},
     binding: {},
-    context: {},
+    local: {},
     ...partial
   };
 }
-function createLoopContext(item, index, extras) {
+function createLoopLocal(item, index, extras) {
   return {
+    ...extras,
     item,
-    index,
-    ...extras
+    index
   };
 }
-function literal(value) {
-  return value;
-}
 function stateRef(path, fallback) {
   return {
     type: "state",
     value: path,
     fallback,
-    meta: { dependencies: [`state.${path}`] }
+    meta: { dependencies: [dep(DEPENDENCY_PREFIX.STATE, path)] }
   };
 }
+var BINDING_ID_PATTERN = /^[A-Za-z_][A-Za-z0-9_-]*$/;
 function bindingRef(bindingId, path, fallback) {
+  if (!BINDING_ID_PATTERN.test(bindingId)) {
+    throw new Error(
+      `Invalid bindingId: "${bindingId}". Must match pattern [A-Za-z_][A-Za-z0-9_-]* (no dots allowed).`
+    );
+  }
   return {
     type: "binding",
     value: `${bindingId}.${path}`,
     fallback,
-    meta: { dependencies: [`binding.${bindingId}.${path}`] }
+    meta: { dependencies: [dep(DEPENDENCY_PREFIX.BINDING, `${bindingId}.${path}`)] }
   };
 }
-function template(templateString, fallback) {
-  const dependencies = [];
+function localRef(path, fallback) {
+  return {
+    type: "local",
+    value: path,
+    fallback,
+    meta: { dependencies: [dep(DEPENDENCY_PREFIX.LOCAL, path)] }
+  };
+}
+var FULL_REF_PATTERN = /\b(state|binding|local|props|event)\.[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\.\d+|\[\d+\])*/g;
+var BARE_PATH_PATTERN = /\b[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\.\d+|\[\d+\])*\b/g;
+var RESERVED_WORDS = /* @__PURE__ */ new Set([
+  "true",
+  "false",
+  "null",
+  "undefined",
+  "NaN",
+  "Infinity",
+  // 常见运算符相关
+  "typeof",
+  "instanceof",
+  "new",
+  "void",
+  "delete",
+  // 常见内置对象（不应作为依赖）
+  "Math",
+  "Date",
+  "JSON",
+  "Array",
+  "Object",
+  "String",
+  "Number",
+  "Boolean"
+]);
+var KNOWN_PREFIXES = ["state", "binding", "local", "props", "event"];
+function extractFullRefs(content) {
+  const set = /* @__PURE__ */ new Set();
+  for (const match of content.matchAll(FULL_REF_PATTERN)) {
+    set.add(match[0]);
+  }
+  return [...set];
+}
+function findBarePaths(content) {
+  const set = /* @__PURE__ */ new Set();
+  for (const match of content.matchAll(BARE_PATH_PATTERN)) {
+    const token = match[0];
+    if (RESERVED_WORDS.has(token)) continue;
+    if (KNOWN_PREFIXES.some((prefix) => token.startsWith(`${prefix}.`))) {
+      continue;
+    }
+    if (KNOWN_PREFIXES.includes(token)) {
+      continue;
+    }
+    set.add(token);
+  }
+  return [...set];
+}
+var TemplateParseError = class extends Error {
+  constructor(message, bareVariables, expression) {
+    super(message);
+    this.bareVariables = bareVariables;
+    this.expression = expression;
+    this.name = "TemplateParseError";
+  }
+};
+function parseTemplateDependencies(templateString, mode = "strict") {
+  const depSet = /* @__PURE__ */ new Set();
   const pattern = /\$\{([^}]+)\}/g;
-  let match;
-  while ((match = pattern.exec(templateString)) !== null) {
-    if (match[1]) {
-      dependencies.push(match[1]);
+  for (const match of templateString.matchAll(pattern)) {
+    const content = (match[1] ?? "").trim();
+    if (!content) continue;
+    const fullRefs = extractFullRefs(content);
+    for (const ref of fullRefs) {
+      depSet.add(ref);
+    }
+    if (mode === "strict") {
+      const bare = findBarePaths(content);
+      if (bare.length > 0) {
+        throw new TemplateParseError(
+          `Template variable must use prefix (state./binding./local./props./event.). Found bare variables: ${bare.join(", ")} in \${${content}}`,
+          bare,
+          content
+        );
+      }
     }
   }
+  return [...depSet];
+}
+function template(templateString, fallback) {
+  const dependencies = parseTemplateDependencies(templateString, "strict");
   return {
     type: "template",
     value: templateString,
@@ -1050,9 +1148,6 @@ function template(templateString, fallback) {
     meta: { dependencies }
   };
 }
-function queryRef(queryId, path, fallback) {
-  return bindingRef(queryId, path, fallback);
-}
 
 // src/component/meta.ts
 var CURRENT_COMPONENT_META_VERSION = "2.0.0";
@@ -1079,11 +1174,7 @@ var CURRENT_ACTION_SPEC_VERSION = "2.0.0";
 var CURRENT_DATA_QUERY_SPEC_VERSION = "2.0.0";
 
 // src/index.ts
-var VERSION = "2.1.0";
+var VERSION = "2.0.0";
 var PROTOCOL_VERSION = "2.0.0";
-var PAGE_SCHEMA_VERSION = "2.0.0";
-var COMPONENT_META_SCHEMA_VERSION = "2.0.0";
-var ACTION_SPEC_VERSION = "2.0.0";
-var DATA_QUERY_SPEC_VERSION = "2.0.0";
 
-export { ACTION_SPEC_VERSION, ALLOWED_FUNCTION_NAMES, ALL_BUILTIN_FUNCTIONS, ARRAY_FUNCTIONS, ActionType, AuditAction, COMPONENT_META_SCHEMA_VERSION, CURRENT_ACTION_SPEC_VERSION, CURRENT_COMPONENT_META_VERSION, CURRENT_DATA_QUERY_SPEC_VERSION, CURRENT_SCHEMA_VERSION, DATA_QUERY_SPEC_VERSION, DATE_FUNCTIONS, DEFAULT_EXPRESSION_VALIDATION_CONFIG, ErrorCategory, ErrorCode, ErrorCodeToHttpStatus, ErrorMessages, FORMAT_FUNCTIONS, LOGIC_FUNCTIONS, NUMBER_FUNCTIONS, PAGE_SCHEMA_VERSION, PROTOCOL_VERSION, PageStatus, PublishChannel, PublishStatus, STRING_FUNCTIONS, UTILITY_FUNCTIONS, VERSION, VersionStatus, bindingRef, createDjvlcError, createExpressionContext, createLoopContext, isDjvlcError, literal, queryRef, stateRef, template };
+export { ALLOWED_FUNCTION_NAMES, ALL_BUILTIN_FUNCTIONS, ARRAY_FUNCTIONS, ActionType, AuditAction, CURRENT_ACTION_SPEC_VERSION, CURRENT_COMPONENT_META_VERSION, CURRENT_DATA_QUERY_SPEC_VERSION, CURRENT_SCHEMA_VERSION, DATE_FUNCTIONS, DEFAULT_EXPRESSION_VALIDATION_CONFIG, DEPENDENCY_PREFIX, ErrorCategory, ErrorCode, ErrorCodeToHttpStatus, ErrorMessages, FORMAT_FUNCTIONS, LOGIC_FUNCTIONS, NUMBER_FUNCTIONS, PROTOCOL_VERSION, PageStatus, PublishChannel, PublishStatus, STRING_FUNCTIONS, TemplateParseError, UTILITY_FUNCTIONS, VERSION, VersionStatus, bindingRef, createDjvlcError, createExpressionContext, createLoopLocal, dep, isDjvlcError, localRef, stateRef, template };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@djvlc/contracts-types",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "DJV Low-code Platform - TypeScript 类型定义包",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",