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

package/src/translator/index.ts

@@ -3,26 +3,26 @@ import { EventEmitter } from '../common/EventEmitter';
 import { Range, Position, uinteger } from './lsp';
 
 export interface SourceMapItem {
-    code?: string;
-    /**
-     * LSP 的 Range
-     */
-    range?: Range;
+  code?: string;
+  /**
+   * LSP 的 Range
+   */
+  range?: Range;
 }
 
 export type SourceMap = Map<BaseNode, SourceMapItem>;
 
 export interface TranslatorState {
-    position?: Position;
-    tabSize?: number;
-    inline?: boolean;
-    preferQuote?: 'single' | 'double' | 'backtick';
-    sourceMap?: SourceMap;
-    finalCode?: boolean;
+  position?: Position;
+  tabSize?: number;
+  inline?: boolean;
+  preferQuote?: 'single' | 'double' | 'backtick';
+  sourceMap?: SourceMap;
+  finalCode?: boolean;
 }
 
 export function lsp2tspNumber(num: uinteger) {
-    return num + 1;
+  return num + 1;
 }
 
 export const indent = (tabSize: number) => ' '.repeat(tabSize * 4);
@@ -33,18 +33,18 @@ export const indent = (tabSize: number) => ' '.repeat(tabSize * 4);
  * @returns
  */
 export function createCompilerState(startCode: string = '', options?: Partial<TranslatorState>) {
-    const state: TranslatorState = Object.assign({
-        position: {
-            line: 0,
-            character: 0,
-            offset: 0,
-        },
-        tabSize: 0,
-    }, options);
-    if (!state.sourceMap)
-        state.sourceMap = new Map<BaseNode, SourceMapItem>();
-
-    return shiftState(state, startCode);
+  const state: TranslatorState = {
+    position: {
+      line: 0,
+      character: 0,
+      offset: 0,
+    },
+    tabSize: 0,
+    ...options,
+  };
+  if (!state.sourceMap) state.sourceMap = new Map<BaseNode, SourceMapItem>();
+
+  return shiftState(state, startCode);
 }
 
 /**
@@ -53,18 +53,16 @@ export function createCompilerState(startCode: string = '', options?: Partial<Tr
  * @param code
  */
 export function shiftPosition(pos: Position, code: string = ''): Position {
-    const res = Object.assign({}, pos);
-    if (code) {
-        const arr = code.split('\n');
-        res.offset += code.length;
-        res.line += arr.length - 1;
-        if (arr.length === 1)
-            res.character += arr[arr.length - 1].length;
-        else
-            res.character = arr[arr.length - 1].length;
-    }
-
-    return Object.freeze(res);
+  const res = { ...pos };
+  if (code) {
+    const arr = code.split('\n');
+    res.offset += code.length;
+    res.line += arr.length - 1;
+    if (arr.length === 1) res.character += arr[arr.length - 1].length;
+    else res.character = arr[arr.length - 1].length;
+  }
+
+  return Object.freeze(res);
 }
 
 /**
@@ -73,61 +71,63 @@ export function shiftPosition(pos: Position, code: string = ''): Position {
  * @param code
  */
 export function shiftState(state: TranslatorState, code?: string, options?: Partial<TranslatorState>): TranslatorState {
-    state = Object.assign({}, state);
-    state.position = shiftPosition(state.position, code);
-    Object.assign(state, options); // 优先 options
-    return Object.freeze(state);
+  state = { ...state };
+  state.position = shiftPosition(state.position, code);
+  Object.assign(state, options); // 优先 options
+  return Object.freeze(state);
 }
 
 /**
  * @decorator
  */
 export function withSourceMap() {
-    return function handleAction(target: any, key: string | number | symbol, descriptor: PropertyDescriptor) {
-        const oldMethod = descriptor.value;
-
-        descriptor.value = function (this: BaseNode, state?: TranslatorState, ...args: any[]) {
-            // 重新生成ts代码就先把类型清除掉
-            // 注意排查错误的时候，调用了这个方法，就会把节点上缓存的__TypeAnnotation清除
-            try {
-                this.__isCorrectTypeAnnotation = false;
-            } catch (err) {}
-            if (!state) {
-                // 没有状态不生成 SourceMap
-                return oldMethod.call(this);
-            } else {
-                // state = Object.freeze(Object.assign({
-                //     position: { line: 0, character: 0, offset: 0 },
-                //     tabSize: 0,
-                // }, state));
-
-                let before: string = '';
-                if (!state.inline) {
-                    before = indent((state?.tabSize || 0));
-                    state = shiftState(state, before);
-                } else {
-                    state = shiftState(state, before, {
-                        inline: undefined,
-                    });
-                }
-
-                // 调用真实方法, 可能有剩余参数
-                const code = oldMethod.call(this, state, ...args);
-
-                state.sourceMap?.set(this, Object.freeze({
-                    code,
-                    range: {
-                        start: state.position,
-                        end: shiftPosition(state.position, code),
-                    },
-                }));
-
-                return before + code;
-            }
-        };
-
-        return descriptor;
+  return function handleAction(target: any, key: string | number | symbol, descriptor: PropertyDescriptor) {
+    const oldMethod = descriptor.value;
+
+    descriptor.value = function (this: BaseNode, state?: TranslatorState, ...args: any[]) {
+      // 重新生成ts代码就先把类型清除掉
+      // 注意排查错误的时候，调用了这个方法，就会把节点上缓存的__TypeAnnotation清除
+      try {
+        this.__isCorrectTypeAnnotation = false;
+      } catch (err) {}
+      if (!state) {
+        // 没有状态不生成 SourceMap
+        return oldMethod.call(this);
+      }
+      // state = Object.freeze(Object.assign({
+      //     position: { line: 0, character: 0, offset: 0 },
+      //     tabSize: 0,
+      // }, state));
+
+      let before: string = '';
+      if (!state.inline) {
+        before = indent(state?.tabSize || 0);
+        state = shiftState(state, before);
+      } else {
+        state = shiftState(state, before, {
+          inline: undefined,
+        });
+      }
+
+      // 调用真实方法, 可能有剩余参数
+      const code = oldMethod.call(this, state, ...args);
+
+      state.sourceMap?.set(
+        this,
+        Object.freeze({
+          code,
+          range: {
+            start: state.position,
+            end: shiftPosition(state.position, code),
+          },
+        })
+      );
+
+      return before + code;
     };
+
+    return descriptor;
+  };
 }
 
 /**

package/src/translator/lsp.ts

@@ -20,31 +20,31 @@ export type uinteger = number;
 export type decimal = number;
 
 export interface Position {
-	/**
-	 * Line position in a document (zero-based).
-	 */
-	line: uinteger;
+  /**
+   * Line position in a document (zero-based).
+   */
+  line: uinteger;
 
-	/**
-	 * Character offset on a line in a document (zero-based). Assuming that
-	 * the line is represented as a string, the `character` value represents
-	 * the gap between the `character` and `character + 1`.
-	 *
-	 * If the character value is greater than the line length it defaults back
-	 * to the line length.
-	 */
-	character: uinteger;
-	offset?: uinteger;
+  /**
+   * Character offset on a line in a document (zero-based). Assuming that
+   * the line is represented as a string, the `character` value represents
+   * the gap between the `character` and `character + 1`.
+   *
+   * If the character value is greater than the line length it defaults back
+   * to the line length.
+   */
+  character: uinteger;
+  offset?: uinteger;
 }
 
 export interface Range {
-	/**
-	 * The range's start position.
-	 */
-	start: Position;
+  /**
+   * The range's start position.
+   */
+  start: Position;
 
-	/**
-	 * The range's end position.
-	 */
-	end: Position;
+  /**
+   * The range's end position.
+   */
+  end: Position;
 }

