@lcap/nasl 2.12.0-beta → 2.12.0-beta.1

package/src/bak/translator.js

@@ -113,6 +113,7 @@ export default function (definition) {
             title: ${JSON.stringify(definition.title)},
             crumb: ${JSON.stringify(definition.crumb)},
             first: ${JSON.stringify(definition.first)},
+            auth: ${JSON.stringify(definition.auth)},
         });
 
         ${events.join('\n\n')}

package/src/common/BaseNode.ts

@@ -48,6 +48,13 @@ export class BaseNode extends EventEmitter {
      */
     @property()
     branchName: string = undefined;
+    /**
+     * 合并代码相关
+     */
+     @property()
+     workingCopy: object = undefined;
+     @property()
+     branch: object = undefined;
     /**
      * 父节点
      */
@@ -159,13 +166,23 @@ export class BaseNode extends EventEmitter {
             const property = propertyMap.get(key);
             const sourceItem = (source as any)[key] !== undefined ? (source as any)[key] : (this as any)[key];
             const { objectRef: propertyObjectRef } = property;
-            let objectRefCtor;
+            let objectRefCtor: any;
             try {
                 if (propertyObjectRef) {
                     objectRefCtor = getConceptConstructor(propertyObjectRef);
-                    if (objectRefCtor && sourceItem instanceof objectRefCtor) {
-                        sourceItem.parentNode = this;
-                        sourceItem.parentKey = key;
+                    if (objectRefCtor) {
+                        // if (Array.isArray(sourceItem)) {
+                        //     sourceItem.forEach((item) => {
+                        //         if (item instanceof objectRefCtor) {
+                        //             item.parentNode = this;
+                        //             item.parentKey = key;
+                        //         }
+                        //     });
+                        // } else
+                        if (sourceItem instanceof objectRefCtor) {
+                            sourceItem.parentNode = this;
+                            sourceItem.parentKey = key;
+                        }
                     }
                 }
 

package/src/concepts/App__.ts

@@ -187,8 +187,6 @@ export class App extends BaseNode {
     @property('Module')
     componentDependencies: Array<Module> = [];
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -237,11 +235,11 @@ export class App extends BaseNode {
         });
     }
 
-        getDataSourceExistingNames(excludedList: Array<DataSource> = []) {
+    getDataSourceExistingNames(excludedList: Array<DataSource> = []) {
         const excludedSet = new Set(excludedList);
         return (this.dataSources || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
-    getDataSourceUniqueName(name = 'DataSource1') {
+    getDataSourceUniqueName(name = 'dataSource1') {
         return utils.unique(name, this.getDataSourceExistingNames(), undefined, true);
     }
 
@@ -378,7 +376,6 @@ 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);
@@ -520,7 +517,6 @@ 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);
@@ -662,7 +658,6 @@ 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);
@@ -804,7 +799,6 @@ 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);
@@ -946,7 +940,6 @@ 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);
@@ -1088,7 +1081,6 @@ 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);
@@ -1230,7 +1222,6 @@ 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);
@@ -1372,7 +1363,6 @@ 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);
@@ -1780,9 +1770,6 @@ export class App extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除数据源
     * @param name 数据源名称
@@ -1831,8 +1818,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除数据结构
     * @param name 数据结构名称
@@ -1881,8 +1866,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除枚举
     * @param name 枚举名称
@@ -1931,8 +1914,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1981,8 +1962,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除接口
     * @param name 接口名称
@@ -2031,8 +2010,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除页面
     * @param name 页面名称
@@ -2081,8 +2058,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除流程
     * @param name 流程名称
@@ -2131,8 +2106,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除角色
     * @param name 角色名称
@@ -2181,8 +2154,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除主题
     * @param name 主题名称
@@ -2231,8 +2202,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除配置管理
     * @param name 配置管理名称
@@ -2281,8 +2250,6 @@ export class App extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除模块
     * @param name 模块名称
@@ -2308,8 +2275,6 @@ export class App extends BaseNode {
         return module.delete();
     }
 
