@lcap/nasl 1.0.0-alpha → 1.0.0-alpha.3

package/src/concepts/App__.ts

@@ -11,6 +11,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import Entity from './Entity__';
@@ -22,6 +23,7 @@ import View from './View__';
 import Process from './Process__';
 import Role from './Role__';
 import Theme from './Theme__';
+import Configuration from './Configuration__';
 import Module from './Module__';
 
 /**
@@ -149,6 +151,12 @@ export class App extends BaseNode {
     @property('Theme')
     theme: Theme = new Theme();
 
+    /**
+     * 配置管理
+     */
+    @property('Configuration')
+    configuration: Configuration = new Configuration();
+
     /**
      * 扩展模块列表
      */
@@ -197,7 +205,7 @@ export class App extends BaseNode {
 
         getEntityExistingNames(excludedList: Array<Entity> = []) {
         const excludedSet = new Set(excludedList);
-        return this.entities.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.entities || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getEntityUniqueName(name = 'Entity1') {
         return utils.unique(name, this.getEntityExistingNames());
@@ -232,22 +240,22 @@ export class App extends BaseNode {
             entity = Entity.from({
                 ...entityOptions,
                 name: this.getEntityUniqueName(),
-            }, this);
+            }, this, 'entities');
         } else if (typeof options === 'string') {
             entity = Entity.from({
                 ...entityOptions,
                 name: options,
-            }, this);
+            }, this, 'entities');
         } else if (options instanceof Entity) {
             options.delete(); // 同一实例不支持多处存在
             entity = options;
+            Object.assign(entity, relationOptions);
         } else {
             entity = Entity.from({
                 ...entityOptions,
                 ...options,
-            }, this);
+            }, this, 'entities');
         }
-        Object.assign(entity, relationOptions);
         this.entities.splice(index, 0, entity);
         return entity;
     }
@@ -339,7 +347,7 @@ export class App extends BaseNode {
 
     getStructureExistingNames(excludedList: Array<Structure> = []) {
         const excludedSet = new Set(excludedList);
-        return this.structures.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.structures || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getStructureUniqueName(name = 'Structure1') {
         return utils.unique(name, this.getStructureExistingNames());
@@ -374,22 +382,22 @@ export class App extends BaseNode {
             structure = Structure.from({
                 ...structureOptions,
                 name: this.getStructureUniqueName(),
-            }, this);
+            }, this, 'structures');
         } else if (typeof options === 'string') {
             structure = Structure.from({
                 ...structureOptions,
                 name: options,
-            }, this);
+            }, this, 'structures');
         } else if (options instanceof Structure) {
             options.delete(); // 同一实例不支持多处存在
             structure = options;
+            Object.assign(structure, relationOptions);
         } else {
             structure = Structure.from({
                 ...structureOptions,
                 ...options,
-            }, this);
+            }, this, 'structures');
         }
-        Object.assign(structure, relationOptions);
         this.structures.splice(index, 0, structure);
         return structure;
     }
@@ -481,7 +489,7 @@ export class App extends BaseNode {
 
     getEnumExistingNames(excludedList: Array<Enum> = []) {
         const excludedSet = new Set(excludedList);
-        return this.enums.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.enums || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getEnumUniqueName(name = 'Enum1') {
         return utils.unique(name, this.getEnumExistingNames());
@@ -516,22 +524,22 @@ export class App extends BaseNode {
             enumeration = Enum.from({
                 ...enumerationOptions,
                 name: this.getEnumUniqueName(),
-            }, this);
+            }, this, 'enums');
         } else if (typeof options === 'string') {
             enumeration = Enum.from({
                 ...enumerationOptions,
                 name: options,
-            }, this);
+            }, this, 'enums');
         } else if (options instanceof Enum) {
             options.delete(); // 同一实例不支持多处存在
             enumeration = options;
+            Object.assign(enumeration, relationOptions);
         } else {
             enumeration = Enum.from({
                 ...enumerationOptions,
                 ...options,
-            }, this);
+            }, this, 'enums');
         }