package/src/translator/tsp.ts

@@ -1,14 +1,14 @@
 export interface TSPPosition {
-    line: number;
-    offset: number;
+  line: number;
+  offset: number;
 }
 
 export interface TSPRange {
-    start: TSPPosition,
-    end: TSPPosition,
+  start: TSPPosition;
+  end: TSPPosition;
 }
 
 export interface TSP1DRange {
-    start: number;
-    length: number;
+  start: number;
+  length: number;
 }

package/src/utils/index.ts

@@ -1,63 +1,63 @@
-export * from './string';
-export * from './traverse';
-export * from './logger';
-
 import { compare } from 'compare-versions';
 import { BaseNode, LogicItem } from '..';
 import { traverse } from './traverse';
 
+export * from './string';
+export * from './traverse';
+export * from './logger';
+export * from './time-slicing';
+
 // 查找最近的模块
 export function findClosestModule(node: BaseNode) {
-    let moduleNode = node;
-    while (moduleNode && !['App', 'Module'].includes(moduleNode.concept)) {
-        moduleNode = moduleNode.parentNode;
-    }
-    return moduleNode;
+  let moduleNode = node;
+  while (moduleNode && !['App', 'Module'].includes(moduleNode.concept)) {
+    moduleNode = moduleNode.parentNode;
+  }
+  return moduleNode;
 }
 
 // 从namespace获取关键字
 export function findConceptKeyWordByNamespace(namespace: string) {
-    const namespaceArr = namespace?.split('.') || [];
-    const start = namespaceArr[0];
-    const mod = start === 'app' ? 1 : 0;
-    const keywordViews = namespaceArr.filter((namespaceItem, index) => index % 2 === mod);
-    return keywordViews.pop();
+  const namespaceArr = namespace?.split('.') || [];
+  const start = namespaceArr[0];
+  const mod = start === 'app' ? 1 : 0;
+  const keywordViews = namespaceArr.filter((namespaceItem, index) => index % 2 === mod);
+  return keywordViews.pop();
 }
 
 // 从namespace中查找concept关键字
 export function findConceptKeyWordIndexFromNamespace(namespace: string, keyword: string) {
-    const namespaceArr = namespace?.split('.') || [];
-    const start = namespaceArr[0];
-    const mod = start === 'app' ? 1 : 0;
-    return namespaceArr.findIndex((namespaceItem, index) => {
-        if (index % 2 === mod) {
-            return namespaceItem === keyword;
-        }
-        return false;
-    });
+  const namespaceArr = namespace?.split('.') || [];
+  const start = namespaceArr[0];
+  const mod = start === 'app' ? 1 : 0;
+  return namespaceArr.findIndex((namespaceItem, index) => {
+    if (index % 2 === mod) {
+      return namespaceItem === keyword;
+    }
+    return false;
+  });
 }
 
 // 从namespace中查找concept，返回找到类型对应的值
 // 如 namespace : app.datasource.defaultDS  keyword: datasource
 // 返回 defaultDS
 export function findConceptValueFromNamespace(namespace: string, keyword: string) {
-    const namespaceArr = namespace?.split('.') || [];
-    const start = namespaceArr[0];
-    const mod = start === 'app' ? 1 : 0;
-    const findIndex = namespaceArr.findIndex((namespaceItem, index) => {
-        if (index % 2 === mod) {
-            return namespaceItem === keyword;
-        }
-        return false;
-    });
+  const namespaceArr = namespace?.split('.') || [];
+  const start = namespaceArr[0];
+  const mod = start === 'app' ? 1 : 0;
+  const findIndex = namespaceArr.findIndex((namespaceItem, index) => {
+    if (index % 2 === mod) {
+      return namespaceItem === keyword;
+    }
+    return false;
+  });
 
-    if (findIndex)
-        return namespaceArr[findIndex + 1];
-    return '';
+  if (findIndex) return namespaceArr[findIndex + 1];
+  return '';
 }
 
 export function getGlobalEnv() {
-    return typeof window !== 'undefined' ? (window as any).appInfo.env : (global as any).appInfoEnv;
+  return typeof window !== 'undefined' ? (window as any).appInfo.env : (global as any).appInfoEnv;
 }
 
 /**
@@ -69,45 +69,48 @@ export function getGlobalEnv() {
 export const throttle = (func: Function, wait: number, options: any) => func;
 
 export function clearObject(obj: any) {
-    Object.keys(obj).forEach((key) => {
-        if (obj[key] === undefined || obj[key] === null)
-            delete obj[key];
-    });
+  Object.keys(obj).forEach((key) => {
+    if (obj[key] === undefined || obj[key] === null) delete obj[key];
+  });
 }
 
 export function clearObjectDeep(obj: any) {
-    traverse((current) => {
-        Object.keys(current.node).forEach((key) => {
-            if (current.node[key] === null)
-                delete current.node[key];
-        });
-    }, { node: obj }, { mode: 'anyObject' });
+  traverse(
+    (current) => {
+      Object.keys(current.node).forEach((key) => {
+        if (current.node[key] === null) delete current.node[key];
+      });
+    },
+    { node: obj },
+    { mode: 'anyObject' }
+  );
 }
 
 export const waitPromise = (wait: number) => new Promise((res) => setTimeout(() => res(wait), wait));
 
 // 官方扩展组件暂时不包含 css 文件
 export const officialCustoms = [
-    'u-sider-modal',
-    'timer-count-down',
-    'u-calendar-table',
-    'lcap-login',
-    'lcap-video',
-    'lcap-amap-nav',
-    'lcap-amap-poi',
-    'lcap-echarts-bar',
-    'lcap-echarts-line',
-    'lcap-echarts-pie',
-    'lcap-report',
-    'lcap-wang-editor',
-    'lcap-clock',
+  'u-sider-modal',
+  'timer-count-down',
+  'u-calendar-table',
+  'lcap-login',
+  'lcap-video',
+  'lcap-amap-nav',
+  'lcap-amap-poi',
+  'lcap-echarts-bar',
+  'lcap-echarts-line',
+  'lcap-echarts-pie',
+  'lcap-report',
+  'lcap-wang-editor',
+  'lcap-clock',
 ];
 // 特殊官方组件，部分低版本有 css，高版本没有 css
 export const specialOfficialCustoms = [{ name: 'lcap-rich-text-editor', version: '1.3.10' }];
 // lcap-h5 开头表示官方 H5 扩展组件
-export const shouldLoadCss = (name: string, version: string): boolean => (!officialCustoms.includes(name)
-  && !/lcap-h5/.test(name)
-  && !specialOfficialCustoms.find((extra) => extra.name === name && compare(version, extra.version, '>=')));
+export const shouldLoadCss = (name: string, version: string): boolean =>
+  !officialCustoms.includes(name) &&
+  !/lcap-h5/.test(name) &&
+  !specialOfficialCustoms.find((extra) => extra.name === name && compare(version, extra.version, '>='));
 
 // https://github.com/Microsoft/TypeScript/issues/27024#issuecomment-421529650
 export type IfEquals<X, Y, A, B> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;
@@ -121,69 +124,64 @@ type IfEquals<X, Y, A, B> =
 */
 
 export type WritableKeysOf<T> = {
-    [P in keyof T]: IfEquals<{ [Q in P]: T[P] }, { -readonly [Q in P]: T[P] }, P, never>;
+  [P in keyof T]: IfEquals<{ [Q in P]: T[P] }, { -readonly [Q in P]: T[P] }, P, never>;
 }[keyof T];
 export type WritablePart<T> = Pick<T, WritableKeysOf<T>>;
 export type NoReadonly<T> = { -readonly [P in keyof T]: T[P] };
 
 export function toBriefExpr(expression: LogicItem): string {
-    let expr = '-';
-    if ([
-        'NumericLiteral',
-        'StringLiteral',
-        'Identifier',
-        'MemberExpression',
-        'QueryFieldExpression',
-        'BooleanLiteral',
-        'NullLiteral',
-        'Unparsed',
-        'BinaryExpression',
-        'UnaryExpression',
-    ].includes(expression?.concept)) {
-        expr = expression.toBrief();
-    } else if ([
-        'CallFunction',
-        'CallLogic',
-        'CallInterface',
-        'CallQueryComponent',
-        'SqlQueryComponent',
-        'OqlQueryComponent',
-    ].includes(expression?.concept)) {
-        expr = expression.label;
-    }
-    return expr;
+  let expr = '-';
+  if (
+    [
+      'NumericLiteral',
+      'StringLiteral',
+      'Identifier',
+      'MemberExpression',
+      'QueryFieldExpression',
+      'BooleanLiteral',
+      'NullLiteral',
+      'Unparsed',
+      'BinaryExpression',
+      'UnaryExpression',
+    ].includes(expression?.concept)
+  ) {
+    expr = expression.toBrief();
+  } else if (
+    ['CallFunction', 'CallLogic', 'CallInterface', 'CallQueryComponent', 'SqlQueryComponent', 'OqlQueryComponent'].includes(expression?.concept)
+  ) {
+    expr = expression.label;
+  }
+  return expr;
 }
 
 export function replaceNode(oldNode: any, newNode: any) {
-    const { parentNode, parentKey, offsetX, offsetY, app } = oldNode;
-    const logic = oldNode.logic;
-    if (!Array.isArray(parentNode[parentKey])) {
-        parentNode.update({
-            [parentKey]: newNode,
-        });
+  const { parentNode, parentKey, offsetX, offsetY, app } = oldNode;
+  const { logic } = oldNode;
+  if (!Array.isArray(parentNode[parentKey])) {
+    parentNode.update({
+      [parentKey]: newNode,
+    });
+  } else {
+    // 虽然如果不在参数里使用属性访问没有意义，但是得兼容
+    app.emit('collect:start', {
+      actionMsg: '删除属性变量',
+    });
+    if (parentNode.concept === 'Logic') {
+      if (parentKey === 'body') {
+        const expIndex = logic.body.findIndex((item: any) => item === oldNode);
+        logic.insertItemInBodyAt(newNode, expIndex);
+      } else {
+        const expIndex = logic.playground.findIndex((item: any) => item === oldNode);
+        Object.assign(newNode, { offsetX, offsetY });
+        logic.insertItemInPlaygroundAt(newNode, expIndex);
+      }
     } else {
-        // 虽然如果不在参数里使用属性访问没有意义，但是得兼容
-        app.emit('collect:start', {
-            actionMsg: '删除属性变量',
-        });
-        if (parentNode.concept === 'Logic') {
-            if (parentKey === 'body') {
-                const expIndex = logic.body.findIndex((item: any) => item === oldNode);
-                logic.insertItemInBodyAt(newNode, expIndex);
-            } else {
-                const expIndex = logic.playground.findIndex((item: any) => item === oldNode);
-                Object.assign(newNode, { offsetX, offsetY });
-                logic.insertItemInPlaygroundAt(newNode, expIndex);
-            }
-        } else {
-            const expIndex = parentNode[parentKey].findIndex((item: any) => item === oldNode);
-            const firstUpperText = parentKey[0].toUpperCase() + parentKey.slice(1, parentKey.length);
-            if (parentNode[`insertItemIn${firstUpperText}At`])
-                parentNode[`insertItemIn${firstUpperText}At`](newNode, expIndex);
-            else
-                parentNode.insertItemAt(newNode, expIndex);
-        }
-        oldNode.delete();
-        app.emit('collect:end');
+      const expIndex = parentNode[parentKey].findIndex((item: any) => item === oldNode);
+      const firstUpperText = parentKey[0].toUpperCase() + parentKey.slice(1, parentKey.length);
+      if (parentNode[`insertItemIn${firstUpperText}At`]) parentNode[`insertItemIn${firstUpperText}At`](newNode, expIndex);
+      else parentNode.insertItemAt(newNode, expIndex);
     }
+    oldNode.delete();
+    app.emit('collect:end');
+  }
 }

package/src/utils/logger.ts

@@ -1,8 +1,7 @@
 import { config } from '../config';
 
 export const logger = {
-    debug(...args: Array<any>) {
-        if (config.debug)
-            console.debug('[ASL Debug]', ...args);
-    },
+  debug(...args: Array<any>) {
+    if (config.debug) console.debug('[ASL Debug]', ...args);
+  },
 };

package/src/utils/sortTsString.ts

@@ -1,32 +1,34 @@
-const babel = require('@babel/core');
-const generate = require('@babel/generator').default;
-const traverse = require('@babel/traverse').default;
-const t = require('@babel/types');
-
-export function sortTsString(tsString: string): string {
-    const str = `type a = ${tsString}`;
-    const ast = babel.parseSync(str, {
-        filename: 'result.ts',
-        presets: [require('@babel/preset-typescript')],
-    });
-    const visitor = {
-        TSTypeLiteral(path: any) {
-            path.node.members.sort((a: any, b: any) => {
-                if (a.type === 'TSPropertySignature' && b.type === 'TSPropertySignature') {
-                    return a.key.name.localeCompare(b.key.name);
-                }
-                return 0;
-            });
-        },
-        ArrayExpression(path: any) {
-            path.node.elements.sort((a: any, b: any) => {
-                if (a.type === 'ObjectExpression' && b.type === 'ObjectExpression') {
-                    return t.isIdentifier(a.properties[0].key) && t.isIdentifier(b.properties[0].key) ? a.properties[0].key.name.localeCompare(b.properties[0].key.name) : 0;
-                }
-                return 0;
-            });
-        },
-    };
-    traverse(ast, visitor);
-    return generate(ast).code;
-}
+const babel = require('@babel/core');
+const generate = require('@babel/generator').default;
+const traverse = require('@babel/traverse').default;
+const t = require('@babel/types');
+
+export function sortTsString(tsString: string): string {
+  const str = `type a = ${tsString}`;
+  const ast = babel.parseSync(str, {
+    filename: 'result.ts',
+    presets: [require('@babel/preset-typescript')],
+  });
+  const visitor = {
+    TSTypeLiteral(path: any) {
+      path.node.members.sort((a: any, b: any) => {
+        if (a.type === 'TSPropertySignature' && b.type === 'TSPropertySignature') {
+          return a.key.name.localeCompare(b.key.name);
+        }
+        return 0;
+      });
+    },
+    ArrayExpression(path: any) {
+      path.node.elements.sort((a: any, b: any) => {
+        if (a.type === 'ObjectExpression' && b.type === 'ObjectExpression') {
+          return t.isIdentifier(a.properties[0].key) && t.isIdentifier(b.properties[0].key)
+            ? a.properties[0].key.name.localeCompare(b.properties[0].key.name)
+            : 0;
+        }
+        return 0;
+      });
+    },
+  };
+  traverse(ast, visitor);
+  return generate(ast).code;
+}