@lcap/nasl 2.22.0-beta.0 → 2.22.0-beta.1

package/src/concepts/EntityProperty__.ts

@@ -2,6 +2,7 @@ import { dataTypesMap } from './basics/types';
 import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 type changeType = 'up' | 'down';
+import CallQueryComponent from './CallQueryComponent__';
 import StructureProperty from './StructureProperty__';
 import Structure from './Structure__';
 //================================================================================
@@ -285,10 +286,6 @@ export class EntityProperty extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
     * 删除类型标注
     * @param name 类型标注名称
@@ -337,8 +334,6 @@ export class EntityProperty extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除数据库存储类型
     * @param name 数据库存储类型名称
@@ -395,7 +390,7 @@ export class EntityProperty extends BaseNode {
     /**
      * 设置实体属性名称
      */
-    setName(name: string) {
+    async setName(name: string) {
         const object: any = {
             name,
         };
@@ -426,10 +421,13 @@ export class EntityProperty extends BaseNode {
 
         this.name = oldName;
         this.columnName = oldColumnName;
+        this.app?.emit('collect:start', { actionMsg: '修改实体属性名' });
         this.update({
             ...object,
             field: 'name',
         });
+        await this._effect();
+        this.app?.emit('collect:end');
     }
 
     /**
@@ -443,6 +441,46 @@ export class EntityProperty extends BaseNode {
             ...object,
         });
     }
+    async delete() {
+        let actionMsg = '删除实体属性';
+        if (this.name)
+            actionMsg += `“${this.name}”`;
+        this.app?.emit('collect:start', { actionMsg });
+        // 副作用
+        await this._effect({ action: 'delete' });
+        super.delete();
+        this.app?.emit('collect:end');
+    }
+
+    async _effect(options: { action?: 'delete' } = {}) {
+        // 处理选中的此字段的 CallQueryComponent
+        const callQueryComponents: Set<CallQueryComponent> = new Set();
+        const refs = await this.findUsage();
+        refs.forEach((val: any) => {
+            const loopFindNode = (item: any) => {
+                if (item.children) {
+                    item.children.forEach((i: any) => loopFindNode(i));
+                } else {
+                    const target = item.node?.getAncestor('CallQueryComponent');
+                    if (target) {
+                        callQueryComponents.add(target);
+                    }
+                }
+            };
+            loopFindNode(val);
+        });
+        callQueryComponents.forEach((node) => {
+            const targetField = node.select.selectFieldElements.find((item) => item.entityAsName === this.parentNode.name && item.propertyName === this.name);
+            if (targetField) {
+                if (options.action === 'delete') {
+                    // 删除字段对应的 QueryFieldExpression
+                    targetField.delete();
+                }
+                // 更新数据结构
+                node.saveStructure();
+            }
+        });
+    }
     /**
      * 是否展开
      */
@@ -680,7 +718,6 @@ export class EntityProperty extends BaseNode {
         return !!this.module || this.generationRule !== 'manual';
     }
 
-
     // 存储类型信息
     get databaseTypeInfo() {
         const dataSourceSqlType = (this.getAncestor('DataSource') as DataSource)?.dataSourceSqlType;
@@ -717,10 +754,67 @@ export class EntityProperty extends BaseNode {
             const typeName = this.databaseTypeAnnotation.typeName;
             return databaseTypeMap[typeName];
         } else {
+            const { typeName } = this.typeAnnotation;
+            if (typeName === 'String') {
+                const defaultDataBaseName = this.inferredDefaultDataBaseName;
+                if (defaultDataBaseName && defaultDataBaseName !== this.defaultDataBaseType?.type) {
+                    return {
+                        ...(this.dataBaseTypeMap[defaultDataBaseName] || {}),
+                    };
+                }
+            }
             return this.defaultDataBaseType;
         }
     }
 
+    // 根据最大长度推断的默认数据库类型
+    get inferredDefaultDataBaseName() {
+        let defaultDataBaseName;
+        const { typeName } = this.typeAnnotation;
+        if (typeName === 'String') {
+            const dataSourceSqlType = (this.getAncestor('DataSource') as DataSource)?.dataSourceSqlType;
+            let maxLength: any;
+            const rules = this.rules;
+            if (Array.isArray(rules)) {
+                // 是否需要更新规则
+                rules.forEach((rule) => {
+                    const match = rule.match(/^([^()]+)\(([\d\-.]+)\)$/);
+                    if (match) {
+                        const [, key, value] = match;
+                        if (key === 'maxLength') {
+                            maxLength = value;
+                        }
+                    }
+                });
+            }
+            // 不同数据库 最大长度 短、中、长 对应的默认储存类型
+            const sqlMap: any = {
+                mysql: {
+                    255: 'varchar',
+                    4000: 'text',
+                    16777215: 'mediumtext',
+                },
+                oracle: {
+                    255: 'varchar2',
+                    4000: 'clob',
+                    16777215: 'clob',
+                },
+                dameng: {
+                    255: 'varchar2',
+                    4000: 'text',
+                    16777215: 'text',
+                },
+                db2: {
+                    255: 'varchar',
+                    4000: 'clob',
+                    16777215: 'clob',
+                },
+            };
+            defaultDataBaseName = sqlMap?.[dataSourceSqlType]?.[maxLength];
+        }
+        return defaultDataBaseName;
+    }
+
     __showAdvanced: boolean = false;
 
     //================================================================================

package/src/concepts/Entity__.ts

@@ -1,6 +1,7 @@
 import Namespace from './Namespace__';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import { entity2LogicNamespace } from '../server/entity2LogicNamespace';
+import CallQueryComponent from './CallQueryComponent__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -129,7 +130,7 @@ export class Entity extends BaseNode {
         });
     }
 
