@lcap/nasl 2.22.1 → 2.22.2-beta.2

package/src/generator/dist/genReleaseBody.js

@@ -0,0 +1,501 @@
+"use strict";
+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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
+exports.__esModule = true;
+exports.genReleaseBody = void 0;
+var concepts_1 = require("../concepts");
+var genBundleFiles_1 = require("./genBundleFiles");
+var permission_1 = require("./permission");
+var utils = require("../utils");
+function genReleaseBody(app, _a) {
+    var env = _a.env, replicas = _a.replicas, realRelease = _a.realRelease, appInfo = _a.appInfo, staticUrl = _a.staticUrl, _b = _a.frontends, frontends = _b === void 0 ? [] : _b, _c = _a.logPublishFunc, logPublishFunc = _c === void 0 ? function () { } : _c;
+    return __awaiter(this, void 0, void 0, function () {
+        var authReport, logicPageResourceDtoList, releaseFrontends, body, NaslAnnotatedJSON, err_1, files, jsonString;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    if (!realRelease) return [3 /*break*/, 2];
+                    authReport = getAuthReport(app, frontends);
+                    return [4 /*yield*/, permission_1.genPermissionData(app)];
+                case 1:
+                    logicPageResourceDtoList = _d.sent();
+                    logPublishFunc("[\u6743\u9650] \"[" + app.title + "]\" \u5206\u6790\u6743\u9650\u6570\u636E\u6210\u529F\uFF01");
+                    _d.label = 2;
+                case 2:
+                    releaseFrontends = app.frontends.map(function (frontend) { return ({
+                        name: frontend.name,
+                        type: frontend.type,
+                        path: frontend.path,
+                        selected: frontends.includes(frontend),
+                        title: frontend.title
+                    }); });
+                    body = __assign(__assign({}, authReport), { // 如果发布需要上报权限，导出源码不需要
+                        logicPageResourceDtoList: logicPageResourceDtoList, logicAuthFlag: permission_1.genLogicAuthFlag(app), noAuthApiPathList: getAuthApiPathList(app, frontends), reportIdList: findAllReportIdList(app, frontends), appId: app.id, env: env,
+                        replicas: replicas, callbackLogicsName: app.getExtensionsCallbackLogics(), frontends: releaseFrontends, files: [] });
+                    if (logicPageResourceDtoList)
+                        Object.assign(body, { logicPageResourceDtoList: logicPageResourceDtoList });
+                    _d.label = 3;
+                case 3:
+                    _d.trys.push([3, 5, , 6]);
+                    return [4 /*yield*/, app.naslServer.getNaslAnnotatedJSON(app, true)];
+                case 4:
+                    NaslAnnotatedJSON = _d.sent();
+                    logPublishFunc("[\u8BED\u8A00] \"[" + app.title + "]\" \u83B7\u53D6\u7C7B\u578B\u6807\u6CE8\u6210\u529F\uFF01");
+                    return [3 /*break*/, 6];
+                case 5:
+                    err_1 = _d.sent();
+                    console.error(err_1);
+                    throw new Error('代码标注失败，请稍后重试！或刷新后重试！');
+                case 6:
+                    files = [];
+                    if (frontends && frontends.length) {
+                        logPublishFunc("[\u4EE3\u7801] \"[" + app.title + "]\" \u751F\u6210\u9875\u9762\u4EE3\u7801\uFF1A\u5F00\u59CB");
+                        files = genBundleFiles_1.genFrontendBundleFiles(app, frontends, Object.assign({}, appInfo, {
+                            env: env,
+                            appid: app.id,
+                            devDnsAddr: app.devDnsAddr,
+                            miniEnable: app.miniEnable
+                        }));
+                        if (files && files.length === 0) {
+                            throw new Error('前端代码生成失败');
+                        }
+                        if (staticUrl)
+                            files = replaceAssetUrl(files, appInfo.USER_STATIC_URL, staticUrl);
+                        console.log(Date.now());
+                        console.time('onGetDeploymentStatus');
+                        logPublishFunc("[\u4EE3\u7801] \"[" + app.title + "]\" \u751F\u6210\u9875\u9762\u4EE3\u7801\uFF1A\u5B8C\u6210\uFF01");
+                    }
+                    // 如果是发布，就排除views，导出源码就不排除
+                    if (realRelease) {
+                        NaslAnnotatedJSON.frontends.forEach(function (frontend) {
+                            delete frontend.views;
+                        });
+                    }
+                    jsonString = JSON.stringify(NaslAnnotatedJSON);
+                    // 打印传给服务端的nasl,为了服务端排查问题方便
+                    if (globalThis.window) {
+                        console.info(NaslAnnotatedJSON, '标注后的nasl');
+                    }
+                    files.push({ name: 'nasl-annotated.json', content: jsonString });
+                    body.files = files;
+                    return [2 /*return*/, body];
+            }
+        });
+    });
+}
+exports.genReleaseBody = genReleaseBody;
+/**
+ * 权限上报数据
+ */
+function getAuthReport(app, frontends) {
+    var result = {
+        roleList: [],
+        resourceList: [],
+        resourceDataList: [],
+        roleResourceMappingList: []
+    };
+    result.roleList = app.roles;
+    var getAuth = function (target) {
+        var authDirective = target.bindDirectives.find(function (item) { return item.name === 'auth'; });
+        return authDirective === null || authDirective === void 0 ? void 0 : authDirective.value;
+    };
+    var loopViews = function (view, isMain, frontend) {
+        var _a;
+        if (view.children) {
+            view.children.forEach(function (item) { return loopViews(item, false, frontend); });
+        }
+        if (view.concept === 'View' && view.elements) {
+            view.elements.forEach(function (item) { return loopViews(item, false, frontend); });
+        }
+        if ((view.concept === 'View' && view.auth)
+            || (view.concept === 'View' && !isMain && view.parentAuth)
+            || (view.concept === 'ViewElement' && getAuth(view))) {
+            result.resourceList.push(view.authPath);
+            result.resourceDataList.push({
+                value: view.authPath,
+                description: view.authDescription,
+                type: view.concept === 'View' ? 'page' : 'component',
+                clientType: frontend.name
+            });
+            if (view.bindRoles) {
+                var _arr = view.bindRoles.map(function (it) { return ({
+                    roleName: it,
+                    resourcePath: view.authPath
+                }); });
+                (_a = result.roleResourceMappingList).push.apply(_a, _arr);
+            }
+        }
+    };
+    frontends.forEach(function (frontend) {
+        frontend.views.forEach(function (view) { return loopViews(view, true, frontend); });
+    });
+    return result;
+}
+// 以下四个函数 导出源码也有引用 需同步改动
+/**
+ * 上报白名单
+ */
+function getAuthApiPathList(app, frontends) {
+    var thisDiffLogicList = [];
+    /* 转换Path */
+    function getPathMethods(logicNameSpace) {
+        var logic = app.findNodeByCompleteName(logicNameSpace);
+        if (!logic) {
+            return;
+        }
+        var logicName = logic === null || logic === void 0 ? void 0 : logic.name;
+        var _pathArr = logicNameSpace.split('.');
+        var isProcess = _pathArr[1] === 'processes';
+        var moduleNode = logic.getAncestor('Module');
+        var isEntity = false;
+        var namespaceLinkedNode = null;
+        var namespaceNode = logic.getAncestor('Namespace');
+        if (namespaceNode) {
+            namespaceLinkedNode = app.findNodeByCompleteName([namespaceNode.getNamespace(), namespaceNode.name].join('.'));
+            isEntity = namespaceNode && (namespaceLinkedNode === null || namespaceLinkedNode === void 0 ? void 0 : namespaceLinkedNode.concept) === 'Entity';
+        }
+        // 实体
+        if (isEntity) {
+            var dataSource = namespaceLinkedNode.parentNode;
+            if (dataSource.name !== 'defaultDS') {
+                return "/api/" + dataSource.name + "/" + getName(namespaceLinkedNode.name) + getEntityMethods(logic.name);
+            }
+            return "/api/" + getName(namespaceLinkedNode.name) + getEntityMethods(logic.name);
+        }
+        else if (moduleNode) {
+            // 外部模块引入的逻辑
+            return "/api/" + getModuleName(moduleNode.name) + "/" + logicName + ":POST";
+        }
+        else if (isProcess) {
+            if (_pathArr.length === 7) {
+                var _name = _pathArr[2];
+                var _path = _pathArr[4];
+                var _logic = _pathArr[6];
+                return "/api/" + _name + "/" + _path + "/" + _logic + ":POST";
+            }
+            else {
+                var _name = _pathArr[2];
+                var _path = _pathArr[4];
+                return "/api/" + _name + "/" + _path + ":POST";
+            }
+        }
+        else {
+            return "/api/lcplogics/" + logicName + ":POST";
+        }
+        function getName(name) {
+            var _name = name.replace(/[A-Z]/g, function (item) { return '-' + item.toLowerCase(); });
+            return _name[0] === '-' ? _name.slice(1) : _name;
+        }
+        function getModuleName(name) {
+            return name.replace(/-/g, '_');
+        }
+        function getEntityMethods(path) {
+            var name = '';
+            switch (path) {
+                case 'get':
+                    name = ":GET";
+                    break;
+                case 'import':
+                    name = '/import:POST';
+                    break;
+                case 'create':
+                    name = ':POST';
+                    break;
+                case 'update':
+                    name = ':PUT';
+                    break;
+                case 'delete':
+                    name = ":DELETE";
+                    break;
+                case 'createOrUpdate':
+                    name = '/createOrUpdate:POST';
+                    break;
+                case 'updateBy':
+                    name = '/by:PUT';
+                    break;
+                case 'deleteBy':
+                    name = '/by:DELETE';
+                    break;
+                case 'batchUpdate':
+                    name = "/batch:PUT";
+                    break;
+                case 'batchDelete':
+                    name = "/batch:DELETE";
+                    break;
+                case 'batchCreate':
+                    name = "/batch:POST";
+                    break;
+            }
+            return name;
+        }
+    }
+    /* 获取LogicITEM */
+    function getStatement(state, frontend) {
+        var _a, _b, _c, _d, _e;
+        var logicItems = [];
+        if (state instanceof concepts_1.Assignment) {
+            logicItems = [state.left, state.right];
+        }
+        else if (state instanceof concepts_1.BatchAssignment) {
+            logicItems = __spreadArrays([(_a = state.left) === null || _a === void 0 ? void 0 : _a.expression], (_b = state.left) === null || _b === void 0 ? void 0 : _b.members, state.rights.map(function (item) { return __spreadArrays([item === null || item === void 0 ? void 0 : item.expression], item === null || item === void 0 ? void 0 : item.members); }).flat(1));
+        }
+        else if (state instanceof concepts_1.IfStatement) {
+            logicItems = __spreadArrays(state.consequent, state.alternate);
+        }
+        else if (state instanceof concepts_1.ForEachStatement) {
+            logicItems = __spreadArrays(state.body, [state.each, state.start, state.end]);
+        }
+        else if (state instanceof concepts_1.Match) {
+            logicItems = __spreadArrays([state.expression], state.cases.map(function (case1) { return getStatement(case1, frontend); }).flat(1));
+        }
+        else if (state instanceof concepts_1.MatchCase) {
+            logicItems = __spreadArrays(state.patterns, state.body);
+        }
+        else if (state instanceof concepts_1.SwitchStatement) {
+            logicItems = state.cases.map(function (case1) { return getStatement(case1, frontend); }).flat(1);
+        }
+        else if (state instanceof concepts_1.SwitchCase) {
+            logicItems = __spreadArrays([state.test], state.consequent);
+        }
+        else if (state instanceof concepts_1.WhileStatement) {
+            logicItems = __spreadArrays([state.test], state.body);
+        }
+        else if (state instanceof concepts_1.CallLogic) {
+            logicItems = (_c = state.arguments) === null || _c === void 0 ? void 0 : _c.map(function (item) { return item.expression; });
+            getLogic(state.calleewholeKey, frontend);
+        }
+        else if (state instanceof concepts_1.CallFunction) {
+            logicItems = (_d = state.arguments) === null || _d === void 0 ? void 0 : _d.map(function (item) { return item.expression; });
+        }
+        else if (state instanceof concepts_1.CallInterface) {
+            logicItems = (_e = state.arguments) === null || _e === void 0 ? void 0 : _e.map(function (item) { return item.expression; });
+        }
+        else if (state instanceof concepts_1.MemberExpression) {
+            logicItems = [state.object, state.property];
+        }
+        else if (state instanceof concepts_1.StringInterpolation) {
+            logicItems = __spreadArrays(state.expressions);
+        }
+        else if (state instanceof concepts_1.ExternalDestination) {
+            logicItems = [state.anchor, state.link];
+        }
+        else if (state instanceof concepts_1.NewComposite) {
+            logicItems = __spreadArrays((state.rights || []).map(function (item) { return item.expression; }));
+        }
+        else if (state instanceof concepts_1.NewList) {
+            logicItems = __spreadArrays(state.items);
+        }
+        return logicItems.filter(function (item) { return !!item; });
+    }
+    /* 获取非鉴权全局逻辑 */
+    function getLogic(key, frontend) {
+        if (!thisDiffLogicList.find(function (diffLogic) { return diffLogic.logicName === key && diffLogic.frontendName === frontend.name; })) {
+            thisDiffLogicList.push({ logicName: key, frontendName: frontend.name });
+            var logic = app.findNodeByCompleteName(key);
+            if (logic && logic.body && logic.body.length > 2) {
+                logic.body.map(function (item) { return getStatement(item, frontend); });
+            }
+        }
+    }
+    var importList = [];
+    var itemloop = function (state, view, frontend) {
+        var logicItems = getStatement(state, frontend);
+        if (logicItems.length) {
+            logicItems.map(function (item) { return itemloop(item, view, frontend); });
+        }
+    };
+    var loopEle = function (view, frontend) {
+        var _a, _b;
+        (_a = view === null || view === void 0 ? void 0 : view.children) === null || _a === void 0 ? void 0 : _a.forEach(function (vitem) { return loopEle(vitem, frontend); });
+        view.concept === 'View' && ((_b = view === null || view === void 0 ? void 0 : view.elements) === null || _b === void 0 ? void 0 : _b.forEach(function (ele) { return loopEle(ele, frontend); }));
+        if (!view.parentAuth) {
+            if (view.bindEvents) {
+                view.bindEvents.forEach(function (item) {
+                    if (item.logics) {
+                        item.logics.forEach(function (logic) {
+                            if (logic.body.length > 2) {
+                                logic.body.forEach(function (it) {
+                                    itemloop(it, view, frontend);
+                                });
+                            }
+                        });
+                    }
+                });
+            }
+            var bindExpressions = [];
+            var bindAttrs = view.bindAttrs || [];
+            var bindDirectives = view.bindDirectives || [];
+            var bindStyles = view.bindStyles || [];
+            bindExpressions.push.apply(bindExpressions, __spreadArrays(bindAttrs, bindDirectives, bindStyles));
+            if (Array.isArray(bindExpressions) && bindExpressions.length) {
+                bindExpressions.forEach(function (bindExpression) { return utils.traverse(function (current) {
+                    if (current.node instanceof concepts_1.CallLogic) {
+                        getLogic(current.node.calleewholeKey, frontend);
+                    }
+                }, { node: bindExpression }, {
+                    mode: 'anyObject',
+                    excludedKeySet: new Set([
+                        // 排除playground里的表达式
+                        'playground',
+                        'parentNode',
+                        'sourceMap',
+                        'storageJSON',
+                        'tsErrorDetail',
+                        'NaslAnnotatedJSON',
+                        'calledFrom',
+                        '_events',
+                        '_collectingList',
+                        '_historyList',
+                    ])
+                }); });
+            }
+        }
+        if (view.concept === 'ViewElement' && (view.tag === 'u-uploader' || view.tag === 'van-uploader')) {
+            var attr = view === null || view === void 0 ? void 0 : view.bindAttrs.find(function (item) { return item.name === 'url'; });
+            if ((attr === null || attr === void 0 ? void 0 : attr.value.endsWith('/import')) && !view.parentAuth) {
+                importList.push({ path: attr === null || attr === void 0 ? void 0 : attr.value, frontendName: frontend.name });
+            }
+        }
+    };
+    var loopViews = function (view, isChild, frontend) {
+        // 有权限的页面下的逻辑都不需要上报白名单
+        if (!view.auth) {
+            if (view.logics) {
+                view.logics.forEach(function (logic) {
+                    if (logic.body.length > 2) {
+                        logic.body.forEach(function (it) {
+                            itemloop(it, view, frontend);
+                        });
+                    }
+                });
+            }
+            if (view.bindEvents) {
+                view.bindEvents.forEach(function (item) {
+                    if (item.logics) {
+                        item.logics.forEach(function (logic) {
+                            if (logic.body.length > 2) {
+                                logic.body.forEach(function (it) {
+                                    itemloop(it, view, frontend);
+                                });
+                            }
+                        });
+                    }
+                });
+            }
+            view.children.forEach(function (item) { return loopViews(item, true, frontend); });
+        }
+        if (!isChild) {
+            view.children.forEach(function (vitem) { return loopEle(vitem, frontend); });
+            view.elements.forEach(function (vele) { return loopEle(vele, frontend); });
+        }
+    };
+    frontends.forEach(function (frontend) {
+        frontend.views.forEach(function (view) { return loopViews(view, false, frontend); });
+    });
+    var diffLogicList = thisDiffLogicList.filter(function (item) { return item.logicName.startsWith('app') || item.logicName.startsWith('extensions'); });
+    var authApiList = __spreadArrays(diffLogicList.map(function (diffLogic) {
+        var path = getPathMethods(diffLogic.logicName);
+        if (path)
+            return path + ":" + diffLogic.frontendName;
+        return '';
+    }).filter(function (path) { return !!path; }), Array.from(new Set(importList.map(function (item) { return item.path + ":POST:" + item.frontendName; })))).filter(function (item) { return !!item; });
+    return authApiList;
+}
+/**
+ * 获取页面中所有 分析报告组件 的reportId
+ */
+function findAllReportIdList(app, frontends) {
+    var reportIds = [];
+    frontends.forEach(function (frontend) {
+        frontend.views.forEach(function (view) { return loop(view); });
+    });
+    function loop(root) {
+        if (root.concept === 'ViewElement') {
+            root.bindAttrs.forEach(function (attr) {
+                if (attr.name === 'reportId') {
+                    reportIds.push(JSON.parse(attr.value || '{}').id);
+                }
+            });
+        }
+        if (root.children && root.children.length) {
+            root.children.forEach(function (item) { return loop(item); });
+        }
+        if (root.concept === 'View' && root.elements && root.elements.length) {
+            root.elements.forEach(function (item) { return loop(item); });
+        }
+    }
+    return __spreadArrays(new Set(reportIds)).filter(Boolean);
+}
+function replaceAssetUrl(files, oldUrlWithoutProtocol, newUrlWithProtocol) {
+    var newUrlWithoutProtocol = newUrlWithProtocol.replace(/^https?:/, '');
+    if (newUrlWithoutProtocol === oldUrlWithoutProtocol)
+        return files;
+    var reg = new RegExp(oldUrlWithoutProtocol + "[^?'\"\\s]*\\?[^?'\"\\s]*(?=(\"|'))", 'g');
+    var reg2 = new RegExp("(https?:)?" + oldUrlWithoutProtocol, 'g');
+    for (var _i = 0, files_1 = files; _i < files_1.length; _i++) {
+        var file = files_1[_i];
+        // 清除 query 参数
+        file.content = file.content.replace(reg, function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return args[0].split('?')[0];
+        });
+        file.content = file.content.replace(reg2, function (whole, protocol) { return (protocol ? newUrlWithProtocol : newUrlWithoutProtocol); });
+        file.name = file.name.replace(reg2, function (whole, protocol) { return (protocol ? newUrlWithProtocol : newUrlWithoutProtocol); });
+    }
+    return files;
+}

