@lcap/nasl 2.19.0-beta.1 → 2.19.0-beta.2

package/out/concepts/Module__.d.ts

@@ -9,7 +9,8 @@ import Interface from './Interface__';
 import View from './View__';
 import Variable from './Variable__';
 import Process from './Process__';
-import ViewComponent from './ViewComponent__';
+import FrontendLibrary from './FrontendLibrary__';
+import Configuration from './Configuration__';
 import App from './App__';
 /**
  * 模块
@@ -53,6 +54,18 @@ export declare class Module extends BaseNode {
             version: string;
         }>;
     };
+    /**
+     * 外部语言依赖
+     */
+    compilerInfoMap: {
+        java?: Array<{
+            packageName: string;
+            className: string;
+            naslName: string;
+            type: string;
+            javaTypes: any;
+        }>;
+    };
     /**
      * 数据源列表
      */
@@ -86,9 +99,13 @@ export declare class Module extends BaseNode {
      */
     processes: Array<Process>;
     /**
-     * 页面组件列表
+     * 端包列表
      */
-    viewComponents: Array<ViewComponent>;
+    frontends: Array<FrontendLibrary>;
+    /**
+     * 配置管理
+     */
+    configuration: Configuration;
     /**
      * 祖先 App
      */
@@ -97,6 +114,7 @@ export declare class Module extends BaseNode {
      * @param source 需要合并的部分参数
      */
     constructor(source?: Partial<Module>);
+    getClassName(): string;
     static from(source: any, parentNode?: any, parentKey?: string): Module;
     /**
      * 从父级删除该节点
@@ -655,75 +673,75 @@ export declare class Module extends BaseNode {
      * @param process 已有的流程实例
      */
     addProcess(process: Process): Process;
-    getViewComponentExistingNames(excludedList?: Array<ViewComponent>): string[];
-    getViewComponentUniqueName(name?: string): string;
+    getFrontendLibraryExistingNames(excludedList?: Array<FrontendLibrary>): ("pc" | "h5")[];
+    getFrontendLibraryUniqueName(name?: string): string;
     /**
-    * 插入页面组件
+    * 插入端包
     * @internal
-    * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+    * @param name 端包名称，如果不填会自动生成一个唯一名称
     */
-    _insertViewComponentAt(name: string, index: number): ViewComponent;
+    _insertFrontendLibraryAt(name: string, index: number): FrontendLibrary;
     /**
-    * 插入页面组件
+    * 插入端包
     * @internal
-    * @param viewComponentOptions 页面组件参数
+    * @param frontendLibraryOptions 端包参数
     */
-    _insertViewComponentAt(viewComponentOptions: Partial<ViewComponent>, index: number): ViewComponent;
+    _insertFrontendLibraryAt(frontendLibraryOptions: Partial<FrontendLibrary>, index: number): FrontendLibrary;
     /**
-    * 插入页面组件
+    * 插入端包
     * @internal
-    * @param viewComponent 已有的页面组件实例
+    * @param frontendLibrary 已有的端包实例
     */
-    _insertViewComponentAt(viewComponent: ViewComponent, index: number): ViewComponent;
+    _insertFrontendLibraryAt(frontendLibrary: FrontendLibrary, index: number): FrontendLibrary;
     /**
-     * 插入页面组件
-     * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+     * 插入端包
+     * @param name 端包名称，如果不填会自动生成一个唯一名称
      */
-    insertViewComponentAt(name: string, index: number): ViewComponent;
+    insertFrontendLibraryAt(name: string, index: number): FrontendLibrary;
     /**
-     * 插入页面组件
-     * @param viewComponentOptions 页面组件参数
+     * 插入端包
+     * @param frontendLibraryOptions 端包参数
      */
-    insertViewComponentAt(viewComponentOptions: Partial<ViewComponent>, index: number): ViewComponent;
+    insertFrontendLibraryAt(frontendLibraryOptions: Partial<FrontendLibrary>, index: number): FrontendLibrary;
     /**
-     * 插入页面组件
-     * @param viewComponent 已有的页面组件实例
+     * 插入端包
+     * @param frontendLibrary 已有的端包实例
      */
-    insertViewComponentAt(viewComponent: ViewComponent, index: number): ViewComponent;
+    insertFrontendLibraryAt(frontendLibrary: FrontendLibrary, index: number): FrontendLibrary;
     /**
-     * 添加页面组件
+     * 添加端包
      * @internal
-     * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+     * @param name 端包名称，如果不填会自动生成一个唯一名称
      */
-    _addViewComponent(name?: string): ViewComponent;
+    _addFrontendLibrary(name?: string): FrontendLibrary;
     /**
-     * 添加页面组件
+     * 添加端包
      * @internal
-     * @param viewComponentOptions 页面组件参数
+     * @param frontendLibraryOptions 端包参数
      */
-    _addViewComponent(viewComponentOptions: Partial<ViewComponent>): ViewComponent;
+    _addFrontendLibrary(frontendLibraryOptions: Partial<FrontendLibrary>): FrontendLibrary;
     /**
-     * 添加页面组件
+     * 添加端包
      * @internal
-     * @param viewComponent 已有的页面组件实例
+     * @param frontendLibrary 已有的端包实例
      */
-    _addViewComponent(viewComponent: ViewComponent): ViewComponent;
+    _addFrontendLibrary(frontendLibrary: FrontendLibrary): FrontendLibrary;
     /**
-     * 添加页面组件
+     * 添加端包
      * @internal
-     * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+     * @param name 端包名称，如果不填会自动生成一个唯一名称
      */
-    addViewComponent(name?: string): ViewComponent;
+    addFrontendLibrary(name?: string): FrontendLibrary;
     /**
-     * 添加页面组件
-     * @param viewComponentOptions 页面组件参数
+     * 添加端包
+     * @param frontendLibraryOptions 端包参数
      */
-    addViewComponent(viewComponentOptions: Partial<ViewComponent>): ViewComponent;
+    addFrontendLibrary(frontendLibraryOptions: Partial<FrontendLibrary>): FrontendLibrary;
     /**
-     * 添加页面组件
-     * @param viewComponent 已有的页面组件实例
+     * 添加端包
+     * @param frontendLibrary 已有的端包实例
      */
-    addViewComponent(viewComponent: ViewComponent): ViewComponent;
+    addFrontendLibrary(frontendLibrary: FrontendLibrary): FrontendLibrary;
     /**
     * 删除数据源
     * @param name 数据源名称
@@ -813,38 +831,60 @@ export declare class Module extends BaseNode {
     removeProcess(process: Process): void;
     __removeProcess(process: Process): Params;
     /**
-    * 删除页面组件
-    * @param name 页面组件名称
+    * 删除端包
+    * @param name 端包名称
+    */
+    removeFrontendLibrary(name: string): void;
+    /**
+     * 删除端包
+     * @param frontendLibrary 已有的端包实例
+     */
+    removeFrontendLibrary(frontendLibrary: FrontendLibrary): void;
+    __removeFrontendLibrary(frontendLibrary: FrontendLibrary): Params;
+    /**
+    * 删除配置管理
+    * @param name 配置管理名称
     */
-    removeViewComponent(name: string): void;
+    removeConfiguration(name: string): void;
     /**
-     * 删除页面组件
-     * @param viewComponent 已有的页面组件实例
+     * 删除配置管理
+     * @param configuration 已有的配置管理实例
      */
-    removeViewComponent(viewComponent: ViewComponent): void;
-    __removeViewComponent(viewComponent: ViewComponent): Params;
+    removeConfiguration(configuration: Configuration): void;
+    __removeConfiguration(configuration: Configuration): Params;
     /**
      * 用于区分存量应用新导入模块,存量应用替换数据结构使用
      */
     isAdd: boolean;
+    /**
+     * 是否启动
+     */
+    enable: boolean;
+    /**
+     * 依赖列表
+     */
+    dependencies: Array<string>;
     setIsAdd(isAdd: boolean): void;
     /**
-    * 生成宿主语言的文件路径
-    * @param name 一般不用传，用于 rename
-    */
+     * 生成宿主语言的文件路径
+     * @param name 一般不用传，用于 rename
+     */
     getEmbeddedFilePath(name?: string): string;
     /**
-    * 获取命名空间和
-    * 暂时不考虑 Module 嵌套的情况
-    */
+     * 获取命名空间和
+     * 暂时不考虑 Module 嵌套的情况
+     */
     getNamespace(): string;
     getTsNamespace(): string;
     getTsNamespaceAndName(): string;
     findEnumByName(name: string): Enum;
     /**
-    *  获取属性节点是否存在
-    */
+     *  获取属性节点是否存在
+     */
     findProperty(name: string, propertyType: PropertyType): any;
     delete(): void;
+    softDelete(options: {
+        index: number;
+    }): void;
 }
 export default Module;

package/out/concepts/Module__.js

@@ -39,6 +39,7 @@ const moduleNameSpace = {
     interfaceDependencies: 'apis',
     componentDependencies: 'components',
 };
+const ConfigProperty__1 = __importDefault(require("./ConfigProperty__"));
 const decorators_1 = require("../decorators");
 const utils = __importStar(require("../utils"));
 const BaseNode_1 = __importDefault(require("../common/BaseNode"));
@@ -51,7 +52,7 @@ const Interface__1 = __importDefault(require("./Interface__"));
 const View__1 = __importDefault(require("./View__"));
 const Variable__1 = __importDefault(require("./Variable__"));
 const Process__1 = __importDefault(require("./Process__"));
-const ViewComponent__1 = __importDefault(require("./ViewComponent__"));
+const FrontendLibrary__1 = __importDefault(require("./FrontendLibrary__"));
 /**
  * 模块
  */
@@ -88,6 +89,10 @@ let Module = Module_1 = class Module extends BaseNode_1.default {
      * 外部语言依赖
      */
     externalDependencyMap = undefined;
+    /**
+     * 外部语言依赖
+     */
+    compilerInfoMap = undefined;
     /**
      * 数据源列表
      */
@@ -121,9 +126,13 @@ let Module = Module_1 = class Module extends BaseNode_1.default {
      */
     processes = [];
     /**
-     * 页面组件列表
+     * 端包列表
      */
-    viewComponents = [];
+    frontends = [];
+    /**
+     * 配置管理
+     */
+    configuration = undefined;
     /**
      * 祖先 App
      */
@@ -138,6 +147,9 @@ let Module = Module_1 = class Module extends BaseNode_1.default {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'Module';
+    }
     static from(source, parentNode, parentKey) {
         return super.from(source, parentNode, parentKey);
     }
@@ -632,63 +644,63 @@ let Module = Module_1 = class Module extends BaseNode_1.default {
         });
         return node;
     }
-    getViewComponentExistingNames(excludedList = []) {
+    getFrontendLibraryExistingNames(excludedList = []) {
         const excludedSet = new Set(excludedList);
-        return (this.viewComponents || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.frontends || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
-    getViewComponentUniqueName(name = 'viewComponent1') {
-        return utils.unique(name, this.getViewComponentExistingNames(), undefined, false);
+    getFrontendLibraryUniqueName(name = 'frontendLibrary1') {
+        return utils.unique(name, this.getFrontendLibraryExistingNames(), undefined, false);
     }
-    _insertViewComponentAt(options, index) {
-        const viewComponentOptions = {};
-        const relationOptions = { parentNode: this, parentKey: 'viewComponents' };
-        let viewComponent;
+    _insertFrontendLibraryAt(options, index) {
+        const frontendLibraryOptions = {};
+        const relationOptions = { parentNode: this, parentKey: 'frontends' };
+        let frontendLibrary;
         if (!options) {
-            viewComponent = ViewComponent__1.default.from({
-                ...viewComponentOptions,
-                name: this.getViewComponentUniqueName(),
-            }, this, 'viewComponents');
+            frontendLibrary = FrontendLibrary__1.default.from({
+                ...frontendLibraryOptions,
+                name: this.getFrontendLibraryUniqueName(),
+            }, this, 'frontends');
         }
         else if (typeof options === 'string') {
-            viewComponent = ViewComponent__1.default.from({
-                ...viewComponentOptions,
+            frontendLibrary = FrontendLibrary__1.default.from({
+                ...frontendLibraryOptions,
                 name: options,
-            }, this, 'viewComponents');
+            }, this, 'frontends');
         }
-        else if (options instanceof ViewComponent__1.default) {
+        else if (options instanceof FrontendLibrary__1.default) {
             options.ensureDelete(); // 同一实例不支持多处存在
-            viewComponent = options;
-            Object.assign(viewComponent, relationOptions);
+            frontendLibrary = options;
+            Object.assign(frontendLibrary, relationOptions);
         }
         else {
-            viewComponent = ViewComponent__1.default.from({
-                ...viewComponentOptions,
+            frontendLibrary = FrontendLibrary__1.default.from({
+                ...frontendLibraryOptions,
                 ...options,
-            }, this, 'viewComponents');
+            }, this, 'frontends');
         }
-        this.viewComponents.splice(index, 0, viewComponent);
-        return viewComponent;
+        this.frontends.splice(index, 0, frontendLibrary);
+        return frontendLibrary;
     }
-    insertViewComponentAt(options, index) {
-        const node = this._insertViewComponentAt(options, index);
+    insertFrontendLibraryAt(options, index) {
+        const node = this._insertFrontendLibraryAt(options, index);
         node.create({
             index,
             parentNode: this,
-            parentKey: 'viewComponents',
+            parentKey: 'frontends',
         });
         return node;
     }
-    _addViewComponent(options) {
-        const index = this.viewComponents.length;
-        return this._insertViewComponentAt(options, index);
+    _addFrontendLibrary(options) {
+        const index = this.frontends.length;
+        return this._insertFrontendLibraryAt(options, index);
     }
-    addViewComponent(options) {
-        const node = this._addViewComponent(options);
-        const index = this.viewComponents.indexOf(node);
+    addFrontendLibrary(options) {
+        const node = this._addFrontendLibrary(options);
+        const index = this.frontends.indexOf(node);
         node.create({
             index,
             parentNode: this,
-            parentKey: 'viewComponents',
+            parentKey: 'frontends',
         });
         return node;
     }
@@ -980,36 +992,72 @@ let Module = Module_1 = class Module extends BaseNode_1.default {
         }
         return params;
     }
-    removeViewComponent(options) {
-        let viewComponent;
+    removeFrontendLibrary(options) {
+        let frontendLibrary;
         if (typeof options === 'string') {
-            viewComponent = this.viewComponents.find((item) => item.name === options);
-            if (!viewComponent) {
-                throw new Error('找不到页面组件 ' + options);
+            frontendLibrary = this.frontends.find((item) => item.name === options);
+            if (!frontendLibrary) {
+                throw new Error('找不到端包 ' + options);
             }
         }
         else {
-            viewComponent = options;
+            frontendLibrary = options;
         }
-        return viewComponent.delete();
+        return frontendLibrary.delete();
     }
-    __removeViewComponent(viewComponent) {
-        const parentKey = viewComponent.parentKey;
+    __removeFrontendLibrary(frontendLibrary) {
+        const parentKey = frontendLibrary.parentKey;
         const params = {
             parentNode: this,
             parentKey,
             index: -1,
             object: null,
-            oldObject: viewComponent,
+            oldObject: frontendLibrary,
         };
         if (parentKey) {
             params.parentKey = parentKey;
             if (Array.isArray(this[parentKey])) {
-                const index = this[parentKey].indexOf(viewComponent);
+                const index = this[parentKey].indexOf(frontendLibrary);
                 ~index && this[parentKey].splice(index, 1);
                 params.index = index;
             }
-            else if (this[parentKey] === viewComponent) {
+            else if (this[parentKey] === frontendLibrary) {
+                params.index = 0;
+                this[parentKey] = undefined;
+            }
+        }
+        return params;
+    }
+    removeConfiguration(options) {
+        let configuration;
+        if (typeof options === 'string') {
+            configuration = this.configuration;
+            if (!configuration) {
+                throw new Error('找不到配置管理 ' + options);
+            }
+        }
+        else {
+            configuration = options;
+        }
+        return configuration.delete();
+    }
+    __removeConfiguration(configuration) {
+        const parentKey = configuration.parentKey;
+        const params = {
+            parentNode: this,
+            parentKey,
+            index: -1,
+            object: null,
+            oldObject: configuration,
+        };
+        if (parentKey) {
+            params.parentKey = parentKey;
+            if (Array.isArray(this[parentKey])) {
+                const index = this[parentKey].indexOf(configuration);
+                ~index && this[parentKey].splice(index, 1);
+                params.index = index;
+            }
+            else if (this[parentKey] === configuration) {
                 params.index = 0;
                 this[parentKey] = undefined;
             }
@@ -1024,6 +1072,14 @@ let Module = Module_1 = class Module extends BaseNode_1.default {
      * 用于区分存量应用新导入模块,存量应用替换数据结构使用
      */
     isAdd;
+    /**
+     * 是否启动
+     */
+    enable;
+    /**
+     * 依赖列表
+     */
+    dependencies = [];
     setIsAdd(isAdd) {
         const object = {
             isAdd,
@@ -1033,16 +1089,16 @@ let Module = Module_1 = class Module extends BaseNode_1.default {
         });
     }
     /**
-    * 生成宿主语言的文件路径
-    * @param name 一般不用传，用于 rename
-    */
+     * 生成宿主语言的文件路径
+     * @param name 一般不用传，用于 rename
+     */
     getEmbeddedFilePath(name = this.name) {
         return `/embedded/${this.app.name}/${this.parentKey}/${this.name}`;
     }
     /**
-    * 获取命名空间和
-    * 暂时不考虑 Module 嵌套的情况
-    */
+     * 获取命名空间和
+     * 暂时不考虑 Module 嵌套的情况
+     */
     getNamespace() {
         return `${moduleNameSpace[this.parentKey]}`;
     }
@@ -1056,8 +1112,8 @@ let Module = Module_1 = class Module extends BaseNode_1.default {
         return this.enums.find((enumItem) => enumItem.name === name);
     }
     /**
-    *  获取属性节点是否存在
-    */
+     *  获取属性节点是否存在
+     */
     findProperty(name, propertyType) {
         return this[propertyType].find((item) => item.name === name);
     }
@@ -1067,6 +1123,17 @@ let Module = Module_1 = class Module extends BaseNode_1.default {
         });
         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?.configuration?.getGroup('dataSource');
         if (this.dataSources && dataSourceGroup) {
             this.dataSources.forEach((datasource) => {
@@ -1077,8 +1144,40 @@ let Module = Module_1 = class Module extends BaseNode_1.default {
                 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) {
+        // 删[禁用的依赖]
+        super.delete();
+        // 创建[禁用的依赖]
+        this.app.insertModuleInDependenciesAt(this, options.index);
+        // 创建[禁用的依赖]的数据源
+        const dataSourceGroup = this.parentNode?.configuration?.getGroup('dataSource');
+        if (this.dataSources && dataSourceGroup) {
+            this.dataSources.forEach((datasource) => {
+                const body = ConfigProperty__1.default.from({
+                    name: datasource.name,
+                    description: '',
+                    isPrivate: false,
+                    values: [
+                        { env: 'dev', value: '', concept: 'ConfigPropertyValue' },
+                        { env: 'online', value: '', concept: 'ConfigPropertyValue' },
+                    ],
+                });
+                dataSourceGroup.addConfigProperty(body);
+            });
+        }
+    }
 };
 __decorate([
     (0, decorators_1.property)()
@@ -1104,6 +1203,9 @@ __decorate([
 __decorate([
     (0, decorators_1.property)()
 ], Module.prototype, "externalDependencyMap", void 0);
+__decorate([
+    (0, decorators_1.property)()
+], Module.prototype, "compilerInfoMap", void 0);
 __decorate([
     (0, decorators_1.property)('DataSource')
 ], Module.prototype, "dataSources", void 0);
@@ -1129,11 +1231,20 @@ __decorate([
     (0, decorators_1.property)('Process')
 ], Module.prototype, "processes", void 0);
 __decorate([
-    (0, decorators_1.property)('ViewComponent')
-], Module.prototype, "viewComponents", void 0);
+    (0, decorators_1.property)('FrontendLibrary')
+], Module.prototype, "frontends", void 0);
+__decorate([
+    (0, decorators_1.property)('Configuration')
+], Module.prototype, "configuration", void 0);
 __decorate([
     (0, decorators_1.property)()
 ], Module.prototype, "isAdd", void 0);
+__decorate([
+    (0, decorators_1.property)()
+], Module.prototype, "enable", void 0);
+__decorate([
+    (0, decorators_1.property)()
+], Module.prototype, "dependencies", void 0);
 Module = Module_1 = __decorate([
     (0, decorators_1.concept)('模块')
 ], Module);