@nocobase/utils 1.9.0-beta.8 → 2.0.0-alpha.10

package/lib/client.d.ts

@@ -29,4 +29,6 @@ export * from './parseHTML';
 export * from './uid';
 export * from './url';
 export * from './transformMultiColumnToSingleColumn';
+export * from './transformFilter';
+export * from './variable-usage';
 export { dayjs, lodash, getDayRangeByParams, getOffsetRangeByParams };

package/lib/client.js

@@ -66,6 +66,8 @@ __reExport(client_exports, require("./parseHTML"), module.exports);
 __reExport(client_exports, require("./uid"), module.exports);
 __reExport(client_exports, require("./url"), module.exports);
 __reExport(client_exports, require("./transformMultiColumnToSingleColumn"), module.exports);
+__reExport(client_exports, require("./transformFilter"), module.exports);
+__reExport(client_exports, require("./variable-usage"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   dayjs,
@@ -91,5 +93,7 @@ __reExport(client_exports, require("./transformMultiColumnToSingleColumn"), modu
   ...require("./parseHTML"),
   ...require("./uid"),
   ...require("./url"),
-  ...require("./transformMultiColumnToSingleColumn")
+  ...require("./transformMultiColumnToSingleColumn"),
+  ...require("./transformFilter"),
+  ...require("./variable-usage")
 });

package/lib/common.d.ts

@@ -33,3 +33,6 @@ export declare function treeFind<T = any>(tree: T | T[], callback: (node: T) =>
  */
 export declare function sortTree(tree: any[], sortBy: string | Function, childrenKey?: string, isAsc?: boolean): any;
 export declare function sleep(ms: number): Promise<void>;
+export declare function isEmptyFilter(obj: any): boolean;
+export declare const removeNullCondition: (filter: any, customFlat?: any) => any;
+export * from './transformFilter';

package/lib/common.js

@@ -26,6 +26,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
   // If the importer is in node compatibility mode or this is not an ESM
   // file that has been converted to a CommonJS file using a Babel-
@@ -40,15 +41,19 @@ __export(common_exports, {
   hasEmptyValue: () => hasEmptyValue,
   isArray: () => isArray,
   isEmpty: () => isEmpty,
+  isEmptyFilter: () => isEmptyFilter,
   isPlainObject: () => isPlainObject,
   isString: () => isString,
   nextTick: () => nextTick,
+  removeNullCondition: () => removeNullCondition,
   sleep: () => sleep,
   sortTree: () => sortTree,
   treeFind: () => treeFind
 });
 module.exports = __toCommonJS(common_exports);
 var import_lodash = __toESM(require("lodash"));
+var import_flat = __toESM(require("flat"));
+__reExport(common_exports, require("./transformFilter"), module.exports);
 const isString = /* @__PURE__ */ __name((value) => {
   return typeof value === "string";
 }, "isString");
@@ -131,15 +136,38 @@ function sleep(ms) {
   });
 }
 __name(sleep, "sleep");
+function isEmptyFilter(obj) {
+  if (!obj) return true;
+  if ("$and" in obj && import_lodash.default.isEmpty(obj.$and) || "$or" in obj && import_lodash.default.isEmpty(obj.$or)) {
+    return true;
+  }
+  return false;
+}
+__name(isEmptyFilter, "isEmptyFilter");
+const removeNullCondition = /* @__PURE__ */ __name((filter, customFlat = import_flat.default) => {
+  const items = customFlat(filter || {});
+  const values = {};
+  for (const key in items) {
+    const value = items[key];
+    if (value != null && !isEmpty(value) && value !== "") {
+      values[key] = value;
+    }
+  }
+  const result = customFlat.unflatten(values);
+  return import_lodash.default.isEmpty(result) ? void 0 : result;
+}, "removeNullCondition");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   hasEmptyValue,
   isArray,
   isEmpty,
+  isEmptyFilter,
   isPlainObject,
   isString,
   nextTick,
+  removeNullCondition,
   sleep,
   sortTree,
-  treeFind
+  treeFind,
+  ...require("./transformFilter")
 });

package/lib/date.js

