@lcap/nasl 3.3.3-beta.8 → 3.3.3-beta.9

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -30,7 +30,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
   const properties = entity.properties.filter(filterProperty('inFilter'));
 
   return `
-<u-linear-layout justify="space-between">
+<u-linear-layout>
     <u-form layout="inline">
     ${properties
       .map((property) => {
@@ -107,9 +107,9 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             <u-button color="primary" @click="${nameGroup.viewLogicReload}">查 询</u-button>
         </u-form-item>
     </u-form>
+    </u-linear-layout>
 
-    <u-linear-layout><u-button color="primary" @click="${nameGroup.viewLogicCreate}">创 建</u-button></u-linear-layout>
-</u-linear-layout>
+    <u-linear-layout mode="flex" alignment="start" justify="end"><u-button color="primary" @click="${nameGroup.viewLogicCreate}">创 建</u-button></u-linear-layout>
     `;
 }
 

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -29,7 +29,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
   const dataSource = entity.parentNode as DataSource;
   const properties = entity.properties.filter(filterProperty('inFilter'));
   return `
-<u-linear-layout justify="space-between">
+<u-linear-layout>
     <u-form layout="inline">
     ${properties
       .map((property) => {
@@ -107,9 +107,9 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             <u-button color="primary" @click="${nameGroup.viewLogicReload}">查 询</u-button>
         </u-form-item>
     </u-form>
+    </u-linear-layout>
 
-    <u-linear-layout><u-button color="primary" @click="${nameGroup.viewLogicCreate}">创 建</u-button></u-linear-layout>
-</u-linear-layout>
+    <u-linear-layout mode="flex" alignment="start" justify="end"><u-button color="primary" @click="${nameGroup.viewLogicCreate}">创 建</u-button></u-linear-layout>
     `;
 }
 

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

@@ -235,8 +235,8 @@ export class TimeSlicingController {
     /// #endif
   }
 
