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

package/src/server/translator.ts

@@ -551,7 +551,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
     } else if (node.parentNode instanceof Assignment) {
       // OQL 的返回类型报错需要转换翻译，其内部 SQL 语句的参数类型报错不转换翻译
       if (node instanceof OqlQueryComponent) {
-        if (node.getCurrentSource().currentSource.range.start.line + 1 === tsErrorDetail.originalDiagnostic.start.line) {
+        if (node.getCurrentSource().currentSource.start.line + 1 === tsErrorDetail.originalDiagnostic.start.line) {
           tsErrorDetail.message = tsErrorDetail.message
             .replace('参数类型不一致！传入类型：', '赋值：类型不一致！右边类型：')
             .replace('接收类型：', '左边类型：');
@@ -801,8 +801,6 @@ export function checkAStructure_(errorText: string) {
       cap.splice(1, 1);
     }
     if (
-      ((cap[1].startsWith('{') && cap[1].endsWith('}')) || (cap[1].startsWith('{') && cap[1].endsWith('...'))) &&
-      ((cap[2].startsWith('{') && cap[2].endsWith('}')) || (cap[2].startsWith('{') && cap[2].endsWith('...'))) &&
       cap[1].includes('__name: "AStructure_') &&
       cap[2].includes('__name: "AStructure_')
     ) {

package/src/service/creator/add.configs.js

@@ -1,5 +1,6 @@
-import errHandles from './errHandles';
 
+import errHandles from './errHandles';
+import cookie from '../../utils/cookie'
 const isPromise = function (func) {
     return func && typeof func.then === 'function';
 };
@@ -22,6 +23,30 @@ function httpCode(response, params, requestInfo) {
 }
 
 function shortResponse(response, params, requestInfo) {
+    try {
+        if (globalThis?.document) {
+            const authorization = cookie.get('authorization')
+            const newAuthorization = response.headers?.authorization
+            if (newAuthorization && newAuthorization !== authorization) {
+                cookie.set({ authorization: newAuthorization })
+            }
+            const refreshToken = localStorage.getItem('refreshtoken')
+            const newRefreshToken = response.headers?.refreshtoken
+            if (newRefreshToken && newRefreshToken !== refreshToken) {
+                localStorage.setItem('refreshtoken', newRefreshToken)
+            }
+            if (response?.headers?.['max-age']) {
+                let maxAge = Number(response?.headers?.['max-age'] || 0)
+                if (maxAge > 200) {
+                    maxAge -= 200
+                }
+                const expiredTime = Date.parse(new Date()) / 1000 + maxAge
+                localStorage.setItem('authorizationExpiredRefreshTime', expiredTime)
+            }
+        }
+    } catch (err) {
+        console.warn(err)
+    }
     if(params === false)
         return response;
 

package/src/service/creator/errHandles.js

@@ -21,14 +21,15 @@ const versionStatus = {
     401013: 'version_inconsistent',
 };
 
-const FRONT_HANDLE_ERROR_MSG_CODE_LIST = [402201, 401356];
-
 export default {
     defaults({ config }, err = {}) {
         if (config.noErrorTip)
             return;
-        // 检测到数组内错误码的情况下，由前端处理返回错误信息，不反显后端错误信息
-        if (FRONT_HANDLE_ERROR_MSG_CODE_LIST.includes(err.code)) {
+        if (config?.noErrorCodeList?.includes(err.code)) {
+            return;
+        }
+        // 检测到租户正在降级中的错误跳转到提示页面，不报toast
+        if (err.code === 401809) {
             return;
         }
         // 检测到当前应用拉取操作已被强制结束

package/src/service/creator/index.js

@@ -18,6 +18,18 @@ const requester = function (requestInfo) {
     const { path, method, body = {}, headers = {}, query = {} } = url;
     let baseURL = config.baseURL || '';
     headers['Content-Type'] = headers['Content-Type'] || 'application/json';
+    try {
+        const refreshToken = localStorage.getItem('refreshtoken')
+        headers['refreshtoken'] = refreshToken;
+        const authorizationExpiredRefreshTime = localStorage.getItem('authorizationExpiredRefreshTime')
+        if (refreshToken && authorizationExpiredRefreshTime) {
+            if (Date.parse(new Date()) / 1000 >= Number(authorizationExpiredRefreshTime)) {
+                headers['refreshtoken'] = refreshToken;
+            }
+        }
+    } catch (err) {
+        console.warn(err)
+    }
     if (headers.operationDesc)
         headers.operationDesc = encodeURIComponent(headers.operationDesc);
 

package/src/service/storage/init.ts

@@ -127,22 +127,6 @@ function getMiniAppChange(target: any, obj: any, action: string) {
   }
 }
 
-let aiExecuted = 0;
-let sessionId = '';
-// AI 生成内容是否被采纳
-const handleAIPoint = (app: any, actionItem: any) => {
-  const { actionMsg, action } = actionItem || {};
-  if (aiExecuted > 0) {
-    app.emit('logic:accepted', { ...actionItem, sessionId });
-    aiExecuted -= 1;
-  }
-  if (actionMsg.includes('自然语言生成代码') && !action) {
-    aiExecuted += 1;
-    // eslint-disable-next-line prefer-destructuring
-    sessionId = actionMsg.match(/:(.*)/)[1];
-  }
-}
-
 /**
  *  执行更新
  */
@@ -151,7 +135,6 @@ async function doAction(app: any, actionItem: any) {
   let hasBackEnd = false;
   const actionList: any[] = [];
   const { list, actionMsg, action } = actionItem || {};
-  handleAIPoint(app, actionItem);
   const itemloop = (_i: LogicItem, app: any, diffArr: string[]) => {
     const _l = getStatement(_i, app, diffArr);
     if (_l.length) {

package/src/service/storage/jsoner.ts

@@ -19,7 +19,7 @@ export interface Action {
 }
 
 function excludeProperties(node: any, excludes: string[]) {
-    const newNode = { ...node };
+    const newNode = { ...node?.toJSON?.() ?? node };
     if (Array.isArray(excludes) && excludes.length) {
         excludes.forEach((exclude) => {
             delete newNode[exclude];

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -35,7 +35,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
     ${properties
       .map((property) => {
         const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
-        const label = property.label || property.name;
+        const label = (property.label || property.name).replace(/"/g, '"');
         let formItem = `<u-form-item layout="center"><template #label><u-text text="${label}"></u-text></template>`;
 
         const { typeAnnotation } = property || {};
@@ -127,7 +127,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
     ${properties
       .map((property) => {
         const vModel = `${nameGroup.viewVariableInput}.${property.name}`;
-        const label = property.label || property.name;
+        const label = (property.label || property.name).replace(/"/g, '&quot;');
         const required = !!property.required;
         const rules = [];
         if (property.rules && property.rules.length) {
@@ -405,7 +405,7 @@ export function genEditTableColumnComponent(app: App, entity: Entity, property:
   const newLoadSelectLogics: any[] = [];
 
   const genEditComponent = (property: EntityProperty) => {
-    const label = property.label || property.name;
+    const label = (property.label || property.name).replace(/"/g, '&quot;');
     let formItem = '';
 
     const propertyTypeName = property.typeAnnotation.typeName;

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -34,7 +34,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
     ${properties
       .map((property) => {
         const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
-        const label = property.label || property.name;
+        const label = (property.label || property.name).replace(/"/g, '"');
         let formItem = `<u-form-item layout="center"><template #label><u-text text="${label}"></u-text></template>`;
 
         const { typeAnnotation } = property || {};
@@ -127,7 +127,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
     ${properties
       .map((property) => {
         const vModel = `${nameGroup.viewVariableInput}.${property.name}`;
-        const label = property.label || property.name;
+        const label = (property.label || property.name).replace(/"/g, '&quot;');
         const required = !!property.required;
         const rules = [];
         if (property.rules && property.rules.length) {
@@ -636,7 +636,7 @@ export function genGridViewMultipleKeyBlock(entity: Entity, oldNode: ViewElement
   return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
-        ${genTableTemplate(entity, nameGroup, entityLogic, true, 'genCurdMultipleKeyBlock')}
+        ${genGridViewTemplate(entity, nameGroup, entityLogic, true, 'genCurdMultipleKeyBlock')}
         ${genSaveModalTemplate(entity, nameGroup, selectNameGroupMap)}
     </u-linear-layout>
 </template>

package/src/templator/genTableBlock.ts

@@ -22,7 +22,7 @@ export function genTableColumnTemplate(property: EntityProperty, currentName: st
   const dataSource = entity.parentNode as DataSource;
   const lowerEntityName = utils.firstLowerCase(entity.name);
   let valueExpression = `${currentName}.item.${lowerEntityName}.${property.name}`;
-  const title = property.label || property.name;
+  const title = (property.label || property.name).replace(/"/g, '"');
 
   if (property.relationEntity) {
     const relationLowerEntityName = utils.firstLowerCase(property.relationEntity);

package/src/translator/constant.ts

@@ -0,0 +1,7 @@
+import { EventEmitter } from '../common/EventEmitter';
+
+/**
+ * 因为 naslServer 和 ts-worker 在一起，不能集成在 nasl 包中，
+ * 需要一个发布订阅器做个中介通信。
+ */
+export const embeddedTSEmitter = new EventEmitter();

package/src/translator/index.ts

@@ -1,137 +1,3 @@
-import { BaseNode } from '../common/BaseNode';
-import { EventEmitter } from '../common/EventEmitter';
-import { Range, Position, uinteger } from './lsp';
-
-export interface SourceMapItem {
-  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;
-}
-
-export function lsp2tspNumber(num: uinteger) {
-  return num + 1;
-}
-
-export const indent = (tabSize: number) => ' '.repeat(tabSize * 4);
-
-/**
- * 创建编译器状态
- * @param before
- * @returns
- */
-export function createCompilerState(startCode: string = '', options?: Partial<TranslatorState>) {
-  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);
-}
-
-/**
- * 根据代码移动位置
- * @param pos
- * @param code
- */
-export function shiftPosition(pos: Position, code: string = ''): Position {
-  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);
-}
-
-/**
- * 根据代码移动状态
- * @param state
- * @param code
- */
-export function shiftState(state: TranslatorState, code?: string, options?: Partial<TranslatorState>): TranslatorState {
-  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);
-      }
-      // 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;
-  };
-}
-
-/**
- * 因为 naslServer 和 ts-worker 在一起，不能集成在 nasl 包中，
- * 需要一个发布订阅器做个中介通信。
- */
-export const embeddedTSEmitter = new EventEmitter();
+export * from './constant';
+export * from './types';
+export * from './utils';

package/src/translator/types.ts

@@ -0,0 +1,40 @@
+import type { BaseNode } from '../concepts';
+
+export interface Position {
+	line: number;
+	character: number;
+	offset: number;
+}
+
+export interface Range {
+	start: Position;
+	end: Position;
+}
+
+export interface TSPPosition {
+  line: number;
+  offset: number;
+}
+
+export interface TSPRange {
+  start: TSPPosition,
+  end: TSPPosition,
+}
+
+export interface TSP1DRange {
+  start: number;
+  length: number;
+}
+
+export type SourceMapItem = Range;
+
+export type SourceMap = Map<BaseNode, SourceMapItem>;
+
+export interface TranslatorState {
+  position?: Position;
+  tabSize?: number;
+  inline?: boolean;
+  preferQuote?: 'single' | 'double' | 'backtick';
+  sourceMap?: SourceMap;
+  finalCode?: boolean;
+}

package/src/translator/utils.ts

@@ -0,0 +1,104 @@
+import type { TranslatorState, SourceMapItem, Position, Range } from './types';
+import type { BaseNode } from '../concepts';
+
+export function lsp2tspNumber(num: number) {
+  return num + 1;
+}
+
+export const indent = (tabSize: number) => ' '.repeat(tabSize * 4);
+
+/**
+ * 创建编译器状态
+ */
+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);
+}
+
+/**
+ * 根据代码移动位置
+ */
+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);
+}
+
+/**
+ * 根据代码移动状态
+ */
+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);
+}
+
+export function isSameRange(rangeA: Range, rangeB : Range) {
+  return rangeA.start.offset === rangeB.start.offset && rangeA.end.offset === rangeB.end.offset;
+}
+
+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({
+          start: state.position,
+          end: shiftPosition(state.position, code),
+        }));
+
+        return before + code;
+      }
+    };
+
+    return descriptor;
+  };
+}

package/src/utils/cookie.ts

@@ -0,0 +1,60 @@
+function getDomain(isRoot?: boolean) {
+    const { hostname } = location;
+    const hostArr = hostname.split('.');
+    if (hostArr.length < 3)
+        return hostname;
+    const len = hostArr.length;
+    if (isRoot)
+        return `${hostArr[len - 2]}.${hostArr[len - 1]}`;
+    return `${hostArr[len - 3]}.${hostArr[len - 2]}.${hostArr[len - 1]}`;
+}
+
+export default {
+    set(data: { [key: string]: string } = {}, exdays = 1, isRoot = false) {
+        const d = new Date();
+        d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
+        const expires = d.toString();
+        Object.keys(data).forEach((key) => {
+            const value = data[key];
+            if (key && value) {
+                let cookie = `${key}=${encodeURIComponent(value)}; expires=${expires}; path=/`;
+                if (isRoot) {
+                    const domain = getDomain(isRoot);
+                    cookie = `${cookie}; domain=${domain}`;
+                }
+                document.cookie = cookie;
+            }
+        });
+    },
+    get(name: string): string | null {
+        const nameEQ = name + '=';
+        const ca = document.cookie.split(';');
+        for (let i = 0; i < ca.length; i++) {
+            let c = ca[i];
+            while (c.charAt(0) === ' ')
+                c = c.substring(1, c.length);
+            if (c.indexOf(nameEQ) === 0)
+                return decodeURIComponent(c.substring(nameEQ.length, c.length));
+        }
+        return null;
+    },
+    erase(name: string) {
+        const d = new Date();
+        d.setTime(d.getTime() - (1 * 24 * 60 * 60 * 1000));
+        const expires = d.toString();
+        document.cookie = `${name}=; expires=${expires}; path=/`;
+        const domain = getDomain();
+        document.cookie = `${name}=; expires=${expires}; path=/; domain=${domain}`;
+        const root = getDomain(true);
+        document.cookie = `${name}=; expires=${expires}; path=/; domain=${root}`;
+    },
+    eraseAll() {
+        const cookies = document.cookie.split(';');
+        for (let i = 0; i < cookies.length; i++) {
+            const cookie = cookies[i];
+            const eqPos = cookie.indexOf('=');
+            const name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
+            this.erase(name);
+        }
+    },
+};

package/src/utils/index.ts

@@ -5,6 +5,8 @@ import { traverse } from './traverse';
 export * from './string';
 export * from './traverse';
 export * from './logger';
+export * from './types';
+export * from './window';
 export * from './time-slicing';
 
 // 查找最近的模块

package/src/utils/logger.ts

@@ -5,3 +5,16 @@ export const logger = {
     if (config.debug) console.debug('[ASL Debug]', ...args);
   },
 };
+
+export const timeline = {
+  time(name: string) {
+      if (process.env.NODE_ENV === 'development') {
+          console.time(name);
+      }
+  },
+  timeEnd(name: string) {
+      if (process.env.NODE_ENV === 'development') {
+          console.timeEnd(name);
+      }
+  }
+}

package/src/utils/types.ts

@@ -0,0 +1 @@
+export type GetPromise<T> = T extends Promise<infer R> ? R : never;

package/src/utils/window.ts

@@ -0,0 +1,9 @@
+/**
+ * 强制 gc
+ *
+ * @description Chrome 浏览器使用命令`open -a "Google Chrome" --args --js-flags="--expose-gc"`打开有效
+ * @description Nodejs 运行时加入参数`--expose-gc`有效
+ */
+export function gc() {
+  (globalThis as any).gc?.();
+}

package/test/concepts/boolean-literal/__snapshots__/toEmbeddedTS.spec.ts.snap

@@ -0,0 +1,11 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`boolean-literal:toEmbeddedTS false 1`] = `
+"new nasl.core.Boolean(false);
+"
+`;
+
+exports[`boolean-literal:toEmbeddedTS true 1`] = `
+"new nasl.core.Boolean(true);
+"
+`;

package/test/concepts/boolean-literal/__snapshots__/toJS.spec.ts.snap

@@ -0,0 +1,11 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`boolean-literal:toJS false 1`] = `
+"false;
+"
+`;
+
+exports[`boolean-literal:toJS true 1`] = `
+"true;
+"
+`;

package/test/concepts/boolean-literal/__snapshots__/toVue.spec.ts.snap

@@ -0,0 +1,11 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`boolean-literal:toVue false 1`] = `
+"<template>false</template>
+"
+`;
+
+exports[`boolean-literal:toVue true 1`] = `
+"<template>true</template>
+"
+`;

package/test/concepts/boolean-literal/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/boolean-literal/fixtures/false.json

@@ -0,0 +1,4 @@
+{
+  "concept": "BooleanLiteral",
+  "value": "false"
+}

package/test/concepts/boolean-literal/fixtures/true.json

@@ -0,0 +1,4 @@
+{
+  "concept": "BooleanLiteral",
+  "value": "true"
+}

package/test/concepts/boolean-literal/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(formatTs(node.toEmbeddedTS())).toMatchSnapshot();
+    });
+  });
+});