@lcap/nasl 1.0.0-alpha.13 → 1.0.0-alpha.16

package/out/server/translator.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.translateDiagnosticMessage = exports.outOriginalvalue = exports.transformMethod = exports.transformNamespace = exports.transformType = void 0;
+exports.naslNodeTranslateMessage = exports.translateDiagnosticMessage = exports.outOriginalvalue = void 0;
 const naslServer_1 = __importDefault(require("./naslServer"));
+const concepts_1 = require("../concepts");
 function transformType(tsType) {
     if (tsType === 'string' || tsType === 'String')
         return '字符串';
@@ -30,8 +31,12 @@ function transformType(tsType) {
         return '枚举';
     else if (tsType === 'views')
         return '页面';
+    else if (tsType === 'void')
+        return '无返回值';
     else if (tsType === '__elements')
         return '页面元素';
+    else if (tsType === 'extensions')
+        return '拓展模块';
     else if (tsType === 'Promise<void>')
         return '未知类型';
     else if (tsType.startsWith('{') && tsType.endsWith('}'))
@@ -47,150 +52,226 @@ function transformType(tsType) {
         });
         return tsStr;
     }
+    else if (tsType.includes(' & ')) {
+        const types = tsType.split(' & ');
+        let tsStr = '';
+        types.forEach((item, index) => {
+            tsStr += index === 0 ? transformType(item) : ' | ' + transformType(item);
+        });
+        return tsStr;
+    }
+    else if (tsType.includes(' | ')) {
+        const types = tsType.split(' | ');
+        let tsStr = '';
+        types.forEach((item, index) => {
+            tsStr += index === 0 ? transformType(item) : ' | ' + transformType(item);
+        });
+        return tsStr;
+    }
     else {
         return tsType;
     }
 }
-exports.transformType = transformType;
+const NAMESPACE_CONCEPT_MAP = {
+    entities: '实体',
+    structures: '数据结构',
+    enums: '枚举',
+    logics: '逻辑',
+    interfaces: '接口',
+    views: '页面',
+    elements: '元素',
+    processes: '流程',
+    roles: '角色',
+    extensions: '扩展模块',
+    apis: '接口应用',
+    components: '扩展组件',
+};
 function transformNamespace(tsNamespace) {
-    if (tsNamespace.endsWith('.structures'))
-        return '数据结构';
-    else if (tsNamespace.endsWith('.logics'))
-        return '逻辑';
-    else
-        return tsNamespace;
+    for (const key in NAMESPACE_CONCEPT_MAP) {
+        const value = NAMESPACE_CONCEPT_MAP[key];
+        if (tsNamespace.endsWith(key))
+            return value;
+    }
+    return tsNamespace;
 }
-exports.transformNamespace = transformNamespace;
 function transformMethod(tsMethod) {
     if (tsMethod === 'forEach')
         return 'ForEach';
-    return tsMethod;
+    else
+        return tsMethod;
+}
+function transformIdentifier(identifier) {
+    if (NAMESPACE_CONCEPT_MAP[identifier])
+        return NAMESPACE_CONCEPT_MAP[identifier];
+    else
+        return ` ${transformType(identifier)} 上的`;
 }
-exports.transformMethod = transformMethod;
 function outOriginalvalue(value) {
     return value;
 }
 exports.outOriginalvalue = outOriginalvalue;
