@lcap/nasl 2.20.1-beta.2 → 2.21.0-beta.1

package/src/concepts/ConfigGroup__.ts

@@ -52,6 +52,9 @@ export class ConfigGroup extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'ConfigGroup';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): ConfigGroup {
         return super.from(source, parentNode, parentKey) as ConfigGroup;
@@ -81,7 +84,7 @@ export class ConfigGroup extends BaseNode {
         });
     }
 
-    getConfigPropertyExistingNames(excludedList: Array<ConfigProperty> = []) {
+        getConfigPropertyExistingNames(excludedList: Array<ConfigProperty> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.properties as ConfigProperty[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -222,6 +225,9 @@ export class ConfigGroup extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除配置属性
     * @param name 配置属性名称

package/src/concepts/ConfigPropertyValue__.ts

@@ -49,6 +49,9 @@ export class ConfigPropertyValue extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'ConfigPropertyValue';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): ConfigPropertyValue {
         return super.from(source, parentNode, parentKey) as ConfigPropertyValue;
@@ -89,10 +92,6 @@ export class ConfigPropertyValue extends BaseNode {
         });
     }
 
-    
-
-    
-
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。

package/src/concepts/ConfigProperty__.ts

@@ -67,6 +67,9 @@ export class ConfigProperty extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'ConfigProperty';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): ConfigProperty {
         return super.from(source, parentNode, parentKey) as ConfigProperty;
@@ -96,7 +99,7 @@ export class ConfigProperty extends BaseNode {
         });
     }
 
