@lcap/nasl 1.0.1 → 2.12.0-beta.1

package/src/concepts/Role__.ts

@@ -104,7 +104,7 @@ export class Role extends BaseNode {
     toEmbeddedTS(state?: TranslatorState): string {
         let code = `export enum ${this.tsName} {\n`;
         code += `      ${this.tsName}='${this.tsName}'\n`;
-        code += indent(state.tabSize) + '}\n';
+        code += indent((state?.tabSize || 0)) + '}\n';
 
         return code;
     }
@@ -117,9 +117,15 @@ export class Role extends BaseNode {
     }
 
     getNamespace() {
-        if (this.parentNode && (this.parentNode as Namespace).getNamespace)
-            return `${(this.parentNode as Namespace).getNamespace()}.roles`;
-        else
+        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 `${arr.join('.')}.roles`;
+        } else
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }
 

package/src/concepts/SqlQueryComponent__.ts

@@ -42,7 +42,11 @@ export class SqlQueryComponent extends LogicItem {
     @property('TypeAnnotation')
     typeAnnotation: TypeAnnotation = undefined;
 
-    
+    /**
+     * 局部版本
+     */
+    @property()
+    ideVersion: string = undefined;
 
     /**
      * @param source 需要合并的部分参数
@@ -57,7 +61,6 @@ export class SqlQueryComponent extends LogicItem {
         return super.from(source, parentNode, parentKey) as SqlQueryComponent;
     }
 
-    
     /**
      * 设置SQL 查询
      */
@@ -70,10 +73,6 @@ export class SqlQueryComponent extends LogicItem {
         });
     }
 
-    
-
-    
-
     /**
     * 删除类型标注
     * @param name 类型标注名称
@@ -126,22 +125,59 @@ export class SqlQueryComponent extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+
+    @property()
+    dataSource: string = undefined;
+
+    /**
+     * 设置SQL 查询
+     */
+    setDataSource(dataSource: string) {
+        const object = {
+            dataSource,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
-        let code = `(function(): nasl.collection.List<`
-        code +=`${this.typeAnnotation ? this.typeAnnotation.toEmbeddedTS(shiftState(state, code)): '__IDENTIFIER__'}> {\n`;
+        let code;
+        if (this.ideVersion === '2.11') {
+            code = `(function(): `;
+            code += `${this.typeAnnotation ? this.typeAnnotation.toEmbeddedTS(shiftState(state, code)) : '__IDENTIFIER__'} {\n`;
+        } else {
+            code = `(function(): nasl.collection.List<`;
+            code += `${this.typeAnnotation ? this.typeAnnotation.toEmbeddedTS(shiftState(state, code)) : '__IDENTIFIER__'}> {\n`;
+        }
+        // app.dataSources.defaultDS;
+        if (this.dataSource) {
+            code += indent((state?.tabSize || 0) + 1);
+            code += `const dataSource = app.dataSources.${this.dataSource};`;
+        }
         code += '\n';
-        code += indent(state.tabSize + 1) + 'return;\n';
-        code += indent(state.tabSize) + '})();\n';
+        code += indent((state?.tabSize || 0) + 1) + 'return;\n';
+        code += indent((state?.tabSize || 0)) + '})();\n';
         return code;
     }
+
+    /**
+     * 获取添加时的默认选项
+     * @returns
+     */
+    public static getDefaultOptions(): any {
+        return {
+            dataSource: 'defaultDS',
+        };
+    }
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
     //================================================================================
 }
 
-classMap['SqlQueryComponent'] = SqlQueryComponent;
+classMap.SqlQueryComponent = SqlQueryComponent;
 export default SqlQueryComponent;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/StringLiteral__.ts

