@lcap/nasl 2.20.0 → 2.20.1-beta.2

package/src/concepts/BindStyle__.ts

@@ -118,6 +118,10 @@ export class BindStyle extends BaseNode {
         });
     }
 
+    
+
+    
+
     /**
     * 插入逻辑项
     * @internal
@@ -150,6 +154,8 @@ export class BindStyle extends BaseNode {
         return logicItem;
     }
 
+    
+
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -172,6 +178,8 @@ export class BindStyle extends BaseNode {
         return node;
     }
 
+    
+
     /**
      * 添加逻辑项
      * @internal
@@ -191,6 +199,8 @@ export class BindStyle extends BaseNode {
         return this._insertItemInPlaygroundAt(options as any, index);
     }
 
+    
+
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -214,6 +224,9 @@ export class BindStyle extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除逻辑项
     * @param name 逻辑项名称
@@ -239,6 +252,8 @@ export class BindStyle extends BaseNode {
         return expression.delete();
     }
 
+    
+
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -246,7 +261,7 @@ export class BindStyle extends BaseNode {
     removeItemInPlayground(logicItem: LogicItem): void;
 
     removeItemInPlayground(options: LogicItem) {
-        const logicItem: LogicItem = options;
+        let logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
@@ -357,12 +372,13 @@ export class BindStyle extends BaseNode {
                 let memberExpressionNode = node?.parentNode;
                 while (memberExpressionNode?.concept === 'MemberExpression') {
                     expressionNode = memberExpressionNode;
+                    // 为了处理MemberExpression里面存在CallLogic、CallFunction等的情况
                     const { concept: objConcept } = memberExpressionNode.object || {};
                     if (!['MemberExpression', 'Identifier'].includes(objConcept)) {
                         memberExpressionNode = null;
                         expressionNode = null;
                     } else {
-                        memberExpressionNode = memberExpressionNode.object;
+                        memberExpressionNode = memberExpressionNode.parentNode;
                     }
                 }
                 if (expressionNode) {
@@ -457,14 +473,14 @@ export class BindStyle extends BaseNode {
     toVue(options?: ElementToVueOptions) {
         let value: string;
         // 需要用标识符替换
-        if (options?.finalCode !== false && this.needReplaceWithIdentifier) {
-            const argsList = this.getArgsList();
-            value = `${this.expressionBuilderName} (${argsList.join(', ')})`;
-        } else {
+        //if (options?.finalCode !== false && this.needReplaceWithIdentifier) {
+        //    const argsList = this.getArgsList();
+        //    value = `${this.expressionBuilderName} (${argsList.join(', ')})`;
+        //} else {
             value = this.expression?.toVue(options);
             if (this.name?.endsWith('background-image') && value)
                 value = `\`url(\${${value}})\``;
-        }
+        //}
         return value && `'${this.name}': ${value}`;
     }
 

package/src/concepts/CallLogic__.ts

@@ -70,8 +70,6 @@ export class CallLogic extends LogicItem {
     @property('Argument')
     arguments: Array<Argument> = [];
 
-
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -85,13 +83,6 @@ export class CallLogic extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallLogic;
     }
 
-    
-    
-
-    
-
-    
-
     /**
     * 插入类型标注
     * @internal
@@ -124,8 +115,6 @@ export class CallLogic extends LogicItem {
         return typeAnnotation;
     }
 
-
-
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -148,8 +137,6 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
-
-
     /**
      * 添加类型标注
      * @internal
@@ -169,8 +156,6 @@ export class CallLogic extends LogicItem {
         return this._insertTypeAnnotationAt(options as any, index);
     }
 
-
-
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -194,11 +179,6 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
-
-
-
-
-
     /**
     * 插入实际参数
     * @internal
@@ -231,8 +211,6 @@ export class CallLogic extends LogicItem {
         return argument;
     }
 
-
-
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -255,8 +233,6 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
-
-
     /**
      * 添加实际参数
      * @internal
@@ -276,8 +252,6 @@ export class CallLogic extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
-
-
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -301,9 +275,6 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
-
-
-
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -311,7 +282,7 @@ export class CallLogic extends LogicItem {
     removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotation(options: TypeAnnotation) {
-        let typeAnnotation: TypeAnnotation = options;
+        const typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
@@ -338,8 +309,6 @@ export class CallLogic extends LogicItem {
         return params;
     }
 
-
-
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -347,7 +316,7 @@ export class CallLogic extends LogicItem {
     removeArgument(argument: Argument): void;
 
     removeArgument(options: Argument) {
-        let argument: Argument = options;
+        const argument: Argument = options;
         return argument.delete();
     }
 
@@ -565,7 +534,7 @@ export class CallLogic extends LogicItem {
         if (typeof argIndex === 'number') {
             if (!this.arguments[argIndex]?.expression) {
                 // 如果本身没有值就直接删除
-                return this.arguments[argIndex].delete();
+                return this.arguments[argIndex]?.delete();
             }
             if (argIndex !== this.arguments.length - 1) {
                 this.arguments[argIndex]?.moveNode({
@@ -632,7 +601,8 @@ export class CallLogic extends LogicItem {
         if (calleeNamespace) {
             const namespaceArr = calleeNamespace.split('.');
             const start = namespaceArr[0];
-            if (start === 'app' || start === 'extensions') {
+            const isFrontendLibrary = ~calleeNamespace.indexOf('frontends');
+            if (start === 'app' || (start === 'extensions' && !isFrontendLibrary)) {
                 const keywordViewsIndex = findConceptKeyWordIndexFromNamespace(this.calleeNamespace, 'views');
                 if (keywordViewsIndex === -1) {
                     flag = false;
@@ -662,15 +632,20 @@ export class CallLogic extends LogicItem {
         let code = '';
         code += 'await (';
         let componentName = '';
+        let extensionName = '';
         const calleeNamespace = this.calleeNamespace;
         const keywordProcessIndex = findConceptKeyWordIndexFromNamespace(this.calleeNamespace, 'processes');
         const isProcessLogic = keywordProcessIndex !== -1;
+        const isFrontendLibrary = calleeNamespace.startsWith('extensions') && calleeNamespace.indexOf('frontends');
         // calleeNamespace不存在，一定是页面逻辑
         if (calleeNamespace) {
             const namespaceArr = calleeNamespace.split('.');
             if (this.isComponentLogic) {
                 componentName = namespaceArr[1];
             }
+            if (isFrontendLibrary) {
+                extensionName = namespaceArr[1];
+            }
         }
         const completeArguments = this.completeArguments;
         // 全局逻辑
@@ -743,9 +718,7 @@ export class CallLogic extends LogicItem {
                         const argsStr = logicArgs
                             .filter((arg: any) => arg.expression)
                             .map((arg: any) => {
-                                const name = arg.keyword === 'body' ? 
-                                    (this.calleeName === 'batchUpdate' ? 'entities' : 'entity') : 
-                                    arg.keyword;
+                                const name = arg.keyword === 'body' ? (this.calleeName === 'batchUpdate' ? 'entities' : 'entity') : arg.keyword;
                                 return `${name}: ${arg.expression.toJS(shiftState(state, code))}`;
                             })
                             .join(',\n');
@@ -845,6 +818,8 @@ export class CallLogic extends LogicItem {
                 }
             } else if (calleeNamespace === 'nasl.browser' || calleeNamespace === 'nasl.auth' || calleeNamespace === 'nasl.configuration' || calleeNamespace === 'nasl.process' || calleeNamespace === 'nasl.io') {
                 code += `this.$global.${this.calleeName}`;
+            } else if (isFrontendLibrary) {
+                code += `this.$library['${extensionName}'].${this.calleeName}`;
             } else {
                 code += `this.${this.calleeName}`;
             }

package/src/concepts/ConfigGroup__.ts

@@ -1,3 +1,5 @@
+import Namespace from './Namespace__';
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -11,8 +13,6 @@ import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import ConfigProperty from './ConfigProperty__';
 import App from './App__';
-import Namespace from './Namespace__';
-import Configuration from './Configuration__';
 
 /**
  * 配置组

package/src/concepts/ConfigProperty__.ts

@@ -330,12 +330,14 @@ export class ConfigProperty extends BaseNode {
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
         let code = `let ${this.name}: nasl.core.String; \n`;
-        this.values.forEach((value) => {
-            code += indent((state?.tabSize || 0) + 1);
-            if (!value.value) {
-                code += `const __${value.env}ConfigValueEmpty: any = null;\n`;
-            }
-        });
+        if (this.parentNode.name === 'custom') {
+            this.values.forEach((value) => {
+                code += indent((state?.tabSize || 0) + 1);
+                if (!value.value) {
+                    code += `const __${value.env}ConfigValueEmpty: any = null;\n`;
+                }
+            });
+        }
         return code;
     }
 

package/src/concepts/DataSource__.ts

@@ -94,7 +94,7 @@ export class DataSource extends BaseNode {
         });
     }
 
-        getEntityExistingNames(excludedList: Array<Entity> = []) {
+    getEntityExistingNames(excludedList: Array<Entity> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.entities as Entity[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -235,9 +235,6 @@ export class DataSource extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除实体
     * @param name 实体名称
@@ -422,13 +419,20 @@ export class DataSource extends BaseNode {
             if (!prop.value) {
                 return;
             }
-            const dataSource = configProperty.name;
+            let isRecycled = false;
+            try {
+                const value = JSON.parse(prop.value);
+                // 被回收的数据库不需要 Ping
+                if (value.dataBaseMode === 'Platform_Generation' && value.status === 1) {
+                    isRecycled = true;
+                }
+            } catch (e) {}
             const env = prop.env;
-            return datasourceService.pingDatabase({
+            return isRecycled ? Promise.resolve() : datasourceService.pingDatabase({
                 body: {
                     category: 'sql',
                     appId: this.app.id,
-                    dataSource,
+                    dataSource: configProperty.name,
                     env,
                 },
             }).then(() => {

package/src/concepts/Destination__.ts

@@ -66,6 +66,8 @@ export class Destination extends LogicItem {
     @property()
     target: string = '_self';
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -79,6 +81,7 @@ export class Destination extends LogicItem {
         return super.from(source, parentNode, parentKey) as Destination;
     }
 
+    
     /**
      * 设置viewNamespace
      */
