@lcap/nasl 2.18.0-beta.7 → 2.20.0-beta.1

package/src/concepts/CallLogic__.ts

@@ -5,6 +5,7 @@ import View from './View__';
 import { ElementToVueOptions } from './ViewElement__';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 import { findConceptKeyWordIndexFromNamespace } from '../utils';
+import * as JSON5 from 'json5';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -20,6 +21,7 @@ import classMap from '../common/classMap';
 import TypeAnnotation from './TypeAnnotation__';
 import Argument from './Argument__';
 import LogicItem from './LogicItem__';
+import Identifier from './Identifier__';
 
 /**
  * 调用逻辑
@@ -68,8 +70,6 @@ export class CallLogic extends LogicItem {
     @property('Argument')
     arguments: Array<Argument> = [];
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -83,13 +83,6 @@ export class CallLogic extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallLogic;
     }
 
-    
-    
-
-    
-
-    
-
     /**
     * 插入类型标注
     * @internal
@@ -122,8 +115,6 @@ export class CallLogic extends LogicItem {
         return typeAnnotation;
     }
 
-    
-
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -146,8 +137,6 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
-    
-
     /**
      * 添加类型标注
      * @internal
@@ -167,8 +156,6 @@ export class CallLogic extends LogicItem {
         return this._insertTypeAnnotationAt(options as any, index);
     }
 
-    
-
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -192,11 +179,6 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
-
-
-
-    
-
     /**
     * 插入实际参数
     * @internal
@@ -229,8 +211,6 @@ export class CallLogic extends LogicItem {
         return argument;
     }
 
-    
-
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -253,8 +233,6 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
-    
-
     /**
      * 添加实际参数
      * @internal
@@ -274,8 +252,6 @@ export class CallLogic extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
-    
-
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -299,9 +275,6 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
-
-    
-
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -309,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();
     }
 
@@ -336,8 +309,6 @@ export class CallLogic extends LogicItem {
         return params;
     }
 
-
-
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -345,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();
     }
 
@@ -448,10 +419,14 @@ export class CallLogic extends LogicItem {
         }
         this.calleeName = logic.name;
         this.arguments = [];
-        logic.params.forEach((param) => {
-            this._addArgument({
+        logic.params.forEach((param: any) => {
+            const argument = this._addArgument({
                 keyword: param.name,
             });
+            if (param.defaultExpression) {
+                const exp: any = BaseNode.from({ ...param.defaultExpression.toJSON() });
+                argument.setExpression(exp);
+            }
         });
         if (logic.typeParams) {
             this.typeArguments = [];
@@ -471,7 +446,7 @@ export class CallLogic extends LogicItem {
             const relationOptions = { parentNode: this, parentKey: 'arguments' };
             const argument = Argument.from({
                 keyword: param.name,
-                expression: param.defaultExpression,
+                expression: param.isFunction ? new Identifier() : param.defaultExpression,
             }, this);
             Object.assign(argument, relationOptions);
             return argument;
@@ -692,7 +667,6 @@ var __parseType = __parseType || ((root, prop) => {
 
         // 全局逻辑
         if (!isViewLogic) {
-            const namespaceArr = calleeNamespace?.split('.');
             const logic = getNodeByNodeCallee(this.app, this.calleewholeKey, (key: string, tempPoint: any) => {
                 // 处理 NASL 中未定义的假的节点
                 if (key === tempPoint.name) {
@@ -754,12 +728,31 @@ var __parseType = __parseType || ((root, prop) => {
                         code += `},\n`;
                         break;
                     }
+                    case 'update':
+                    case 'createOrUpdate':
+                    case 'batchUpdate': {
+                        code += `body: {\n`;
+                        const argsStr = logicArgs
+                            .filter((arg: any) => arg.expression)
+                            .map((arg: any) => {
+                                const name = arg.keyword === 'body' ? 
+                                    (this.calleeName === 'batchUpdate' ? 'entities' : 'entity') : 
+                                    arg.keyword;
+                                return `${name}: ${arg.expression.toJS(shiftState(state, code))}`;
+                            })
+                            .join(',\n');
+                        code += argsStr;
+                        code += `},\n`;
+                        logicArgs = [];
+                        breakBody = true;
+                        break;
+                    }
                     case 'updateBy': {
                         code += `body: {`;
                         const argsStr = logicArgs
                             .filter((arg: any) => arg.expression)
                             .map((arg: any) => {
-                                const name = arg.expression.returnExpression ? arg.expression.name : 'entity';
+                                const name = arg.keyword === 'body' ? 'entity' : arg.keyword;
                                 // filter回调函数
                                 if (arg.expression.returnExpression) {
                                     const argsStr = JSON.stringify(handleMember(arg.expression.returnExpression));
@@ -816,6 +809,9 @@ var __parseType = __parseType || ((root, prop) => {
                         .map((obj: any) => `\n${obj?.keyword}: ${obj?.arg?.toJS(shiftState(state, code))}`)
                         .join(', ');
                     code += argsStr;
+                    if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+                        code += `,\n__typeArguments: ${JSON5.stringify(this.typeArguments)}`;
+                    }
                 }
                 code += '\n}';
             }
@@ -854,12 +850,27 @@ var __parseType = __parseType || ((root, prop) => {
                 code += '})';
             } else {
                 code += '(';
-                completeArguments
-                    .forEach((arg, index) => {
+                const needToString = ['showMessage', 'consoleLog'].includes(this.calleeName);
+                if (needToString) {
+                    code += `this.$utils['ToString'](`;
+                }
+                if (Array.isArray(completeArguments) && completeArguments.length) {
+                    completeArguments.forEach((arg, index) => {
                         code += arg?.toJS(shiftState(state, code));
                         if (index !== completeArguments?.length - 1)
                             code += ', ';
                     });
+                    if (needToString) {
+                        const arg = this.arguments[0];
+                        const argTypeAnnotation = (arg as any).typeAnnotation || arg.__TypeAnnotation;
+                        if (argTypeAnnotation) {
+                            code += `, '${argTypeAnnotation?.sortedTypeKey}'`;
+                        }
+                    }
+                }
+                if (needToString) {
+                    code += `)`;
+                }
                 code += ')';
             }
         }
@@ -914,7 +925,10 @@ var __parseType = __parseType || ((root, prop) => {
             };
         }
         const typeAnnotation = (this as any).typeAnnotation || this.__TypeAnnotation;
-        const needGenInitFromSchema = typeAnnotation && !['primitive', 'union'].includes(typeAnnotation.typeKind);
+        const needGenInitFromSchema = typeAnnotation && (
+            !['primitive', 'union'].includes(typeAnnotation.typeKind)
+            || typeAnnotation.typeName === 'DateTime'
+        );
         if (needGenInitFromSchema) {
             code = `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', ${code})`;
         }
@@ -953,7 +967,8 @@ var __parseType = __parseType || ((root, prop) => {
                 && this.parentNode.concept !== 'SelectMembers'
                 && this.parentNode.concept !== 'BinaryExpression'
                 && this.parentNode.concept !== 'StringInterpolation'
-                && this.parentNode.concept !== 'MemberExpression') {
+                && this.parentNode.concept !== 'MemberExpression'
+                && !['NewMap', 'NewList'].includes(this.parentNode.concept)) {
                 code += ';';
             }
         } else {
@@ -975,7 +990,8 @@ var __parseType = __parseType || ((root, prop) => {
                     && this.parentNode.concept !== 'SelectMembers'
                     && this.parentNode.concept !== 'BinaryExpression'
                     && this.parentNode.concept !== 'StringInterpolation'
-                    && this.parentNode.concept !== 'MemberExpression') {
+                    && this.parentNode.concept !== 'MemberExpression'
+                    && !['NewMap', 'NewList'].includes(this.parentNode.concept)) {
                     code += ';';
                 }
             } else {
@@ -988,7 +1004,8 @@ var __parseType = __parseType || ((root, prop) => {
                     && this.parentNode.concept !== 'SelectMembers'
                     && this.parentNode.concept !== 'BinaryExpression'
                     && this.parentNode.concept !== 'StringInterpolation'
-                    && this.parentNode.concept !== 'MemberExpression') {
+                    && this.parentNode.concept !== 'MemberExpression'
+                    && !['NewMap', 'NewList'].includes(this.parentNode.concept)) {
                     code += ';';
                 }
             }

package/src/concepts/CallQueryComponent__.ts

@@ -1087,7 +1087,8 @@ export class CallQueryComponent extends LogicItem {
             && this.parentNode.concept !== 'SelectMembers'
             && this.parentNode.concept !== 'BinaryExpression'
             && this.parentNode.concept !== 'StringInterpolation'
-            && this.parentNode.concept !== 'MemberExpression') {
+            && this.parentNode.concept !== 'MemberExpression'
+            && ['NewMap', 'NewList'].includes(this.parentNode.concept)) {
             code += ';';
         }
         code += '\n';
@@ -1486,6 +1487,8 @@ export class CallQueryComponent extends LogicItem {
                                 expression,
                             });
                             completionProperty.icon = 'property';
+                            // 标记实体属性是否是符合类型
+                            Object.assign(completionProperty, { isComplexType: property.typeAnnotation.isComplexType() });
                             return completionProperty;
                         }),
                     }));

package/src/concepts/Constant__.ts

@@ -18,6 +18,7 @@ import Process from './Process__';
 import ProcessElement from './ProcessElement__';
 import Module from './Module__';
 import App from './App__';
+import Frontend from './Frontend__';
 
 /**
  * 常量
@@ -78,6 +79,12 @@ export class Constant extends BaseNode {
     get view() {
         return this.getAncestor('View') as View;
     }
+    /**
+     * 祖先 Frontend
+     */
+    get frontend() {
+        return this.getAncestor('Frontend') as Frontend;
+    }
     /**
      * 祖先 ProcessElement
      */