@@ -111,7 +111,7 @@ const toMoment = /* @__PURE__ */ __name((val, options) => {
       return import_dayjs.dayjs.utc(dateString, "YYYY-MM-DD");
     }
     if (!utc) {
-      return import_dayjs.dayjs.utc(val);
+      return (0, import_dayjs.dayjs)(val);
     }
     if (import_dayjs.dayjs.isDayjs(val)) {
       return offset ? val.utcOffset(offsetFromString(offset)) : val;

package/lib/index.d.ts

@@ -7,17 +7,19 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import lodash from 'lodash';
-export { lodash };
-export { dayjs } from './dayjs';
+export { Schema } from '@formily/json-schema';
 export * from './assign';
 export * from './collections-graph';
 export * from './common';
 export * from './crypto';
 export * from './date';
+export * from './dateRangeUtils';
 export * from './dayjs';
+export { dayjs } from './dayjs';
 export * from './forEach';
 export * from './fs-exists';
 export * from './handlebars';
+export * from './i18n';
 export * from './isValidFilter';
 export * from './json-templates';
 export * from './koa-multer';
@@ -26,17 +28,17 @@ export * from './merge';
 export * from './mixin';
 export * from './mixin/AsyncEmitter';
 export * from './number';
+export * from './object-to-cli-args';
+export * from './parse-bigint';
 export * from './parse-date';
 export * from './parse-filter';
+export * from './parsedValue';
 export * from './perf-hooks';
 export * from './registry';
 export * from './requireModule';
 export * from './toposort';
 export * from './uid';
 export * from './url';
-export * from './i18n';
+export * from './variable-usage';
 export * from './wrap-middleware';
-export * from './object-to-cli-args';
-export * from './parsedValue';
-export * from './dateRangeUtils';
-export { Schema } from '@formily/json-schema';
+export { lodash };

package/lib/index.js

@@ -43,16 +43,19 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_lodash = __toESM(require("lodash"));
-var import_dayjs = require("./dayjs");
+var import_json_schema = require("@formily/json-schema");
 __reExport(src_exports, require("./assign"), module.exports);
 __reExport(src_exports, require("./collections-graph"), module.exports);
 __reExport(src_exports, require("./common"), module.exports);
 __reExport(src_exports, require("./crypto"), module.exports);
 __reExport(src_exports, require("./date"), module.exports);
+__reExport(src_exports, require("./dateRangeUtils"), module.exports);
 __reExport(src_exports, require("./dayjs"), module.exports);
+var import_dayjs = require("./dayjs");
 __reExport(src_exports, require("./forEach"), module.exports);
 __reExport(src_exports, require("./fs-exists"), module.exports);
 __reExport(src_exports, require("./handlebars"), module.exports);
+__reExport(src_exports, require("./i18n"), module.exports);
 __reExport(src_exports, require("./isValidFilter"), module.exports);
 __reExport(src_exports, require("./json-templates"), module.exports);
 __reExport(src_exports, require("./koa-multer"), module.exports);
@@ -61,20 +64,19 @@ __reExport(src_exports, require("./merge"), module.exports);
 __reExport(src_exports, require("./mixin"), module.exports);
 __reExport(src_exports, require("./mixin/AsyncEmitter"), module.exports);
 __reExport(src_exports, require("./number"), module.exports);
+__reExport(src_exports, require("./object-to-cli-args"), module.exports);
+__reExport(src_exports, require("./parse-bigint"), module.exports);
 __reExport(src_exports, require("./parse-date"), module.exports);
 __reExport(src_exports, require("./parse-filter"), module.exports);
+__reExport(src_exports, require("./parsedValue"), module.exports);
 __reExport(src_exports, require("./perf-hooks"), module.exports);
 __reExport(src_exports, require("./registry"), module.exports);
 __reExport(src_exports, require("./requireModule"), module.exports);
 __reExport(src_exports, require("./toposort"), module.exports);
 __reExport(src_exports, require("./uid"), module.exports);
 __reExport(src_exports, require("./url"), module.exports);
-__reExport(src_exports, require("./i18n"), module.exports);
+__reExport(src_exports, require("./variable-usage"), module.exports);
 __reExport(src_exports, require("./wrap-middleware"), module.exports);
-__reExport(src_exports, require("./object-to-cli-args"), module.exports);
-__reExport(src_exports, require("./parsedValue"), module.exports);
-__reExport(src_exports, require("./dateRangeUtils"), module.exports);
-var import_json_schema = require("@formily/json-schema");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Schema,
@@ -85,10 +87,12 @@ var import_json_schema = require("@formily/json-schema");
   ...require("./common"),
   ...require("./crypto"),
   ...require("./date"),
+  ...require("./dateRangeUtils"),
   ...require("./dayjs"),
   ...require("./forEach"),
   ...require("./fs-exists"),
   ...require("./handlebars"),
+  ...require("./i18n"),
   ...require("./isValidFilter"),
   ...require("./json-templates"),
   ...require("./koa-multer"),
@@ -97,17 +101,17 @@ var import_json_schema = require("@formily/json-schema");
   ...require("./mixin"),
   ...require("./mixin/AsyncEmitter"),
   ...require("./number"),
+  ...require("./object-to-cli-args"),
+  ...require("./parse-bigint"),
   ...require("./parse-date"),
   ...require("./parse-filter"),
+  ...require("./parsedValue"),
   ...require("./perf-hooks"),
   ...require("./registry"),
   ...require("./requireModule"),
   ...require("./toposort"),
   ...require("./uid"),
   ...require("./url"),
-  ...require("./i18n"),
-  ...require("./wrap-middleware"),
-  ...require("./object-to-cli-args"),
-  ...require("./parsedValue"),
-  ...require("./dateRangeUtils")
+  ...require("./variable-usage"),
+  ...require("./wrap-middleware")
 });

