@lcap/nasl 2.22.0-beta.0 → 2.22.0-beta.1

package/src/concepts/Module__.ts

@@ -5,6 +5,7 @@ const moduleNameSpace = {
     componentDependencies: 'components',
 };
 type ModuleKeyType = 'dependencies' | 'interfaceDependencies' | 'componentDependencies';
+import ConfigProperty from './ConfigProperty__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -85,7 +86,7 @@ export class Module extends BaseNode {
      * 外部语言依赖
      */
     @property()
-    compilerInfoMap: { java?: Array<{ packageName: string,className:string,naslName: string, type: string,javaTypes:any }> } = undefined;
+    compilerInfoMap: { java?: Array<{ packageName: string, className:string, naslName: string, type: string, javaTypes:any }> } = undefined;
 
     /**
      * 数据源列表
@@ -181,9 +182,8 @@ export class Module extends BaseNode {
         }
         return params;
     }
-    
 
-        getDataSourceExistingNames(excludedList: Array<DataSource> = []) {
+    getDataSourceExistingNames(excludedList: Array<DataSource> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.dataSources as DataSource[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -324,7 +324,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getStructureExistingNames(excludedList: Array<Structure> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.structures as Structure[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -466,7 +465,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getEnumExistingNames(excludedList: Array<Enum> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.enums as Enum[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -608,7 +606,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getLogicExistingNames(excludedList: Array<Logic> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -750,7 +747,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getInterfaceExistingNames(excludedList: Array<Interface> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.interfaces as Interface[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -892,7 +888,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.views as View[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1034,7 +1029,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getVarExistingNames(excludedList: Array<Variable> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.frontendVariables as Variable[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1176,7 +1170,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getProcessExistingNames(excludedList: Array<Process> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.processes as Process[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1318,7 +1311,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
     getFrontendLibraryExistingNames(excludedList: Array<FrontendLibrary> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.frontends as FrontendLibrary[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1460,9 +1452,6 @@ export class Module extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除数据源
     * @param name 数据源名称
@@ -1511,8 +1500,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除数据结构
     * @param name 数据结构名称
@@ -1561,8 +1548,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除枚举
     * @param name 枚举名称
@@ -1611,8 +1596,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1661,8 +1644,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除接口
     * @param name 接口名称
@@ -1711,8 +1692,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除页面
     * @param name 页面名称
@@ -1761,8 +1740,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除变量
     * @param name 变量名称
@@ -1811,8 +1788,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除流程
     * @param name 流程名称
@@ -1861,8 +1836,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除端包
     * @param name 端包名称
@@ -1911,8 +1884,6 @@ export class Module extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除配置管理
     * @param name 配置管理名称
@@ -1971,65 +1942,121 @@ export class Module extends BaseNode {
      @property()
      isAdd: boolean;
 
-     setIsAdd(isAdd: boolean) {
-         const object = {
-             isAdd,
-         };
-         this.update({
-             ...object,
-         });
-     }
-     /**
+    /**
+     * 是否启动
+     */
+    @property()
+    enable: boolean;
+
+    /**
+     * 依赖列表
+     */
+    @property()
+    dependencies: Array<string> = [];
+
+    setIsAdd(isAdd: boolean) {
+        const object = {
+            isAdd,
+        };
+        this.update({
+            ...object,
+        });
+    }
+    /**
      * 生成宿主语言的文件路径
      * @param name 一般不用传，用于 rename
      */
-     getEmbeddedFilePath(name = this.name) {
-         return `/embedded/${this.app.name}/${this.parentKey}/${this.name}`;
-     }
-     /**
+    getEmbeddedFilePath(name = this.name) {
+        return `/embedded/${this.app.name}/${this.parentKey}/${this.name}`;
+    }
+    /**
      * 获取命名空间和
      * 暂时不考虑 Module 嵌套的情况
      */
-     getNamespace() {
-         return `${moduleNameSpace[this.parentKey as ModuleKeyType]}`;
-     }
+    getNamespace() {
+        return `${moduleNameSpace[this.parentKey as ModuleKeyType]}`;
+    }
 
-     getTsNamespace() {
-         return `${moduleNameSpace[this.parentKey as ModuleKeyType]}`;
-     }
-     getTsNamespaceAndName() {
-         return `${moduleNameSpace[this.parentKey as ModuleKeyType]}.${this.name}`;
-     }
+    getTsNamespace() {
+        return `${moduleNameSpace[this.parentKey as ModuleKeyType]}`;
+    }
+    getTsNamespaceAndName() {
+        return `${moduleNameSpace[this.parentKey as ModuleKeyType]}.${this.name}`;
+    }
 
