@lcap/nasl 3.1.0-beta.2 → 3.1.0-beta.4

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

@@ -0,0 +1,89 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`view-element:toEmbeddedTS default-not-found 1`] = `
+"new nasl.ui.uLinearLayout({name: __elements.uLinearLayout1,
+    bindAttr: () => [
+    () => {},
+    () => {},
+    () => {},
+        ],
+        slotDefault: ()=> {
+
+        return [        new nasl.ui.uLinearLayout({name: __elements.uLinearLayout2,
+            bindAttr: () => [
+    () => {},
+    () => {},
+                ],
+                slotDefault: ()=> {
+
+                return [                new nasl.ui.img({name: __elements.img1,
+                    bindAttr: () => [
+    () => {},
+    () => {},
+                        ],
+                        slotDefault: ()=> {
+
+                        return [                        ]
+                    }
+                }),
+
+                new nasl.ui.h1({name: __elements.h11,
+                    bindAttr: () => [
+                        ],
+                        slotDefault: ()=> {
+
+                        return [                        new nasl.ui.uText({name: __elements.uText1,
+                            bindAttr: () => [
+    () => {},
+                                ],
+                                slotDefault: ()=> {
+
+                                return [                                ]
+                            }
+                        }),
+
+                        ]
+                    }
+                }),
+
+                new nasl.ui.h2({name: __elements.h21,
+                    bindAttr: () => [
+                        ],
+                        slotDefault: ()=> {
+
+                        return [                        new nasl.ui.uText({name: __elements.uText2,
+                            bindAttr: () => [
+    () => {},
+                                ],
+                                slotDefault: ()=> {
+
+                                return [                                ]
+                            }
+                        }),
+
+                        ]
+                    }
+                }),
+
+                new nasl.ui.uButton({name: __elements.uButton1,
+                    bindAttr: () => [
+    () => {},
+    () => {},
+    () => {},
+    () => {},
+                        ],
+                        slotDefault: ()=> {
+
+                        return [                        ]
+                    }
+                }),
+
+                ]
+            }
+        }),
+
+        ]
+    }
+}),
+"
+`;

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

@@ -0,0 +1,44 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`view-element:toVue default-not-found 1`] = `
+"<template>
+  <u-linear-layout
+    :ref=\\"\`uLinearLayout1\`\\"
+    style=\\"height: 100vh\\"
+    justify=\\"center\\"
+    type=\\"flex\\"
+    alignment=\\"center\\"
+  >
+    <u-linear-layout
+      :ref=\\"\`uLinearLayout2\`\\"
+      justify=\\"center\\"
+      direction=\\"vertical\\"
+    >
+      <img :ref=\\"\`img1\`\\" width=\\"240\\" src=\\"/assets/error-code.svg\\" />
+      <h1
+        :ref=\\"\`h11\`\\"
+        style=\\"
+          margin: 0;
+          margin-top: -15px;
+          padding-bottom: 20px;
+          font-family: Geneva, 'Arial Black', Verdana, Tahoma, sans-serif;
+          font-size: 64px;
+        \\"
+      >
+        <u-text :ref=\\"\`uText1\`\\" text=\\"404\\"></u-text>
+      </h1>
+      <h2 :ref=\\"\`h21\`\\" style=\\"color: var(--color-light)\\">
+        <u-text :ref=\\"\`uText2\`\\" text=\\"抱歉，你访问的页面不存在\\"></u-text>
+      </h2>
+      <u-button
+        :ref=\\"\`uButton1\`\\"
+        text=\\"返回首页\\"
+        color=\\"primary\\"
+        href=\\"/\\"
+        shape=\\"round\\"
+      ></u-button>
+    </u-linear-layout>
+  </u-linear-layout>
+</template>
+"
+`;

package/test/concepts/view-element/constant.ts

@@ -0,0 +1,5 @@
+import { basename } from 'path';
+import { getCases } from '../utils';
+
+export const ConceptName = basename(__dirname);
+export const cases = getCases(ConceptName);

package/test/concepts/view-element/fixtures/default-not-found.json

