@lcap/nasl 2.18.0-beta.7 → 2.19.0-beta.1

package/src/templator/genGridViewBlock.ts

@@ -1,8 +1,7 @@
 import { config } from '../config';
 import * as utils from '../utils';
-import { App, Module, Namespace, Entity, EntityProperty, View, DataSource, ViewElement } from '../concepts';
+import { App, Module, Namespace, Entity, EntityProperty, DataSource, ViewElement } from '../concepts';
 import {
-    getExpression,
     filterProperty,
     NameGroup,
     genUniqueQueryNameGroup,
@@ -12,7 +11,7 @@ import {
     genCallComponentLogic,
     genQueryLogic,
 } from '.';
-import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslCollectionTypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
+import {  NaslUITypeAnnotation,  NaslLogicItem, NaslNode } from './utils';
 
 /**
  * 根据实体属性生成表格列模板
@@ -23,7 +22,7 @@ export function genGridViewCardTemplate(property: EntityProperty, nameGroup: Nam
     const dataSource = entity.parentNode as DataSource;
     const lowerEntityName = utils.firstLowerCase(entity.name);
     const currentName = nameGroup.currentName || 'current';
-    let expression = `${currentName}.item.${lowerEntityName}.${property.name}`;
+    let valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
     const title = property.label || property.name;
 
     if (property.relationEntity) {
@@ -33,23 +32,24 @@ export function genGridViewCardTemplate(property: EntityProperty, nameGroup: Nam
             const displayedProperty = getFirstDisplayedProperty(relationEntity);
             if (displayedProperty) {
                 const relationLowerEntityName = utils.firstLowerCase(relationEntity.name);
-                expression = getExpression(property, `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`);
+                valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`;
             } else
                 return '';
         } else
             return '';
-    } else
-        expression = getExpression(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
+    } else {
+        valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
 
+    }
     const getText = (property: EntityProperty) => {
         const propertyTypeName = property.typeAnnotation.typeName;
         if (propertyTypeName === 'Boolean') {
             return `
-                <u-text v-if="${expression}" text="是"></u-text>
-                <u-text v-if="!${expression}" text="否"></u-text>
+                <u-text v-if="${valueExpression}" text="是"></u-text>
+                <u-text v-if="!${valueExpression}" text="否"></u-text>
                 `;
         } else {
-            return `<u-text :text="${expression}"></u-text>`;
+            return `<u-text :text="${valueExpression}"></u-text>`;
         }
     };
 
@@ -64,7 +64,7 @@ export function genH5GridViewCardTemplate(property: EntityProperty, nameGroup?:
     const lowerEntityName = utils.firstLowerCase(entity.name);
 
     const currentName = nameGroup.currentName || 'current';
-    let expression = `${currentName}.item.${lowerEntityName}.${property.name}`;
+    let valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
 
     if (property.relationEntity) {
         // 有外键关联
@@ -73,23 +73,23 @@ export function genH5GridViewCardTemplate(property: EntityProperty, nameGroup?:
             const displayedProperty = getFirstDisplayedProperty(relationEntity);
             if (displayedProperty) {
                 const relationLowerEntityName = utils.firstLowerCase(relationEntity.name);
-                expression = getExpression(property, `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`);
+                valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`;
             } else
                 return '';
         } else
             return '';
-    } else
-        expression = getExpression(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
-
+    } else {
+        valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
+    }
     const getText = (property: EntityProperty) => {
         const propertyTypeName = property.typeAnnotation.typeName;
         if (propertyTypeName === 'Boolean') {
             return `
-                <van-text v-if="${expression}" text="是" display="block"></van-text>
-                <van-text v-if="!${expression}" text="否" display="block"></van-text>
+                <van-text v-if="${valueExpression}" text="是" display="block"></van-text>
+                <van-text v-if="!${valueExpression}" text="否" display="block"></van-text>
                 `;
         } else {
-            return `<van-text :text="${expression}" display="block"></van-text>`;
+            return `<van-text :text="${valueExpression}" display="block"></van-text>`;
         }
     };
     return `${getText(property)}`;

package/src/templator/genListViewBlock.ts

@@ -1,24 +1,22 @@
 import { config } from '../config';
 import * as utils from '../utils';
-import { App, Module, Namespace, Entity, EntityProperty, View, DataSource, ViewElement } from '../concepts';
-import { getExpression, genUniqueQueryNameGroup, getFirstDisplayedProperty, genQueryLogic, genQueryStructure, genLogicParam } from '.';
+import { App, Module, Namespace, Entity, EntityProperty,  DataSource, ViewElement } from '../concepts';
+import { genUniqueQueryNameGroup, getFirstDisplayedProperty, genQueryLogic, genLogicParam } from '.';
 import {
-    NameGroup, NaslUITypeAnnotation, NaslCollectionTypeAnnotation,
-    NaslTypeAnnotation, NaslLogicItem, NaslNode,
+    NameGroup, NaslUITypeAnnotation,  NaslLogicItem, NaslNode,
 } from './utils';
 
 export function genListViewTemplate(property: EntityProperty, nameGroup: NameGroup) {
     const entity = property.entity;
     const lowerEntityName = utils.firstLowerCase(entity.name);
     const currentName = nameGroup.currentName || 'current';
-
-    const expression = getExpression(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
+    const valueExpression = `${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="current">
         <u-linear-layout>
-            <u-text :text="${expression}"></u-text>
+            <u-text :text="${valueExpression}"></u-text>
         </u-linear-layout>
     </template>
 </u-list-view>`;
@@ -28,14 +26,13 @@ export function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameG
     const entity = property.entity;
     const lowerEntityName = utils.firstLowerCase(entity.name);
     const currentName = nameGroup.currentName || 'current';
-
-    const expression = getExpression(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
+    const valueExpression = `${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="current">
-        <van-cell :value="${expression}" isLink>
-            <template #title>{{ ${expression} }}</template>
+        <van-cell :value="${valueExpression}" isLink>
+            <template #title>{{ ${valueExpression} }}</template>
         </van-cell>
     </template>
 </van-list-view>`;

package/src/templator/genTableBlock.ts

@@ -1,7 +1,6 @@
 import * as utils from '../utils';
 import { App, Module, Namespace, Entity, EntityProperty, View, DataSource, ViewElement } from '../concepts';
 import {
-    getExpression,
     filterProperty,
     NameGroup,
     genUniqueQueryNameGroup,
@@ -22,27 +21,24 @@ export function genTableColumnTemplate(property: EntityProperty, currentName: st
 
     const dataSource = entity.parentNode as DataSource;
     const lowerEntityName = utils.firstLowerCase(entity.name);
-    let expression = `${currentName}.item.${lowerEntityName}.${property.name}`;
+    let valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
     const title = property.label || property.name;
 
     if (property.relationEntity) {
         const relationLowerEntityName = utils.firstLowerCase(property.relationEntity);
         const relationEntity = dataSource?.findEntityByName(property.relationEntity);
         const displayedProperty = getFirstDisplayedProperty(relationEntity);
-        // 有外键关联
-        expression = getExpression(property, `${currentName}.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`);
-    } else {
-        expression = getExpression(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
+        valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`; 
     }
 
     const getText = (property: EntityProperty) => {
         if (property.typeAnnotation.typeName === 'Boolean') {
             return `
-            <u-text v-if="${expression}" text="是"></u-text>
-            <u-text v-if="!${expression}" text="否"></u-text>
+            <u-text v-if="${valueExpression}" text="是"></u-text>
+            <u-text v-if="!${valueExpression}" text="否"></u-text>
             `;
         } else {
-            return `<u-text :text="${expression}"></u-text>`;
+            return `<u-text :text="${valueExpression}"></u-text>`;
         }
     };
 
@@ -68,7 +64,7 @@ export function genTableTemplate(entity: Entity, nameGroup: NameGroup, modifyabl
     return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
         :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>
+    <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template><template #cell="current"></template></u-table-view-column>
 
     ${properties.map((property) => genTableColumnTemplate(property, currentName) + '\n').join('')}
 

package/ts-worker/dist/webpack.config.dev.js

@@ -16,8 +16,7 @@ module.exports = {
   target: 'webworker',
   resolve: {
     // Use our versions of Node modules.
-    alias: {
-      // fs: 'browserfs/dist/shims/fs.js',
+    alias: {// fs: 'browserfs/dist/shims/fs.js',
       // os: require.resolve('os-browserify/browser'),
       // // path: require.resolve('path-browserify'),
       // buffer: 'browserfs/dist/shims/buffer.js',
@@ -25,7 +24,6 @@ module.exports = {
       // processGlobal: 'browserfs/dist/shims/process.js',
       // bufferGlobal: 'browserfs/dist/shims/bufferGlobal.js',
       // bfsGlobal: require.resolve('browserfs'),
-      ts: path.resolve(__dirname, 'typescript')
     },
     // DISABLE Webpack's built-in process and Buffer polyfills!
     fallback: {

package/ts-worker/lib/tsserver.js

@@ -176736,7 +176736,7 @@ var ts;
 
             function analyzeTypeNode(typeNode) {
                 const typeInfo = {};
-                const { typeName, typeArguments, members } = typeNode || {};
+                const { typeName, typeArguments, members, types } = typeNode || {};
                 if (typeName) {
                     const { left, right } = typeName || {};
                     if (right) {
@@ -176745,6 +176745,8 @@ var ts;
                     if (left) {
                         typeInfo.typeNamespace = analyzeTypeNameSpace(left);
                     }
+                } else if(Array.isArray(types)) {
+                    typeInfo.typeName = 'Union';
                 } else {
                     typeInfo.typeKind = 'anonymousStructure';
                 }
@@ -176753,6 +176755,11 @@ var ts;
                         return analyzeTypeNode(typeArg);
                     });
                 }
+                if (Array.isArray(types)) {
+                    typeInfo.typeArguments = types.map((typeArg) => {
+                        return analyzeTypeNode(typeArg);
+                    });
+                }
                 if (Array.isArray(members)) {
                     const properties = members.map((member) => {
                         const { name, type } = member || {};