-     findEnumByName(name: string) {
-         return this.enums.find((enumItem) => enumItem.name === name);
-     }
+    findEnumByName(name: string) {
+        return this.enums.find((enumItem) => enumItem.name === name);
+    }
 
-     /**
+    /**
      *  获取属性节点是否存在
      */
 
-     findProperty(name: string, propertyType: PropertyType): any {
-         return ((this as any)[propertyType] as Array<any>).find((item) => item.name === name);
-     }
-
-     delete() {
-         this.parentNode?.emit('collect:start', {
-             actionMsg: '移除依赖库',
-         });
-         super.delete();
-         this._delete();
-         const dataSourceGroup = (this.parentNode as any)?.configuration?.getGroup('dataSource');
-         if (this.dataSources && dataSourceGroup) {
-             this.dataSources.forEach((datasource) => {
-                 this.parentNode?.emit('clear:datasourceError', datasource as any);
-                 try {
-                     dataSourceGroup.removeConfigProperty(datasource.name);
-                 } catch (e) {}
-             });
-         }
-         this.parentNode?.emit('collect:end');
-     }
+    findProperty(name: string, propertyType: PropertyType): any {
+        return ((this as any)[propertyType] as Array<any>).find((item) => item.name === name);
+    }
+
+    delete() {
+        this.parentNode?.emit('collect:start', {
+            actionMsg: '移除依赖库',
+        });
+        super.delete();
+        this._delete();
+        // if (this.dependencies) {
+        //     // 删除依赖链中的依赖
+        //     this.dependencies.forEach((tag) => {
+        //         const [name, version] = tag.split('-');
+        //         const existNode = this.app.dependencies.find((m) => m.name === name && m.version === version);
+        //         existNode?.delete();
+        //     });
+        // }
+        // 处理同名依赖 重新生成文件
+        if (this.enable) {
+            // 删[数据源]
+            const dataSourceGroup = (this.parentNode as any)?.configuration?.getGroup('dataSource');
+            if (this.dataSources && dataSourceGroup) {
+                this.dataSources.forEach((datasource) => {
+                    this.parentNode?.emit('clear:datasourceError', datasource as any);
+                    try {
+                        dataSourceGroup.removeConfigProperty(datasource.name);
+                    } catch (e) {}
+                });
+            }
+        // // 已启用的依赖库被删除时，将后续被禁用的同名依赖库 切换为启用
+        // const index = this.app.dependencies.findIndex((m) => m.enable === false && m.name === this.name);
+        // if (index >= 0) {
+        //     const nextMainModule = this.app.dependencies[index];
+        //     // 更新[禁用的依赖]enable:true
+        //     nextMainModule.update({ enable: true });
+        //     nextMainModule.softDelete({ index });
+        // }
+        }
+        this.parentNode?.emit('collect:end');
+    }
+
+    // 删除再添加 触发文件生成
+    softDelete(options: { index: number }) {
+        // 删[禁用的依赖]
+        super.delete();
+        // 创建[禁用的依赖]
+        this.app.insertModuleInDependenciesAt(this, options.index);
+        // 创建[禁用的依赖]的数据源
+        const dataSourceGroup = (this.parentNode as any)?.configuration?.getGroup('dataSource');
+        if (this.dataSources && dataSourceGroup) {
+            this.dataSources.forEach((datasource) => {
+                const body: ConfigProperty = ConfigProperty.from({
+                    name: datasource.name,
+                    description: '',
+                    isPrivate: false,
+                    values: [
+                        { env: 'dev', value: '', concept: 'ConfigPropertyValue' },
+                        { env: 'online', value: '', concept: 'ConfigPropertyValue' },
+                    ],
+                });
+                dataSourceGroup.addConfigProperty(body);
+            });
+        }
+    }
 
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！

package/src/concepts/NewComposite__.ts