package/src/concepts/DataSource__.ts

@@ -1,4 +1,5 @@
 import { TranslatorState, withSourceMap, createCompilerState } from '../translator';
+import datasourceService from '../service/datasource';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -93,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);
     }
@@ -234,9 +235,6 @@ export class DataSource extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除实体
     * @param name 实体名称
@@ -402,7 +400,7 @@ export class DataSource extends BaseNode {
             code += this.toEmbeddedTS(state);
         } catch (err) {
             code += '';
-            console.log(err);
+            console.error(err);
         }
         code += '}\n';
 
@@ -413,6 +411,60 @@ export class DataSource extends BaseNode {
         };
     }
 
+    // 测试数据源连通性
+    async pingDatabase(recordEnvConnectError: Function) {
+        const configProperty = this.app.configuration.getGroup('dataSource').getProperty(this.name);
+        configProperty && configProperty.values.forEach((prop) => {
+            // 未配置数据源时，不进行连接测试
+            if (!prop.value) {
+                return;
+            }
+            const dataSource = configProperty.name;
+            const env = prop.env;
+            return datasourceService.pingDatabase({
+                body: {
+                    category: 'sql',
+                    appId: this.app.id,
+                    dataSource,
+                    env,
+                },
+            }).then(() => {
+                Object.assign(this, { [`__${env}ConnectError`]: false });
+            }).catch(() => {
+                Object.assign(this, { [`__${env}ConnectError`]: true });
+            }).then(() => {
+                recordEnvConnectError(env);
+            });
+        });
+    }
+    recordEnvConnectError(records: any[], env: string) {
+        const target = records?.find((item: any) => item.id === this.id);
+        // 诊断还未生成，在诊断时生成问题
+        if (!target) {
+            return;
+        }
+        // 诊断已生成，手动插入问题
+        const errorKey = `__${env}ConnectError`;
+        const errorText = `DataSource ${env} env connect error`;
+        target.semanticDiagnostics = target.semanticDiagnostics.filter((item: any) => item.code !== errorText);
+        if ((this as any)[errorKey]) {
+            const envText = env === 'online' ? '生产' : '开发';
+            target.semanticDiagnostics.push({
+                text: errorText,
+                node: this,
+                severity: 'error',
+                message: `数据源配置：数据源 ${this.name} ${envText}环境数据源连接不通，请先检查${envText}环境数据源配置`,
+                originalDiagnostic: {
+                    fileName: '',
+                    start: null,
+                    end: null,
+                    category: 'error',
+                    text: `DataSource connection error`,
+                },
+            });
+        }
+    }
+
     // 获取datasource对应的数据源配置
     get dataSourceConfig() {
         let devProperty = null;

package/src/concepts/Destination__.ts

@@ -66,8 +66,6 @@ export class Destination extends LogicItem {
     @property()
     target: string = '_self';
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -81,7 +79,6 @@ export class Destination extends LogicItem {
         return super.from(source, parentNode, parentKey) as Destination;
     }
 
-    
     /**
      * 设置viewNamespace
      */
@@ -133,10 +130,6 @@ export class Destination extends LogicItem {
         });
     }
 
