@lcap/nasl 1.0.2 → 2.12.0

package/src/concepts/StructureProperty__.ts

@@ -171,10 +171,6 @@ export class StructureProperty extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
     * 删除类型标注
     * @param name 类型标注名称
@@ -251,7 +247,7 @@ export class StructureProperty extends BaseNode {
             const { typeName, typeKind, typeNamespace } = this.typeAnnotation;
             let completionChildren;
             if (typeKind === 'reference') {
-                if (typeNamespace === 'nasl.ui') {
+                if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process') {
                     const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
                     const properties = node.properties || [];
                     completionChildren = properties;
@@ -284,9 +280,10 @@ export class StructureProperty extends BaseNode {
             code += ': ';
             code += this.typeAnnotation.toEmbeddedTS(shiftState(state, code));
         }
-        if (this.defaultValue) {
-            code += ` = ${this.defaultValue}`;
-        } // else
+        // StructureProperty 暂不支持默认值
+        // if (this.defaultValue) {
+        //     code += ` = ${this.defaultValue}`;
+        // }
         return code;
     }
 
@@ -345,7 +342,7 @@ export class StructureProperty extends BaseNode {
     //================================================================================
 }
 
-classMap['StructureProperty'] = StructureProperty;
+classMap.StructureProperty = StructureProperty;
 export default StructureProperty;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Structure__.ts

@@ -531,34 +531,42 @@ export class Structure extends BaseNode {
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         let code = `export class ${this.tsName} {\n`;
-        code += indent(state.tabSize + 1);
+        code += indent((state?.tabSize || 0) + 1);
         code += `__name: '${this.getTsNamespace()}.${this.tsName}';\n`;
         this.properties.forEach((property) => {
-            code += indent(state.tabSize + 1);
+            code += indent((state?.tabSize || 0) + 1);
             code += property.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
             code += ';\n';
         });
-        code += indent(state.tabSize) + '}\n';
+        code += indent((state?.tabSize || 0)) + '}\n';
 
         return code;
     }
 
     getNamespace() {
         if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
-            return `${(this.parentNode as Namespace).getNamespace()}.structures`;
+            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 `${arr.join('.')}.structures`;
         } else
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }
 
     getTsNamespace() {
-        if (this.parentNode.concept === 'App') {
-            return `${(this.parentNode as Namespace).getNamespace()}.structures`;
-        } else {
-            if (this.parentNode && (this.parentNode as Namespace).getTsNamespace) {
-                return `${(this.parentNode as Namespace).getTsNamespace()}.structures`;
-            } else {
-                throw new Error('无法获取命名空间，请设置 parentNode！');
+        if (this.parentNode && (this.parentNode as Namespace).getTsNamespace) {
+            const parentNamespace = (this.parentNode as Namespace).getTsNamespace();
+            const parentName = this.parentNode.tsName || this.parentNode.name;
+            const arr = [parentNamespace];
+            if (this.parentNode.concept !== 'App' && parentName) {
+                arr.push(parentName);
             }
+            return `${arr.join('.')}.structures`;
+        } else {
+            throw new Error('无法获取命名空间，请设置 parentNode！');
         }
     }
 

package/src/concepts/SwitchCase__.ts

@@ -241,37 +241,33 @@ export class SwitchCase extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
-    toJS(state?: TranslatorState, isLast?: boolean): string {
+    toJS(state?: TranslatorState, index?: number, length?: number): string {
         let code = '';
-        if (!isLast) {
+        if (index === 0) {
             code = 'if (';
             code += this.test ? this.test.toJS(shiftState(state, code, {
                 tabSize: 0,
             })) : '';
-
             code += ') {\n';
-
-            if (Array.isArray(this.consequent)) {
-                this.consequent.forEach((logicItem) => {
-                    code
-                        += logicItem.toJS(shiftState(state, code, {
-                            tabSize: 0,
-                        })) + '\n';
-                });
-            }
-            code += '}\n';
+        } else if (index !== length - 1) {
+            code = 'else if (';
+            code += this.test ? this.test.toJS(shiftState(state, code, {
+                tabSize: 0,
+            })) : '';
+            code += ') {\n';
         } else {
             code += 'else {\n';
-            if (Array.isArray(this.consequent)) {
-                this.consequent.forEach((logicItem) => {
-                    code
-                        += logicItem.toJS(shiftState(state, code, {
-                            tabSize: 0,
-                        })) + '\n';
-                });
-            }
-            code += '}\n';
         }
+        if (Array.isArray(this.consequent)) {
+            this.consequent.forEach((logicItem) => {
+                code
+                    += logicItem.toJS(shiftState(state, code, {
+                        tabSize: 0,
+                    })) + '\n';
+            });
+        }
+        code += '}\n';
+
         return code;
     }
 
@@ -281,7 +277,7 @@ export class SwitchCase extends LogicItem {
         if (!isLast) {
             code += 'if (nasl.core.ensureBoolean(';
             code += this.test ? this.test.toEmbeddedTS(shiftState(state, code, {
-                tabSize: state.tabSize + 1,
+                tabSize: (state?.tabSize || 0) + 1,
             })) : '__IDENTIFIER__';
 
             code += ')) {\n';
@@ -290,22 +286,22 @@ export class SwitchCase extends LogicItem {
                 this.consequent.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';
         } else {
             code += 'else {\n';
             if (Array.isArray(this.consequent)) {
                 this.consequent.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/SwitchStatement__.ts

@@ -213,11 +213,7 @@ export class SwitchStatement extends LogicItem {
         let code = '';
         this.cases.forEach((item, index) => {
             // 如果是最后一项
-            if (index === this.cases.length - 1) {
-                code += item.toJS(state, true);
-            } else {
-                code += item.toJS(state);
-            }
+            code += item.toJS(state, index, this.cases.length);
         });
         return code;
     }

package/src/concepts/TypeAnnotation__.ts

@@ -258,6 +258,35 @@ export class TypeAnnotation extends BaseNode {
         }
     }
 
+    /**
+     * 用于展示的 type 标题
+     */
+    get headTitle(): string {
+        if (this.typeKind === 'primitive') {
+            return `${this.typeName} ${PRIMITIVE_TITLE[this.typeName]}`;
+        } else if (this.typeKind === 'reference') {
+            const typeNamespace = this?.typeNamespace;
+            let typeTitle = this.typeName;
+            if (typeNamespace && this.rootNode) {
+                const entity = (this.rootNode as any).findNodeByCompleteName([typeNamespace, this?.typeName].join('.'));
+                if (entity?.concept === 'Entity') {
+                    const dataSourceName = entity.dataSource?.name;
+                    if (dataSourceName) {
+                        typeTitle += `（${dataSourceName}）`;
+                    }
+                }
+            }
+            return typeTitle;
+        } else if (this.typeKind === 'generic') {
+            if (this.typeArguments && this.typeArguments.length)
+                return `${this.typeName}<${(this.typeArguments || []).map((arg) => arg.headTitle || 'T')}>`;
+            else
+                return this.typeName;
+        } else {
+            return this.typeName;
+        }
+    }
+
     /**
      * 用于展示的 type 标题
      */
@@ -265,11 +294,11 @@ export class TypeAnnotation extends BaseNode {
         if (this.typeKind === 'primitive') {
             return `${this.typeName} ${PRIMITIVE_TITLE[this.typeName]}`;
         } else if (this.typeKind === 'reference') {
-            return `${this.typeName}`;
+            return this.typeName;
         } else if (this.typeKind === 'generic') {
             let str = `${this.typeName}`;
             const loop = (typeArguments: Array<TypeAnnotation>) => {
-                str += '<' + (typeArguments[0].typeName || 'T');
+                str += '<' + (typeArguments[0].typeTitle || 'T');
                 if (typeArguments[0].typeKind === 'generic') {
                     if (this.typeArguments && this.typeArguments.length) {
                         loop(typeArguments[0].typeArguments);
@@ -329,6 +358,18 @@ export class TypeAnnotation extends BaseNode {
         });
     }
 
+    /**
+     * 设置类型字段名称
+     */
+    setTypeNamespace(typeNamespace: string) {
+        const object = {
+            typeNamespace,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
     get tsCalleeNamespace() {
         if (this.typeNamespace) {
             let tsCalleeNamespace = this.typeNamespace;

package/src/concepts/Variable__.ts

@@ -329,7 +329,7 @@ export class Variable extends BaseNode {
             const { typeName, typeKind, typeNamespace } = newTypeAnnotation || this.typeAnnotation;
             let completionChildren;
             if (typeKind === 'reference') {
-                if (typeNamespace === 'nasl.ui') {
+                if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process') {
                     const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
                     const properties = node.properties || [];
                     completionChildren = properties;

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', 'devopsDragTable'];
+        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;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