package/lib/parse-bigint.d.ts

@@ -0,0 +1,9 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare const parseBigIntValue: (val: string | number) => string | number;

package/lib/parse-bigint.js

@@ -0,0 +1,47 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var parse_bigint_exports = {};
+__export(parse_bigint_exports, {
+  parseBigIntValue: () => parseBigIntValue
+});
+module.exports = __toCommonJS(parse_bigint_exports);
+const parseBigIntValue = /* @__PURE__ */ __name((val) => {
+  if (val === null || val === void 0) {
+    return val;
+  }
+  try {
+    const big = BigInt(val);
+    return big <= BigInt(Number.MAX_SAFE_INTEGER) ? Number(big) : val;
+  } catch {
+    return val;
+  }
+}, "parseBigIntValue");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  parseBigIntValue
+});

package/lib/transformFilter.d.ts

@@ -0,0 +1,154 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+/**
+ * 过滤器条件项接口
+ */
+export interface FilterCondition {
+    /** 字段名 */
+    path: string;
+    /** 值 */
+    value: any;
+    /** 操作符 */
+    operator: string;
+}
+/**
+ * 过滤器分组接口
+ */
+export interface FilterGroupType {
+    /** 逻辑操作符 */
+    logic: '$and' | '$or';
+    /** 条件项数组 */
+    items: (FilterCondition | FilterGroupType)[];
+}
+/**
+ * 查询条件对象类型
+ */
+export type QueryCondition = {
+    [field: string]: {
+        [operator: string]: any;
+    };
+};
+/**
+ * 查询对象类型
+ */
+export type QueryObject = {
+    [logic: string]: (QueryCondition | QueryObject)[];
+} | QueryCondition;
+/**
+ * 转换过滤器数据结构
+ *
+ * 将结构化的过滤器配置转换为查询对象格式
+ *
+ * @param filter - 过滤器配置对象
+ * @returns 转换后的查询对象
+ *
+ * @throws {Error} 当过滤器格式无效时抛出错误
+ *
+ * @example
+ * ```typescript
+ * // 简单条件
+ * const simpleFilter = {
+ *   "logic": "$and",
+ *   "items": [
+ *     {
+ *       "path": "name",
+ *       "operator": "$eq",
+ *       "value": "test"
+ *     }
+ *   ]
+ * };
+ *
+ * const result = transformFilter(simpleFilter);
+ * // 输出: {"$and":[{"name":{"$eq":"test"}}]}
+ *
+ * // 嵌套条件
+ * const nestedFilter = {
+ *   "logic": "$or",
+ *   "items": [
+ *     {
+ *       "path": "isAdmin",
+ *       "operator": "$eq",
+ *       "value": true
+ *     },
+ *     {
+ *       "logic": "$and",
+ *       "items": [
+ *         {
+ *           "path": "name",
+ *           "operator": "$includes",
+ *           "value": "NocoBase"
+ *         },
+ *         {
+ *           "path": "age",
+ *           "operator": "$gt",
+ *           "value": 18
+ *         }
+ *       ]
+ *     }
+ *   ]
+ * };
+ *
+ * const nestedResult = transformFilter(nestedFilter);
+ * // 输出: {"$or":[{"isAdmin":{"$eq":true}},{"$and":[{"name":{"$includes":"NocoBase"}},{"age":{"$gt":18}}]}]}
+ * ```
+ */
+export declare function transformFilter(filter: FilterGroupType): QueryObject;
+/**
+ * 条件评估器函数类型
+ *
+ * @param path - 左值（字段名）
+ * @param operator - 操作符
+ * @param value - 右值
+ * @returns 条件评估结果
+ */
+export type ConditionEvaluator = (path: string, operator: string, value: any) => boolean;
+/**
+ * 评估过滤器条件
+ *
+ * 解析 FilterGroupType 类型的条件，根据提供的评估器函数计算每个条件的值，
+ * 然后按照逻辑操作符组合得出最终的布尔值结果。
+ *
+ * @param conditions - 过滤器条件配置对象
+ * @param evaluator - 条件评估器函数，用于计算 path、operator、value 的结果
+ * @returns 最终的布尔值结果
+ *
+ * @throws {Error} 当条件格式无效时抛出错误
+ *
+ * @example
+ * ```typescript
+ * // 定义条件评估器
+ * const evaluator: ConditionEvaluator = (path, operator, value) => {
+ *   // 这里实现具体的条件计算逻辑
+ *   // 例如从上下文中获取字段值并与 value 比较
+ *   const fieldValue = getFieldValue(path);
+ *   return compareValues(fieldValue, operator, value);
+ * };
+ *
+ * // 评估条件
+ * const conditions = {
+ *   logic: '$and',
+ *   items: [
+ *     {
+ *       path: 'name',
+ *       operator: '$eq',
+ *       value: 'test'
+ *     },
+ *     {
+ *       path: 'age',
+ *       operator: '$gt',
+ *       value: 18
+ *     }
+ *   ]
+ * };
+ *
+ * const result = evaluateConditions(conditions, evaluator);
+ * // 返回: boolean (根据评估器的具体实现)
+ * ```
+ */
+export declare function evaluateConditions(conditions: FilterGroupType, evaluator: ConditionEvaluator): boolean;

