@lcap/nasl 1.0.1 → 2.12.0-beta.1

package/src/concepts/ViewElement__.ts

@@ -262,8 +262,6 @@ export class ViewElement extends BaseNode {
         super.subConstructor(source);
     }
 
-
-
     /**
      * 从父级删除该节点
      * @internal
@@ -300,7 +298,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);
     }
@@ -441,7 +439,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);
@@ -583,7 +580,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);
@@ -725,11 +721,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
-
-
-
-
     /**
     * 插入页面元素
     * @internal
@@ -863,9 +854,6 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除元素绑定属性
     * @param name 元素绑定属性名称
@@ -914,8 +902,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -964,8 +950,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素指令
     * @param name 元素指令名称
@@ -1014,8 +998,6 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除页面元素
     * @param name 页面元素名称
@@ -1120,7 +1102,7 @@ export class ViewElement extends BaseNode {
 
     haveScope(node: ViewElement): boolean {
         // uGallery 没有子集不需要scope
-        const dataSourcePcList = ['uTableView', 'uListView', 'uGridView', 'uCalendarView', 'uListComponents', 'uSelect'];
+        const dataSourcePcList = ['uTableView', 'uListView', 'uGridView', 'uCalendarView', 'uListComponents', 'uSelect', 'devopsDragTable', 'uTreeViewNew', 'uTreeSelectNew'];
         const dataSourceH5List = ['vanRadioGroup', 'vanCheckboxGroup', 'vanListView', 'vanGridView', 'vanForComponents', 'lcapEchartsLine', 'lcapEchartsBar', 'lcapEchartsPie'];
         const dataSourceList = [...dataSourcePcList, ...dataSourceH5List];
         return dataSourceList.includes(node.toHump(node.tag));
@@ -1132,7 +1114,7 @@ export class ViewElement extends BaseNode {
         let code = '';
         // formItem的单独处理
         if (this.tag === 'u-form-item') {
-            code = indent(state.tabSize) + `${this.name}: nasl.ui.${this.toHump(this.tag)}`;
+            code = indent((state?.tabSize || 0)) + `${this.name}: nasl.ui.${this.toHump(this.tag)}`;
             if (Array.isArray(this.children) && this.children.length) {
                 const tag = this.children[0].tag;
                 if (tag === 'u-input') {
@@ -1185,9 +1167,9 @@ export class ViewElement extends BaseNode {
                     }
                 }
             }
-            code += indent(state.tabSize) + `${this.name}: nasl.ui.${this.toHump(this.tag)}<${genericType}>;\n`;
+            code += indent((state?.tabSize || 0)) + `${this.name}: nasl.ui.${this.toHump(this.tag)}<${genericType}>;\n`;
         } else {
-            code = indent(state.tabSize) + `${this.name}: nasl.ui.${this.toHump(this.tag)}<any>;\n`;
+            code = indent((state?.tabSize || 0)) + `${this.name}: nasl.ui.${this.toHump(this.tag)}<any>;\n`;
         }
         if (Array.isArray(this.children)) {
             this.children.forEach((element) => {
@@ -1217,14 +1199,14 @@ export class ViewElement extends BaseNode {
         }
         // 角色
         if (Array.isArray(this.bindRoles) && this.bindRoles.length) {
-            code += indent(state.tabSize + 2);
+            code += indent((state?.tabSize || 0) + 2);
             code += 'roles = [\n';
             this.bindRoles.forEach((role) => {
-                code += indent(state.tabSize + 3);
+                code += indent((state?.tabSize || 0) + 3);
                 code += `${this.app.getNamespace()}.roles.${chineseTsName(role)}.${chineseTsName(role)},`;
                 code += '\n';
             });
-            code += indent(state.tabSize + 2);
+            code += indent((state?.tabSize || 0) + 2);
             code += '],\n';
         }
         // 绑定属性
@@ -1233,7 +1215,7 @@ export class ViewElement extends BaseNode {
                 // 跳转页面
                 if (attr.destination) {
                     code += attr.destination.toEmbeddedTS(shiftState(state, code, {
-                        tabSize: state.tabSize,
+                        tabSize: (state?.tabSize || 0),
                     }));
                 }
             });
@@ -1244,7 +1226,7 @@ export class ViewElement extends BaseNode {
         if (Array.isArray(this.bindEvents)) {
             this.bindEvents.forEach((event) => {
                 code += event.toEmbeddedTS(shiftState(state, code, {
-                    tabSize: state.tabSize + 2,
+                    tabSize: (state?.tabSize || 0) + 2,
                 }));
                 code += '\n';
             });
@@ -1252,7 +1234,7 @@ export class ViewElement extends BaseNode {
 
         // 子元素
         if (Array.isArray(this.children)) {
-            code += indent(state.tabSize + 1);
+            code += indent((state?.tabSize || 0) + 1);
 
             if (Array.isArray(this.bindAttrs)) {
                 code += `bindAttr: () => [\n`;
@@ -1260,7 +1242,7 @@ export class ViewElement extends BaseNode {
                     if (attr.expression) {
                         code
                             += attr.expression.toEmbeddedTS(shiftState(state, code, {
-                                tabSize: state.tabSize + 2,
+                                tabSize: (state?.tabSize || 0) + 2,
                             })) + ',\n';
                     }
                     if (Array.isArray(attr.rules) && attr.rules.length) {
@@ -1273,11 +1255,11 @@ export class ViewElement extends BaseNode {
                     if (directive.expression) {
                         code
                             += directive.expression.toEmbeddedTS(shiftState(state, code, {
-                                tabSize: state.tabSize + 2,
+                                tabSize: (state?.tabSize || 0) + 2,
                             })) + ',\n';
                     }
                 });
-                code += indent(state.tabSize + 2) + '],\n';
+                code += indent((state?.tabSize || 0) + 2) + '],\n';
             }
 
             let levelIndex = parentLevel || 0;
@@ -1290,15 +1272,15 @@ export class ViewElement extends BaseNode {
 
             this.children.forEach((element) => {
                 code += element.toEmbeddedTS(shiftState(state, code, {
-                    tabSize: state.tabSize + 2,
+                    tabSize: (state?.tabSize || 0) + 2,
                 }), levelIndex);
                 code += '\n';
             });
-            code += indent(state.tabSize + 1);
+            code += indent((state?.tabSize || 0) + 1);
             code += ']\n';
         }
 
-        code += indent(state.tabSize) + '}),\n';
+        code += indent((state?.tabSize || 0)) + '}),\n';
 
         return code;
     }
@@ -1550,7 +1532,7 @@ export class ViewElement extends BaseNode {
                 tag: tagName,
                 name: view.getViewElementUniqueName(`${baseName}1`),
             });
-            const value = astNode.text.match(/{{(.*?)}}/)[1].trim();
+            const value = astNode.text?.match(/{{(.*?)}}/)[1].trim();
             const expression = <any> this._parseExpression(value);
             element.addBindAttribute(new BindAttribute({
                 type: 'dynamic',
@@ -1568,7 +1550,7 @@ export class ViewElement extends BaseNode {
             element.addBindAttribute(new BindAttribute({
                 name: 'text',
                 type: 'string',
-                value: astNode.text,
+                value: astNode.text?.trim(),
             }));
         }
         return element;
@@ -1615,6 +1597,11 @@ export class ViewElement extends BaseNode {
                     const apiOfAttr = api && api.attrs && api.attrs.find((_attr) => _attr.name === attr.name);
                     if (apiOfAttr && apiOfAttr['designer-value'] !== undefined) {
                         let designerValue = apiOfAttr['designer-value'];
+                        //对流程模板拖拽进行特判
+                        element.bindAttrs.forEach((property) => {
+                            if (property.name === 'repeat' && property.value === '1')
+                                designerValue = '[{}, {}]';
+                        });
                         if (typeof designerValue === 'string') {
                             designerValue = designerValue.replace(/"/g, "'");
                         }
@@ -1673,7 +1660,7 @@ export class ViewElement extends BaseNode {
                             if (hasAuto)
                                 addEmpty = false;
                         }
-                        if (['u-select', 'u-dropdown', 'u-panel'].includes(el.tag)) {
+                        if (['u-select', 'u-dropdown', 'u-panel', 'u-toc', 'u-toc-item', 'u-tree-view-new', 'u-tree-view-node-new', 'u-tree-select', 'u-tree-select-new', 'u-anchor'].includes(el.tag)) {
                             addEmpty = false;
                         }
                         const background = (emptySlot && emptySlot['empty-background']) || (hasSupport ? 'add-sub' : '');
@@ -1801,7 +1788,7 @@ export class ViewElement extends BaseNode {
     //================================================================================
 }
 
-classMap['ViewElement'] = ViewElement;
+classMap.ViewElement = ViewElement;
 export default ViewElement;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/View__.ts

@@ -234,7 +234,7 @@ export class View extends BaseNode {
         });
     }
 
-    
+
 
     /**
     * 插入页面元素
@@ -370,12 +370,8 @@ export class View extends BaseNode {
     }
 
 
-    getParamExistingNames(excludedList: Array<Param> = []) {
-        const excludedSet = new Set(excludedList);
-        return (this.params || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
-    }
     getParamUniqueName(name = 'param1') {
-        return utils.unique(name, this.getParamExistingNames(), undefined, false);
+        return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
 
     /**
@@ -512,12 +508,8 @@ export class View extends BaseNode {
     }
 
 
-    getVariableExistingNames(excludedList: Array<Variable> = []) {
-        const excludedSet = new Set(excludedList);
-        return (this.variables || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
-    }
     getVariableUniqueName(name = 'variable1') {
-        return utils.unique(name, this.getVariableExistingNames(), undefined, false);
+        return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
 
     /**
@@ -654,10 +646,6 @@ export class View extends BaseNode {
     }
 
 
-    getLogicExistingNames(excludedList: Array<Logic> = []) {
-        const excludedSet = new Set(excludedList);
-        return (this.logics || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
-    }
     getLogicUniqueName(name = 'logic1') {
         return utils.unique(name, this.getLogicExistingNames(), undefined, false);
     }
@@ -1082,7 +1070,7 @@ export class View extends BaseNode {
     }
 
 
-    
+
 
     /**
     * 删除页面元素
@@ -1545,6 +1533,21 @@ export class View extends BaseNode {
         this.emit('change', $event);
     }
 
+    getLogicExistingNames(excludedList: Array<Logic> = []) {
+        const excludedSet = new Set(excludedList);
+        const varList: any[] = [];
+        if (Array.isArray(this.params)) {
+            varList.push(...this.params);
+        }
+        if (Array.isArray(this.variables)) {
+            varList.push(...this.variables);
+        }
+        if (Array.isArray(this.logics)) {
+            varList.push(...this.logics);
+        }
+        return varList.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    }
+
     getVarExistingNames(excludedList: Array<Param | Variable> = []) {
         const excludedSet = new Set(excludedList);
         const varList: any[] = [];
@@ -1556,6 +1559,7 @@ export class View extends BaseNode {
         }
         if (Array.isArray(this.logics)) {
             this.logics.forEach((logic) => {
+                varList.push(logic);
                 if (Array.isArray(logic.params)) {
                     varList.push(...logic.params);
                 }
@@ -1587,6 +1591,7 @@ export class View extends BaseNode {
             title: this.title,
             crumb: this.crumb,
             first: this.children.find((child) => child.isIndex)?.name,
+            auth: this.auth ? 'loginAuth' : undefined,
         };
         return `${componentOptions}
             ${translator(definition)}
@@ -1647,12 +1652,14 @@ export class View extends BaseNode {
     }
 
     getNamespace(): string {
-        if (this.parentNode) {
-            let parentNodeNamespace = (this.parentNode as Namespace).getNamespace();
-            if (this.parentNode.concept === 'View') {
-                parentNodeNamespace = `${(this.parentNode as View).getNamespace()}.${this.parentNode.name}`;
+        if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
+            const parentNamespace = (this.parentNode as Namespace).getNamespace();
+            const parentName = this.parentNode.name;
+            const arr = [parentNamespace];
+            if (this.parentNode.concept !== 'App' && parentName) {
+                arr.push(parentName);
             }
-            return `${parentNodeNamespace}.views`;
+            return `${arr.join('.')}.views`;
         } else
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }
@@ -1688,27 +1695,27 @@ export class View extends BaseNode {
         let code = `export namespace ${this.tsName} {\n`;
         // 角色
         if (Array.isArray(this.bindRoles) && this.bindRoles.length) {
-            code += indent(state.tabSize + 1);
+            code += indent((state?.tabSize || 0) + 1);
             code += 'export let __bindRoles = [\n';
             this.bindRoles.forEach((role) => {
-                code += indent(state.tabSize + 1);
+                code += indent((state?.tabSize || 0) + 1);
                 code += `${this.app.getNamespace()}.roles.${chineseTsName(role)}.${chineseTsName(role)},`;
                 code += '\n';
             });
             code += '\n';
-            code += indent(state.tabSize + 1);
+            code += indent((state?.tabSize || 0) + 1);
             code += '];\n';
         }
         if (Array.isArray(this.params)) {
             this.params.forEach((param) => {
-                code += indent(state.tabSize + 1) + 'let ';
+                code += indent((state?.tabSize || 0) + 1) + 'let ';
                 code += param.toEmbeddedTS(shiftState(state, code, { inline: true }));
                 code += ';\n';
             });
         }
         if (Array.isArray(this.variables)) {
             this.variables.forEach((variable) => {
-                code += indent(state.tabSize + 1) + 'let ';
+                code += indent((state?.tabSize || 0) + 1) + 'let ';
                 code += variable.toEmbeddedTS(shiftState(state, code, { inline: true }));
                 code += ';\n';
             });
@@ -1719,53 +1726,53 @@ export class View extends BaseNode {
         // 生成所有的name和类型定义
         this.elements.forEach((element) => {
             code += element.toEmbeddedTSDefinition(shiftState(state, code, {
-                tabSize: state.tabSize + 1,
+                tabSize: (state?.tabSize || 0) + 1,
             }));
         });
-        code += indent(state.tabSize + 1) + '}\n';
+        code += indent((state?.tabSize || 0) + 1) + '}\n';
         code += `let __elements: __elements;\n`;
         // 逻辑
         if (Array.isArray(this.logics) && this.logics.length) {
-            code += indent(state.tabSize + 1);
+            code += indent((state?.tabSize || 0) + 1);
             this.logics.forEach((logic) => {
                 code += logic.toEmbeddedTS(shiftState(state, code, {
-                    tabSize: state.tabSize + 2,
+                    tabSize: (state?.tabSize || 0) + 2,
                 }), 'noExport');
                 code += '\n';
             });
-            code += indent(state.tabSize + 1);
+            code += indent((state?.tabSize || 0) + 1);
         }
         // 事件
         if (Array.isArray(this.bindEvents)) {
             this.bindEvents.forEach((event) => {
                 code += event.toEmbeddedTS(shiftState(state, code, {
-                    tabSize: state.tabSize,
+                    tabSize: (state?.tabSize || 0),
                 }), true);
                 code += '\n';
             });
         }
 
         // render函数
-        code += '\n' + indent(state.tabSize + 1);
+        code += '\n' + indent((state?.tabSize || 0) + 1);
         code += `export function __render(`;
         code += `){\n`;
-        code += indent(state.tabSize);
+        code += indent((state?.tabSize || 0));
 
         // elements 元素
         if (Array.isArray(this.elements)) {
             // 生成嵌套式的内容
             this.elements.forEach((element) => {
                 code += element.toEmbeddedTS(shiftState(state, code, {
-                    tabSize: state.tabSize + 3,
+                    tabSize: (state?.tabSize || 0) + 3,
                 }));
                 code += '\n';
             });
         }
 
-        code += '\n' + indent(state.tabSize + 1) + '}\n';
+        code += '\n' + indent((state?.tabSize || 0) + 1) + '}\n';
 
         if (Array.isArray(this.params)) {
-            code += indent(state.tabSize + 1) + `export function $destination(options: {`;
+            code += indent((state?.tabSize || 0) + 1) + `export function $destination(options: {`;
             this.params.forEach((param, index) => {
                 code += param.name + '?: ';
                 code += param.typeAnnotation.toEmbeddedTS(shiftState(state, code));
@@ -1774,7 +1781,7 @@ export class View extends BaseNode {
             });
             code += '}){}\n';
         }
-        code += indent(state.tabSize) + '}\n';
+        code += indent((state?.tabSize || 0)) + '}\n';
         return code;
     }
 

package/src/concepts/WhileStatement__.ts

@@ -257,12 +257,12 @@ export class WhileStatement extends LogicItem {
             this.body.forEach((logicItem) => {
                 code
                     += logicItem.toJS(shiftState(state, code, {
-                        tabSize: state.tabSize + 1,
+                        tabSize: (state?.tabSize || 0) + 1,
                     })) + '\n';
             });
         }
 
-        code += indent(state.tabSize) + '}\n';
+        code += indent((state?.tabSize || 0)) + '}\n';
         return code;
     }
 
@@ -279,12 +279,12 @@ export class WhileStatement extends LogicItem {
             this.body.forEach((logicItem) => {
                 code
                     += logicItem.toEmbeddedTS(shiftState(state, code, {
-                        tabSize: state.tabSize + 1,
+                        tabSize: (state?.tabSize || 0) + 1,
                     })) + '\n';
             });
         }
 
-        code += indent(state.tabSize) + '}\n';
+        code += indent((state?.tabSize || 0)) + '}\n';
         return code;
     }
     //================================================================================

package/src/concepts/basics/stdlib/nasl.auth.ts

@@ -22,5 +22,25 @@ export default new Namespace({
             params: [],
             returns: [],
         }),
+        new Logic({
+            name: 'encryptByAES',
+            params: [
+                new Param({
+                    name: 'string',
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                }),
+            ],
+            returns: [],
+        }),
+        new Logic({
+            name: 'decryptByAES',
+            params: [
+                new Param({
+                    name: 'string',
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                }),
+            ],
+            returns: [],
+        }),
     ],
 });

package/src/concepts/basics/stdlib/nasl.configuration.ts

@@ -8,7 +8,7 @@ export default new Namespace({
     name: 'configuration',
     logics: [
         new Logic({
-            name: 'getConfig',
+            name: 'getCustomConfig',
             params: [
                 new Param({
                     name: 'name',

package/src/concepts/basics/stdlib/nasl.interface.ts

@@ -10,7 +10,7 @@ import { primitiveTypeList } from '../types/coreTypeList';
 import { reference2TypeAnnotationList } from './reference2TypeAnnotationList';
 import TypeParam from '../../TypeParam__';
 
-const interfaceStructures = [
+export const interfaceStructures = [
     new Structure({
         name: 'ApiReturnOf',
         typeParams: [