@@ -0,0 +1,322 @@
+{
+    "concept": "App",
+    "changedTime": 1691727930927,
+    "name": "a123456",
+    "id": "1e337dcf-ef84-4ace-9c6a-ee472fe7b738",
+    "ideVersion": "3.1",
+    "title": "test",
+    "icon": "",
+    "desc": "",
+    "dnsAddr": "http://a123456.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",
+                    "name": "notFound",
+                    "uuid": null,
+                    "title": "找不到页面",
+                    "auth": false,
+                    "isIndex": false,
+                    "script": "",
+                    "elements": [
+                        {
+                            "__$Selected": true,
+                            "concept": "ViewElement",
+                            "name": "uLinearLayout1",
+                            "type": 0,
+                            "tag": "u-linear-layout",
+                            "staticStyle": "height: 100vh;",
+                            "bindAttrs": [
+                                {
+                                    "concept": "BindAttribute",
+                                    "name": "justify",
+                                    "type": "string",
+                                    "value": "center",
+                                    "rules": [],
+                                    "model": false,
+                                    "sync": false,
+                                    "playground": []
+                                },
+                                {
+                                    "concept": "BindAttribute",
+                                    "name": "type",
+                                    "type": "string",
+                                    "value": "flex",
+                                    "rules": [],
+                                    "model": false,
+                                    "sync": false,
+                                    "playground": []
+                                },
+                                {
+                                    "concept": "BindAttribute",
+                                    "name": "alignment",
+                                    "type": "string",
+                                    "value": "center",
+                                    "rules": [],
+                                    "model": false,
+                                    "sync": false,
+                                    "playground": []
+                                }
+                            ],
+                            "bindEvents": [],
+                            "bindDirectives": [],
+                            "bindRoles": [],
+                            "bindStyles": [],
+                            "children": [
+                                {
+                                    "concept": "ViewElement",
+                                    "name": "uLinearLayout2",
+                                    "type": 0,
+                                    "tag": "u-linear-layout",
+                                    "bindAttrs": [
+                                        {
+                                            "concept": "BindAttribute",
+                                            "name": "justify",
+                                            "type": "string",
+                                            "value": "center",
+                                            "rules": [],
+                                            "model": false,
+                                            "sync": false,
+                                            "playground": []
+                                        },
+                                        {
+                                            "concept": "BindAttribute",
+                                            "name": "direction",
+                                            "type": "string",
+                                            "value": "vertical",
+                                            "rules": [],
+                                            "model": false,
+                                            "sync": false,
+                                            "playground": []
+                                        }
+                                    ],
+                                    "bindEvents": [],
+                                    "bindDirectives": [],
+                                    "bindRoles": [],
+                                    "bindStyles": [],
+                                    "children": [
+                                        {
+                                            "concept": "ViewElement",
+                                            "name": "img1",
+                                            "type": 0,
+                                            "tag": "img",
+                                            "bindAttrs": [
+                                                {
+                                                    "concept": "BindAttribute",
+                                                    "name": "width",
+                                                    "type": "string",
+                                                    "value": "240",
+                                                    "rules": [],
+                                                    "model": false,
+                                                    "sync": false,
+                                                    "playground": []
+                                                },
+                                                {
+                                                    "concept": "BindAttribute",
+                                                    "name": "src",
+                                                    "type": "string",
+                                                    "value": "/assets/error-code.svg",
+                                                    "rules": [],
+                                                    "model": false,
+                                                    "sync": false,
+                                                    "playground": []
+                                                }
+                                            ],
+                                            "bindEvents": [],
+                                            "bindDirectives": [],
+                                            "bindRoles": [],
+                                            "bindStyles": [],
+                                            "children": []
+                                        },
+                                        {
+                                            "concept": "ViewElement",
+                                            "name": "h11",
+                                            "type": 0,
+                                            "tag": "h1",
+                                            "staticStyle": "margin: 0; margin-top: -15px; padding-bottom: 20px; font-family: Geneva, 'Arial Black', Verdana, Tahoma, sans-serif; font-size: 64px;",
+                                            "bindAttrs": [],
+                                            "bindEvents": [],
+                                            "bindDirectives": [],
+                                            "bindRoles": [],
+                                            "bindStyles": [],
+                                            "children": [
+                                                {
+                                                    "concept": "ViewElement",
+                                                    "name": "uText1",
+                                                    "type": 0,
+                                                    "tag": "u-text",
+                                                    "bindAttrs": [
+                                                        {
+                                                            "concept": "BindAttribute",
+                                                            "name": "text",
+                                                            "type": "string",
+                                                            "value": "404",
+                                                            "rules": [],
+                                                            "model": false,
+                                                            "sync": false,
+                                                            "playground": []
+                                                        }
+                                                    ],
+                                                    "bindEvents": [],
+                                                    "bindDirectives": [],
+                                                    "bindRoles": [],
+                                                    "bindStyles": [],
+                                                    "children": []
+                                                }
+                                            ]
+                                        },
+                                        {
+                                            "concept": "ViewElement",
+                                            "name": "h21",
+                                            "type": 0,
+                                            "tag": "h2",
+                                            "staticStyle": "color: var(--color-light);",
+                                            "bindAttrs": [],
+                                            "bindEvents": [],
+                                            "bindDirectives": [],
+                                            "bindRoles": [],
+                                            "bindStyles": [],
+                                            "children": [
+                                                {
+                                                    "concept": "ViewElement",
+                                                    "name": "uText2",
+                                                    "type": 0,
+                                                    "tag": "u-text",
+                                                    "bindAttrs": [
+                                                        {
+                                                            "concept": "BindAttribute",
+                                                            "name": "text",
+                                                            "type": "string",
+                                                            "value": "抱歉，你访问的页面不存在",
+                                                            "rules": [],
+                                                            "model": false,
+                                                            "sync": false,
+                                                            "playground": []
+                                                        }
+                                                    ],
+                                                    "bindEvents": [],
+                                                    "bindDirectives": [],
+                                                    "bindRoles": [],
+                                                    "bindStyles": [],
+                                                    "children": []
+                                                }
+                                            ]
+                                        },
+                                        {
+                                            "concept": "ViewElement",
+                                            "name": "uButton1",
+                                            "type": 0,
+                                            "tag": "u-button",
+                                            "bindAttrs": [
+                                                {
+                                                    "concept": "BindAttribute",
+                                                    "name": "text",
+                                                    "type": "string",
+                                                    "value": "返回首页",
+                                                    "rules": [],
+                                                    "model": false,
+                                                    "sync": false,
+                                                    "playground": []
+                                                },
+                                                {
+                                                    "concept": "BindAttribute",
+                                                    "name": "color",
+                                                    "type": "string",
+                                                    "value": "primary",
+                                                    "rules": [],
+                                                    "model": false,
+                                                    "sync": false,
+                                                    "playground": []
+                                                },
+                                                {
+                                                    "concept": "BindAttribute",
+                                                    "name": "href",
+                                                    "type": "string",
+                                                    "value": "/",
+                                                    "rules": [],
+                                                    "model": false,
+                                                    "sync": false,
+                                                    "playground": []
+                                                },
+                                                {
+                                                    "concept": "BindAttribute",
+                                                    "name": "shape",
+                                                    "type": "string",
+                                                    "value": "round",
+                                                    "rules": [],
+                                                    "model": false,
+                                                    "sync": false,
+                                                    "playground": []
+                                                }
+                                            ],
+                                            "bindEvents": [],
+                                            "bindDirectives": [],
+                                            "bindRoles": [],
+                                            "bindStyles": [],
+                                            "children": []
+                                        }
+                                    ]
+                                }
+                            ]
+                        }
+                    ],
+                    "params": [],
+                    "variables": [],
+                    "logics": [],
+                    "bindEvents": [],
+                    "bindRoles": [],
+                    "children": []
+                }
+            ],
+            "variables": [],
+            "theme": {
+                "concept": "Theme",
+                "name": "",
+                "title": "默认主题样式",
+                "variableMap": {}
+            },
+            "componentDependencies": [],
+            "globalScaleEnabled": false,
+            "canvasWidth": 0
+        }
+    ],
+    "backend": {
+        "concept": "Backend",
+        "variables": []
+    },
+    "processes": [],
+    "roles": [],
+    "configuration": {
+        "concept": "Configuration",
+        "name": "",
+        "groups": []
+    },
+    "dependencies": [],
+    "interfaceDependencies": [],
+    "authLogics": [],
+    "authLogicsForCallInterface": [],
+    "preferenceMap": {
+        "namingConvention.tableName": "camelCase",
+        "namingConvention.columnName": "camelCase",
+        "javaLogicEnabled": "false",
+        "onDemandInterfaceGeneration": "true",
+        "serverValidationRules": "custom"
+    }
+}

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

