@lcap/nasl 3.2.0-beta.3 → 3.3.0-alpha

package/src/generator/styleReplacer.ts

@@ -1,41 +1,38 @@
 import * as postcss from 'postcss';
 
 export function getClassName(styleStr: string) {
-    if (/^\$style\[['"](.*)['"]\]$/g.test(styleStr)) {
-        const classNameVarName = /^\$style\[['"](.*)['"]\]$/g.exec(styleStr);
-        if (classNameVarName)
-            return classNameVarName[1];
-    } else if (/^\$style./g.test(styleStr)) {
-        const classNameVarName = styleStr.split('.')[1];
-        if (classNameVarName)
-            return classNameVarName;
-    }
-    return undefined;
+  if (/^\$style\[['"](.*)['"]\]$/g.test(styleStr)) {
+    const classNameVarName = /^\$style\[['"](.*)['"]\]$/g.exec(styleStr);
+    if (classNameVarName) return classNameVarName[1];
+  } else if (/^\$style./g.test(styleStr)) {
+    const classNameVarName = styleStr.split('.')[1];
+    if (classNameVarName) return classNameVarName;
+  }
+  return undefined;
 }
 
 export function replaceCSS(content: string, hash: string) {
-    const root = postcss.parse(content);
-    root.walkRules((rule) => {
-        rule.selector = rule.selector.replace(/\.[-_a-zA-Z0-9]+/g, (m) => m + '__' + hash);
-    });
-    return root.toResult().css;
+  const root = postcss.parse(content);
+  root.walkRules((rule) => {
+    rule.selector = rule.selector.replace(/\.[-_a-zA-Z0-9]+/g, (m) => `${m}__${hash}`);
+  });
+  return root.toResult().css;
 }
 
 export function replaceTemplate(content: string, hash: string) {
-    return content.replace(/(<[^>\s]+\s.*):class="([^"]+)"/g, (m, $1, $2) => {
-        if ($1 !== '!--') {
-            const className = $2;
-            if (/^\[.*\]$/g.test(className)) {
-                const result = /^\[(.*)\]$/g.exec(className);
-                const contents = result[1]
-                    .split(',')
-                    .filter((item) => item)
-                    .map((item) => item.trim());
-                return $1 + `class="${contents.map((item) => getClassName(item) + '__' + hash).join(' ')}"`;
-            } else
-                return $1 + `class="${getClassName(className) + '__' + hash}"`;
-        } else {
-            return m;
-        }
-    });
+  return content.replace(/(<[^>\s]+\s.*):class="([^"]+)"/g, (m, $1, $2) => {
+    if ($1 !== '!--') {
+      const className = $2;
+      if (/^\[.*\]$/g.test(className)) {
+        const result = /^\[(.*)\]$/g.exec(className);
+        const contents = result[1]
+          .split(',')
+          .filter((item) => item)
+          .map((item) => item.trim());
+        return `${$1}class="${contents.map((item) => `${getClassName(item)}__${hash}`).join(' ')}"`;
+      }
+      return `${$1}class="${`${getClassName(className)}__${hash}`}"`;
+    }
+    return m;
+  });
 }

package/src/index.ts

@@ -2,7 +2,6 @@ export { EventEmitter, EventPayload, BaseNode } from './common';
 export * from './concepts';
 export { genBundleFiles, genFrontendBundleFiles, genMetaData, genReleaseBody, genPermissionData, genLogicAuthFlag } from './generator';
 export * from './translator';
-// export { default as diagnosticManager } from './manager/diagnostic';
 export { default as server, NaslServer } from './server';
 export * as genBlock from './templator';
 export * as utils from './utils';
@@ -11,5 +10,3 @@ export * from './eventBus';
 export * as breakpoint from './breakpoint';
 export { loadApp, loadAppSync, handleApp, batchAction, batchQuery, mountDatabaseTypes } from './service/storage/init';
 export { createService } from './service/creator';
-export * from './manager/stepRecorder';
-import './automate/engine';

package/src/manager/diagnostic.ts

@@ -1,5 +1,5 @@
-import { LogicItem, BaseNode } from '../concepts';
 import * as tsProtocol from 'typescript/lib/protocol';
+import { LogicItem, BaseNode } from '../concepts';
 
 // export interface TypeCheckNote {
 //     status: string,
@@ -8,22 +8,22 @@ import * as tsProtocol from 'typescript/lib/protocol';
 // }
 
 export interface Diagnostic {
-    // 唯一标识
-    id?: string;
-    // 严重等级
-    severity: string;
-    // 原来的诊断信息
-    originalDiagnostic?: tsProtocol.DiagnosticWithFileName;
-    // 底部展示的名称
-    message?: string;
-    // code的长度
-    code?: number;
-    // 节点本身
-    node?: BaseNode;
-    // 原始报错的text
-    text?: string;
-    // 用来展示一些问题对应的展示
-    titleTip?: string;
+  // 唯一标识
+  id?: string;
+  // 严重等级
+  severity: string;
+  // 原来的诊断信息
+  originalDiagnostic?: tsProtocol.DiagnosticWithFileName;
+  // 底部展示的名称
+  message?: string;
+  // code的长度
+  code?: number;
+  // 节点本身
+  node?: BaseNode;
+  // 原始报错的text
+  text?: string;
+  // 用来展示一些问题对应的展示
+  titleTip?: string;
 }
 
 // export interface TypeCheckAttribute {
@@ -36,82 +36,84 @@ export interface Diagnostic {
  * 文件粒度的 Diagnostic
  */
 export interface DiagnosticRecord {
-    id: string;
-    logicId?: string;
-    // typeCheckNote: TypeCheckNote,
-    filePath?: string;
-    node: BaseNode;
-    message: string;
-    syntaxDiagnostics: Array<Diagnostic>;
-    semanticDiagnostics: Array<Diagnostic>;
-    suggestionDiagnostics: Array<Diagnostic>;
-    // processComponentId?: string,
-    // attributes?: TypeCheckAttribute[],
+  id: string;
+  logicId?: string;
+  // typeCheckNote: TypeCheckNote,
+  filePath?: string;
+  node: BaseNode;
+  message: string;
+  syntaxDiagnostics: Array<Diagnostic>;
+  semanticDiagnostics: Array<Diagnostic>;
+  suggestionDiagnostics: Array<Diagnostic>;
+  // processComponentId?: string,
+  // attributes?: TypeCheckAttribute[],
 }
 
 export class DiagnosticManager {
-    records:Array<DiagnosticRecord> = [];
+  records: Array<DiagnosticRecord> = [];
 
-    push(record: DiagnosticRecord) {
-        const index = this.records.findIndex((item) => item.id === record.id);
-        if (index === -1) {
-            this.records.unshift(record);
-        } else {
-            this.records.splice(index, 1, record);
-        }
+  push(record: DiagnosticRecord) {
+    const index = this.records.findIndex((item) => item.id === record.id);
+    if (index === -1) {
+      this.records.unshift(record);
+    } else {
+      this.records.splice(index, 1, record);
+    }
 
-        // if(record.typeCheckNote?.message?.filter)
-        //     record.typeCheckNote.message = record.typeCheckNote.message.filter((item) => !!item);
+    // if(record.typeCheckNote?.message?.filter)
+    //     record.typeCheckNote.message = record.typeCheckNote.message.filter((item) => !!item);
 
-        // if(!record.typeCheckNote || record.typeCheckNote.status === 'success'
-        //     || (record.typeCheckNote && record.typeCheckNote.message && record.typeCheckNote.message.length === 0))
-        //     return;
-    }
+    // if(!record.typeCheckNote || record.typeCheckNote.status === 'success'
+    //     || (record.typeCheckNote && record.typeCheckNote.message && record.typeCheckNote.message.length === 0))
+    //     return;
+  }
 
-    getRecord(id: string) {
-        const index = this.records.findIndex((item) => item.id === id);
-        return this.records[index];
-    }
+  getRecord(id: string) {
+    const index = this.records.findIndex((item) => item.id === id);
+    return this.records[index];
+  }
 
-    deleteOwn(id: string) {
-        const index = this.records.findIndex((item) => item.id === id);
-        ~index && this.records.splice(index, 1);
-    }
+  deleteOwn(id: string) {
+    const index = this.records.findIndex((item) => item.id === id);
+    ~index && this.records.splice(index, 1);
+  }
 
-    delete(id: string) {
-        // const node = vertexsMap.get(id);
-        // this.deleteOwn(id);
-        // if (node) {
-        //     const children: LogicItem[] = [];
-        //     // [...logicItemKeyOfLogicItem, ...logicItemArrayKeyOfLogicItem].forEach((key) => {
-        //     //     const item = (node as LogicItem)[key as keyof LogicItem];
-        //     //     if (item)
-        //     //         children = children.concat(item);
-        //     // });
-        //     children.forEach((item) => {
-        //         this.delete(item.id);
-        //     });
-        // }
-    }
+  delete(id: string) {
+    // const node = vertexsMap.get(id);
+    // this.deleteOwn(id);
+    // if (node) {
+    //     const children: LogicItem[] = [];
+    //     // [...logicItemKeyOfLogicItem, ...logicItemArrayKeyOfLogicItem].forEach((key) => {
+    //     //     const item = (node as LogicItem)[key as keyof LogicItem];
+    //     //     if (item)
+    //     //         children = children.concat(item);
+    //     // });
+    //     children.forEach((item) => {
+    //         this.delete(item.id);
+    //     });
+    // }
+  }
 
-    clear() {
-        this.records.splice(0, this.records.length);
-    }
+  clear() {
+    this.records.splice(0, this.records.length);
+  }
 
-    pushAll(records: DiagnosticRecord[]) {
-        for (const record of records) {
-            this.push(record);
-        }
+  pushAll(records: DiagnosticRecord[]) {
+    for (const record of records) {
+      this.push(record);
     }
+  }
 
-    filterDiagnostics(showTSError?: boolean) {
-        const chineseRE = /[\u2E80-\uFE4F]/;
-        return [].concat(...this.records.map((record) => {
-            const diagnostics: Diagnostic[] = [].concat(record.semanticDiagnostics, record.suggestionDiagnostics);
-            // if (!showTSError) {
-            //     diagnostics = diagnostics.filter((diagnostic) => chineseRE.test(diagnostic.message));
-            // }
-            return diagnostics;
-        }));
-    }
+  filterDiagnostics(showTSError?: boolean) {
+    const chineseRE = /[\u2E80-\uFE4F]/;
+    return [].concat(
+      ...this.records.map((record) => {
+        const diagnostics: Diagnostic[] = [].concat(record.semanticDiagnostics, record.suggestionDiagnostics);
+        // if (!showTSError) {
+        //     diagnostics = diagnostics.filter((diagnostic) => chineseRE.test(diagnostic.message));
+        // }
+        return diagnostics;
+      })
+    );
+  }
 }

package/src/manager/stepRecorder.ts

@@ -1,112 +1,124 @@
 import format from 'date-fns/format';
 
 export const stepRecorder = {
-    count: 0,
-    initialized: false,
-    init() {
-        this.count = this.getKeys().length;
+  count: 0,
+  initialized: false,
+  init() {
+    this.count = this.getKeys().length;
 
-        const div = document.createElement('div');
-        div.id = 'recorder';
-        (div as any).style = 'position: fixed; top: -12px; right: 300px; z-index: 9999; background: #fffbd0; padding: 10px; border: 1px solid #ccc; border-radius: 5px;';
+    const div = document.createElement('div');
+    div.id = 'recorder';
+    (div as any).style =
+      'position: fixed; top: -12px; right: 300px; z-index: 9999; background: #fffbd0; padding: 10px; border: 1px solid #ccc; border-radius: 5px;';
 
-        div.innerHTML = `<div><span style="color: red; font-size: 17px; vertical-align: -2px;">◉</span> 正在录制中…</div>
+    div.innerHTML = `<div><span style="color: red; font-size: 17px; vertical-align: -2px;">◉</span> 正在录制中…</div>
 <div style="margin-top: -2px;">当前应用的操作步骤数：<span id="recorder-count">${this.count}</span></div>
 <div style="margin-top: 4px;">
     <button onclick="$data.nasl.stepRecorder.exportExcel()">下载数据</button>
 </div>
 `;
-        //     <button onclick="$data.nasl.stepRecorder.clear()">清除数据</button>
-        document.body.appendChild(div);
+    //     <button onclick="$data.nasl.stepRecorder.clear()">清除数据</button>
+    document.body.appendChild(div);
 
-        const script = document.createElement('script');
-        script.src = 'https://cdnjs.cloudflare.com/ajax/libs/xlsx-populate/1.21.0/xlsx-populate.min.js';
-        document.body.appendChild(script);
+    const script = document.createElement('script');
+    script.src = 'https://cdnjs.cloudflare.com/ajax/libs/xlsx-populate/1.21.0/xlsx-populate.min.js';
+    document.body.appendChild(script);
 
-        this.initialized = true;
+    this.initialized = true;
+  },
+  clear() {
+    // eslint-disable-next-line no-alert
+    const result = confirm('确定要清空所有当前应用的操作记录吗？');
+    if (result) {
+      this.getKeys().forEach((key) => localStorage.removeItem(key));
+      this.count = 0;
+      document.getElementById('recorder-count').innerText = String(this.count);
+    }
+  },
+  getAppName() {
+    return location.search.match(/appId=([^-]+)/)[1];
+  },
+  getKeys() {
+    return Object.keys(localStorage).filter((key) => key.startsWith(`录-${this.getAppName()}-`));
+  },
+  record(
+    actionMsg: string,
+    actionItem: {
+      action: 'undo' | 'redo';
     },
-    clear() {
-        // eslint-disable-next-line no-alert
-        const result = confirm('确定要清空所有当前应用的操作记录吗？');
-        if (result) {
-            this.getKeys().forEach((key) => localStorage.removeItem(key));
-            this.count = 0;
-            document.getElementById('recorder-count').innerText = String(this.count);
-        }
-    },
-    getAppName() {
-        return location.search.match(/appId=([^-]+)/)[1];
-    },
-    getKeys() {
-        return Object.keys(localStorage).filter((key) => key.startsWith(`录-${this.getAppName()}-`));
-    },
-    record(actionMsg: string, actionItem: {
-        action: 'undo' | 'redo',
-    }, actionList: Array<{ action: string, path: string, object: { concept: string, name: string } }>) {
-        try {
-            const actionItemDetail = actionList?.[0];
-            const timestamp = new Date().toJSON();
-            // eslint-disable-next-line function-paren-newline
-            localStorage.setItem(`录-${this.getAppName()}-${this.count + 1}`, JSON.stringify(
-                // {
-                //     timestamp,
-                //     message: actionMsg + (actionItem?.action ? ' ' + actionItem.action : ''),
-                //     detail: {
-                //         action: actionItemDetail?.action,
-                //         path: actionItemDetail?.path,
-                //         object: {
-                //             concept: actionItemDetail?.object?.concept,
-                //             name: actionItemDetail?.object?.name,
-                //         }
-                //     },
-                // }
-                [
-                    timestamp,
-                    actionMsg,
-                    ({ undo: '撤销', redo: '重做' })[actionItem?.action],
-                    actionItemDetail?.action,
-                    actionItemDetail?.path,
-                    actionItemDetail?.object?.concept,
-                    actionItemDetail?.object?.name,
-                ]));
-            this.count++;
-            document.getElementById('recorder-count').innerText = String(this.count);
-        } catch (e) {
-            console.log(e);
-        }
-    },
-    exportExcel() {
-        (window as any).XlsxPopulate.fromBlankAsync()
-            .then((workbook: any) => {
-                const sheet = workbook.sheet(0);
-                const firstRowData = ['操作时间', '操作信息', '是否为撤销重做', '（详情）action', '（详情）path', '（详情）concept', '（详情）name'];
-                sheet.range(1, 1, 1, firstRowData.length).value([firstRowData]);
-                sheet.row(1).style({
-                    bold: true,
-                    fill: 'E1EAFF',
-                }).height(22);
-                [30, 30, 30, 14, 30, 18, 18].forEach((width, index) => sheet.column(index + 1).width(width));
+    actionList: Array<{ action: string; path: string; object: { concept: string; name: string } }>
+  ) {
+    try {
+      const actionItemDetail = actionList?.[0];
+      const timestamp = new Date().toJSON();
+      // eslint-disable-next-line function-paren-newline
+      localStorage.setItem(
+        `录-${this.getAppName()}-${this.count + 1}`,
+        JSON.stringify(
+          // {
+          //     timestamp,
+          //     message: actionMsg + (actionItem?.action ? ' ' + actionItem.action : ''),
+          //     detail: {
+          //         action: actionItemDetail?.action,
+          //         path: actionItemDetail?.path,
+          //         object: {
+          //             concept: actionItemDetail?.object?.concept,
+          //             name: actionItemDetail?.object?.name,
+          //         }
+          //     },
+          // }
+          [
+            timestamp,
+            actionMsg,
+            { undo: '撤销', redo: '重做' }[actionItem?.action],
+            actionItemDetail?.action,
+            actionItemDetail?.path,
+            actionItemDetail?.object?.concept,
+            actionItemDetail?.object?.name,
+          ]
+        )
+      );
+      this.count++;
+      document.getElementById('recorder-count').innerText = String(this.count);
+    } catch (e) {
+      console.log(e);
+    }
+  },
+  exportExcel() {
+    (window as any).XlsxPopulate.fromBlankAsync().then((workbook: any) => {
+      const sheet = workbook.sheet(0);
+      const firstRowData = ['操作时间', '操作信息', '是否为撤销重做', '（详情）action', '（详情）path', '（详情）concept', '（详情）name'];
+      sheet.range(1, 1, 1, firstRowData.length).value([firstRowData]);
+      sheet
+        .row(1)
+        .style({
+          bold: true,
+          fill: 'E1EAFF',
+        })
+        .height(22);
+      [30, 30, 30, 14, 30, 18, 18].forEach((width, index) => sheet.column(index + 1).width(width));
 
-                this.getKeys().sort().forEach((key, index) => {
-                    const item = JSON.parse(localStorage[key]);
-                    item[0] = format(new Date(item[0]), 'yyyy-MM-dd HH:mm:ss');
-                    sheet.range(index + 2, 1, index + 2, firstRowData.length).value([item]);
-                });
+      this.getKeys()
+        .sort()
+        .forEach((key, index) => {
+          const item = JSON.parse(localStorage[key]);
+          item[0] = format(new Date(item[0]), 'yyyy-MM-dd HH:mm:ss');
+          sheet.range(index + 2, 1, index + 2, firstRowData.length).value([item]);
+        });
 
-                // Write to file.
-                return workbook.outputAsync()
-                    .then((blob: Blob) => {
-                        const url = window.URL.createObjectURL(blob);
-                        const a = document.createElement('a');
-                        document.body.appendChild(a);
-                        a.href = url;
-                        a.download = `操作步骤统计-${this.getAppName()}-${format(new Date(), 'yyyyMMddHHmmss')}.xlsx`;
-                        a.click();
-                        window.URL.revokeObjectURL(url);
-                        document.body.removeChild(a);
-                    });
-            });
-    },
+      // Write to file.
+      return workbook.outputAsync().then((blob: Blob) => {
+        const url = window.URL.createObjectURL(blob);
+        const a = document.createElement('a');
+        document.body.appendChild(a);
+        a.href = url;
+        a.download = `操作步骤统计-${this.getAppName()}-${format(new Date(), 'yyyyMMddHHmmss')}.xlsx`;
+        a.click();
+        window.URL.revokeObjectURL(url);
+        document.body.removeChild(a);
+      });
+    });
+  },
 };
 
 export default stepRecorder;