@cloudpss/template 0.6.23 → 0.6.25

package/dist/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAGpE,YAAY;AACZ,MAAM,MAAM,QAAQ,GACd,MAAM,GACN;IACI,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,QAAQ,CAAC;CACnB,CAAC;AAER,cAAc;AACd,MAAM,MAAM,YAAY,GAAG,eAAe,GAAG,SAAS,CAAC;AA2BvD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,CASxD"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAIpE,YAAY;AACZ,MAAM,MAAM,QAAQ,GACd,MAAM,GACN;IACI,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,QAAQ,CAAC;CACnB,CAAC;AAER,cAAc;AACd,MAAM,MAAM,YAAY,GAAG,eAAe,GAAG,SAAS,CAAC;AAsCvD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,CASxD"}

package/dist/parser.js

@@ -1,11 +1,24 @@
 import { compileSync } from '@mirascript/mirascript';
+import { wrapScript } from '@mirascript/mirascript/subtle';
 import { LRUCache } from 'lru-cache';
 const CACHE_SIZE = 100;
 const formula = new LRUCache({
     max: CACHE_SIZE,
     memoMethod: (template) => {
         const formula = template.slice(1);
-        const value = compileSync(formula, { input_mode: 'Script' });
+        let value;
+        try {
+            value = compileSync(formula, { input_mode: 'Script' });
+        }
+        catch (error) {
+            // 兼容简单的公式形式，例如 `=foo`，直接访问全局变量 `foo`
+            // 支持错误的标识符，例如 `=foo-bar`，直接访问全局变量 `foo-bar`
+            const match = /^[-_/.\p{XID_Continue}]+$/u.test(formula);
+            if (!match) {
+                throw error;
+            }
+            value = wrapScript(formula, 'Script', (global) => global?.get(formula) ?? null);
+        }
         return {
             type: 'formula',
             value: value,

package/dist/parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAiB,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAarC,MAAM,UAAU,GAAG,GAAG,CAAC;AAEvB,MAAM,OAAO,GAAG,IAAI,QAAQ,CAAyC;IACjE,GAAG,EAAE,UAAU;IACf,UAAU,EAAE,CAAC,QAAgB,EAAE,EAAE;QAC7B,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC7D,OAAO;YACH,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,KAAK;SACf,CAAC;IACN,CAAC;CACJ,CAAC,CAAC;AACH,MAAM,aAAa,GAAG,IAAI,QAAQ,CAA+C;IAC7E,GAAG,EAAE,UAAU;IACf,UAAU,EAAE,CAAC,QAAgB,EAAE,EAAE;QAC7B,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;QAC5D,OAAO;YACH,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,KAAK;SACf,CAAC;IACN,CAAC;CACJ,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAAC,QAAgB;IAC1C,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,QAAQ,CAAC;IAC1C,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IACD,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC"}
+{"version":3,"file":"parser.js","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAiB,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAarC,MAAM,UAAU,GAAG,GAAG,CAAC;AAEvB,MAAM,OAAO,GAAG,IAAI,QAAQ,CAAyC;IACjE,GAAG,EAAE,UAAU;IACf,UAAU,EAAE,CAAC,QAAgB,EAAE,EAAE;QAC7B,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,KAAK,CAAC;QACV,IAAI,CAAC;YACD,KAAK,GAAG,WAAW,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,qCAAqC;YACrC,4CAA4C;YAC5C,MAAM,KAAK,GAAG,4BAA4B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzD,IAAI,CAAC,KAAK,EAAE,CAAC;gBACT,MAAM,KAAK,CAAC;YAChB,CAAC;YACD,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC;QACpF,CAAC;QACD,OAAO;YACH,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,KAAK;SACf,CAAC;IACN,CAAC;CACJ,CAAC,CAAC;AACH,MAAM,aAAa,GAAG,IAAI,QAAQ,CAA+C;IAC7E,GAAG,EAAE,UAAU;IACf,UAAU,EAAE,CAAC,QAAgB,EAAE,EAAE;QAC7B,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;QAC5D,OAAO;YACH,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,KAAK;SACf,CAAC;IACN,CAAC;CACJ,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAAC,QAAgB;IAC1C,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,QAAQ,CAAC;IAC1C,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IACD,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudpss/template",
-  "version": "0.6.23",
+  "version": "0.6.25",
   "author": "CloudPSS",
   "license": "MIT",
   "keywords": [
@@ -14,7 +14,7 @@
   "types": "dist/index.d.ts",
   "exports": "./dist/index.js",
   "dependencies": {
-    "@mirascript/mirascript": "^0.1.56",
+    "@mirascript/mirascript": "^0.1.57",
     "lru-cache": "^11.2.7"
   },
   "scripts": {

package/src/parser.ts

@@ -1,4 +1,5 @@
 import { compileSync, type VmScript } from '@mirascript/mirascript';
+import { wrapScript } from '@mirascript/mirascript/subtle';
 import { LRUCache } from 'lru-cache';
 
 /** 字符串模板 */
@@ -18,7 +19,18 @@ const formula = new LRUCache<string, Template & { type: 'formula' }>({
     max: CACHE_SIZE,
     memoMethod: (template: string) => {
         const formula = template.slice(1);
-        const value = compileSync(formula, { input_mode: 'Script' });
+        let value;
+        try {
+            value = compileSync(formula, { input_mode: 'Script' });
+        } catch (error) {
+            // 兼容简单的公式形式，例如 `=foo`，直接访问全局变量 `foo`
+            // 支持错误的标识符，例如 `=foo-bar`，直接访问全局变量 `foo-bar`
+            const match = /^[-_/.\p{XID_Continue}]+$/u.test(formula);
+            if (!match) {
+                throw error;
+            }
+            value = wrapScript(formula, 'Script', (global) => global?.get(formula) ?? null);
+        }
         return {
             type: 'formula',
             value: value,