@lcap/nasl 2.20.0-beta.3 → 2.20.0

package/src/templator/genSelectBlock.ts

@@ -82,7 +82,7 @@ export function genLoadSelectLogic(entity: Entity, nameGroup: NameGroup, newLogi
 export function genSelectBlock(entity: Entity, oldNode: ViewElement) {
     const view = oldNode.view;
     const dataSource = entity.parentNode as DataSource;
-    const module = dataSource.parentNode as App | Module | Namespace;
+    const module = dataSource.app;
 
     const viewElementMainView = view.getViewElementUniqueName('select');
     const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView, false);

package/src/templator/genTableBlock.ts

@@ -28,7 +28,7 @@ export function genTableColumnTemplate(property: EntityProperty, currentName: st
         const relationLowerEntityName = utils.firstLowerCase(property.relationEntity);
         const relationEntity = dataSource?.findEntityByName(property.relationEntity);
         const displayedProperty = getFirstDisplayedProperty(relationEntity);
-        valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`; 
+        valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`;
     }
 
     const getText = (property: EntityProperty) => {
@@ -179,7 +179,7 @@ export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
 export function genTableBlock(entity: Entity, oldNode: ViewElement) {
     const view = oldNode.view;
     const dataSource = entity.parentNode as DataSource;
-    const module = dataSource.parentNode as App | Module | Namespace;
+    const module = dataSource.app;
 
     const viewElementMainView = view.getViewElementUniqueName('tableView');
     const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
@@ -228,7 +228,7 @@ export function genTableColumnBlock(property: EntityProperty, oldNode: ViewEleme
     const view = oldNode.view;
     const entity = property.entity;
     const dataSource = entity.parentNode as DataSource;
-    const module = dataSource.parentNode as App | Module | Namespace;
+    const module = dataSource.app;
 
     const viewElementMainView = view.getViewElementUniqueName('tableView');
     const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);

package/src/templator/genUpdateBlock.ts

@@ -16,7 +16,6 @@ import {
 
 export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
     const dataSource = entity.parentNode as DataSource;
-    const module = dataSource.parentNode as App | Module | Namespace;
     const properties = entity.properties.filter(filterProperty('inForm'));
 
     return `<u-form ref="${nameGroup.viewElementMainView}">
@@ -96,7 +95,7 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
 
 export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
     const dataSource = entity.parentNode as DataSource;
-    const module = dataSource.parentNode as App | Module | Namespace;
+    const module = dataSource.app;
     const properties = entity.properties.filter(filterProperty('inForm'));
 
     return `<van-form ref="${nameGroup.viewElementMainView}">
@@ -264,7 +263,7 @@ function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
 export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
     const view = oldNode.view;
     const dataSource = entity.parentNode as DataSource;
-    const module = dataSource.parentNode as App | Module | Namespace;
+    const module = dataSource.app;
     const ns = entity.ns;
     const getLogic = ns?.logics?.find((logic) => logic.name === `get`);
     const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);

package/src/utils/traverse.ts

@@ -25,6 +25,14 @@ export interface TraverseOptions {
     excludedKeySet?: Set<string>;
 }
 
+const EXCLUDE_RULES = [
+    /^__.*__$/,
+]
+
+function isExcludeProperty(propertyName: string) {
+    return EXCLUDE_RULES.some(r => r.test(propertyName));
+}
+
 function handleNext<T extends INode>(func: (next: INodeInfo<T>) => any, current: INodeInfo<T>, options?: TraverseOptions) {
     if (options.mode === 'onlyChildren') {
         const list = current.node && current.node.children;
@@ -51,7 +59,7 @@ function handleNext<T extends INode>(func: (next: INodeInfo<T>) => any, current:
         }
     } else if (options.mode === 'onlyArray') {
         for (const key in current.node) {
-            if (!current.node.hasOwnProperty(key) || options.excludedKeySet.has(key))
+            if (!current.node.hasOwnProperty(key) || options.excludedKeySet.has(key) || isExcludeProperty(key))
                 continue;
             const value = current.node[key];
             if (!Array.isArray(value))
@@ -79,7 +87,7 @@ function handleNext<T extends INode>(func: (next: INodeInfo<T>) => any, current:
         }
     } else if (options.mode === 'anyObject') {
         for (const key in current.node) {
-            if (!current.node.hasOwnProperty(key) || options.excludedKeySet.has(key))
+            if (!current.node.hasOwnProperty(key) || options.excludedKeySet.has(key) || isExcludeProperty(key))
                 continue;
             const value = current.node[key];
             if (Array.isArray(value)) {

package/ts-worker/lib/tsserver.js

@@ -171847,6 +171847,9 @@ var ts;
             ProjectService.prototype.doEnsureDefaultProjectForFile = function (fileName) {
                 this.ensureProjectStructuresUptoDate();
                 var scriptInfo = this.getScriptInfoForNormalizedPath(fileName);
+                if (!scriptInfo) {
+                    console.log(fileName);
+                }
                 return scriptInfo ? scriptInfo.getDefaultProject() : (this.logErrorForScriptInfoNotFound(fileName), server.Errors.ThrowNoProject());
             };
             ProjectService.prototype.getScriptInfoEnsuringProjectsUptoDate = function (uncheckedFileName) {
@@ -176745,7 +176748,7 @@ var ts;
                     if (left) {
                         typeInfo.typeNamespace = analyzeTypeNameSpace(left);
                     }
-                } else if(Array.isArray(types)) {
+                } else if (Array.isArray(types)) {
                     typeInfo.typeName = 'Union';
                 } else {
                     typeInfo.typeKind = 'anonymousStructure';
@@ -176897,7 +176900,10 @@ var ts;
                             }
                         }
                     }
-                } else if (flags === 2048 /* SymbolFlags.TypeLiteral */) {
+                } else if ([
+                    2048/* SymbolFlags.TypeLiteral */,
+                    4096 /* SymbolFlags.ObjectLiteral */
+                ].includes(flags)) {
                     if (objectFlags & 16 /* ObjectFlags.Anonymous */) {
                         const typeNode = typeChecker.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(typeFlags) | 70221824 /* NodeBuilderFlags.IgnoreErrors */ | 0);
                         const { members } = typeNode || {};
@@ -176981,6 +176987,8 @@ var ts;
                     206, /* SyntaxKind.PropertyAccessExpression */
                     208, /* SyntaxKind.CallExpression */
                     209, /* SyntaxKind.NewExpression */
+                    212, /* SyntaxKind.ParenthesizedExpression */
+                    213, /* SyntaxKind.FunctionExpression */
                 ].includes(node.kind)) {
                     const result = ts.isCallLikeExpression(node);
                     if (result) {

package/ts-worker/package.json

@@ -1,4 +1,5 @@
 {
+    "version": "1.0.0",
     "scripts": {
         "file-server": "node server/file-server",
         "dev": "webpack serve",

package/ts-worker/webpack.config.js

@@ -1,5 +1,7 @@
 const path = require('path');
 // const HtmlWebpackPlugin = require('html-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
+const pkg = require('./package.json');
 
 module.exports = {
     //mode: 'development',
@@ -8,8 +10,8 @@ module.exports = {
         bundle: './src/index.js',
     },
     output: {
-        path: path.resolve(__dirname, '../../../src/static/'),
-        filename: 'ts-worker.js',
+        path: path.resolve(__dirname, '../../../src/static/ts-worker'),
+        filename: `${pkg.version}.js`,
     },
     target: 'webworker',
     resolve: {
@@ -104,4 +106,11 @@ module.exports = {
             },
         },
     },
+    optimization: {
+        minimizer: [
+            new TerserPlugin({
+                extractComments: false,
+            }),
+        ],
+    },
 };

package/out/concepts/ConstructArgument__.d.ts

@@ -1,40 +0,0 @@
-import { TranslatorState } from '../translator';
-import { Params } from '../common/EventEmitter';
-import BaseNode from '../common/BaseNode';
-/**
- * 构造属性
- */
-export declare class ConstructArgument extends BaseNode {
-    /**
-     * 产品概念
-     */
-    concept: 'ConstructArgument';
-    /**
-     * keyword
-     */
-    keyword: string;
-    /**
-     * expressionIndex
-     */
-    expressionIndex: number;
-    /**
-     * @param source 需要合并的部分参数
-     */
-    constructor(source?: Partial<ConstructArgument>);
-    static from(source: any, parentNode?: any, parentKey?: string): ConstructArgument;
-    /**
-     * 从父级删除该节点
-     * @internal
-     */
-    _delete(): Params;
-    /**
-     * 设置keyword
-     */
-    setKeyword(keyword: string): void;
-    /**
-     * 设置expressionIndex
-     */
-    setExpressionIndex(expressionIndex: number): void;
-    toEmbeddedTS(state?: TranslatorState): string;
-}
-export default ConstructArgument;

package/out/concepts/ConstructArgument__.js

@@ -1,108 +0,0 @@
-"use strict";
-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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var ConstructArgument_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConstructArgument = void 0;
-const translator_1 = require("../translator");
-const decorators_1 = require("../decorators");
-const BaseNode_1 = __importDefault(require("../common/BaseNode"));
-const classMap_1 = __importDefault(require("../common/classMap"));
-/**
- * 构造属性
- */
-let ConstructArgument = ConstructArgument_1 = class ConstructArgument extends BaseNode_1.default {
-    /**
-     * 产品概念
-     */
-    concept = 'ConstructArgument';
-    /**
-     * keyword
-     */
-    keyword = undefined;
-    /**
-     * expressionIndex
-     */
-    expressionIndex = undefined;
-    /**
-     * @param source 需要合并的部分参数
-     */
-    constructor(source) {
-        source = Object.assign({}, ConstructArgument_1.getDefaultOptions(), source);
-        super(source);
-        super.subConstructor(source);
-    }
-    static from(source, parentNode, parentKey) {
-        return super.from(source, parentNode, parentKey);
-    }
-    /**
-     * 从父级删除该节点
-     * @internal
-     */
-    _delete() {
-        let params = null;
-        if (this.parentNode) {
-            params = this.parentNode?.__removeConstructArgument?.(this);
-        }
-        return params;
-    }
-    /**
-     * 设置keyword
-     */
-    setKeyword(keyword) {
-        const object = {
-            keyword,
-        };
-        this.update({
-            ...object,
-        });
-    }
-    /**
-     * 设置expressionIndex
-     */
-    setExpressionIndex(expressionIndex) {
-        const object = {
-            expressionIndex,
-        };
-        this.update({
-            ...object,
-        });
-    }
-    //================================================================================
-    // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-    // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
-    toEmbeddedTS(state) {
-        return '';
-    }
-};
-__decorate([
-    (0, decorators_1.property)()
-], ConstructArgument.prototype, "concept", void 0);
-__decorate([
-    (0, decorators_1.property)()
-], ConstructArgument.prototype, "keyword", void 0);
-__decorate([
-    (0, decorators_1.property)()
-], ConstructArgument.prototype, "expressionIndex", void 0);
-__decorate([
-    (0, translator_1.withSourceMap)()
-], ConstructArgument.prototype, "toEmbeddedTS", null);
-ConstructArgument = ConstructArgument_1 = __decorate([
-    (0, decorators_1.concept)('构造属性')
-], ConstructArgument);
-exports.ConstructArgument = ConstructArgument;
-classMap_1.default.ConstructArgument = ConstructArgument;
-exports.default = ConstructArgument;
-//================================================================================
-// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
-// 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
-//# sourceMappingURL=ConstructArgument__.js.map

package/out/concepts/ConstructArgument__.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ConstructArgument__.js","sourceRoot":"","sources":["../../src/concepts/ConstructArgument__.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,8CAA2E;AAQ3E,8CAAkE;AAIlE,kEAA0C;AAC1C,kEAA0C;AAG1C;;GAEG;AAEH,IAAa,iBAAiB,yBAA9B,MAAa,iBAAkB,SAAQ,kBAAQ;IAC3C;;OAEG;IAEH,OAAO,GAAwB,mBAAmB,CAAC;IAEnD;;OAEG;IAEH,OAAO,GAAW,SAAS,CAAC;IAE5B;;OAEG;IAEH,eAAe,GAAW,SAAS,CAAC;IAIpC;;OAEG;IACH,YAAY,MAAmC;QAC3C,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,mBAAiB,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;QAC1E,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,UAAgB,EAAE,SAAkB;QACzD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAsB,CAAC;IAC1E,CAAC;IAED;;;OAGG;IACH,OAAO;QACH,IAAI,MAAM,GAAW,IAAI,CAAC;QAC1B,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,MAAM,GAAI,IAAI,CAAC,UAAkB,EAAE,yBAAyB,EAAE,CAAC,IAAI,CAAC,CAAC;SACxE;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IACD;;OAEG;IACH,UAAU,CAAC,OAAe;QACtB,MAAM,MAAM,GAAG;YACX,OAAO;SACV,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,eAAuB;QACtC,MAAM,MAAM,GAAG;YACX,eAAe;SAClB,CAAC;QACF,IAAI,CAAC,MAAM,CAAC;YACR,GAAG,MAAM;SACZ,CAAC,CAAC;IACP,CAAC;IAMD,kFAAkF;IAClF,gEAAgE;IAChE,uBAAuB;IACvB,kFAAkF;IAElF,YAAY,CAAC,KAAuB;QAChC,OAAO,EAAE,CAAC;IACd,CAAC;CAKJ,CAAA;AAhFG;IADC,IAAA,qBAAQ,GAAE;kDACwC;AAMnD;IADC,IAAA,qBAAQ,GAAE;kDACiB;AAM5B;IADC,IAAA,qBAAQ,GAAE;0DACyB;AA6DpC;IADC,IAAA,0BAAa,GAAE;qDAGf;AAhFQ,iBAAiB;IAD7B,IAAA,oBAAO,EAAC,MAAM,CAAC;GACH,iBAAiB,CAqF7B;AArFY,8CAAiB;AAuF9B,kBAAQ,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;AAC/C,kBAAe,iBAAiB,CAAC;AACjC,kFAAkF;AAClF,gEAAgE;AAChE,uBAAuB;AACvB,kFAAkF"}

package/out/concepts/Construct__.d.ts

@@ -1,189 +0,0 @@
-import { TranslatorState } from '../translator';
-import { Params } from '../common/EventEmitter';
-import TypeAnnotation from './TypeAnnotation__';
-import ConstructArgument from './ConstructArgument__';
-import MemberExpression from './MemberExpression__';
-import LogicItem from './LogicItem__';
-/**
- * 构造器
- */
-export declare class Construct extends LogicItem {
-    /**
-     * 产品概念
-     */
-    concept: 'Construct';
-    /**
-     * 类型参数
-     */
-    typeArguments?: Array<TypeAnnotation>;
-    /**
-     * 构造属性
-     */
-    arguments: Array<ConstructArgument>;
-    /**
-     * 右边项
-     */
-    rightExpressions: Array<MemberExpression>;
-    /**
-     * @param source 需要合并的部分参数
-     */
-    constructor(source?: Partial<Construct>);
-    static from(source: any, parentNode?: any, parentKey?: string): Construct;
-    /**
-     * 设置右边项
-     */
-    setRightExpressions(rightExpressions: Array<MemberExpression>): void;
-    /**
-    * 插入类型标注
-    * @internal
-    * @param typeAnnotationOptions 类型标注参数
-    */
-    _insertTypeAnnotationAt(typeAnnotationOptions: Partial<TypeAnnotation>, index: number): TypeAnnotation;
-    /**
-    * 插入类型标注
-    * @internal
-    * @param typeAnnotation 已有的类型标注实例
-    */
-    _insertTypeAnnotationAt(typeAnnotation: TypeAnnotation, index: number): TypeAnnotation;
-    /**
-     * 插入类型标注
-     * @param typeAnnotationOptions 类型标注参数
-     */
-    insertTypeAnnotationAt(typeAnnotationOptions: Partial<TypeAnnotation>, index: number): TypeAnnotation;
-    /**
-     * 插入类型标注
-     * @param typeAnnotation 已有的类型标注实例
-     */
-    insertTypeAnnotationAt(typeAnnotation: TypeAnnotation, index: number): TypeAnnotation;
-    /**
-     * 添加类型标注
-     * @internal
-     * @param typeAnnotationOptions 类型标注参数
-     */
-    _addTypeAnnotation(typeAnnotationOptions: Partial<TypeAnnotation>): TypeAnnotation;
-    /**
-     * 添加类型标注
-     * @internal
-     * @param typeAnnotation 已有的类型标注实例
-     */
-    _addTypeAnnotation(typeAnnotation: TypeAnnotation): TypeAnnotation;
-    /**
-     * 添加类型标注
-     * @param typeAnnotationOptions 类型标注参数
-     */
-    addTypeAnnotation(typeAnnotationOptions: Partial<TypeAnnotation>): TypeAnnotation;
-    /**
-     * 添加类型标注
-     * @param typeAnnotation 已有的类型标注实例
-     */
-    addTypeAnnotation(typeAnnotation: TypeAnnotation): TypeAnnotation;
-    /**
-    * 插入构造属性
-    * @internal
-    * @param constructArgumentOptions 构造属性参数
-    */
-    _insertConstructArgumentAt(constructArgumentOptions: Partial<ConstructArgument>, index: number): ConstructArgument;
-    /**
-    * 插入构造属性
-    * @internal
-    * @param constructArgument 已有的构造属性实例
-    */
-    _insertConstructArgumentAt(constructArgument: ConstructArgument, index: number): ConstructArgument;
-    /**
-     * 插入构造属性
-     * @param constructArgumentOptions 构造属性参数
-     */
-    insertConstructArgumentAt(constructArgumentOptions: Partial<ConstructArgument>, index: number): ConstructArgument;
-    /**
-     * 插入构造属性
-     * @param constructArgument 已有的构造属性实例
-     */
-    insertConstructArgumentAt(constructArgument: ConstructArgument, index: number): ConstructArgument;
-    /**
-     * 添加构造属性
-     * @internal
-     * @param constructArgumentOptions 构造属性参数
-     */
-    _addConstructArgument(constructArgumentOptions: Partial<ConstructArgument>): ConstructArgument;
-    /**
-     * 添加构造属性
-     * @internal
-     * @param constructArgument 已有的构造属性实例
-     */
-    _addConstructArgument(constructArgument: ConstructArgument): ConstructArgument;
-    /**
-     * 添加构造属性
-     * @param constructArgumentOptions 构造属性参数
-     */
-    addConstructArgument(constructArgumentOptions: Partial<ConstructArgument>): ConstructArgument;
-    /**
-     * 添加构造属性
-     * @param constructArgument 已有的构造属性实例
-     */
-    addConstructArgument(constructArgument: ConstructArgument): ConstructArgument;
-    /**
-    * 插入成员表达式
-    * @internal
-    * @param memberExpressionOptions 成员表达式参数
-    */
-    _insertMemberExpressionAt(memberExpressionOptions: Partial<MemberExpression>, index: number): MemberExpression;
-    /**
-    * 插入成员表达式
-    * @internal
-    * @param memberExpression 已有的成员表达式实例
-    */
-    _insertMemberExpressionAt(memberExpression: MemberExpression, index: number): MemberExpression;
-    /**
-     * 插入成员表达式
-     * @param memberExpressionOptions 成员表达式参数
-     */
-    insertMemberExpressionAt(memberExpressionOptions: Partial<MemberExpression>, index: number): MemberExpression;
-    /**
-     * 插入成员表达式
-     * @param memberExpression 已有的成员表达式实例
-     */
-    insertMemberExpressionAt(memberExpression: MemberExpression, index: number): MemberExpression;
-    /**
-     * 添加成员表达式
-     * @internal
-     * @param memberExpressionOptions 成员表达式参数
-     */
-    _addMemberExpression(memberExpressionOptions: Partial<MemberExpression>): MemberExpression;
-    /**
-     * 添加成员表达式
-     * @internal
-     * @param memberExpression 已有的成员表达式实例
-     */
-    _addMemberExpression(memberExpression: MemberExpression): MemberExpression;
-    /**
-     * 添加成员表达式
-     * @param memberExpressionOptions 成员表达式参数
-     */
-    addMemberExpression(memberExpressionOptions: Partial<MemberExpression>): MemberExpression;
-    /**
-     * 添加成员表达式
-     * @param memberExpression 已有的成员表达式实例
-     */
-    addMemberExpression(memberExpression: MemberExpression): MemberExpression;
-    /**
-     * 删除类型标注
-     * @param typeAnnotation 已有的类型标注实例
-     */
-    removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
-    __removeTypeAnnotation(typeAnnotation: TypeAnnotation): Params;
-    /**
-     * 删除构造属性
-     * @param constructArgument 已有的构造属性实例
-     */
-    removeConstructArgument(constructArgument: ConstructArgument): void;
-    __removeConstructArgument(constructArgument: ConstructArgument): Params;
-    /**
-     * 删除成员表达式
-     * @param memberExpression 已有的成员表达式实例
-     */
-    removeMemberExpression(memberExpression: MemberExpression): void;
-    __removeLogicItem(logicItem: LogicItem): Params;
-    toJS(state?: TranslatorState): string;
-    toEmbeddedTS(state?: TranslatorState): string;
-}
-export default Construct;