@lcap/nasl 3.7.4-beta.1 → 3.7.4-beta.3

package/src/generator/genBundleFiles.ts

@@ -426,8 +426,16 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
             } else if(window.parent.isGlobalScaleTop) {
                 // 点击跳转到外部页面时，通知顶层页面
                 document.body.addEventListener('click', (e) => {
-                  if(e.target.href){
-                    parent.location.href = e.target.href;
+                  if(!e.target.href) return;
+                  if(typeof e.target.href !== 'string') return;
+                  if(e.target.tagName !== 'A') return;
+                  try {
+                    const url = new URL(e.target.href);
+                    if(url.host !== location.host){
+                      parent.location.href = e.target.href;
+                    }
+                  } catch(err) {
+                    console.error(err);
                   }
                 });
             }

package/src/generator/release-body/body.ts

@@ -248,7 +248,7 @@ export async function genReleaseBody(app: App, opt: InternalReleaseData) {
 
   files.push(annotationFile);
 
-  // nodejs 环境下某些情况下字符会发生错误，需要转译
+  // nodejs 环境下的极速开发模式，在某些情况下字符会发生错误，需要转译
   if (utils.isNode) {
     files.forEach((file) => {
       file.name = encodeURIComponent(file.name);

package/src/natural/transformTS2UI.ts

@@ -244,7 +244,7 @@ function handleNewExpression(calleeName: String, node: any, type?: string) {
         if (arg?.value) {
           assignmentLines.push(new naslTypes.AssignmentLine({
             leftIndex: [0, index],
-            rightIndex: [index, index],
+            rightIndex: [index, members.length - 1],
           }));
         }
       } else {
@@ -301,7 +301,7 @@ function handleNewExpression(calleeName: String, node: any, type?: string) {
         if (arg?.value) {
           assignmentLines.push(new naslTypes.AssignmentLine({
             leftIndex: [0, index],
-            rightIndex: [index, index],
+            rightIndex: [index, members.length - 1],
           }));
         }
       } else {
@@ -359,7 +359,7 @@ function handleNewExpression(calleeName: String, node: any, type?: string) {
         if (arg?.value) {
           assignmentLines.push(new naslTypes.AssignmentLine({
             leftIndex: [0, index],
-            rightIndex: [index, index],
+            rightIndex: [index, members.length - 1],
           }));
         }
       } else {
@@ -929,14 +929,29 @@ function transformNode2Expression(node: babelTypes.Node, type?: string): any {
     const assignmentLines: any = [];
     node?.properties?.forEach((arg: any, index: number) => {
       properties.push(transformNode2Expression(arg.key, type));
-      rights.push(new naslTypes.SelectMembers({
-        expression: transformNode2Expression(arg?.value, type)
-      }));
-      if (arg?.value) {
-        assignmentLines.push(new naslTypes.AssignmentLine({
-          leftIndex: [0, index],
-          rightIndex: [index],
+      if (arg.value.type === 'MemberExpression') {
+        const expression = flatMemberExpression(arg.value);
+        const members = flatMembers(transformNode2Expression(arg.value, type) as any);
+        rights.push(new naslTypes.SelectMembers({
+          expression: transformNode2Expression(expression[0]),
+          members,
+        }));
+        if (arg?.value) {
+          assignmentLines.push(new naslTypes.AssignmentLine({
+            leftIndex: [0, index],
+            rightIndex: [index, members.length - 1],
+          }));
+        }
+      } else {
+        rights.push(new naslTypes.SelectMembers({
+          expression: transformNode2Expression(arg?.value, type)
         }));
+        if (arg?.value) {
+          assignmentLines.push(new naslTypes.AssignmentLine({
+            leftIndex: [0, index],
+            rightIndex: [index],
+          }));
+        }
       }
       structureProperties.push(new naslTypes.StructureProperty({
         name: arg?.key?.name,
@@ -1244,7 +1259,7 @@ function transformNode2View(node: babelTypes.FunctionDeclaration, root?: babelTy
     }
     if (item.type === 'ReturnStatement' && item?.argument?.type === 'ArrayExpression') {
       viewItem?.forEach((element: any) => {
-        json.push(element.aiParams);
+        if (element.aiParams) json.push(element.aiParams);
       });
     }
     if (viewItem?.concept === 'Variable') {
@@ -1255,7 +1270,7 @@ function transformNode2View(node: babelTypes.FunctionDeclaration, root?: babelTy
     }
     if (viewItem?.concept === 'ViewElement') {
       view.addViewElement(viewItem);
-      json.push(viewItem.aiParams);
+      if (viewItem.aiParams) json.push(viewItem.aiParams);
     }
   });
   // console.log("lemon ~ 转换出的 view:", view);
@@ -1314,7 +1329,7 @@ export function tryTransformTS2UI(tsCode: string, curView?: any): any {
   const replaceNameList = [] as any;
   const selectedNodeNames = [] as any;
   json.forEach((item: any) => {
-    if (item.concept === 'ViewElement' && item.action !== 'remove') {
+    if (item && item.concept === 'ViewElement' && item.action !== 'remove') {
       selectedNodeNames.push(item.selectedNodeName.replace('$refs.', ''));
       const { list } = handleNodeName(newView, item.object.toJSON());
       replaceNameList.push(...list);

package/src/natural/transformTSCode.ts

@@ -230,7 +230,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           if (arg?.value) {
             assignmentLines.push(new naslTypes.AssignmentLine({
               leftIndex: [0, index],
-              rightIndex: [index, index],
+              rightIndex: [index, members.length - 1],
             }));
           }
         } else {
@@ -287,7 +287,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           if (arg?.value) {
             assignmentLines.push(new naslTypes.AssignmentLine({
               leftIndex: [0, index],
-              rightIndex: [index, index],
+              rightIndex: [index, members.length - 1],
             }));
           }
         } else {
@@ -345,7 +345,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           if (arg?.value) {
             assignmentLines.push(new naslTypes.AssignmentLine({
               leftIndex: [0, index],
-              rightIndex: [index, index],
+              rightIndex: [index, members.length - 1],
             }));
           }
         } else {
@@ -1003,14 +1003,29 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
       const assignmentLines: any = [];
       node?.properties?.forEach((arg: any, index: number) => {
         properties.push(transformLogicNode(arg.key));
-        rights.push(new naslTypes.SelectMembers({
-          expression: transformLogicNode(arg?.value)
-        }));
-        if (arg?.value) {
-          assignmentLines.push(new naslTypes.AssignmentLine({
-            leftIndex: [0, index],
-            rightIndex: [index],
+        if (arg.value.type === 'MemberExpression') {
+          const expression = flatMemberExpression(arg.value);
+          const members = flatMembers(transformLogicNode(arg.value) as any);
+          rights.push(new naslTypes.SelectMembers({
+            expression: transformLogicNode(expression[0]),
+            members,
           }));
+          if (arg?.value) {
+            assignmentLines.push(new naslTypes.AssignmentLine({
+              leftIndex: [0, index],
+              rightIndex: [index, members.length - 1],
+            }));
+          }
+        } else {
+          rights.push(new naslTypes.SelectMembers({
+            expression: transformLogicNode(arg?.value)
+          }));
+          if (arg?.value) {
+            assignmentLines.push(new naslTypes.AssignmentLine({
+              leftIndex: [0, index],
+              rightIndex: [index],
+            }));
+          }
         }
         structureProperties.push(new naslTypes.StructureProperty({
           name: arg?.key?.name,

package/src/service/storage/init.ts

@@ -11,7 +11,7 @@ import * as jsoner from './jsoner';
 /// #if !process.env.NODE_ENV || process.env.BUILD_TARGET === 'node'
 import * as fs from 'fs-extra';
 import type { NaslServer } from 'src/server/naslServer';
-import { NaslCacheData, NaslData } from 'src/utils/language-cache';
+import { NaslData } from 'src/utils/language-cache';
 /// #endif
 
 export const batchQuery = storageService.batchQuery;
@@ -19,6 +19,7 @@ export const batchAction = storageService.batchAction;
 export const batchInstruct = storageService.batchInstruct;
 export const breakpoint = storageService.breakpoint;
 
+let globalBatchInstructResult: BatchInstructResult = null;
 let tabTimestamp: string;
 export const databaseTypes = storageService.databaseTypes;
 
@@ -414,6 +415,23 @@ const isBreakpointEvent = (event: any) => {
   return keys[0] === 'breakpoint';
 };
 
+export function updateNaslCache(app: App, batchInstructResult?: BatchInstructResult) {
+  const result = batchInstructResult ?? globalBatchInstructResult;
+
+  if (result) {
+    if (isDebugMode) {
+      console.dir('更新 Nasl 缓存');
+    }
+
+    return LsCache.updateNaslCache(app.id, {
+      ...result,
+      getData: () => cloneDeep(app.toJSON()),
+    });
+  }
+
+  return Promise.resolve();
+}
+
 /**
  *  执行更新
  */
@@ -998,11 +1016,10 @@ async function _saveNasl(options: TaskOption) {
   }
   app.emit?.('saved', err);
 
+  globalBatchInstructResult = res;
+
   // 更新缓存
-  await LsCache.updateNaslCache(app.id, {
-    ...res,
-    getData: () => cloneDeep(app.toJSON()),
-  });
+  // updateNaslCache(app, batchInstructResult);
 
   return err;
 }

package/src/templator/genCreateBlock.ts

@@ -94,7 +94,7 @@ export function genCreateFormTemplate(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;
@@ -211,7 +211,7 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
           formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${property.label || property.name
             }" 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') {
             const Enum = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`) as Enum;

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -88,7 +88,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         } 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;
@@ -191,7 +191,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
         } 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;

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -97,7 +97,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         } else if (propertyTypeName === 'DateTime') {
           formItem += `<u-date-time-picker clearable :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;
@@ -222,7 +222,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
           }></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;
@@ -1048,7 +1048,7 @@ export function genFilterTemplateTableDesigner(entity: Entity, nameGroup: NameGr
               } 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;
@@ -1167,7 +1167,7 @@ function genSaveModalTemplateDesigner(
           property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
         }></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;

package/src/templator/genEditTableBlock.ts

@@ -95,7 +95,7 @@ export function genEditTableColumnTemplate(
     } else if (propertyTypeName === 'DateTime') {
       formItem = `<u-date-time-picker :clearable="true" :value.sync="${valueExpression}" placeholder="请输入${label}" appendTo="body" :autofocus="true" :opened="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-date-time-picker>`;
     } else {
-      const namespaceArr = propertyTypeNamespace.split('.');
+      const namespaceArr = propertyTypeNamespace?.split?.('.') || [];
       const type = namespaceArr.pop();
       if (type === 'enums') {
         const enumeration = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`) as Enum;

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(

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>
 "
 `;