-    
-
-    
-
     /**
     * 插入实际参数
     * @internal
@@ -169,8 +162,6 @@ export class Destination extends LogicItem {
         return argument;
     }
 
-    
-
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -193,8 +184,6 @@ export class Destination extends LogicItem {
         return node;
     }
 
-    
-
     /**
      * 添加实际参数
      * @internal
@@ -214,8 +203,6 @@ export class Destination extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
-    
-
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -239,9 +226,6 @@ export class Destination extends LogicItem {
         return node;
     }
 
-
-    
-
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -249,12 +233,10 @@ export class Destination extends LogicItem {
     removeArgumentInArguments(argument: Argument): void;
 
     removeArgumentInArguments(options: Argument) {
-        let argument: Argument = options;
+        const argument: Argument = options;
         return argument.delete();
     }
 
-    
-
     /**
     * 删除锚点参数
     * @param name 锚点参数名称
@@ -339,6 +321,8 @@ export class Destination extends LogicItem {
         if (this.viewName) {
             viewArr.push(this.viewName);
         }
+        // 第一个是端名，需要去掉
+        viewArr.shift();
         return viewArr;
     }
 
@@ -577,6 +561,9 @@ export class Destination extends LogicItem {
                 }
             });
         }
+        if (this.viewNode) {
+            return `${this.viewNode.frontend.basePath}/${viewNameAttr.join('/')}`;
+        }
         return `/${viewNameAttr.join('/')}`;
     }
     @withSourceMap()
@@ -659,11 +646,11 @@ export class Destination extends LogicItem {
     }
 
     toBrief(): string {
-        let q = [];
+        const q = [];
         if (this.anchor?.expression) {
             q.push(this.anchor.toBrief());
         }
-        return this.arguments.map(a => a.toBrief()).concat(q).join('<br />')
+        return this.arguments.map((a) => a.toBrief()).concat(q).join('<br />');
     }
 
     @withSourceMap()