@@ -0,0 +1,14 @@
+import { expect } from 'chai';
+import type { ViewElement } from '../../../out';
+import { readFixture, formatTs, getNodeByData } from '../utils';
+import { ConceptName, cases } from './constant';
+
+describe(`${ConceptName}:toEmbeddedTS`, () => {
+    cases.forEach((name) => {
+        it(name, () => {
+            const data = readFixture(ConceptName, name);
+            const node = getNodeByData<ViewElement>(data);
+            expect(node.toEmbeddedTS()).toMatchSnapshot();
+        });
+    });
+});

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

@@ -0,0 +1,14 @@
+import { expect } from 'chai';
+import type { ViewElement } from '../../../out';
+import { readFixture, formatVue, getNodeByData } from '../utils';
+import { ConceptName, cases } from './constant';
+
+describe(`${ConceptName}:toVue`, () => {
+    cases.forEach((name) => {
+        it(name, () => {
+            const data = readFixture(ConceptName, name);
+            const node = getNodeByData<ViewElement>(data);
+            expect(formatVue(node.toVue())).toMatchSnapshot();
+        });
+    });
+});

package/test/setup.ts

@@ -1,4 +1,10 @@
+import { before } from 'mocha';
 import { use } from 'chai';
 import { jestSnapshotPlugin } from 'mocha-chai-jest-snapshot';
 
 use(jestSnapshotPlugin());
