@lcap/nasl 2.22.0-beta.5 → 3.0.0-beta.1

package/src/concepts/View__.ts

@@ -269,6 +269,8 @@ export class View extends BaseNode {
         });
     }
 
+    
+
     /**
     * 插入页面元素
     * @internal
@@ -402,6 +404,7 @@ export class View extends BaseNode {
         return node;
     }
 
+
     getParamUniqueName(name = 'param1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -539,6 +542,7 @@ export class View extends BaseNode {
         return node;
     }
 
+
     getVariableUniqueName(name = 'variable1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -676,6 +680,7 @@ export class View extends BaseNode {
         return node;
     }
 
+
     getLogicUniqueName(name = 'logic1') {
         return utils.unique(name, this.getLogicExistingNames(), undefined, false);
     }
@@ -813,6 +818,7 @@ export class View extends BaseNode {
         return node;
     }
 
+
     getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.bindEvents as BindEvent[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -954,6 +960,9 @@ export class View extends BaseNode {
         return node;
     }
 
+
+
+
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.children as View[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1095,6 +1104,9 @@ export class View extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除页面元素
     * @param name 页面元素名称
@@ -1143,6 +1155,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1191,6 +1205,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除变量
     * @param name 变量名称
@@ -1239,6 +1255,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1287,6 +1305,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -1335,6 +1355,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除页面
     * @param name 页面名称
@@ -1489,7 +1511,7 @@ export class View extends BaseNode {
             }
         }
 
-        // 全局逻辑
+        // 服务端逻辑
         if (Array.isArray(definition.logics)) {
             definition.logics.forEach((logicOption: any) => {
                 const logic = Logic.from({
@@ -2137,7 +2159,7 @@ export class View extends BaseNode {
             return _interface ? `${rightNode.tsCalleeKey}(${_interface.params.map(() => 'null').join(',')})` : null;
         }
 
-        // 调用全局逻辑，参数替换成 null
+        // 调用服务端逻辑，参数替换成 null
         if (rightNode instanceof CallLogic && rightNode.calleeNamespace === 'app.logics') {
             const calleeName = rightNode?.calleeName;
             const calleeLogic = this.app.logics.find((l) => l.name === calleeName);

package/src/concepts/basics/stdlib/index.ts

@@ -11,6 +11,7 @@ import naslProcess from './nasl.process';
 import naslValidation from './nasl.validation';
 import naslBrowser from './nasl.browser';
 import naslAuth from './nasl.auth';
+import naslHttp from './nasl.http';
 import naslConfiguration from './nasl.configuration';
 import naslLogging from './nasl.logging';
 import naslIo from './nasl.io';
@@ -19,6 +20,6 @@ export { reference2TypeAnnotationList } from './reference2TypeAnnotationList';
 export const stdlibNamespace = new Namespace({
     name: 'nasl',
     path: 'nasl',
-    children: [naslCore, naslCollection, naslInterface, naslUi, naslUtil, naslProcess, naslValidation, naslBrowser, naslAuth, naslConfiguration, naslLogging, naslIo],
+    children: [naslCore, naslCollection, naslInterface, naslUi, naslUtil, naslProcess, naslValidation, naslBrowser, naslAuth, naslConfiguration, naslLogging, naslIo, naslHttp],
 });
 export default stdlibNamespace;

package/src/concepts/basics/stdlib/nasl.auth.ts

@@ -49,6 +49,30 @@ export const authStructures = [
             }),
         ],
     }),
+    new Structure({
+        name: 'LCAPUser',
+        properties: [
+            new StructureProperty({
+                name: 'userName',
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
+            }),
+            new StructureProperty({
+                name: 'userId',
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
+            }),
+            new StructureProperty({
+                name: 'extendFiledMap',
+                typeAnnotation: TypeAnnotation.createGeneric('map', {
+                    typeArguments: [
+                        // TypeAnnotation.createPrimitive('String'),
+                        // TypeAnnotation.createPrimitive('String'),
+                        TypeAnnotation.createTypeParam('K'),
+                        TypeAnnotation.createTypeParam('V'),
+                    ],
+                }),
+            }),
+        ],
+    }),
 ];
 
 export const authTypeList: Array<TypeAnnotation> = reference2TypeAnnotationList(authStructures, 'nasl.auth');

package/src/concepts/basics/stdlib/nasl.http.ts

@@ -0,0 +1,166 @@
+import Namespace from '../../Namespace__';
+import Param from '../../Param__';
+import Return from '../../Return__';
+import Logic from '../../Logic__';
+import TypeAnnotation from '../../TypeAnnotation__';
+import Structure from '../../Structure__';
+import StructureProperty from '../../StructureProperty__';
+import { reference2TypeAnnotationList } from './reference2TypeAnnotationList';
+import TypeParam from '@nasl/concepts/TypeParam__';
+
+export const httpStructures = [
+    new Structure({
+        name: 'HttpCookie',
+        properties: [
+            new StructureProperty({
+                name: 'name',
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
+            }),
+            new StructureProperty({
+                name: 'value',
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
+            }),
+            new StructureProperty({
+                name: 'domain',
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
+            }),
+            new StructureProperty({
+                name: 'cookiePath',
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
+            }),
+            new StructureProperty({
+                name: 'sameSite',
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
+            }),
+            new StructureProperty({
+                name: 'httpOnly',
+                typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+            }),
+            new StructureProperty({
+                name: 'secure',
+                typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+            }),
+            new StructureProperty({
+                name: 'maxAge',
+                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
+            }),
+        ],
+    }),
+    new Structure({
+        name: 'HttpResponse',
+        typeParams: [
+            new TypeParam({
+                name: 'T',
+            }),
+        ],
+        properties: [
+            new StructureProperty({
+                name: 'status',
+                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
+            }),
+            new StructureProperty({
+                name: 'body',
+                typeAnnotation: TypeAnnotation.createPrimitive('T'),
+            }),
+            new StructureProperty({
+                name: 'headers',
+                typeAnnotation: TypeAnnotation.createGeneric('map', {
+                    typeArguments: [
+                        // TypeAnnotation.createPrimitive('String'),
+                        // TypeAnnotation.createPrimitive('String'),
+                        TypeAnnotation.createTypeParam('K'),
+                        TypeAnnotation.createTypeParam('V'),
+                    ],
+                }),
+            }), new StructureProperty({
+                name: 'cookies',
+                typeAnnotation: TypeAnnotation.createGeneric('map', {
+                    typeArguments: [
+                        TypeAnnotation.createTypeParam('K'),
+                        TypeAnnotation.createReference('HttpCookie', {
+                            typeNamespace: 'nasl.http',
+                        }),
+                    ],
+                }),
+            }),
+        ],
+    }),
+    new Structure({
+        name: 'HttpRequest',
+        typeParams: [
+            new TypeParam({
+                name: 'T',
+            }),
+        ],
+        properties: [
+            new StructureProperty({
+                name: 'requestURL',
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
+            }),
+            new StructureProperty({
+                name: 'remoteIp',
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
+            }),
+            new StructureProperty({
+                name: 'requestMethod',
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
+            }),
+            new StructureProperty({
+                name: 'body',
+                typeAnnotation: TypeAnnotation.createPrimitive('T'),
+            }),
+            new StructureProperty({
+                name: 'headers',
+                typeAnnotation: TypeAnnotation.createGeneric('map', {
+                    typeArguments: [
+                        // TypeAnnotation.createPrimitive('String'),
+                        // TypeAnnotation.createPrimitive('String'),
+                        TypeAnnotation.createTypeParam('K'),
+                        TypeAnnotation.createTypeParam('V'),
+                    ],
+                }),
+            }),
+            new StructureProperty({
+                name: 'pathParams',
+                typeAnnotation: TypeAnnotation.createGeneric('map', {
+                    typeArguments: [
+                        // TypeAnnotation.createPrimitive('String'),
+                        // TypeAnnotation.createPrimitive('String'),
+                        TypeAnnotation.createTypeParam('K'),
+                        TypeAnnotation.createTypeParam('V'),
+                    ],
+                }),
+            }),
+            new StructureProperty({
+                name: 'queryParams',
+                typeAnnotation: TypeAnnotation.createGeneric('map', {
+                    typeArguments: [
+                        // TypeAnnotation.createPrimitive('String'),
+                        // TypeAnnotation.createPrimitive('String'),
+                        TypeAnnotation.createTypeParam('K'),
+                        TypeAnnotation.createTypeParam('V'),
+                    ],
+                }),
+            }),
+            new StructureProperty({
+                name: 'cookies',
+                typeAnnotation: TypeAnnotation.createGeneric('map', {
+                    typeArguments: [
+                        TypeAnnotation.createTypeParam('K'),
+                        TypeAnnotation.createReference('HttpCookie', {
+                            typeNamespace: 'nasl.http',
+                        }),
+                    ],
+                }),
+            }),
+        ],
+    }),
+];
+
+export const httpTypeList: Array<TypeAnnotation> = reference2TypeAnnotationList(httpStructures, 'nasl.http');
+
+export default new Namespace({
+    name: 'http',
+    structures: httpStructures,
+    logics: [],
+});

package/src/concepts/basics/stdlib/nasl.process.ts

@@ -42,6 +42,34 @@ const logics = [
             }),
         ],
     }),
+    new Logic({
+        name: 'setProcessDefinitionState',
+        description: '流程定义设置激活/挂起',
+        params: [
+            new Param({
+                name: 'name',
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
+            }),
+            new Param({
+                name: 'state',
+                typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+            }),
+            new Param({
+                name: 'processInstancesAffected',
+                typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+            }),
+            new Param({
+                name: 'effectiveDate',
+                typeAnnotation: TypeAnnotation.createPrimitive('Date'),
+            }),
+        ],
+        returns: [
+            new Return({
+                name: 'result',
+                typeAnnotation: TypeAnnotation.createTypeParam('T'),
+            }),
+        ],
+    }),
     new Logic({
         name: 'getProcessInstance',
         description: '获取流程详情，如发起人、时间',
@@ -390,6 +418,34 @@ const logics = [
             }),
         ],
     }),
+    new Logic({
+        name: 'updateTaskDefinitionStrategy',
+        description: '设置任务策略',
+        params: [
+            new Param({
+                name: 'processDefName',
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
+            }),
+            new Param({
+                name: 'name',
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
+            }),
+            new Param({
+                name: 'emptyAssignee',
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
+            }),
+            new Param({
+                name: 'skipEnabled',
+                typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+            }),
+        ],
+        returns: [
+            new Return({
+                name: 'result',
+                typeAnnotation: TypeAnnotation.createTypeParam('T'),
+            }),
+        ],
+    }),
 ];
 
 export const processStructures = [
@@ -408,6 +464,10 @@ export const processStructures = [
                 name: 'description',
                 typeAnnotation: TypeAnnotation.createPrimitive('String'),
             }),
+            new StructureProperty({
+                name: 'suspended',
+                typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+            }),
         ],
     }),
     new Structure({
@@ -466,6 +526,14 @@ export const processStructures = [
                 name: 'processDefName',
                 typeAnnotation: TypeAnnotation.createPrimitive('String'),
             }),
+            new StructureProperty({
+                name: 'emptyAssignee',
+                typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+            }),
+            new StructureProperty({
+                name: 'skipEnabled',
+                typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+            }),
         ],
     }),
     new Structure({

package/src/concepts/basics/stdlib/nasl.ui.ts

@@ -837,19 +837,14 @@ export const uiStructures = [
     }),
     new Structure({
         name: 'SelectData',
-        typeParams: [
-            new TypeParam({
-                name: 'T',
-            }),
-        ],
         properties: [
             new StructureProperty({
                 name: 'parent',
-                typeAnnotation: TypeAnnotation.createTypeParam('T'),
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
             }),
             new StructureProperty({
                 name: 'item',
-                typeAnnotation: TypeAnnotation.createTypeParam('T'),
+                typeAnnotation: TypeAnnotation.createPrimitive('String'),
             }),
             new StructureProperty({
                 name: 'level',
@@ -863,33 +858,23 @@ export const uiStructures = [
     }),
     new Structure({
         name: 'DragAndDropUpdateData',
-        typeParams: [
-            new TypeParam({
-                name: 'T',
-            }),
-        ],
         properties: [
             new StructureProperty({
                 name: 'sourceList',
                 typeAnnotation: TypeAnnotation.createGeneric('List', {
-                    typeArguments: [TypeAnnotation.createTypeParam('T')],
+                    typeArguments: [TypeAnnotation.createPrimitive('String')],
                 }),
             }),
             new StructureProperty({
                 name: 'targetList',
                 typeAnnotation: TypeAnnotation.createGeneric('List', {
-                    typeArguments: [TypeAnnotation.createTypeParam('T')],
+                    typeArguments: [TypeAnnotation.createPrimitive('String')],
                 }),
             }),
         ],
     }),
     new Structure({
         name: 'DragAndDropEvent',
-        typeParams: [
-            new TypeParam({
-                name: 'T',
-            }),
-        ],
         properties: [
             new StructureProperty({
                 name: 'source',

package/src/concepts/basics/stdlib/nasl.util.ts

@@ -96,6 +96,7 @@ export default new Namespace({
             params: [
                 new Param({
                     name: 'value',
+                    description: '指定要转换的对象',
                     defaultExpression: new Identifier(),
                 }),
             ],
@@ -117,6 +118,7 @@ export default new Namespace({
             params: [
                 new Param({
                     name: 'value',
+                    description: '指定要转换的对象',
                     defaultExpression: new Identifier(),
                 }),
             ],
@@ -152,8 +154,16 @@ export default new Namespace({
                     description: '是否忽略大小写，true为忽略，false为不忽略',
                     defaultExpression: new BooleanLiteral({ value: 'true' }),
                     options: [
-                        { text: 'true', value: 'true' },
-                        { text: 'false', value: 'false' },
+                        {
+                            text: 'true',
+                            value: 'true',
+                            description: '忽略大小写',
+                        },
+                        {
+                            text: 'false',
+                            value: 'false',
+                            description: '对大小写敏感',
+                        },
                     ],
                 }),
             ],
@@ -182,8 +192,16 @@ export default new Namespace({
                     description: '是否忽略大小写，true为忽略，false为不忽略',
                     defaultExpression: new BooleanLiteral({ value: 'true' }),
                     options: [
-                        { text: 'true', value: 'true' },
-                        { text: 'false', value: 'false' },
+                        {
+                            text: 'true',
+                            value: 'true',
+                            description: '忽略大小写',
+                        },
+                        {
+                            text: 'false',
+                            value: 'false',
+                            description: '对大小写敏感',
+                        },
                     ],
                 }),
             ],
@@ -1138,8 +1156,16 @@ export default new Namespace({
                     defaultValue: 'false',
                     defaultExpression: new BooleanLiteral({ value: 'false' }),
                     options: [
-                        { text: 'true', value: 'true' },
-                        { text: 'false', value: 'false' },
+                        {
+                            text: 'true',
+                            value: 'true',
+                            description: '显示千分位',
+                        },
+                        {
+                            text: 'false',
+                            value: 'false',
+                            description: '不显示千分位',
+                        },
                     ],
                 }),
             ],
@@ -1214,14 +1240,46 @@ export default new Namespace({
                     defaultValue: 'd',
                     defaultExpression: new StringLiteral({ value: 'd' }),
                     options: [
-                        { text: '年数', value: 'y' },
-                        { text: '季度数', value: 'q' },
-                        { text: '月数', value: 'M' },
-                        { text: '星期数', value: 'w' },
-                        { text: '天数', value: 'd' },
-                        { text: '小时数', value: 'h' },
-                        { text: '分钟数', value: 'm' },
-                        { text: '秒数', value: 's' },
+                        {
+                            text: 'Year',
+                            value: 'y',
+                            description: '年数',
+                        },
+                        {
+                            text: 'Season', 
+                            value: 'q',
+                            description: '季度数', 
+                        },
+                        {
+                            text: 'Month',
+                            value: 'M',
+                            description: '月数',
+                        },
+                        {
+                            text: 'Week',
+                            value: 'w',
+                            description: '星期数',
+                        },
+                        {
+                            text: 'Day',
+                            value: 'd',
+                            description: '天数',
+                        },
+                        {
+                            text: 'Hour',
+                            value: 'h',
+                            description: '小时数',
+                        },
+                        {
+                            text: 'Minute',
+                            value: 'm',
+                            description: '分钟数',
+                        },
+                        {
+                            text: 'Second',
+                            value: 's',
+                            description: '秒数',
+                        },
                     ],
                 }),
             ],
@@ -1292,7 +1350,7 @@ export default new Namespace({
         }),
         new Function({
             name: 'GetSpecificDaysOfWeek',
-            description: '按“星期几”获取指定日期范围内的日子',
+            description: '给定起止日期和条件，获取其中满足条件的日期',
             params: [
                 new Param({
                     name: '起始',
@@ -1434,8 +1492,16 @@ export default new Namespace({
                     defaultValue: 'asc',
                     defaultExpression: new BooleanLiteral({ value: 'true' }),
                     options: [
-                        { text: 'asc(升序)', value: 'true' },
-                        { text: 'desc(降序)', value: 'false' },
+                        {
+                            text: 'asc',
+                            value: 'true',
+                            description: '升序',
+                        },
+                        {
+                            text: 'desc',
+                            value: 'false',
+                            description: '降序',
+                        },
                     ],
                 }),
             ],

package/src/concepts/basics/types/index.ts

@@ -5,10 +5,10 @@ export const dataTypeList: Array<{
     title: string;
     children: Array<TypeAnnotation>;
 }> = [
-    { title: '基础类型', children: primitiveTypeList },
-    { title: '自定义类型', children: [] },
-    { title: '平台类型', children: [] },
-];
+        { title: '基础类型', children: primitiveTypeList },
+        { title: '自定义类型', children: [] },
+        { title: '平台类型', children: [] },
+    ];
 
 export const dataTypesMap: { [typeKey: string]: TypeAnnotation } = {};
 primitiveTypeList.forEach((typeAnnotation) => {
@@ -17,6 +17,7 @@ primitiveTypeList.forEach((typeAnnotation) => {
 
 export { collectionStructures, collectionTypeList } from '../stdlib/nasl.collection';
 export { authStructures, authTypeList } from '../stdlib/nasl.auth';
+export { httpStructures, httpTypeList } from '../stdlib/nasl.http';
 export { processStructures, processTypeList } from '../stdlib/nasl.process';
 export { uiStructures, uiTypeList } from '../stdlib/nasl.ui';
 export { interfaceTypeList } from '../stdlib/nasl.interface';