@lcap/nasl 3.8.0-beta.6 → 3.8.0-beta.7

package/src/templator/genSelectBlock.ts

@@ -1,6 +1,6 @@
 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, View, DataSource, ViewElement, Logic } from '../concepts';
 import { NameGroup, genUniqueQueryNameGroup, getFirstDisplayedProperty, genQueryLogic, genLogicParam, genCallComponentLogic } from '.';
 import { NaslUITypeAnnotation, NaslCollectionTypeAnnotation, NaslLogicItem, NaslTypeAnnotation, NaslNode } from './utils';
 
@@ -103,7 +103,7 @@ export function genLoadSelectLogic(entity: Entity, nameGroup: NameGroup, newLogi
  * @param view
  * @returns
  */
-export function genSelectBlock(entity: Entity, oldNode: ViewElement, 
+export function genSelectBlock(entity: Entity, oldNode: ViewElement,
   genSelectTemplateLocal?: (property: EntityProperty, nameGroup: NameGroup, newLogic: any) => string ) {
   const likeComponent = oldNode?.likeComponent;
   const dataSource = entity.parentNode as DataSource;
@@ -304,7 +304,7 @@ export function genSelectItemAddLogic(entity: Entity, nameGroup: NameGroup, view
   );
   if (entity && entity.concept === 'Entity') {
     const { ns } = entity;
-    const createLogic = ns?.logics?.find((logic) => logic.name === `create`);
+    const createLogic = ns?.logics?.find((logic : Logic) => logic.name === `create`);
     callLogics.push(
       NaslLogicItem.Assignment({
         left: NaslLogicItem.Identifier({

package/src/templator/genTableBlock.ts

@@ -1,5 +1,5 @@
 import * as utils from '../utils';
-import { App, Module, Namespace, Entity, EntityProperty, View, DataSource, ViewElement } from '../concepts';
+import { App, Module, Namespace, Entity, EntityProperty, View, DataSource, ViewElement, Logic } from '../concepts';
 import {
   filterProperty,
   NameGroup,
@@ -165,7 +165,7 @@ export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
   const currentName = nameGroup.currentName || 'current';
 
   const { ns } = entity;
-  const deleteLogic = ns?.logics?.find((logic) => logic.name === 'delete');
+  const deleteLogic = ns?.logics?.find((logic : Logic) => logic.name === 'delete');
   const idPropertys = entity.properties.filter((property) => property.primaryKey);
   return NaslNode.Logic({
     name: nameGroup.viewLogicRemove,

package/src/templator/genUpdateBlock.ts

@@ -87,7 +87,7 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
         } else if (propertyTypeName === 'DateTime') {
           formItem += `<u-date-time-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
         } else {
-          const namespaceArr = propertyTypeNamespace.split('.');
+          const namespaceArr = propertyTypeNamespace?.split?.('.') || [];
           const type = namespaceArr.pop();
           if (type === 'enums') {
             const Enum = dataSource.app.findNodeByCompleteName(propertyTypeNamespace + '.' + propertyTypeName) as Enum;
@@ -196,7 +196,7 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
         } else if (propertyTypeName === 'DateTime') {
           formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${label}" labelField="" inputAlign="left"></van-datetime-picker></van-linear-layout></template>`;
         } else {
-          const namespaceArr = propertyTypeNamespace.split('.');
+          const namespaceArr = propertyTypeNamespace?.split?.('.') || [];
           const type = namespaceArr.pop();
           if (type === 'enums') {
             formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal">${genEnumSelectBlock(
@@ -295,7 +295,7 @@ function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
 
 // 生成修改区块
 export function genUpdateBlock(entity: Entity, oldNode: ViewElement, useViewVariable = true,
-  genUpdateTemplate?: (entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) => string, 
+  genUpdateTemplate?: (entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) => string,
   genLoadLogicLocal?: (getLogic: Logic, nameGroup: NameGroup, entity?: Entity) => any,
   genSubmitLogicLocal?: (updateLogic: Logic, nameGroup: NameGroup) => any) {
   const likeComponent = oldNode?.likeComponent;
@@ -303,8 +303,8 @@ export function genUpdateBlock(entity: Entity, oldNode: ViewElement, useViewVari
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
   const { ns } = entity;
-  const getLogic = ns?.logics?.find((logic) => logic.name === `get`);
-  const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
+  const getLogic = ns?.logics?.find((logic : Logic) => logic.name === `get`);
+  const updateLogic = ns?.logics?.find((logic : Logic) => logic.name === `update`);
 
   const nameGroup: NameGroup = {};
   nameGroup.viewElementMainView = likeComponent.getViewElementUniqueName('form1');
@@ -364,7 +364,7 @@ export function genUpdateBlock(entity: Entity, oldNode: ViewElement, useViewVari
       )}
       }` : ''
       }
-        
+
     ],
     "viewLogics": [
         ${JSON.stringify((genLoadLogicLocal || genLoadLogic)(getLogic, nameGroup, entity))},

package/src/templator/utils.ts

@@ -19,7 +19,7 @@ export function getExpression(property: EntityProperty, expression: string) {
   if (propertyTypeName === 'DateTime') return `$utils['FormatDateTime'](${expression}, 'YYYY-MM-DD HH:mm:ss')`;
   if (propertyTypeName === 'Date') return `$utils['FormatDate'](${expression}, 'YYYY-MM-DD')`;
 
-  const namespaceArr = propertyTypeNamespace.split('.');
+  const namespaceArr = propertyTypeNamespace?.split?.('.') || [];
   const type = namespaceArr.pop();
   if (type === 'enums') {
     return `$utils['EnumValueToText'](${expression}, '__enumTypeAnnotation_${propertyTypeNamespace}.${propertyTypeName}')`;

package/test/concepts/string-literal/__snapshots__/toVue.spec.ts.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`string-literal:toVue escape 1`] = `
-"<template>\`\\\\\\"123\\\\\\"123\\\\\\\\123\\\\\`\`</template>
+"<template>\`\\\\\\\\\\"123\\\\\\\\\\"123\\\\\\\\\\\\\\\\123\\\\\\\\\`\`</template>
 "
 `;
 

package/test/concepts/view-element/__snapshots__/toVue.spec.ts.snap

@@ -103,7 +103,9 @@ exports[`view-element:toVue table-data-source-calllogic-with-server-validation 1
     >
       <u-table-view
         :ref=\\"\`tableView_1\`\\"
-        :data-source=\\"(params) => __tableView_1_handleDataSourceLoad(params)\\"
+        :data-source=\\"
+          $global.useDatabaseCallback()(__tableView_1_handleDataSourceLoad)
+        \\"
         :data-schema=\\"\`LoadTestTableView_1Structure\`\\"
         :value-field=\\"\`entity1.id\`\\"
         :pagination=\\"true\\"
@@ -271,7 +273,9 @@ exports[`view-element:toVue with-table 1`] = `
       </u-linear-layout>
       <u-table-view
         :ref=\\"\`tableView\`\\"
-        :data-source=\\"(params) => __tableView_handleDataSourceLoad(params)\\"
+        :data-source=\\"
+          $global.useDatabaseCallback()(__tableView_handleDataSourceLoad)
+        \\"
         :data-schema=\\"\`LoadTestTableView2Structure\`\\"
         :value-field=\\"\`entity2.id\`\\"
         :pagination=\\"true\\"