@lcap/nasl 3.3.0-beta.0 → 3.3.0-beta.2

package/src/concepts/View__.ts

@@ -1531,6 +1531,22 @@ export class View extends BaseNode {
     return viewElementUniqueName;
   }
 
+  getAllViewElementNames(excludeName: string) {
+    const res: Array<string> = [];
+    this.elements.forEach((element) => {
+      utils.traverse(
+        ({ node }) => {
+          if (node.name !== excludeName)
+            res.push(node.name);
+        },
+        {
+          node: element,
+        },
+      );
+    });
+    return Array.from(res);
+  }
+
   // 组件名是否有效
   isValidElementName(name: string): boolean {
     if (name) {
@@ -1765,15 +1781,15 @@ export class View extends BaseNode {
             methods: {
                 async onKeyDown(e) {
                     ${this.bindEvents
-                      .filter((event) => ['keydown'].includes(event.name))
-                      .map((event) => `await this.${event.view.name}_${event.name}(e);`)
-                      .join('\n')}
+        .filter((event) => ['keydown'].includes(event.name))
+        .map((event) => `await this.${event.view.name}_${event.name}(e);`)
+        .join('\n')}
                 },
                 async onKeyUp(e) {
                     ${this.bindEvents
-                      .filter((event) => ['keyup'].includes(event.name))
-                      .map((event) => `await this.${event.view.name}_${event.name}(e);`)
-                      .join('\n')}
+        .filter((event) => ['keyup'].includes(event.name))
+        .map((event) => `await this.${event.view.name}_${event.name}(e);`)
+        .join('\n')}
                 }
             }
         };`;
@@ -1900,6 +1916,7 @@ export class View extends BaseNode {
       });
     }
   }
+
   // 获取当前element，铺平
   elementsAttrs(elements: Array<ViewElement>, componentList: Array<ViewElement>) {
     if (elements) {
@@ -1915,7 +1932,7 @@ export class View extends BaseNode {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     function chineseTsName(name: string) {
       let tsName = name;
       // 匹配所有特殊字符都转为_
@@ -2039,7 +2056,7 @@ export class View extends BaseNode {
     code += `let __elements: __elements;\n`;
 
     if (Array.isArray(this.elements)) {
-      code += indent((state?.tabSize || 0) + 1) + 'interface ';
+      code += `${indent((state?.tabSize || 0) + 1)  }interface `;
       code += `__elements_completionProperty {\n`;
       const componentList: Array<ViewElement> = [];
       this.elementsAttrs(this.elements, componentList);
@@ -2131,6 +2148,103 @@ export class View extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState(), currentNode?: BaseNode, declaration?: boolean): string {
+    // const isCurrentInThisView = currentNode?.getAncestor('View') === this;
+
+    if (declaration) {
+      let code = `
+${indent(state.tabSize)}export function ${this.tsName}_view`;
+      // 有参数长度
+      code += '(';
+      this.params.forEach((param, index) => {
+        code += param.toNaturalTS(shiftState(state, code, { inline: true }));
+        if (index !== this.params.length - 1)
+          code += ', ';
+      });
+      code += ') {';
+        this.children.forEach((child, index) => {
+          code += child.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }), currentNode, declaration);
+        });
+      code += `${indent(state.tabSize)}}`;
+      return code;
+    }
+
+    let code = `${indent(state.tabSize)}/**
+${indent(state.tabSize)} * 当前页面
+${indent(state.tabSize)} */
+${indent(state.tabSize)}export function ${this.tsName}_view`;
+    const advanceMap: Map<Variable, Assignment | BatchAssignment> = new Map();
+    this.traverseChildren((el) => {
+      if (el && (el instanceof BatchAssignment || (el instanceof Assignment && el.left?.name))) {
+        // 子页面内部逻辑过滤
+        if (el.view !== this)
+          return;
+        const jsCode = el.toJS();
+        const advanceVar = this.variables?.find((variable) =>
+          !variable.typeAnnotation && jsCode.includes(`this.${variable.name} = `));
+        if (advanceVar && !advanceMap.get(advanceVar)) {
+          advanceMap.set(advanceVar, el);
+        }
+      }
+    });
+
+    // 有参数长度
+    code += '(';
+    this.params.forEach((param, index) => {
+      code += param.toNaturalTS(shiftState(state, code, { inline: true }));
+      if (index !== this.params.length - 1)
+        code += ', ';
+    });
+    code += ')';
+
+    code += ' {\n';
+
+    this.variables.forEach((variable) => {
+      if (!advanceMap.get(variable)) {
+        code += `${indent(state.tabSize + 1)}let `;
+        code += variable.toNaturalTS(shiftState(state, code, { inline: true }));
+        code += ';\n';
+      }
+    });
+    code += `\n${indent(state.tabSize + 1)}const $refs = {\n`;
+    // 生成所有的name和类型定义
+    this.elements.forEach((element) => {
+      code += element.toNaturalTSDefinition(shiftState(state, code, {
+        tabSize: state.tabSize + 1,
+      }));
+    });
+    code += `${indent(state.tabSize + 1)}}\n`;
+    // 逻辑
+    if (currentNode?.concept === 'Logic') {
+      code += '\n';
+      this.logics.forEach((logic) => {
+        if (logic === currentNode)
+          return;
+        code += logic.toNaturalTS(shiftState(state, code, {
+          tabSize: state.tabSize + 1,
+        }), 'noExport', undefined, currentNode);
+        code += '\n';
+      });
+      // 包含了事件逻辑的处理
+      code += (currentNode as Logic).toNaturalTS(shiftState(state, code, {
+        tabSize: state.tabSize + 1,
+      }), 'noExport', undefined, currentNode);
+      code += '\n';
+    } else if (this.logics.length) {
+      code += '\n';
+      this.logics.forEach((logic) => {
+        code += logic.toNaturalTS(shiftState(state, code, {
+          tabSize: state.tabSize + 1,
+        }), 'noExport', undefined, currentNode);
+        code += '\n';
+      });
+    }
+    code += `${indent(state.tabSize)}}\n`;
+
+    return code;
+  }
+
   toEmbeddedTSFile() {
     let code = `namespace ${this.getTsNamespace()} {\n`;
     const state = createCompilerState(code, {

package/src/concepts/WhileStatement__.ts

@@ -1,4 +1,4 @@
-import { TranslatorState, shiftState, withSourceMap, indent } from '../translator';
+import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -264,7 +264,7 @@ export class WhileStatement extends LogicItem {
   }
 
   @withSourceMap()
-  toEmbeddedTS(state?: TranslatorState): string {
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
     code += 'while (nasl.core.ensureBoolean(';
     code += this.test
@@ -289,7 +289,29 @@ export class WhileStatement extends LogicItem {
     code += `${indent(state?.tabSize || 0)}}\n`;
     return code;
   }
-  //================================================================================
+
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = '';
+    code += 'while (';
+    code += this.test ? this.test.toNaturalTS(shiftState(state, code, {
+      tabSize: 0,
+    })) : '__IDENTIFIER__';
+    code += ') {\n';
+
+    if (Array.isArray(this.body)) {
+      this.body.forEach((logicItem) => {
+        code += `${logicItem.toNaturalTS(shiftState(state, code, {
+          tabSize: state.tabSize + 1,
+        }))};\n`;
+      });
+    }
+
+    code += `${indent(state.tabSize)}}\n`;
+    return code;
+  }
+
+  //= ===============================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/generator/permission.ts

@@ -296,7 +296,9 @@ export async function genPermissionData(app: App) {
   if (authValue?.length) {
     authValue.forEach((item) => {
       const { key, authValue } = item;
-      logicPageResourceDtoList[`${key}:POST`] = checkPageAndUploadAuth(uploaders, key) !== -1 ? [[]] : convertArray(authValue);
+      if (key.startsWith('/upload' || '/api/')) {
+        logicPageResourceDtoList[`${key}:POST`] = checkPageAndUploadAuth(uploaders, key) !== -1 ? [[]] : convertArray(authValue);
+      }
     });
   }
   closeCache();

package/src/index.ts

@@ -10,3 +10,4 @@ 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 './natural';

package/src/natural/componentData.ts

@@ -0,0 +1,81 @@
+export const componentData = [
+    {
+        name: 'u-tabs',
+        title: '选项卡',
+        description: '选项卡切换组件，常用于平级区域大块内容的收纳和展现。',
+        template: {
+            0: '基本用法',
+        },
+    },
+    {
+        name: 'i-ico',
+        title: '图标',
+        description: '仅图标或图标及文本',
+        template: {
+            0: '组合图标-上下',
+            1: '组合图标-左右',
+            2: '组合图标-仅图标',
+        },
+    },
+    {
+        name: 'u-button',
+        title: '按钮',
+        description: '用于触发一个即时操作。',
+        template: {
+            0: '主要按钮',
+            // 1: '次要按钮',
+            // 2: '普通按钮',
+            3: '图标按钮',
+        },
+    },
+    {
+        name: 'u-list-view',
+        title: '数据列表',
+        description: '用于列举大量数据的列表框，支持单选、多选、过滤（搜索）、分页等功能。',
+        template: {
+            0: '基本用法',
+        },
+    },
+    {
+        name: 'u-modal',
+        title: '弹窗',
+        description: '弹窗',
+        template: {
+            0: '基本用法',
+        },
+    },
+    {
+        name: 'u-rate',
+        title: '评分',
+        description: '评分组件。',
+        template: {
+            0: '基本用法',
+        },
+    },
+    {
+        name: 'u-label',
+        title: '标签',
+        description: '用于展示状态、标签、分类等',
+        template: {
+            0: '基本用法',
+        },
+    },
+    {
+        name: 'u-card',
+        title: '卡片',
+        description: '用于快速布局，单个组件的显示',
+        template: {
+            0: '基本样式',
+            1: '带分割线样式',
+            2: '带图片样式',
+        },
+    },
+    {
+        name: 'u-grid-view',
+        title: '数据网格',
+        description: '用于列举大量数据的列表框，支持单选、多选、过滤（搜索）、分页等功能。内部可添加卡片等用于展示的组件',
+        template: {
+            0: '基本数据网格',
+        },
+    },
+];

package/src/natural/genNaturalTS.ts

@@ -0,0 +1,90 @@
+import { App, View, Logic, BaseNode, Frontend } from '../concepts';
+import { shiftState, createCompilerState } from '../translator';
+
+import naslStdlibMap from './naslStdlibMap';
+
+export function genNaturalTS(app: App, currentNode?: BaseNode) {
+  const logic = currentNode as Logic;
+  const code = logic?.toNaturalTS(undefined);
+  return code;
+}
+
+export function genNaturalTSContext(app: App, currentNode?: BaseNode) {
+  let code = `### 低代码应用的 ts 上下文定义如下：\n`;
+  /* 标准库 */
+  code += `\`\`\`ts\n`;
+  code += '// 标准库\n';
+  code += `${Object.values(naslStdlibMap).join('\n')}\n`;
+  /* 全局上下文 */
+  code += '\n// 全局上下文\n';
+  app.enums.forEach((enumeration) => code += `${enumeration?.toNaturalTS()}\n`);
+  app.dataSources.forEach((dataSource) => dataSource.entities
+    .filter((entity) => !entity.name.startsWith('LCAP') || entity.name === 'LCAPUser')
+    .forEach((entity) => code += `${entity?.toNaturalTS()}\n`));
+  app.structures
+    .filter((entity) => !entity.name.startsWith('LCAP'))
+    .forEach((structure) => code += `${structure?.toNaturalTS()}\n`);
+
+  code += '\n// 服务端逻辑\n';
+  app?.logics
+    ?.filter((logic) => logic !== currentNode && !logic.name.startsWith('LCAP'))
+    ?.forEach((logic) => code += `${logic?.toNaturalTS(undefined, undefined, undefined, currentNode)}`);
+
+
+  const frontend = currentNode?.getAncestor('Frontend') as Frontend;
+  if (frontend) {
+    code += '\n// 前端全局变量\n';
+    frontend?.variables?.forEach((variable) => {
+      const state = createCompilerState();
+      code += 'let ';
+      code += variable?.toNaturalTS(shiftState(state, code, { inline: true }));
+      code += ';\n';
+    });
+
+    code += '\n// 前端页面\n';
+    frontend?.views?.forEach((view) => {
+      code += view?.toNaturalTS(undefined, currentNode, true);
+    });
+  }
+
+  /* 页面上下文 */
+  let view: View;
+  if (currentNode?.concept === 'View') {
+    view = currentNode as View;
+  } else if (currentNode) {
+    if (!currentNode.getAncestor) {
+      console.log(currentNode.concept, currentNode.parentNode?.concept);
+    }
+    view = currentNode.getAncestor('View') as View;
+  }
+
+  if (currentNode?.concept === 'ViewElement') {
+    code += '\n// 页面变量\n';
+    view.variables.forEach((variable) => {
+      const state = createCompilerState();
+      code += 'let ';
+      code += variable?.toNaturalTS(shiftState(state, code, { inline: true }));
+      code += ';\n';
+    });
+    code += 'let current.item.supplier: Supplier; \n';
+    code += '\n';
+    return code;
+  }
+
+  /* 逻辑上下文 */
+  let logic: Logic;
+  if (currentNode?.concept === 'Logic')
+    logic = currentNode as Logic;
+  else if (currentNode) {
+    logic = currentNode.getAncestor('Logic') as Logic;
+  }
+  // code += '// 页面上下文\n';
+  code += ``;
+  if (view) { // 为页面中的逻辑
+    code += view?.toNaturalTS(undefined, currentNode);
+  } else if (logic) { // 为全局逻辑
+    code += logic?.toNaturalTS(undefined, undefined, undefined, currentNode);
+  }
+  code += `\n\`\`\`\n`;
+  return code;
+}