@@ -130,6 +133,10 @@ export class Destination extends LogicItem {
         });
     }
 
+    
+
+    
+
     /**
     * 插入实际参数
     * @internal
@@ -162,6 +169,8 @@ export class Destination extends LogicItem {
         return argument;
     }
 
+    
+
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -184,6 +193,8 @@ export class Destination extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加实际参数
      * @internal
@@ -203,6 +214,8 @@ export class Destination extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
+    
+
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -226,6 +239,9 @@ export class Destination extends LogicItem {
         return node;
     }
 
+
+    
+
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -233,10 +249,12 @@ export class Destination extends LogicItem {
     removeArgumentInArguments(argument: Argument): void;
 
     removeArgumentInArguments(options: Argument) {
-        const argument: Argument = options;
+        let argument: Argument = options;
         return argument.delete();
     }
 
+    
+
     /**
     * 删除锚点参数
     * @param name 锚点参数名称
@@ -581,7 +599,7 @@ export class Destination extends LogicItem {
          */
         if (typeof argIndex === 'number') {
             if (!this.arguments[argIndex]?.expression) {
-                return this.arguments[argIndex].delete();
+                return this.arguments[argIndex]?.delete();
             }
             if (argIndex !== this.arguments.length - 1) {
                 // 如果本身没有值就直接删除

package/src/concepts/ExternalDestination__.ts

@@ -47,7 +47,7 @@ export class ExternalDestination extends LogicItem {
     @property('Anchor')
     anchor: Anchor = undefined;
 
-
+    
 
     /**
      * @param source 需要合并的部分参数
@@ -62,7 +62,7 @@ export class ExternalDestination extends LogicItem {
         return super.from(source, parentNode, parentKey) as ExternalDestination;
     }
 
-
+    
     /**
      * 设置外部链接
      */
@@ -105,9 +105,9 @@ export class ExternalDestination extends LogicItem {
         });
     }
 
+    
 
-
-
+    
 
     /**
     * 删除逻辑项
@@ -134,7 +134,7 @@ export class ExternalDestination extends LogicItem {
         return link.delete();
     }
 
-
+    
 
     /**
     * 删除锚点参数
@@ -223,7 +223,7 @@ export class ExternalDestination extends LogicItem {
 
     toVue(options?: ElementToVueOptions) {
         let url = '`';
-        const tempLink = this.link ? this.link.toVue(options) : '';
+        const tempLink = this.link ? this.link.toVue(options) : "''";
         url += '${';
         url += `${tempLink}`;
         url += '}';