@lcap/nasl 1.0.0-alpha.13 → 1.0.0-alpha.16

package/src/concepts/View__.ts

@@ -272,7 +272,7 @@ export class View extends BaseNode {
                 name: options,
             }, this, 'elements');
         } else if (options instanceof ViewElement) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             viewElement = options;
             Object.assign(viewElement, relationOptions);
         } else {
@@ -414,7 +414,7 @@ export class View extends BaseNode {
                 name: options,
             }, this, 'params');
         } else if (options instanceof Param) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             param = options;
             Object.assign(param, relationOptions);
         } else {
@@ -556,7 +556,7 @@ export class View extends BaseNode {
                 name: options,
             }, this, 'variables');
         } else if (options instanceof Variable) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             variable = options;
             Object.assign(variable, relationOptions);
         } else {
@@ -698,7 +698,7 @@ export class View extends BaseNode {
                 name: options,
             }, this, 'logics');
         } else if (options instanceof Logic) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logic = options;
             Object.assign(logic, relationOptions);
         } else {
@@ -840,7 +840,7 @@ export class View extends BaseNode {
                 name: options,
             }, this, 'bindEvents');
         } else if (options instanceof BindEvent) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             bindEvent = options;
             Object.assign(bindEvent, relationOptions);
         } else {
@@ -984,7 +984,7 @@ export class View extends BaseNode {
                 name: options,
             }, this, 'children');
         } else if (options instanceof View) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             view = options;
             Object.assign(view, relationOptions);
         } else {
@@ -1391,7 +1391,7 @@ export class View extends BaseNode {
     get parentAuth() {
         const _nameSpace = this.getTsNamespace();
         const mainViewName = _nameSpace.split('.')[2];
-        return this.app.views.find((item) => item.name === mainViewName)?.auth;
+        return mainViewName ? this.app.views.find((item) => item.name === mainViewName)?.auth : this.auth;
     }
     /**
      * 设置页面权限
@@ -1480,15 +1480,6 @@ export class View extends BaseNode {
                 }
             }
         }
-        // 全局结构体
-        if (Array.isArray(definition.structures)) {
-            definition.structures.forEach((structureOption: any) => {
-                const structure = Structure.from({
-                    ...structureOption,
-                }, this.rootNode, 'structures');
-                (this.rootNode as App).addStructure(structure);
-            });
-        }
 
         // 全局逻辑
         if (Array.isArray(definition.logics)) {
@@ -1500,6 +1491,16 @@ export class View extends BaseNode {
             });
         }
 
+        // 全局结构体
+        if (Array.isArray(definition.structures)) {
+            definition.structures.forEach((structureOption: any) => {
+                const structure = Structure.from({
+                    ...structureOption,
+                }, this.rootNode, 'structures');
+                (this.rootNode as App).addStructure(structure);
+            });
+        }
+
         // 页面入参
         if (Array.isArray(definition.viewParams)) {
             definition.viewParams.forEach((paramsOption: any) => {
@@ -1663,12 +1664,12 @@ export class View extends BaseNode {
             tsName = tsName.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '_');
             return tsName;
         }
-        // console.log(this.tsName)
+
         let code = `export namespace ${this.tsName} {\n`;
         // 角色
-        if (this.auth && Array.isArray(this.bindRoles) && this.bindRoles.length) {
+        if (Array.isArray(this.bindRoles) && this.bindRoles.length) {
             code += indent(state.tabSize + 1);
-            code += 'export let bindRoles = [\n';
+            code += 'export let __bindRoles = [\n';
             this.bindRoles.forEach((role) => {
                 code += indent(state.tabSize + 1);
                 code += `${this.app.getNamespace()}.roles.${chineseTsName(role)}.${chineseTsName(role)},`;
@@ -1706,15 +1707,13 @@ export class View extends BaseNode {
         // 逻辑
         if (Array.isArray(this.logics) && this.logics.length) {
             code += indent(state.tabSize + 1);
-            code += `export namespace logics {\n`;
             this.logics.forEach((logic) => {
                 code += logic.toEmbeddedTS(shiftState(state, code, {
                     tabSize: state.tabSize + 2,
-                }));
+                }), 'noExport');
                 code += '\n';
             });
             code += indent(state.tabSize + 1);
-            code += '}\n';
         }
         // 事件
         if (Array.isArray(this.bindEvents)) {
@@ -1746,13 +1745,14 @@ export class View extends BaseNode {
         code += '\n' + indent(state.tabSize + 1) + '}\n';
 
         if (Array.isArray(this.params)) {
-            code += indent(state.tabSize + 1) + `export function $destination(`;
+            code += indent(state.tabSize + 1) + `export function $destination(options: {`;
             this.params.forEach((param, index) => {
-                code += `${param.toEmbeddedTS(shiftState(state, code, { inline: true }), true)}`;
+                code += param.name + '?: ';
+                code += param.typeAnnotation.toEmbeddedTS(shiftState(state, code));
                 if (index !== this.params.length - 1)
                     code += ', ';
             });
-            code += '){}\n';
+            code += '}){}\n';
         }
         code += indent(state.tabSize) + '}\n';
         return code;
@@ -1810,6 +1810,25 @@ export class View extends BaseNode {
         return arr.length ? subView.findViewByPath(arr.join('/')) : subView;
     }
 
+    findViewByName(name: string): View {
+        return utils.traverse((current) => {
+            if (current.node.name === name)
+                return current.node;
+        }, { node: this });
+    }
+
+    findElementByName(name: string): ViewElement {
+        return this.elements[0]?.findElementByName(name);
+    }
+
+    findElementByTag(tag: string): ViewElement {
+        return this.elements[0]?.findElementByName(tag);
+    }
+
+    findElementByAttr(name: string, value: string): ViewElement {
+        return this.elements[0]?.findElementByAttr(name, value);
+    }
+
     _setAsIndexView(isIndex: boolean) {
         let views: View[] = [];
         if (this.parentNode.concept !== 'View') {

package/src/concepts/WhileStatement__.ts

@@ -89,7 +89,7 @@ export class WhileStatement extends LogicItem {
         const relationOptions = { parentNode: this, parentKey: 'body' };
         let logicItem: LogicItem;
         if (options instanceof LogicItem) {
-            options.delete(); // 同一实例不支持多处存在
+            options.ensureDelete(); // 同一实例不支持多处存在
             logicItem = options;
             Object.assign(logicItem, relationOptions);
         } else {

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

@@ -10,11 +10,13 @@ import naslUtil from './nasl.util';
 import naslProcess from './nasl.process';
 import naslValidation from './nasl.validation';
 import naslBrowser from './nasl.browser';
+import naslAuth from './nasl.auth';
+import naslConfiguration from './nasl.configuration';
 
 export { reference2TypeAnnotationList } from './reference2TypeAnnotationList';
 export const stdlibNamespace = new Namespace({
     name: 'nasl',
     path: 'nasl',
-    children: [naslCore, naslCollection, naslInterface, naslUi, naslUtil, naslProcess, naslValidation, naslBrowser],
+    children: [naslCore, naslCollection, naslInterface, naslUi, naslUtil, naslProcess, naslValidation, naslBrowser, naslAuth, naslConfiguration],
 });
 export default stdlibNamespace;

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

@@ -0,0 +1,26 @@
+import Namespace from '../../Namespace__';
+import Param from '../../Param__';
+import Return from '../../Return__';
+import Logic from '../../Logic__';
+import TypeAnnotation from '../../TypeAnnotation__';
+
+export default new Namespace({
+    name: 'auth',
+    logics: [
+        new Logic({
+            name: 'hasAuth',
+            params: [
+                new Param({
+                    name: 'authPath',
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                }),
+            ],
+            returns: [],
+        }),
+        new Logic({
+            name: 'logout',
+            params: [],
+            returns: [],
+        }),
+    ],
+});

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

@@ -9,22 +9,13 @@ export default new Namespace({
     logics: [
         new Logic({
             name: 'requestFullscreen',
-            params: [
-            ],
+            params: [],
+            body: [],
         }),
         new Logic({
             name: 'exitFullscreen',
-        }),
-        new Logic({
-            name: 'hasAuth',
-            params: [
-                new Param({
-                    name: 'authPath',
-                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
-                }),
-            ],
-            returns: [
-            ],
+            params: [],
+            body: [],
         }),
         new Logic({
             name: 'getDistance',
@@ -32,40 +23,15 @@ export default new Namespace({
                 new Param({
                     name: 'Point1',
                     typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                    required: true,
                 }),
                 new Param({
                     name: 'Point2',
                     typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                    required: true,
                 }),
             ],
-            returns: [
-            ],
-        }),
-        new Logic({
-            name: 'logOut',
-            params: [
-                new Param({
-                    name: 'Point1',
-                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
-                }),
-                new Param({
-                    name: 'Point2',
-                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
-                }),
-            ],
-            returns: [
-            ],
-        }),
-        new Logic({
-            name: 'getConfiguration',
-            params: [
-                new Param({
-                    name: 'name',
-                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
-                }),
-            ],
-            returns: [
-            ],
+            body: [],
         }),
     ],
 });

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

@@ -0,0 +1,21 @@
+import Namespace from '../../Namespace__';
+import Param from '../../Param__';
+import Return from '../../Return__';
+import Logic from '../../Logic__';
+import TypeAnnotation from '../../TypeAnnotation__';
+
+export default new Namespace({
+    name: 'configuration',
+    logics: [
+        new Logic({
+            name: 'getConfig',
+            params: [
+                new Param({
+                    name: 'name',
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                }),
+            ],
+            returns: [],
+        }),
+    ],
+});

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

@@ -88,11 +88,6 @@ export default new Namespace({
         new Function({
             name: 'IndexOf',
             description: '搜索字符串位置',
-            typeParams: [
-                new TypeParam({
-                    name: 'T',
-                }),
-            ],
             params: [
                 new Param({
                     name: 'str',
@@ -126,11 +121,6 @@ export default new Namespace({
         new Function({
             name: 'LastIndexOf',
             description: '从末尾搜索字符串位置',
-            typeParams: [
-                new TypeParam({
-                    name: 'T',
-                }),
-            ],
             params: [
                 new Param({
                     name: 'str',
@@ -159,11 +149,6 @@ export default new Namespace({
         new Function({
             name: 'Replace',
             description: '字符串替换',
-            typeParams: [
-                new TypeParam({
-                    name: 'T',
-                }),
-            ],
             params: [
                 new Param({
                     name: 'str',
@@ -187,11 +172,6 @@ export default new Namespace({
         new Function({
             name: 'SubString',
             description: '字符串截取',
-            typeParams: [
-                new TypeParam({
-                    name: 'T',
-                }),
-            ],
             params: [
                 new Param({
                     name: 'str',
@@ -356,7 +336,6 @@ export default new Namespace({
         new Function({
             name: 'Get',
             description: '获得集合指定索引的项',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'list',
@@ -378,7 +357,6 @@ export default new Namespace({
         new Function({
             name: 'Set',
             description: '为集合指定索引赋值（覆盖原索引项）',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'list',
@@ -404,7 +382,6 @@ export default new Namespace({
         new Function({
             name: 'Contains',
             description: '返回集合是否包含某一项',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'list',
@@ -426,7 +403,6 @@ export default new Namespace({
         new Function({
             name: 'Add',
             description: '为集合末尾添加项，并返回集合长度',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'list',
@@ -443,7 +419,6 @@ export default new Namespace({
         new Function({
             name: 'Insert',
             description: '为集合指定索引插入项（原索引项依次后推）',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'list',
@@ -464,7 +439,6 @@ export default new Namespace({
         new Function({
             name: 'Remove',
             description: '删除集合的项',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'list',
@@ -481,7 +455,6 @@ export default new Namespace({
         new Function({
             name: 'RemoveAt',
             description: '删除集合位于某个索引的项',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'list',
@@ -493,14 +466,16 @@ export default new Namespace({
                     name: 'index',
                     typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
                 }),
-                new Param({
-                    name: 'item',
+            ],
+            returns: [
+                new Return({
                     typeAnnotation: TypeAnnotation.createTypeParam('T'),
                 }),
             ],
         }),
         new Function({
             name: 'CurrDate',
+            description: '返回当前日期',
             params: [],
             returns: [
                 new Return({
@@ -510,7 +485,7 @@ export default new Namespace({
         }),
         new Function({
             name: 'CurrTime',
-            description: '返回当前日期',
+            description: '返回当前时间',
             params: [],
             returns: [
                 new Return({
@@ -588,7 +563,10 @@ export default new Namespace({
                     typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
                     defaultValue: 'false',
                     defaultExpression: new BooleanLiteral({ value: 'false' }),
-                    options: [{ value: 'true' }, { value: 'false' }],
+                    options: [
+                        { text: 'true', value: 'true' },
+                        { text: 'false', value: 'false' },
+                    ],
                 }),
             ],
             returns: [
@@ -691,7 +669,6 @@ export default new Namespace({
         new Function({
             name: 'Clone',
             description: '复制一个所选参数的实例',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'struct',
@@ -707,7 +684,6 @@ export default new Namespace({
         new Function({
             name: 'Clear',
             description: '清除对象数据',
-            typeParams: [new TypeParam({ name: 'T' })],
             params: [
                 new Param({
                     name: 'struct',
@@ -746,13 +722,45 @@ export default new Namespace({
                 new Param({
                     name: 'name',
                     typeAnnotation: TypeAnnotation.createPrimitive('String'),
-                }),
-            ],
-            returns: [
-                new Return({
-                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
-                }),
-            ],
-        }),
+                    useComponent: { type: 's-config-select' },
+                }),
+            ],
+            returns: [
+                new Return({
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
+                }),
+            ],
+        }),
+        // new Function({
+        //     name: 'CreatePageOf',
+        //     description: '将List<T>集合转换为分页集合PageOf<T>',
+        //     params: [
+        //         new Param({
+        //             name: 'list',
+        //             typeAnnotation: TypeAnnotation.createGeneric('List', {
+        //                 typeArguments: [TypeAnnotation.createTypeParam('T')],
+        //             }),
+        //         }),
+        //         new Param({
+        //             name: 'page',
+        //             typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
+        //         }),
+        //         new Param({
+        //             name: 'size',
+        //             typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
+        //         }),
+        //         new Param({
+        //             name: 'total',
+        //             typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
+        //         }),
+        //     ],
+        //     returns: [
+        //         new Return({
+        //             typeAnnotation: TypeAnnotation.createPrimitive('PageOf', {
+        //                 typeArguments: [TypeAnnotation.createTypeParam('T')],
+        //             }),
+        //         }),
+        //     ],
+        // }),
     ],
 });

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

@@ -205,7 +205,7 @@ export default new Namespace({
                 new Param({
                     name: 'arr',
                     typeAnnotation: TypeAnnotation.createGeneric('List', {
-                        typeArguments: [TypeAnnotation.createTypeParam('T')],
+                        typeArguments: [TypeAnnotation.createPrimitive('Any')],
                     }),
                 }),
             ],
@@ -221,7 +221,7 @@ export default new Namespace({
                 new Param({
                     name: 'arr',
                     typeAnnotation: TypeAnnotation.createGeneric('List', {
-                        typeArguments: [TypeAnnotation.createTypeParam('T')],
+                        typeArguments: [TypeAnnotation.createPrimitive('Any')],
                     }),
                 }),
             ],
@@ -237,7 +237,7 @@ export default new Namespace({
                 new Param({
                     name: 'arr',
                     typeAnnotation: TypeAnnotation.createGeneric('List', {
-                        typeArguments: [TypeAnnotation.createTypeParam('T')],
+                        typeArguments: [TypeAnnotation.createPrimitive('Any')],
                     }),
                 }),
             ],
@@ -253,7 +253,7 @@ export default new Namespace({
                 new Param({
                     name: 'arr',
                     typeAnnotation: TypeAnnotation.createGeneric('List', {
-                        typeArguments: [TypeAnnotation.createTypeParam('T')],
+                        typeArguments: [TypeAnnotation.createPrimitive('Any')],
                     }),
                 }),
             ],
@@ -263,14 +263,13 @@ export default new Namespace({
                 }),
             ],
         }),
-        /*
         new Function({
             name: 'unique',
             params: [
                 new Param({
                     name: 'arr',
                     typeAnnotation: TypeAnnotation.createGeneric('List', {
-                        typeArguments: [TypeAnnotation.createTypeParam('T')],
+                        typeArguments: [TypeAnnotation.createPrimitive('Any')],
                     }),
                 }),
             ],
@@ -279,7 +278,16 @@ export default new Namespace({
                     typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
                 }),
             ],
-        })*/
+        }),
+        new Function({
+            name: 'noDuplicates',
+            params: [],
+            returns: [
+                new Return({
+                    typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
+                }),
+            ],
+        }),
         genEmptyParamFunction('string'),
         genEmptyParamFunction('number'),
         new Function({
@@ -412,13 +420,12 @@ export default new Namespace({
         }),
         genEmptyParamFunction('halfWidth'),
         genEmptyParamFunction('fullWidth'),
-        /* hash ?
         new Function({
             name: 'hash',
             params: [
                 new Param({
-                    name: 'divisor',
-                    typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
+                    name: 'algorithm',
+                    typeAnnotation: TypeAnnotation.createPrimitive('String'),
                 }),
             ],
             returns: [
@@ -427,7 +434,6 @@ export default new Namespace({
                 }),
             ],
         }),
-        */
         genEmptyParamFunction('hexColor'),
         genEmptyParamFunction('hex'),
         genEmptyParamFunction('creditCard'),

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

@@ -1,15 +1,15 @@
 import { TypeAnnotation, PRIMITIVE_TYPE } from '../../TypeAnnotation__';
 
 export const primitiveTypeList: Array<TypeAnnotation> = [
-    TypeAnnotation.createPrimitive('Boolean', { text: 'Boolean 布尔值' }),
-    TypeAnnotation.createPrimitive('Integer', { text: 'Integer 整数' }),
-    TypeAnnotation.createPrimitive('Long', { text: 'Long 长整数' }),
-    TypeAnnotation.createPrimitive('Double', { text: 'Double 小数' }),
-    TypeAnnotation.createPrimitive('String', { text: 'String 字符串' }),
-    TypeAnnotation.createPrimitive('Text', { text: 'Text 长文本' }),
-    TypeAnnotation.createPrimitive('Binary', { text: 'Binary 二进制流' }),
-    TypeAnnotation.createPrimitive('Date', { text: 'Date 日期' }),
-    TypeAnnotation.createPrimitive('Time', { text: 'Time 时间' }),
-    TypeAnnotation.createPrimitive('DateTime', { text: 'DateTime 日期时间' }),
-    TypeAnnotation.createPrimitive('Email', { text: 'Email 电子邮箱' }),
+    TypeAnnotation.createPrimitive('Boolean'),
+    TypeAnnotation.createPrimitive('Integer'),
+    TypeAnnotation.createPrimitive('Long'),
+    TypeAnnotation.createPrimitive('Double'),
+    TypeAnnotation.createPrimitive('String'),
+    TypeAnnotation.createPrimitive('Text'),
+    TypeAnnotation.createPrimitive('Binary'),
+    TypeAnnotation.createPrimitive('Date'),
+    TypeAnnotation.createPrimitive('Time'),
+    TypeAnnotation.createPrimitive('DateTime'),
+    TypeAnnotation.createPrimitive('Email'),
 ];

package/src/concepts/index__.ts

@@ -70,6 +70,7 @@ export * from './Process__';
 export * from './ProcessElement__';
 export * from './ProcessComponent__';
 export * from './ProcessOutcome__';
+export * from './Assignee__';
 export * from './Role__';
 export * from './Configuration__';
 export * from './ConfigGroup__';

package/src/enums/KEYWORDS.ts

@@ -62,7 +62,6 @@ export const KEYWORDS = [
     'enum',
     'enums',
     'eval',
-    'event',
     'events',
     'expect',
     'experimental',
@@ -104,6 +103,7 @@ export const KEYWORDS = [
     'is',
     'it',
     'lazy',
+    'length',
     'let',
     'logging',
     'logic',