@lcap/nasl 1.0.0-alpha.8 → 1.0.1

package/out/concepts/MemberExpression__.d.ts

@@ -1,4 +1,5 @@
 import { TranslatorState } from '../translator';
+import { TypeAnnotation } from '..';
 import { ElementToVueOptions } from './ViewElement__';
 import { Params } from '../common/EventEmitter';
 import LogicItem from './LogicItem__';
@@ -44,6 +45,7 @@ export declare class MemberExpression extends LogicItem {
      */
     removeProperty(property: LogicItem): void;
     __removeLogicItem(logicItem: LogicItem): Params;
+    typeAnnotation: TypeAnnotation;
     toVue(options?: ElementToVueOptions): string;
     toUI(): string;
     toJS(): string;

package/out/concepts/MemberExpression__.js

@@ -12,7 +12,7 @@ var MemberExpression_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemberExpression = void 0;
 const translator_1 = require("../translator");
-const BinaryExpression__1 = __importDefault(require("./BinaryExpression__"));
+const Identifier_RE = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 const decorators_1 = require("../decorators");
 const classMap_1 = __importDefault(require("../common/classMap"));
 const LogicItem__1 = __importDefault(require("./LogicItem__"));
@@ -96,22 +96,55 @@ let MemberExpression = MemberExpression_1 = class MemberExpression extends Logic
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    // 选中的数据类型，这个用作暂存
+    typeAnnotation = undefined;
     toVue(options) {
-        const object = this.object.toVue(options);
-        const property = this.property.toVue(options);
+        //  如果是枚举取值
+        if (this.object?.concept === 'Identifier' && this.object?.isEnum() && this.property?.concept === 'Identifier') {
+            return `"${this.property?.name}"`;
+        }
+        const object = String(this.object?.toVue(options)); // undefined 也让正常展示
+        const property = String(this.property?.toVue(options));
+        const bindAttr = this.getAncestor('BindAttribute');
+        if (bindAttr && (bindAttr.sync || bindAttr.model))
+            return Identifier_RE.test(property) ? `${object}.${property}` : `${object}['${property}']`;
         const lastPart = object.split(' && ').pop();
-        return options?.finalCode === false ? `${object}.${property}` : `${object} && ${lastPart}.${property}`;
+        if (Identifier_RE.test(property))
+            return options?.finalCode === false ? `${object}.${property}` : `${object} && ${lastPart}.${property}`;
+        else
+            return options?.finalCode === false ? `${object}['${property}']` : `${object} && ${lastPart}['${property}']`;
     }
     toUI() {
-        const object = this.object.toUI();
-        const property = this.property.toUI();
-        return `${object}.${property}`;
+        //  如果是枚举取值
+        if (this.object?.concept === 'Identifier' && this.object?.isEnum() && this.property?.concept === 'Identifier') {
+            return `${this.object?.name}.${this.property?.name}`;
+        }
+        const object = this.object?.toUI();
+        const property = this.property?.toUI();
+        return Identifier_RE.test(property) ? `${object}.${property}` : `${object}['${property}']`;
     }
     toJS() {
-        const object = this.object.toJS();
-        const property = this.property.toJS();
+        //  如果是枚举取值
+        if (this.object?.concept === 'Identifier' && this.object?.isEnum() && this.property?.concept === 'Identifier') {
+            return `"${this.property?.name}"`;
+        }
+        const object = this.object?.toJS();
+        const property = this.property?.toJS();
+        // 在赋值语句的左侧，不能有 &&
+        const assignment = this.getAncestor('Assignment');
+        if (assignment) {
+            const left = assignment.left;
+            let node = this;
+            while (node && node.concept === 'MemberExpression' && left !== node) {
+                node = node.parentNode;
+            }
+            // 在赋值语句的左侧
+            if (node) {
+                return Identifier_RE.test(property) ? `${object}.${property}` : `${object}['${property}']`;
+            }
+        }
         const lastPart = object.split(' && ').pop();
-        return `${object} && ${lastPart}.${property}`;
+        return Identifier_RE.test(property) ? `${object} && ${lastPart}.${property}` : `${object} && ${lastPart}['${property}']`;
     }
     setValue(newValue) {
         const valueList = newValue.split('.');
@@ -141,7 +174,6 @@ let MemberExpression = MemberExpression_1 = class MemberExpression extends Logic
         };
         this.update({
             ...object,
-            field: 'name',
         });
     }
     // 方便快速取值,遍历获取value