package/src/natural/index.ts

@@ -0,0 +1,2 @@
+export * from './genNaturalTS';
+export * from './transformTSCode';

package/src/natural/naslStdlibMap.ts

@@ -0,0 +1,24 @@
+let naslStdlibMap: any;
+/// #if process.env.BUILD_TARGET === 'node'
+if (globalThis.process) { // For TS build
+    const fs = require('fs');
+    naslStdlibMap = {
+        'nasl.core.ts': fs.readFileSync(require.resolve('../../sandbox-natural/stdlib/nasl.core.ts'), 'utf8'),
+        'nasl.util.ts': fs.readFileSync(require.resolve('../../sandbox-natural/stdlib/nasl.util.ts'), 'utf8'),
+        'nasl.oql.ts': fs.readFileSync(require.resolve('../../sandbox-natural/stdlib/nasl.oql.ts'), 'utf8'),
+        'nasl.ui.ts': fs.readFileSync(require.resolve('../../sandbox-natural/stdlib/nasl.ui.ts'), 'utf8'),
+    };
+}
+/// #endif
+/// #if process.env.BUILD_TARGET !== 'node'
+if (globalThis.window) { // For TS build
+    naslStdlibMap = {
+        'nasl.core.ts': require('!!raw-loader!../../sandbox-natural/stdlib/nasl.core.ts').default,
+        'nasl.util.ts': require('!!raw-loader!../../sandbox-natural/stdlib/nasl.util.ts').default,
+        'nasl.oql.ts': require('!!raw-loader!../../sandbox-natural/stdlib/nasl.oql.ts').default,
+        'nasl.ui.ts': require('!!raw-loader!../../sandbox-natural/stdlib/nasl.ui.ts').default,
+    };
+}
+/// #endif
+
+export default naslStdlibMap;