-        Object.assign(enumeration, relationOptions);
         this.enums.splice(index, 0, enumeration);
         return enumeration;
     }
@@ -623,7 +631,7 @@ export class App extends BaseNode {
 
     getLogicExistingNames(excludedList: Array<Logic> = []) {
         const excludedSet = new Set(excludedList);
-        return this.logics.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.logics || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getLogicUniqueName(name = 'logic1') {
         return utils.unique(name, this.getLogicExistingNames());
@@ -658,22 +666,22 @@ export class App extends BaseNode {
             logic = Logic.from({
                 ...logicOptions,
                 name: this.getLogicUniqueName(),
-            }, this);
+            }, this, 'logics');
         } else if (typeof options === 'string') {
             logic = Logic.from({
                 ...logicOptions,
                 name: options,
-            }, this);
+            }, this, 'logics');
         } else if (options instanceof Logic) {
             options.delete(); // 同一实例不支持多处存在
             logic = options;
+            Object.assign(logic, relationOptions);
         } else {
             logic = Logic.from({
                 ...logicOptions,
                 ...options,
-            }, this);
+            }, this, 'logics');
         }
-        Object.assign(logic, relationOptions);
         this.logics.splice(index, 0, logic);
         return logic;
     }
@@ -765,7 +773,7 @@ export class App extends BaseNode {
 
     getInterfaceExistingNames(excludedList: Array<Interface> = []) {
         const excludedSet = new Set(excludedList);
-        return this.interfaces.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.interfaces || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getInterfaceUniqueName(name = 'Interface1') {
         return utils.unique(name, this.getInterfaceExistingNames());
@@ -800,22 +808,22 @@ export class App extends BaseNode {
             itface = Interface.from({
                 ...itfaceOptions,
                 name: this.getInterfaceUniqueName(),
-            }, this);
+            }, this, 'interfaces');
         } else if (typeof options === 'string') {
             itface = Interface.from({
                 ...itfaceOptions,
                 name: options,
-            }, this);
+            }, this, 'interfaces');
         } else if (options instanceof Interface) {
             options.delete(); // 同一实例不支持多处存在
             itface = options;
+            Object.assign(itface, relationOptions);
         } else {
             itface = Interface.from({
                 ...itfaceOptions,
                 ...options,
-            }, this);
+            }, this, 'interfaces');
         }
-        Object.assign(itface, relationOptions);
         this.interfaces.splice(index, 0, itface);
         return itface;
     }
@@ -907,7 +915,7 @@ export class App extends BaseNode {
 
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
-        return this.views.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.views || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getViewUniqueName(name = 'view1') {
         return utils.unique(name, this.getViewExistingNames());
@@ -942,22 +950,22 @@ export class App extends BaseNode {
             view = View.from({
                 ...viewOptions,
                 name: this.getViewUniqueName(),
-            }, this);
+            }, this, 'views');
         } else if (typeof options === 'string') {
             view = View.from({
                 ...viewOptions,
                 name: options,
-            }, this);
+            }, this, 'views');
         } else if (options instanceof View) {
             options.delete(); // 同一实例不支持多处存在
             view = options;
+            Object.assign(view, relationOptions);
         } else {
             view = View.from({
                 ...viewOptions,
                 ...options,
-            }, this);
+            }, this, 'views');
         }
-        Object.assign(view, relationOptions);
         this.views.splice(index, 0, view);
         return view;
     }
