@lcap/nasl 3.4.0-beta.6 → 3.5.0-alpha.1

package/out/concepts/TriggerEvent__.js

@@ -1,33 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -35,32 +12,11 @@ var TriggerEvent_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TriggerEvent = void 0;
 const decorators_1 = require("../decorators");
-const utils = __importStar(require("../utils"));
 const BaseNode_1 = __importDefault(require("../common/BaseNode"));
-const TypeAnnotation__1 = __importDefault(require("./TypeAnnotation__"));
 /**
  * 触发器事件
  */
-let TriggerEvent = TriggerEvent_1 = 
-// @ts-ignore
-class TriggerEvent extends BaseNode_1.default {
-    /** 类名 */
-    static ConceptName = 'TriggerEvent';
-    /** 继承链 */
-    static inheritanceChain = ['BaseNode'];
-    /**
-     * 产品概念
-     */
-    concept;
-    /**
-     * 触发器事件名称
-     */
-    // @ts-ignore
-    name;
-    /**
-     * 类型标注列表
-     */
-    callBackLogic = [];
+let TriggerEvent = TriggerEvent_1 = class TriggerEvent extends BaseNode_1.default {
     /**
      * @param source 需要合并的部分参数
      */
@@ -96,9 +52,12 @@ class TriggerEvent extends BaseNode_1.default {
         });
     }
     /**
-     * 设置类型标注列表
+     * 设置类型标注
      */
     setCallBackLogic(callBackLogic) {
+        callBackLogic._delete();
+        const relationOptions = { parentNode: this, parentKey: 'callBackLogic' };
+        Object.assign(callBackLogic, relationOptions);
         const object = {
             callBackLogic,
         };
@@ -106,80 +65,18 @@ class TriggerEvent extends BaseNode_1.default {
             ...object,
         });
     }
