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

package/out/concepts/FrontendVariable__.js

@@ -16,23 +16,25 @@ const Variable__1 = __importDefault(require("./Variable__"));
 /**
  * 前端全局变量
  */
-let FrontendVariable = FrontendVariable_1 = 
-// @ts-ignore
-class FrontendVariable extends Variable__1.default {
-    /** 类名 */
-    static ConceptName = 'FrontendVariable';
-    /** 继承链 */
-    static inheritanceChain = ['Variable', 'BaseNode'];
-    /**
-     * 是否开启本地缓存
-     */
-    localCache = false;
+let FrontendVariable = FrontendVariable_1 = class FrontendVariable extends Variable__1.default {
     /**
      * @param source 需要合并的部分参数
      */
     constructor(source) {
         source = Object.assign({}, FrontendVariable_1.getDefaultOptions(), source);
         super(source);
+        /**
+         * 是否开启本地缓存
+         */
+        this.localCache = false;
+        //================================================================================
+        // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+        // 自动生成的代码已结束。下面可以手动编写。
+        //================================================================================
+        /**
+         * 默认值toJS的结果
+         */
+        this.defaultCode = {};
         super.subConstructor(source);
     }
     static from(source, parentNode, parentKey) {
@@ -49,15 +51,14 @@ class FrontendVariable extends Variable__1.default {
             ...object,
         });
     }
-    //================================================================================
-    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-    // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
-    /**
-   * 默认值toJS的结果
-   */
-    defaultCode = {};
 };
+/** 类名 */
+FrontendVariable.ConceptName = 'FrontendVariable';
+/** 继承链 */
+FrontendVariable.inheritanceChain = ['Variable', 'BaseNode'];
+__decorate([
+    (0, decorators_1.property)('concept')
+], FrontendVariable.prototype, "concept", void 0);
 __decorate([
     (0, decorators_1.property)()
 ], FrontendVariable.prototype, "localCache", void 0);
@@ -66,7 +67,6 @@ __decorate([
 ], FrontendVariable.prototype, "defaultCode", void 0);
 FrontendVariable = FrontendVariable_1 = __decorate([
     (0, decorators_1.concept)('前端全局变量')
-    // @ts-ignore
 ], FrontendVariable);
 exports.FrontendVariable = FrontendVariable;
 exports.default = FrontendVariable;

package/out/concepts/FrontendVariable__.js.map