@@ -1049,7 +1057,7 @@ export class App extends BaseNode {
 
     getProcessExistingNames(excludedList: Array<Process> = []) {
         const excludedSet = new Set(excludedList);
-        return this.processes.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.processes || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getProcessUniqueName(name = 'Process1') {
         return utils.unique(name, this.getProcessExistingNames());
@@ -1084,22 +1092,22 @@ export class App extends BaseNode {
             process = Process.from({
                 ...processOptions,
                 name: this.getProcessUniqueName(),
-            }, this);
+            }, this, 'processes');
         } else if (typeof options === 'string') {
             process = Process.from({
                 ...processOptions,
                 name: options,
-            }, this);
+            }, this, 'processes');
         } else if (options instanceof Process) {
             options.delete(); // 同一实例不支持多处存在
             process = options;
+            Object.assign(process, relationOptions);
         } else {
             process = Process.from({
                 ...processOptions,
                 ...options,
-            }, this);
+            }, this, 'processes');
         }
-        Object.assign(process, relationOptions);
         this.processes.splice(index, 0, process);
         return process;
     }
@@ -1191,7 +1199,7 @@ export class App extends BaseNode {
 
     getRoleExistingNames(excludedList: Array<Role> = []) {
         const excludedSet = new Set(excludedList);
-        return this.roles.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.roles || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getRoleUniqueName(name = 'role1') {
         return utils.unique(name, this.getRoleExistingNames());
@@ -1226,22 +1234,22 @@ export class App extends BaseNode {
             role = Role.from({
                 ...roleOptions,
                 name: this.getRoleUniqueName(),
-            }, this);
+            }, this, 'roles');
         } else if (typeof options === 'string') {
             role = Role.from({
                 ...roleOptions,
                 name: options,
-            }, this);
+            }, this, 'roles');
         } else if (options instanceof Role) {
             options.delete(); // 同一实例不支持多处存在
             role = options;
+            Object.assign(role, relationOptions);
         } else {
             role = Role.from({
                 ...roleOptions,
                 ...options,
-            }, this);
+            }, this, 'roles');
         }
-        Object.assign(role, relationOptions);
         this.roles.splice(index, 0, role);
         return role;
     }
@@ -1333,7 +1341,7 @@ export class App extends BaseNode {
 
     getModuleExistingNames(excludedList: Array<Module> = []) {
         const excludedSet = new Set(excludedList);
-        return this.dependencies.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.dependencies || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getModuleUniqueName(name = 'module1') {
         return utils.unique(name, this.getModuleExistingNames());
@@ -1368,22 +1376,22 @@ export class App extends BaseNode {
             module = Module.from({
                 ...moduleOptions,
                 name: this.getModuleUniqueName(),
-            }, this);
+            }, this, 'dependencies');
         } else if (typeof options === 'string') {
             module = Module.from({
                 ...moduleOptions,
                 name: options,
-            }, this);
+            }, this, 'dependencies');
         } else if (options instanceof Module) {
             options.delete(); // 同一实例不支持多处存在
             module = options;
+            Object.assign(module, relationOptions);
         } else {
             module = Module.from({
                 ...moduleOptions,
                 ...options,
-            }, this);
+            }, this, 'dependencies');
         }
-        Object.assign(module, relationOptions);
         this.dependencies.splice(index, 0, module);
         return module;
     }
@@ -1501,22 +1509,22 @@ export class App extends BaseNode {
             module = Module.from({
                 ...moduleOptions,
                 name: this.getModuleUniqueName(),
-            }, this);
+            }, this, 'interfaceDependencies');
         } else if (typeof options === 'string') {
             module = Module.from({
                 ...moduleOptions,
                 name: options,
-            }, this);
+            }, this, 'interfaceDependencies');
         } else if (options instanceof Module) {
             options.delete(); // 同一实例不支持多处存在
             module = options;
+            Object.assign(module, relationOptions);
         } else {
             module = Module.from({
                 ...moduleOptions,
                 ...options,
-            }, this);
+            }, this, 'interfaceDependencies');
         }
-        Object.assign(module, relationOptions);
         this.interfaceDependencies.splice(index, 0, module);
         return module;
     }
