@lcap/nasl 2.16.1 → 2.17.1

package/src/concepts/Variable__.ts

@@ -3,6 +3,7 @@ import { TranslatorState, shiftState, withSourceMap, createCompilerState, indent
 import { ElementToVueOptions } from './ViewElement__';
 import EntityProperty from './EntityProperty__';
 import StructureProperty from './StructureProperty__';
+import Structure from './Structure__';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 import Namespace from './Namespace__';
 //================================================================================
@@ -23,7 +24,6 @@ import Module from './Module__';
 import App from './App__';
 import ProcessElement from './ProcessElement__';
 import Process from './Process__';
-import Structure from './Structure__';
 
 /**
  * 变量
@@ -153,16 +153,19 @@ export class Variable extends BaseNode {
         const object = {
             defaultValue,
         };
-        console.log(JSON.stringify(object));
         this.update({
             ...object,
         });
     }
 
+    
+
+    
+
     /**
-     * 删除类型标注
-     * @param name 类型标注名称
-     */
+    * 删除类型标注
+    * @param name 类型标注名称
+    */
     removeTypeAnnotation(name: string): void;
 
     /**
@@ -212,7 +215,7 @@ export class Variable extends BaseNode {
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
     /**
-     * 自动补全的字段列表
+     * 自动补全的属性列表
      */
     completionChildren: Array<EntityProperty | StructureProperty> = undefined;
 
@@ -225,8 +228,8 @@ export class Variable extends BaseNode {
     }
 
     toJS(state?: TranslatorState): string {
-        const scope = this.view ? 'this' : 'Vue.prototype';
-        return `${this.name} = ${scope}.$genInitFromSchema(${JSON.stringify(this.typeAnnotation)}, ${JSON.stringify(this.defaultValue)})`;
+        const context = this.view ? 'this' : 'Vue.prototype';
+        return `${this.name} = ${context}.$genInitFromSchema(${JSON.stringify(this.typeAnnotation)}, ${JSON.stringify(this.defaultValue)})`;
     }
 
     @withSourceMap()
@@ -316,25 +319,27 @@ export class Variable extends BaseNode {
      */
     async setDataType(typeKey: string): Promise<void>;
     async setDataType(typeAnnotation: TypeAnnotation | string) {
-        if (typeof typeAnnotation === 'string') {
-            typeAnnotation = dataTypesMap[typeAnnotation];
-            if (!typeAnnotation)
-                throw new Error('找不到类型：' + arguments[0]);
-        } else {
-            typeAnnotation._delete?.();
-            const relationOptions = { parentId: this.id, parentConcept: this.concept, parentNode: this };
-            Object.assign(typeAnnotation, relationOptions);
-        }
+        if (typeAnnotation) {
+            if (typeof typeAnnotation === 'string') {
+                typeAnnotation = dataTypesMap[typeAnnotation];
+                if (!typeAnnotation)
+                    throw new Error('找不到类型：' + typeAnnotation);
+            } else {
+                typeAnnotation._delete?.();
+                const relationOptions = { parentId: this.id, parentConcept: this.concept, parentNode: this };
+                Object.assign(typeAnnotation, relationOptions);
+            }
 
-        // 处理下拉属性
-        try {
-            this.completionChildren = this.getSelectRef(typeAnnotation);
-        } catch (err) {
-            this.completionChildren = [];
-            console.log(err);
+            // 处理下拉属性
+            try {
+                this.completionChildren = this.getSelectRef(typeAnnotation);
+            } catch (err) {
+                this.completionChildren = [];
+                console.log(err);
+            }
         }
         const object: any = {
-            typeAnnotation,
+            typeAnnotation: typeAnnotation || null,
         };
         // 切换类型的时候如果有默认值就清除掉
         if (this.defaultValue) {
@@ -347,14 +352,7 @@ export class Variable extends BaseNode {
     }
 
     public static getDefaultOptions() {
-        return {
-            typeAnnotation: {
-                concept: 'TypeAnnotation',
-                typeKind: 'primitive',
-                typeNamespace: 'nasl.core',
-                typeName: 'String',
-            },
-        };
+        return {};
     }
 
     /**
@@ -364,6 +362,8 @@ export class Variable extends BaseNode {
         return !!this.module;
     }
     get hasChildren() {
+        if (!this.typeAnnotation)
+            return null;
         const { typeKind, typeName, typeNamespace } = this.typeAnnotation;
         if (typeKind === 'reference' || typeKind === 'generic') {
             if (typeNamespace.endsWith('.enums') || (typeNamespace.endsWith('.collection') && typeName === 'Map'))
@@ -378,22 +378,22 @@ export class Variable extends BaseNode {
     getSelectRef(newTypeAnnotation: TypeAnnotation) {
         try {
             const { typeName, typeKind, typeNamespace } = newTypeAnnotation || this.typeAnnotation;
-            let completionChildren: StructureProperty[];
+            let completionChildren;
             if (typeKind === 'reference') {
                 if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process' || typeNamespace === 'nasl.auth') {
-                    const node = getNaslNodeByNodeCallee(typeNamespace, typeName) as Structure;
-                    const properties = node?.properties || [];
+                    const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
+                    const properties = (node as Structure)?.properties || [];
                     completionChildren = properties;
                 } else if (typeNamespace.endsWith('.enums')) {
                     completionChildren = [];
                 } else {
-                    const node = getNodeByNodeCallee(this.app, typeNamespace + '.' + typeName) as Structure;
+                    const node = getNodeByNodeCallee(this.app, typeNamespace + '.' + typeName);
                     const properties = node?.properties || [];
                     completionChildren = properties;
                 }
             } else if (typeKind === 'generic') {
-                const node = getNaslNodeByNodeCallee(typeNamespace, typeName) as Structure;
-                const properties = (node?.properties && [...node?.properties]) || [];
+                const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
+                const properties = ((node as Structure)?.properties && [...(node as Structure)?.properties]) || [];
                 for (let i = 0; i < properties.length; i++) {
                     const item = properties[i];
                     if (item?.typeAnnotation?.typeKind === 'typeParam') {

package/src/concepts/ViewElement__.ts

@@ -67,7 +67,7 @@ export interface ElementToVueOptions {
     attrFormat?: (attr: BindAttribute | BindEvent | BindDirective, element?: ViewElement, defaultResult?: string) => string | false;
     bindStylesFormat?: (bindStyles: BindStyle[], element?: ViewElement, defaultResult?: string) => string | false;
     finalCode?: boolean;
-    scopeList?: string[];
+    currentList?: string[];
 }
 
 function transAstNodeToNaslNode(astNode: any, namespace?: string): any {
@@ -1448,7 +1448,7 @@ export class ViewElement extends BaseNode {
         if (this.tag === 'template' && this.haveScope()) {
             const slotTarget = !this.slotTarget ? 'slotDefault' : 'slot' + this.toFirstUpper(this.toHump(this.slotTarget));
             let code = '';
-            code += `${slotTarget}: (scope${levelIndex === 0 ? '' : levelIndex})=> [\n`;
+            code += `${slotTarget}: (current${levelIndex === 0 ? '' : levelIndex})=> [\n`;
             levelIndex++;
             this.children.forEach((element) => {
                 code += element.toEmbeddedTS(shiftState(state, code, {
@@ -1559,6 +1559,7 @@ export class ViewElement extends BaseNode {
     _duplicate() {
         const element = ViewElement.from(this.toTemplateJSON());
         element.deepRenameElements(this);
+        this.view.existingViewElement.clear();
         return element;
     }
 
@@ -1651,7 +1652,7 @@ export class ViewElement extends BaseNode {
             delete astNode.scopedSlots;
         }
 
-        // 提示不支持的字段
+        // 提示不支持的属性
         ['component', 'inlineTemplate', 'pre', 'ns', 'transition', 'transitionOnAppear', 'transitionMode', 'slotName', 'classBinding', 'styleBinding'].forEach((key) => {
             if ((astNode as any)[key])
                 console.warn(`[warn] ViewElement NASL unsupports '${key}' field in node `, astNode);
@@ -1736,7 +1737,7 @@ export class ViewElement extends BaseNode {
                         let args: any[] = [];
                         const argStrs: string[] = argsStr.split(',');
                         args = argStrs
-                            .filter((argStr) => !!argStr && argStr !== '_empty_')
+                            .filter((argStr) => !!argStr)
                             .map((argStr) => {
                                 const keyword = argStr.trim().split('.');
                                 return {
@@ -1901,7 +1902,9 @@ export class ViewElement extends BaseNode {
                                 .replace(/\$utils\['(.+?)'\]/g, '$1')
                                 .replace(/\$refs./g, 'elements.')
                                 .replace(/\$global.userInfo/g, 'nasl.auth.userInfo')
-                                .replace(/\$global./g, 'nasl.');
+                                .replace(/\$global./g, 'nasl.')
+                                .replace(/\bscope\.item\.\b/g, '')
+                                .replace(/\bcurrent\.item\.\b/g, '');
                             return `${name}="{{ ${value} }}"`;
                         });
                     else
@@ -1944,6 +1947,13 @@ export class ViewElement extends BaseNode {
                     }
                 }
 
+                if (['u-router-view', 'van-router-view'].includes(el.tag)) {
+                    const excludes = ['background-color:', 'background:', 'background-image:'];
+                    if (excludes.some((key) => (el.staticStyle && el.staticStyle.includes(key)))) {
+                        parts.push(':designer="false"');
+                    }
+                }
+
                 return parts;
             },
         });
@@ -1953,12 +1963,12 @@ export class ViewElement extends BaseNode {
      * 转换成 Vue 的模板格式
      */
     toVue(options?: ElementToVueOptions) {
-        let scopeList: string[] = [];
-        if (Array.isArray(options?.scopeList)) {
-            scopeList = [...options?.scopeList];
+        let currentList: string[] = [];
+        if (Array.isArray(options?.currentList)) {
+            currentList = [...options?.currentList];
         }
         if (this.slotScope) {
-            scopeList.unshift(this.slotScope);
+            currentList.unshift(this.slotScope);
         }
 
         const newOptions: ElementToVueOptions = Object.assign({
@@ -1970,15 +1980,16 @@ export class ViewElement extends BaseNode {
             getExtraParts: () => [],
             attrFormat: (attr: BindAttribute | BindEvent | BindDirective, element?: ViewElement, defaultResult?: string) => defaultResult,
             bindStylesFormat: (bindStyles: BindStyle[], element?: ViewElement) => {
-                if(bindStyles.length === 0) return false;
+                if (bindStyles.length === 0)
+                    return false;
 
-                return `:style="{${ bindStyles
-                    .map(item => item.toVue())
-                    .filter(item => item !== undefined)
+                return `:style="{${bindStyles
+                    .map((item) => item.toVue())
+                    .filter((item) => item !== undefined)
                     .join(', ')}}"`;
             },
         }, options, {
-            scopeList,
+            currentList,
         });
         const tabString = ' '.repeat(newOptions.tabSize * newOptions.indentLevel);
         const insideTabString = ' '.repeat(newOptions.tabSize * (newOptions.indentLevel + 1));
@@ -2004,8 +2015,8 @@ export class ViewElement extends BaseNode {
             // 注入 asl 的 node-path
             parts.push(`vusion-node-path="${this.nodePath}"`);
         }
-        // 模板里解析时候，可能会有多级嵌套的scope，所以当前有多少的长度，当前就是多大的下标
-        this.slotTarget && parts.push(`#${this.slotTarget}` + (this.slotScope ? `="${scopeList.length > 1 ? this.slotScope + (scopeList.length - 1) : this.slotScope}"` : ''));
+        // 模板里解析时候，可能会有多级嵌套的 current，所以当前有多少的长度，当前就是多大的下标
+        this.slotTarget && parts.push(`#${this.slotTarget}` + (this.slotScope ? `="${currentList.length > 1 ? this.slotScope + (currentList.length - 1) : this.slotScope}"` : ''));
         this.name && parts.push(`ref="${this.name}"`);
         this.staticClass && parts.push(`class="${this.staticClass}"`);
         this.staticStyle && parts.push(`style="${this.staticStyle}"`);
@@ -2016,10 +2027,8 @@ export class ViewElement extends BaseNode {
         });
 
         const bindStyles = newOptions.bindStylesFormat(this.bindStyles, this);
-        if(bindStyles)
+        if (bindStyles)
             parts.push(bindStyles);
-        
-
 
         newOptions.getExtraParts(this).forEach((part) => parts.push(part));
 
@@ -2084,8 +2093,8 @@ export class ViewElement extends BaseNode {
 
     @excludedInJSON()
     computedStyle: object = {};
-    getScopeName() {
-        let scope = 'scope';
+    getCurrentName() {
+        let current = 'current';
         let parent = this.parentNode;
         let index = 0;
         while (parent && parent.concept !== 'View') {
@@ -2094,8 +2103,8 @@ export class ViewElement extends BaseNode {
             }
             parent = parent.parentNode;
         }
-        scope = (index === 0 ? 'scope' : 'scope' + index);
-        return scope;
+        current = (index === 0 ? 'current' : 'current' + index);
+        return current;
     }
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！

package/src/concepts/View__.ts

@@ -5,6 +5,9 @@ import { ElementToVueOptions } from './ViewElement__';
 import { Structure } from './Structure__';
 import MemberExpression from './MemberExpression__';
 import Identifier from './Identifier__';
+import Assignment from './Assignment__';
+import Match from './Match__';
+import BatchAssignment from './BatchAssignment__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -253,8 +256,6 @@ export class View extends BaseNode {
         });
     }
 
-    
-
     /**
     * 插入页面元素
     * @internal
@@ -388,7 +389,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getParamUniqueName(name = 'param1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -526,7 +526,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getVariableUniqueName(name = 'variable1') {
         return utils.unique(name, this.getVarExistingNames(), undefined, false);
     }
@@ -664,7 +663,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getLogicUniqueName(name = 'logic1') {
         return utils.unique(name, this.getLogicExistingNames(), undefined, false);
     }
@@ -802,7 +800,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
     getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return (this.bindEvents || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -944,9 +941,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
-
-
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return (this.children || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1088,9 +1082,6 @@ export class View extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
     * 删除页面元素
     * @param name 页面元素名称
@@ -1139,8 +1130,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1189,8 +1178,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除变量
     * @param name 变量名称
@@ -1239,8 +1226,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1289,8 +1274,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -1339,8 +1322,6 @@ export class View extends BaseNode {
         return params;
     }
 
-
-
     /**
     * 删除页面
     * @param name 页面名称
@@ -1634,6 +1615,7 @@ export class View extends BaseNode {
             first: this.children.find((child) => child.isIndex)?.name,
             auth: this.auth ? 'loginAuth' : undefined,
             viewBindEvents: this.getViewBindEvents(),
+            viewMatchExpressions: this.getViewMatchExpressions(),
         };
         let code = '';
         let mixin = '';
@@ -1763,6 +1745,26 @@ export class View extends BaseNode {
             code += indent((state?.tabSize || 0) + 1);
             code += '];\n';
         }
+        // 需要类型推导的局部变量/返回值需要调整申明顺序
+        const advanceMap: Map<Variable, Assignment | BatchAssignment> = new Map();
+        this.traverseChildren((el) => {
+            if (el && (el instanceof BatchAssignment || (el instanceof Assignment && el.left?.name))) {
+                // 子页面内部逻辑过滤
+                if (el.view !== this)
+                    return;
+                const tsCode = el.toEmbeddedTS();
+                // 逻辑内局部变量、输出参数、输入参数过滤
+                if ((el.logic?.variables || []).find((lVar) => tsCode.includes(`${lVar.name} = `))
+                    || (el.logic?.returns || []).find((lRet) => tsCode.includes(`${lRet.name} = `))
+                    || (el.logic?.params || []).find((lPar) => tsCode.includes(`${lPar.name} = `)))
+                    return;
+                const advanceVar = this.variables?.find((variable) =>
+                    !variable.typeAnnotation && tsCode.includes(`${variable.name} = `));
+                if (advanceVar && !advanceMap.get(advanceVar)) {
+                    advanceMap.set(advanceVar, el);
+                }
+            }
+        });
         if (Array.isArray(this.params)) {
             this.params.forEach((param) => {
                 code += indent((state?.tabSize || 0) + 1) + 'let ';
@@ -1772,11 +1774,35 @@ export class View extends BaseNode {
         }
         if (Array.isArray(this.variables)) {
             this.variables.forEach((variable) => {
-                code += indent((state?.tabSize || 0) + 1) + 'let ';
-                code += variable.toEmbeddedTS(shiftState(state, code, { inline: true }));
-                code += ';\n';
+                if (!advanceMap.get(variable)) {
+                    code += indent((state?.tabSize || 0) + 1) + 'let ';
+                    code += variable.toEmbeddedTS(shiftState(state, code, { inline: true }));
+                    code += ';\n';
+                }
             });
         }
+        advanceMap.forEach((assignment, variable) => {
+            code += indent((state?.tabSize || 0) + 1) + 'let ';
+            code += variable.toEmbeddedTS(shiftState(state, code, { inline: true }));
+            code += ' = ';
+            if (assignment instanceof BatchAssignment) {
+                assignment.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
+                    const leftCode = leftIndex.length === 1 ? assignment.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true })) : assignment.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true }));
+                    if (leftCode === variable.name) {
+                        const rightCode = rightIndex.length === 1 ? assignment.rights[rightIndex[0]]?.expression?.toEmbeddedTS(shiftState(state, code, { inline: true })) : assignment.rights[rightIndex[0]]?.members[rightIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true }));
+                        code += this.getRightCode(rightCode, assignment);
+                    }
+                });
+            } else {
+                // 因为右侧枚举要赋值就得new 一下；
+                if (assignment.right && assignment.right instanceof Identifier && assignment.right.namespace && assignment.right.namespace.endsWith('enums')) {
+                    code += 'new ';
+                }
+                const rightCode = (assignment.right && assignment.right.toEmbeddedTS) ? assignment.right.toEmbeddedTS(shiftState(state, code, { inline: true })) : '__RIGHT__';
+                code += this.getRightCode(rightCode, assignment);
+            }
+            code += ';\n';
+        });
 
         // elements类型声明定义
         code += `interface __elements {\n`;
@@ -1911,7 +1937,7 @@ export class View extends BaseNode {
                         if (logic.name.startsWith('__')) {
                             return;
                         }
-                        // 绑定参数才有event 的scope
+                        // 绑定参数才有 event 的 current
                         logic.virtualParams = bindEvent.getContextRenderLogicParams(logic);
                         logics.push(logic);
                     });
@@ -1977,6 +2003,33 @@ export class View extends BaseNode {
         return bindEvents;
     }
 
+    getViewMatchExpressions() {
+        const bindMatchExpressions: Array<Match> = [];
+        this.elements.forEach((item) => {
+            utils.traverse((current) => {
+                const { node } = current as any;
+                if (node.concept === 'Match') {
+                    bindMatchExpressions.push(node as Match);
+                }
+            }, {
+                node: item,
+            }, { mode: 'anyObject',
+                depthFirst: true,
+                excludedKeySet: new Set([
+                    'parentNode',
+                    'sourceMap',
+                    'storageJSON',
+                    'tsErrorDetail',
+                    'NaslAnnotatedJSON',
+                    'calledFrom',
+                    '_events',
+                    '_collectingList',
+                    '_historyList',
+                ]) });
+        });
+        return bindMatchExpressions;
+    }
+
     /**
      * @param path 子路径
      * 比如当前页面路径为：/dashboard
@@ -2053,6 +2106,47 @@ export class View extends BaseNode {
         }
     }
 
+    getRightCode(code: string, assignment: Assignment | BatchAssignment): string {
+        const logic = assignment.logic;
+        // view 局部变量，申明提升前增加判断，使用 logic 内的 result 直接替换成对应 logic，logic 内部变量替换成 null
+        if (code.includes('result')) {
+            code = code.replace(/result(\d)*/g, `${logic.name}(${logic.params.map(() => 'null').join(',')})`);
+            logic.params.forEach((param) => {
+                if (code.includes(param.name))
+                    code = code.replace(param.name, 'null');
+            });
+            logic.variables.forEach((variable) => {
+                if (code.includes(variable.name))
+                    code = code.replace(variable.name, 'null');
+            });
+            logic.returns.forEach((rtn) => {
+                if (code.includes(rtn.name))
+                    code = code.replace(rtn.name, 'null');
+            });
+            return code;
+        } else {
+            // 直接赋值 logic 内局部变量、输入参数直接提示系统无法推断类型
+            let hasVar = false;
+            logic.params.forEach((param) => {
+                if (code.includes(param.name))
+                    hasVar = true;
+            });
+            if (!hasVar) {
+                logic.variables.forEach((variable) => {
+                    if (code.includes(variable.name))
+                        hasVar = true;
+                });
+            }
+            if (!hasVar) {
+                logic.returns.forEach((rtn) => {
+                    if (code.includes(rtn.name))
+                        hasVar = true;
+                });
+            }
+            return hasVar ? 'null' : code;
+        }
+    }
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

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

@@ -20,54 +20,6 @@ export const collectionStructures = [
             }),
         ],
     }),
-    new Structure({
-        name: 'PageOf',
-        typeParams: [
-            new TypeParam({
-                name: 'T',
-            }),
-        ],
-        properties: [
-            new StructureProperty({
-                name: 'content',
-                typeAnnotation: TypeAnnotation.createGeneric('List', {
-                    typeArguments: [TypeAnnotation.createTypeParam('T')],
-                }),
-            }),
-            new StructureProperty({
-                name: 'number',
-                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
-            }),
-            new StructureProperty({
-                name: 'size',
-                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
-            }),
-            new StructureProperty({
-                name: 'numberOfElements',
-                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
-            }),
-            new StructureProperty({
-                name: 'last',
-                typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
-            }),
-            new StructureProperty({
-                name: 'totalPages',
-                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
-            }),
-            new StructureProperty({
-                name: 'first',
-                typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
-            }),
-            new StructureProperty({
-                name: 'empty',
-                typeAnnotation: TypeAnnotation.createPrimitive('Boolean'),
-            }),
-            new StructureProperty({
-                name: 'totalElements',
-                typeAnnotation: TypeAnnotation.createPrimitive('Integer'),
-            }),
-        ],
-    }),
     new Structure({
         name: 'Map',
         typeParams: [