-    getTypeAnnotationExistingNames(excludedList = []) {
-        const excludedSet = new Set(excludedList);
-        return (this.callBackLogic || [])
-            .filter((item) => !excludedSet.has(item))
-            .map((item) => item?.name);
-    }
-    getTypeAnnotationUniqueName(name = 'typeAnnotation1') {
-        return utils.unique(name, this.getTypeAnnotationExistingNames(), undefined, false);
-    }
-    _insertTypeAnnotationAt(options, index) {
-        const typeAnnotationOptions = {};
-        const relationOptions = { parentNode: this, parentKey: 'callBackLogic' };
-        let typeAnnotation;
-        if (!options) {
-            typeAnnotation = TypeAnnotation__1.default.from({
-                ...typeAnnotationOptions,
-                name: this.getTypeAnnotationUniqueName(),
-            }, this, 'callBackLogic');
-        }
-        else if (typeof options === 'string') {
-            typeAnnotation = TypeAnnotation__1.default.from({
-                ...typeAnnotationOptions,
-                name: options,
-            }, this, 'callBackLogic');
-        }
-        else if (options instanceof TypeAnnotation__1.default) {
-            options.ensureDelete(); // 同一实例不支持多处存在
-            typeAnnotation = options;
-            Object.assign(typeAnnotation, relationOptions);
-        }
-        else {
-            typeAnnotation = TypeAnnotation__1.default.from({
-                ...typeAnnotationOptions,
-                ...options,
-            }, this, 'callBackLogic');
-        }
-        this.callBackLogic.splice(index, 0, typeAnnotation);
-        return typeAnnotation;
-    }
-    insertTypeAnnotationAt(options, index) {
-        const node = this._insertTypeAnnotationAt(options, index);
-        node.create({
-            index,
-            parentNode: this,
-            parentKey: 'callBackLogic',
-        });
-        return node;
-    }
-    _addTypeAnnotation(options) {
-        const index = this.callBackLogic.length;
-        return this._insertTypeAnnotationAt(options, index);
-    }
-    addTypeAnnotation(options) {
-        const node = this._addTypeAnnotation(options);
-        const index = this.callBackLogic.indexOf(node);
-        node.create({
-            index,
-            parentNode: this,
-            parentKey: 'callBackLogic',
-        });
-        return node;
-    }
-    removeTypeAnnotation(options) {
-        let typeAnnotation;
+    removeCallBackLogic(options) {
+        let callBackLogic;
         if (typeof options === 'string') {
-            typeAnnotation = this.callBackLogic.find((item) => item.name === options);
-            if (!typeAnnotation) {
+            callBackLogic = this.callBackLogic;
+            if (!callBackLogic) {
                 throw new Error('找不到类型标注 ' + options);
             }
         }
         else {
-            typeAnnotation = options;
+            callBackLogic = options;
         }
-        return typeAnnotation.delete();
+        return callBackLogic.delete();
     }
     __removeTypeAnnotation(typeAnnotation) {
         const parentKey = typeAnnotation.parentKey;
@@ -213,6 +110,10 @@ class TriggerEvent extends BaseNode_1.default {
         return params;
     }
 };
+/** 类名 */
+TriggerEvent.ConceptName = 'TriggerEvent';
+/** 继承链 */
+TriggerEvent.inheritanceChain = ['BaseNode'];
 __decorate([
     (0, decorators_1.property)('concept')
 ], TriggerEvent.prototype, "concept", void 0);
@@ -222,14 +123,10 @@ __decorate([
 __decorate([
     (0, decorators_1.property)({
         objectRef: 'TypeAnnotation',
-        isArray: true,
-        defaultValue: [],
     })
 ], TriggerEvent.prototype, "callBackLogic", void 0);
 TriggerEvent = TriggerEvent_1 = __decorate([
-    decorators_1.className,
     (0, decorators_1.concept)('触发器事件')
-    // @ts-ignore
 ], TriggerEvent);
 exports.TriggerEvent = TriggerEvent;
 exports.default = TriggerEvent;

package/out/concepts/TriggerEvent__.js.map

@@ -1 +1 @@
-{"version":3,"file":"TriggerEvent__.js","sourceRoot":"","sources":["../../src/concepts/TriggerEvent__.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TriggerEvent__.js","sourceRoot":"","sources":["../../src/concepts/TriggerEvent__.ts"],"names":[],"mappings":"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"}

package/out/concepts/TriggerLauncher__.d.ts

@@ -1,16 +1,16 @@
 import type { EmbeddedTSFileGenerator } from '../utils';
 import { TranslatorState, TranslatorGenerator } from '../translator';
-import Identifier from './Identifier__';
+import type Identifier from './Identifier__';
 import { Params } from '../common/EventEmitter';
 import BaseNode from '../common/BaseNode';
-import Module from './Module__';
-import App from './App__';
+import type Module from './Module__';
+import type App from './App__';
 /**
  * 触发器启动器
  */
 export declare class TriggerLauncher extends BaseNode {
     /** 类名 */
-    static readonly ConceptName = "TriggerLauncher";
+    static readonly ConceptName: string;
     /** 继承链 */
     static readonly inheritanceChain: string[];
     /**

package/out/concepts/TriggerLauncher__.js

@@ -17,37 +17,15 @@ const BaseNode_1 = __importDefault(require("../common/BaseNode"));
 /**
  * 触发器启动器
  */
-let TriggerLauncher = TriggerLauncher_1 = 
-// @ts-ignore
-class TriggerLauncher extends BaseNode_1.default {
-    /** 类名 */
-    static ConceptName = 'TriggerLauncher';
-    /** 继承链 */
-    static inheritanceChain = ['BaseNode'];
+let TriggerLauncher = TriggerLauncher_1 = class TriggerLauncher extends BaseNode_1.default {
     /**
-     * 产品概念
-     */
-    concept;
-    /**
-     * 触发器启动器名称
-     */
-    // @ts-ignore
-    name;
-    /**
-     * calleeNamespace
-     */
-    // @ts-ignore
-    calleeNamespace;
-    /**
-     * calleeName
-     */
-    // @ts-ignore
-    calleeName;
-    /**
-     * callBackLogic
+     * @param source 需要合并的部分参数
      */
-    // @ts-ignore
-    callBackLogic;
+    constructor(source) {
+        source = Object.assign({}, TriggerLauncher_1.getDefaultOptions(), source);
+        super(source);
+        super.subConstructor(source);
+    }
     /**
      * 祖先 Module
      */
@@ -60,14 +38,6 @@ class TriggerLauncher extends BaseNode_1.default {
     get app() {
         return this.getAncestor('App');
     }
-    /**
-     * @param source 需要合并的部分参数
-     */
-    constructor(source) {
-        source = Object.assign({}, TriggerLauncher_1.getDefaultOptions(), source);
-        super(source);
-        super.subConstructor(source);
-    }
     static from(source, parentNode, parentKey) {
         return super.from(source, parentNode, parentKey);
     }
@@ -193,6 +163,10 @@ class TriggerLauncher extends BaseNode_1.default {
         return `${TriggerLauncher_1.getEmbeddedFileBasePath(this.app)}${name}.ts`;
     }
 };
+/** 类名 */
+TriggerLauncher.ConceptName = 'TriggerLauncher';
+/** 继承链 */
+TriggerLauncher.inheritanceChain = ['BaseNode'];
 __decorate([
     (0, decorators_1.property)('concept')
 ], TriggerLauncher.prototype, "concept", void 0);
@@ -212,9 +186,7 @@ __decorate([
     translator_1.withSourceMapGenerator
 ], TriggerLauncher.prototype, "toEmbeddedTS", null);
 TriggerLauncher = TriggerLauncher_1 = __decorate([
-    decorators_1.className,
     (0, decorators_1.concept)('触发器启动器')
-    // @ts-ignore
 ], TriggerLauncher);
 exports.TriggerLauncher = TriggerLauncher;
 exports.default = TriggerLauncher;

package/out/concepts/TriggerLauncher__.js.map

@@ -1 +1 @@
-{"version":3,"file":"TriggerLauncher__.js","sourceRoot":"","sources":["../../src/concepts/TriggerLauncher__.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TriggerLauncher__.js","sourceRoot":"","sources":["../../src/concepts/TriggerLauncher__.ts"],"names":[],"mappings":"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"}

package/out/concepts/TypeAnnotation__.d.ts

@@ -1,5 +1,5 @@
-import App from './App__';
-import Structure from './Structure__';
+import type App from './App__';
+import type Structure from './Structure__';
 import { TranslatorState, TranslatorGenerator } from '../translator';
 export declare enum PRIMITIVE_TYPE {
     Boolean = "Boolean",
@@ -28,14 +28,15 @@ export declare const GENERIC_DESC: Record<string, string>;
  */
 export declare function isUnion(typeAnnotation: TypeAnnotation): boolean;
 import { Params } from '../common/EventEmitter';
+import * as types from './utils/types';
 import BaseNode from '../common/BaseNode';
-import StructureProperty from './StructureProperty__';
+import type StructureProperty from './StructureProperty__';
 /**
  * 类型标注
  */
 export declare class TypeAnnotation extends BaseNode {
     /** 类名 */
-    static readonly ConceptName = "TypeAnnotation";
+    static readonly ConceptName: string;
     /** 继承链 */
     static readonly inheritanceChain: string[];
     /**
@@ -273,8 +274,8 @@ export declare class TypeAnnotation extends BaseNode {
      */
     setTypeNamespace(typeNamespace: string): void;
     get tsCalleeNamespace(): string;
-    get integration(): import("./types__").SyntaxNode;
-    get connector(): import("./types__").SyntaxNode;
+    get integration(): types.SyntaxNode;
+    get connector(): types.SyntaxNode;
     toVue(state?: TranslatorState): string;
     toJS(state?: TranslatorState): string;
     toEmbeddedTS(state?: TranslatorState): TranslatorGenerator;

package/out/concepts/TypeAnnotation__.js

@@ -117,65 +117,36 @@ function isUnion(typeAnnotation) {
 exports.isUnion = isUnion;
 const decorators_1 = require("../decorators");
 const utils = __importStar(require("../utils"));
+const asserts = __importStar(require("./utils/asserts"));
 const BaseNode_1 = __importDefault(require("../common/BaseNode"));
-const StructureProperty__1 = __importDefault(require("./StructureProperty__"));
 /**
  * 类型标注
  */
-let TypeAnnotation = TypeAnnotation_1 = 
-// @ts-ignore
-class TypeAnnotation extends BaseNode_1.default {
-    /** 类名 */
-    static ConceptName = 'TypeAnnotation';
-    /** 继承链 */
-    static inheritanceChain = ['BaseNode'];
-    /**
-     * 产品概念
-     */
-    concept;
-    /**
-     * 类型种类
-     */
-    // @ts-ignore
-    typeKind;
-    /**
-     * 类型命名空间
-     */
-    // @ts-ignore
-    typeNamespace;
-    /**
-     * 类型名称
-     */
-    // @ts-ignore
-    typeName;
-    /**
-     * 类型参数
-     */
-    typeArguments = null;
-    /**
-     * 返回类型
-     */
-    returnType = null;
-    /**
-     * 是否是推断出来的
-     */
-    // @ts-ignore
-    inferred;
-    /**
-     * 匿名数据结构属性
-     */
-    properties = null;
-    /**
-     * 规则对象
-     */
-    // @ts-ignore
-    ruleMap;
+let TypeAnnotation = TypeAnnotation_1 = class TypeAnnotation extends BaseNode_1.default {
     /**
      * @param source 需要合并的部分参数
      */
     constructor(source) {
         source = Object.assign({}, TypeAnnotation_1.getDefaultOptions(), source);
         super(source);
+        /**
+         * 类型参数
+         */
+        this.typeArguments = null;
+        /**
+         * 返回类型
+         */
+        this.returnType = null;
+        /**
+         * 匿名数据结构属性
+         */
+        this.properties = null;
+        //================================================================================
+        // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+        // 自动生成的代码已结束。下面可以手动编写。
+        //================================================================================
+        // 兼容 long 需要显示为 long 的情况，默认 undefined
+        this.longNotInteger = undefined;
         super.subConstructor(source);
     }
     static from(source, parentNode, parentKey) {
@@ -206,14 +177,15 @@ class TypeAnnotation extends BaseNode_1.default {
     _insertTypeAnnotationInTypeArgumentsAt(options, index) {
         const typeAnnotationOptions = {};
         const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
+        const TypeAnnotation = (0, decorators_1.getConceptConstructor)('TypeAnnotation');
         let typeAnnotation;
-        if (options instanceof TypeAnnotation_1) {
+        if (asserts.isTypeAnnotation(options)) {
             options.ensureDelete(); // 同一实例不支持多处存在
             typeAnnotation = options;
             Object.assign(typeAnnotation, relationOptions);
         }
         else {
-            typeAnnotation = TypeAnnotation_1.from({
+            typeAnnotation = TypeAnnotation.from({
                 ...typeAnnotationOptions,
                 ...options,
             }, this, 'typeArguments');
@@ -247,14 +219,15 @@ class TypeAnnotation extends BaseNode_1.default {
     _insertTypeAnnotationInReturnTypeAt(options, index) {
         const typeAnnotationOptions = {};
         const relationOptions = { parentNode: this, parentKey: 'returnType' };
+        const TypeAnnotation = (0, decorators_1.getConceptConstructor)('TypeAnnotation');
         let typeAnnotation;
-        if (options instanceof TypeAnnotation_1) {
+        if (asserts.isTypeAnnotation(options)) {
             options.ensureDelete(); // 同一实例不支持多处存在
             typeAnnotation = options;
             Object.assign(typeAnnotation, relationOptions);
         }
         else {
-            typeAnnotation = TypeAnnotation_1.from({
+            typeAnnotation = TypeAnnotation.from({
                 ...typeAnnotationOptions,
                 ...options,
             }, this, 'returnType');
@@ -288,14 +261,15 @@ class TypeAnnotation extends BaseNode_1.default {
     _insertStructurePropertyAt(options, index) {
         const structurePropertyOptions = {};
         const relationOptions = { parentNode: this, parentKey: 'properties' };
+        const StructureProperty = (0, decorators_1.getConceptConstructor)('StructureProperty');
         let structureProperty;
-        if (options instanceof StructureProperty__1.default) {
+        if (asserts.isStructureProperty(options)) {
             options.ensureDelete(); // 同一实例不支持多处存在
             structureProperty = options;
             Object.assign(structureProperty, relationOptions);
         }
         else {
-            structureProperty = StructureProperty__1.default.from({
+            structureProperty = StructureProperty.from({
                 ...structurePropertyOptions,
                 ...options,
             }, this, 'properties');
@@ -400,12 +374,6 @@ class TypeAnnotation extends BaseNode_1.default {
         }
         return params;
     }
-    //================================================================================
-    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-    // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
-    // 兼容 long 需要显示为 long 的情况，默认 undefined
-    longNotInteger = undefined;
     toUI(state, hideDetails) {
         return this.headTitle;
     }
@@ -966,7 +934,7 @@ class TypeAnnotation extends BaseNode_1.default {
     }
     // 增加插入泛型子类型
     typeArgumentsPush(typeItem) {
-        if (typeItem instanceof TypeAnnotation_1) {
+        if (asserts.isTypeAnnotation(typeItem)) {
             this.typeArguments.push(TypeAnnotation_1.from(typeItem, {
                 parentNode: this,
                 parentKey: 'typeArguments',
@@ -1002,13 +970,19 @@ class TypeAnnotation extends BaseNode_1.default {
         typeAnnotation.typeArguments;
         const typeAnnotation1 = this.toJSON();
         const typeAnnotation2 = typeAnnotation.toJSON();
+        const ignoreNull = (key, value) => {
+            if (value === null || value === undefined) {
+                return undefined; // 忽略此属性
+            }
+            return value; // 其他情况下返回原始值
+        };
         if (typeAnnotation1.typeArguments) {
             typeAnnotation1.typeArguments = this.sortedTypeKey;
         }
         if (typeAnnotation2.typeArguments) {
             typeAnnotation2.typeArguments = typeAnnotation?.sortedTypeKey;
         }
-        return JSON.stringify(typeAnnotation1) === JSON.stringify(typeAnnotation2);
+        return JSON.stringify(typeAnnotation1, ignoreNull) === JSON.stringify(typeAnnotation2, ignoreNull);
     }
     // 是否是系统类型
     isSystemType() {
@@ -1060,6 +1034,10 @@ class TypeAnnotation extends BaseNode_1.default {
         return result;
     }
 };
+/** 类名 */
+TypeAnnotation.ConceptName = 'TypeAnnotation';
+/** 继承链 */
+TypeAnnotation.inheritanceChain = ['BaseNode'];
 __decorate([
     (0, decorators_1.property)('concept')
 ], TypeAnnotation.prototype, "concept", void 0);
@@ -1106,9 +1084,7 @@ __decorate([
     (0, translator_1.withSourceMap)()
 ], TypeAnnotation.prototype, "toNaturalTS", null);
 TypeAnnotation = TypeAnnotation_1 = __decorate([
-    decorators_1.className,
     (0, decorators_1.concept)('类型标注')
-    // @ts-ignore
 ], TypeAnnotation);
 exports.TypeAnnotation = TypeAnnotation;
 exports.default = TypeAnnotation;