package/src/server/dist/naslServer.js

@@ -180,6 +180,8 @@ var NaslServer = /** @class */ (function () {
                                 records = _b.sent();
                                 this.diagnosticManager.pushAll(records);
                                 try {
+                                    // 结束诊断和标注
+                                    common_1.invokeCommand('naslServer:endWork');
                                     common_1.invokeCommand('naslServer:nodeChange');
                                 }
                                 catch (e) {
@@ -981,7 +983,13 @@ var NaslServer = /** @class */ (function () {
             var records;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getDiagnosticRecords(fileNames)];
+                    case 0:
+                        // 开始诊断和标注
+                        try {
+                            common_1.invokeCommand('naslServer:startWork');
+                        }
+                        catch (err) { }
+                        return [4 /*yield*/, this.getDiagnosticRecords(fileNames)];
                     case 1:
                         records = _a.sent();
                         return [2 /*return*/];
@@ -2556,6 +2564,52 @@ var NaslServer = /** @class */ (function () {
                         if (node instanceof concepts_1.Entity) {
                             // 过滤一把不需要改的信息
                             refsList = refsList.filter(function (item) { return fileNode.getEmbeddedFilePath() !== item.file || item.isDefinition === true; });
+                            // 防止死循环
+                            // const forRefsList = [...refsList];
+                            // for (let i = 0; i < forRefsList.length; i++) {
+                            //     const refItem = forRefsList[i];
+                            //     if (refItem.lineText?.includes('new nasl.langUtil.Collection')) {
+                            //         try {
+                            //             const fileNode = this.file2NodeMap.get(refItem.file);
+                            //             if (!fileNode)
+                            //                 return;
+                            //             const minRange = this._findMinRange(refItem, fileNode as FileNode);
+                            //             if (minRange.node && (minRange.node instanceof QueryFromExpression || minRange.node instanceof QueryJoinExpression)) {
+                            //                 const callQueryComponent = minRange.node.getAncestor('CallQueryComponent') as CallQueryComponent;
+                            //                 const callQueryComponentTypeAnnotation = callQueryComponent.typeAnnotation;
+                            //                 const { currentSource: qcTypeAnnotationCurrentSource, fileNode } = callQueryComponentTypeAnnotation.getCurrentSource();
+                            //                 const { currentSource: logicCurrentSource } = fileNode.getCurrentSource();
+                            //                 const aggregateLength = callQueryComponent.select.selectAggregateElements.filter((item: any) => item.aggregateName && item.asName).length;
+                            //                 const groupByLength = callQueryComponent.groupBy.filter((item) => (item.groupElement as QueryFieldExpression)?.propertyName && (item.groupElement as QueryFieldExpression).asName).length;
+                            //                 if (!groupByLength && !aggregateLength && callQueryComponentTypeAnnotation.typeKind === 'anonymousStructure') {
+                            //                 // 拿到 List 的泛型（匿名数据结构）的所有属性
+                            //                     const properties = callQueryComponentTypeAnnotation.properties[0].typeAnnotation.typeArguments[0].properties;
+                            //                     const targetProperty = properties.find((p) => p.name === utils.firstLowerCase(node.name));
+                            //                     if (!targetProperty) {
+                            //                         continue;
+                            //                     }
+                            //                     const { currentSource: propertyTypeCurrentSource } = targetProperty.typeAnnotation.getCurrentSource();
+                            //                     // 减去 ": " 2个字符、减去属性名长度
+                            //                     const propertyCharacter = propertyTypeCurrentSource.range.start.character - 2 - targetProperty.name.length;
+                            //                     const propertyOffset = propertyCharacter - qcTypeAnnotationCurrentSource.range.start.character;
+                            //                     const qcTypeAnnotationOffset = logicCurrentSource.code.indexOf(qcTypeAnnotationCurrentSource.code);
+                            //                     const declarationCodeArr = logicCurrentSource.code.slice(0, qcTypeAnnotationOffset).split('\n');
+                            //                     const line = declarationCodeArr.length - 1;
+                            //                     const character = declarationCodeArr[declarationCodeArr.length - 1].length;
+                            //                     // eslint-disable-next-line no-await-in-loop
+                            //                     const newRefs = await this.references({
+                            //                         file: (fileNode as any).getEmbeddedFilePath(),
+                            //                         line: line + 2,
+                            //                         offset: character + 1 + propertyOffset,
+                            //                     });
+                            //                     refsList.push(...newRefs.refs);
+                            //                 }
+                            //             }
+                            //         } catch (e) {
+                            //             console.error('naslServer实体引用', e);
+                            //         }
+                            //     }
+                            // }
                             // 不再当前文件里
                             // 或者在当前列表但是位置小于entity的结束位置
                         }
@@ -2899,7 +2953,10 @@ var NaslServer = /** @class */ (function () {
                     if (minRange.node instanceof concepts_1.EntityProperty) {
                         minRange.setTypeMethods = 'setRelationEntity';
                     }
-                    else if (minRange.node instanceof concepts_1.QueryFieldExpression || minRange.node instanceof concepts_1.QueryGroupByExpression) {
+                    else if (minRange.node instanceof concepts_1.QueryFieldExpression) {
+                        minRange.setTypeMethods = 'setEntityAsNameAndEffect';
+                    }
+                    else if (minRange.node instanceof concepts_1.QueryGroupByExpression) {
                         minRange.setTypeMethods = 'setEntityAsName';
                     }
                     else if (minRange.node instanceof concepts_1.QueryFromExpression || minRange.node instanceof concepts_1.QueryJoinExpression) {
@@ -2912,6 +2969,8 @@ var NaslServer = /** @class */ (function () {
                         var newTextValue = node.parentNode.name === 'defaultDS' ? "/api/" + newName + "/import" : "/api/" + node.parentNode.name + "/" + newName + "/import";
                         minRange.setTypeMethods = 'setUrlValue';
                         minRange.newValue = newTextValue;
+                        // } else if (minRange.node instanceof Identifier) {
+                        //     minRange.newValue = utils.firstLowerCase(newValue);
                     }
                 }
                 // 如果是修改实体属性，要同步实体属性
@@ -3182,7 +3241,18 @@ var NaslServer = /** @class */ (function () {
             return minRange;
         })
             // 过滤掉不需要操作的
-            .filter(function (item) { return !!item; });
+            .filter(function (item) { return !!item; })
+            // 排序：
+            // QueryFieldExpression依赖Entity，把Entity放在QueryFieldExpression前，
+            .sort(function (a, b) {
+            if (a.node.concept === 'QueryFieldExpression') {
+                return 1;
+            }
+            else if (b.node.concept === 'QueryFieldExpression') {
+                return -1;
+            }
+            return 0;
+        });
         return result;
     };
     // 增加参数的副作用，用于更新logic和view
@@ -3972,7 +4042,7 @@ var NaslServer = /** @class */ (function () {
     };
     NaslServer.prototype.annotationToJson = function (typesMap, json) {
         typesMap.forEach(function (value, node) {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f;
             // 如果节点本身有类型就不去在塞一遍了
             // 有值而且没有类型再去设置
             // 但是Identifier 和 MemberExpression 都用标注出来的因为本身是变量，有类型也需要覆盖一下
@@ -4043,7 +4113,7 @@ var NaslServer = /** @class */ (function () {
             if (node instanceof concepts_1.Match) {
                 var matchExpression_1 = node.expression;
                 if (((_d = matchExpression_1 === null || matchExpression_1 === void 0 ? void 0 : matchExpression_1.__TypeAnnotation) === null || _d === void 0 ? void 0 : _d.typeKind) === 'union' && (matchExpression_1 instanceof concepts_1.Identifier || matchExpression_1 instanceof concepts_1.MemberExpression)) {
-                    var _f = matchExpression_1 === null || matchExpression_1 === void 0 ? void 0 : matchExpression_1.getCurrentSource(), currentSource_6 = _f.currentSource, fileNode = _f.fileNode;
+                    var _g = matchExpression_1 === null || matchExpression_1 === void 0 ? void 0 : matchExpression_1.getCurrentSource(), currentSource_6 = _g.currentSource, fileNode = _g.fileNode;
                     fileNode.sourceMap.forEach(function (item, itemNode) {
                         if (itemNode.concept === matchExpression_1.concept && item.code === currentSource_6.code) {
                             var jsonNode = jsoner.queryNodeByPath(json, itemNode.getNodePath(false));
@@ -4060,7 +4130,7 @@ var NaslServer = /** @class */ (function () {
                     jsonNode.typeAnnotation = value.toJSON();
                 }
             }
-            if (node instanceof concepts_1.NewComposite && ((_e = node.typeAnnotation) === null || _e === void 0 ? void 0 : _e.typeKind) === 'anonymousStructure') {
+            if (node instanceof concepts_1.NewComposite && (((_e = node.typeAnnotation) === null || _e === void 0 ? void 0 : _e.typeKind) === 'anonymousStructure' || ((_f = node.typeAnnotation) === null || _f === void 0 ? void 0 : _f.typeKind) === 'generic')) {
                 var jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
                 jsonNode.typeAnnotation = value.toJSON();
             }