@lcap/nasl 2.14.0-beta.5 → 2.15.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "2.14.0-beta.5",
+  "version": "2.15.1",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "dev": "tsc -watch -p ./",

package/src/concepts/BindDirective__.ts

@@ -140,10 +140,6 @@ export class BindDirective extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
     * 插入逻辑项
     * @internal
@@ -176,8 +172,6 @@ export class BindDirective extends BaseNode {
         return logicItem;
     }
 
-    
-
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -200,8 +194,6 @@ export class BindDirective extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加逻辑项
      * @internal
@@ -221,8 +213,6 @@ export class BindDirective extends BaseNode {
         return this._insertItemInPlaygroundAt(options as any, index);
     }
 
-    
-
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -246,9 +236,6 @@ export class BindDirective extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除逻辑项
     * @param name 逻辑项名称
@@ -274,8 +261,6 @@ export class BindDirective extends BaseNode {
         return expression.delete();
     }
 
-    
-
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -283,7 +268,7 @@ export class BindDirective extends BaseNode {
     removeItemInPlayground(logicItem: LogicItem): void;
 
     removeItemInPlayground(options: LogicItem) {
-        let logicItem: LogicItem = options;
+        const logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
@@ -345,7 +330,7 @@ export class BindDirective extends BaseNode {
                 modifiersString += '.' + key;
         });
         // eslint-disable-next-line no-nested-ternary
-        let value = this.type !== 'string' ? this.value : this.value ? `'${this.value}'` : '';
+        let value = (this.type ?? 'string') !== 'string' ? this.value : this.value ? `'${this.value}'` : '';
         if (this.expression) {
             value = this.expression.toVue(options);
             if (this.expression.concept === 'StringLiteral') {

package/src/concepts/Interface__.ts

@@ -541,9 +541,25 @@ export class Interface extends BaseNode {
 
     /* 删除空数据模块 */
     deleteLogincAndModule() {
+        this.rootNode.emit('collect:start', {
+            actionMsg: `删除接口“${this.name}”`,
+        });
+
         this.delete();
+        this.deleteStructures();
+
+        if (this.module && this.module.interfaces.length === 0 && this.module.structures.length === 0) {
+            this.app.removeModuleInInterfaceDependencies(this.module);
+        }
+
+        // 结束修改 ，批量操作
+        this.rootNode.emit('collect:end');
+    }
+
+    /* 删除接口引用的数据结构 */
+    deleteStructures() {
+        // 需要过滤被其他接口同时引用的数据结构
 
-        // 删除接口引用的数据结构，需过滤被其他接口同时引用的数据结构
         const structures = (this.parentNode as Module).structures;
         // 递归找出 response/request 的 Body/Returns 引用的数据结构
         const getStructures = (typeAnnotation: TypeAnnotation, result: Array<Structure> = []) => {
@@ -566,19 +582,22 @@ export class Interface extends BaseNode {
         };
 
         const otherStructureMap: Record<string, number> = {};
-        (this.parentNode as Module).interfaces.filter((itf) => itf !== this).forEach((itf) => {
-            const params = itf.params || [];
-            const returns = itf.returns || [];
-            [...params, ...returns].forEach((p) => {
-                const strus = getStructures(p.typeAnnotation);
-                strus.forEach((s) => {
-                    if (!(s.name in otherStructureMap)) {
-                        otherStructureMap[s.name] = 0;
-                    }
-                    otherStructureMap[s.name]++;
+        // 找出其他接口引用的数据结构
+        (this.parentNode as Module).interfaces
+            .filter((itf) => itf !== this)
+            .forEach((itf) => {
+                const params = itf.params || [];
+                const returns = itf.returns || [];
+                [...params, ...returns].forEach((p) => {
+                    const strus = getStructures(p.typeAnnotation);
+                    strus.forEach((s) => {
+                        if (!(s.name in otherStructureMap)) {
+                            otherStructureMap[s.name] = 0;
+                        }
+                        otherStructureMap[s.name]++;
+                    });
                 });
             });
-        });
         const params = this.params || [];
         const returns = this.returns || [];
         [...params, ...returns].forEach((p) => {
@@ -589,10 +608,6 @@ export class Interface extends BaseNode {
                 }
             });
         });
-
-        if (this.module && this.module.interfaces.length === 0 && this.module.structures.length === 0) {
-            this.app.removeModuleInInterfaceDependencies(this.module);
-        }
     }
     /**
      * 设置逻辑名称

package/src/concepts/ProcessElement__.ts

@@ -1,6 +1,5 @@
 import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
 import { genUserTaskLogic, getPreviousTask, syncMemberExpression, getFlowAfterElements, isFromStartNode, getFlowBeforeElements } from '../server/getProcesses';
-import naslServer from '@nasl/server';
 import Namespace from './Namespace__';
 import View from './View__';
 //================================================================================
@@ -258,7 +257,7 @@ export class ProcessElement extends BaseNode {
         });
     }
 
-        getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
+    getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return (this.bindEvents || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -1110,7 +1109,7 @@ export class ProcessElement extends BaseNode {
     }
 
 
-    
+
 
     /**
     * 删除元素绑定事件
@@ -1560,9 +1559,12 @@ export class ProcessElement extends BaseNode {
                 const view = destination.viewNode;
                 const name = this.uniqueTaskId(view);
                 const node = view.params.find((param: any) => param.name === name);
-                const refsList = await naslServer._isHaveRef(node);
-                const usagelist = refsList.filter((refs: any) => refs.lineText.includes(name));
-                if (usagelist.length <= 2)
+                if (!node)
+                    return;
+                const UsageMap = await node.findUsage();
+                const usageNodes = UsageMap.get(this.process);
+                // console.log(UsageMap, usageNodes)
+                if (!UsageMap.size || (UsageMap.size === 1 && usageNodes && (!usageNodes.children || usageNodes.children.length === 1)))
                     view.removeParam(name);
             }
         }));

package/src/concepts/SqlQueryComponent__.ts

@@ -1,4 +1,7 @@
 import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
+import StructureProperty from './StructureProperty__';
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -151,6 +154,142 @@ export class SqlQueryComponent extends LogicItem {
         });
     }
 
+    getVariableTs(state?: TranslatorState) {
+        const str = this.code;
+        const variables = [];
+        let code = '';
+        let temp: any;
+        const re = /(\#|\$)\{(.+?)\}/g;
+        while (temp = re.exec(str)) {
+            variables.push(temp[2]);
+        }
+        variables.forEach((variable: String) => {
+            const content = variable.replaceAll(' ', '');
+            code += indent((state?.tabSize || 0) + 2);
+            code += content + ';\n';
+        });
+        return code;
+    }
+
+    getTypeBanError() {
+        let sqlTypeBan = false;
+        if (this.typeAnnotation) {
+            const getSqlTypeBan = (typeAnnotation: TypeAnnotation) => {
+                const ref = this.getSelectRef(typeAnnotation);
+                if (ref?.length) {
+                    ref.forEach((item: StructureProperty) => {
+                        // 如果有类型但是类型不是基本类型，就需要打开开关，注入变量
+                        if (item?.typeAnnotation && item.typeAnnotation.typeNamespace !== 'nasl.core' && !(item.typeAnnotation.typeNamespace.endsWith('.enums'))) {
+                            sqlTypeBan = true;
+                        }
+                    });
+                }
+            };
+            if (this.typeAnnotation.typeArguments?.length) {
+                // list 就去校验一下内部的类型
+                if (this.typeAnnotation.typeName === 'List') {
+                    this.typeAnnotation.typeArguments.forEach((item) => {
+                        getSqlTypeBan(item);
+                    });
+                } else {
+                    // 别的都不放开
+                    sqlTypeBan = true;
+                }
+            } else {
+                getSqlTypeBan(this.typeAnnotation);
+            }
+        }
+        return sqlTypeBan;
+    }
+    getQueryComponentTsCode(state?: TranslatorState):string {
+        let tsCode = '';
+        // let sqlParser: null | any = null;
+        // let sqlParserErr: null | any = null;
+
+        if (!this.code)
+            return tsCode;
+        /**
+             * 处理变量，因为解析code，因为sql中不支持
+             * #{变量}这种写法
+             * 而且不支持a.b.c这种写法保留前两个，翻译的时候补上去
+             * 如果是多个.链接的变量就转换成nasl变量，让他可以翻译，等后面在把值换回来
+             */
+
+        /**
+        try {
+            const newCode = this.code.replace(/\#|\$\{(.+?)\}/g, (value, content) => {
+                console.log(content)
+                const len = content.split('.').length;
+                console.log(len, content, content.split('.'), content, content.split('.').length)
+                if (len > 2) {
+                    return '__NASL__SQL__' + content.replaceAll('.', '_');
+                }
+                return content;
+            });
+            console.log(newCode);
+            // 生成对应的sqlts 和 产生sourceMap对应
+            sqlParser = SQLParser(newCode || '', 0, this.dataSource);
+        } catch (err) {
+            sqlParserErr = err;
+        }
+        console.log(sqlParser, sqlParserErr);
+        if (sqlParserErr) {
+            tsCode += '__SQL_GRAMMAR_ERROR__';
+        } else if (sqlParser) {
+            // 解析内部变量，先看是不是未知变量
+            // 使用 tableList 和 columnList
+            tsCode += this.getContentVariable(sqlParser, state);
+        }
+         */
+
+        try {
+            tsCode += this.getVariableTs(state);
+        } catch (err) {
+            console.log(err);
+        }
+        return tsCode;
+    }
+
+    getSelectRef(newTypeAnnotation: TypeAnnotation) {
+        try {
+            const { typeName, typeKind, typeNamespace } = newTypeAnnotation || this.typeAnnotation;
+            let completionChildren;
+            if (typeKind === 'reference') {
+                if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process') {
+                    const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
+                    const properties = node.properties || [];
+                    completionChildren = properties;
+                } else if (typeNamespace.endsWith('.enums')) {
+                    completionChildren = undefined;
+                } else {
+                    const node = getNodeByNodeCallee(this.app, typeNamespace + '.' + typeName);
+                    const properties = node.properties || [];
+                    completionChildren = properties;
+                }
+            } else if (typeKind === 'generic') {
+                // if (typeNamespace === 'nasl.collection' || typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.interface') {
+                // }
+                const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
+                const properties = [...node.properties] || [];
+                for (let i = 0; i < properties.length; i++) {
+                    const item = properties[i];
+                    if (item?.typeAnnotation?.typeKind === 'typeParam') {
+                        const newItem = StructureProperty.from(item.toJSON());
+                        newItem.typeAnnotation = this?.typeAnnotation?.typeArguments[0];
+                        newItem.parentNode = this;
+                        properties[i] = newItem;
+                    }
+                }
+                completionChildren = properties;
+            } else {
+                completionChildren = undefined;
+            }
+            return completionChildren;
+        } catch (err) {
+            console.log(err);
+        }
+    }
+
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         let code;
@@ -164,11 +303,13 @@ export class SqlQueryComponent extends LogicItem {
         // app.dataSources.defaultDS;
         if (this.dataSource) {
             code += indent((state?.tabSize || 0) + 1);
-            code += `const dataSource = app.dataSources.${this.dataSource};`;
+            code += `const dataSource = app.dataSources.${this.dataSource};\n`;
         }
+        // 生成内部的ts内容
+        code += this.getQueryComponentTsCode(state);
         code += '\n';
         code += indent((state?.tabSize || 0) + 1) + 'return;\n';
-        code += indent((state?.tabSize || 0)) + '})();\n';
+        code += indent((state?.tabSize || 0)) + '})()';
         return code;
     }
 

package/src/concepts/Variable__.ts

@@ -238,7 +238,6 @@ export class Variable extends BaseNode {
             code += ': ';
             code += this.typeAnnotation.toEmbeddedTS(shiftState(state, code));
         }
-        code += ';';
         return code;
     }
 

package/src/concepts/ViewElement__.ts

@@ -301,8 +301,6 @@ export class ViewElement extends BaseNode {
         super.subConstructor(source);
     }
 
-
-
     /**
      * 从父级删除该节点
      * @internal
@@ -351,7 +349,7 @@ export class ViewElement extends BaseNode {
         });
     }
 
-        getBindAttributeExistingNames(excludedList: Array<BindAttribute> = []) {
+    getBindAttributeExistingNames(excludedList: Array<BindAttribute> = []) {
         const excludedSet = new Set(excludedList);
         return (this.bindAttrs || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -492,7 +490,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
     getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return (this.bindEvents || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -634,7 +631,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
     getBindDirectiveExistingNames(excludedList: Array<BindDirective> = []) {
         const excludedSet = new Set(excludedList);
         return (this.bindDirectives || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -776,11 +772,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
-
-
-
-
     /**
     * 插入页面元素
     * @internal
@@ -914,9 +905,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除元素绑定属性
     * @param name 元素绑定属性名称
@@ -965,8 +953,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -1015,8 +1001,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素指令
     * @param name 元素指令名称
@@ -1065,8 +1049,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除页面元素
     * @param name 页面元素名称
@@ -1715,7 +1697,9 @@ export class ViewElement extends BaseNode {
                 const emptySlot = api && api.slots && api.slots.find((slot) => slot.name === 'default' && slot['empty-background']);
                 const hasSupport = api && api.slots && api.slots.some((slot) => slot.support);
                 if (emptySlot || hasSupport) {
-                    let childEmpty = !el.children.length;
+                    // 有些限制的组件如侧边栏分组有title插槽但要限制子元素放入
+                    const validChildren = el.children.filter((elem) => !(elem.tag === 'template' && elem.slotTarget !== 'default'));
+                    let childEmpty = !validChildren.length;
                     const defaultSlot = el.children.find((elem) => elem.tag === 'template' && elem.slotTarget === 'default');
                     if (defaultSlot) {
                         childEmpty = !defaultSlot.children.length;
@@ -1803,6 +1787,14 @@ export class ViewElement extends BaseNode {
         });
         newOptions.getExtraParts(this).forEach((part) => parts.push(part));
 
+        if (['u-modal', 'u-drawer'].includes(this.tag)) {
+            this.children.forEach((citem) => {
+                if (citem.tag === 'template' && !citem.children.length) {
+                    parts.push(`:is-${citem.slotTarget}-slot-empty=true`);
+                }
+            });
+        }
+
         let partsLength = 0;
         let partsString = '';
         parts.forEach((part) => {

package/src/generator/genMetaData.ts

@@ -1,42 +1,61 @@
-import { App, Module, View, BaseNode, Entity, Structure, Enum, uiStructures, collectionStructures, processStructures, Logic, Interface, Process } from '../concepts';
+import { App, View, BaseNode, Module, Interface, Entity, Structure, Enum, uiStructures, collectionStructures, processStructures, Logic, Process, DataSource } from '../concepts';
 
-export function genMetaData(app: App) {
+export function genMetaData(app: App,
+    config: {
+        tenant: string;
+        env: string;
+        nuimsDomain: string;
+        envNuimsDomain: Object;
+        STATIC_URL: string;
+        USER_STATIC_URL: string;
+        extendedConfig: string;
+        lowcodeDomain: string;
+    }) {
     const modules: Module[] = [];
     const views: View[] = [];
-    const entities: Entity[] = [];
+    const dataSources: DataSource[] = [];
     const structures: Structure[] = [];
     const enums: Enum[] = [];
     const logics: Logic[] = [];
     const interfaces: Interface[] = [];
     const processes: Process[] = [];
-    if (Array.isArray(app.dataSources)) {
-        app.dataSources.forEach((dataSource) => {
-            if (Array.isArray(dataSource.entities)) {
-                entities.push(...dataSource.entities);
-            }
-        });
+
+    const {
+        dataSources: appDataSources = [],
+        structures: appStructures = [],
+        enums: appEnums = [],
+        logics: appLogics = [],
+        interfaceDependencies: appInterfaceDependencies = [],
+        dependencies: appDependencies = [],
+        processes: appProcesses = [],
+    } = app || {};
+    dataSources.push(...appDataSources);
+    structures.push(...appStructures);
+    enums.push(...appEnums);
+    logics.push(...appLogics);
+    processes.push(...appProcesses);
+    if (Array.isArray(appDependencies)) {
+        modules.push(...appDependencies);
+    }
+    if (Array.isArray(appInterfaceDependencies)) {
+        modules.push(...appInterfaceDependencies);
     }
-    app.structures && structures.push(...app.structures);
-    app.enums && enums.push(...app.enums);
-    app.logics && logics.push(...app.logics);
-    app.processes && processes.push(...app.processes);
-    app.dependencies && modules.push(...app.dependencies);
-    app.interfaceDependencies && modules.push(...app.interfaceDependencies);
     modules.forEach((module: Module) => {
-        module.views && views.push(...module.views);
-        module.structures && structures.push(...module.structures);
-        module.enums && enums.push(...module.enums);
-        module.logics && logics.push(...module.logics);
-        module.interfaces && interfaces.push(...module.interfaces);
-        if (Array.isArray(module.dataSources)) {
-            module.dataSources.forEach((dataSource) => {
-                if (Array.isArray(dataSource.entities)) {
-                    entities.push(...dataSource.entities);
-                }
-            });
-        }
+        const {
+            views: moduleViews = [],
+            structures: moduleStructures = [],
+            enums: moduleEnums = [],
+            logics: moduleLogics = [],
+            interfaces: moduleInterfaces = [],
+        } = module;
+        views.push(...moduleViews);
+        structures.push(...moduleStructures);
+        enums.push(...moduleEnums);
+        logics.push(...moduleLogics);
+        interfaces.push(...moduleInterfaces);
     });
     const dataTypes: (Entity | Structure | Enum)[] = [];
+
     const dataTypesMap: {
         [id: string]: BaseNode;
     } = {};
@@ -61,7 +80,6 @@ export function genMetaData(app: App) {
         [id: string]: any;
     } = {};
     const allLogics: Logic[] = [];
-
     if (Array.isArray(enums)) {
         dataTypes.push(...enums);
         enums.forEach((node) => {
@@ -75,20 +93,20 @@ export function genMetaData(app: App) {
             enumsMap[name] = enumObj;
         });
     }
-
-    if (Array.isArray(entities)) {
-        dataTypes.push(...entities);
-        entities.forEach((entity) => {
-            const ns = entity.ns;
-            if (Array.isArray(ns?.logics)) {
-                allLogics.push(...ns.logics);
-            }
+    if (Array.isArray(dataSources)) {
+        dataSources.forEach((dataSource) => {
+            dataSource.entities.forEach((entity) => {
+                dataTypes.push(entity);
+                const ns = entity.ns;
+                if (Array.isArray(ns?.logics)) {
+                    allLogics.push(...ns.logics);
+                }
+            });
         });
     }
     if (Array.isArray(structures)) {
         dataTypes.push(...structures);
     }
-    // console.log(dataTypes);
 
     dataTypes.forEach((node) => {
         const namespace = node.getNamespace();

package/src/server/extendBaseNode.ts

@@ -207,13 +207,20 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
                 // 如果没有别的文件的依赖，就直接delete
                 if (!find) {
                     if (node instanceof Process) {
-                        node.elements.forEach((ele) => ele.isUserTask && ele.cancelBindDelete(true));
+                        const App = this.rootNode;
+                        App.emit('collect:start', {
+                            actionMsg: `删除流程${node.name}`,
+                        });
+                        await Promise.all(node.elements.map((ele) => ele.isUserTask && ele.cancelBindDelete(true)));
+                        this.delete();
+                        App.emit('collect:end');
+                    } else {
+                        this.delete();
                     }
-                    this.delete();
                     return;
                 }
             }
-            callback = () => {
+            callback = async () => {
                 // removeParam
                 // 跟rename 还不太一样，部分修改依赖修改好的值，然后在下面的修改需要把自己传递进去
                 if (node instanceof Param) {
@@ -299,8 +306,13 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
                     this.delete();
                 }
                 if (node instanceof Process) {
-                    node.elements.forEach((ele) => ele.isUserTask && ele.cancelBindDelete(true));
+                    const App = this.rootNode;
+                    App.emit('collect:start', {
+                        actionMsg: `删除流程${node.name}`,
+                    });
+                    await Promise.all(node.elements.map((ele) => ele.isUserTask && ele.cancelBindDelete(true)));
                     this.delete();
+                    App.emit('collect:end');
                 }
                 // 其余的都直接调用删除
                 // Structure 和 Interface是内部有delete方法

package/src/server/naslServer.ts

@@ -652,6 +652,20 @@ const naslServer = {
                 }
             }
         }
+        if (fileNode instanceof Logic) {
+            fileNode?.sourceMap.forEach((value, node) => {
+                // SqlQueryComponent内部返回值类型，如果是嵌套的就需要报错
+                if (node instanceof SqlQueryComponent && node.getTypeBanError()) {
+                    const diagnostic = {
+                        node,
+                        severity: 'error',
+                        message: 'SQL查询：返回类型内部,不支持复杂类型。',
+                    };
+                    node.tsErrorDetail = diagnostic;
+                    diagnostics.push(diagnostic);
+                }
+            });
+        }
 
         return diagnostics;
     },

package/src/server/translator.ts

@@ -226,6 +226,10 @@ const TS_RULES: Array<{
         re: /Cannot find name '__(?:EMPTY_AGGREGATE_ALIAS)__'/,
         result: '数据查询：聚合函数别名不能为空。',
     },
+    {
+        re: /Cannot find name '__(?:SQL_GRAMMAR_ERROR)__'/,
+        result: 'SQL查询：语句可能有异常。',
+    },
     {
         re: /Cannot find name '__UsersEmpty__'./,
         result: '任务完成人为空',