@@ -94,14 +94,7 @@ export class StringLiteral extends LogicItem {
     toEmbeddedTS(state?: TranslatorState, isRequired?: boolean): string {
         let code = '';
         if (typeof this.value === 'string') {
-            if (!this.value.includes("'"))
-                code += `'${this.value}'`;
-            else if (!this.value.includes('"'))
-                code += `"${this.value}"`;
-            else if (!this.value.includes('`'))
-                code += `\`${this.value}\``;
-            else
-                code += `'${this.value.replace(/'/g, "\\'")}'`;
+            code += `'StringLiteral'`;
         } else {
             code += isRequired ? '__IDENTIFIER__' : `''`;
         }
@@ -109,7 +102,7 @@ export class StringLiteral extends LogicItem {
     }
 
     /**
-     * 设置数组内容
+     * 设置字符串内容
      */
     setValue(value: string) {
         const object = {

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;
@@ -263,11 +259,11 @@ export class StructureProperty extends BaseNode {
                     completionChildren = properties;
                 }
             } else if (typeKind === 'generic') {
-                if (typeNamespace === 'nasl.collection') {
-                    const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
-                    const properties = node.properties || [];
-                    completionChildren = properties;
-                }
+                // if (typeNamespace === 'nasl.collection' || typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.interface') {
+                // }
+                const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
+                const properties = node.properties || [];
+                completionChildren = properties;
             } else {
                 completionChildren = undefined;
             }
@@ -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

@@ -261,14 +261,25 @@ export class TypeAnnotation extends BaseNode {
     /**
      * 用于展示的 type 标题
      */
-    get typeTitle(): string {
+    get headTitle(): string {
         if (this.typeKind === 'primitive') {
             return `${this.typeName} ${PRIMITIVE_TITLE[this.typeName]}`;
         } else if (this.typeKind === 'reference') {
-            return `${this.typeName}`;
+            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.typeName || 'T')}>`;
+                return `${this.typeName}<${(this.typeArguments || []).map((arg) => arg.headTitle || 'T')}>`;
             else
                 return this.typeName;
         } else {
@@ -276,6 +287,32 @@ export class TypeAnnotation extends BaseNode {
         }
     }
 
+    /**
+     * 用于展示的 type 标题
+     */
+    get typeTitle(): string {
+        if (this.typeKind === 'primitive') {
+            return `${this.typeName} ${PRIMITIVE_TITLE[this.typeName]}`;
+        } else if (this.typeKind === 'reference') {
+            return this.typeName;
+        } else if (this.typeKind === 'generic') {
+            let str = `${this.typeName}`;
+            const loop = (typeArguments: Array<TypeAnnotation>) => {
+                str += '<' + (typeArguments[0].typeTitle || 'T');
+                if (typeArguments[0].typeKind === 'generic') {
+                    if (this.typeArguments && this.typeArguments.length) {
+                        loop(typeArguments[0].typeArguments);
+                    }
+                }
+                str += '>';
+            };
+            loop(this.typeArguments);
+            return str;
+        } else {
+            return this.typeName;
+        }
+    }
+
     static createPrimitive(typeName: string, source?: Partial<TypeAnnotation>) {
         if ((PRIMITIVE_TYPE as any)[typeName]) {
             return this.from(Object.assign({
@@ -321,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

@@ -253,9 +253,9 @@ export class Variable extends BaseNode {
             code += ': undefined as ';
             code += this.typeAnnotation.toEmbeddedTS(shiftState(state, code));
         }
-        if (this.defaultValue) {
-            code += `: ${this.defaultValue}`;
-        }
+        // if (this.defaultValue) {
+        //     code += `: ${this.defaultValue}`;
+        // }
         return code;
     }
 
@@ -281,7 +281,7 @@ export class Variable extends BaseNode {
         }
         // 处理下拉属性
         try {
-            this.completionChildren = this.getSelectRef();
+            this.completionChildren = this.getSelectRef(typeAnnotation);
         } catch (err) {
             this.completionChildren = [];
             console.log(err);
@@ -324,12 +324,12 @@ export class Variable extends BaseNode {
     get isTreeLeaf() {
         return !this.hasChildren;
     }
-    getSelectRef() {
+    getSelectRef(newTypeAnnotation: TypeAnnotation) {
         try {
-            const { typeName, typeKind, typeNamespace } = this.typeAnnotation;
+            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;
@@ -341,11 +341,16 @@ export class Variable extends BaseNode {
                     completionChildren = properties;
                 }
             } else if (typeKind === 'generic') {
-                if (typeNamespace === 'nasl.collection') {
-                    const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
-                    const properties = node.properties || [];
-                    completionChildren = properties;
+                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') {
+                        properties[i].typeAnnotation = this?.typeAnnotation?.typeArguments[0];
+                        properties[i].parentNode = this;
+                    }
                 }
+                completionChildren = properties;
             } else {
                 completionChildren = undefined;
             }