@lcap/nasl 3.6.0-alpha.7 → 3.6.0-alpha.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "3.6.0-alpha.7",
+  "version": "3.6.0-alpha.8",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "clear": "rimraf ./out",

package/sandbox/stdlib/nasl.oql.ts

@@ -319,8 +319,8 @@ declare namespace nasl.oql {
     export function COMPARE_SUBQUERY<SelectRecord, T extends SelectRecord>(value: T, expr: Query<[SelectRecord]>): nasl.core.Boolean;
     export function ISNULL(value: any): nasl.core.Boolean;
     export function IFNULL<T1, T2>(expr1: T1, expr2: T2): T1 | T2;
-    export function CASE_WHEN<THEN>(caseCase: any, ...caseWhen: Array<[() => THEN, () => THEN]>): THEN;
-    export function CASE_WHEN<THEN>(caseCase: any, caseElse: THEN, ...caseWhen: Array<[() => THEN, () => THEN]>): THEN;
+    export function CASE_WHEN<THEN>(caseCase: any, ...caseWhen: Array<[() => any, () => THEN]>): THEN;
+    export function CASE_WHEN<THEN>(caseCase: any, caseElse: THEN, ...caseWhen: Array<[() => any, () => THEN]>): THEN;
     export function BETWEEN_AND<T>(value: T, between: T, and: T): nasl.core.Boolean;
     export function GROUP_CONCAT(...value: Array<any>): nasl.core.String;
     export function IF<THEN, ELSE>(expr1: nasl.core.Boolean, expr2: THEN, expr3: ELSE): THEN | ELSE;

package/src/concepts/NewComposite__.ts

@@ -1375,7 +1375,7 @@ export class NewComposite extends LogicItem {
           if (['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts)) {
             code += `${indent1}let ${temp}: void = null; \n`;
           } else {
-            code += `${indent1}let ${temp}${ts === 'null' ? ':void' : ''} = ${ts}; \n`;
+            code += `${indent1}let ${temp}${ts === 'null' ? ':any' : ''} = ${ts}; \n`;
           }
         }
       });
@@ -1397,7 +1397,7 @@ export class NewComposite extends LogicItem {
             // 如果是字段是union类型，且赋值的是当前union允许的类型，会导致property.name类型推断成temp的类型
             code += `${indent2}${property.name} = ${property.name} as ${typeTs};\n`;
           } else {
-            code += `nasl.core.Incompatible<typeof ${temp}, void>`;
+            code += `nasl.core.Incompatible<typeof ${temp}, void | any>`;
             code += ` = ${temp};\n`;
           }
         } else if (propertyType) {

package/src/server/translator.ts

@@ -746,7 +746,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
       if (node.parentNode instanceof AnonymousFunction) {
         // 匿名函数：左右参数类型不一致！左边类型：布尔值，右边类型：整数。
         tsErrorDetail.message = tsErrorDetail.message.replace('左右参数', '返回值').replace('左边类型', '接收类型').replace('右边类型', '传入类型');
-      } else if (text === `Type 'void' is not assignable to type 'never'.`) {
+      } else if ([`Type 'void' is not assignable to type 'never'.`, `Type 'any' is not assignable to type 'never'.`].includes(text)) {
         tsErrorDetail.message = `${node.name}推导不出类型！请连线或手动设置`;
       }
     }

package/src/templator/genTableBlock.ts

