@lcap/nasl 1.0.0-alpha.9 → 1.0.2

package/src/concepts/Module__.ts

@@ -159,7 +159,7 @@ export class Module extends BaseNode {
         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, false);
     }
 
     /**
@@ -198,7 +198,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'entities');
         } else if (options instanceof Entity) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             entity = options;
             Object.assign(entity, relationOptions);
         } else {
@@ -286,7 +286,7 @@ export class Module 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,
@@ -301,7 +301,7 @@ export class Module extends BaseNode {
         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, false);
     }
 
     /**
@@ -340,7 +340,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'structures');
         } else if (options instanceof Structure) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             structure = options;
             Object.assign(structure, relationOptions);
         } else {
@@ -428,7 +428,7 @@ export class Module 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,
@@ -443,7 +443,7 @@ export class Module extends BaseNode {
         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, false);
     }
 
     /**
@@ -482,7 +482,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'enums');
         } else if (options instanceof Enum) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             enumeration = options;
             Object.assign(enumeration, relationOptions);
         } else {
@@ -570,7 +570,7 @@ export class Module 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,
@@ -585,7 +585,7 @@ export class Module extends BaseNode {
         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, false);
     }
 
     /**
@@ -624,7 +624,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'logics');
         } else if (options instanceof Logic) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logic = options;
             Object.assign(logic, relationOptions);
         } else {
@@ -712,7 +712,7 @@ export class Module 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,
@@ -727,7 +727,7 @@ export class Module extends BaseNode {
         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, false);
     }
 
     /**
@@ -766,7 +766,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'interfaces');
         } else if (options instanceof Interface) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             itface = options;
             Object.assign(itface, relationOptions);
         } else {
@@ -854,7 +854,7 @@ export class Module 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,
@@ -869,7 +869,7 @@ export class Module extends BaseNode {
         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, false);
     }
 
     /**
@@ -908,7 +908,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'views');
         } else if (options instanceof View) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             view = options;
             Object.assign(view, relationOptions);
         } else {
@@ -996,7 +996,7 @@ export class Module 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,
@@ -1011,7 +1011,7 @@ export class Module extends BaseNode {
         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, false);
     }
 
     /**
@@ -1050,7 +1050,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'processes');
         } else if (options instanceof Process) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             process = options;
             Object.assign(process, relationOptions);
         } else {
@@ -1138,7 +1138,7 @@ export class Module 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,
@@ -1153,7 +1153,7 @@ export class Module extends BaseNode {
         return (this.viewComponents || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getViewComponentUniqueName(name = 'viewComponent1') {
-        return utils.unique(name, this.getViewComponentExistingNames());
+        return utils.unique(name, this.getViewComponentExistingNames(), undefined, false);
     }
 
     /**
@@ -1192,7 +1192,7 @@ export class Module extends BaseNode {
                 name: options,
             }, this, 'viewComponents');
         } else if (options instanceof ViewComponent) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             viewComponent = options;
             Object.assign(viewComponent, relationOptions);
         } else {
@@ -1280,7 +1280,7 @@ export class Module extends BaseNode {
 
     addViewComponent(options?: string | Partial<ViewComponent> | ViewComponent) {
         const node = this._addViewComponent(options as any);
-        const index = this.viewComponents.length;
+        const index = this.viewComponents.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1695,11 +1695,22 @@ export class Module extends BaseNode {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
 
+    /**
+     * 生成宿主语言的文件路径
+     * @param name 一般不用传，用于 rename
+     */
+    getEmbeddedFilePath(name = this.name) {
+        return `/embedded/${this.app.name}/${this.parentKey}/${this.name}`;
+    }
     /**
      * 获取命名空间和
      * 暂时不考虑 Module 嵌套的情况
      */
     getNamespace() {
+        return `${moduleNameSpace[this.parentKey as ModuleKeyType]}.${this.name}`;
+    }
+
+    getTsNamespace() {
         return `${moduleNameSpace[this.parentKey as ModuleKeyType]}.${this.tsName}`;
     }
 

package/src/concepts/Namespace__.ts

