@cloudpss/expression 0.6.21 → 0.6.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +3 -1
- package/dist/main.js.map +1 -1
- package/package.json +3 -3
- package/src/main.ts +2 -1
package/dist/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,KAAK,QAAQ,EAAE,KAAK,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAE9G,OAAO,EAAkB,KAAK,MAAM,EAAE,KAAK,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE3E,OAAO,EAAW,KAAK,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EACH,kBAAkB,EAClB,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EAGxB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAKH,KAAK,WAAW,EAChB,KAAK,aAAa,EAGlB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,SAAS,EACd,KAAK,cAAc,EACnB,KAAK,YAAY,EACpB,MAAM,kBAAkB,CAAC;AAG1B,WAAW;AACX,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,mBAAmB,IAAI;KACzD,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,SAAS;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC,CAAA;KAAE,GAAG,CAAC,CAAC,SAAS,SAAS,OAAO,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,KAAK;CAC/G,CAAC,CAAC,CAAC,CAAC;AAEL;;GAEG;AACH,qBAAa,SAAS;gBACN,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI;IAI7C,aAAa;IACb,IAAI,MAAM,IAAI,MAAM,CAEnB;IACD,SAAS;IACT,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAE7C,aAAa;IACb,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAwC;IAE9D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IACzD,WAAW;IACX,IAAI,QAAQ,IAAI,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAE3C;IACD;;;;OAIG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAU7C,YAAY;IACZ,OAAO,CAAC,CAAC,SAAS,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,MAAM,UAAO,GAAG,kBAAkB,CAAC,CAAC,CAAC;IAwBtG,uBAAuB;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,MAAM;
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/dist/main.js
CHANGED
|
@@ -71,8 +71,10 @@ export class Evaluator {
|
|
|
71
71
|
}
|
|
72
72
|
/** 执行 MiraScript 模板 */
|
|
73
73
|
template(template, scope) {
|
|
74
|
-
if (template
|
|
74
|
+
if (!template)
|
|
75
75
|
return '';
|
|
76
|
+
if (!template.includes('$'))
|
|
77
|
+
return template;
|
|
76
78
|
const throws = scope?.throws ?? true;
|
|
77
79
|
const value = parse(this, template, throws, true);
|
|
78
80
|
const result = evaluate(this, value, scope ?? this.scope) ?? template;
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAA+B,MAAM,wBAAwB,CAAC;AAC9G,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAA6B,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,OAAO,EAA6B,MAAM,cAAc,CAAC;AAClE,OAAO,EACH,kBAAkB,EAKlB,aAAa,EACb,YAAY,GACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EACH,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EACf,aAAa,GAUhB,MAAM,kBAAkB,CAAC;AAC1B,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;AAO1B;;GAEG;AACH,MAAM,OAAO,SAAS;IAClB,YAAY,OAAiC;QAW7C,aAAa;QACI,UAAK,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;QAE7C,eAAU,GAAG,IAAI,GAAG,EAAmB,CAAC;QAbrD,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,cAAc,CAAC;IAC7C,CAAC;IAED,aAAa;IACb,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC;IAC1C,CAAC;IAQD,WAAW;IACX,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IACD;;;;OAIG;IACH,MAAM,CAAC,MAA+B;QAClC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAChD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACtB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChC,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;YACzD,CAAC;QACL,CAAC;IACL,CAAC;IAED,YAAY;IACZ,OAAO,CAAoB,UAAoC,EAAE,MAAM,GAAG,IAAI;QAC1E,IAAI,KAAK,EAAE,GAAG,CAAC;QACf,IAAI,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YACzB,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;YAC/C,GAAG,GAAG,EAAW,CAAC;QACtB,CAAC;aAAM,CAAC;YACJ,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;YACtD,GAAG,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5C,IAAI,QAA+B,CAAC;QACpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,QAAQ,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAI,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1E,CAAC;aAAM,CAAC;YACJ,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACpC,QAAQ,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;gBAC5B,MAAM,GAAG,GAAG,QAAQ,CAAI,SAAS,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;gBACjD,IAAI,GAAG,IAAI,IAAI;oBAAE,OAAO,IAAI,CAAC;gBAC7B,OAAO,EAAE,CAAC,GAAG,CAAM,CAAC;YACxB,CAAC,CAAC;QACN,CAAC;QACD,OAAO,kBAAkB,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACjE,CAAC;IAED,uBAAuB;IACvB,QAAQ,CAAC,QAAmC,EAAE,KAAwB;QAClE,IAAI,QAAQ,IAAI,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudpss/expression",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.22",
|
|
4
4
|
"author": "CloudPSS",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -12,9 +12,9 @@
|
|
|
12
12
|
"./*": "./dist/*.js"
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@mirascript/mirascript": "^0.1.
|
|
15
|
+
"@mirascript/mirascript": "^0.1.55",
|
|
16
16
|
"klona": "^2.0.6",
|
|
17
|
-
"lru-cache": "^11.2.
|
|
17
|
+
"lru-cache": "^11.2.7",
|
|
18
18
|
"mathjs": "^15.1.1",
|
|
19
19
|
"type-fest": "^5.4.4"
|
|
20
20
|
},
|
package/src/main.ts
CHANGED
|
@@ -102,7 +102,8 @@ export class Evaluator {
|
|
|
102
102
|
|
|
103
103
|
/** 执行 MiraScript 模板 */
|
|
104
104
|
template(template: string | null | undefined, scope: Scope | undefined): string {
|
|
105
|
-
if (template
|
|
105
|
+
if (!template) return '';
|
|
106
|
+
if (!template.includes('$')) return template;
|
|
106
107
|
const throws = scope?.throws ?? true;
|
|
107
108
|
const value = parse(this, template, throws, true);
|
|
108
109
|
const result = evaluate<string>(this, value, scope ?? this.scope) ?? template;
|