package/lib/transformFilter.js

@@ -0,0 +1,128 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var transformFilter_exports = {};
+__export(transformFilter_exports, {
+  evaluateConditions: () => evaluateConditions,
+  transformFilter: () => transformFilter
+});
+module.exports = __toCommonJS(transformFilter_exports);
+function isFilterCondition(item) {
+  return "path" in item && "operator" in item && "value" in item;
+}
+__name(isFilterCondition, "isFilterCondition");
+function isFilterGroup(item) {
+  return "logic" in item && "items" in item;
+}
+__name(isFilterGroup, "isFilterGroup");
+function transformCondition(condition) {
+  const { path, operator, value } = condition;
+  return {
+    [path]: {
+      [operator]: value
+    }
+  };
+}
+__name(transformCondition, "transformCondition");
+function transformGroup(group) {
+  const { logic, items } = group;
+  const transformedItems = items.map((item) => {
+    if (isFilterCondition(item)) {
+      return transformCondition(item);
+    } else if (isFilterGroup(item)) {
+      return transformGroup(item);
+    } else {
+      throw new Error("Invalid filter item type");
+    }
+  });
+  return {
+    [logic]: transformedItems
+  };
+}
+__name(transformGroup, "transformGroup");
+function transformFilter(filter) {
+  if (!filter || typeof filter !== "object") {
+    throw new Error("Invalid filter: filter must be an object");
+  }
+  if (!isFilterGroup(filter)) {
+    throw new Error("Invalid filter: filter must have logic and items properties");
+  }
+  if (!Array.isArray(filter.items)) {
+    throw new Error("Invalid filter: items must be an array");
+  }
+  return transformGroup(filter);
+}
+__name(transformFilter, "transformFilter");
+function evaluateCondition(condition, evaluator) {
+  const { path, operator, value } = condition;
+  return evaluator(path, operator, value);
+}
+__name(evaluateCondition, "evaluateCondition");
+function evaluateGroup(group, evaluator) {
+  const { logic, items } = group;
+  if (!items || items.length === 0) {
+    return true;
+  }
+  const results = items.map((item) => {
+    if (isFilterCondition(item)) {
+      return evaluateCondition(item, evaluator);
+    } else if (isFilterGroup(item)) {
+      return evaluateGroup(item, evaluator);
+    } else {
+      throw new Error("Invalid filter item type");
+    }
+  });
+  if (logic === "$and") {
+    return results.every((result) => result === true);
+  } else if (logic === "$or") {
+    return results.some((result) => result === true);
+  } else {
+    throw new Error(`Unsupported logic operator: ${logic}`);
+  }
+}
+__name(evaluateGroup, "evaluateGroup");
+function evaluateConditions(conditions, evaluator) {
+  if (!conditions || typeof conditions !== "object") {
+    throw new Error("Invalid conditions: conditions must be an object");
+  }
+  if (!isFilterGroup(conditions)) {
+    throw new Error("Invalid conditions: conditions must have logic and items properties");
+  }
+  if (!Array.isArray(conditions.items)) {
+    throw new Error("Invalid conditions: items must be an array");
+  }
+  if (typeof evaluator !== "function") {
+    throw new Error("Invalid evaluator: evaluator must be a function");
+  }
+  return evaluateGroup(conditions, evaluator);
+}
+__name(evaluateConditions, "evaluateConditions");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  evaluateConditions,
+  transformFilter
+});