@@ -36,7 +36,7 @@ export class Namespace extends BaseNode {
      * 表示是从实体还是流程等概念产生的
      */
     @property()
-    originConcept: 'Namespace' = 'Namespace';
+    originConcept: string = undefined;
 
     /**
      * 命名空间名称
@@ -161,7 +161,7 @@ export class Namespace extends BaseNode {
         return (this.children || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getNamespaceUniqueName(name = 'namespace1') {
-        return utils.unique(name, this.getNamespaceExistingNames());
+        return utils.unique(name, this.getNamespaceExistingNames(), undefined, false);
     }
 
     /**
@@ -200,7 +200,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'children');
         } else if (options instanceof Namespace) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             namespace = options;
             Object.assign(namespace, relationOptions);
         } else {
@@ -288,7 +288,7 @@ export class Namespace extends BaseNode {
 
     addNamespace(options?: string | Partial<Namespace> | Namespace) {
         const node = this._addNamespace(options as any);
-        const index = this.children.length;
+        const index = this.children.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -303,7 +303,7 @@ export class Namespace extends BaseNode {
         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, false);
     }
 
     /**
@@ -342,7 +342,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'processes');
         } else if (options instanceof Process) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             process = options;
             Object.assign(process, relationOptions);
         } else {
@@ -430,7 +430,7 @@ export class Namespace 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,
@@ -445,7 +445,7 @@ export class Namespace extends BaseNode {
         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, false);
     }
 
     /**
@@ -484,7 +484,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'entities');
         } else if (options instanceof Entity) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             entity = options;
             Object.assign(entity, relationOptions);
         } else {
@@ -572,7 +572,7 @@ export class Namespace 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,
@@ -587,7 +587,7 @@ export class Namespace extends BaseNode {
         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, false);
     }
 
     /**
@@ -626,7 +626,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'structures');
         } else if (options instanceof Structure) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             structure = options;
             Object.assign(structure, relationOptions);
         } else {
@@ -714,7 +714,7 @@ export class Namespace 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,
@@ -729,7 +729,7 @@ export class Namespace extends BaseNode {
         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, false);
     }
 
     /**
@@ -768,7 +768,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'enums');
         } else if (options instanceof Enum) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             enumeration = options;
             Object.assign(enumeration, relationOptions);
         } else {
@@ -856,7 +856,7 @@ export class Namespace 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,
@@ -871,7 +871,7 @@ export class Namespace extends BaseNode {
         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, false);
     }
 
     /**
@@ -910,7 +910,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'logics');
         } else if (options instanceof Logic) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logic = options;
             Object.assign(logic, relationOptions);
         } else {
@@ -998,7 +998,7 @@ export class Namespace 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,
@@ -1013,7 +1013,7 @@ export class Namespace extends BaseNode {
         return (this.functions || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getFunctionUniqueName(name = 'func1') {
-        return utils.unique(name, this.getFunctionExistingNames());
+        return utils.unique(name, this.getFunctionExistingNames(), undefined, false);
     }
 
     /**
@@ -1052,7 +1052,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'functions');
         } else if (options instanceof Function) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             func = options;
             Object.assign(func, relationOptions);
         } else {
@@ -1140,7 +1140,7 @@ export class Namespace extends BaseNode {
 
     addFunction(options?: string | Partial<Function> | Function) {
         const node = this._addFunction(options as any);
-        const index = 0;
+        const index = this.functions.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1155,7 +1155,7 @@ export class Namespace extends BaseNode {
         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, false);
     }
 
     /**
@@ -1194,7 +1194,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'interfaces');
         } else if (options instanceof Interface) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             itface = options;
             Object.assign(itface, relationOptions);
         } else {
@@ -1282,7 +1282,7 @@ export class Namespace 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,
@@ -1297,7 +1297,7 @@ export class Namespace extends BaseNode {
         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, false);
     }
 
     /**
@@ -1336,7 +1336,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'views');
         } else if (options instanceof View) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             view = options;
             Object.assign(view, relationOptions);
         } else {
@@ -1424,7 +1424,7 @@ export class Namespace 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,
@@ -1439,7 +1439,7 @@ export class Namespace extends BaseNode {
         return (this.variables || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getVariableUniqueName(name = 'variable1') {
-        return utils.unique(name, this.getVariableExistingNames());
+        return utils.unique(name, this.getVariableExistingNames(), undefined, false);
     }
 
     /**
@@ -1478,7 +1478,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'variables');
         } else if (options instanceof Variable) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             variable = options;
             Object.assign(variable, relationOptions);
         } else {
@@ -1566,7 +1566,7 @@ export class Namespace extends BaseNode {
 
     addVariable(options?: string | Partial<Variable> | Variable) {
         const node = this._addVariable(options as any);
-        const index = this.variables.length;
+        const index = this.variables.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1581,7 +1581,7 @@ export class Namespace extends BaseNode {
         return (this.viewComponents || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getViewComponentUniqueName(name = 'viewComponent1') {
-        return utils.unique(name, this.getViewComponentExistingNames());
+        return utils.unique(name, this.getViewComponentExistingNames(), undefined, false);
     }
 
     /**
@@ -1620,7 +1620,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'viewComponents');
         } else if (options instanceof ViewComponent) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             viewComponent = options;
             Object.assign(viewComponent, relationOptions);
         } else {
@@ -1708,7 +1708,7 @@ export class Namespace extends BaseNode {
 
     addViewComponent(options?: string | Partial<ViewComponent> | ViewComponent) {
         const node = this._addViewComponent(options as any);
-        const index = this.viewComponents.length;
+        const index = this.viewComponents.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -1723,7 +1723,7 @@ export class Namespace extends BaseNode {
         return (this.processComponents || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
     getProcessComponentUniqueName(name = 'processComponent1') {
-        return utils.unique(name, this.getProcessComponentExistingNames());
+        return utils.unique(name, this.getProcessComponentExistingNames(), undefined, false);
     }
 
     /**
@@ -1762,7 +1762,7 @@ export class Namespace extends BaseNode {
                 name: options,
             }, this, 'processComponents');
         } else if (options instanceof ProcessComponent) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             processComponent = options;
             Object.assign(processComponent, relationOptions);
         } else {
@@ -1850,7 +1850,7 @@ export class Namespace extends BaseNode {
 
     addProcessComponent(options?: string | Partial<ProcessComponent> | ProcessComponent) {
         const node = this._addProcessComponent(options as any);
-        const index = this.processComponents.length;
+        const index = this.processComponents.indexOf(node);
         node.create({
             index,
             parentNode: this,
@@ -2496,6 +2496,18 @@ export class Namespace extends BaseNode {
             throw new Error('无法获取命名空间，请设置 parentNode 或临时的 path！');
     }
 
+    /**
+     * 获取命名空间
+     */
+    getTsNamespace(): string {
+        if (this.path)
+            return this.path;
+        else if (this.parentNode && (this.parentNode as Namespace).getNamespace)
+            return `${(this.parentNode as Namespace).getNamespace()}.${this.tsName}`;
+        else
+            throw new Error('无法获取命名空间，请设置 parentNode 或临时的 path！');
+    }
+
     findChild(name: string) {
         return this.children.find((child) => child.name === name);
     }

package/src/concepts/NullLiteral__.ts

@@ -52,7 +52,7 @@ export class NullLiteral extends LogicItem {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
     toVue(options?: ElementToVueOptions): string {
-        return 'null';
+        return 'undefined';
     }
 
     toUI(): string {
@@ -60,6 +60,13 @@ export class NullLiteral extends LogicItem {
     }
 
     toJS(): string {
+        return 'undefined';
+    }
+    @withSourceMap()
+    toEmbeddedTS(state?: TranslatorState) {
+        return 'null';
+    }
+    getValue() {
         return 'null';
     }
 

package/src/concepts/NumericLiteral__.ts

@@ -135,26 +135,37 @@ export class NumericLiteral extends LogicItem {
         return code;
     }
 
-    changeType() {
-        if (this.value.length > 8) {
-            this.typeAnnotation.typeName = 'Long';
+    changeType(value: string | number) {
+        const newValue = value.toString();
+        let typeName = 'Integer';
+        if (newValue.length > 8) {
+            typeName = 'Long';
         } else {
-            this.typeAnnotation.typeName = 'Integer';
+            typeName = 'Integer';
         }
-        if (this.value.includes('.')) {
-            this.typeAnnotation.typeName = 'Double';
+        if (newValue.includes('.')) {
+            typeName = 'Double';
         }
+        return typeName;
     }
     /**
      * 设置数组内容
      */
     setValue(value: string) {
+        const typeName = this.changeType(value);
+        const App = this.app;
+        App.emit('collect:start', {
+            actionMsg: '修改数字文本内容',
+        });
+        this.typeAnnotation.setTypeName(typeName);
         const object = {
             value,
         };
         this.update({
             ...object,
         });
+        // 结束修改 ，批量操作
+        App.emit('collect:end');
     }
 
     /**