@lcap/nasl 1.0.0-alpha.9 → 1.0.2

package/src/concepts/App__.ts

@@ -85,6 +85,18 @@ export class App extends BaseNode {
     @property()
     scope: 'pc' | 'h5' = undefined;
 
+    /**
+     * 制品应用标题
+     */
+    @property()
+    documentTitle: string = undefined;
+
+    /**
+     * 制品应用图标
+     */
+    @property()
+    documentIcon: string = undefined;
+
     /**
      * 是否有用户中心
      */
@@ -175,8 +187,6 @@ export class App extends BaseNode {
     @property('Module')
     componentDependencies: Array<Module> = [];
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -201,14 +211,36 @@ export class App extends BaseNode {
         }
         return params;
     }
-    
+    /**
+     * 设置制品应用标题
+     */
+    setDocumentTitle(documentTitle: string) {
+        const object = {
+            documentTitle,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
+    /**
+     * 设置制品应用图标
+     */
+    setDocumentIcon(documentIcon: string) {
+        const object = {
+            documentIcon,
+        };
+        this.update({
+            ...object,
+        });
+    }
 
-        getEntityExistingNames(excludedList: Array<Entity> = []) {
+    getEntityExistingNames(excludedList: Array<Entity> = []) {
         const excludedSet = new Set(excludedList);
         return (this.entities || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getEntityUniqueName(name = 'Entity1') {
-        return utils.unique(name, this.getEntityExistingNames());
+        return utils.unique(name, this.getEntityExistingNames(), undefined, true);
     }
 
     /**
@@ -247,7 +279,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'entities');
         } else if (options instanceof Entity) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             entity = options;
             Object.assign(entity, relationOptions);
         } else {
@@ -335,7 +367,7 @@ export class App extends BaseNode {
 
     addEntity(options?: string | Partial<Entity> | Entity) {
         const node = this._addEntity(options as any);
-        const index = 0;
+        const index = this.entities.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -344,13 +376,12 @@ export class App extends BaseNode {
         return node;
     }
 
-
     getStructureExistingNames(excludedList: Array<Structure> = []) {
         const excludedSet = new Set(excludedList);
         return (this.structures || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getStructureUniqueName(name = 'Structure1') {
-        return utils.unique(name, this.getStructureExistingNames());
+        return utils.unique(name, this.getStructureExistingNames(), undefined, true);
     }
 
     /**
@@ -389,7 +420,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'structures');
         } else if (options instanceof Structure) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             structure = options;
             Object.assign(structure, relationOptions);
         } else {
@@ -477,7 +508,7 @@ export class App extends BaseNode {
 
     addStructure(options?: string | Partial<Structure> | Structure) {
         const node = this._addStructure(options as any);
-        const index = 0;
+        const index = this.structures.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -486,13 +517,12 @@ export class App extends BaseNode {
         return node;
     }
 
-
     getEnumExistingNames(excludedList: Array<Enum> = []) {
         const excludedSet = new Set(excludedList);
         return (this.enums || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getEnumUniqueName(name = 'Enum1') {
-        return utils.unique(name, this.getEnumExistingNames());
+        return utils.unique(name, this.getEnumExistingNames(), undefined, true);
     }
 
     /**
@@ -531,7 +561,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'enums');
         } else if (options instanceof Enum) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             enumeration = options;
             Object.assign(enumeration, relationOptions);
         } else {
@@ -619,7 +649,7 @@ export class App extends BaseNode {
 
     addEnum(options?: string | Partial<Enum> | Enum) {
         const node = this._addEnum(options as any);
-        const index = 0;
+        const index = this.enums.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -628,13 +658,12 @@ export class App extends BaseNode {
         return node;
     }
 
-
     getLogicExistingNames(excludedList: Array<Logic> = []) {
         const excludedSet = new Set(excludedList);
         return (this.logics || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getLogicUniqueName(name = 'logic1') {
-        return utils.unique(name, this.getLogicExistingNames());
+        return utils.unique(name, this.getLogicExistingNames(), undefined, true);
     }
 
     /**
@@ -673,7 +702,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'logics');
         } else if (options instanceof Logic) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logic = options;
             Object.assign(logic, relationOptions);
         } else {
@@ -761,7 +790,7 @@ export class App extends BaseNode {
 
     addLogic(options?: string | Partial<Logic> | Logic) {
         const node = this._addLogic(options as any);
-        const index = 0;
+        const index = this.logics.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -770,13 +799,12 @@ export class App extends BaseNode {
         return node;
     }
 
-
     getInterfaceExistingNames(excludedList: Array<Interface> = []) {
         const excludedSet = new Set(excludedList);
         return (this.interfaces || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getInterfaceUniqueName(name = 'Interface1') {
-        return utils.unique(name, this.getInterfaceExistingNames());
+        return utils.unique(name, this.getInterfaceExistingNames(), undefined, true);
     }
 
     /**
@@ -815,7 +843,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'interfaces');
         } else if (options instanceof Interface) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             itface = options;
             Object.assign(itface, relationOptions);
         } else {
@@ -903,7 +931,7 @@ export class App extends BaseNode {
 
     addInterface(options?: string | Partial<Interface> | Interface) {
         const node = this._addInterface(options as any);
-        const index = 0;
+        const index = this.interfaces.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -912,13 +940,12 @@ export class App extends BaseNode {
         return node;
     }
 
-
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return (this.views || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getViewUniqueName(name = 'view1') {
-        return utils.unique(name, this.getViewExistingNames());
+        return utils.unique(name, this.getViewExistingNames(), undefined, true);
     }
 
     /**
@@ -957,7 +984,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'views');
         } else if (options instanceof View) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             view = options;
             Object.assign(view, relationOptions);
         } else {
@@ -1045,7 +1072,7 @@ export class App extends BaseNode {
 
     addView(options?: string | Partial<View> | View) {
         const node = this._addView(options as any);
-        const index = this.views.length;
+        const index = this.views.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1054,13 +1081,12 @@ export class App extends BaseNode {
         return node;
     }
 
-
     getProcessExistingNames(excludedList: Array<Process> = []) {
         const excludedSet = new Set(excludedList);
         return (this.processes || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getProcessUniqueName(name = 'Process1') {
-        return utils.unique(name, this.getProcessExistingNames());
+        return utils.unique(name, this.getProcessExistingNames(), undefined, true);
     }
 
     /**
@@ -1099,7 +1125,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'processes');
         } else if (options instanceof Process) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             process = options;
             Object.assign(process, relationOptions);
         } else {
@@ -1187,7 +1213,7 @@ export class App extends BaseNode {
 
     addProcess(options?: string | Partial<Process> | Process) {
         const node = this._addProcess(options as any);
-        const index = 0;
+        const index = this.processes.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1196,13 +1222,12 @@ export class App extends BaseNode {
         return node;
     }
 
-
     getRoleExistingNames(excludedList: Array<Role> = []) {
         const excludedSet = new Set(excludedList);
         return (this.roles || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getRoleUniqueName(name = 'role1') {
-        return utils.unique(name, this.getRoleExistingNames());
+        return utils.unique(name, this.getRoleExistingNames(), undefined, true);
     }
 
     /**
@@ -1241,7 +1266,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'roles');
         } else if (options instanceof Role) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             role = options;
             Object.assign(role, relationOptions);
         } else {
@@ -1329,7 +1354,7 @@ export class App extends BaseNode {
 
     addRole(options?: string | Partial<Role> | Role) {
         const node = this._addRole(options as any);
-        const index = this.roles.length;
+        const index = this.roles.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1338,13 +1363,12 @@ export class App extends BaseNode {
         return node;
     }
 
-
     getModuleExistingNames(excludedList: Array<Module> = []) {
         const excludedSet = new Set(excludedList);
         return (this.dependencies || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getModuleUniqueName(name = 'module1') {
-        return utils.unique(name, this.getModuleExistingNames());
+        return utils.unique(name, this.getModuleExistingNames(), undefined, false);
     }
 
     /**
@@ -1383,7 +1407,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'dependencies');
         } else if (options instanceof Module) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             module = options;
             Object.assign(module, relationOptions);
         } else {
@@ -1471,7 +1495,7 @@ export class App extends BaseNode {
 
     addModuleInDependencies(options?: string | Partial<Module> | Module) {
         const node = this._addModuleInDependencies(options as any);
-        const index = this.dependencies.length;
+        const index = this.dependencies.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1516,7 +1540,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'interfaceDependencies');
         } else if (options instanceof Module) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             module = options;
             Object.assign(module, relationOptions);
         } else {
@@ -1604,7 +1628,7 @@ export class App extends BaseNode {
 
     addModuleInInterfaceDependencies(options?: string | Partial<Module> | Module) {
         const node = this._addModuleInInterfaceDependencies(options as any);
-        const index = this.interfaceDependencies.length;
+        const index = this.interfaceDependencies.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1649,7 +1673,7 @@ export class App extends BaseNode {
                 name: options,
             }, this, 'componentDependencies');
         } else if (options instanceof Module) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             module = options;
             Object.assign(module, relationOptions);
         } else {
@@ -1737,7 +1761,7 @@ export class App extends BaseNode {
 
     addModuleInComponentDependencies(options?: string | Partial<Module> | Module) {
         const node = this._addModuleInComponentDependencies(options as any);
-        const index = this.componentDependencies.length;
+        const index = this.componentDependencies.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1746,9 +1770,6 @@ export class App extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除实体
     * @param name 实体名称
@@ -1797,8 +1818,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除数据结构
     * @param name 数据结构名称
@@ -1847,8 +1866,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除枚举
     * @param name 枚举名称
@@ -1897,8 +1914,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1947,8 +1962,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除接口
     * @param name 接口名称
@@ -1997,8 +2010,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除页面
     * @param name 页面名称
@@ -2047,8 +2058,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除流程
     * @param name 流程名称
@@ -2097,8 +2106,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除角色
     * @param name 角色名称
@@ -2147,8 +2154,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除主题
     * @param name 主题名称
@@ -2197,8 +2202,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除配置管理
     * @param name 配置管理名称
@@ -2247,8 +2250,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除模块
     * @param name 模块名称
@@ -2274,8 +2275,6 @@ export class App extends BaseNode {
         return module.delete();
     }
 
-    
-
     /**
     * 删除模块
     * @param name 模块名称
@@ -2301,8 +2300,6 @@ export class App extends BaseNode {
         return module.delete();
     }
 
-    
-
     /**
     * 删除模块
     * @param name 模块名称
@@ -2436,6 +2433,10 @@ export class App extends BaseNode {
         return `app`;
     }
 
+    getTsNamespace() {
+        return `app`;
+    }
+
     findNodeByPath(nodePath: string) {
         const pathArr = nodePath?.split('.') || [];
         let pathItem = pathArr.shift();
@@ -2446,7 +2447,7 @@ export class App extends BaseNode {
             const arrOption = matchArr && matchArr[1] && matchArr[1].split('=');
             if (node && arrayPropertyKey && arrayPropertyKey !== 'app') {
                 node = node[arrayPropertyKey];
-                if (Array.isArray(arrOption) && arrOption.length && Array.isArray(node) && node.length) {
+                if (Array.isArray(arrOption) && arrOption.length && Array.isArray(node)) {
                     if (arrOption.length === 2) {
                         node = node.filter((nodeItem) => nodeItem[arrOption[0]] === arrOption[1])[0];
                     } else {
@@ -2476,26 +2477,30 @@ export class App extends BaseNode {
         return arr.length ? subView.findViewByPath(arr.join('/')) : subView;
     }
 
+    findViewByName(name: string): View {
+        return utils.traverse((current) => {
+            if (current.node.name === name)
+                return current.node;
+        }, { node: { name: '', children: this.views } });
+    }
+
     loadEnvList() {
         this.envList = ['dev', 'online'];
     }
 
-    public readonly packageInfo: {
+    // 必须先 loadPackageInfo 之后再生成代码
+    public packageInfo: {
         template: { name: string; version: string };
         ui: { name: string; version: string };
-    } = {
-        template: {
-            name: 'lcap-pc-template',
-            version: '0.4.13-beta',
-        },
-        ui: {
-            name: 'cloud-ui.vusion',
-            version: '0.14.8',
-        },
-    };
+    } = null;
 
     loadPackageInfo() {
         const dependencyMap = (window as any).globalData.ideVersionDetail.dependencies;
+        this.packageInfo = {
+            template: { name: '', version: '' },
+            ui: { name: '', version: '' },
+        };
+
         this.packageInfo.template.name = this.scope === 'h5' ? '@lcap/mobile-template' : 'lcap-pc-template';
         this.packageInfo.template.version = this.scope === 'h5' ? dependencyMap.FrontendArchH5.version : dependencyMap.FrontendArchPC.version;
         this.packageInfo.ui.name = this.scope === 'h5' ? '@lcap/mobile-ui' : 'cloud-ui.vusion';
@@ -2521,7 +2526,7 @@ export class App extends BaseNode {
 
                     scope === 'h5' ? `${prefix}/packages/@lcap/mobile-ui@${packageInfo.ui.version}/dist-theme/index.js` : `${prefix}/packages/cloud-ui.vusion@${packageInfo.ui.version}/dist-theme/index.js`,
 
-                    scope === 'h5' ? `${prefix}/packages/@lcap/mobile-template@0.7.10-beta/cloudAdminDesigner.umd.min.js` : `${prefix}/packages/lcap-pc-template@0.4.13-beta/cloudAdminDesigner.umd.min.js`,
+                    scope === 'h5' ? `${prefix}/packages/@lcap/mobile-template@${packageInfo.template.version}/cloudAdminDesigner.umd.min.js` : `${prefix}/packages/lcap-pc-template@${packageInfo.template.version}/cloudAdminDesigner.umd.min.js`,
                 ],
                 css: [
                     scope === 'h5' ? `${prefix}/packages/@lcap/mobile-ui@${packageInfo.ui.version}/dist-theme/index.css` : `${prefix}/packages/cloud-ui.vusion@${packageInfo.ui.version}/dist-theme/index.css`,
@@ -2537,7 +2542,9 @@ export class App extends BaseNode {
         this.componentDependencies.forEach((dep) => {
             const { name, version } = dep;
             result.custom.js.push(`${prefix}/packages/${name}@${version}/dist-theme/index.js`);
-            result.custom.css.push(`${prefix}/packages/${name}@${version}/dist-theme/index.css`);
+            if (utils.shouldLoadCss(name, version)) {
+                result.custom.css.push(`${prefix}/packages/${name}@${version}/dist-theme/index.css`);
+            }
             result.custom.names.push(name);
         });
         return result;
@@ -2560,7 +2567,7 @@ ${keys.map((key) => `    ${key}: ${this.theme?.variableMap[key]};`).join('\n')}
     //================================================================================
 }
 
-classMap['App'] = App;
+classMap.App = App;
 export default App;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Argument__.ts

@@ -1,5 +1,6 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
+import StringLiteral from './StringLiteral__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -172,13 +173,32 @@ export class Argument extends LogicItem {
         return code;
     }
 
+    /**
+     * 获取当前的TsName
+     */
+    get tsKeyword() {
+        if (this.keyword) {
+            let tsName = this.keyword;
+            // 匹配所有特殊字符都转为_
+            tsName = tsName.replace(/\W/g, '_');
+            if (/^\d/.test(tsName)) {
+                tsName = '$' + tsName;
+            }
+            return tsName;
+        }
+        return '';
+    }
+
     @withSourceMap()
-    toEmbeddedTS(state?: TranslatorState): string {
+    toEmbeddedTS(state?: TranslatorState, isRequired: boolean = true, isHaveKeyWord?: boolean): string {
         let code = this.spread ? '...' : '';
+        if (isHaveKeyWord) {
+            code += `${this.tsKeyword}:`;
+        }
         if (this.expression) {
-            code += this.expression.toEmbeddedTS(shiftState(state, code));
+            code += (this.expression as StringLiteral).toEmbeddedTS(shiftState(state, code), isRequired);
         } else {
-            code += '__IDENTIFIER__';
+            code += isRequired ? '__IDENTIFIER__' : 'undefined';
         }
         return code;
     }