@@ -171,8 +203,12 @@ let MemberExpression = MemberExpression_1 = class MemberExpression extends Logic
         const rightCode = this.property ? this.property.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) : '';
         // 就说明这是一个枚举取值操作，直接啊app.enums.color.red 要转成字符串
         code += leftCode + rightCode;
-        if (leftCode.startsWith('app.enums.') && !(this.parentNode instanceof BinaryExpression__1.default)) {
-            code += '.toString()';
+        // 解决枚举可能全是数字的问题
+        // app.enums.color  || extensions.tool.enums.color
+        if (leftCode.startsWith('app.enums.') || (leftCode.startsWith('extensions') && leftCode.includes('.enums.'))) {
+            const lastIndex = leftCode.lastIndexOf('.');
+            const newCode = `${code.substring(0, lastIndex)}['${code.substring(lastIndex + 1, code.length)}']`;
+            code = newCode;
         }
         return code;
     }

package/out/concepts/MemberExpression__.js.map

@@ -1 +1 @@
-{"version":3,"file":"MemberExpression__.js","sourceRoot":"","sources":["../../src/concepts/MemberExpression__.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MemberExpression__.js","sourceRoot":"","sources":["../../src/concepts/MemberExpression__.ts"],"names":[],"mappings":"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"}

package/out/concepts/Module__.d.ts

@@ -97,22 +97,22 @@ export declare class Module extends BaseNode {
     getEntityExistingNames(excludedList?: Array<Entity>): string[];
     getEntityUniqueName(name?: string): string;
     /**
-     * 插入实体
-     * @internal
-     * @param name 实体名称，如果不填会自动生成一个唯一名称
-     */
+    * 插入实体
+    * @internal
+    * @param name 实体名称，如果不填会自动生成一个唯一名称
+    */
     _insertEntityAt(name: string, index: number): Entity;
     /**
-     * 插入实体
-     * @internal
-     * @param entityOptions 实体参数
-     */
+    * 插入实体
+    * @internal
+    * @param entityOptions 实体参数
+    */
     _insertEntityAt(entityOptions: Partial<Entity>, index: number): Entity;
     /**
-     * 插入实体
-     * @internal
-     * @param entity 已有的实体实例
-     */
+    * 插入实体
+    * @internal
+    * @param entity 已有的实体实例
+    */
     _insertEntityAt(entity: Entity, index: number): Entity;
     /**
      * 插入实体
@@ -166,22 +166,22 @@ export declare class Module extends BaseNode {
     getStructureExistingNames(excludedList?: Array<Structure>): string[];
     getStructureUniqueName(name?: string): string;
     /**
-     * 插入数据结构
-     * @internal
-     * @param name 数据结构名称，如果不填会自动生成一个唯一名称
-     */
+    * 插入数据结构
+    * @internal
+    * @param name 数据结构名称，如果不填会自动生成一个唯一名称
+    */
     _insertStructureAt(name: string, index: number): Structure;
     /**
-     * 插入数据结构
-     * @internal
-     * @param structureOptions 数据结构参数
-     */
+    * 插入数据结构
+    * @internal
+    * @param structureOptions 数据结构参数
+    */
     _insertStructureAt(structureOptions: Partial<Structure>, index: number): Structure;
     /**
-     * 插入数据结构
-     * @internal
-     * @param structure 已有的数据结构实例
-     */
+    * 插入数据结构
+    * @internal
+    * @param structure 已有的数据结构实例
+    */
     _insertStructureAt(structure: Structure, index: number): Structure;
     /**
      * 插入数据结构
@@ -235,22 +235,22 @@ export declare class Module extends BaseNode {
     getEnumExistingNames(excludedList?: Array<Enum>): string[];
     getEnumUniqueName(name?: string): string;
     /**
-     * 插入枚举
-     * @internal
-     * @param name 枚举名称，如果不填会自动生成一个唯一名称
-     */
+    * 插入枚举
+    * @internal
+    * @param name 枚举名称，如果不填会自动生成一个唯一名称
+    */
     _insertEnumAt(name: string, index: number): Enum;
     /**
-     * 插入枚举
-     * @internal
-     * @param enumerationOptions 枚举参数
-     */
+    * 插入枚举
+    * @internal
+    * @param enumerationOptions 枚举参数
+    */
     _insertEnumAt(enumerationOptions: Partial<Enum>, index: number): Enum;
     /**
-     * 插入枚举
-     * @internal
-     * @param enumeration 已有的枚举实例
-     */
+    * 插入枚举
+    * @internal
+    * @param enumeration 已有的枚举实例
+    */
     _insertEnumAt(enumeration: Enum, index: number): Enum;
     /**
      * 插入枚举
@@ -304,22 +304,22 @@ export declare class Module extends BaseNode {
     getLogicExistingNames(excludedList?: Array<Logic>): string[];
     getLogicUniqueName(name?: string): string;
     /**
-     * 插入逻辑
-     * @internal
-     * @param name 逻辑名称，如果不填会自动生成一个唯一名称
-     */
+    * 插入逻辑
+    * @internal
+    * @param name 逻辑名称，如果不填会自动生成一个唯一名称
+    */
     _insertLogicAt(name: string, index: number): Logic;
     /**
-     * 插入逻辑
-     * @internal
-     * @param logicOptions 逻辑参数
-     */
+    * 插入逻辑
+    * @internal
+    * @param logicOptions 逻辑参数
+    */
     _insertLogicAt(logicOptions: Partial<Logic>, index: number): Logic;
     /**
-     * 插入逻辑
-     * @internal
-     * @param logic 已有的逻辑实例
-     */
+    * 插入逻辑
+    * @internal
+    * @param logic 已有的逻辑实例
+    */
     _insertLogicAt(logic: Logic, index: number): Logic;
     /**
      * 插入逻辑
@@ -373,22 +373,22 @@ export declare class Module extends BaseNode {
     getInterfaceExistingNames(excludedList?: Array<Interface>): string[];
     getInterfaceUniqueName(name?: string): string;
     /**
-     * 插入接口
-     * @internal
-     * @param name 接口名称，如果不填会自动生成一个唯一名称
-     */
+    * 插入接口
+    * @internal
+    * @param name 接口名称，如果不填会自动生成一个唯一名称
+    */
     _insertInterfaceAt(name: string, index: number): Interface;
     /**
-     * 插入接口
-     * @internal
-     * @param itfaceOptions 接口参数
-     */
+    * 插入接口
+    * @internal
+    * @param itfaceOptions 接口参数
+    */
     _insertInterfaceAt(itfaceOptions: Partial<Interface>, index: number): Interface;
     /**
-     * 插入接口
-     * @internal
-     * @param itface 已有的接口实例
-     */
+    * 插入接口
+    * @internal
+    * @param itface 已有的接口实例
+    */
     _insertInterfaceAt(itface: Interface, index: number): Interface;
     /**
      * 插入接口
@@ -442,22 +442,22 @@ export declare class Module extends BaseNode {
     getViewExistingNames(excludedList?: Array<View>): string[];
     getViewUniqueName(name?: string): string;
     /**
-     * 插入页面
-     * @internal
-     * @param name 页面名称，如果不填会自动生成一个唯一名称
-     */
+    * 插入页面
+    * @internal
+    * @param name 页面名称，如果不填会自动生成一个唯一名称
+    */
     _insertViewAt(name: string, index: number): View;
     /**
-     * 插入页面
-     * @internal
-     * @param viewOptions 页面参数
-     */
+    * 插入页面
+    * @internal
+    * @param viewOptions 页面参数
+    */
     _insertViewAt(viewOptions: Partial<View>, index: number): View;
     /**
-     * 插入页面
-     * @internal
-     * @param view 已有的页面实例
-     */
+    * 插入页面
+    * @internal
+    * @param view 已有的页面实例
+    */
     _insertViewAt(view: View, index: number): View;
     /**
      * 插入页面
@@ -511,22 +511,22 @@ export declare class Module extends BaseNode {
     getProcessExistingNames(excludedList?: Array<Process>): string[];
     getProcessUniqueName(name?: string): string;
     /**
-     * 插入流程
-     * @internal
-     * @param name 流程名称，如果不填会自动生成一个唯一名称
-     */
+    * 插入流程
+    * @internal
+    * @param name 流程名称，如果不填会自动生成一个唯一名称
+    */
     _insertProcessAt(name: string, index: number): Process;
     /**
-     * 插入流程
-     * @internal
-     * @param processOptions 流程参数
-     */
+    * 插入流程
+    * @internal
+    * @param processOptions 流程参数
+    */
     _insertProcessAt(processOptions: Partial<Process>, index: number): Process;
     /**
-     * 插入流程
-     * @internal
-     * @param process 已有的流程实例
-     */
+    * 插入流程
+    * @internal
+    * @param process 已有的流程实例
+    */
     _insertProcessAt(process: Process, index: number): Process;
     /**
      * 插入流程
@@ -580,22 +580,22 @@ export declare class Module extends BaseNode {
     getViewComponentExistingNames(excludedList?: Array<ViewComponent>): string[];
     getViewComponentUniqueName(name?: string): string;
     /**
-     * 插入页面组件
-     * @internal
-     * @param name 页面组件名称，如果不填会自动生成一个唯一名称
-     */
+    * 插入页面组件
+    * @internal
+    * @param name 页面组件名称，如果不填会自动生成一个唯一名称
+    */
     _insertViewComponentAt(name: string, index: number): ViewComponent;
     /**
-     * 插入页面组件
-     * @internal
-     * @param viewComponentOptions 页面组件参数
-     */
+    * 插入页面组件
+    * @internal
+    * @param viewComponentOptions 页面组件参数
+    */
     _insertViewComponentAt(viewComponentOptions: Partial<ViewComponent>, index: number): ViewComponent;
     /**
-     * 插入页面组件
-     * @internal
-     * @param viewComponent 已有的页面组件实例
-     */
+    * 插入页面组件
+    * @internal
+    * @param viewComponent 已有的页面组件实例
+    */
     _insertViewComponentAt(viewComponent: ViewComponent, index: number): ViewComponent;
     /**
      * 插入页面组件
@@ -647,9 +647,9 @@ export declare class Module extends BaseNode {
      */
     addViewComponent(viewComponent: ViewComponent): ViewComponent;
     /**
-     * 删除实体
-     * @param name 实体名称
-     */
+    * 删除实体
+    * @param name 实体名称
+    */
     removeEntity(name: string): void;
     /**
      * 删除实体
@@ -658,9 +658,9 @@ export declare class Module extends BaseNode {
     removeEntity(entity: Entity): void;
     __removeEntity(entity: Entity): Params;
     /**
-     * 删除数据结构
-     * @param name 数据结构名称
-     */
+    * 删除数据结构
+    * @param name 数据结构名称
+    */
     removeStructure(name: string): void;
     /**
      * 删除数据结构
@@ -669,9 +669,9 @@ export declare class Module extends BaseNode {
     removeStructure(structure: Structure): void;
     __removeStructure(structure: Structure): Params;
     /**
-     * 删除枚举
-     * @param name 枚举名称
-     */
+    * 删除枚举
+    * @param name 枚举名称
+    */
     removeEnum(name: string): void;
     /**
      * 删除枚举
@@ -680,9 +680,9 @@ export declare class Module extends BaseNode {
     removeEnum(enumeration: Enum): void;
     __removeEnum(enumeration: Enum): Params;
     /**
-     * 删除逻辑
-     * @param name 逻辑名称
-     */
+    * 删除逻辑
+    * @param name 逻辑名称
+    */
     removeLogic(name: string): void;
     /**
      * 删除逻辑
@@ -691,9 +691,9 @@ export declare class Module extends BaseNode {
     removeLogic(logic: Logic): void;
     __removeLogic(logic: Logic): Params;
     /**
-     * 删除接口
-     * @param name 接口名称
-     */
+    * 删除接口
+    * @param name 接口名称
+    */
     removeInterface(name: string): void;
     /**
      * 删除接口
@@ -702,9 +702,9 @@ export declare class Module extends BaseNode {
     removeInterface(itface: Interface): void;
     __removeInterface(itface: Interface): Params;
     /**
-     * 删除页面
-     * @param name 页面名称
-     */
+    * 删除页面
+    * @param name 页面名称
+    */
     removeView(name: string): void;
     /**
      * 删除页面
@@ -713,9 +713,9 @@ export declare class Module extends BaseNode {
     removeView(view: View): void;
     __removeView(view: View): Params;
     /**
-     * 删除流程
-     * @param name 流程名称
-     */
+    * 删除流程
+    * @param name 流程名称
+    */
     removeProcess(name: string): void;
     /**
      * 删除流程
@@ -724,9 +724,9 @@ export declare class Module extends BaseNode {
     removeProcess(process: Process): void;
     __removeProcess(process: Process): Params;
     /**
-     * 删除页面组件
-     * @param name 页面组件名称
-     */
+    * 删除页面组件
+    * @param name 页面组件名称
+    */
     removeViewComponent(name: string): void;
     /**
      * 删除页面组件
@@ -734,11 +734,17 @@ export declare class Module extends BaseNode {
      */
     removeViewComponent(viewComponent: ViewComponent): void;
     __removeViewComponent(viewComponent: ViewComponent): Params;
+    /**
+     * 生成宿主语言的文件路径
+     * @param name 一般不用传，用于 rename
+     */
+    getEmbeddedFilePath(name?: string): string;
     /**
      * 获取命名空间和
      * 暂时不考虑 Module 嵌套的情况
      */
     getNamespace(): string;
+    getTsNamespace(): string;
     /**
      *  获取属性节点是否存在
      */