@@ -305,6 +305,10 @@ export function genTableTemplateTableDesigner(
 ) {
   const currentName = nameGroup.currentName || 'current';
   const properties = entity.properties.filter(filterProperty('inTable'));
+  function getName(name:string) {
+    const _name = name.replace(/[A-Z]/g, (item) => '-' + item.toLowerCase())
+    return _name[0] === '-' ? _name.slice(1) : _name
+  }
   let dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;
   if (['genCurdMultipleKeyBlock'].includes(entryFromCall)) {
     dataSourceValue = `(params) => ${newLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order,${nameGroup.viewVariableFilter})`;
@@ -315,7 +319,7 @@ export function genTableTemplateTableDesigner(
       <u-uploader
         style="--custom-start: auto;margin-right: 5px"
         display="inline"
-        url="/api/${entity.name.toLowerCase()}/import"
+        url="/api/${getName(entity.name)}/import"
         url-field="filePath"
         :limit="999"
         max-size="50MB"

package/test/concepts/new-composite/__snapshots__/getQuickInfoOffset.spec.ts.snap

@@ -7,7 +7,7 @@ Object {
     new nasl.core.Boolean(true);
     let temp0__ = new nasl.core.Boolean(true); 
     function __newComposite() {
-        let property1: nasl.core.Incompatible<typeof temp0__, void> = temp0__;
+        let property1: nasl.core.Incompatible<typeof temp0__, void | any> = temp0__;
         return {
             property1,
             __name: \\"AStructure_AAAAAAAA\\" as const,
@@ -19,7 +19,7 @@ Object {
     new nasl.core.Boolean(true);
     let temp0__ = new nasl.core.Boolean(true); 
     function __newComposite() {
-        let property1: nasl.core.Incompatible<typeof temp0__, void> = temp0__;
+        let property1: nasl.core.Incompatible<typeof temp0__, void | any> = temp0__;
         return {
             property1,
             __name: \\"AStructure_AAAAAAAA\\" as const,
@@ -28,7 +28,7 @@ Object {
     return __newComposite();
 })(); 
     function __newComposite() {
-        let property1: nasl.core.Incompatible<typeof temp0__, void> = temp0__;
+        let property1: nasl.core.Incompatible<typeof temp0__, void | any> = temp0__;
         return {
             property1,
             __name: \\"AStructure_AAAAAAAA\\" as const,
@@ -49,7 +49,7 @@ return         (() => {
         item;
         let temp0__ = item; 
         function __newComposite() {
-            let property1: nasl.core.Incompatible<typeof temp0__, void> = temp0__;
+            let property1: nasl.core.Incompatible<typeof temp0__, void | any> = temp0__;
             return {
                 property1,
                 __name: \\"AStructure_AAAAAAAA\\" as const,
@@ -62,7 +62,7 @@ return         (() => {
         item;
         let temp0__ = item; 
         function __newComposite() {
-            let property1: nasl.core.Incompatible<typeof temp0__, void> = temp0__;
+            let property1: nasl.core.Incompatible<typeof temp0__, void | any> = temp0__;
             return {
                 property1,
                 __name: \\"AStructure_AAAAAAAA\\" as const,
@@ -71,7 +71,7 @@ return         (() => {
         return __newComposite();
     })();}); 
     function __newComposite() {
-        let property1: nasl.core.Incompatible<typeof temp0__, void> = temp0__;
+        let property1: nasl.core.Incompatible<typeof temp0__, void | any> = temp0__;
         return {
             property1,
             __name: \\"AStructure_AAAAAAAA\\" as const,
@@ -90,7 +90,7 @@ Object {
     new nasl.core.String('StringLiteral');
     let temp0__ = new nasl.core.String('StringLiteral'); 
     function __newComposite() {
-        let property1: nasl.core.Incompatible<typeof temp0__, void> = temp0__;
+        let property1: nasl.core.Incompatible<typeof temp0__, void | any> = temp0__;
         return {
             property1,
             __name: \\"AStructure_AAAAAAAA\\" as const,

package/test/concepts/new-composite/__snapshots__/toEmbeddedTS.spec.ts.snap

@@ -6,7 +6,8 @@ exports[`new-composite:toEmbeddedTS nested 1`] = `
     new nasl.core.Boolean(true);
     let temp0__ = new nasl.core.Boolean(true);
     function __newComposite() {
-      let property1: nasl.core.Incompatible<typeof temp0__, void> = temp0__;
+      let property1: nasl.core.Incompatible<typeof temp0__, void | any> =
+        temp0__;
       return {
         property1,
         __name: \\"AStructure_AAAAAAAA\\" as const,
@@ -18,7 +19,8 @@ exports[`new-composite:toEmbeddedTS nested 1`] = `
     new nasl.core.Boolean(true);
     let temp0__ = new nasl.core.Boolean(true);
     function __newComposite() {
-      let property1: nasl.core.Incompatible<typeof temp0__, void> = temp0__;
+      let property1: nasl.core.Incompatible<typeof temp0__, void | any> =
+        temp0__;
       return {
         property1,
         __name: \\"AStructure_AAAAAAAA\\" as const,
@@ -27,7 +29,7 @@ exports[`new-composite:toEmbeddedTS nested 1`] = `
     return __newComposite();
   })();
   function __newComposite() {
-    let property1: nasl.core.Incompatible<typeof temp0__, void> = temp0__;
+    let property1: nasl.core.Incompatible<typeof temp0__, void | any> = temp0__;
     return {
       property1,
       __name: \\"AStructure_AAAAAAAA\\" as const,
@@ -45,7 +47,8 @@ exports[`new-composite:toEmbeddedTS nested-transform 1`] = `
       item;
       let temp0__ = item;
       function __newComposite() {
-        let property1: nasl.core.Incompatible<typeof temp0__, void> = temp0__;
+        let property1: nasl.core.Incompatible<typeof temp0__, void | any> =
+          temp0__;
         return {
           property1,
           __name: \\"AStructure_AAAAAAAA\\" as const,
@@ -59,7 +62,8 @@ exports[`new-composite:toEmbeddedTS nested-transform 1`] = `
       item;
       let temp0__ = item;
       function __newComposite() {
-        let property1: nasl.core.Incompatible<typeof temp0__, void> = temp0__;
+        let property1: nasl.core.Incompatible<typeof temp0__, void | any> =
+          temp0__;
         return {
           property1,
           __name: \\"AStructure_AAAAAAAA\\" as const,
@@ -69,7 +73,7 @@ exports[`new-composite:toEmbeddedTS nested-transform 1`] = `
     })();
   });
   function __newComposite() {
-    let property1: nasl.core.Incompatible<typeof temp0__, void> = temp0__;
+    let property1: nasl.core.Incompatible<typeof temp0__, void | any> = temp0__;
     return {
       property1,
       __name: \\"AStructure_AAAAAAAA\\" as const,
@@ -85,7 +89,7 @@ exports[`new-composite:toEmbeddedTS normal 1`] = `
   new nasl.core.String(\\"StringLiteral\\");
   let temp0__ = new nasl.core.String(\\"StringLiteral\\");
   function __newComposite() {
-    let property1: nasl.core.Incompatible<typeof temp0__, void> = temp0__;
+    let property1: nasl.core.Incompatible<typeof temp0__, void | any> = temp0__;
     return {
       property1,
       __name: \\"AStructure_AAAAAAAA\\" as const,

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

@@ -103,200 +103,150 @@ 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
-                    );
+"new nasl.ui.ULinearLayout({
+  _name: __elements.uLinearLayout1,
+  slotDefault: () => [
+    new nasl.ui.ULinearLayout({
+      _name: __elements.linear_layout_1,
+      slotDefault: () => [
+        new nasl.ui.UTableView({
+          _name: __elements.tableView_1,
+          dataSource: (() => {
+            return (() => {
+              const wrapper = nasl.util.callLogicWithChecker(
+                app.logics.loadTestTableView_1,
+                (page, size, sort, order, filter) => {
+                  rules: ((): any => {
+                    return;
                   })();
-                },
-                () => {},
-                () => {},
-                () => {},
-                () => {},
-                () => {},
-                () => {},
+                }
+              );
+              return wrapper(
+                __elements[\\"tableView_1\\"].page,
+                __elements[\\"tableView_1\\"].size,
+                __elements[\\"tableView_1\\"].sort,
+                __elements[\\"tableView_1\\"].order,
+                filter
+              );
+            })();
+          })(),
+          valueField: (item) => item.entity1.id,
+          pagination: ((): any => {
+            return true;
+          })(),
+          showSizer: ((): any => {
+            return true;
+          })(),
+          pageSize: ((): any => {
+            return 20;
+          })(),
+          pageNumber: ((): any => {
+            return 1;
+          })(),
+          slotDefault: () => [
+            new nasl.ui.UTableViewColumn({
+              _name: __elements.table_view_column_1,
+              type: ((): any => {
+                return \\"index\\";
+              })(),
+              width: ((): any => {
+                return \\"60\\";
+              })(),
+              slotExpander: (current) => [
+                new nasl.ui.UTableViewExpander({
+                  _name: __elements.table_view_expander_1,
+                  item: ((): any => {
+                    return current.item;
+                  })(),
+                }),
               ],
-              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 [];
-                          },
-                        }),
-                      ];
-                    },
-                  }),
+              slotCell: (current) => [],
+              slotTitle: () => [
+                new nasl.ui.UText({
+                  _name: __elements.text_9,
+                  text: ((): any => {
+                    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_2,
+              field: ((): any => {
+                return \\"entity1.createdTime\\";
+              })(),
+              slotExpander: (current) => [
+                new nasl.ui.UTableViewExpander({
+                  _name: __elements.table_view_expander_2,
+                  item: ((): any => {
+                    return current.item;
+                  })(),
+                }),
+              ],
+              slotCell: (current) => [
+                new nasl.ui.ULinearLayout({
+                  _name: __elements.linear_layout_4,
+                  slotDefault: () => [
+                    new nasl.ui.UText({
+                      _name: __elements.text_10,
+                      text: ((): any => {
+                        return current.item.entity1.createdTime;
+                      })(),
+                    }),
+                  ],
+                }),
+              ],
+              slotTitle: () => [
+                new nasl.ui.UText({
+                  _name: __elements.text_11,
+                  text: ((): any => {
+                    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 [];
-                          },
-                        }),
-                      ];
-                    },
-                  }),
-                ];
-              },
+            new nasl.ui.UTableViewColumn({
+              _name: __elements.table_view_column_3,
+              field: ((): any => {
+                return \\"entity1.updatedTime\\";
+              })(),
+              slotExpander: (current) => [
+                new nasl.ui.UTableViewExpander({
+                  _name: __elements.table_view_expander_3,
+                  item: ((): any => {
+                    return current.item;
+                  })(),
+                }),
+              ],
+              slotCell: (current) => [
+                new nasl.ui.ULinearLayout({
+                  _name: __elements.linear_layout_5,
+                  slotDefault: () => [
+                    new nasl.ui.UText({
+                      _name: __elements.text_12,
+                      text: ((): any => {
+                        return current.item.entity1.updatedTime;
+                      })(),
+                    }),
+                  ],
+                }),
+              ],
+              slotTitle: () => [
+                new nasl.ui.UText({
+                  _name: __elements.text_13,
+                  text: ((): any => {
+                    return \\"更新时间\\";
+                  })(),
+                }),
+              ],
             }),
-          ];
-        },
-      }),
-    ];
-  },
+          ],
+        }),
+      ],
+    }),
+  ],
 });
 "
 `;

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

@@ -103,7 +103,15 @@ exports[`view-element:toVue table-data-source-calllogic-with-server-validation 1
     >
       <u-table-view
         :ref=\\"\`tableView_1\`\\"
-        :data-source=\\"__tableView_1_dataSourceLoad\\"
+        :data-source=\\"
+          loadTestTableView_1(
+            $refs['tableView_1']?.paging?.number,
+            $refs['tableView_1']?.paging?.size,
+            $refs['tableView_1']?.sorting?.field,
+            $refs['tableView_1']?.sorting?.order,
+            filter
+          )
+        \\"
         :data-schema=\\"\`LoadTestTableView_1Structure\`\\"
         :value-field=\\"\`entity1.id\`\\"
         :pagination=\\"true\\"