-  run<T = void>(generator: Generator<any, T, void>): Promise<T> {
-    return new Promise<T>((resolve) => {
+  run<T = void>(generator: Generator<any, T, any>): T extends Promise<any> ? T : Promise<T> {
+    return new Promise<any>((resolve) => {
       /** 生成器结果 */
       let result: IteratorResult<void, any> = {
         done: false,
@@ -245,9 +245,18 @@ export class TimeSlicingController {
       /** 异步运行标志 */
       let waitAsync = false;
 
-      const { group } = this;
+      const { group, id } = this;
       const isPromise = (input: unknown): input is Promise<any> => input && input instanceof Promise;
 
+      /** 运行结束 */
+      const runStop = (result: any) => {
+        this.clearState();
+        /// #if process.env.NODE_ENV === 'development'
+        this.displayInfo();
+        console.timeEnd(`时间分片-${id}`);
+        /// #endif
+        resolve(result);
+      };
       /** 运行帧 */
       const runFrame = () => {
         this.setFrameStart();
@@ -280,12 +289,7 @@ export class TimeSlicingController {
 
         // 结束运行
         if (result.done) {
-          this.clearState();
-          /// #if process.env.NODE_ENV === 'development'
-          this.displayInfo();
-          console.timeEnd(`时间分片-${this.id}`);
-          /// #endif
-          resolve(result.value);
+          runStop(result.value);
           return;
         }
 
@@ -304,27 +308,34 @@ export class TimeSlicingController {
         let taskId = 0;
 
         while (!result.done && taskId < group.limit) {
-          const lastIsPromise = isPromise(result.value);
-          const lastParam = lastIsPromise ? this.async.result : result.value;
+          const lastParam = isPromise(result.value) ? this.async.result : result.value;
 
           taskId++;
           result = generator.next(lastParam);
 
-          // 运行完毕
-          if (result.done || taskId >= group.limit) {
-            break;
-          }
-
           // 返回 Promise 时，等待异步任务完成
           if (isPromise(result.value)) {
-            waitAsync = true;
-            this.setAsyncStart();
-            result.value
-              .then(runAsyncTask)
-              .catch(error => generator.throw(error));
+            // 最后返回异步
+            if (result.done) {
+              result.value
+                .then(runStop)
+                .catch(error => generator.throw(error));
+            }
+            // 中途的异步流程
+            else {
+              waitAsync = true;
+              this.setAsyncStart();
+              result.value
+                .then(runAsyncTask)
+                .catch(error => generator.throw(error));
+            }
 
             break;
           }
+          // 运行完毕
+          else if (result.done || taskId >= group.limit) {
+            break;
+          }
         }
 
         // 记录实际运行数量
@@ -332,11 +343,11 @@ export class TimeSlicingController {
       };
 
       /// #if process.env.NODE_ENV === 'development'
-      console.time(`时间分片-${this.id}`);
+      console.time(`时间分片-${id}`);
       /// #endif
 
       // 启动分片
       runFrame();
-    });
+    }) as any;
   }
 }

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

@@ -16,8 +16,8 @@ export function runGeneratorSync<T = void>(generator: Generator<any, T, any>) {
  *
  * @description 异步模式
  */
-export function runGeneratorAsync<T = void>(generator: Generator<any, T, any>): Promise<T> {
-  return new Promise<T>((resolve) => {
+export function runGeneratorAsync<T = void>(generator: Generator<any, T, any>): T extends Promise<any> ? T : Promise<T> {
+  return new Promise((resolve) => {
     let result: IteratorResult<any, T> = {
       done: false,
       value: undefined,
@@ -37,18 +37,16 @@ export function runGeneratorAsync<T = void>(generator: Generator<any, T, any>):
         result = generator.next(result.value);
       }
 
-      if (result.done) {
-        resolve(result.value);
-        return;
-      }
-
       if (isPromise(result.value)) {
         result.value
-          .then(runAsync)
+          .then(result.done ? resolve : runAsync)
           .catch(error => generator.throw(error));
       }
+      else if (result.done) {
+        resolve(result.value);
+      }
     }
 
     run();
-  });
+  }) as any;
 }

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

@@ -35,7 +35,7 @@ export function timeSlicingWithList<T>(list: T[], cb: (val: T, index: number, ar
  * ```
  * @param {Generator<any, T, any>} generator - 生成器
  */
-export function timeSlicingWithGenerator<T = void>(generator: Generator<any, T, any>) {
+export function timeSlicingWithGenerator<T = void>(generator: Generator<any, T, any>): T extends Promise<any> ? T : Promise<T> {
   // node 环境不需要进行切片
   if (isNode) {
     return runAsync<T>(generator);

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

@@ -45,6 +45,30 @@ Object {
 }
 `;
 
+exports[`call-logic:getQuickInfoOffset json-deserialize 1`] = `
+Object {
+  "code": "nasl.util.jsonDeserialize(variable1)",
+  "line": 1,
+  "offset": 11,
+}
+`;
+
+exports[`call-logic:getQuickInfoOffset json-serialize 1`] = `
+Object {
+  "code": "nasl.util.jsonSerialize(variable1)",
+  "line": 1,
+  "offset": 11,
+}
+`;
+
+exports[`call-logic:getQuickInfoOffset json-serialize-with-string 1`] = `
+Object {
+  "code": "nasl.util.jsonSerialize(variable1)",
+  "line": 1,
+  "offset": 11,
+}
+`;
+
 exports[`call-logic:getQuickInfoOffset nested-call-logic 1`] = `
 Object {
   "code": "(() =>{

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

@@ -39,6 +39,21 @@ exports[`call-logic:toEmbeddedTS global-logic-argument-some-expression 1`] = `
 "
 `;
 
+exports[`call-logic:toEmbeddedTS json-deserialize 1`] = `
+"nasl.util.jsonDeserialize(variable1);
+"
+`;
+
+exports[`call-logic:toEmbeddedTS json-serialize 1`] = `
+"nasl.util.jsonSerialize(variable1);
+"
+`;
+
+exports[`call-logic:toEmbeddedTS json-serialize-with-string 1`] = `
+"nasl.util.jsonSerialize(variable1);
+"
+`;
+
 exports[`call-logic:toEmbeddedTS nested-call-logic 1`] = `
 "(() => {
   const wrapper = nasl.util.autoHandleError(

package/test/concepts/call-logic/__snapshots__/toJS.spec.ts.snap

@@ -101,6 +101,21 @@ exports[`call-logic:toJS global-logic-argument-some-expression 1`] = `
 "
 `;
 
+exports[`call-logic:toJS json-deserialize 1`] = `
+"await(JSON.parse(this.variable1));
+"
+`;
+
+exports[`call-logic:toJS json-serialize 1`] = `
+"await(this.$utils[\\"JsonSerialize\\"](this.variable1));
+"
+`;
+
+exports[`call-logic:toJS json-serialize-with-string 1`] = `
+"await(JSON.stringify(this.variable1));
+"
+`;
+
 exports[`call-logic:toJS nested-call-logic 1`] = `
 "await(
   this.$logics[\\"extensions.httpclient.logics.exchange\\"]({

package/test/concepts/call-logic/__snapshots__/toUI.spec.ts.snap

@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`call-logic:toVue json-deserialize 1`] = `"JSON 反序列化"`;
+
+exports[`call-logic:toVue json-serialize 1`] = `"JSON 序列化"`;
+
+exports[`call-logic:toVue json-serialize-with-string 1`] = `"JSON 序列化"`;

package/test/concepts/call-logic/__snapshots__/toVue.spec.ts.snap

@@ -0,0 +1,101 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`call-logic:toVue entries-get-with-arguments 1`] = `
+"get(123);
+"
+`;
+
+exports[`call-logic:toVue entries-update-with-arguments 1`] = `
+"update([编译方法未实现]);
+"
+`;
+
+exports[`call-logic:toVue global-logic-argument-no-expression 1`] = `
+"logic1(undefined, undefined, undefined);
+"
+`;
+
+exports[`call-logic:toVue global-logic-argument-some-expression 1`] = `
+"logic1(
+  \`123\`,
+  undefined,
+  $utils[\\"New\\"]({
+    concept: \\"TypeAnnotation\\",
+    name: \\"\\",
+    typeKind: \\"reference\\",
+    typeNamespace: \\"app.dataSources.defaultDS.entities\\",
+    typeName: \\"Entity1\\",
+    typeArguments: null,
+    returnType: null,
+    properties: null,
+  })
+);
+"
+`;
+
+exports[`call-logic:toVue json-deserialize 1`] = `
+"JSON.parse(variable1);
+"
+`;
+
+exports[`call-logic:toVue json-serialize 1`] = `
+"$utils[\\"JsonSerialize\\"](variable1);
+"
+`;
+
+exports[`call-logic:toVue json-serialize-with-string 1`] = `
+"JSON.stringify(variable1);
+"
+`;
+
+exports[`call-logic:toVue nested-call-logic 1`] = `
+"exchange(
+  $utils[\\"ToString\\"](
+    \\"nasl.core.String\\",
+    \`https://dysmsapi.aliyuncs.com/?AccessKeyId=LTAI5tPhPfe7NDP1qzrQjkuV&Action=SendSms&Format=JSON&Signature=\`
+  ) +
+    $utils[\\"ToString\\"](\\"nasl.core.String\\", encryptWithUrlEncode(sign)) +
+    $utils[\\"ToString\\"](
+      \\"nasl.core.String\\",
+      \`&SignatureMethod=HMAC-SHA1&SignatureVersion=1.0&Timestamp=\`
+    ) +
+    $utils[\\"ToString\\"](\\"nasl.core.String\\", encryptWithUrlEncode(currDate)) +
+    $utils[\\"ToString\\"](
+      \\"nasl.core.String\\",
+      \`&Version=2017-05-25&SignatureNonce=\`
+    ) +
+    $utils[\\"ToString\\"](\\"nasl.core.String\\", SignatureNonce) +
+    $utils[\\"ToString\\"](\\"nasl.core.String\\", \`&PhoneNumbers=\`) +
+    $utils[\\"ToString\\"](\\"nasl.core.String\\", receiver) +
+    $utils[\\"ToString\\"](\\"nasl.core.String\\", \`&SignName=\`) +
+    $utils[\\"ToString\\"](\\"nasl.core.String\\", signName) +
+    $utils[\\"ToString\\"](\\"nasl.core.String\\", \`&TemplateCode=\`) +
+    $utils[\\"ToString\\"](\\"nasl.core.String\\", templateCode) +
+    $utils[\\"ToString\\"](\\"nasl.core.String\\", \`&TemolateParam=\`) +
+    $utils[\\"ToString\\"](\\"nasl.core.String\\", encryptWithUrlEncode(templateParam)),
+  \`Get\`,
+  header,
+  body
+);
+"
+`;
+
+exports[`call-logic:toVue only-call-logic 1`] = `
+"$global.logout();
+"
+`;
+
+exports[`call-logic:toVue view-buildin-logic-with-argument 1`] = `
+"downloadFile(\`www.baidu.com\`, \`test.txt\`);
+"
+`;
+
+exports[`call-logic:toVue view-component-logic-no-argument 1`] = `
+"openLoading();
+"
+`;
+
+exports[`call-logic:toVue view-component-with-validation 1`] = `
+"logic1(\`123\`);
+"
+`;

package/test/concepts/call-logic/__snapshots__/toVueDesigner.spec.ts.snap

@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`call-logic:toVueDesigner json-deserialize 1`] = `"JSON 反序列化(variable1)"`;
+
+exports[`call-logic:toVueDesigner json-serialize 1`] = `"JSON 序列化(variable1)"`;
+
+exports[`call-logic:toVueDesigner json-serialize-with-string 1`] = `"JSON 序列化(variable1)"`;

package/test/concepts/call-logic/fixtures/json-deserialize.json

@@ -0,0 +1,173 @@
+{
+  "concept": "App",
+  "name": "dsadsadsa3213213",
+  "id": "9bce21ed-9f56-40c7-b50e-161c52b407a3",
+  "ideVersion": "3.3",
+  "title": "苏方舟3.3测试（勿删）",
+  "icon": "",
+  "desc": "",
+  "dnsAddr": "http://dsadsadsa3213213.defaulttenant.lcap.hatest.163yun.com",
+  "hasUserCenter": true,
+  "hasAuth": true,
+  "dataSources": [],
+  "structures": [],
+  "enums": [],
+  "logics": [],
+  "overriddenLogics": [],
+  "interfaces": [],
+  "frontends": [
+    {
+      "concept": "Frontend",
+      "name": "pc",
+      "title": "PC端",
+      "type": "pc",
+      "path": "/",
+      "documentTitle": null,
+      "documentIcon": null,
+      "bindEvents": [],
+      "views": [
+        {
+          "concept": "View",
+          "changedTime": 1700220400141,
+          "name": "test",
+          "title": "",
+          "crumb": null,
+          "auth": false,
+          "isIndex": false,
+          "script": "",
+          "elements": [
+            {
+              "concept": "ViewElement",
+              "name": "uLinearLayout1",
+              "type": 0,
+              "tag": "u-linear-layout",
+              "staticClass": null,
+              "staticStyle": "height:100%; --custom-start: auto; min-height: 200px;",
+              "slotTarget": null,
+              "slotScope": null,
+              "bindAttrs": [],
+              "bindEvents": [],
+              "bindDirectives": [],
+              "bindRoles": [],
+              "bindStyles": [],
+              "children": [
+                {
+                  "concept": "ViewElement",
+                  "changedTime": 1700220406982,
+                  "name": "text_1",
+                  "tag": "u-text",
+                  "staticStyle": "--custom-start: auto;",
+                  "bindAttrs": [
+                    {
+                      "concept": "BindAttribute",
+                      "changedTime": 1701169488568,
+                      "name": "text",
+                      "type": "dynamic",
+                      "value": "普通文本",
+                      "expression": {
+                        "__$Selected": true,
+                        "concept": "CallLogic",
+                        "name": "",
+                        "label": "JSON 反序列化",
+                        "folded": false,
+                        "uuid": "5f8e4543a9624e4fa6c22b0d9fe417b9",
+                        "calleeNamespace": "nasl.util",
+                        "calleeName": "jsonDeserialize",
+                        "shortcut": true,
+                        "typeArguments": null,
+                        "arguments": [
+                          {
+                            "concept": "Argument",
+                            "changedTime": 1701169493575,
+                            "name": "",
+                            "folded": false,
+                            "keyword": "arg",
+                            "expression": {
+                              "concept": "Identifier",
+                              "name": "variable1",
+                              "folded": false,
+                              "namespace": ""
+                            }
+                          }
+                        ]
+                      },
+                      "rules": [],
+                      "sync": false,
+                      "playground": []
+                    }
+                  ],
+                  "bindEvents": [],
+                  "bindDirectives": [],
+                  "bindRoles": [],
+                  "bindStyles": [],
+                  "children": []
+                }
+              ]
+            }
+          ],
+          "params": [],
+          "variables": [
+            {
+              "concept": "Variable",
+              "changedTime": 1701169481170,
+              "name": "variable1",
+              "typeAnnotation": {
+                "concept": "TypeAnnotation",
+                "name": "",
+                "typeKind": "primitive",
+                "typeNamespace": "nasl.core",
+                "typeName": "String",
+                "typeArguments": null,
+                "returnType": null,
+                "properties": null
+              },
+              "defaultValue": "测试文本"
+            }
+          ],
+          "logics": [],
+          "bindEvents": [],
+          "bindRoles": [],
+          "children": []
+        }
+      ],
+      "variables": [],
+      "theme": {
+        "concept": "Theme",
+        "name": "",
+        "title": "默认主题样式",
+        "variableMap": {}
+      },
+      "componentDependencies": [],
+      "globalScaleEnabled": false,
+      "canvasWidth": 0
+    }
+  ],
+  "backend": {
+    "concept": "Backend",
+    "name": "",
+    "variables": []
+  },
+  "processes": [],
+  "roles": [],
+  "configuration": {
+    "concept": "Configuration",
+    "name": "",
+    "groups": []
+  },
+  "dependencies": [],
+  "interfaceDependencies": [],
+  "integration": null,
+  "authLogics": [],
+  "authLogicsForCallInterface": [],
+  "connections": [],
+  "triggerLaunchers": [],
+  "metadataTypes": [],
+  "preferenceMap": {
+    "namingConvention.tableName": "snake_case",
+    "namingConvention.columnName": "snake_case",
+    "javaLogicEnabled": "false",
+    "onDemandInterfaceGeneration": "true",
+    "serverValidationRules": "auto",
+    "metadataTypeEnable": false
+  }
+}