@@ -1225,19 +1225,26 @@ export class NewComposite extends LogicItem {
             code += `${indent1}function __newComposite() {\n`;
             this.properties.forEach((property, index) => {
                 const temp = `temp${index}`;
+                const propertyType = this.typeAnnotation.properties[index]?.typeAnnotation;
                 const name = property.name;
                 const rightItem = nameMap.get(name);
                 const ts = rightMap.get(rightItem);
                 if (ts !== undefined) {
                     if (['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts)) {
-                        code += `${indent2}const ${temp}: any = null; `;
+                        code += `${indent2}let ${temp}: void = null; `;
                     } else {
-                        code += `${indent2}const ${temp}${ts === 'null' ? ':void' : ''} = ${ts}; `;
+                        code += `${indent2}let ${temp}${ts === 'null' ? ':void' : ''} = ${ts}; `;
                     }
-                    code += `${indent2}const `;
-                    code += property.toEmbeddedTS(shiftState(state, code, { inline: true }));
-                    code += `: nasl.core.Incompatible<typeof ${temp}, void> = ${temp}`;
-                    code += ';\n';
+                    code += `const `;
+                    code += `${property.toEmbeddedTS(shiftState(state, code, { inline: true }))}: `;
+                    code += propertyType ? propertyType.toEmbeddedTS(shiftState(state, code, { inline: true })) : `nasl.core.Incompatible<typeof ${temp}, void>`;
+                    code += ` = ${temp};\n`;
+                } else if (propertyType) {
+                    code += `${indent2}let ${property.name}: `;
+                    code += `${propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }))}; `;
+                    code += `<`;
+                    code += `${property.toEmbeddedTS(shiftState(state, code, { inline: true }))}`;
+                    code += `>${property.name};\n`;
                 } else {
                     code += `${indent2}const `;
                     code += property.toEmbeddedTS(shiftState(state, code, { inline: true }));
@@ -1289,11 +1296,14 @@ export class NewComposite extends LogicItem {
         });
         // 方便ts报错检查
         code += 'function __newComposite() { ';
-        this.properties.forEach((property) => {
+        this.properties.forEach((property, index) => {
             const name = property.name;
+            const propertyType = this.typeAnnotation.properties[index]?.typeAnnotation;
             const rightItem = nameMap.get(name);
             const ts = rightMap.get(rightItem);
-            if (ts !== undefined) {
+            if (propertyType) {
+                code += `const ${name}: ${propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }))}; `;
+            } else if (ts !== undefined) {
                 code += `const ${name} = ${['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts) ? null : ts}; `;
             } else {
                 code += `const ${name}; `;
@@ -1313,14 +1323,16 @@ export class NewComposite extends LogicItem {
         return code;
     }
 
-    __addIdentifier() {
+    __addIdentifier(name: string, typeAnnotation: TypeAnnotation) {
+        const newName = name || 'property1';
+        const newType = typeAnnotation || null;
         this.app.emit('collect:start', {
             actionMsg: '添加匿名数据结构属性',
         });
-        const node = this.addIdentifier({ name: this.getIdentifierUniqueName('property1') });
+        const node = this.addIdentifier({ name: this.getIdentifierUniqueName(newName) });
         const struct = StructureProperty.from({
             name: node.name,
-            typeAnnotation: null,
+            typeAnnotation: newType,
         });
         this.typeAnnotation.addStructureProperty(struct);
         this.app.emit('collect:end');

package/src/concepts/OqlQueryComponent__.ts

@@ -303,7 +303,7 @@ export class OqlQueryComponent extends LogicItem {
                     dataSourceName: this.dataSource,
                     oql: this.code,
                     ideVersion: this.app.ideVersion,
-                    dataSourceNasl: this.app.findNodeByCompleteName(this.dataSource).toJSON(),
+                    dataSourceNasl: this.app.findNodeByCompleteName(this.dataSource)?.toJSON(),
                     typeScriptStartLine: 1,
                     typeScriptStartLineColumn: 1,
                 },

package/src/concepts/Param__.ts

@@ -266,6 +266,9 @@ export class Param extends BaseNode {
     type: 's-member-identifier-select' | 's-enum-select' | 's-schema-select' | 's-datatype-select' | 's-config-select' | 's-options-select';
     attrs?: any;
   } = undefined;
+  @excludedInJSON()
+  @property()
+  cascader: Boolean = false;
 
   /**
    * 自动补全的属性列表

package/src/concepts/QueryFieldExpression__.ts

@@ -48,8 +48,6 @@ export class QueryFieldExpression extends LogicItem {
     @property()
     propertyName: string = undefined;
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -66,7 +64,6 @@ export class QueryFieldExpression extends LogicItem {
         return super.from(source, parentNode, parentKey) as QueryFieldExpression;
     }
 
-    
     /**
      * 设置entityAsName
      */
@@ -91,10 +88,6 @@ export class QueryFieldExpression extends LogicItem {
         });
     }
 
-    
-
-    
-
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。