@@ -1 +1 @@
-{"version":3,"file":"FrontendVariable__.js","sourceRoot":"","sources":["../../src/concepts/FrontendVariable__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AASA,8CAAsG;AAMtG,6DAAoC;AAEpC;;GAEG;AAGH,IAAa,gBAAgB;AAD7B,aAAa;AACb,MAAa,gBAAiB,SAAQ,mBAAQ;IAC5C,SAAS;IACT,MAAM,CAAU,WAAW,GAAG,kBAAkB,CAAC;IAEjD,UAAU;IACV,MAAM,CAAU,gBAAgB,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAE5D;;OAEG;IAEH,UAAU,GAAY,KAAK,CAAC;IAE5B;;OAEG;IACH,YAAY,MAAkC;QAC5C,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,kBAAgB,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QACzE,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QAC3D,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAqB,CAAC;IACvE,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,UAAmB;QAC/B,MAAM,MAAM,GAAG;YACb,UAAU;SACX,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACV,GAAG,MAAM;SACV,CAAC,CAAC;IACL,CAAC;IAED,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAEhF;;KAEC;IAED,WAAW,GAAgB,EAAE,CAAC;CAMjC,CAAA;AA1CC;IADC,IAAA,qBAAQ,GAAE;oDACiB;AAoC1B;IADC,IAAA,qBAAQ,GAAE;qDACmB;AA/CrB,gBAAgB;IAF5B,IAAA,oBAAO,EAAC,QAAQ,CAAC;IAClB,aAAa;GACA,gBAAgB,CAqD5B;AArDY,4CAAgB;AAuD7B,kBAAe,gBAAgB,CAAC;AAChC,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}
+{"version":3,"file":"FrontendVariable__.js","sourceRoot":"","sources":["../../src/concepts/FrontendVariable__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AASA,8CAAsG;AAMtG,6DAAoC;AAEpC;;GAEG;AAEH,IAAa,gBAAgB,wBAA7B,MAAa,gBAAiB,SAAQ,mBAAQ;IAoB5C;;OAEG;IACH,YAAY,MAAkC;QAC5C,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,kBAAgB,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QACzE,KAAK,CAAC,MAAM,CAAC,CAAC;QAXhB;;WAEG;QAEH,eAAU,GAAY,KAAK,CAAC;QA2B5B,kFAAkF;QAClF,gEAAgE;QAChE,uBAAuB;QACvB,kFAAkF;QAElF;;WAEG;QAEH,gBAAW,GAAgB,EAAE,CAAC;QA5B5B,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QAC3D,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAqB,CAAC;IACvE,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,UAAmB;QAC/B,MAAM,MAAM,GAAG;YACb,UAAU;SACX,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACV,GAAG,MAAM;SACV,CAAC,CAAC;IACL,CAAC;CAiBF,CAAA;AA3DC,SAAS;AACO,4BAAW,GAAW,kBAAmB,CAAA;AAEzD,UAAU;AACM,iCAAgB,GAAa,CAAC,UAAU,EAAE,UAAU,CAAE,CAAA;AAOtE;IAFC,IAAA,qBAAQ,EAAC,SAAS,CAAC;iDAEkB;AAMtC;IADC,IAAA,qBAAQ,GAAE;oDACiB;AAoC5B;IADC,IAAA,qBAAQ,GAAE;qDACmB;AAtDnB,gBAAgB;IAD5B,IAAA,oBAAO,EAAC,QAAQ,CAAC;GACL,gBAAgB,CA4D5B;AA5DY,4CAAgB;AA8D7B,kBAAe,gBAAgB,CAAC;AAChC,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}

package/out/concepts/Frontend__.d.ts

@@ -1,13 +1,11 @@
 import type { EmbeddedTSFileGenerator } from '../utils';
 import { TranslatorState, TranslatorGenerator } from '../translator';
-import { AssetsInfo } from './App__';
 import { Params } from '../common/EventEmitter';
 import BaseNode from '../common/BaseNode';
 import type BindEvent from './BindEvent__';
 import type View from './View__';
 import type FrontendVariable from './FrontendVariable__';
 import Theme from './Theme__';
-import type Module from './Module__';
 import type I18nInfo from './I18nInfo__';
 import type App from './App__';
 import type Variable from './Variable__';
@@ -16,7 +14,7 @@ import type Variable from './Variable__';
  */
 export declare class Frontend extends BaseNode {
     /** 类名 */
-    static readonly ConceptName = "Frontend";
+    static readonly ConceptName: string;
     /** 继承链 */
     static readonly inheritanceChain: string[];
     /**
@@ -63,10 +61,6 @@ export declare class Frontend extends BaseNode {
      * 主题配置
      */
     theme: Theme;
-    /**
-     * 扩展组件列表（兼容老版）
-     */
-    componentDependencies: Array<Module>;
     /**
      * 全局缩放开关
      */
@@ -328,75 +322,6 @@ export declare class Frontend extends BaseNode {
      * @param frontendVariable 已有的前端全局变量实例
      */
     addFrontendVariable(frontendVariable: FrontendVariable): FrontendVariable;
-    getModuleExistingNames(excludedList?: Array<Module>): string[];
-    getModuleUniqueName(name?: string): string;
-    /**
-     * 插入模块
-     * @internal
-     * @param name 模块名称，如果不填会自动生成一个唯一名称
-     */
-    _insertModuleAt(name: string, index: number): Module;
-    /**
-     * 插入模块
-     * @internal
-     * @param moduleOptions 模块参数
-     */
-    _insertModuleAt(moduleOptions: Partial<Module>, index: number): Module;
-    /**
-     * 插入模块
-     * @internal
-     * @param module 已有的模块实例
-     */
-    _insertModuleAt(module: Module, index: number): Module;
-    /**
-     * 插入模块
-     * @param name 模块名称，如果不填会自动生成一个唯一名称
-     */
-    insertModuleAt(name: string, index: number): Module;
-    /**
-     * 插入模块
-     * @param moduleOptions 模块参数
-     */
-    insertModuleAt(moduleOptions: Partial<Module>, index: number): Module;
-    /**
-     * 插入模块
-     * @param module 已有的模块实例
-     */
-    insertModuleAt(module: Module, index: number): Module;
-    /**
-     * 添加模块
-     * @internal
-     * @param name 模块名称，如果不填会自动生成一个唯一名称
-     */
-    _addModule(name?: string): Module;
-    /**
-     * 添加模块
-     * @internal
-     * @param moduleOptions 模块参数
-     */
-    _addModule(moduleOptions: Partial<Module>): Module;
-    /**
-     * 添加模块
-     * @internal
-     * @param module 已有的模块实例
-     */
-    _addModule(module: Module): Module;
-    /**
-     * 添加模块
-     * @internal
-     * @param name 模块名称，如果不填会自动生成一个唯一名称
-     */
-    addModule(name?: string): Module;
-    /**
-     * 添加模块
-     * @param moduleOptions 模块参数
-     */
-    addModule(moduleOptions: Partial<Module>): Module;
-    /**
-     * 添加模块
-     * @param module 已有的模块实例
-     */
-    addModule(module: Module): Module;
     /**
      * 删除元素绑定事件
      * @param name 元素绑定事件名称
@@ -441,17 +366,6 @@ export declare class Frontend extends BaseNode {
      */
     removeTheme(theme: Theme): void;
     __removeTheme(theme: Theme): Params;
-    /**
-     * 删除模块
-     * @param name 模块名称
-     */
-    removeModule(name: string): void;
-    /**
-     * 删除模块
-     * @param module 已有的模块实例
-     */
-    removeModule(module: Module): void;
-    __removeModule(module: Module): Params;
     /**
      * 删除国际化信息
      * @param name 国际化信息名称
@@ -463,7 +377,6 @@ export declare class Frontend extends BaseNode {
      */
     removeI18nInfo(i18nInfo: I18nInfo): void;
     __removeI18nInfo(i18nInfo: I18nInfo): Params;
-    findComponentDependencyByName(name: string): Module;
     /**
      * @param path 路径
      * path 为要查找路径：如 /dashboard/student/list、/dashboard/student/list
@@ -486,7 +399,6 @@ export declare class Frontend extends BaseNode {
      * 为/的转成''，便于url拼接
      */
     get basePath(): string;
-    genCustomAssetsInfo(prefix: string): AssetsInfo;
     getExtensionsCallbackLogics(): string[];
     get defaultCanvasWidth(): 1440 | 375;
     /**

package/out/concepts/Frontend__.js

@@ -38,101 +38,52 @@ const translator_1 = require("../translator");
 const i18nInfo_1 = require("../utils/i18nInfo");
 const decorators_1 = require("../decorators");
 const utils = __importStar(require("../utils"));
-const Assert = __importStar(require("./utils/asserts"));
+const asserts = __importStar(require("./utils/asserts"));
 const uuid_1 = require("uuid");
 const BaseNode_1 = __importDefault(require("../common/BaseNode"));
 const Theme__1 = __importDefault(require("./Theme__"));
 /**
  * 前端
  */
-let Frontend = Frontend_1 = 
-// @ts-ignore
-class Frontend extends BaseNode_1.default {
-    /** 类名 */
-    static ConceptName = 'Frontend';
-    /** 继承链 */
-    static inheritanceChain = ['BaseNode'];
-    /**
-     * 产品概念
-     */
-    concept;
-    /**
-     * 前端标识
-     */
-    // @ts-ignore
-    name;
-    /**
-     * pc端
-     */
-    // @ts-ignore
-    title;
-    /**
-     * PC/H5 端
-     */
-    // @ts-ignore
-    type;
-    /**
-     * 基础路径
-     */
-    // @ts-ignore
-    path;
-    /**
-     * 制品应用标题
-     */
-    // @ts-ignore
-    documentTitle;
-    /**
-     * 制品应用图标
-     */
-    // @ts-ignore
-    documentIcon;
-    /**
-     * 元素绑定事件列表
-     */
-    bindEvents = [];
-    /**
-     * 页面列表
-     */
-    views = [];
-    /**
-     * 前端全局变量列表
-     */
-    variables = [];
-    /**
-     * 主题配置
-     */
-    theme = new Theme__1.default();
-    /**
-     * 扩展组件列表（兼容老版）
-     */
-    componentDependencies = [];
-    /**
-     * 全局缩放开关
-     */
-    globalScaleEnabled = false;
-    /**
-     * 画布宽度
-     */
-    canvasWidth = 0;
-    /**
-     * 国际化信息
-     */
-    // @ts-ignore
-    i18nInfo;
-    /**
-     * 祖先 App
-     */
-    get app() {
-        return this.getAncestor('App');
-    }
+let Frontend = Frontend_1 = class Frontend extends BaseNode_1.default {
     /**
      * @param source 需要合并的部分参数
      */
     constructor(source) {
         source = Object.assign({}, Frontend_1.getDefaultOptions(), source);
         super(source);
+        /**
+         * 元素绑定事件列表
+         */
+        this.bindEvents = [];
+        /**
+         * 页面列表
+         */
+        this.views = [];
+        /**
+         * 前端全局变量列表
+         */
+        this.variables = [];
+        /**
+         * 主题配置
+         */
+        this.theme = new Theme__1.default();
+        /**
+         * 全局缩放开关
+         */
+        this.globalScaleEnabled = false;
+        /**
+         * 画布宽度
+         */
+        this.canvasWidth = 0;
         super.subConstructor(source);
     }
+    /**
+     * 祖先 App
+     */
+    get app() {
+        return this.getAncestor('App');
+    }
     static from(source, parentNode, parentKey) {
         return super.from(source, parentNode, parentKey);
     }
@@ -249,7 +200,7 @@ class Frontend extends BaseNode_1.default {
                 name: options,
             }, this, 'bindEvents');
         }
-        else if (Assert.isBindEvent(options)) {
+        else if (asserts.isBindEvent(options)) {
             options.ensureDelete(); // 同一实例不支持多处存在
             bindEvent = options;
             Object.assign(bindEvent, relationOptions);
@@ -310,7 +261,7 @@ class Frontend extends BaseNode_1.default {
                 name: options,
             }, this, 'views');
         }
-        else if (Assert.isView(options)) {
+        else if (asserts.isView(options)) {
             options.ensureDelete(); // 同一实例不支持多处存在
             view = options;
             Object.assign(view, relationOptions);
@@ -373,7 +324,7 @@ class Frontend extends BaseNode_1.default {
                 name: options,
             }, this, 'variables');
         }
-        else if (Assert.isFrontendVariable(options)) {
+        else if (asserts.isFrontendVariable(options)) {
             options.ensureDelete(); // 同一实例不支持多处存在
             frontendVariable = options;
             Object.assign(frontendVariable, relationOptions);
@@ -410,69 +361,6 @@ class Frontend extends BaseNode_1.default {
         });
         return node;
     }
-    getModuleExistingNames(excludedList = []) {
-        const excludedSet = new Set(excludedList);
-        return (this.componentDependencies || [])
-            .filter((item) => !excludedSet.has(item))
-            .map((item) => item?.name);
-    }
-    getModuleUniqueName(name = 'module1') {
-        return utils.unique(name, this.getModuleExistingNames(), undefined, false);
-    }
-    _insertModuleAt(options, index) {
-        const moduleOptions = {};
-        const relationOptions = { parentNode: this, parentKey: 'componentDependencies' };
-        const Module = (0, decorators_1.getConceptConstructor)('Module');
-        let module;
-        if (!options) {
-            module = Module.from({
-                ...moduleOptions,
-                name: this.getModuleUniqueName(),
-            }, this, 'componentDependencies');
-        }
-        else if (typeof options === 'string') {
-            module = Module.from({
-                ...moduleOptions,
-                name: options,
-            }, this, 'componentDependencies');
-        }
-        else if (Assert.isModule(options)) {
-            options.ensureDelete(); // 同一实例不支持多处存在
-            module = options;
-            Object.assign(module, relationOptions);
-        }
-        else {
-            module = Module.from({
-                ...moduleOptions,
-                ...options,
-            }, this, 'componentDependencies');
-        }
-        this.componentDependencies.splice(index, 0, module);
-        return module;
-    }
-    insertModuleAt(options, index) {
-        const node = this._insertModuleAt(options, index);
-        node.create({
-            index,
-            parentNode: this,
-            parentKey: 'componentDependencies',
-        });
-        return node;
-    }
-    _addModule(options) {
-        const index = this.componentDependencies.length;
-        return this._insertModuleAt(options, index);
-    }
-    addModule(options) {
-        const node = this._addModule(options);
-        const index = this.componentDependencies.indexOf(node);
-        node.create({
-            index,
-            parentNode: this,
-            parentKey: 'componentDependencies',
-        });
-        return node;
-    }
     removeBindEvent(options) {
         let bindEvent;
         if (typeof options === 'string') {
@@ -649,50 +537,6 @@ class Frontend extends BaseNode_1.default {
         }
         return params;
     }
-    removeModule(options) {
-        let module;
-        if (typeof options === 'string') {
-            module = this.componentDependencies.find((item) => item.name === options);
-            if (!module) {
-                throw new Error('找不到模块 ' + options);
-            }
-        }
-        else {
-            module = options;
-        }
-        return module.delete();
-    }
-    __removeModule(module) {
-        const parentKey = module.parentKey;
-        const params = {
-            parentNode: this,
-            parentKey,
-            index: -1,
-            object: null,
-            oldObject: module,
-        };
-        if (parentKey) {
-            params.parentKey = parentKey;
-            // @ts-ignore
-            const t = this.__v_raw || this;
-            // @ts-ignore
-            const n = module.__v_raw || module;
-            if (Array.isArray(t[parentKey])) {
-                // @ts-ignore
-                const index = t[parentKey].findIndex((el) => (el.__v_raw || el) === n);
-                ~index && this[parentKey].splice(index, 1);
-                params.index = index;
-            }
-            else {
-                const q = t[parentKey];
-                if ((q.__v_raw || q) === n) {
-                    params.index = 0;
-                    this[parentKey] = undefined;
-                }
-            }
-        }
-        return params;
-    }
     removeI18nInfo(options) {
         let i18nInfo;
         if (typeof options === 'string') {
@@ -741,9 +585,6 @@ class Frontend extends BaseNode_1.default {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-    findComponentDependencyByName(name) {
-        return this.componentDependencies.find((componentDependency) => componentDependency.name === name);
-    }
     /**
      * @param path 路径
      * path 为要查找路径：如 /dashboard/student/list、/dashboard/student/list
@@ -801,7 +642,7 @@ class Frontend extends BaseNode_1.default {
      * @param name 一般不用传，用于 rename
      */
     getEmbeddedFilePath(name = this.name) {
-        return `/embedded/${this.rootNode?.name || this.parentNode.name}/frontends/${name}.ts`;
+        return `/embedded/${this.getAncestor('App')?.name}/frontendTypes/${this.getAncestor('FrontendType')?.name}/frontends/${name}.ts`;
     }
     *toEmbeddedTS(state = (0, translator_1.createCompilerState)()) {
         const self = this;
@@ -851,27 +692,6 @@ class Frontend extends BaseNode_1.default {
         const basePath = path && path !== '/' ? path : '';
         return basePath;
     }
-    genCustomAssetsInfo(prefix) {
-        const custom = {
-            js: [],
-            css: [],
-            names: [],
-        };
-        const existingSet = new Set();
-        this.componentDependencies.forEach((dep) => {
-            const { name, version } = dep;
-            const jsName = `${prefix}/packages/${name}@${version}/dist-theme/index.js`;
-            if (!existingSet.has(jsName)) {
-                existingSet.add(jsName);
-                custom.js.push(jsName);
-                if (utils.shouldLoadCss(name, version)) {
-                    custom.css.push(`${prefix}/packages/${name}@${version}/dist-theme/index.css`);
-                }
-                custom.names.push(name);
-            }
-        });
-        return custom;
-    }
     getExtensionsCallbackLogics() {
         let resultLogics = [];
         this.views.forEach((item) => {
@@ -1018,6 +838,10 @@ class Frontend extends BaseNode_1.default {
         return list;
     }
 };
+/** 类名 */
+Frontend.ConceptName = 'Frontend';
+/** 继承链 */
+Frontend.inheritanceChain = ['BaseNode'];
 __decorate([
     (0, decorators_1.property)('concept')
 ], Frontend.prototype, "concept", void 0);
@@ -1065,13 +889,6 @@ __decorate([
         objectRef: 'Theme',
     })
 ], Frontend.prototype, "theme", void 0);
-__decorate([
-    (0, decorators_1.property)({
-        objectRef: 'Module',
-        isArray: true,
-        defaultValue: [],
-    })
-], Frontend.prototype, "componentDependencies", void 0);
 __decorate([
     (0, decorators_1.property)()
 ], Frontend.prototype, "globalScaleEnabled", void 0);
@@ -1088,7 +905,6 @@ __decorate([
 ], Frontend.prototype, "toEmbeddedTS", null);
 Frontend = Frontend_1 = __decorate([
     (0, decorators_1.concept)('前端')
-    // @ts-ignore
 ], Frontend);
 exports.Frontend = Frontend;
 exports.default = Frontend;