-        getPropertyExistingNames(excludedList: Array<EntityProperty> = []) {
+    getPropertyExistingNames(excludedList: Array<EntityProperty> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.properties as EntityProperty[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -270,7 +271,6 @@ export class Entity extends BaseNode {
         return node;
     }
 
-
     getEntityIndexExistingNames(excludedList: Array<EntityIndex> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.indexes as EntityIndex[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -412,9 +412,6 @@ export class Entity extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除实体属性
     * @param name 实体属性名称
@@ -463,8 +460,6 @@ export class Entity extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除实体索引
     * @param name 实体索引名称
@@ -535,7 +530,7 @@ export class Entity extends BaseNode {
     /**
      * 设置实体表名并修改表名
      */
-    setName(name: string) {
+    async setName(name: string) {
         const object: any = {
             name,
         };
@@ -552,10 +547,14 @@ export class Entity extends BaseNode {
 
         this.name = oldName;
         this.tableName = oldTableName;
+        this.app?.emit('collect:start', { actionMsg: '修改实体名' });
+        const refs = await this.findUsage();
         this.update({
             ...object,
             field: 'name',
         });
+        this._effect(refs);
+        this.app?.emit('collect:end');
     }
     /**
      * 设置实体表名
@@ -671,6 +670,30 @@ export class Entity extends BaseNode {
         // 重命名 properties columnName
         this.formatPropertyColumnName();
     }
+    async _effect(refs: any = []) {
+        // 处理选中的此实体的 CallQueryComponent
+        const callQueryComponents: Set<CallQueryComponent> = new Set();
+        refs.forEach((val: any) => {
+            const loopFindNode = (item: any) => {
+                if (item.children) {
+                    item.children.forEach((i: any) => loopFindNode(i));
+                } else {
+                    const target = item.node?.getAncestor('CallQueryComponent');
+                    if (target) {
+                        callQueryComponents.add(target);
+                    }
+                }
+            };
+            loopFindNode(val);
+        });
+        callQueryComponents.forEach((node) => {
+            const targetField = node.select.selectFieldElements.find((item) => item.entityAsName === this.name);
+            if (targetField) {
+                // 更新数据结构
+                node.saveStructure();
+            }
+        });
+    }
 
     public static getDefaultOptions() {
         return {

package/src/concepts/Identifier__.ts

@@ -1,5 +1,5 @@
 import { TranslatorState, withSourceMap } from '../translator';
-import { BindAttribute, TypeAnnotation } from '..';
+import { BindAttribute, CallLogic, TypeAnnotation } from '..';
 import { ElementToVueOptions } from './ViewElement__';
 import { findConceptKeyWordByNamespace } from '../utils';
 
@@ -229,7 +229,14 @@ export class Identifier extends LogicItem {
         if (this.namespace === 'inner' && this.getAncestor('CallQueryComponent')) {
             return `__${this.name}` || '__IDENTIFIER__';
         }
-
+        const logicAncestor = this.getAncestor('CallLogic') as CallLogic;
+        
+        if (logicAncestor && logicAncestor.calleeName === "getCustomConfig" && logicAncestor.calleeNamespace === "nasl.configuration") {
+            if (!!this.view) {
+                return this.namespace ? `${this.namespace}.Custom${this.name}.FrontEnd${this.name}` : this.name || '__IDENTIFIER__';
+            }
+            return this.namespace ? `${this.namespace}.Custom${this.name}.BackEnd${this.name}` : this.name || '__IDENTIFIER__';
+        }
         return this.namespace ? this.namespace + '.' + this.name : this.name || '__IDENTIFIER__';
     }
 

package/src/concepts/IfStatement__.ts

@@ -442,7 +442,7 @@ export class IfStatement extends LogicItem {
                 code
                     += logicItem.toEmbeddedTS(shiftState(state, code, {
                         tabSize: (state?.tabSize || 0) + 1,
-                    })) + '\n';
+                    })) + ';\n';
             });
         }
 
@@ -453,7 +453,7 @@ export class IfStatement extends LogicItem {
                 code
                     += logicItem.toEmbeddedTS(shiftState(state, code, {
                         tabSize: (state?.tabSize || 0) + 1,
-                    })) + '\n';
+                    })) + ';\n';
             });
             code += indent((state?.tabSize || 0)) + '}\n';
         }

package/src/concepts/Integration__.ts

@@ -0,0 +1,162 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 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';
+import MicroApp from './MicroApp__';
+import App from './App__';
+
+/**
+ * 集成
+ */
+@concept('集成')
+export class Integration extends BaseNode {
+    /**
+     * 产品概念
+     */
+    @property()
+    concept: 'Integration' = 'Integration';
+
+    /**
+     * 微应用
+     */
+    @property('MicroApp')
+    microApp: MicroApp = undefined;
+
+    /**
+     * 祖先 App
+     */
+    get app() {
+        return this.getAncestor('App') as App;
+    }
+
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source?: Partial<Integration>) {
+        source = Object.assign({}, Integration.getDefaultOptions(), source);
+        super(source);
+        super.subConstructor(source);
+    }
+    getClassName() {
+        return 'Integration';
+    }
+
+    static from(source: any, parentNode?: any, parentKey?: string): Integration {
+        return super.from(source, parentNode, parentKey) as Integration;
+    }
+
+    /**
+     * 从父级删除该节点
+     * @internal
+     */
+    _delete() {
+        let params: Params = null;
+        if (this.parentNode) {
+            params = (this.parentNode as any)?.__removeIntegration?.(this);
+        }
+        return params;
+    }
+    /**
+     * 设置微应用
+     */
+    setMicroApp(microApp: MicroApp) {
+        microApp._delete();
+        const relationOptions = { parentNode: this, parentKey: 'microApp' };
+        Object.assign(microApp, relationOptions);
+        const object = {
+            microApp,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
+    
+
+    
+
+    /**
+    * 删除微应用
+    * @param name 微应用名称
+    */
+    removeMicroApp(name: string): void;
+
+    /**
+     * 删除微应用
+     * @param microApp 已有的微应用实例
+     */
+    removeMicroApp(microApp: MicroApp): void;
+
+    removeMicroApp(options: string | MicroApp) {
+        let microApp: MicroApp;
+        if (typeof options === 'string') {
+            microApp = this.microApp;
+            if (!microApp) {
+                throw new Error('找不到微应用 ' + options);
+            }
+        } else {
+            microApp = options;
+        }
+        return microApp.delete();
+    }
+
+    __removeMicroApp(microApp: MicroApp) {
+        const parentKey = microApp.parentKey;
+        const params: Params = {
+            parentNode: this,
+            parentKey,
+            index: -1,
+            object: null,
+            oldObject: microApp,
+        };
+        if (parentKey) {
+            params.parentKey = parentKey;
+            if (Array.isArray((this as any)[parentKey])) {
+                const index = (this as any)[parentKey].indexOf(microApp);
+                ~index && (this as any)[parentKey].splice(index, 1);
+                params.index = index;
+            } else if ((this as any)[parentKey] === microApp) {
+                params.index = 0;
+                (this as any)[parentKey] = undefined;
+            }
+        }
+        return params;
+    }
+
+    //================================================================================
+    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+    // 自动生成的代码已结束。下面可以手动编写。
+    //================================================================================
+
+    /**
+     * 获取添加时的默认选项
+     * @returns
+     */
+    public static getDefaultOptions(): any {
+        return {
+            concept: 'Integration',
+            microApp: {
+                concept: 'MicroApp',
+            },
+        };
+    }
+
+    //================================================================================
+    // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+    // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+    //================================================================================
+}
+
+classMap.Integration = Integration;
+export default Integration;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/JavaLogic__.ts

@@ -0,0 +1,129 @@
+import { TranslatorState, indent } from '../translator';
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 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';
+import LogicItem from './LogicItem__';
+
+/**
+ * Java 扩展逻辑
+ */
+@concept('Java 扩展逻辑')
+export class JavaLogic extends LogicItem {
+    /**
+     * 产品概念
+     */
+    @property()
+    concept: 'JavaLogic' = 'JavaLogic';
+
+    /**
+     * packageName
+     */
+    @property()
+    packageName: string = undefined;
+
+    /**
+     * className
+     */
+    @property()
+    className: string = undefined;
+
+    /**
+     * 代码内容
+     */
+    @property()
+    code: string = undefined;
+
+    
+
+    /**
+     * @param source 需要合并的部分参数
+     */
+    constructor(source?: Partial<JavaLogic>) {
+        source = Object.assign({}, JavaLogic.getDefaultOptions(), source);
+        super(source);
+        super.subConstructor(source);
+    }
+    getClassName() {
+        return 'JavaLogic';
+    }
+
+    static from(source: any, parentNode?: any, parentKey?: string): JavaLogic {
+        return super.from(source, parentNode, parentKey) as JavaLogic;
+    }
+
+    
+    /**
+     * 设置代码内容
+     */
+    setCode(code: string) {
+        const object = {
+            code,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
+    
+
+    
+
+    //================================================================================
+    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+    // 自动生成的代码已结束。下面可以手动编写。
+    //================================================================================
+
+    /**
+     * 生成 TS 宿主语言代码
+     * @param state 编译状态
+     * @returns 生成的代码
+     */
+    toEmbeddedTS(state?: TranslatorState): string {
+        let code = '';
+        const ret = this.logic.returns[0];
+        if (ret) {
+            code += indent((state?.tabSize || 0)) + 'return ' + ret.name + ';';
+        } else {
+            code += indent((state?.tabSize || 0)) + 'return;';
+        }
+        return code;
+    }
+
+    setPackageName(packageName: string) {
+        const object = {
+            packageName,
+        };
+        this.update({
+            ...object
+        });
+    }
+    
+    setClassName(className: string) {
+        const object = {
+            className,
+        };
+        this.update({
+            ...object
+        });
+    }
+
+    //================================================================================
+    // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+    // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+    //================================================================================
+}
+
+classMap.JavaLogic = JavaLogic;
+export default JavaLogic;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/LogicItem__.ts

@@ -31,7 +31,7 @@ export class LogicItem extends BaseNode {
      * 产品概念
      */
     @property()
-    concept: 'LogicItem' | 'Abort' | 'Start' | 'End' | 'IfStatement' | 'SwitchStatement' | 'SwitchCase' | 'ForEachStatement' | 'WhileStatement' | 'Assignment' | 'BatchAssignment' | 'Comment' | 'CallLogic' | 'CallFunction' | 'CallInterface' | 'Destination' | 'ExternalDestination' | 'ValidationRule' | 'Argument' | 'Anchor' | 'JSBlock' | 'Identifier' | 'NullLiteral' | 'BooleanLiteral' | 'StringLiteral' | 'StringInterpolation' | 'NumericLiteral' | 'BinaryExpression' | 'MatchCase' | 'Match' | 'UnaryExpression' | 'MemberExpression' | 'Unparsed' | 'New' | 'NewComposite' | 'NewList' | 'NewMap' | 'CallQueryComponent' | 'QueryFromExpression' | 'QueryJoinExpression' | 'QueryFieldExpression' | 'QueryAggregateExpression' | 'QueryOrderByExpression' | 'QueryGroupByExpression' | 'QuerySelectExpression' | 'QueryLimitExpression' | 'SqlQueryComponent' | 'OqlQueryComponent' | 'ProcessOutcome' | 'Assignee' | 'ProcessOutcomes' = 'LogicItem';
+    concept: 'LogicItem' | 'Abort' | 'Start' | 'End' | 'IfStatement' | 'SwitchStatement' | 'SwitchCase' | 'ForEachStatement' | 'WhileStatement' | 'Assignment' | 'BatchAssignment' | 'Comment' | 'CallLogic' | 'CallFunction' | 'CallInterface' | 'Destination' | 'ExternalDestination' | 'ValidationRule' | 'Argument' | 'Anchor' | 'JSBlock' | 'JavaLogic' | 'Identifier' | 'NullLiteral' | 'BooleanLiteral' | 'StringLiteral' | 'StringInterpolation' | 'NumericLiteral' | 'BinaryExpression' | 'MatchCase' | 'Match' | 'UnaryExpression' | 'MemberExpression' | 'Unparsed' | 'New' | 'NewComposite' | 'NewList' | 'NewMap' | 'CallQueryComponent' | 'QueryFromExpression' | 'QueryJoinExpression' | 'QueryFieldExpression' | 'QueryAggregateExpression' | 'QueryOrderByExpression' | 'QueryGroupByExpression' | 'QuerySelectExpression' | 'QueryLimitExpression' | 'SqlQueryComponent' | 'OqlQueryComponent' | 'ProcessOutcome' | 'Assignee' | 'ProcessOutcomes' = 'LogicItem';
 
     /**
      * 逻辑项标题