@@ -1634,22 +1642,22 @@ export class App extends BaseNode {
             module = Module.from({
                 ...moduleOptions,
                 name: this.getModuleUniqueName(),
-            }, this);
+            }, this, 'componentDependencies');
         } else if (typeof options === 'string') {
             module = Module.from({
                 ...moduleOptions,
                 name: options,
-            }, this);
+            }, this, 'componentDependencies');
         } else if (options instanceof Module) {
             options.delete(); // 同一实例不支持多处存在
             module = options;
+            Object.assign(module, relationOptions);
         } else {
             module = Module.from({
                 ...moduleOptions,
                 ...options,
-            }, this);
+            }, this, 'componentDependencies');
         }
-        Object.assign(module, relationOptions);
         this.componentDependencies.splice(index, 0, module);
         return module;
     }
@@ -2191,6 +2199,56 @@ export class App extends BaseNode {
 
 
 
+    /**
+    * 删除配置管理
+    * @param name 配置管理名称
+    */
+    removeConfiguration(name: string): void;
+
+    /**
+     * 删除配置管理
+     * @param configuration 已有的配置管理实例
+     */
+    removeConfiguration(configuration: Configuration): void;
+
+    removeConfiguration(options: string | Configuration) {
+        let configuration: Configuration;
+        if (typeof options === 'string') {
+            configuration = this.configuration;
+            if (!configuration) {
+                throw new Error('找不到配置管理 ' + options);
+            }
+        } else {
+            configuration = options;
+        }
+        return configuration.delete();
+    }
+
+    __removeConfiguration(configuration: Configuration) {
+        const parentKey = configuration.parentKey;
+        const params: Params = {
+            parentNode: this,
+            parentKey,
+            index: -1,
+            object: null,
+            oldObject: configuration,
+        };
+        if (parentKey) {
+            params.parentKey = parentKey;
+            if (Array.isArray((this as any)[parentKey])) {
+                const index = (this as any)[parentKey].indexOf(configuration);
+                ~index && (this as any)[parentKey].splice(index, 1);
+                params.index = index;
+            } else if ((this as any)[parentKey] === configuration) {
+                params.index = 0;
+                (this as any)[parentKey] = undefined;
+            }
+        }
+        return params;
+    }
+
+
+
     /**
     * 删除模块
     * @param name 模块名称
@@ -2297,6 +2355,9 @@ export class App extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    findComponentDependencyByName(name: string) {
+        return this.componentDependencies.find((componentDependency) => componentDependency.name === name);
+    }
 
     findEntityByName(name: string) {
         return this.entities.find((entity) => entity.name === name);
@@ -2383,7 +2444,7 @@ export class App extends BaseNode {
             const matchArr = pathItem.match(/\[(.+?)\]/);
             const arrayPropertyKey = pathItem.split('[')[0];
             const arrOption = matchArr && matchArr[1] && matchArr[1].split('=');
-            if (arrayPropertyKey && arrayPropertyKey !== 'app') {
+            if (node && arrayPropertyKey && arrayPropertyKey !== 'app') {
                 node = node[arrayPropertyKey];
                 if (Array.isArray(arrOption) && arrOption.length && Array.isArray(node) && node.length) {
                     if (arrOption.length === 2) {
@@ -2399,6 +2460,22 @@ export class App extends BaseNode {
         return node;
     }
 
+    /**
+     * @param path 路径
+     * path 为要查找路径：如 /dashboard/student/list、/dashboard/student/list
+     */
+    findViewByPath(path: string) {
+        const arr = path.split('/');
+        if (arr[0] === '')
+            arr.shift();
+
+        if (!arr.length)
+            throw Error('Cannot find View ' + path);
+        const childName = arr.shift();
+        const subView = this.views.find((child) => child.name === childName);
+        return arr.length ? subView.findViewByPath(arr.join('/')) : subView;
+    }
+
     loadEnvList() {
         this.envList = ['dev', 'online'];
     }
@@ -2409,7 +2486,7 @@ export class App extends BaseNode {
     } = {
         template: {
             name: 'lcap-pc-template',
-            version: '0.4.12',
+            version: '0.4.13-beta',
         },
         ui: {
             name: 'cloud-ui.vusion',
@@ -2444,7 +2521,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@${packageInfo.template.version}/cloudAdminDesigner.umd.min.js` : `${prefix}/packages/lcap-pc-template@${packageInfo.template.version}/cloudAdminDesigner.umd.min.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`,
                 ],
                 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`,
@@ -2457,23 +2534,22 @@ export class App extends BaseNode {
                 names: [],
             },
         };
-
         this.componentDependencies.forEach((dep) => {
-            result.custom.js.push(`${prefix}/packages/${dep.name}@${dep.version}/dist-theme/index.js`);
-            result.custom.css.push(`${prefix}/packages/${dep.name}@${dep.version}/dist-theme/index.css`);
-            result.custom.names.push(dep.name);
+            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`);
+            result.custom.names.push(name);
         });
-
         return result;
     }
 
     genThemeCSS() {
-        const keys = Object.keys(this.theme.variableMap);
+        const keys = Object.keys(this.theme?.variableMap || {});
         if (!keys.length)
             return;
 
         return `:root {
-${keys.map((key) => `    ${key}: ${this.theme.variableMap[key]};`).join('\n')}
+${keys.map((key) => `    ${key}: ${this.theme?.variableMap[key]};`).join('\n')}
 }
 `;
     }

package/src/concepts/Argument__.ts

@@ -1,4 +1,5 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { ElementToVueOptions } from './ViewElement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -7,6 +8,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
@@ -22,12 +24,6 @@ export class Argument extends LogicItem {
     @property()
     concept: 'Argument' = 'Argument';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Statement';
-
     /**
      * 参数名
      */
@@ -146,6 +142,16 @@ export class Argument extends LogicItem {
         });
     }
 
+    toVue(options?: ElementToVueOptions) {
+        let code = this.spread ? '...' : '';
+        if (this.expression) {
+            code += this.expression.toVue(options);
+        } else {
+            code += '';
+        }
+        return code;
+    }
+
     toUI(state?: TranslatorState): string {
         let code = this.spread ? '...' : '';
         if (this.expression) {

package/src/concepts/Assignment__.ts

@@ -1,5 +1,6 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import Identifier from './Identifier__';
+import { ElementToVueOptions } from './ViewElement__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -9,6 +10,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import LogicItem from './LogicItem__';
@@ -24,12 +26,6 @@ export class Assignment extends LogicItem {
     @property()
     concept: 'Assignment' = 'Assignment';
 
-    /**
-     * kind
-     */
-    @property()
-    kind: string = 'Statement';
-
     /**
      * 赋值语句标题
      */
@@ -187,6 +183,15 @@ export class Assignment extends LogicItem {
         };
     }
 
+    toVue(options?: ElementToVueOptions) {
+        let code = '';
+        code += this.left ? this.left.toVue(options) : '';
+        code += ' = ';
+        code += this.right ? this.right.toVue(options) : '';
+        code += ';';
+        return code;
+    }
+
     toUI(state?: TranslatorState): string {
         let code = '';
         code += this.left ? this.left.toUI(shiftState(state, code, { inline: true })) : '';
@@ -212,10 +217,6 @@ export class Assignment extends LogicItem {
         code += this.left ? this.left.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__LEFT__';
         code += ' = ';
 
-        // 因为右侧枚举要赋值就得new 一下；
-        if (this.right && this.right instanceof Identifier && this.right.namespace && this.right.namespace.endsWith('enums')) {
-            code += 'new ';
-        }
         code += this.right ? this.right.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
         code += ';';
         return code;

package/src/concepts/Attribute__.ts

@@ -6,6 +6,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import TypeAnnotation from './TypeAnnotation__';