+const TS_RULES = [
+    {
+        re: /Type '(.+?)' is not assignable to type '(.+?)'/,
+        result: '左右参数类型不一致！左边类型：$2，右边类型：$1。',
+        transforms: [transformType, transformType],
+    },
+    {
+        re: /Argument of type '(.+?)' is not assignable to parameter of type '(.+?)'/,
+        result: '参数类型不一致！传入类型：$1，接收类型：$2。',
+        transforms: [transformType, transformType],
+    },
+    {
+        re: /Type '(.+?)' does not satisfy the constraint '(.+?)'/,
+        result: '参数类型不一致！传入类型：$1，接收类型：$2。',
+        transforms: [transformType, transformType],
+    },
+    {
+        re: /This condition will always return '(.+?)' since the types '(.+?)' and '(.+?)' have no overlap/,
+        result: '左右参数类型不一致！左边类型：$2，右边类型：$3。',
+        transforms: [transformType, transformType, transformType],
+    },
+    {
+        re: /Type '(.+?)' is missing the following properties from type '(.+?)'/,
+        result: '类型不一致！左边类型：$2，右边类型：$1。',
+        transforms: [transformType, transformType],
+    },
+    {
+        re: /Property '(.+?)' is missing in type '(.+?)' but required in type '(.+?)'/,
+        result: '类型不一致！左边类型：$3，右边类型：$2。',
+        transforms: [outOriginalvalue, transformType, transformType],
+    },
+    {
+        re: /Expression expected/,
+        result: '表达式不能为空。',
+    },
+    {
+        re: /Cannot find name '__(?:IDENTIFIER|LEFT|RIGHT)__'/,
+        result: '表达式不能为空。',
+    },
+    {
+        re: /Cannot find name '__(?:QueryFieldExpression)__'/,
+        result: '数据查询：实体字段不能为空。',
+    },
+    {
+        re: /Cannot find name '__(?:WHERE_MULTIPLE_CONDITION)__'/,
+        result: '数据查询：筛选条件不能有多个表达式。',
+    },
+    {
+        re: /Cannot find name '__(?:HAVING_MULTIPLE_CONDITION)__'/,
+        result: '数据查询：聚合属性过滤不能有多个表达式。',
+    },
+    {
+        re: /Cannot find name '__(?:EMPTY_AGGREGATE_NAME)__'/,
+        result: '数据查询：聚合函数名称不能为空。',
+    },
+    {
+        re: /Cannot find name '__(?:EMPTY_AGGREGATE_ALIAS)__'/,
+        result: '数据查询：聚合函数别名不能为空。',
+    },
+    {
+        re: /No value exists in scope for the shorthand property '__(?:IDENTIFIER|LEFT|RIGHT)__'. Either declare one or provide an initializer./,
+        result: '用户任务未关联页面',
+    },
+    {
+        re: /'(.+?)' is declared but its value is never read/,
+        result: "已添加'$1'，但从来没有使用过。",
+        transforms: [transformType, transformType],
+    },
+    {
+        re: /'(.+?)' has no exported member(?: named)? '(.+?)'/,
+        result: '找不到$1 $2。',
+        transforms: [transformNamespace, transformType],
+    },
+    {
+        re: /Unreachable code detected\./,
+        result: '逻辑中有未使用的。',
+    },
+    {
+        re: /Property '__slice' does not exist on type '(.+?)'/,
+        result: 'For Each：循环列表：参数类型不匹配！所需类型：数组、集合等，提供类型：$1',
+        transforms: [transformType],
+    },
+    {
+        re: /Property '(.+?)' does not exist on type 'typeof (.+?)'/,
+        result: '找不到$2 $1。',
+        transforms: [transformMethod, transformIdentifier],
+    },
+    {
+        re: /Property '(.+?)' does not exist on type '(.+?)'/,
+        result: '找不到$2 $1。',
+        transforms: [transformMethod, transformIdentifier],
+    },
+    {
+        re: /Cannot find name '(.+?)'. Did you mean '(.+?)'\?/,
+        result: '找不到 $1。',
+        transforms: [outOriginalvalue, outOriginalvalue],
+    },
+    {
+        re: /Expected (.+?) type arguments, but got (.+?)/,
+        result: '预期 $1 个类型参数，但传入了 $2 个。',
+        transforms: [outOriginalvalue, outOriginalvalue],
+    },
+    {
+        re: /Expected (.+?) arguments, but got (.+?)./,
+        result: '预期 $1 个参数，但传入了 $2 个。',
+        transforms: [outOriginalvalue, outOriginalvalue],
+    },
+    {
+        re: /The (.+?)-hand side of an arithmetic operation must be of type (.+?). type./,
+        result: '表达式错误！',
+        transforms: [outOriginalvalue, outOriginalvalue],
+    },
+    {
+        re: /Operator '(.+?)' cannot be applied to types '(.+?)' and '(.+?)'./,
+        result: '符号：$1 参数类型不匹配！所需类型：基础类型>$2，提供类型：$3。',
+        transforms: [outOriginalvalue, transformType, transformType],
+    },
+    {
+        re: /Object is possibly 'undefined'./,
+        result: '所选择的内容未定义。',
+    },
+    {
+        re: /Cannot find name '(.+?)'./,
+        result: '所选择的内容 $1 未定义。',
+        transforms: [outOriginalvalue],
+    },
+    {
+        re: /Duplicate identifier '(.+?)'./,
+        result: '当前内容中有重复的 $1，可能会影响使用。',
+        transforms: [outOriginalvalue],
+    },
+];
+const POST_RULES = [
+    {
+        re: /__IDENTIFIER__/g,
+        result: 'undefined',
+    },
+    {
+        re: /Integer|"Integer"/g,
+        result: '整数',
+    },
+    {
+        re: /Long|"Long"/g,
+        result: '长整数',
+    },
+    {
+        re: /Double|"Double"/g,
+        result: '小数',
+    },
+    {
+        re: /never/g,
+        result: '不接受任何类型',
+    },
+];
+Object.keys(NAMESPACE_CONCEPT_MAP).forEach((key) => {
+    POST_RULES.push({
+        re: new RegExp(key, 'g'),
+        result: NAMESPACE_CONCEPT_MAP[key],
+    });
+});
 function translateDiagnosticMessage(message) {
-    const translateRules = [
-        {
-            re: /^Type '(.+?)' is not assignable to type '(.+?)'\./,
-            result: '左右参数类型不一致！左边类型：$2，右边类型：$1。',
-            transforms: [transformType, transformType],
-        },
-        {
-            re: /^Argument of type '(.+?)' is not assignable to parameter of type '(.+?)'\./,
-            result: '参数类型不一致！传入类型：$1，接收类型：$2。',
-            transforms: [transformType, transformType],
-        },
-        {
-            re: /^This condition will always return 'false' since the types '(.+?)' and '(.+?)' have no overlap\.$/,
-            result: '类型不一致！左边类型：$1，右边类型：$2。',
-            transforms: [transformType, transformType],
-        },
-        {
-            re: /^Type '(.+?)' is missing the following properties from type '(.+?)'/,
-            result: '类型不一致！左边类型：$2，右边类型：$1。',
-            transforms: [transformType, transformType],
-        },
-        {
-            re: /^Property '(.+?)' is missing in type '(.+?)' but required in type '(.+?)'./,
-            result: '类型不一致！左边类型：$3，右边类型：$2。',
-            transforms: [outOriginalvalue, transformType, transformType],
-        },
-        {
-            re: /^Expression expected\.$/,
-            result: '表达式不能为空。',
-        },
-        {
-            re: /^Cannot find name '__(?:IDENTIFIER|LEFT|RIGHT)__'\.$/,
-            result: '表达式不能为空。',
-        },
-        {
-            re: /^Cannot find name '__(?:QueryFieldExpression)__'\.$/,
-            result: '实体字段不能为空。',
-        },
-        {
-            re: /^Cannot find name '__(?:WHERE_MULTIPLE_CONDITION)__'\.$/,
-            result: '筛选条件不能有多个表达式。',
-        },
-        {
-            re: /^Cannot find name '__(?:HAVING_MULTIPLE_CONDITION)__'\.$/,
-            result: '聚合属性过滤不能有多个表达式。',
-        },
-        {
-            re: /^Cannot find name '__(?:EMPTY_AGGREGATE_NAME)__'\.$/,
-            result: '聚合函数名称不能为空。',
-        },
-        {
-            re: /^Cannot find name '__(?:EMPTY_AGGREGATE_ALIAS)__'\.$/,
-            result: '聚合函数别名不能为空。',
-        },
-        {
-            re: /^'(.+?)' is declared but its value is never read\.$/,
-            result: "已添加'$1'，但从来没有使用过。",
-            transforms: [transformType, transformType],
-        },
-        {
-            re: /'(.+?)' has no exported member(?: named)? '(.+?)'/,
-            result: "找不到数据结构 '$2'。",
-            transforms: [transformType, transformNamespace],
-        },
-        {
-            re: /^Unreachable code detected\.$/,
-            result: '逻辑中有未使用的。',
-        },
-        {
-            re: /Property '__slice' does not exist on type '(.+?)'./,
-            result: 'For Each：循环列表：参数类型不匹配！所需类型：基础类型>字符串、数组、集合等，提供类型：$1',
-            transforms: [transformType],
-        },
-        {
-            re: /Property '(.+?)' does not exist on type 'typeof logics'./,
-            result: '逻辑上找不到 $1 未找到。',
-            transforms: [outOriginalvalue],
-        },
-        {
-            re: /Property '(.+?)' does not exist on type 'typeof (.+?)'./,
-            result: '$2 上找不到 $1。',
-            transforms: [transformMethod, transformType],
-        },
-        {
-            re: /Property '(.+?)' does not exist on type '(.+?)'./,
-            result: '$2 上找不到 $1。',
-            transforms: [transformMethod, transformType],
-        },
-        {
-            re: /Cannot find name '(.+?)'. Did you mean '(.+?)'\?/,
-            result: '找不到 $1，您是想要 $2 吗？',
-            transforms: [outOriginalvalue, outOriginalvalue],
-        },
-        {
-            re: /Expected (.+?) arguments, but got (.+?)./,
-            result: '预期 $1 个参数，但传入了 $2 个。',
-            transforms: [outOriginalvalue, outOriginalvalue],
-        },
-        {
-            re: /The (.+?)-hand side of an arithmetic operation must be of type (.+?). type./,
-            result: '表达式错误！',
-            transforms: [outOriginalvalue, outOriginalvalue],
-        },
-        {
-            re: /Operator '(.+?)' cannot be applied to types '(.+?)' and '(.+?)'./,
-            result: '符号 $1 左右类型不匹配！左侧 $2，右侧 $3。',
-            transforms: [outOriginalvalue, transformType, transformType],
-        },
-        {
-            re: /Object is possibly 'undefined'./,
-            result: '所选择的内容未定义。',
-        },
-        {
-            re: /Cannot find name '(.+?)'./,
-            result: '所选择的内容 $1 未定义。',
-            transforms: [outOriginalvalue],
-        },
-    ];
-    for (const rule of translateRules) {
+    for (const rule of TS_RULES) {
         const cap = rule.re.exec(message);
         if (cap) {
             return rule.result.replace(/\$(\d+)/g, (m, index) => rule.transforms[index - 1](cap[index]));
@@ -199,4 +280,129 @@ function translateDiagnosticMessage(message) {
     return message;
 }
 exports.translateDiagnosticMessage = translateDiagnosticMessage;
+/**
+ * 节点和ts 报错结合，转成更精准的ts报错
+ * @param minRange
+ * @param tsErrorDetail 报错具体信息
+ * @returns
+ */
+function naslNodeTranslateMessage(minRange, tsErrorDetail) {
+    const text = tsErrorDetail.originalDiagnostic.text;
+    let node = minRange.node;
+    // 有一些节点报错信息不向外暴露,缺失一些原生标签等等的展示
+    if (node instanceof concepts_1.View || node instanceof concepts_1.ViewElement) {
+        if (text.startsWith(`'nasl.ui' has no exported member named `)) {
+            return null;
+        }
+        else if (text.startsWith(`Property '`) && text.includes(`does not exist on type 'typeof ui'.`)) {
+            return null;
+        }
+        else if (text.startsWith(`Namespace 'nasl.ui' has no exported member `)) {
+            return null;
+        }
+    }
+    // 处理bindevent参数没传递的报错
+    if (/Expected (.+?) arguments, but got (.+?)./.exec(text)) {
+        // bindevent本身现在就不传参数
+        if (node instanceof concepts_1.BindEvent) {
+            return null;
+        }
+    }
+    // 因为缺少参数时候有可能有特殊情况,因为原本少的多了就会找到 callLogic上,
+    // 但是只少一个的时候就会找到准确的Argument上 需要特殊处理, ui层就可以统一处理
+    if (/Expected (.+?) arguments, but got (.+?)./.exec(text) && node.getAncestor('CallLogic')) {
+        node = node.getAncestor('CallLogic');
+    }
+    if (node instanceof concepts_1.Argument) {
+        // if (/Type '(.+?)' is not assignable to type '(.+?)'./.exec(text)) {
+        // }
+        // Argument在callInterface上的报错放到内部
+        if (node.expression) {
+            node = node.expression;
+        }
+    }
+    // 处理一些复制过来的内容 Identifier或者MemberExpression内容缺失，错误要像上冒
+    if (node instanceof concepts_1.Identifier || node instanceof concepts_1.MemberExpression) {
+        if (node.parentNode instanceof concepts_1.MemberExpression) {
+            let parentNode = node;
+            while (parentNode && parentNode.parentNode instanceof concepts_1.MemberExpression) {
+                parentNode = parentNode.parentNode;
+            }
+            node = parentNode || node;
+            let str = tsErrorDetail.message;
+            str = node.constructor.nodeTitle + '：' + str;
+            tsErrorDetail.message = str;
+        }
+    }
+    // 类型报错的，需要放到上一级
+    if (/'(.+?)' has no exported member(?: named)? '(.+?)'/.exec(text) || /Property '(.+?)' does not exist on type '(.+?)'./.exec(text)) {
+        if (node instanceof concepts_1.TypeAnnotation) {
+            // 变量type的报错放到内部
+            node = node.parentNode;
+            let str = tsErrorDetail.message;
+            str = node.constructor.nodeTitle + '：' + str;
+            tsErrorDetail.message = str;
+        }
+    }
+    /**
+     * 所有问题的报错处理具体信息
+     */
+    if (/^Cannot find name '__(?:IDENTIFIER|LEFT|RIGHT)__'\.$/.exec(text)) {
+        if (node instanceof concepts_1.IfStatement || node instanceof concepts_1.SwitchCase || node instanceof concepts_1.WhileStatement) {
+            tsErrorDetail.message = node.constructor.nodeTitle + '：参数不能为空！所需类型：基础类型>布尔值';
+        }
+        else if (node instanceof concepts_1.ForEachStatement) {
+            tsErrorDetail.message = 'For Each：结束值：不能为空！所需类型：基础类型>整数';
+        }
+        else if (node instanceof concepts_1.UnaryExpression) {
+            tsErrorDetail.message = '!：参数不能为空！';
+        }
+        else if (node instanceof concepts_1.Assignment) {
+            tsErrorDetail.message = '赋值：参数不能为空！';
+        }
+        else if ((node instanceof concepts_1.Argument && node.parentNode instanceof concepts_1.CallInterface) || node instanceof concepts_1.CallInterface) {
+            tsErrorDetail.message = '调用接口：逻辑不能为空！';
+        }
+        else if ((node instanceof concepts_1.Argument && node.parentNode instanceof concepts_1.CallFunction) || node instanceof concepts_1.CallFunction) {
+            tsErrorDetail.message = '调用函数：逻辑不能为空！';
+        }
+        else if ((node instanceof concepts_1.Argument && node.parentNode instanceof concepts_1.CallLogic) || node instanceof concepts_1.CallLogic) {
+            tsErrorDetail.message = '调用逻辑：逻辑不能为空！';
+        }
+        else if (node instanceof concepts_1.Identifier) {
+            // 根据父级内容推断当前缺少啥
+            const identifierToString = (node) => {
+                let str = tsErrorDetail.message;
+                if (node.parentNode instanceof concepts_1.Assignment) {
+                    str = '赋值：参数不能为空！';
+                }
+                else if (node.parentNode instanceof concepts_1.Argument && node.parentNode.parentNode instanceof concepts_1.CallLogic) {
+                    str = '调用逻辑：逻辑不能为空！';
+                }
+                else {
+                    str = node.parentNode.constructor.nodeTitle + '：' + str;
+                    tsErrorDetail.message = str;
+                }
+                return str;
+            };
+            tsErrorDetail.message = identifierToString(node);
+        }
+    }
+    // 左右类型不一致的，把上级信息带上
+    if (/^Type '(.+?)' is not assignable to type '(.+?)'\./.exec(text) || /^This condition will always return '(.+?)' since the types '(.+?)' and '(.+?)' have no overlap./.exec(text)) {
+        let str = tsErrorDetail.message;
+        str = node.parentNode.constructor.nodeTitle + '：' + str;
+        tsErrorDetail.message = str;
+    }
+    for (const rule of POST_RULES) {
+        if (rule.re.test(tsErrorDetail.message))
+            tsErrorDetail.message = tsErrorDetail.message.replace(rule.re, rule.result);
+    }
+    node.tsErrorDetail = tsErrorDetail;
+    return {
+        node,
+        ...tsErrorDetail,
+    };
+}
+exports.naslNodeTranslateMessage = naslNodeTranslateMessage;
 //# sourceMappingURL=translator.js.map

package/out/server/translator.js.map

@@ -1 +1 @@
-{"version":3,"file":"translator.js","sourceRoot":"","sources":["../../src/server/translator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"translator.js","sourceRoot":"","sources":["../../src/server/translator.ts"],"names":[],"mappings":"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"}

package/out/service/storage/init.js

@@ -93,12 +93,13 @@ function getStatement(state, app, diffLogicList) {
         default:
             break;
     }
-    return logicItems;
+    return logicItems.filter((item) => !!item);
 }
 /**
  *  执行更新
  */
 async function doAction(app, actionItem) {
+    app.emit('saving');
     let hasFrontEnd = false;
     let hasBackEnd = false;
     const actionList = [];
@@ -107,11 +108,10 @@ async function doAction(app, actionItem) {
         list.forEach((event) => {
             const emitTarget = event?.originEvent?.target;
             const _path = event.originEvent.path;
-            const _root = _path.split('.')[1];
-            if (['entities', 'processes', 'logics'].some((item) => _root.startsWith(item))) {
+            const _root = _path.split('.')?.[1] || '';
+            if (['entities', 'processes', 'logics', 'enums', 'structures', 'interfaces'].some((item) => _root.startsWith(item))) {
                 hasBackEnd = true;
             }
-            // console.log(emitTarget, action, actionItem);
             const itemloop = (_i, app, diffArr) => {
                 const _l = getStatement(_i, app, diffArr);
                 if (_l.length) {
@@ -203,16 +203,23 @@ async function doAction(app, actionItem) {
     else if (hasBackEnd) {
         ChangedNASLType = 'backend';
     }
+    let err;
     if (config_1.config.storage.protocol === 'http') {
-        service_1.default.batchAction({
-            body: actionList,
-            headers: {
-                appId: app.id,
-                ChangedNASLType,
-                'request-appBaseVersion': window.appData?.baseVersion || '',
-                'request-versionChangedTime': window.appData?.versionChangedTime || '',
-            },
-        });
+        try {
+            await service_1.default.batchAction({
+                body: actionList,
+                headers: {
+                    appId: app.id,
+                    ChangedNASLType,
+                    'request-appBaseVersion': window.appData?.baseVersion || '',
+                    'request-versionChangedTime': window.appData?.versionChangedTime || '',
+                },
+            });
+        }
+        catch (error) {
+            err = error;
+            app.emit('refresh');
+        }
     }
     else if (config_1.config.storage.protocol === 'mock') {
         // Do nothing
@@ -224,6 +231,7 @@ async function doAction(app, actionItem) {
             spaces: 4,
         });
     }
+    app.emit('saved', err);
     if (!app._historying) {
         if (app._historyIndex !== app._historyList.length) {
             app._historyList = app._historyList.splice(0, app._historyIndex);
@@ -261,9 +269,11 @@ function handleApp(app) {
      * 开启收集
      */
     app.on('collect:start', (event) => {
+        if (!app._isCollectingCount) {
+            app._actionMsg = event?.actionMsg;
+            app._action = event?.action;
+        }
         app._isCollectingCount++;
-        app._actionMsg = event?.actionMsg;
-        app._action = event?.action;
     });
     /**
      * 结束收集
@@ -285,6 +295,10 @@ function handleApp(app) {
             app._actionMsg = '';
             app._action = '';
         }
+        else if (app._isCollectingCount < 0) {
+            app._isCollectingCount = 0;
+            throw Error('关闭收集有问题，请排查');
+        }
     });
     /**
      * 有变更