-    getConfigPropertyValueExistingNames(excludedList: Array<ConfigPropertyValue> = []) {
+        getConfigPropertyValueExistingNames(excludedList: Array<ConfigPropertyValue> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.values as ConfigPropertyValue[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -237,6 +240,9 @@ export class ConfigProperty extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除配置属性值
     * @param name 配置属性值名称

package/src/concepts/Configuration__.ts

@@ -45,6 +45,9 @@ export class Configuration extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'Configuration';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): Configuration {
         return super.from(source, parentNode, parentKey) as Configuration;
@@ -61,8 +64,9 @@ export class Configuration extends BaseNode {
         }
         return params;
     }
+    
 
-    getConfigGroupExistingNames(excludedList: Array<ConfigGroup> = []) {
+        getConfigGroupExistingNames(excludedList: Array<ConfigGroup> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.groups as ConfigGroup[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -203,6 +207,9 @@ export class Configuration extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除配置组
     * @param name 配置组名称

package/src/concepts/Constant__.ts

@@ -106,6 +106,9 @@ export class Constant extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'Constant';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): Constant {
         return super.from(source, parentNode, parentKey) as Constant;

package/src/concepts/DataElement__.ts

@@ -56,6 +56,9 @@ export class DataElement extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'DataElement';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): DataElement {
         return super.from(source, parentNode, parentKey) as DataElement;

package/src/concepts/DataSource__.ts

@@ -66,6 +66,9 @@ export class DataSource extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'DataSource';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): DataSource {
         return super.from(source, parentNode, parentKey) as DataSource;
@@ -94,7 +97,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,6 +238,9 @@ export class DataSource extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除实体
     * @param name 实体名称
@@ -459,19 +465,23 @@ export class DataSource extends BaseNode {
             target.semanticDiagnostics.push({
                 text: errorText,
                 node: this,
-                severity: 'error',
+                severity: 'warning',
                 message: `数据源配置：数据源 ${this.name} ${envText}环境数据源连接不通，请先检查${envText}环境数据源配置`,
                 originalDiagnostic: {
                     fileName: '',
                     start: null,
                     end: null,
-                    category: 'error',
+                    category: 'warning',
                     text: `DataSource connection error`,
                 },
             });
         }
     }
 
+    get dataSourceSqlType() {
+        return JSON.parse(this.dataSourceConfig?.devProperty?.value || '{}')?.type;
+    }
+
     // 获取datasource对应的数据源配置
     get dataSourceConfig() {
         let devProperty = null;

package/src/concepts/DatabaseTypeAnnotation__.ts

@@ -0,0 +1,85 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+import { concept, excludedInJSON, property } from '../decorators';
+
+import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
+import BaseNode from '../common/BaseNode';
+import classMap from '../common/classMap';
+
+
+/**
+ * 数据库存储类型
+ */
+@concept('数据库存储类型')
+export class DatabaseTypeAnnotation extends BaseNode {
+    /**
+     * 产品概念
+     */
+    @property()
+    concept: 'DatabaseTypeAnnotation' = 'DatabaseTypeAnnotation';
+
+    /**
+     * 类型名
+     */
+    @property()
+    typeName: string = undefined;
+
+    /**
+     * arguments
+     */
+    @property()
+    arguments: Map<string, string> = undefined;
+
+    
+
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source?: Partial<DatabaseTypeAnnotation>) {
+        source = Object.assign({}, DatabaseTypeAnnotation.getDefaultOptions(), source);
+        super(source);
+        super.subConstructor(source);
+    }
+
+    static from(source: any, parentNode?: any, parentKey?: string): DatabaseTypeAnnotation {
+        return super.from(source, parentNode, parentKey) as DatabaseTypeAnnotation;
+    }
+
+    /**
+     * 从父级删除该节点
+     * @internal
+     */
+    _delete() {
+        let params: Params = null;
+        if (this.parentNode) {
+            params = (this.parentNode as any)?.__removeDatabaseTypeAnnotation?.(this);
+        }
+        return params;
+    }
+    
+
+    
+
+    
+
+    //================================================================================
+    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+    // 自动生成的代码已结束。下面可以手动编写。
+    //================================================================================
+
+    //================================================================================
+    // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+    // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+    //================================================================================
+}
+
+classMap.DatabaseTypeAnnotation = DatabaseTypeAnnotation;
+export default DatabaseTypeAnnotation;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/Destination__.ts

@@ -76,6 +76,9 @@ export class Destination extends LogicItem {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'Destination';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): Destination {
         return super.from(source, parentNode, parentKey) as Destination;
@@ -348,12 +351,12 @@ export class Destination extends LogicItem {
         let code = '';
         const viewArr = this.genViewArr();
         if (Array.isArray(viewArr) && viewArr.length) {
-            code += `let url = '${this.viewNode.frontend.basePath ? this.viewNode.frontend.basePath : ''}/${viewArr.join('/')}';\n`;
+            code += `let url = '${this.viewNode.frontend.prefixPath ? this.viewNode.frontend.prefixPath : ''}/${viewArr.join('/')}';\n`;
             const completeArguments = this.completeArguments;
             if (Array.isArray(completeArguments) && completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam: Param[] = [];
-                if (node) {
+                if (node?.params) {
                     logicParam = node.params;
                 }
                 const logicParamLen = logicParam.length;
@@ -402,12 +405,12 @@ export class Destination extends LogicItem {
         let url = '`';
         const viewArr = this.genViewArr();
         if (Array.isArray(viewArr) && viewArr.length) {
-            url += `${this.viewNode?.frontend?.basePath ? this.viewNode.frontend.basePath : ''}/${viewArr.join('/')}`;
+            url += `${this.viewNode?.frontend?.prefixPath ? this.viewNode.frontend.prefixPath : ''}/${viewArr.join('/')}`;
             const completeArguments = this.completeArguments;
             if (completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam: Param[] = [];
-                if (node) {
+                if (node?.params) {
                     logicParam = node.params;
                 }
                 const logicParamLength = logicParam.length;
@@ -442,12 +445,13 @@ export class Destination extends LogicItem {
         const viewArr = this.genViewArr();
         if (Array.isArray(viewArr) && viewArr.length) {
             url += '`';
+            // IDE内展示需要屏蔽掉“系统统一路径前缀”
             url += `${this.viewNode?.frontend?.basePath ? this.viewNode.frontend.basePath : ''}/${viewArr.join('/')}`;
             const completeArguments = this.completeArguments;
             if (completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam: Param[] = [];
-                if (node) {
+                if (node?.params) {
                     logicParam = node.params;
                 }
                 const logicParamLength = logicParam.length;
@@ -482,13 +486,13 @@ export class Destination extends LogicItem {
         const viewArr = this.genViewArr();
         if (Array.isArray(viewArr) && viewArr.length) {
             url += 'this.$destination(`';
-            url += `${this.viewNode?.frontend?.basePath ? this.viewNode.frontend.basePath : ''}/${viewArr.join('/')}`;
+            url += `${this.viewNode?.frontend?.prefixPath ? this.viewNode.frontend.prefixPath : ''}/${viewArr.join('/')}`;
             const completeArguments = this.completeArguments;
 
             if (completeArguments.length) {
                 const node = this.viewNode;
                 let logicParam: Param[] = [];
-                if (node) {
+                if (node?.params) {
                     logicParam = node.params;
                 }
                 const logicParamLength = logicParam.length;
@@ -618,7 +622,7 @@ export class Destination extends LogicItem {
         findArgument.setKeyword(newKeyword);
     }
 
-    get viewPath() {
+    get viewUIPath() {
         if (!this.viewNamespace) {
             return '';
         }
@@ -637,6 +641,26 @@ export class Destination extends LogicItem {
         }
         return `/${viewNameAttr.join('/')}`;
     }
+
+    get viewPath() {
+        if (!this.viewNamespace) {
+            return '';
+        }
+        const namespaceAttr = this.viewNamespace.split('.');
+        namespaceAttr.push(this.viewName);
+        const viewNameAttr: string[] = [];
+        if (Array.isArray(namespaceAttr)) {
+            namespaceAttr.forEach((item, index) => {
+                if (item === 'views') {
+                    viewNameAttr.push(namespaceAttr[index + 1]);
+                }
+            });
+        }
+        if (this.viewNode) {
+            return `${this.viewNode.frontend.prefixPath}/${viewNameAttr.join('/')}`;
+        }
+        return `/${viewNameAttr.join('/')}`;
+    }
     @withSourceMap()
     toEmbeddedTSInProcess(state: TranslatorState, prependCode: string): string {
         // const tab = indent((state?.tabSize || 0));
@@ -668,7 +692,7 @@ export class Destination extends LogicItem {
 
         const node = this.viewNode;
         let logicParam: Param[] = [];
-        if (node) {
+        if (node?.params) {
             logicParam = node.params;
         }
         const logicParamLength = logicParam.length;
@@ -759,7 +783,7 @@ export class Destination extends LogicItem {
         const node = this.viewNode;
         let logicParam: Param[] = [];
         const Arguments: Argument[] = [];
-        if (node) {
+        if (node?.params) {
             logicParam = node.params;
         }
         if (this.arguments?.length) {

package/src/concepts/End__.ts

@@ -39,6 +39,9 @@ export class End extends LogicItem {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'End';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): End {
         return super.from(source, parentNode, parentKey) as End;

package/src/concepts/EntityIndex__.ts

@@ -90,6 +90,9 @@ export class EntityIndex extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'EntityIndex';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): EntityIndex {
         return super.from(source, parentNode, parentKey) as EntityIndex;

package/src/concepts/EntityProperty__.ts

@@ -16,6 +16,7 @@ import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import TypeAnnotation from './TypeAnnotation__';
+import DatabaseTypeAnnotation from './DatabaseTypeAnnotation__';
 import Entity from './Entity__';
 import Module from './Module__';
 import App from './App__';
@@ -68,6 +69,12 @@ export class EntityProperty extends BaseNode {
     @property('TypeAnnotation')
     typeAnnotation: TypeAnnotation = undefined;
 
+    /**
+     * 数据库存储类型
+     */
+    @property('DatabaseTypeAnnotation')
+    databaseTypeAnnotation: DatabaseTypeAnnotation = undefined;
+
     /**
      * 是否必填
      */
@@ -105,7 +112,7 @@ export class EntityProperty extends BaseNode {
     relationProperty: string = undefined;
 
     /**
-     * 删除关联属性记录时
+     * 关联属性实体记录删除规则
      */
     @property()
     deleteRule: 'protect' | 'cascade' = undefined;
@@ -172,6 +179,9 @@ export class EntityProperty extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'EntityProperty';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): EntityProperty {
         return super.from(source, parentNode, parentKey) as EntityProperty;
@@ -212,6 +222,21 @@ export class EntityProperty extends BaseNode {
         });
     }
 
+    /**
+     * 设置数据库存储类型
+     */
+    setDatabaseTypeAnnotation(databaseTypeAnnotation: DatabaseTypeAnnotation) {
+        databaseTypeAnnotation._delete();
+        const relationOptions = { parentNode: this, parentKey: 'databaseTypeAnnotation' };
+        Object.assign(databaseTypeAnnotation, relationOptions);
+        const object = {
+            databaseTypeAnnotation,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
     /**
      * 设置是否必填
      */
@@ -312,6 +337,56 @@ export class EntityProperty extends BaseNode {
         return params;
     }
 
+
+
+    /**
+    * 删除数据库存储类型
+    * @param name 数据库存储类型名称
+    */
+    removeDatabaseTypeAnnotation(name: string): void;
+
+    /**
+     * 删除数据库存储类型
+     * @param databaseTypeAnnotation 已有的数据库存储类型实例
+     */
+    removeDatabaseTypeAnnotation(databaseTypeAnnotation: DatabaseTypeAnnotation): void;
+
+    removeDatabaseTypeAnnotation(options: string | DatabaseTypeAnnotation) {
+        let databaseTypeAnnotation: DatabaseTypeAnnotation;
+        if (typeof options === 'string') {
+            databaseTypeAnnotation = this.databaseTypeAnnotation;
+            if (!databaseTypeAnnotation) {
+                throw new Error('找不到数据库存储类型 ' + options);
+            }
+        } else {
+            databaseTypeAnnotation = options;
+        }
+        return databaseTypeAnnotation.delete();
+    }
+
+    __removeDatabaseTypeAnnotation(databaseTypeAnnotation: DatabaseTypeAnnotation) {
+        const parentKey = databaseTypeAnnotation.parentKey;
+        const params: Params = {
+            parentNode: this,
+            parentKey,
+            index: -1,
+            object: null,
+            oldObject: databaseTypeAnnotation,
+        };
+        if (parentKey) {
+            params.parentKey = parentKey;
+            if (Array.isArray((this as any)[parentKey])) {
+                const index = (this as any)[parentKey].indexOf(databaseTypeAnnotation);
+                ~index && (this as any)[parentKey].splice(index, 1);
+                params.index = index;
+            } else if ((this as any)[parentKey] === databaseTypeAnnotation) {
+                params.index = 0;
+                (this as any)[parentKey] = undefined;
+            }
+        }
+        return params;
+    }
+
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。

package/src/concepts/Entity__.ts

@@ -98,6 +98,9 @@ export class Entity extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'Entity';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): Entity {
         return super.from(source, parentNode, parentKey) as Entity;

package/src/concepts/EnumItem__.ts

@@ -64,6 +64,9 @@ export class EnumItem extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'EnumItem';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): EnumItem {
         return super.from(source, parentNode, parentKey) as EnumItem;

package/src/concepts/Enum__.ts

@@ -72,6 +72,9 @@ export class Enum extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'Enum';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): Enum {
         return super.from(source, parentNode, parentKey) as Enum;

package/src/concepts/Event__.ts

@@ -88,6 +88,9 @@ export class Event extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'Event';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): Event {
         return super.from(source, parentNode, parentKey) as Event;

package/src/concepts/ExternalDestination__.ts

@@ -57,6 +57,9 @@ export class ExternalDestination extends LogicItem {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'ExternalDestination';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): ExternalDestination {
         return super.from(source, parentNode, parentKey) as ExternalDestination;

package/src/concepts/ForEachStatement__.ts

@@ -73,6 +73,9 @@ export class ForEachStatement extends LogicItem {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'ForEachStatement';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): ForEachStatement {
         return super.from(source, parentNode, parentKey) as ForEachStatement;

package/src/concepts/FrontendLibrary__.ts

@@ -72,6 +72,9 @@ export class FrontendLibrary extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'FrontendLibrary';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): FrontendLibrary {
         return super.from(source, parentNode, parentKey) as FrontendLibrary;

package/src/concepts/Frontend__.ts

@@ -105,6 +105,9 @@ export class Frontend extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'Frontend';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): Frontend {
         return super.from(source, parentNode, parentKey) as Frontend;
@@ -904,6 +907,20 @@ export class Frontend extends BaseNode {
         return finalPath;
     }
 
+    // 前缀
+    get prefixPath() {
+        const prefixArr: string[] = [];
+        [
+            this.app.sysPrefixPath,
+            this.basePath,
+        ].forEach((prefix) => {
+            if (prefix) {
+                prefixArr.push(prefix);
+            }
+        });
+        return prefixArr.join('');
+    }
+
     /**
      * 为/的转成''，便于url拼接
      */

package/src/concepts/Function__.ts

@@ -95,6 +95,9 @@ export class Function extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'Function';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): Function {
         return super.from(source, parentNode, parentKey) as Function;

package/src/concepts/Identifier__.ts

@@ -49,6 +49,9 @@ export class Identifier extends LogicItem {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'Identifier';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): Identifier {
         return super.from(source, parentNode, parentKey) as Identifier;

package/src/concepts/IfStatement__.ts

@@ -52,6 +52,9 @@ export class IfStatement extends LogicItem {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'IfStatement';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): IfStatement {
         return super.from(source, parentNode, parentKey) as IfStatement;