@aiot-toolkit/card-expression - npm Package Compare versions

Comparing version 1.0.5 to 1.0.6

es/JsNodeToCardNode.d.ts

@@ -7,3 +7,4 @@ import { Expression } from '@babel/types';
 declare class JsNodeToCardNode {
-    translate(source: Expression): ICardNode;
+    translate(source: Expression | null): ICardNode;
+    private translateTemplateLiteral;
     private translateUnaryExpression;
@@ -10,0 +11,0 @@ private translateBinaryExpression;

lib/JsNodeToCardNode.d.ts

@@ -7,3 +7,4 @@ import { Expression } from '@babel/types';
 declare class JsNodeToCardNode {
-    translate(source: Expression): ICardNode;
+    translate(source: Expression | null): ICardNode;
+    private translateTemplateLiteral;
     private translateUnaryExpression;
@@ -10,0 +11,0 @@ private translateBinaryExpression;

lib/JsNodeToCardNode.js

 'use strict';
 
 var types = require('@babel/types');
+var JsExpressionParser = require('./JsExpressionParser.js');
+var generator = require('@babel/generator');
 
@@ -10,2 +12,5 @@ /**
     translate(source) {
+        if (source === null) {
+            return '';
+        }
         const { type } = source;
@@ -34,2 +39,4 @@ switch (type) {
                 return this.translateArrayExpression(source);
+            case 'TemplateLiteral':
+                return this.translateTemplateLiteral(source);
             default:
@@ -39,2 +46,25 @@ throw new Error(`Unsupported expression type: ${type}`);
     }
+    translateTemplateLiteral(source) {
+        const { quasis, expressions } = source;
+        let nodeList = [];
+        for (let i = 0; i < quasis.length; i++) {
+            nodeList.push(quasis[i]);
+            if (i < expressions.length) {
+                nodeList.push(expressions[i]);
+            }
+        }
+        nodeList = nodeList.filter((item) => item.type !== 'TemplateElement' || Boolean(item.value.raw));
+        const expression = nodeList
+            .map((item) => {
+            if (item.type === 'TemplateElement') {
+                return `"${item.value.raw}"`;
+            }
+            else {
+                return `(${generator.default(item).code})`;
+            }
+        })
+            .join('+');
+        const jsNode = new JsExpressionParser().parser(expression);
+        return this.translate(jsNode);
+    }
     translateUnaryExpression(source) {
@@ -41,0 +71,0 @@ const { operator, argument } = source;

package.json

 {
   "name": "@aiot-toolkit/card-expression",
   "description": "快应用卡片表达式解析库",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "main": "lib/index.js",
@@ -54,2 +54,3 @@ "module": "es/index.js",
   "dependencies": {
+    "@babel/generator": "^7.25.6",
     "@babel/parser": "^7.25.6",
@@ -56,0 +57,0 @@ "@babel/types": "^7.25.6"

README.md

@@ -70,1 +70,2 @@ # 快应用卡片表达式解析
 | 调用表达式<br/> CallExpression        | `fun(arg1, args2, ...)`                      | `["()", "fun" arg1, arg2, ...]`       | `fun(a, 123)` --> `["()", "fun", ["$", "a"], 123]` |
+| 模板字符串                            | `str-${js}`                                  | 相当于**加法**二元表达式 `"str" + js` |                                                    |

No alert changes

Improved metrics

Total package byte prevSize

40895

increased by6.59%

Lines of code

976

increased by6.78%

Number of lines in readme file

71

increased by1.43%

Worsened metrics

Dependency count

3

increased by50%

Dependency changes

• + Added@babel/generator@^7.25.6

• + Added@babel/generator@7.26.9(transitive)

• + Added@jridgewell/gen-mapping@0.3.8(transitive)

• + Added@jridgewell/resolve-uri@3.1.2(transitive)

• + Added@jridgewell/set-array@1.2.1(transitive)

• + Added@jridgewell/sourcemap-codec@1.5.0(transitive)

• + Added@jridgewell/trace-mapping@0.3.25(transitive)

• + Addedjsesc@3.1.0(transitive)