@lcap/nasl 3.5.0-beta.3 → 3.5.0-beta.5

package/src/templator/genUpdateBlock.ts

@@ -308,6 +308,7 @@ function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
 // 生成修改区块
 export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
   const likeComponent = oldNode?.likeComponent;
+  const isBusinessComponent = likeComponent.concept === 'BusinessComponent';
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
   const { ns } = entity;
@@ -357,7 +358,7 @@ export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
 {
     "viewParams": [
         {
-            "concept": "Param",
+            "concept": "${isBusinessComponent ? 'ParamWithGroup' : 'Param'}",
             "name": "${nameGroup.viewParamId}",
             "typeAnnotation": ${JSON.stringify(NaslCoreTypeAnnotation.Long)}
         }

package/src/templator/utils.ts

@@ -137,11 +137,11 @@ export function genUniqueQueryNameGroup(
   suffix: string = ''
 ) {
   const result: NameGroup = {};
-  result.viewLogicLoad = view.getLogicUniqueName(`load${defaultInView ? '' : capFirstLetter(componentName)}${suffix ? capFirstLetter(suffix) : ''}`);
-  result.logic = scope.getLogicUniqueName(
+  result.viewLogicLoad = view?.getLogicUniqueName?.(`load${defaultInView ? '' : capFirstLetter(componentName)}${suffix ? capFirstLetter(suffix) : ''}`);
+  result.logic = scope?.getLogicUniqueName?.(
     `load${capFirstLetter(view.name)}${componentName ? capFirstLetter(componentName) : ''}${suffix ? capFirstLetter(suffix) : ''}`
   );
-  result.structure = scope.getStructureUniqueName(utils.firstUpperCase(`${result.logic}Structure`));
+  result.structure = scope?.getStructureUniqueName?.(utils.firstUpperCase(`${result.logic}Structure`));
   return result;
 }
 

package/src/translator/types.ts

@@ -48,6 +48,10 @@ export interface TranslatorState {
   finalCode?: boolean;
   focusedNodePath?: string;
   getVuePrototype?: boolean;
+
+  // CallLogic 节点翻译时不使用立即运行函数
+  callLogicNoIife?: boolean;
+  blankNodePath?: string;
 }
 
 export type SourceMapItem = Range;

package/src/translator/utils.ts

@@ -31,6 +31,8 @@ export function createCompilerState(startCode: string = '', options?: Partial<Tr
 export function shiftPosition(pos: Position, code: string = ''): Position {
   const res = { ...pos};
   if (code) {
+    if (typeof code !== 'string') 
+      console.log(code);
     const arr = code.split('\n');
     res.offset += code.length;
     res.line += arr.length - 1;
@@ -61,7 +63,7 @@ export function isSameRange(rangeA: Range, rangeB : Range) {
 /**
  * 翻译方法修饰器
  *
- * @deprecated
+ * 只为 toNaturalTS 用
  * @description 旧的翻译方法修饰器，现在用`withSourceMapGenerator`
  */
 export function withSourceMap() {
@@ -72,6 +74,7 @@ export function withSourceMap() {
     descriptor.value = function (this: BaseNode, state?: TranslatorState, ...args: any[]) {
       // 重新生成ts代码就先把类型清除掉
       // 注意排查错误的时候，调用了这个方法，就会把节点上缓存的__TypeAnnotation清除
+
       try {
         this.__isCorrectTypeAnnotation = false;
       } catch (err) {}
@@ -79,43 +82,45 @@ export function withSourceMap() {
         // 没有状态不生成 SourceMap
         return oldMethod.call(this, state, ...args);
       }
-        // state = Object.freeze(Object.assign({
-        //   position: { line: 0, character: 0, offset: 0 },
-        //   tabSize: 0,
-        // }, state));
-
-        let before: string = '';
-        if (!state.inline) {
-          before = indent((state?.tabSize || 0));
-          state = shiftState(state, before);
-        } else {
-          state = shiftState(state, before, {
-            inline: undefined,
-          });
-        }
+      
+      // state = Object.freeze(Object.assign({
+      //   position: { line: 0, character: 0, offset: 0 },
+      //   tabSize: 0,
+      // }, state));
+
+      let before: string = '';
+      if (!state.inline) {
+        before = indent((state?.tabSize || 0));
+        state = shiftState(state, before);
+      } else {
+        // state = shiftState(state, before, {
+        //   inline: undefined,
+        // });
+      }
 
-        if (isNatural && state.focusedNodePath) {
-          const needAddComment = this.nodePath === state.focusedNodePath;
-          // if (!needAddComment) {
-          //   const parts = state.focusedNodePath.split('.');
-          //   const lastPart = parts.pop();
-          // }
-          if (needAddComment) {
-            const beforeComment = `// 当前位置\n${before}`;
-            before += beforeComment;
-            state = shiftState(state, beforeComment);
-          }
+      if (isNatural && state.focusedNodePath) {
+        const needAddComment = this.nodePath === state.focusedNodePath;
+        // if (!needAddComment) {
+        //   const parts = state.focusedNodePath.split('.');
+        //   const lastPart = parts.pop();
+        // }
+        if (needAddComment) {
+          const beforeComment = `// 当前位置\n${before}`;
+          before += beforeComment;
+          state = shiftState(state, beforeComment);
         }
+      }
 
-        // 调用真实方法, 可能有剩余参数
-        const code = oldMethod.call(this, state, ...args);
+      // 调用真实方法, 可能有剩余参数
+      // ${(this as any).tsKeyword || '__IDENTIFIER__'}:
+      const code = target && this.nodePath === state.blankNodePath ? (this.concept === 'Argument' && args[1] ? `__BLANK__` : '__BLANK__') : oldMethod.call(this, state, ...args);
 
-        state.sourceMap?.set(this, {
-          start: state.position,
-          end: shiftPosition(state.position, code),
-        });
+      state.sourceMap?.set(this, {
+        start: state.position,
+        end: shiftPosition(state.position, code),
+      });
 
-        return before + code;
+      return before + code;
     };
 
     return descriptor;
@@ -160,8 +165,19 @@ export function withSourceMapGenerator(target: any, key: string, descriptor: Pro
     const code = yield* oldMethod.call(this, state, ...args);
     yield;
 
+    const start = {
+      ...state.position
+    };
+    if (this.concept === 'BusinessComponent') {
+      const lines: string[] = code.split('\n');
+      const lineOffset = lines.findIndex((item) => item.startsWith('export class '));
+      if (lineOffset) {
+        start.line = start.line + lineOffset + 1;
+        start.offset = 13;
+      }
+    }
     state.sourceMap?.set(this, {
-      start: state.position,
+      start,
       end: shiftPosition(state.position, code),
     });
 
@@ -222,3 +238,26 @@ export function transfromUnionTypeAnnotation(expTypeAnnotation: TypeAnnotation,
     })
   }
 }
+
+export function createDecoratorCode<T>(state: TranslatorState, node: T, properties: Array<keyof T>) {
+  let code = '@(';
+
+  for (const prop of properties) {
+    const value = node[prop] as any;
+    if (value === undefined || value === null) continue;
+
+    if (properties.length > 1) code += `\n${indent(state.tabSize + 1)}`;
+    if (value === true)
+      code += `${String(prop)}`;
+    else
+      code += `${String(prop)} = ${JSON.stringify(value)}`;
+
+    if (properties.length > 1) code += `,`;
+  }
+
+  if (code === '@(') return '';
+  if (properties.length > 1) code += `\n${indent(state.tabSize)}`;
+  
+  code += `)\n${indent(state.tabSize)}`;
+  return code;
+}

package/src/utils/string.ts

@@ -69,11 +69,11 @@ export function unique(
       }
       if (Array.isArray(set))
         // return set.includes(_key);
-        return set.some((s) => s.toLowerCase() === lkey);
+        return set.some((s) => s?.toLowerCase?.() === lkey);
 
       // return set[_key];
       const keys = Object.keys(set);
-      return keys.some((k) => k.toLowerCase() === lkey);
+      return keys.some((k) => k?.toLowerCase?.() === lkey);
     };
   } else {
     has = (_key: string) => {

package/src/utils/time-slicing/performance.ts

@@ -28,16 +28,16 @@ export class Performance {
   }
 
   mark(name: string) {
-    return performance.mark(this.getPerformanceId(name));
+    return performance?.mark?.(this.getPerformanceId(name));
   }
 
   measure(name: string, startMark: string, endMark: string) {
-    return performance.measure(this.getPerformanceId(name), this.getPerformanceId(startMark), this.getPerformanceId(endMark));
+    return performance?.measure?.(this.getPerformanceId(name), this.getPerformanceId(startMark), this.getPerformanceId(endMark));
   }
 
   clearByNames(...names: string[]) {
     for (const name of names) {
-      const entry = performance.getEntriesByName(this.getPerformanceId(name))[0];
+      const entry = performance?.getEntriesByName?.(this.getPerformanceId(name))[0];
 
       if (entry) {
         this.clearEntry(entry);

package/test/concepts/call-interface/__snapshots__/getQuickInfoOffset.spec.ts.snap

@@ -33,7 +33,7 @@ Object {
 
 exports[`call-interface:getQuickInfoOffset with-body-no-argument 1`] = `
 Object {
-  "code": "apis.a123456.interfaces.with_body({param1:__IDENTIFIER__});
+  "code": "apis.a123456.interfaces.with_body({param1:undefined});
 ",
   "line": 1,
   "offset": 25,
@@ -60,7 +60,7 @@ Object {
 
 exports[`call-interface:getQuickInfoOffset with-headers-no-argument 1`] = `
 Object {
-  "code": "apis.a123456.interfaces.with_headers({param1:__IDENTIFIER__, param2:__IDENTIFIER__});
+  "code": "apis.a123456.interfaces.with_headers({param1:__IDENTIFIER__, param2:undefined});
 ",
   "line": 1,
   "offset": 25,
@@ -78,7 +78,7 @@ Object {
 
 exports[`call-interface:getQuickInfoOffset with-query-no-argument 1`] = `
 Object {
-  "code": "apis.a123456.interfaces.with_query({param1:__IDENTIFIER__, param2:__IDENTIFIER__});
+  "code": "apis.a123456.interfaces.with_query({param1:__IDENTIFIER__, param2:undefined});
 ",
   "line": 1,
   "offset": 25,

package/test/concepts/call-interface/__snapshots__/toEmbeddedTS.spec.ts.snap

@@ -28,7 +28,7 @@ exports[`call-interface:toEmbeddedTS with-body-complex-argument 1`] = `
 `;
 
 exports[`call-interface:toEmbeddedTS with-body-no-argument 1`] = `
-"apis.a123456.interfaces.with_body({ param1: __IDENTIFIER__ });
+"apis.a123456.interfaces.with_body({ param1: undefined });
 "
 `;
 
@@ -50,7 +50,7 @@ exports[`call-interface:toEmbeddedTS with-headers 1`] = `
 exports[`call-interface:toEmbeddedTS with-headers-no-argument 1`] = `
 "apis.a123456.interfaces.with_headers({
   param1: __IDENTIFIER__,
-  param2: __IDENTIFIER__,
+  param2: undefined,
 });
 "
 `;
@@ -65,7 +65,7 @@ exports[`call-interface:toEmbeddedTS with-query 1`] = `
 exports[`call-interface:toEmbeddedTS with-query-no-argument 1`] = `
 "apis.a123456.interfaces.with_query({
   param1: __IDENTIFIER__,
-  param2: __IDENTIFIER__,
+  param2: undefined,
 });
 "
 `;

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

@@ -116,6 +116,205 @@ exports[`view-element:toEmbeddedTS default-not-found 1`] = `
 "
 `;
 
+exports[`view-element:toEmbeddedTS table-data-source-calllogic-with-server-validation 1`] = `
+"new nasl.ui.uLinearLayout({
+  name: __elements.uLinearLayout1,
+  bindAttr: () => [() => {}, () => {}],
+  slotDefault: () => {
+    return [
+      new nasl.ui.uLinearLayout({
+        name: __elements.linear_layout_1,
+        bindAttr: () => [() => {}],
+        slotDefault: () => {
+          type datasourceNametableView_1 = nasl.ui.GetItemTypeFromDataSource<
+            typeof app.logics.loadTestTableView_1
+          >;
+
+          return [
+            new nasl.ui.uTableView<datasourceNametableView_1>({
+              name: __elements.tableView_1,
+              bindAttr: () => [
+                () => {
+                  (() => {
+                    const wrapper = nasl.util.callLogicWithChecker(
+                      app.logics.loadTestTableView_1,
+                      (page, size, sort, order, filter) => {
+                        () => {};
+                      }
+                    );
+                    return wrapper(
+                      __elements_completionProperty[\\"tableView_1\\"].pageNumber,
+                      __elements_completionProperty[\\"tableView_1\\"].pageSize,
+                      __elements_completionProperty[\\"tableView_1\\"].sorting
+                        .field,
+                      __elements_completionProperty[\\"tableView_1\\"].sorting
+                        .order,
+                      filter
+                    );
+                  })();
+                },
+                () => {},
+                () => {},
+                () => {},
+                () => {},
+                () => {},
+                () => {},
+              ],
+              slotDefault: () => {
+                return [
+                  new nasl.ui.uTableViewColumn({
+                    name: __elements.table_view_column_1,
+                    bindAttr: () => [() => {}, () => {}],
+                    slotExpander: (current) => {
+                      return [
+                        new nasl.ui.uTableViewExpander({
+                          name: __elements.table_view_expander_1,
+                          bindAttr: () => [
+                            () => {
+                              current.item;
+                            },
+                          ],
+                          slotDefault: () => {
+                            return [];
+                          },
+                        }),
+                      ];
+                    },
+                    slotCell: (current) => {
+                      return [];
+                    },
+                    slotTitle: () => {
+                      return [
+                        new nasl.ui.uText({
+                          name: __elements.text_9,
+                          bindAttr: () => [() => {}],
+                          slotDefault: () => {
+                            return [];
+                          },
+                        }),
+                      ];
+                    },
+                  }),
+
+                  new nasl.ui.uTableViewColumn({
+                    name: __elements.table_view_column_2,
+                    bindAttr: () => [() => {}],
+                    slotExpander: (current) => {
+                      return [
+                        new nasl.ui.uTableViewExpander({
+                          name: __elements.table_view_expander_2,
+                          bindAttr: () => [
+                            () => {
+                              current.item;
+                            },
+                          ],
+                          slotDefault: () => {
+                            return [];
+                          },
+                        }),
+                      ];
+                    },
+                    slotCell: (current) => {
+                      return [
+                        new nasl.ui.uLinearLayout({
+                          name: __elements.linear_layout_4,
+                          bindAttr: () => [() => {}],
+                          slotDefault: () => {
+                            return [
+                              new nasl.ui.uText({
+                                name: __elements.text_10,
+                                bindAttr: () => [
+                                  () => {
+                                    current.item.entity1.createdTime;
+                                  },
+                                ],
+                                slotDefault: () => {
+                                  return [];
+                                },
+                              }),
+                            ];
+                          },
+                        }),
+                      ];
+                    },
+                    slotTitle: () => {
+                      return [
+                        new nasl.ui.uText({
+                          name: __elements.text_11,
+                          bindAttr: () => [() => {}],
+                          slotDefault: () => {
+                            return [];
+                          },
+                        }),
+                      ];
+                    },
+                  }),
+
+                  new nasl.ui.uTableViewColumn({
+                    name: __elements.table_view_column_3,
+                    bindAttr: () => [() => {}],
+                    slotExpander: (current) => {
+                      return [
+                        new nasl.ui.uTableViewExpander({
+                          name: __elements.table_view_expander_3,
+                          bindAttr: () => [
+                            () => {
+                              current.item;
+                            },
+                          ],
+                          slotDefault: () => {
+                            return [];
+                          },
+                        }),
+                      ];
+                    },
+                    slotCell: (current) => {
+                      return [
+                        new nasl.ui.uLinearLayout({
+                          name: __elements.linear_layout_5,
+                          bindAttr: () => [() => {}],
+                          slotDefault: () => {
+                            return [
+                              new nasl.ui.uText({
+                                name: __elements.text_12,
+                                bindAttr: () => [
+                                  () => {
+                                    current.item.entity1.updatedTime;
+                                  },
+                                ],
+                                slotDefault: () => {
+                                  return [];
+                                },
+                              }),
+                            ];
+                          },
+                        }),
+                      ];
+                    },
+                    slotTitle: () => {
+                      return [
+                        new nasl.ui.uText({
+                          name: __elements.text_13,
+                          bindAttr: () => [() => {}],
+                          slotDefault: () => {
+                            return [];
+                          },
+                        }),
+                      ];
+                    },
+                  }),
+                ];
+              },
+            }),
+          ];
+        },
+      }),
+    ];
+  },
+});
+"
+`;
+
 exports[`view-element:toEmbeddedTS with-role-auth 1`] = `
 "new nasl.ui.uLinearLayout({
   name: __elements.uLinearLayout1,

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

@@ -4,14 +4,14 @@ exports[`view-element:toVue default-login 1`] = `
 "<template>
   <u-linear-layout
     :ref=\\"\`uLinearLayout1\`\\"
+    :alignment=\\"\`center\`\\"
+    :justify=\\"\`center\`\\"
+    :type=\\"\`flex\`\\"
     style=\\"
       background: url('/assets/login-bg-1.jpg') no-repeat;
       background-size: cover;
       height: 100vh;
     \\"
-    :alignment=\\"\`center\`\\"
-    :justify=\\"\`center\`\\"
-    :type=\\"\`flex\`\\"
   >
     <u-linear-layout
       :ref=\\"\`uLinearLayout2\`\\"
@@ -49,10 +49,10 @@ exports[`view-element:toVue default-not-found 1`] = `
 "<template>
   <u-linear-layout
     :ref=\\"\`uLinearLayout1\`\\"
-    style=\\"height: 100vh\\"
     :justify=\\"\`center\`\\"
     :type=\\"\`flex\`\\"
     :alignment=\\"\`center\`\\"
+    style=\\"height: 100vh\\"
   >
     <u-linear-layout
       :ref=\\"\`uLinearLayout2\`\\"
@@ -88,14 +88,135 @@ exports[`view-element:toVue default-not-found 1`] = `
 "
 `;
 
-exports[`view-element:toVue with-role-auth 1`] = `
+exports[`view-element:toVue table-data-source-calllogic-with-server-validation 1`] = `
 "<template>
   <u-linear-layout
     :ref=\\"\`uLinearLayout1\`\\"
+    :type=\\"\`root\`\\"
+    :gap=\\"\`none\`\\"
     style=\\"height: 100%; --custom-start: auto; min-height: 200px\\"
+  >
+    <u-linear-layout
+      :ref=\\"\`linear_layout_1\`\\"
+      :direction=\\"\`vertical\`\\"
+      style=\\"--custom-start: auto\\"
+    >
+      <u-table-view
+        :ref=\\"\`tableView_1\`\\"
+        :data-source=\\"__tableView_1_dataSourceLoad\\"
+        :data-schema=\\"\`LoadTestTableView_1Structure\`\\"
+        :value-field=\\"\`entity1.id\`\\"
+        :pagination=\\"true\\"
+        :show-sizer=\\"true\\"
+        :page-size=\\"20\\"
+        :page-number=\\"1\\"
+        key=\\"tableView_1\\"
+      >
+        <u-table-view-column
+          :ref=\\"\`table_view_column_1\`\\"
+          :type=\\"\`index\`\\"
+          :width=\\"\`60\`\\"
+        >
+          <template #expander=\\"current\\" :ref=\\"\`template_9\`\\">
+            <u-table-view-expander
+              :ref=\\"\`table_view_expander_1_\${
+                (current || {}).__nodeKey || (current || {}).index
+              }\`\\"
+              :item=\\"(current || {}).item\\"
+            ></u-table-view-expander>
+          </template>
+          <template #cell=\\"current\\" :ref=\\"\`template_10\`\\"></template>
+          <template #title :ref=\\"\`template_11\`\\">
+            <u-text :ref=\\"\`text_9\`\\" :text=\\"\`序号\`\\"></u-text>
+          </template>
+        </u-table-view-column>
+        <u-table-view-column
+          :ref=\\"\`table_view_column_2\`\\"
+          :field=\\"\`entity1.createdTime\`\\"
+        >
+          <template #expander=\\"current\\" :ref=\\"\`template_12\`\\">
+            <u-table-view-expander
+              :ref=\\"\`table_view_expander_2_\${
+                (current || {}).__nodeKey || (current || {}).index
+              }\`\\"
+              :item=\\"(current || {}).item\\"
+            ></u-table-view-expander>
+          </template>
+          <template #cell=\\"current\\" :ref=\\"\`template_13\`\\">
+            <u-linear-layout
+              :ref=\\"\`linear_layout_4_\${
+                (current || {}).__nodeKey || (current || {}).index
+              }\`\\"
+              :gap=\\"\`small\`\\"
+            >
+              <u-text
+                :ref=\\"\`text_10_\${
+                  (current || {}).__nodeKey || (current || {}).index
+                }\`\\"
+                :text=\\"
+                  $utils['ToString'](
+                    'undefined',
+                    (((current || {}).item || {}).entity1 || {}).createdTime
+                  )
+                \\"
+              ></u-text>
+            </u-linear-layout>
+          </template>
+          <template #title :ref=\\"\`template_14\`\\">
+            <u-text :ref=\\"\`text_11\`\\" :text=\\"\`创建时间\`\\"></u-text>
+          </template>
+        </u-table-view-column>
+        <u-table-view-column
+          :ref=\\"\`table_view_column_3\`\\"
+          :field=\\"\`entity1.updatedTime\`\\"
+        >
+          <template #expander=\\"current\\" :ref=\\"\`template_15\`\\">
+            <u-table-view-expander
+              :ref=\\"\`table_view_expander_3_\${
+                (current || {}).__nodeKey || (current || {}).index
+              }\`\\"
+              :item=\\"(current || {}).item\\"
+            ></u-table-view-expander>
+          </template>
+          <template #cell=\\"current\\" :ref=\\"\`template_16\`\\">
+            <u-linear-layout
+              :ref=\\"\`linear_layout_5_\${
+                (current || {}).__nodeKey || (current || {}).index
+              }\`\\"
+              :gap=\\"\`small\`\\"
+            >
+              <u-text
+                :ref=\\"\`text_12_\${
+                  (current || {}).__nodeKey || (current || {}).index
+                }\`\\"
+                :text=\\"
+                  $utils['ToString'](
+                    'undefined',
+                    (((current || {}).item || {}).entity1 || {}).updatedTime
+                  )
+                \\"
+              ></u-text>
+            </u-linear-layout>
+          </template>
+          <template #title :ref=\\"\`template_17\`\\">
+            <u-text :ref=\\"\`text_13\`\\" :text=\\"\`更新时间\`\\"></u-text>
+          </template>
+        </u-table-view-column>
+      </u-table-view>
+    </u-linear-layout>
+  </u-linear-layout>
+</template>
+"
+`;
+
+exports[`view-element:toVue with-role-auth 1`] = `
+"<template>
+  <u-linear-layout
+    :ref=\\"\`uLinearLayout1\`\\"
     :type=\\"\`root\`\\"
     :gap=\\"\`none\`\\"
     v-if=\\"$auth.has('/pc/test_2/uLinearLayout1')\\"
+    style=\\"height: 100%; --custom-start: auto; min-height: 200px\\"
   >
     <u-router-view :ref=\\"\`router_view1\`\\"></u-router-view>
   </u-linear-layout>
@@ -107,9 +228,9 @@ exports[`view-element:toVue with-table 1`] = `
 "<template>
   <u-linear-layout
     :ref=\\"\`uLinearLayout1\`\\"
-    style=\\"height: 100%; --custom-start: auto; min-height: 200px\\"
     :type=\\"\`root\`\\"
     :gap=\\"\`none\`\\"
+    style=\\"height: 100%; --custom-start: auto; min-height: 200px\\"
   >
     <u-linear-layout :ref=\\"\`linear_layout1\`\\" :direction=\\"\`vertical\`\\">
       <u-linear-layout :ref=\\"\`linear_layout2\`\\" :justify=\\"\`space-between\`\\">