@lcap/nasl 2.16.1 → 2.17.1

package/src/templator/genListViewBlock.ts

@@ -10,13 +10,13 @@ import {
 export function genListViewTemplate(property: EntityProperty, nameGroup: NameGroup) {
     const entity = property.entity;
     const lowerEntityName = utils.firstLowerCase(entity.name);
-    const scopeName = nameGroup.scopeName || 'scope';
+    const currentName = nameGroup.currentName || 'current';
 
-    const expression = getExpression(property, `${scopeName}.item.${lowerEntityName}.${property.name}`);
+    const expression = getExpression(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
     return `<u-list-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.viewVariableEntity}.${property.name}"
     value-field="${nameGroup.viewVariableEntity}.id" :pageable="true" :remote-paging="true">
-    <template #item="${scopeName}">
+    <template #item="${currentName}">
         <u-linear-layout>
             <u-text :text="${expression}"></u-text>
         </u-linear-layout>
@@ -27,13 +27,13 @@ export function genListViewTemplate(property: EntityProperty, nameGroup: NameGro
 export function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameGroup) {
     const entity = property.entity;
     const lowerEntityName = utils.firstLowerCase(entity.name);
-    const scopeName = nameGroup.scopeName || 'scope';
+    const currentName = nameGroup.currentName || 'current';
 
-    const expression = getExpression(property, `${scopeName}.item.${lowerEntityName}.${property.name}`);
+    const expression = getExpression(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
     return `<van-list-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.viewVariableEntity}.${property.name}"
     value-field="${nameGroup.viewVariableEntity}.id" pageable="auto-more" :remote-paging="true">
-    <template #item="${scopeName}">
+    <template #item="${currentName}">
         <van-cell :value="${expression}" isLink>
             <template #title>{{ ${expression} }}</template>
         </van-cell>
@@ -41,16 +41,14 @@ export function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameG
 </van-list-view>`;
 }
 
-export function genLoadListViewLogic(entity: Entity, nameGroup: NameGroup, newStructures: Array<any>, newLogics: Array<any>) {
+export function genLoadListViewLogic(entity: Entity, nameGroup: NameGroup, newLogics: Array<any>) {
     const parentNode = entity.parentNode as App | Module | Namespace;
 
     const moduleNode = entity.app;
     const moduleNamespace = moduleNode?.getNamespace();
 
     // Select 和 table 不一样，直接在内部产生了
-    const entityStructure = genQueryStructure([entity], nameGroup);
     const entityLogic = genQueryLogic([entity], nameGroup, false, false, parentNode);
-    newStructures.push(entityStructure);
     newLogics.push(entityLogic);
 
     return NaslNode.Logic({
@@ -64,12 +62,7 @@ export function genLoadListViewLogic(entity: Entity, nameGroup: NameGroup, newSt
         returns: [
             NaslNode.Return({
                 name: 'result',
-                typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
-                    NaslTypeAnnotation.Reference({
-                        typeNamespace: `${moduleNamespace}.structures`,
-                        typeName: nameGroup.structure,
-                    }),
-                ]),
+                typeAnnotation: null,
             }),
         ],
         variables: [] as Array<any>,
@@ -105,11 +98,10 @@ export function genListViewBlock(entity: Entity, oldNode: ViewElement, property:
     const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView, false);
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-    // 当前节点的scopeName
-    nameGroup.scopeName = oldNode.getScopeName();
+    // 当前节点的currentName
+    nameGroup.currentName = oldNode.getCurrentName();
     const displayedProperty = property || getFirstDisplayedProperty(entity);
 
-    const newStructures: Array<any> = [];
     const newLogics: Array<any> = [];
 
     return `<template>
@@ -119,11 +111,10 @@ export function genListViewBlock(entity: Entity, oldNode: ViewElement, property:
 <definition>
 {
     "viewLogics": [
-        ${JSON.stringify(genLoadListViewLogic(entity, nameGroup, newStructures, newLogics))}
+        ${JSON.stringify(genLoadListViewLogic(entity, nameGroup, newLogics))}
     ],
 
-    "logics": ${JSON.stringify(newLogics)},
-    "structures": ${JSON.stringify(newStructures)}
+    "logics": ${JSON.stringify(newLogics)}
 }
 </definition>
 `;

package/src/templator/genQueryComponent.ts

@@ -98,6 +98,19 @@ export function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGr
         }),
     });
     const where: any = supportFilter ? genWhereExpression(entity) : undefined;
+    const aStructureProperties = [NaslNode.StructureProperty({
+        name: utils.firstLowerCase(entity.name),
+        typeAnnotation: NaslTypeAnnotation.Reference({
+            typeNamespace: entity.getNamespace(),
+            typeName: entity.name,
+        }),
+    }), ...(allEntities.map((relationEntity) => (NaslNode.StructureProperty({
+        name: utils.firstLowerCase(relationEntity.name),
+        typeAnnotation: NaslTypeAnnotation.Reference({
+            typeNamespace: relationEntity.getNamespace(),
+            typeName: relationEntity.name,
+        }),
+    }))))];
     return NaslLogicItem.Assignment({
         left: NaslLogicItem.Identifier({
             name: 'result',
@@ -105,12 +118,7 @@ export function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGr
         right: NaslQueryExpression.CallQueryComponent({
             label: '数据查询',
             ideVersion: '2.11', // 2.11版本新创建的数据查询组件，返回类型将自动推断
-            typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
-                NaslTypeAnnotation.Reference({
-                    typeNamespace: `${moduleNamespace}.structures`,
-                    typeName: nameGroup.structure,
-                }),
-            ]),
+            typeAnnotation: NaslTypeAnnotation.AnonymousStructure(aStructureProperties),
             select: NaslQueryExpression.QuerySelectExpression({
                 label: '查询组件Select子句',
                 distinct: false,
@@ -168,12 +176,7 @@ export function genQueryLogic(allEntities: Array<Entity>, nameGroup: NameGroup,
         returns: [
             NaslNode.Return({
                 name: 'result',
-                typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
-                    NaslTypeAnnotation.Reference({
-                        typeNamespace: `${moduleNamespace}.structures`,
-                        typeName: nameGroup.structure,
-                    }),
-                ]),
+                typeAnnotation: null,
             }),
         ],
         variables: [] as Array<any>,

package/src/templator/genSelectBlock.ts

@@ -1,7 +1,7 @@
 import { config } from '../config';
 import * as utils from '../utils';
 import { App, Module, Namespace, Entity, EntityProperty, View, DataSource, ViewElement } from '../concepts';
-import { NameGroup, genUniqueQueryNameGroup, getFirstDisplayedProperty, genQueryLogic, genQueryStructure, genLogicParam } from '.';
+import { NameGroup, genUniqueQueryNameGroup, getFirstDisplayedProperty, genQueryLogic, genLogicParam } from '.';
 import {
     NaslUITypeAnnotation, NaslCollectionTypeAnnotation, NaslLogicItem,
     NaslTypeAnnotation, NaslNode,
@@ -52,12 +52,7 @@ export function genLoadSelectLogic(entity: Entity, nameGroup: NameGroup, newLogi
         returns: [
             NaslNode.Return({
                 name: 'result',
-                typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
-                    NaslTypeAnnotation.Reference({
-                        typeNamespace: `${moduleNamespace}.structures`,
-                        typeName: nameGroup.structure,
-                    }),
-                ]),
+                typeAnnotation: null,
             }),
         ],
         variables: [] as Array<any>,
@@ -100,9 +95,6 @@ export function genSelectBlock(entity: Entity, oldNode: ViewElement) {
         entity,
     ];
 
-    const newStructures: Array<any> = [
-        genQueryStructure(allEntities, nameGroup),
-    ];
     const newLogic = genQueryLogic(allEntities, nameGroup, false, false, module);
     const newLogics: Array<any> = [
         newLogic,
@@ -117,8 +109,7 @@ export function genSelectBlock(entity: Entity, oldNode: ViewElement) {
     "viewLogics": [
         ${JSON.stringify(genLoadSelectLogic(entity, nameGroup, newLogic))}
     ],
-    "logics": ${JSON.stringify(newLogics)},
-    "structures": ${JSON.stringify(newStructures)}
+    "logics": ${JSON.stringify(newLogics)}
 }
 </definition>
 `;

package/src/templator/genTableBlock.ts

@@ -9,7 +9,6 @@ import {
     getParamFromLogic,
     genCallComponentLogic,
     genQueryLogic,
-    genQueryStructure,
     genLogicParam,
 } from '.';
 import { NaslCoreTypeAnnotation, NaslCollectionTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
@@ -18,13 +17,12 @@ import { NaslCoreTypeAnnotation, NaslCollectionTypeAnnotation, NaslUITypeAnnotat
  * 根据实体属性生成表格列模板
  * @param property 实体属性
  */
-export function genTableColumnTemplate(property: EntityProperty, scope?: string) {
+export function genTableColumnTemplate(property: EntityProperty, currentName: string = 'current') {
     const entity = property.entity;
-    const scopeName = scope || 'scope';
 
     const dataSource = entity.parentNode as DataSource;
     const lowerEntityName = utils.firstLowerCase(entity.name);
-    let expression = `${scopeName}.item.${lowerEntityName}.${property.name}`;
+    let expression = `${currentName}.item.${lowerEntityName}.${property.name}`;
     const title = property.label || property.name;
 
     if (property.relationEntity) {
@@ -32,9 +30,9 @@ export function genTableColumnTemplate(property: EntityProperty, scope?: string)
         const relationEntity = dataSource?.findEntityByName(property.relationEntity);
         const displayedProperty = getFirstDisplayedProperty(relationEntity);
         // 有外键关联
-        expression = getExpression(property, `${scopeName}.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`);
+        expression = getExpression(property, `${currentName}.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`);
     } else {
-        expression = getExpression(property, `${scopeName}.item.${lowerEntityName}.${property.name}`);
+        expression = getExpression(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
     }
 
     const getText = (property: EntityProperty) => {
@@ -50,7 +48,7 @@ export function genTableColumnTemplate(property: EntityProperty, scope?: string)
 
     return `<u-table-view-column field="${lowerEntityName}.${property.name}">
     <template #title><u-text text="${title}"></u-text></template>
-    <template #cell="${scopeName}">
+    <template #cell="${currentName}">
         <u-linear-layout gap="small">
             ${getText(property)}
         </u-linear-layout>
@@ -64,7 +62,7 @@ export function genTableColumnTemplate(property: EntityProperty, scope?: string)
  * @param nameGroup 命名组
  */
 export function genTableTemplate(entity: Entity, nameGroup: NameGroup, modifyable?: boolean) {
-    const scopeName = nameGroup.scopeName || 'scope';
+    const currentName = nameGroup.currentName || 'current';
     const properties = entity.properties.filter(filterProperty('inTable'));
 
     return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
@@ -72,11 +70,11 @@ export function genTableTemplate(entity: Entity, nameGroup: NameGroup, modifyabl
         :pageable="true" :remote-paging="true" :show-sizer="true">
     <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template></u-table-view-column>
 
-    ${properties.map((property) => genTableColumnTemplate(property, scopeName) + '\n').join('')}
+    ${properties.map((property) => genTableColumnTemplate(property, currentName) + '\n').join('')}
 
     <u-table-view-column title="操作">
         <template #title><u-text text="操作"></u-text></template>
-        <template #cell="${scopeName}">
+        <template #cell="${currentName}">
             <u-linear-layout gap="small">
                 <u-link ${modifyable ? `@click="${nameGroup.viewLogicModify || 'modify'}"` : ''}>修改</u-link>
                 <u-link @click="${nameGroup.viewLogicRemove}">删除</u-link>
@@ -115,12 +113,7 @@ export function genTableLoadLogic(entity: Entity, nameGroup: NameGroup, newLogic
         returns: [
             NaslNode.Return({
                 name: 'result',
-                typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
-                    NaslTypeAnnotation.Reference({
-                        typeNamespace: `${moduleNamespace}.structures`,
-                        typeName: nameGroup.structure,
-                    }),
-                ]),
+                typeAnnotation: null,
             }),
         ],
         variables: [] as any[],
@@ -147,7 +140,7 @@ export function genTableLoadLogic(entity: Entity, nameGroup: NameGroup, newLogic
  */
 export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
     const lowerEntityName = utils.firstLowerCase(entity.name);
-    const scopeName = nameGroup.scopeName || 'scope';
+    const currentName = nameGroup.currentName || 'current';
 
     const ns = entity.ns;
     const deleteLogic = ns?.logics?.find((logic) => logic.name === 'delete');
@@ -169,7 +162,7 @@ export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
                     if (!paramFromLogic) {
                         paramFromLogic = getParamFromLogic(deleteLogic, 'id');
                     }
-                    return genLogicParam(paramFromLogic.name, `${scopeName}.item.${lowerEntityName}.${paramFromLogic.name}`);
+                    return genLogicParam(paramFromLogic.name, `${currentName}.item.${lowerEntityName}.${paramFromLogic.name}`);
                 }),
             }),
             genCallComponentLogic(nameGroup.viewElementMainView, 'reload'),
@@ -197,12 +190,11 @@ export function genTableBlock(entity: Entity, oldNode: ViewElement) {
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
     nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
-    // 当前节点的scopeName
-    nameGroup.scopeName = oldNode.getScopeName();
+    // 当前节点的currentName
+    nameGroup.currentName = oldNode.getCurrentName();
     // 收集所有和本实体关联的实体
     const entitySet: Set<Entity> = new Set();
     entitySet.add(entity);
-    const newStructures: any[] = [];
     const newLogics: any[] = [];
     entity.properties.forEach((property) => {
         if (property.relationEntity) {
@@ -216,8 +208,6 @@ export function genTableBlock(entity: Entity, oldNode: ViewElement) {
         }
     });
     const allEntities = [...entitySet];
-    const entityStructure = genQueryStructure(allEntities, nameGroup);
-    newStructures.push(entityStructure);
     const entityLogic = genQueryLogic(allEntities, nameGroup, false, true, module);
     newLogics.push(entityLogic);
 
@@ -232,8 +222,7 @@ export function genTableBlock(entity: Entity, oldNode: ViewElement) {
         ${JSON.stringify(genTableRemoveLogic(entity, nameGroup))}
     ],
 
-    "logics": ${JSON.stringify(newLogics)},
-    "structures": ${JSON.stringify(newStructures)}
+    "logics": ${JSON.stringify(newLogics)}
 }
 </definition>
 `;
@@ -254,7 +243,6 @@ export function genTableColumnBlock(property: EntityProperty, oldNode: ViewEleme
     // 收集所有和本实体关联的实体
     const entitySet: Set<Entity> = new Set();
     entitySet.add(entity);
-    const newStructures: any[] = [];
     const newLogics: any[] = [];
     const properties = [property];
     properties.forEach((property) => {
@@ -269,8 +257,6 @@ export function genTableColumnBlock(property: EntityProperty, oldNode: ViewEleme
         }
     });
     const allEntities = [...entitySet];
-    const entityStructure = genQueryStructure(allEntities, nameGroup);
-    newStructures.push(entityStructure);
     const entityLogic = genQueryLogic(allEntities, nameGroup, false, true, module);
     newLogics.push(entityLogic);
 
@@ -286,8 +272,7 @@ export function genTableColumnBlock(property: EntityProperty, oldNode: ViewEleme
         ${JSON.stringify(genTableLoadLogic(entity, nameGroup, entityLogic, false))}
     ],
 
-    "logics": ${JSON.stringify(newLogics)},
-    "structures": ${JSON.stringify(newStructures)}
+    "logics": ${JSON.stringify(newLogics)}
 }
 </definition>
 `;

package/src/templator/genUpdateBlock.ts

@@ -10,7 +10,6 @@ import {
     genLogicParam,
     genCallComponentLogic,
     genLoadSelectLogic,
-    genQueryStructure,
     genQueryLogic,
     genEnumSelectBlock,
 } from '.';
@@ -278,7 +277,6 @@ export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
 
     // 收集所有和本实体关联的实体
     const selectNameGroupMap: Map<string, NameGroup> = new Map();
-    const newStructures: any[] = [];
     const newLogics: any[] = [];
     const newLoadSelectLogics: any[] = [];
     entity.properties.forEach((property) => {
@@ -294,9 +292,7 @@ export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
                     // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
                     const key = [property.name, relationEntity.name].join('-');
                     selectNameGroupMap.set(key, selectNameGroup);
-                    const newStructure = genQueryStructure([relationEntity], selectNameGroup);
                     const newLogic = genQueryLogic([relationEntity], selectNameGroup, false, false, module);
-                    newStructures.push(newStructure);
                     newLogics.push(newLogic);
                     newLoadSelectLogics.push(genLoadSelectLogic(relationEntity, selectNameGroup, newLogic));
                 }
@@ -341,8 +337,7 @@ export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
             "calleeName": "${nameGroup.viewLogicLoad}"
         }
     ],
-    "logics": ${JSON.stringify(newLogics)},
-    "structures": ${JSON.stringify(newStructures)}
+    "logics": ${JSON.stringify(newLogics)}
 }
 </definition>
 `;

package/src/templator/utils.ts

@@ -227,7 +227,7 @@ export const NaslUITypeAnnotation = {
     SortEvent: genNaslUITypeAnnotation('SortEvent'),
     PoiInfo: genNaslUITypeAnnotation('PoiInfo'),
     File: genNaslUITypeAnnotation('File'),
-    ScopeOf: genNaslUIGenericTypeAnnotation('ScopeOf'),
+    Current: genNaslUIGenericTypeAnnotation('Current'),
 };
 
 export const NaslTypeAnnotation = {
@@ -238,6 +238,34 @@ export const NaslTypeAnnotation = {
         typeNamespace,
         typeName,
     }),
+    AnonymousStructure: (properties: any[]) => ({
+        concept: 'TypeAnnotation',
+        typeKind: 'anonymousStructure',
+        properties: [{
+            concept: 'StructureProperty',
+            name: 'list',
+            typeAnnotation: {
+                concept: 'TypeAnnotation',
+                typeKind: 'generic',
+                typeName: 'List',
+                typeNamespace: 'nasl.collection',
+                typeArguments: [{
+                    concept: 'TypeAnnotation',
+                    typeKind: 'anonymousStructure',
+                    properties,
+                }],
+            },
+        }, {
+            concept: 'StructureProperty',
+            name: 'total',
+            typeAnnotation: {
+                concept: 'TypeAnnotation',
+                typeKind: 'primitive',
+                typeNamespace: 'nasl.core',
+                typeName: 'Integer',
+            },
+        }],
+    }),
 };
 
 export const NaslCollectionTypeAnnotation = {

package/src/test/units/page/example.view1.html

@@ -19,24 +19,24 @@
         <u-table-view ref="tableView" :data-source="load" pageable remote-paging data-schema="#/zystest3_backend/entities/Product">
             <u-table-view-column type="index" width="60" title="序号"></u-table-view-column>
             <u-table-view-column title="name" field="name">
-                <template #cell="scope">
+                <template #cell="current">
                     <u-linear-layout gap="small">
-                        <u-text>{{ scope.item.name }}</u-text>
+                        <u-text>{{ current.item.name }}</u-text>
                     </u-linear-layout>
                 </template>
             </u-table-view-column>
             <u-table-view-column title="serial" field="serial">
-                <template #cell="scope">
+                <template #cell="current">
                     <u-linear-layout gap="small">
-                        <u-text>{{ scope.item.serial }}</u-text>
+                        <u-text>{{ current.item.serial }}</u-text>
                     </u-linear-layout>
                 </template>
             </u-table-view-column>
             <u-table-view-column title="操作">
-                <template #cell="scope">
+                <template #cell="current">
                     <u-linear-layout gap="small">
-                        <u-link @click="modify($event, scope)">修改</u-link>
-                        <u-link @click="remove($event, scope)">删除</u-link>
+                        <u-link @click="modify($event, current)">修改</u-link>
+                        <u-link @click="remove($event, current)">删除</u-link>
                     </u-linear-layout>
                 </template>
             </u-table-view-column>

package/src/translator/index.ts

@@ -86,6 +86,9 @@ export function withSourceMap() {
         const oldMethod = descriptor.value;
 
         descriptor.value = function (this: BaseNode, state?: TranslatorState, ...args: any[]) {
+            // 重新生成ts代码就先把类型清除掉
+            // 注意排查错误的时候，调用了这个方法，就会把节点上缓存的__TypeAnnotation清除
+            this.__TypeAnnotation = undefined;
             if (!state) {
                 // 没有状态不生成 SourceMap
                 return oldMethod.call(this);

package/src/utils/traverse.ts

@@ -120,6 +120,13 @@ function handleNext<T extends INode>(func: (next: INodeInfo<T>) => any, current:
     }
 }
 
+function checkCircular<T>(next: INodeInfo<T>) {
+    if (next.stack.length > 100 || next.key > 10000 || next.index > 10000)
+        console.error(next);
+    if (next.stack.length > 110 || next.key > 10010 || next.index > 10010)
+        throw new Error('Circular traverse!');
+    return next.stack.includes(next.node);
+}
 /**
  * 遍历树
  * @param func
@@ -135,11 +142,11 @@ export function traverse<T extends INode>(func: (current: INodeInfo<T>) => any,
 
     if (options.depthFirst) {
         if (options.backTracking) {
-            handleNext<T>((next) => traverse(func, next, options), init, options);
+            handleNext<T>((next) => !checkCircular(next) && traverse(func, next, options), init, options);
             func(init);
         } else {
             func(init);
-            handleNext<T>((next) => traverse(func, next, options), init, options);
+            handleNext<T>((next) => !checkCircular(next) && traverse(func, next, options), init, options);
         }
     } else {
         let queue: Array<INodeInfo<T>> = [];
@@ -150,7 +157,7 @@ export function traverse<T extends INode>(func: (current: INodeInfo<T>) => any,
             if (result !== undefined)
                 return result;
 
-            handleNext<T>((next) => queue.push(next), current, options);
+            handleNext<T>((next) => !checkCircular(next) && queue.push(next), current, options);
         }
     }
 }

package/stdlib/nasl.collection.ts

@@ -3,6 +3,7 @@ declare namespace nasl.collection {
         length: nasl.core.Integer;
         __slice: (start?: nasl.core.Integer, end?: nasl.core.Integer) => List<T>;
         __forEach: (callbackfn: (value: T, index: nasl.core.Integer) => void) => void;
+        __get: (index?: any) => T;
     }
     export class PageOf<T> {
         content: nasl.collection.List<T>;

package/stdlib/nasl.core.ts

@@ -3,9 +3,8 @@ type StringAlias = String;
 
 declare namespace nasl.core {
     export type Any = any;
-
-    export type Boolean = BooleanAlias;
-
+    export class Boolean extends globalThis.Boolean {
+    }
     // Integer<Long<Double   小类型可以隐式转换为大类型，反之不可。
     export class Integer {
         accept: 'Integer';
@@ -27,7 +26,8 @@ declare namespace nasl.core {
         constructor(num?: number);
     }
 
-    export type String = StringAlias;
+    export class String extends globalThis.String {
+    }
 
     export class Text extends String {
     }
@@ -51,6 +51,11 @@ declare namespace nasl.core {
     export class Email extends String {
         subAccept: 'Email';
     }
+
+    export class Union {
+        accept: 'Union';
+    }
+
     // &&
     export function and(left: Boolean, right: Boolean): Boolean;
     // ||
@@ -163,6 +168,8 @@ declare namespace nasl.core {
 
     export function ensureBoolean(value: Boolean): Boolean;
 
+    export function isUnionType<T, S extends T>(obj: T): obj is S;
+
     export let universalVariable: nasl.core.Any;
 
     export class Enums {

package/stdlib/nasl.langUtil.ts

@@ -15,7 +15,7 @@ declare namespace nasl.langUtil {
         ORDER_BY(...exprs: Array<(...types: Arr) => any>): Collection<Arr>;
         LIMIT(expr: (...types: Arr) => any): Collection<Arr>;
         // PAGINATE(page: nasl.core.Integer, size: nasl.core.Integer): Collection<Arr>
-        // SELECT_PAGE_OF<R>(expr: (...types: Arr) => R): nasl.collection.PageOf<R>
+        // SELECT_PAGE_OF<R>(expr: (...types: Arr) => R): <R>
     }
 
     export function FROM<T extends Array<any>>(collection: Collection<T>): Collection<T>;

package/stdlib/nasl.process.ts

@@ -66,7 +66,7 @@ declare namespace nasl.process {
         page: nasl.core.Integer, 
         size: nasl.core.Integer, 
         sort: nasl.core.String, 
-        order: nasl.core.String): nasl.collection.PageOf<LCAPTaskInstance>;
+        order: nasl.core.String): { list: nasl.collection.List<LCAPTaskInstance>, total: nasl.core.Integer };
 
     export function getProcessDefinitionList(): nasl.collection.List<LCAPProcessDefinition>;
     export function getProcessDefinition(name: nasl.core.String): LCAPProcessDefinition;
@@ -89,7 +89,7 @@ declare namespace nasl.process {
         page: nasl.core.Integer, 
         size: nasl.core.Integer, 
         sort: nasl.core.String, 
-        order: nasl.core.String): nasl.collection.PageOf<LCAPProcessInstance>;
+        order: nasl.core.String): { list: nasl.collection.List<LCAPProcessInstance>, total: nasl.core.Integer };
     
     export function transferTaskInstance(taskId: nasl.core.String, userName: nasl.core.String): LCAPOperateProcessResult;
     export function withdrawProcessInstance(processId: nasl.core.String): LCAPOperateProcessResult;