@lcap/nasl 1.0.0-alpha.13 → 1.0.0-alpha.14

package/src/generator/genBundleFiles.ts

@@ -255,7 +255,7 @@ export async function genBundleFiles(app: App,
     });
 
     const data = JSON5.stringify({
-        pages,
+        // pages,
         metaData: {
             dataTypesMap,
             enumsMap,
@@ -270,6 +270,7 @@ export async function genBundleFiles(app: App,
         env: config.env,
         indexName,
     }, null, 4);
+
     const assetsInfo = app.genAllAssetsInfo(config.STATIC_URL);
     // console.log(assetsInfo);
     // debugger;
@@ -297,15 +298,46 @@ export async function genBundleFiles(app: App,
         }
     }`;
 
+    function routeToString(route: Route): string {
+        return `{
+    path: '${route.path}',
+    component: (function(){
+        var componentOptions = ${route.component.script ? '(function(){\n' + route.component.script.trim().replace(/export default |module\.exports +=/, 'return ') + '\n})()' : '{}'};
+        Object.assign(componentOptions, {
+            template: \`${route.component.template.replace(/[`$]/g, (m) => '\\' + m)}\`,
+        });
+        return componentOptions;
+        // return window.Vue.extend(componentOptions);
+    })(),
+    children: [
+        ${route.children.map(routeToString).join(',\n')}
+    ],
+}`;
+    }
+
     content += `
         var data = ${data};
+        data.pages = {
+            ${Object.keys(pages)
+        .map((pageName) => {
+            const page = pages[pageName];
+            const rootRoute = page.rootRoute;
+            delete page.rootRoute;
+
+            let pageJSON = JSON5.stringify(page, null, 4);
+            pageJSON = pageJSON.slice(0, -1) + `\nrootRoute: ${routeToString(rootRoute)} }`;
+
+            return `${pageName}: ${pageJSON},`;
+        })
+        .join('\n')}
+        };
         var pageName = window.pageName;
         if(!pageName){
             pageName = data.indexName;
         }
         var page = data.pages[pageName];
         page.router.noLogin = noLogin;
-        compileComponent(page.rootRoute);
+
         if(appVM){
             appVM=null
         }
@@ -320,79 +352,76 @@ export async function genBundleFiles(app: App,
         window.appVM = appVM;
     })();`;
 
-    // if (config.env === 'dev') {
-    //     // 加载资源js
-    //     // const targetUrl = `${location.origin}/empty?url=${config.lowcodeDomain}&appid=${config.appid}`;
-    //     const domain = config.lowcodeDomain.slice(5);
-    //     const targetUrl = `${location.origin}/empty?url=${domain}&appid=${config.appid}`;
-    //     // const targetUrl = `http://defaulttenant.fafdafd.lcap.ha.dev.com:3000?url=${domain}&appid=${config.appid}`;
-    //     const str = `
-    //    if(!document.querySelector("iframe[name='iframeEmpty']")){
-    //         var el = document.createElement('iframe');
-    //         el.setAttribute('src', "${targetUrl}");
-    //         el.setAttribute('name', 'iframeEmpty');
-    //         el.setAttribute('width', 0);
-    //         el.setAttribute('height', 0);
-    //         el.style.borderWidth = 0
-    //         el.style.display= "block"
-    //         document.getElementsByTagName('body')[0].appendChild(el);
-    //         document.domain = '${domain}'
-    //         var _div = document.createElement('div');
-    //         _div.classList = "div-load"
-    //         _div.innerHTML = "<div>代码发布中</div><div class='loading-container'></div>"
-    //         document.getElementsByTagName('body')[0].appendChild(_div);
-    //         window.showLoading  = function(){
-    //             document.querySelector(".div-load").style.display ="flex"
-    //         }
-    //         window.hideLoading  = function(){
-    //             document.querySelector(".div-load").style.display ="none"
-    //         }
-    //         var style = document.createElement('style');
-    //         style.innerHTML=\`.loading-container{
-    //             width: 20px;
-    //             height: 20px;
-    //             margin-left: 20px;
-    //             animation: loading-animation 0.8s infinite linear;
-    //             display: inline-block;
-    //             border: 2px solid #f3f3f3;
-    //             border-top: 2px solid rgb(109, 108, 108);
-    //             border-radius: 50%;
-    //         }
-    //         .div-load{
-    //             display: flex;
-    //             align-items: center;
-    //             justify-content: center;
-    //             position: fixed;
-    //             top:0;
-    //             width:100vw;
-    //             height:60px;
-    //             background:red;
-    //             opacity: 1;
-    //             color: #f3f3f3;
-    //             font-weight: 600;
-    //             display:none;
-    //         }
-
-    //         @keyframes loading-animation{
-    //             0% {
-    //                 transform: rotate(0deg);
-    //             }
-    //             100% {
-    //                 transform: rotate(360deg);
-    //             }
-    //         }\`
-    //         document.getElementsByTagName('body')[0].appendChild(style);
-    //     }
-    //      `;
-    //     content += str;
-    // }
+    if (config.env === 'dev') {
+        // 加载资源js
+        const domain = config.lowcodeDomain.slice(5);
+        const targetUrl = `${location.origin}/empty?url=${domain}&appid=${config.appid}`;
+        const str = `
+       if(!document.querySelector("iframe[name='iframeEmpty']")){
+            var el = document.createElement('iframe');
+            el.setAttribute('src', "${targetUrl}");
+            el.setAttribute('name', 'iframeEmpty');
+            el.setAttribute('width', 0);
+            el.setAttribute('height', 0);
+            el.style.borderWidth = 0
+            el.style.display= "block"
+            document.getElementsByTagName('body')[0].appendChild(el);
+            document.domain = '${domain}'
+            var _div = document.createElement('div');
+            _div.classList = "div-load"
+            _div.innerHTML = "<div class='loading-container'></div><div>正在更新最新发布内容...</div>"
+            document.getElementsByTagName('body')[0].appendChild(_div);
+            window.showLoading  = function(){
+                document.querySelector(".div-load").style.display ="flex"
+            }
+            window.hideLoading  = function(){
+                document.querySelector(".div-load").style.display ="none"
+            }
+            var style = document.createElement('style');
+            style.innerHTML=\`.div-load{
+        width: 208px;
+        height: 40px;
+        background: rgba(48, 48, 48, 0.8);
+        box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.1);
+        border-radius: 4px;
+        position: fixed;
+        top: 120px;
+        left: 50%;
+        margin-left: -104px;
+        color: #FFFFFF;
+        font-size: 14px;
+        display: none;
+        justify-content: center;
+        align-items: center;
+    }
 
-    // debugger;
-    // const outputs: { [name: string]: string } = {};
-    // const outputs =
-    const bundlePath = `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}/bundle.${genHash(content)}.js`;
-    // outputs[bundlePath] = content;
+    .loading-container{
+               width: 12px;
+               height: 12px;
+               margin-right: 10px;
+               animation: loading-animation 0.8s infinite linear;
+               border: 2px solid #f3f3f3;
+               border-top: 2px solid rgb(109, 108, 108);
+               border-right: 2px solid rgb(109, 108, 108);
+               border-bottom: 2px solid rgb(109, 108, 108);
+               border-radius: 50%;
+           }
 
+           @keyframes loading-animation{
+               0% {
+                   transform: rotate(0deg);
+               }
+               100% {
+                   transform: rotate(360deg);
+               }
+           }\`
+            document.getElementsByTagName('body')[0].appendChild(style);
+        }
+         `;
+        content += str;
+    }
+
+    const bundlePath = `${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}/bundle.${genHash(content)}.js`;
     const assetsContent = `(function() {
     LazyLoad.js(${JSON5.stringify(assetsInfo.basic.js.concat(assetsInfo.custom.js).concat([bundlePath]))});
     LazyLoad.css(${JSON5.stringify(assetsInfo.basic.css.concat(assetsInfo.custom.css))});
@@ -409,6 +438,5 @@ export async function genBundleFiles(app: App,
             content: assetsContent,
         },
     ];
-    // outputs[`${config.USER_STATIC_URL}/${config.tenant}/${app.id}/${config.env}/client.js`] = assetsContent;
     return outputs;
 }

package/src/server/createUiTs.ts

@@ -1,9 +1,23 @@
 import { Logic, TypeAnnotation, Param, LogicItem, NumericLiteral, BooleanLiteral, StringLiteral, Identifier, MemberExpression } from '..';
 
+const naslStdlibMap: any = {
+    'nasl.core.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.core.ts').default,
+    'nasl.collection.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.collection.ts').default,
+    'nasl.interface.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.interface.ts').default,
+    'nasl.util.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.util.ts').default,
+    'nasl.ui.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.ui.ts').default,
+    'nasl.browser.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.browser.ts').default,
+    'nasl.auth.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.auth.ts').default,
+    'nasl.configuration.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.configuration.ts').default,
+    'nasl.langUtil.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.langUtil.ts').default,
+    'nasl.annotation.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.annotation.ts').default,
+    'nasl.validation.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.validation.ts').default,
+};
+
 export default function formatUiTs(allComponent: any) {
     const indent = (tabSize: number) => ' '.repeat(tabSize * 2);
 
-    const toHump = (name: string) => name ? name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase()) : '';
+    const toHump = (name: string) => (name ? name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase()) : '');
 
     const toNaslType = (type: string) => {
         if (type === 'number')
@@ -17,7 +31,7 @@ export default function formatUiTs(allComponent: any) {
         else
             return type;
     };
-    const createDefault = (param: any):LogicItem => {
+    const createDefault = (param: any): LogicItem => {
         const defaultValue = param.default;
         if (defaultValue) {
             if (typeof defaultValue === 'number') {
@@ -31,7 +45,7 @@ export default function formatUiTs(allComponent: any) {
         }
         return null;
     };
-    const creatMethodLogic = (method: {name: string, params: any[]}) => {
+    const creatMethodLogic = (method: { name: string; params: any[] }) => {
         const { name, params } = method;
         const logic = new Logic({
             name,
@@ -175,5 +189,6 @@ export default function formatUiTs(allComponent: any) {
     return {
         code: value,
         elementsLogic,
+        naslStdlibMap,
     };
 }

package/src/server/getLogics.ts

@@ -1,4 +1,4 @@
-import { CallLogic, BindEvent, App, Namespace, Entity, BaseNode, Logic, Param, TypeAnnotation, Return, Process, ViewElement } from '..';
+import { CallLogic, BindEvent, App, Namespace, Entity, BaseNode, Logic, Param, TypeAnnotation, Return, Process, ViewElement, stdlibNamespace } from '..';
 import { process2LogicNamespace } from './process2LogicNamespace';
 import { moduleToLogicNamesapce } from './getExtensionModules';
 import naslServer from './naslServer';
@@ -31,7 +31,7 @@ function iterator(tree: FakeNode | FakeProcessNode, searchContent: string, fakeN
         }
         if (tree.logics) {
             tree.logics.forEach((l) => {
-                const exist = l.name.includes(searchContent);
+                const exist = l.name.toLowerCase().includes(searchContent);
                 if (exist) {
                     fakeNode.logics.push(l);
                 }
@@ -100,7 +100,7 @@ export async function getLogics(node: CallLogic | BindEvent, needAllLogic: boole
                 if (Array.isArray(eleLogis) && eleLogis.length) {
                     const viewElement = new Namespace({
                         title: toHump(item.name),
-                        logics: eleLogis,
+                        logics: eleLogis.map((item: Logic) => Logic.from(item)),
                         path: `elements.${toHump(item.name)}.logics`,
                         originConcept: 'ViewElement',
                     });
@@ -121,63 +121,45 @@ export async function getLogics(node: CallLogic | BindEvent, needAllLogic: boole
 
             const systemTree = new Namespace({
                 name: 'category',
-                path: `nasl.browser`,
-                title: '系统',
-                logics: [
-                    new Logic({
-                        name: 'requestFullscreen',
-                        params: [],
-                        body: [],
+                path: `nasl`,
+                title: '系统逻辑',
+                children: [
+                    new Namespace({
+                        name: 'category',
+                        path: `browser`,
+                        title: '浏览器',
+                        logics: stdlibNamespace.findChild('browser').logics,
+                        expanded: true,
                     }),
-                    new Logic({
-                        name: 'exitFullscreen',
-                        params: [],
-                        body: [],
+                    new Namespace({
+                        name: 'category',
+                        path: `auth`,
+                        title: '认证与权限',
+                        logics: stdlibNamespace.findChild('auth').logics,
+                        expanded: true,
                     }),
-                    new Logic({
-                        name: 'hasAuth',
-                        params: [
-                            new Param({
-                                name: 'authPath',
-                                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-                                required: true,
-                            }),
-                        ],
-                        body: [],
-                    }),
-                    new Logic({
-                        name: 'getDistance',
-                        params: [
-                            new Param({
-                                name: 'Point1',
-                                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-                                required: true,
-                            }),
-                            new Param({
-                                name: 'Point2',
-                                typeAnnotation: TypeAnnotation.createPrimitive('String'),
-                                required: true,
-                            }),
-                        ],
-                        body: [],
-                    }),
-                    new Logic({
-                        name: 'logOut',
-                        params: [],
-                        body: [],
+                    new Namespace({
+                        name: 'category',
+                        path: `configuration`,
+                        title: '配置',
+                        logics: stdlibNamespace.findChild('configuration').logics,
+                        expanded: true,
                     }),
                 ],
+                expanded: true,
             });
-            systemTree.expanded = true;
 
+            systemTree.expanded = true;
+            systemTree.children.forEach((child) => (child.expanded = true));
             result.push(systemTree);
         }
         return result;
     }
 }
 
-export function iteratorTree(treeList: {}[], filterText?: string) {
+export function iteratorTree(treeList: {}[], filterText: string = '') {
     const result: {}[] = [];
+    filterText = filterText.toLowerCase();
     treeList.forEach((item) => {
         const fakeNode = {};
         iterator(item, filterText, fakeNode);

package/src/server/getMemberIdentifier.ts

@@ -248,7 +248,7 @@ function formatGlobalVariable() {
     };
     const userInfoIdentifier = new Identifier({
         name: 'userInfo',
-        namespace: 'nasl.browser',
+        namespace: 'nasl.auth',
     });
     const userCompletionProperty = new CompletionProperty({
         name: 'userInfo',
@@ -340,7 +340,7 @@ export async function getMemberIdentifier(node: BaseNode) {
             completionData = formatVariableData(nextCompletion, node);
         }
         let globalVariable: CompletionProperty[] = [];
-        // 全局变量修改
+        // 公共变量修改
         if ((node as any).view) {
             globalVariable = formatGlobalVariable();
         }
@@ -349,7 +349,7 @@ export async function getMemberIdentifier(node: BaseNode) {
             { name: '字面量', children: literals, expanded: true, icon: 'category' },
             { name: '枚举', children: newEnums, expanded: true, icon: 'category' },
             { name: '变量', children: completionData, expanded: true, icon: 'category' },
-            { name: '全局变量', children: globalVariable, expanded: true, icon: 'category' },
+            { name: '公共变量', children: globalVariable, expanded: true, icon: 'category' },
 
             // { name: '流程变量', children: [] },
         ];

package/src/server/getProcesses.ts

@@ -248,7 +248,7 @@ export function getPreviousUserTask(node: ProcessElement) {
     return elements;
 }
 
-export function getProcessVariableSuggestions(node: Logic): CompletionProperty {
+export function getProcessVariableSuggestions(node: Logic, abandonConstant: boolean = false): CompletionProperty {
     if (!node.processElement) {
         return;
     }
@@ -263,7 +263,7 @@ export function getProcessVariableSuggestions(node: Logic): CompletionProperty {
             noFurther: true,
             children: [
                 ...us.returns.map(genCompletionProperty([process.name, us.name])),
-                ...us.constants.map(genCompletionProperty([process.name, us.name])),
+                ...(abandonConstant ? [] : us.constants.map(genCompletionProperty([process.name, us.name]))),
             ],
         });
         cp.icon = us.type;