@lcap/nasl 2.18.0-beta.7 → 2.19.0-beta.1

package/src/concepts/dist/CallFunction__.js

@@ -232,12 +232,20 @@ var CallFunction = /** @class */ (function (_super) {
         else {
             var code_1 = "$utils['" + this.calleeName + "']";
             code_1 += '(';
-            (_a = this.arguments) === null || _a === void 0 ? void 0 : _a.forEach(function (arg, index) {
-                var _a;
-                code_1 += arg === null || arg === void 0 ? void 0 : arg.toVue(options);
-                if (index !== ((_a = _this.arguments) === null || _a === void 0 ? void 0 : _a.length) - 1)
-                    code_1 += ', ';
-            });
+            if (Array.isArray(this.arguments) && this.arguments.length) {
+                var needToString_1 = ['Concat'].includes(this.calleeName);
+                (_a = this.arguments) === null || _a === void 0 ? void 0 : _a.forEach(function (arg, index) {
+                    var _a;
+                    var argStr = arg === null || arg === void 0 ? void 0 : arg.toVue(options);
+                    if (needToString_1) {
+                        var argTypeAnnotation = arg.typeAnnotation || arg.__TypeAnnotation;
+                        argStr = "$utils['ToString'](" + argStr + ", '" + (argTypeAnnotation === null || argTypeAnnotation === void 0 ? void 0 : argTypeAnnotation.sortedTypeKey) + "')";
+                    }
+                    code_1 += argStr;
+                    if (index !== ((_a = _this.arguments) === null || _a === void 0 ? void 0 : _a.length) - 1)
+                        code_1 += ', ';
+                });
+            }
             if (this.typeArguments && this.typeArguments.length) {
                 if ((_b = this.arguments) === null || _b === void 0 ? void 0 : _b.length)
                     code_1 += ', ';
@@ -282,9 +290,15 @@ var CallFunction = /** @class */ (function (_super) {
         var code = "this.$utils['" + this.calleeName + "']";
         code += '(';
         if (Array.isArray(this.arguments) && this.arguments.length) {
+            var needToString_2 = ['Concat'].includes(this.calleeName);
             this.arguments.forEach(function (arg, index) {
                 var _a;
-                code += arg === null || arg === void 0 ? void 0 : arg.toJS(translator_1.shiftState(state, code));
+                var argStr = arg === null || arg === void 0 ? void 0 : arg.toJS(translator_1.shiftState(state, code));
+                if (needToString_2) {
+                    var argTypeAnnotation_1 = arg.typeAnnotation || arg.__TypeAnnotation;
+                    argStr = "this.$utils['ToString'](" + argStr + ", '" + (argTypeAnnotation_1 === null || argTypeAnnotation_1 === void 0 ? void 0 : argTypeAnnotation_1.sortedTypeKey) + "')";
+                }
+                code += argStr;
                 if (index !== ((_a = _this.arguments) === null || _a === void 0 ? void 0 : _a.length) - 1)
                     code += ', ';
             });

package/src/concepts/dist/CallLogic__.js

@@ -35,7 +35,10 @@ var translator_1 = require("../translator");
 var View__1 = require("./View__");
 var utils_1 = require("../automate/engine/utils");
 var utils_2 = require("../utils");
+var JSON5 = require("json5");
+var Identifier__1 = require("./Identifier__");
 var decorators_1 = require("../decorators");
+var BaseNode_1 = require("../common/BaseNode");
 var classMap_1 = require("../common/classMap");
 var TypeAnnotation__1 = require("./TypeAnnotation__");
 var Argument__1 = require("./Argument__");
@@ -298,9 +301,13 @@ var CallLogic = /** @class */ (function (_super) {
         this.calleeName = logic.name;
         this.arguments = [];
         logic.params.forEach(function (param) {
-            _this._addArgument({
+            var argument = _this._addArgument({
                 keyword: param.name
             });
+            if (param.defaultExpression) {
+                var exp = BaseNode_1["default"].from(__assign({}, param.defaultExpression.toJSON()));
+                argument.setExpression(exp);
+            }
         });
         if (logic.typeParams) {
             this.typeArguments = [];
@@ -320,7 +327,7 @@ var CallLogic = /** @class */ (function (_super) {
             var relationOptions = { parentNode: _this, parentKey: 'arguments' };
             var argument = Argument__1["default"].from({
                 keyword: param.name,
-                expression: param.defaultExpression
+                expression: param.isFunction ? new Identifier__1["default"]() : param.defaultExpression
             }, _this);
             Object.assign(argument, relationOptions);
             return argument;
@@ -482,7 +489,6 @@ var CallLogic = /** @class */ (function (_super) {
         var completeArguments = this.completeArguments;
         // 全局逻辑
         if (!isViewLogic) {
-            var namespaceArr = calleeNamespace === null || calleeNamespace === void 0 ? void 0 : calleeNamespace.split('.');
             var logic = utils_1.getNodeByNodeCallee(this.app, this.calleewholeKey, function (key, tempPoint) {
                 // 处理 NASL 中未定义的假的节点
                 if (key === tempPoint.name) {
@@ -538,12 +544,31 @@ var CallLogic = /** @class */ (function (_super) {
                         code += "},\n";
                         break;
                     }
+                    case 'update':
+                    case 'createOrUpdate':
+                    case 'batchUpdate': {
+                        code += "body: {\n";
+                        var argsStr = logicArgs
+                            .filter(function (arg) { return arg.expression; })
+                            .map(function (arg) {
+                            var name = arg.keyword === 'body' ?
+                                (_this.calleeName === 'batchUpdate' ? 'entities' : 'entity') :
+                                arg.keyword;
+                            return name + ": " + arg.expression.toJS(translator_1.shiftState(state, code));
+                        })
+                            .join(',\n');
+                        code += argsStr;
+                        code += "},\n";
+                        logicArgs = [];
+                        breakBody = true;
+                        break;
+                    }
                     case 'updateBy': {
                         code += "body: {";
                         var argsStr = logicArgs
                             .filter(function (arg) { return arg.expression; })
                             .map(function (arg) {
-                            var name = arg.expression.returnExpression ? arg.expression.name : 'entity';
+                            var name = arg.keyword === 'body' ? 'entity' : arg.keyword;
                             // filter回调函数
                             if (arg.expression.returnExpression) {
                                 var argsStr_1 = JSON.stringify(handleMember(arg.expression.returnExpression));
@@ -594,6 +619,9 @@ var CallLogic = /** @class */ (function (_super) {
                         .map(function (obj) { var _a; return "\n" + (obj === null || obj === void 0 ? void 0 : obj.keyword) + ": " + ((_a = obj === null || obj === void 0 ? void 0 : obj.arg) === null || _a === void 0 ? void 0 : _a.toJS(translator_1.shiftState(state, code))); })
                         .join(', ');
                     code += argsStr;
+                    if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+                        code += ",\n__typeArguments: " + JSON5.stringify(this.typeArguments);
+                    }
                 }
                 code += '\n}';
             }
@@ -609,7 +637,7 @@ var CallLogic = /** @class */ (function (_super) {
                         code += "this.$toast.show";
                         break;
                     case 'consoleLog':
-                        code += "this.$utils.ConsoleLog";
+                        code += "console.log";
                         break;
                     case 'jsonSerialize':
                         code += "JSON.stringify";
@@ -637,13 +665,17 @@ var CallLogic = /** @class */ (function (_super) {
             }
             else {
                 code += '(';
+                var needToString = ['showMessage', 'consoleLog'].includes(this.calleeName);
+                if (needToString) {
+                    code += "this.$utils['ToString'](";
+                }
                 if (Array.isArray(completeArguments) && completeArguments.length) {
                     completeArguments.forEach(function (arg, index) {
                         code += arg === null || arg === void 0 ? void 0 : arg.toJS(translator_1.shiftState(state, code));
                         if (index !== (completeArguments === null || completeArguments === void 0 ? void 0 : completeArguments.length) - 1)
                             code += ', ';
                     });
-                    if (calleeNamespace === 'nasl.util' && this.calleeName === 'consoleLog') {
+                    if (needToString) {
                         var arg = this.arguments[0];
                         var argTypeAnnotation = arg.typeAnnotation || arg.__TypeAnnotation;
                         if (argTypeAnnotation) {
@@ -651,6 +683,9 @@ var CallLogic = /** @class */ (function (_super) {
                         }
                     }
                 }
+                if (needToString) {
+                    code += ")";
+                }
                 code += ')';
             }
         }
@@ -723,12 +758,14 @@ var CallLogic = /** @class */ (function (_super) {
             code += "<";
             code += typeAnnotation.toEmbeddedTS(translator_1.shiftState(state, code, { tabSize: 0 })) + ">";
         }
+        // 参数必填
+        var paramRequired = ['showMessage', 'consoleLog'].includes(this.calleeName);
         var tsCalleeNamespace = this.tsCalleeNamespace;
         if ((tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) || tsCalleeNamespace.startsWith('nasl.')) {
             code += '(';
             this.arguments.forEach(function (arg, index) {
                 // 页面逻辑先都非必填
-                code += arg.toEmbeddedTS(translator_1.shiftState(state, code), false);
+                code += arg.toEmbeddedTS(translator_1.shiftState(state, code), paramRequired);
                 if (index !== _this.arguments.length - 1)
                     code += ', ';
             });
@@ -741,7 +778,8 @@ var CallLogic = /** @class */ (function (_super) {
                 && this.parentNode.concept !== 'SelectMembers'
                 && this.parentNode.concept !== 'BinaryExpression'
                 && this.parentNode.concept !== 'StringInterpolation'
-                && this.parentNode.concept !== 'MemberExpression') {
+                && this.parentNode.concept !== 'MemberExpression'
+                && !['NewMap', 'NewList'].includes(this.parentNode.concept)) {
                 code += ';';
             }
         }
@@ -764,7 +802,8 @@ var CallLogic = /** @class */ (function (_super) {
                     && this.parentNode.concept !== 'SelectMembers'
                     && this.parentNode.concept !== 'BinaryExpression'
                     && this.parentNode.concept !== 'StringInterpolation'
-                    && this.parentNode.concept !== 'MemberExpression') {
+                    && this.parentNode.concept !== 'MemberExpression'
+                    && !['NewMap', 'NewList'].includes(this.parentNode.concept)) {
                     code += ';';
                 }
             }
@@ -778,7 +817,8 @@ var CallLogic = /** @class */ (function (_super) {
                     && this.parentNode.concept !== 'SelectMembers'
                     && this.parentNode.concept !== 'BinaryExpression'
                     && this.parentNode.concept !== 'StringInterpolation'
-                    && this.parentNode.concept !== 'MemberExpression') {
+                    && this.parentNode.concept !== 'MemberExpression'
+                    && !['NewMap', 'NewList'].includes(this.parentNode.concept)) {
                     code += ';';
                 }
             }

package/src/concepts/dist/Identifier__.js

@@ -0,0 +1,311 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+exports.__esModule = true;
+exports.Identifier = void 0;
+var translator_1 = require("../translator");
+var __1 = require("..");
+var utils_1 = require("../utils");
+var decorators_1 = require("../decorators");
+var classMap_1 = require("../common/classMap");
+var LogicItem__1 = require("./LogicItem__");
+/**
+ * 标识符
+ */
+var Identifier = /** @class */ (function (_super) {
+    __extends(Identifier, _super);
+    /**
+     * @param source 需要合并的部分参数
+     */
+    function Identifier(source) {
+        var _this = this;
+        source = Object.assign({}, Identifier_1.getDefaultOptions(), source);
+        _this = _super.call(this, source) || this;
+        /**
+         * 产品概念
+         */
+        _this.concept = 'Identifier';
+        /**
+         * namespace
+         */
+        _this.namespace = undefined;
+        /**
+         * 标识符名称
+         */
+        _this.name = undefined;
+        //================================================================================
+        // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+        // 自动生成的代码已结束。下面可以手动编写。
+        //================================================================================
+        // 选中的数据类型，这个用作暂存
+        _this.typeAnnotation = undefined;
+        _this.globalDataMap = {
+            $route: true,
+            $global: true,
+            $refs: true
+        };
+        _super.prototype.subConstructor.call(_this, source);
+        return _this;
+    }
+    Identifier_1 = Identifier;
+    Identifier.from = function (source, parentNode, parentKey) {
+        return _super.from.call(this, source, parentNode, parentKey);
+    };
+    Identifier.prototype.isEnum = function () {
+        return utils_1.findConceptKeyWordByNamespace(this.namespace) === 'enums';
+    };
+    Identifier.prototype.toVue = function (options) {
+        var name = this.name;
+        var namespace = this.namespace;
+        if (namespace) {
+            if ((this.namespace.endsWith('nasl.browser') || this.namespace.endsWith('nasl.auth') || this.namespace.endsWith('nasl.configuration') || this.namespace.endsWith('nasl.process'))) {
+                name = "$global." + this.name;
+            }
+            else if (this.namespace.endsWith('frontendVariables')) {
+                name = "$global.frontendVariables." + this.name;
+            }
+            else if (this.isEnum()) {
+                var enumName = this.name;
+                if (this.namespace.startsWith('extensions.')) {
+                    enumName = this.namespace + "." + this.name;
+                }
+                name = enumName;
+            }
+            else if (this.namespace.endsWith('logics')) {
+                name = "'" + this.namespace + "." + name + "'";
+            }
+        }
+        return name;
+    };
+    Identifier.prototype.toUI = function () {
+        var name = this.name;
+        var namespace = this.namespace;
+        if (namespace) {
+            if (namespace.startsWith('nasl.')) {
+                name = namespace + "." + this.name;
+            }
+            else if (namespace.endsWith('frontendVariables')) {
+                name = "nasl.frontendVariables." + this.name;
+            }
+            else if (this.isEnum()) {
+                var enumName = this.name;
+                if (this.namespace.startsWith('extensions.')) {
+                    enumName = this.namespace + "." + this.name;
+                }
+                name = enumName;
+            }
+        }
+        return name;
+    };
+    Object.defineProperty(Identifier.prototype, "jsName", {
+        // 在页面 表达式/逻辑 中的名字
+        get: function () {
+            var name = this.name;
+            var namespace = this.namespace;
+            if (namespace) {
+                if (namespace.endsWith('nasl.browser') || namespace.endsWith('nasl.auth') || namespace.endsWith('nasl.configuration') || this.namespace.endsWith('nasl.process')) {
+                    name = "$global." + this.name;
+                }
+                else if (namespace.endsWith('frontendVariables')) {
+                    name = "$global.frontendVariables." + this.name;
+                }
+                else if (this.isEnum()) {
+                    var enumName = this.name;
+                    if (this.namespace.startsWith('extensions.')) {
+                        enumName = this.namespace + "." + this.name;
+                    }
+                    name = enumName;
+                }
+                else if (this.namespace.endsWith('logics')) {
+                    name = "'" + this.namespace + "." + name + "'";
+                }
+            }
+            return name;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Identifier.prototype.toJS = function () {
+        var name = this.jsName;
+        return this.isViewOrGlobalDataVariable() ? "this." + name : name;
+    };
+    // 页面/全局 级别的变量
+    Identifier.prototype.isViewOrGlobalDataVariable = function () {
+        var _a, _b, _c, _d, _e, _f;
+        var dataMap = {};
+        (_b = (_a = this.view) === null || _a === void 0 ? void 0 : _a.params) === null || _b === void 0 ? void 0 : _b.forEach(function (param) {
+            dataMap[param.name] = true;
+        });
+        (_d = (_c = this.view) === null || _c === void 0 ? void 0 : _c.variables) === null || _d === void 0 ? void 0 : _d.forEach(function (variable) {
+            dataMap[variable.name] = true;
+        });
+        // 目前前端逻辑也会被当成可选变量（以datasource为典型）
+        (_f = (_e = this.view) === null || _e === void 0 ? void 0 : _e.logics) === null || _f === void 0 ? void 0 : _f.forEach(function (logics) {
+            dataMap[logics.name] = true;
+        });
+        var parentNode = this.parentNode;
+        var isMemberExpressionProperty = false;
+        if ((parentNode === null || parentNode === void 0 ? void 0 : parentNode.concept) === 'MemberExpression' && this.parentKey === 'property') {
+            isMemberExpressionProperty = true;
+        }
+        var name = this.jsName;
+        var namespace = this.namespace;
+        if (name === 'UserStatusEnum') {
+            console.log(this);
+        }
+        return (dataMap[name]
+            || this.globalDataMap[name]
+            || (namespace === null || namespace === void 0 ? void 0 : namespace.endsWith('nasl.browser'))
+            || (namespace === null || namespace === void 0 ? void 0 : namespace.endsWith('nasl.auth'))
+            || (namespace === null || namespace === void 0 ? void 0 : namespace.endsWith('nasl.configuration'))
+            || (namespace === null || namespace === void 0 ? void 0 : namespace.endsWith('nasl.process'))
+            || (namespace === null || namespace === void 0 ? void 0 : namespace.endsWith('frontendVariables'))
+            || this.isEnum()) && !isMemberExpressionProperty;
+    };
+    Identifier.prototype.toBrief = function () {
+        return this.name || '-';
+    };
+    Identifier.prototype.toEmbeddedTS = function (state) {
+        var _this = this;
+        var _a;
+        // 只有data-source可以是函数 ，也可能是属性
+        if (this.parentNode instanceof __1.BindAttribute && this.parentNode.name === 'data-source') {
+            var view = this.view;
+            var viewLogics = view.logics;
+            var findLogic = viewLogics.find(function (item) { return item.name === _this.name; });
+            if (findLogic) {
+                return this.name;
+            }
+        }
+        // 全局变量在不是页面的地方放置，就会报错
+        if (((_a = this.namespace) === null || _a === void 0 ? void 0 : _a.startsWith('app.frontendVariables')) && !this.view) {
+            return '__FRONTENDVARIABLES__';
+        }
+        // 如果是nasl.util.Enum 的子集里的 Identifier > MemberExpression > Argument > callfunction
+        // nasl.util.Enum 的 右侧是转成字符串的
+        // 如果是identifier 而且枚举
+        // if (this.parentNode?.parentNode?.parentNode instanceof CallFunction) {
+        //     const calleeNamespace = this.parentNode.parentNode.parentNode.calleeNamespace;
+        //     const calleeName = this.parentNode.parentNode.parentNode.calleeName;
+        //     if (calleeNamespace + '.' + calleeName === 'nasl.util.Enum') {
+        //         const str = (this.namespace ? this.namespace + '.' : '') + this.name;
+        //         return str.includes('.enums.') ? str : str + '.toString()';
+        //     }
+        // }
+        // having 下选择的变量不生成 namespace 前缀
+        if (this.namespace === 'inner' && this.getAncestor('CallQueryComponent')) {
+            return "__" + this.name || '__IDENTIFIER__';
+        }
+        return this.namespace ? this.namespace + '.' + this.name : this.name || '__IDENTIFIER__';
+    };
+    // 方便快速取值
+    Identifier.prototype.getValue = function () {
+        // 实体逻辑 deleteBy/updateBy 的 filter 参数的回调函数的参数：_
+        // 处理 _ 的显示问题
+        if (this.name === '_') {
+            var parentNode = this.parentNode;
+            if (parentNode) {
+                var p = parentNode;
+                while (p && p.concept !== 'CallLogic') {
+                    p = p.parentNode;
+                }
+                if (p && (p.calleeName === 'deleteBy' || p.calleeName === 'updateBy')) {
+                    var ns = p.calleeNamespace.split('.');
+                    return ns[ns.length - 2] || this.name;
+                }
+                else {
+                    return 'item';
+                }
+            }
+        }
+        return this.name;
+    };
+    Object.defineProperty(Identifier.prototype, "completeName", {
+        get: function () {
+            var arr = [this.name];
+            if (this.namespace) {
+                arr.unshift(this.namespace);
+            }
+            return arr.join('.');
+        },
+        enumerable: false,
+        configurable: true
+    });
+    /**
+     * 设置函数名称
+     */
+    Identifier.prototype.setNamespace = function (namespace) {
+        var object = {
+            namespace: namespace
+        };
+        this.update(__assign({}, object));
+    };
+    /**
+     * 设置函数名称
+     */
+    Identifier.prototype.setName = function (name) {
+        var object = {
+            name: name
+        };
+        this.update(__assign({}, object));
+    };
+    Identifier.prototype.setNameAndNamespace = function (name, namespace) {
+        var object = {
+            name: name,
+            namespace: namespace
+        };
+        this.update(__assign({}, object));
+    };
+    var Identifier_1;
+    __decorate([
+        decorators_1.property()
+    ], Identifier.prototype, "concept");
+    __decorate([
+        decorators_1.property()
+    ], Identifier.prototype, "namespace");
+    __decorate([
+        decorators_1.property()
+    ], Identifier.prototype, "name");
+    __decorate([
+        translator_1.withSourceMap()
+    ], Identifier.prototype, "toEmbeddedTS");
+    Identifier = Identifier_1 = __decorate([
+        decorators_1.concept('标识符')
+    ], Identifier);
+    return Identifier;
+}(LogicItem__1["default"]));
+exports.Identifier = Identifier;
+classMap_1["default"].Identifier = Identifier;
+exports["default"] = Identifier;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================