package/lib/variable-usage.d.ts

@@ -0,0 +1,23 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export type JSONValue = string | {
+    [key: string]: JSONValue;
+} | JSONValue[];
+/**
+ * 提取模板中使用到的 ctx 顶层变量名集合。
+ * - 支持点语法与顶层括号变量：ctx.user / ctx["user"]
+ */
+export declare function extractUsedVariableNames(template: JSONValue): Set<string>;
+/**
+ * 提取模板中使用到的 ctx 顶层变量与对应的子路径数组。
+ * - 返回 Map 形如：{ user: ['id', 'roles[0].name'], view: ['record.id'] }
+ * - 兼容：顶层括号变量（ctx["user"])、首段括号键与数字索引（如 ["roles"][0].name -> roles[0].name）
+ * - 方法调用：记录空字符串以触发服务端 attach（例如 ctx.twice(21) => { twice: [''] }）
+ */
+export declare function extractUsedVariablePaths(template: JSONValue): Record<string, string[]>;

package/lib/variable-usage.js

@@ -0,0 +1,138 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var variable_usage_exports = {};
+__export(variable_usage_exports, {
+  extractUsedVariableNames: () => extractUsedVariableNames,
+  extractUsedVariablePaths: () => extractUsedVariablePaths
+});
+module.exports = __toCommonJS(variable_usage_exports);
+function extractUsedVariableNames(template) {
+  const result = /* @__PURE__ */ new Set();
+  const visit = /* @__PURE__ */ __name((src) => {
+    if (typeof src === "string") {
+      const regex = /\{\{\s*([^}]+?)\s*\}\}/g;
+      let m;
+      while ((m = regex.exec(src)) !== null) {
+        const expr = m[1];
+        const pathRegex = /ctx\.([a-zA-Z_$][a-zA-Z0-9_$]*)/g;
+        let pm;
+        while ((pm = pathRegex.exec(expr)) !== null) {
+          result.add(pm[1]);
+        }
+        const bracketVarRegex = /ctx\[\s*(["'])\s*([a-zA-Z_$][a-zA-Z0-9_$]*)\s*\1\s*\]/g;
+        let bm;
+        while ((bm = bracketVarRegex.exec(expr)) !== null) {
+          result.add(bm[2]);
+        }
+      }
+    } else if (Array.isArray(src)) {
+      src.forEach(visit);
+    } else if (src && typeof src === "object") {
+      Object.values(src).forEach(visit);
+    }
+  }, "visit");
+  visit(template);
+  return result;
+}
+__name(extractUsedVariableNames, "extractUsedVariableNames");
+function extractUsedVariablePaths(template) {
+  const usage = {};
+  const visit = /* @__PURE__ */ __name((src) => {
+    if (typeof src === "string") {
+      const regex = /\{\{\s*([^}]+?)\s*\}\}/g;
+      let m;
+      while ((m = regex.exec(src)) !== null) {
+        const expr = m[1];
+        const pathRegex = /ctx\.([a-zA-Z_$][a-zA-Z0-9_$]*)([^\s)]*)/g;
+        let pm;
+        while ((pm = pathRegex.exec(expr)) !== null) {
+          const varName = pm[1];
+          const after = pm[2] || "";
+          usage[varName] = usage[varName] || [];
+          if (after.startsWith(".")) {
+            usage[varName].push(after.slice(1));
+          } else if (after.startsWith("[")) {
+            const mm = after.match(/^\[\s*(["'])\s*([^'"\]]+)\s*\1\s*\](.*)$/);
+            if (mm) {
+              const first = mm[2];
+              const rest = mm[3] || "";
+              usage[varName].push(`${first}${rest}`);
+            } else {
+              const mn = after.match(/^\[(\d+)\](.*)$/);
+              if (mn) {
+                const idx = mn[1];
+                const rest = mn[2] || "";
+                usage[varName].push(`[${idx}]${rest}`);
+              }
+            }
+          } else if (after.startsWith("(")) {
+            if (!usage[varName].length) usage[varName].push("");
+          }
+        }
+        const bracketVarRegex = /ctx\[\s*(["'])\s*([a-zA-Z_$][a-zA-Z0-9_$]*)\s*\1\s*\]([^\s)]*)/g;
+        let bm;
+        while ((bm = bracketVarRegex.exec(expr)) !== null) {
+          const varName = bm[2];
+          const after = bm[3] || "";
+          usage[varName] = usage[varName] || [];
+          if (after.startsWith(".")) {
+            usage[varName].push(after.slice(1));
+          } else if (after.startsWith("[")) {
+            const mm = after.match(/^\[\s*(["'])\s*([^'"\]]+)\s*\1\s*\](.*)$/);
+            if (mm) {
+              const first = mm[2];
+              const rest = mm[3] || "";
+              usage[varName].push(`${first}${rest}`);
+            } else {
+              const mn = after.match(/^\[(\d+)\](.*)$/);
+              if (mn) {
+                const idx = mn[1];
+                const rest = mn[2] || "";
+                usage[varName].push(`[${idx}]${rest}`);
+              }
+            }
+          } else if (after.startsWith("(")) {
+            if (!usage[varName].length) usage[varName].push("");
+          }
+        }
+      }
+    } else if (Array.isArray(src)) {
+      src.forEach(visit);
+    } else if (src && typeof src === "object") {
+      Object.values(src).forEach(visit);
+    }
+  }, "visit");
+  visit(template);
+  return usage;
+}
+__name(extractUsedVariablePaths, "extractUsedVariablePaths");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  extractUsedVariableNames,
+  extractUsedVariablePaths
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.9.0-beta.8",
+  "version": "2.0.0-alpha.10",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -16,5 +16,5 @@
     "multer": "^1.4.5-lts.2",
     "object-path": "^0.11.8"
   },
-  "gitHead": "f3d4f3d1ba7adbf4d4c60e656c23da45565769c8"
+  "gitHead": "6422cfb6fa6c8450de2efa3294fd29a28b228990"
 }