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

package/src/generator/genBundleFiles.ts

@@ -22,6 +22,7 @@ export interface PageOptions {
     domainName: string;
     nuimsDomain: string;
     auth: boolean;
+    documentTitle?: string;
     router: {
         notFound: string;
         middleware: string[];
@@ -53,44 +54,24 @@ export async function genBundleFiles(app: App,
     const logics: Logic[] = [];
     const interfaces: Interface[] = [];
     const processes: Process[] = [];
-    const {
-        views: appViews = [],
-        entities: appEntities = [],
-        structures: appStructures = [],
-        enums: appEnums = [],
-        logics: appLogics = [],
-        interfaceDependencies: appInterfaceDependencies = [],
-        dependencies: appDependencies = [],
-        processes: appProcesses = [],
-    } = app || {};
-    views.push(...appViews);
-    entities.push(...appEntities);
-    structures.push(...appStructures);
-    enums.push(...appEnums);
-    logics.push(...appLogics);
-    processes.push(...appProcesses);
-
-    if (Array.isArray(appDependencies)) {
-        modules.push(...appDependencies);
-    }
-    if (Array.isArray(appInterfaceDependencies)) {
-        modules.push(...appInterfaceDependencies);
-    }
+
+    app.views && views.push(...app.views);
+    app.entities && entities.push(...app.entities);
+    app.structures && structures.push(...app.structures);
+    app.enums && enums.push(...app.enums);
+    app.logics && logics.push(...app.logics);
+    app.processes && processes.push(...app.processes);
+
+    app.dependencies && modules.push(...app.dependencies);
+    app.interfaceDependencies && modules.push(...app.interfaceDependencies);
+
     modules.forEach((module: Module) => {
-        const {
-            views: moduleViews = [],
-            entities: moduleEntities = [],
-            structures: moduleStructures = [],
-            enums: moduleEnums = [],
-            logics: moduleLogics = [],
-            interfaces: moduleInterfaces = [],
-        } = module;
-        views.push(...moduleViews);
-        entities.push(...moduleEntities);
-        structures.push(...moduleStructures);
-        enums.push(...moduleEnums);
-        logics.push(...moduleLogics);
-        interfaces.push(...moduleInterfaces);
+        module.views && views.push(...module.views);
+        module.entities && entities.push(...module.entities);
+        module.structures && structures.push(...module.structures);
+        module.enums && enums.push(...module.enums);
+        module.logics && logics.push(...module.logics);
+        module.interfaces && interfaces.push(...module.interfaces);
     });
 
     const componentMap: {
@@ -151,6 +132,7 @@ export async function genBundleFiles(app: App,
             domainName: app.name,
             nuimsDomain: config.nuimsDomain,
             auth: view.auth,
+            documentTitle: app.documentTitle,
             router: {
                 notFound: '/',
                 middleware: ['first', 'lock', 'auth', 'login'],
@@ -255,7 +237,7 @@ export async function genBundleFiles(app: App,
     });
 
     const data = JSON5.stringify({
-        pages,
+        // pages,
         metaData: {
             dataTypesMap,
             enumsMap,
@@ -270,6 +252,7 @@ export async function genBundleFiles(app: App,
         env: config.env,
         indexName,
     }, null, 4);
+
     const assetsInfo = app.genAllAssetsInfo(config.STATIC_URL);
     // console.log(assetsInfo);
     // debugger;
@@ -288,6 +271,15 @@ export async function genBundleFiles(app: App,
         `;
     }
 
+    if (app.documentIcon) {
+        content += `{
+            const link = document.createElement('link');
+            link.rel = 'shortcut icon';
+            link.href = \`${app.documentIcon}\`;
+            document.head.appendChild(link);
+        }`;
+    }
+
     content += `
     var customNames = ${customNames};
     for(var i=0;i<customNames.length;i++){
@@ -297,15 +289,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
         }
@@ -314,85 +337,82 @@ export async function genBundleFiles(app: App,
             env: data.env,
             extendedConfig: data.extendedConfig,
             envConfig: {
-                lowcodeDomain:data.lowcodeDomain
+                lowcodeDomain: data.lowcodeDomain,
             },
         }, page.rootRoute, data.metaData);
         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;
+    }
+
+    .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%;
+           }
 
-    // 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;
+           @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 +429,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/manager/diagnostic.ts

@@ -11,7 +11,7 @@ export interface Diagnostic {
     id?: string;
     severity: string;
     originalDiagnostic: tsProtocol.DiagnosticWithFileName;
-    message: string;
+    message?: string;
     code?: number;
     node?: BaseNode;
     text?: string;

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,
@@ -72,6 +86,7 @@ export default function formatUiTs(allComponent: any) {
     export class lRoot<T> extends VueComponent{
         constructor(
             options?: {
+              [propname: string]: any,
               bindAttr?: () => Array<any>,
               slotDefault?: ()=> Array<any>,
         }){super()}
@@ -79,6 +94,7 @@ export default function formatUiTs(allComponent: any) {
     export class div<T> extends VueComponent {
         constructor(
             options?: {
+              [propname: string]: any,
               bindAttr?: () => Array<any>,
               slotDefault?: ()=> Array<any>,
               click?: (event) => Array<any>,
@@ -87,6 +103,7 @@ export default function formatUiTs(allComponent: any) {
     export class template<T> extends VueComponent {
         constructor(
             options?: {
+              [propname: string]: any,
               bindAttr?: () => Array<any>,
               slotDefault?: ()=> Array<any>,
         }){super()}
@@ -97,7 +114,7 @@ export default function formatUiTs(allComponent: any) {
         const item = allComponent[i];
         const componentName = toHump(item.name);
         if (!componentName)
-            break;
+            continue;
         // console.log(item);
         value += `export class ${componentName}<T> extends VueComponent{\n
                 constructor(\n
@@ -175,5 +192,6 @@ export default function formatUiTs(allComponent: any) {
     return {
         code: value,
         elementsLogic,
+        naslStdlibMap,
     };
 }

package/src/server/entity2LogicNamespace.ts

@@ -4,6 +4,30 @@ export function entity2LogicNamespace(entity: Entity) {
     const properties = entity.properties;
     const keys = properties.filter((item) => item.primaryKey);
     const params = keys.map((item: EntityProperty) => new Param({ name: item.name, typeAnnotation: TypeAnnotation.createPrimitive(item.typeAnnotation.typeName), required: true }));
+    const batchDeleteParams
+        = keys.length > 1 ? [
+            new Param({
+                name: 'body',
+                typeAnnotation: TypeAnnotation.createGeneric('List', {
+                    typeArguments: [
+                        TypeAnnotation.from({
+                            typeKind: 'reference',
+                            typeNamespace: entity.getNamespace(),
+                            typeName: entity.name,
+                        }),
+                    ],
+                }),
+                required: true,
+            }),
+        ] : [
+            new Param({
+                name: 'body',
+                typeAnnotation: TypeAnnotation.createGeneric('List', {
+                    typeArguments: [TypeAnnotation.createPrimitive(keys[0].typeAnnotation.typeName)],
+                }),
+                required: true,
+            }),
+        ];
     const ns = new Namespace({
         name: entity.name,
         logics: [
@@ -145,15 +169,7 @@ export function entity2LogicNamespace(entity: Entity) {
             }),
             new Logic({
                 name: 'batchDelete',
-                params: [
-                    new Param({
-                        name: 'body',
-                        typeAnnotation: TypeAnnotation.createGeneric('List', {
-                            typeArguments: [TypeAnnotation.createPrimitive('Long')],
-                        }),
-                        required: true,
-                    }),
-                ],
+                params: batchDeleteParams,
                 body: [],
             }),
             new Logic({

package/src/server/getExtensionModules.ts

@@ -9,5 +9,7 @@ export function moduleToLogicNamesapce(m: Module) {
         logics: m.logics,
     });
     ns.path = `app.${m.name}.logics`;
+    ns.expanded = true
+    ns.originConcept = 'import-interface-category'
     return ns;
 }

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';
@@ -20,32 +20,34 @@ function iterator(tree: FakeNode | FakeProcessNode, searchContent: string, fakeN
     if (searchContent) {
         fakeNode.children = [];
         fakeNode.logics = [];
-        fakeNode.processes = [];
+        // fakeNode.processes = [];
         if (tree.children) {
             tree.children.forEach((c) => {
                 const childFakeNode = {};
-                if (iterator(c, searchContent, childFakeNode)) {
+                if(c.title?.toLowerCase().includes(searchContent) || c.name?.toLowerCase().includes(searchContent))
+                    fakeNode.children.push({...c});
+                else if (iterator(c, searchContent, childFakeNode)) {
                     fakeNode.children.push(childFakeNode);
                 }
             });
         }
         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);
                 }
             });
         }
-        if (tree.processes) {
-            tree.processes.forEach((c) => {
-                const childFakeNode = {};
-                if (iterator(c, searchContent, childFakeNode)) {
-                    fakeNode.processes.push(childFakeNode);
-                }
-            });
-        }
-        if (fakeNode.logics.length > 0) {
+        // if (tree.processes) {
+        //     tree.processes.forEach((c) => {
+        //         const childFakeNode = {};
+        //         if (iterator(c, searchContent, childFakeNode)) {
+        //             fakeNode.processes.push(childFakeNode);
+        //         }
+        //     });
+        // }
+        if (fakeNode.logics.length > 0 || fakeNode.children.length > 0) {
             return true;
         }
         return false;
@@ -100,7 +102,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 +123,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);