+
+// 测试环境变量注入
+before(() => {
+    process.env.NODE_ENV = 'testing';
+});

package/ts-worker/lib/tsserver.js

@@ -176835,7 +176835,9 @@ var ts;
                     [
                         16 /* SymbolFlags.Function */,
                         8192 /* SymbolFlags.Method */
-                    ].includes(flags)
+                    ].includes(flags) ||
+                    // 含有调用签名就表明它是个函数
+                    (type.callSignatures?.length > 0)
                 ) {
                     if (callResolvedSignature) {
                         const returnType = typeChecker.getReturnTypeOfSignature(callResolvedSignature);
@@ -177114,10 +177116,8 @@ var ts;
                                 });
                             }
                         }
-                        if (count === 0) {
-                            return false;
-                        }
-                        return true;
+
+                        return count !== 0;
                     });
                 }
                 console.timeEnd('方案2标注耗时：');
@@ -180970,4 +180970,3 @@ var ts;
         } */
     })(server = ts.server || (ts.server = {}));
 })(ts || (ts = {}));
-//# sourceMappingURL=tsserver.js.map

package/ts-worker/package-lock.json

@@ -1,6 +1,7 @@
 {
-    "requires": true,
+    "version": "1.0.0",
     "lockfileVersion": 1,
+    "requires": true,
     "dependencies": {
         "@babel/parser": {
             "version": "7.17.3",

package/bin/naslc

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-// TODO

package/out/src/automate/engine/index.d.ts

@@ -1,4 +0,0 @@
-export function autoTemplate(node: any): string;
-export function getRoles(script: any): any;
-export function applyTemplate(script: any, app: any, frontend: any, rootBindCallback: any, roleCallback: any, finalCallback: any): void;
-export function applyDropComponent(app: any, frontend: any, view: any, element: any): any;