@lcap/nasl 1.0.0-alpha.2 → 1.0.0-alpha.5

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());
@@ -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());
@@ -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());
@@ -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());
@@ -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());
@@ -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());
@@ -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());
@@ -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());
@@ -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());
@@ -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);
@@ -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'];
     }
@@ -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@0.4.13-beta/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__';
@@ -140,10 +142,10 @@ export class Argument extends LogicItem {
         });
     }
 
-    toVue(state?: TranslatorState): string {
+    toVue(options?: ElementToVueOptions) {
         let code = this.spread ? '...' : '';
         if (this.expression) {
-            code += this.expression.toVue(shiftState(state, code));
+            code += this.expression.toVue(options);
         } else {
             code += '';
         }

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__';
@@ -181,11 +183,11 @@ export class Assignment extends LogicItem {
         };
     }
 
-    toVue(state?: TranslatorState): string {
+    toVue(options?: ElementToVueOptions) {
         let code = '';
-        code += this.left ? this.left.toVue(shiftState(state, code, { inline: true })) : '';
+        code += this.left ? this.left.toVue(options) : '';
         code += ' = ';
-        code += this.right ? this.right.toVue(shiftState(state, code, { inline: true })) : '';
+        code += this.right ? this.right.toVue(options) : '';
         code += ';';
         return code;
     }
@@ -215,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__';

package/src/concepts/BinaryExpression__.ts

@@ -1,4 +1,5 @@
 import { TranslatorState, shiftState, withSourceMap } from '../translator';
+import { ElementToVueOptions } from './ViewElement__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -8,6 +9,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__';
@@ -171,7 +173,7 @@ export class BinaryExpression extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
-    toVue(state?: TranslatorState): string {
+    toVue(options?: ElementToVueOptions) {
         if (['startwith', 'endwith'].includes(this.operator)) {
             const operatorMap = {
                 startwith: 'startsWith',
@@ -179,16 +181,16 @@ export class BinaryExpression extends LogicItem {
             };
             const fnName = operatorMap[this.operator as keyof typeof operatorMap];
             let code = '';
-            code += this.left?.toVue ? this.left.toVue(shiftState(state, code, { inline: true })) : '';
+            code += this.left?.toVue ? this.left.toVue(options) : '';
             code += '.' + fnName + '(';
-            code += this.right?.toVue ? this.right.toVue(shiftState(state, code, { inline: true })) : '';
+            code += this.right?.toVue ? this.right.toVue(options) : '';
             code += ')';
             return code;
         }
         let code = '';
-        code += this.left?.toVue ? this.left.toVue(shiftState(state, code, { inline: true })) : '';
+        code += this.left?.toVue ? this.left.toVue() : '';
         code += ` ${this.operator} `;
-        code += this.right?.toVue ? this.right.toVue(shiftState(state, code, { inline: true })) : '';
+        code += this.right?.toVue ? this.right.toVue() : '';
         return code;
     }
 

package/src/concepts/BindAttribute__.ts

@@ -9,6 +9,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__';
@@ -197,7 +198,7 @@ export class BindAttribute extends BaseNode {
 
         getValidationRuleExistingNames(excludedList: Array<ValidationRule> = []) {
         const excludedSet = new Set(excludedList);
-        return this.rules.filter((item) => !excludedSet.has(item)).map((item) => item.name);
+        return (this.rules || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getValidationRuleUniqueName(name = 'validationRule1') {
         return utils.unique(name, this.getValidationRuleExistingNames());
@@ -462,16 +463,20 @@ export class BindAttribute extends BaseNode {
     /**
      * 转换成 Vue 的模板格式
      */
-    toVue() {
+    toVue(options?: ElementToVueOptions) {
         let value = this.value;
         if (this.type === 'dynamic' && this.expression) {
-            value = this.expression.toVue();
+            value = this.expression.toVue(options);
         }
         if (value !== undefined && value !== null && typeof value === 'string') {
             value = value.replace(/"/g, "'");
         }
         if (this.name === 'destination' && this.destination) {
-            return this.destination.toVue();
+            return this.destination.toVue(options);
+        } else if (this.name === 'rules' && this.rules) {
+            const ruleStrs = this.rules.map((rule) => rule.toVue());
+            value = ruleStrs.join(' | ');
+            return value !== undefined && value !== null ? `${this.name}="${value}"` : '';
         } else if (this.type === 'string') {
             return value !== undefined && value !== null ? `${this.name}="${value}"` : '';
         } else {

package/src/concepts/BindDirective__.ts

@@ -1,3 +1,4 @@
+import { ElementToVueOptions } from './ViewElement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -6,6 +7,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__';
@@ -204,7 +206,7 @@ export class BindDirective extends BaseNode {
     /**
      * 转换成 Vue 的模板格式
      */
-    toVue() {
+    toVue(options?: ElementToVueOptions) {
         let modifiersString = '';
         Object.keys(this.modifiers || {}).forEach((key) => {
             const value = (this.modifiers as any)[key];
@@ -214,7 +216,7 @@ export class BindDirective extends BaseNode {
         // eslint-disable-next-line no-nested-ternary
         let value = this.type !== 'string' ? this.value : this.value ? `'${this.value}'` : '';
         if (this.expression) {
-            value = this.expression.toVue();
+            value = this.expression.toVue(options);
             if (this.expression.concept === 'StringLiteral') {
                 value = `'${value}'`;
             }

package/src/concepts/BindEvent__.ts

@@ -3,7 +3,7 @@ import Logic from './Logic__';
 import LogicItem from './LogicItem__';
 import Namespace from './Namespace__';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState, embeddedTSEmitter } from '../translator';
-
+import { ElementToVueOptions } from './ViewElement__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -12,6 +12,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 Argument from './Argument__';
@@ -304,7 +305,8 @@ export class BindEvent extends BaseNode {
             if (/^\d/.test(tsName)) {
                 tsName = '$' + tsName;
             }
-            tsName = tsName.replaceAll('-', '_');
+            // 匹配所有特殊字符都转为_
+            tsName = tsName.replace(/\W/g, '_');
             return tsName;
         }
         return '';
@@ -376,7 +378,7 @@ export class BindEvent extends BaseNode {
     /**
      * 转换成 Vue 的模板格式
      */
-    toVue() {
+    toVue(options?: ElementToVueOptions) {
         const calleeName = this.calleeName;
         let code = '';
         if (calleeName) {
@@ -390,8 +392,8 @@ export class BindEvent extends BaseNode {
                 });
                 code += ')';
             }
+            code += `"`;
         }
-        code += `"`;
         return code;
     }
     //================================================================================

package/src/concepts/BooleanLiteral__.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__';
@@ -54,7 +56,7 @@ export class BooleanLiteral extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-    toVue(): string {
+    toVue(options?: ElementToVueOptions): string {
         return this.value;
     }