-    
-
     /**
     * 删除模块
     * @param name 模块名称
@@ -2335,8 +2300,6 @@ export class App extends BaseNode {
         return module.delete();
     }
 
-    
-
     /**
     * 删除模块
     * @param name 模块名称
@@ -2510,6 +2473,7 @@ export class App extends BaseNode {
         const modulesMap: any = {
             extensions: node.dependencies,
             apis: node.interfaceDependencies,
+            components: node.componentDependencies,
         };
         const modules = modulesMap[start];
         if (Array.isArray(modules)) {
@@ -2637,7 +2601,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

@@ -209,7 +209,7 @@ export class Argument extends LogicItem {
     //================================================================================
 }
 
-classMap.Argument = Argument;
+classMap['Argument'] = Argument;
 export default Argument;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Assignee__.ts

@@ -459,7 +459,7 @@ export class Assignee extends LogicItem {
     //================================================================================
 }
 
-classMap.Assignee = Assignee;
+classMap['Assignee'] = Assignee;
 export default Assignee;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Assignment__.ts

@@ -231,7 +231,7 @@ export class Assignment extends LogicItem {
     //================================================================================
 }
 
-classMap.Assignment = Assignment;
+classMap['Assignment'] = Assignment;
 export default Assignment;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/Attribute__.ts

@@ -244,7 +244,7 @@ export class Attribute extends BaseNode {
     //================================================================================
 }
 
-classMap.Attribute = Attribute;
+classMap['Attribute'] = Attribute;
 export default Attribute;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/BinaryExpression__.ts

@@ -281,7 +281,7 @@ export class BinaryExpression extends LogicItem {
     //================================================================================
 }
 
-classMap.BinaryExpression = BinaryExpression;
+classMap['BinaryExpression'] = BinaryExpression;
 export default BinaryExpression;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/BindAttribute__.ts

@@ -560,7 +560,7 @@ export class BindAttribute extends BaseNode {
     //================================================================================
 }
 
-classMap.BindAttribute = BindAttribute;
+classMap['BindAttribute'] = BindAttribute;
 export default BindAttribute;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/BindDirective__.ts

@@ -133,10 +133,6 @@ export class BindDirective extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
     * 删除逻辑项
     * @param name 逻辑项名称
@@ -208,8 +204,14 @@ export class BindDirective extends BaseNode {
      */
     toVue(options?: ElementToVueOptions) {
         let modifiersString = '';
-        Object.keys(this.modifiers || {}).forEach((key) => {
-            const value = (this.modifiers as any)[key];
+        let modifiers = {};
+        try {
+            modifiers = JSON.parse(this.modifiers || '{}');
+        } catch (err) {
+            modifiers = {};
+        }
+        Object.keys(modifiers).forEach((key) => {
+            const value = (modifiers as any)[key];
             if (value)
                 modifiersString += '.' + key;
         });

package/src/concepts/BindEvent__.ts

@@ -291,6 +291,10 @@ export class BindEvent extends BaseNode {
     //================================================================================
     // 用于logic回填
     get calleewholeKey(): string {
+        if (!this.calleeNamespace && this.calleeName) {
+            // 页面逻辑单独处理
+            return `${this.view.getNamespace()}.${this.view.name}.logics.${this.calleeName}`;
+        }
         return this.calleeNamespace + '.' + this.calleeName;
     }
     get tsCalleeNamespace() {
@@ -338,7 +342,7 @@ export class BindEvent extends BaseNode {
             if (isPageCycle) {
                 return `${this.calleeKey}();`;
             }
-            let code = `${this.toHump(this.name) || '__IDENTIFIER__'}: (event) => [\n`;
+            let code = `${this.toHump(this.name) || '__IDENTIFIER__'}: (event: any) => [\n`;
             code += indent((state?.tabSize || 0) + 1);
             code += `() => {${this.calleeKey}()}`;
             code += '\n';
@@ -440,7 +444,7 @@ export class BindEvent extends BaseNode {
     //================================================================================
 }
 
-classMap.BindEvent = BindEvent;
+classMap['BindEvent'] = BindEvent;
 export default BindEvent;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/BooleanLiteral__.ts

@@ -72,6 +72,18 @@ export class BooleanLiteral extends LogicItem {
     toEmbeddedTS(state?: TranslatorState) {
         return this.value;
     }
+
+    /**
+     * 设置布尔值内容
+     */
+    setValue(value: string) {
+        const object = {
+            value,
+        };
+        this.update({
+            ...object,
+        });
+    }
     getValue() {
         return this.value;
     }
@@ -82,7 +94,7 @@ export class BooleanLiteral extends LogicItem {
     //================================================================================
 }
 
-classMap.BooleanLiteral = BooleanLiteral;
+classMap['BooleanLiteral'] = BooleanLiteral;
 export default BooleanLiteral;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/CallFunction__.ts

@@ -64,7 +64,7 @@ export class CallFunction extends LogicItem {
     @property('Argument')
     arguments: Array<Argument> = [];
 
-
+    
 
     /**
      * @param source 需要合并的部分参数
@@ -79,12 +79,12 @@ export class CallFunction extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallFunction;
     }
 
+    
+    
 
+    
 
-
-
-
-
+    
 
     /**
     * 插入类型标注
@@ -118,7 +118,7 @@ export class CallFunction extends LogicItem {
         return typeAnnotation;
     }
 
-
+    
 
     /**
      * 插入类型标注
@@ -142,7 +142,7 @@ export class CallFunction extends LogicItem {
         return node;
     }
 
-
+    
 
     /**
      * 添加类型标注
@@ -163,7 +163,7 @@ export class CallFunction extends LogicItem {
         return this._insertTypeAnnotationAt(options as any, index);
     }
 
-
+    
 
     /**
      * 添加类型标注
@@ -191,7 +191,7 @@ export class CallFunction extends LogicItem {
 
 
 
-
+    
 
     /**
     * 插入实际参数
@@ -225,7 +225,7 @@ export class CallFunction extends LogicItem {
         return argument;
     }
 
-
+    
 
     /**
      * 插入实际参数
@@ -249,7 +249,7 @@ export class CallFunction extends LogicItem {
         return node;
     }
 
-
+    
 
     /**
      * 添加实际参数
@@ -270,7 +270,7 @@ export class CallFunction extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
-
+    
 
     /**
      * 添加实际参数
@@ -296,7 +296,7 @@ export class CallFunction extends LogicItem {
     }
 
 
-
+    
 
     /**
      * 删除类型标注
@@ -457,6 +457,7 @@ export class CallFunction extends LogicItem {
                 argument.expression = BaseNode.from(param.defaultExpression, argument, 'expression') as Identifier;
             }
             if (param.defaultExpression instanceof Function) {
+                (param.defaultExpression as Function).returnExpression = null;
                 argument.expression = BaseNode.from(param.defaultExpression, argument, 'expression') as Identifier;
             }
             Object.assign(argument, relationOptions);
@@ -523,7 +524,7 @@ export class CallFunction extends LogicItem {
     //================================================================================
 }
 
-classMap.CallFunction = CallFunction;
+classMap['CallFunction'] = CallFunction;
 export default CallFunction;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/CallInterface__.ts

@@ -516,7 +516,7 @@ export class CallInterface extends LogicItem {
     //================================================================================
 }
 
-classMap.CallInterface = CallInterface;
+classMap['CallInterface'] = CallInterface;
 export default CallInterface;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/CallLogic__.ts

@@ -389,6 +389,10 @@ export class CallLogic extends LogicItem {
 
     // 用于logic回填
     get calleewholeKey(): string {
+        if (!this.calleeNamespace && this.calleeName && this.view) {
+            // 页面逻辑单独处理
+            return `${this.view.getNamespace()}.${this.view.name}.logics.${this.calleeName}`;
+        }
         return this.calleeNamespace + '.' + this.calleeName;
     }
     get calleeKey(): string {
@@ -539,7 +543,7 @@ export class CallLogic extends LogicItem {
 
     toVue(options?: ElementToVueOptions): string {
         let code = '';
-        if (this.calleeNamespace === 'nasl.browser' || this.calleeNamespace === 'nasl.auth' || this.calleeNamespace === 'nasl.configuration') {
+        if (this.calleeNamespace === 'nasl.browser' || this.calleeNamespace === 'nasl.auth' || this.calleeNamespace === 'nasl.configuration' || this.calleeNamespace === 'nasl.process') {
             code += '$global.';
         }
         code += this.calleeName;
@@ -688,19 +692,30 @@ export class CallLogic extends LogicItem {
                         code += `JSON.parse`;
                         break;
                 }
-            } else if (calleeNamespace === 'nasl.browser' || calleeNamespace === 'nasl.auth' || calleeNamespace === 'nasl.configuration') {
+            } else if (calleeNamespace === 'nasl.browser' || calleeNamespace === 'nasl.auth' || calleeNamespace === 'nasl.configuration' || calleeNamespace === 'nasl.process') {
                 code += `this.$global.${this.calleeName}`;
             } else {
                 code += `this.${this.calleeName}`;
             }
-            code += '(';
-            this.arguments?.filter((arg) => arg?.expression)
-                .forEach((arg, index) => {
-                    code += arg?.toJS(shiftState(state, code));
-                    if (index !== this.arguments?.length - 1)
-                        code += ', ';
-                });
-            code += ')';
+            if (calleeNamespace === 'nasl.process') {
+                code += '({';
+                this.arguments?.filter((arg) => arg?.expression)
+                    .forEach((arg, index) => {
+                        code += `${arg.keyword}: ${arg?.toJS(shiftState(state, code))}`;
+                        if (index !== this.arguments?.length - 1)
+                            code += ', ';
+                    });
+                code += '})';
+            } else {
+                code += '(';
+                this.arguments?.filter((arg) => arg?.expression)
+                    .forEach((arg, index) => {
+                        code += arg?.toJS(shiftState(state, code));
+                        if (index !== this.arguments?.length - 1)
+                            code += ', ';
+                    });
+                code += ')';
+            }
         }
         return code;
     }
@@ -736,7 +751,7 @@ export class CallLogic extends LogicItem {
     //================================================================================
 }
 
-classMap.CallLogic = CallLogic;
+classMap['CallLogic'] = CallLogic;
 export default CallLogic;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