@lcap/nasl 3.8.2-beta.8 → 3.8.3-beta.1

package/src/concepts/basics/stdlib/nasl.ui.ts

@@ -1012,46 +1012,46 @@ export function initialize() {
     new Structure({
       name: 'KeyboardEvent',
       properties: [
-        // new StructureProperty({
-        //     name: 'altKey',
-        //     description: '事件触发时 alt 键 (OS X 系统上的 Option 或 ⌥ 键) 是 (true) 否 (false) 被按下',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
-        // }),
-        // new StructureProperty({
-        //     name: 'code',
-        //     description: '',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('String')
-        // }),
-        // new StructureProperty({
-        //     name: 'ctrlKey',
-        //     description: '事件触发时 control 键是 (true) 否 (false) 按下',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
-        // }),
-        // new StructureProperty({
-        //     name: 'isComposing',
-        //     description: '该事件是否在 compositionstart 之后和 compositionend 之前被触发',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
-        // }),
-        // new StructureProperty({
-        //     name: 'key',
-        //     description: '',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('String')
-        // }),
-        // new StructureProperty({
-        //     name: 'metaKey',
-        //     description: '指示 Meta 键是按下状态（true），还是释放状态（false）',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
-        // }),
-        // new StructureProperty({
-        //     name: 'repeat',
-        //     description: '如果按键被一直按住，返回值为true',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
-        // }),
-        // new StructureProperty({
-        //     name: 'shiftKey',
-        //     description: '事件触发时 shift 键是 (true) 否 (false) 按下',
-        //     typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
-        // })
+        new StructureProperty({
+            name: 'altKey',
+            description: '事件触发时 alt 键 (OS X 系统上的 Option 或 ⌥ 键) 是 (true) 否 (false) 被按下',
+            typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
+        }),
+        new StructureProperty({
+            name: 'code',
+            description: '',
+            typeAnnotation: TypeAnnotation.createPrimitive('String')
+        }),
+        new StructureProperty({
+            name: 'ctrlKey',
+            description: '事件触发时 control 键是 (true) 否 (false) 按下',
+            typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
+        }),
+        new StructureProperty({
+            name: 'isComposing',
+            description: '该事件是否在 compositionstart 之后和 compositionend 之前被触发',
+            typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
+        }),
+        new StructureProperty({
+            name: 'key',
+            description: '',
+            typeAnnotation: TypeAnnotation.createPrimitive('String')
+        }),
+        new StructureProperty({
+            name: 'metaKey',
+            description: '指示 Meta 键是按下状态（true），还是释放状态（false）',
+            typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
+        }),
+        new StructureProperty({
+            name: 'repeat',
+            description: '如果按键被一直按住，返回值为true',
+            typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
+        }),
+        new StructureProperty({
+            name: 'shiftKey',
+            description: '事件触发时 shift 键是 (true) 否 (false) 按下',
+            typeAnnotation: TypeAnnotation.createPrimitive('Boolean')
+        })
       ],
     }),
   );

package/src/generator/genBundleFiles.ts

@@ -860,7 +860,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
         if (window.annotationAllData) {
               resolve(window.annotationAllData);
           } else {
-           let sysPrefixPath =  window.appInfo && window.appInfo.sysPrefixPath || '';
+           let sysPrefixPath =  ${ config?.sysPrefixPath ? "'" + config?.sysPrefixPath + "'" : "'" + "'" } ||'';
            let urlEntity = sysPrefixPath + '/api/system/annotation/entityAll'
            let urlLogic = sysPrefixPath + '/api/system/annotation/logicAll'
            Promise.all([

package/src/generator/release-body/utils.ts

@@ -425,7 +425,7 @@ export function getProcessFormDefinitions(app: App) {
               );
               formDefinition = formDefinition.replaceAll(
                 `(${process.name} ||`,
-                '{processDetailFormData ||'
+                '(processDetailFormData ||'
               );
               formDefinition = formDefinition.replace(
                 /:ref="([^"]+)"/g,

package/src/natural/genNaturalTS.ts

@@ -13,6 +13,8 @@ import {
   getConnectors,
   getDependencies,
   getFrontendVariables,
+  getServerVariables,
+  getVariablesCode,
   getFrontendViews,
   getCurrentNodeContext,
   getCurrentNodeContextForUI,
@@ -26,6 +28,7 @@ import {
   getConnectorsCode,
   getDependenciesCode,
   getFrontendViewsCode,
+  getCurrentComponentDeclaration,
   wrapTSBlock,
 } from './getContext';
 import { createCompilerState } from '../translator';
@@ -57,20 +60,35 @@ export function genNaturalTSContextJSONForLogic(
     moduleInterfaces: any;
     connectors: any;
     dependencies: any;
-  }
+    basicMaterials: 'pc' | 'h5' | { json: any; tsDeclaration: string; };
+    extensionMaterials: 'pc' | 'h5' | {
+      name: string;
+      title: string;
+      description: string;
+      tsDescription: string;
+    }[];
+  },
+  restParams?: any
 ) {
   const frontend = currentNode?.getAncestor('Frontend') as Frontend;
   const logicType = currentNode?.parentNode?.concept === 'App' ? 'global_logic' : 'view_logic';
-  const state = createCompilerState('', { descriptionComment: true });
+  const state = createCompilerState('', { descriptionComment: true, typeMap: restParams?.typeMap });
 
   const { naslCore } = getNaslCore(logicType);
   const { naslUtil } = getNaslUtil();
   const { naslUI } = getNaslUIOld();
+  let components = [];
+  if (logicType === 'view_logic' && material?.basicMaterials && material?.extensionMaterials) {
+    components = getNaslUI(app, frontend.type, {
+      basicMaterials: material?.basicMaterials,
+      extensionMaterials: material?.extensionMaterials,
+    }).naslUI;
+  }
   const { naslOql } = getNaslOQL();
   const { enums } = getEnums(app, state);
   const { entities } = getEntities(app, state);
   const { structures } = getStructures(app, state);
-  const { appLogics } = getLogics(app, currentNode);
+  const { appLogics } = getLogics(app, currentNode, state);
   const { interfaceDependencies } = getModuleInterfaces(
     material?.moduleInterfaces || app?.interfaceDependencies,
     state
@@ -89,17 +107,21 @@ export function genNaturalTSContextJSONForLogic(
     logicType,
     frontend?.type
   );
-  const { frontendVar, frontendVariables } = getFrontendVariables(
+  const { frontendVariables } = getFrontendVariables(
     currentNode?.getAncestor('Frontend') as Frontend,
     state
   );
-  const { views } = getFrontendViews(frontend, state, currentNode, false);
-  const { currentLogic } = getCurrentNodeContext(currentNode, focusedNodePath, experimental);
 
+  const { backendVariables } = getServerVariables(app, state);
+
+  const { views } = getFrontendViews(frontend, state, currentNode, false);
+  const { currentLogic } = getCurrentNodeContext(currentNode, focusedNodePath, experimental, restParams?.typeMap);
+  const { componentDeclaration } = getCurrentComponentDeclaration(currentNode, components);
   return {
     naslCore,
     naslUtil,
     naslUI,
+    components,
     naslOql,
     enums,
     entities,
@@ -108,11 +130,12 @@ export function genNaturalTSContextJSONForLogic(
     interfaceDependencies,
     connections,
     dependencies,
-    frontendVar, // @deprecated
     frontendVariables,
+    backendVariables,
     views,
     currentLogic,
     logicType,
+    componentDeclaration
   };
 }
 
@@ -142,16 +165,18 @@ export const genNaturalTSContextFromJSONForLogic = (
     connections,
     dependencies,
     frontendVariables,
+    backendVariables,
     views,
     currentLogic,
     logicType,
+    componentDeclaration
   } = tsContextJSON;
 
   let code = '';
-  code += '### [1] 标准库\n';
+  code += '### [1]标准库与类型定义\n';
   code += wrapTSBlock(naslCore);
 
-  code += '\n### [2] nasl.util\n';
+  code += '\n### [2]平台内置函数库\n';
   code += wrapTSBlock(naslUtil);
 
   if (naslUI && logicType === 'view_logic') {
@@ -161,10 +186,14 @@ export const genNaturalTSContextFromJSONForLogic = (
     } else {
       code += getNaslUICode(naslUI, codeType, requiredIndexes);
     }
+    if (componentDeclaration) {
+      code += '\n#### [3-1] 组件声明\n';
+      code += wrapTSBlock(`declare namespace nasl.ui {\n${componentDeclaration}}`);
+    }
   }
 
   if (naslOql && logicType === 'global_logic') {
-    code += '\n### [4] nasl.oql\n';
+    code += '\n### [4]数据查询定义\n';
     code += wrapTSBlock(naslOql);
   }
 
@@ -205,15 +234,20 @@ export const genNaturalTSContextFromJSONForLogic = (
 
   if (logicType === 'view_logic') {
     code += '\n### [10] 页面上下文\n';
-    if (frontendVariables) {
+    if (frontendVariables?.data?.length) {
       code += '\n#### [10-0] 前端全局变量\n';
-      code += frontendVariables;
+      code += getVariablesCode(frontendVariables);
     }
 
     if (views?.data?.length) {
       code += '\n#### [10-1] 前端页面列表\n';
       code += getFrontendViewsCode(views);
     }
+  } else {
+    code += '\n### [10] 全局变量\n';
+    if (backendVariables?.data?.length) {
+      code += getVariablesCode(backendVariables);
+    }
   }
 
   code += '\n### 当前逻辑上下文\n';
@@ -232,9 +266,17 @@ export function genNaturalTSContextForLogic(
     moduleInterfaces: any;
     connectors: any;
     dependencies: any;
+    basicMaterials: 'pc' | 'h5' | { json: any; tsDeclaration: string; };
+    extensionMaterials: 'pc' | 'h5' | {
+      name: string;
+      title: string;
+      description: string;
+      tsDescription: string;
+    }[];
   },
   restParams?: {
-    codeType?: 'detail' | 'short';
+    codeType: 'detail' | 'short';
+    typeMap?: any;
   }
 ) {
   const tsContextJSON = genNaturalTSContextJSONForLogic(
@@ -242,11 +284,12 @@ export function genNaturalTSContextForLogic(
     currentNode,
     focusedNodePath,
     experimental,
-    material
+    material,
+    restParams
   );
   const code = genNaturalTSContextFromJSONForLogic(
     tsContextJSON,
-    restParams.codeType,
+    restParams?.codeType || 'short',
     requiredIndexes
   );
   return code;
@@ -262,8 +305,8 @@ export function genNaturalTSContextJSONForUI(
   app: App,
   currentNode: BaseNode,
   material?: {
-    basicMaterials: 'pc' | 'h5' | { json: any; tsDeclaration: string };
-    extensionMaterials: {
+    basicMaterials: 'pc' | 'h5' | { json: any; tsDeclaration: string; };
+    extensionMaterials: 'pc' | 'h5' | {
       name: string;
       title: string;
       description: string;
@@ -272,21 +315,23 @@ export function genNaturalTSContextJSONForUI(
     moduleInterfaces: any;
     connectors: any;
     dependencies: any;
-  }
+  },
+  restParams?: any
 ) {
   const frontend = currentNode.getAncestor('Frontend') as Frontend;
-  const state = createCompilerState();
+  const state = createCompilerState('', { descriptionComment: true, needNamespace: true, typeMap: restParams?.typeMap });
 
   const { naslCore } = getNaslCore('view_logic');
   const { naslUtil } = getNaslUtil();
-  const { naslUI } = getNaslUI(app, frontend.type, {
+  const { naslUI } = getNaslUIOld();
+  const components = getNaslUI(app, frontend.type, {
     basicMaterials: material?.basicMaterials,
     extensionMaterials: material?.extensionMaterials,
-  });
+  }).naslUI;
   const { enums } = getEnums(app, state);
   const { entities } = getEntities(app, state);
   const { structures } = getStructures(app, state);
-  const { appLogics } = getLogics(app, currentNode);
+  const { appLogics } = getLogics(app, currentNode, state);
   const { interfaceDependencies } = getModuleInterfaces(
     material?.moduleInterfaces || app?.interfaceDependencies,
     state
@@ -299,12 +344,15 @@ export function genNaturalTSContextJSONForUI(
   );
   const { frontendVariables } = getFrontendVariables(frontend, state);
   const { views } = getFrontendViews(frontend, state, currentNode, false);
-  const { currentLogic } = getCurrentNodeContextForUI(currentNode);
+  const { currentLogic } = getCurrentNodeContextForUI(currentNode, restParams?.typeMap);
+  const { componentDeclaration } = getCurrentComponentDeclaration(currentNode, components);
 
   return {
     naslCore,
     naslUtil,
     naslUI,
+    components,
+    componentDeclaration,
     enums,
     entities,
     structures,
@@ -333,7 +381,8 @@ export const genNaturalTSContextFromJSONForUI = (
   const {
     naslCore,
     naslUtil,
-    naslUI,
+    components,
+    componentDeclaration,
     enums,
     entities,
     structures,
@@ -346,18 +395,18 @@ export const genNaturalTSContextFromJSONForUI = (
   } = tsContextJSON;
 
   let code = '';
-  code += '### [1] 标准库\n';
+  code += '### [1] 标准库与类型定义\n';
   code += wrapTSBlock(naslCore);
 
-  code += '\n### [2] nasl.util\n';
+  code += '\n### [2] 平台内置函数库\n';
   code += wrapTSBlock(naslUtil);
 
-  if (naslUI) {
+  if (components) {
     code += '\n### [3] nasl.ui\n';
-    if (typeof naslUI === 'string') {
-      code += wrapTSBlock(naslUI);
-    } else {
-      code += getNaslUICode(naslUI, codeType, requiredIndexes);
+    code += getNaslUICode(components, codeType, requiredIndexes);
+    if (componentDeclaration) {
+      code += '\n#### [3-1] 组件声明\n';
+      code += wrapTSBlock(`declare namespace nasl.ui {\n${componentDeclaration}\n}`);
     }
   }
 
@@ -393,11 +442,10 @@ export const genNaturalTSContextFromJSONForUI = (
   }
 
   code += '\n### [10] 页面上下文\n';
-  if (frontendVariables) {
+  if (frontendVariables?.data?.length) {
     code += '\n#### [10-0] 前端全局变量\n';
-    code += frontendVariables;
+    code += getVariablesCode(frontendVariables);
   }
-
   if (views?.data?.length) {
     code += '\n#### [10-1] 前端页面列表\n';
     code += getFrontendViewsCode(views);
@@ -416,8 +464,8 @@ export function genNaturalTSContextForUI(
   focusedNodePath?: string,
   requiredIndexes?: string[],
   material?: {
-    basicMaterials: 'pc' | 'h5' | { json: any; tsDeclaration: string };
-    extensionMaterials: {
+    basicMaterials: 'pc' | 'h5' | { json: any; tsDeclaration: string; };
+    extensionMaterials: 'pc' | 'h5' | {
       name: string;
       title: string;
       description: string;
@@ -428,13 +476,14 @@ export function genNaturalTSContextForUI(
     dependencies: any;
   },
   restParams?: {
-    codeType?: 'detail' | 'short';
+    codeType: 'detail' | 'short';
+    typeMap?: any;
   }
 ) {
-  const tsContextJSON = genNaturalTSContextJSONForUI(app, currentNode, material);
+  const tsContextJSON = genNaturalTSContextJSONForUI(app, currentNode, material, restParams);
   const code = genNaturalTSContextFromJSONForUI(
     tsContextJSON,
-    restParams.codeType,
+    restParams?.codeType || 'short',
     requiredIndexes
   );
   return code;

package/src/natural/getContext/getUILib.ts

@@ -50,7 +50,10 @@ export function handleMaterial({ json, tsDeclaration }: { json: Array<{ name: st
   snippets.forEach((code) => {
     const cap = code.match(/class ([a-zA-Z]+).+?extends ViewComponent/);
     if (cap) {
-      snippetMap[cap[1]] = `declare namespace nasl.ui${code}`;
+      const newCode = code
+        .replace(/nasl\.core\./g, "")
+        .replace(/Integer/g, "Long");
+      snippetMap[cap[1]] = `declare namespace nasl.ui${newCode}`;
     }
   });
   json.forEach((item) => {
@@ -79,12 +82,12 @@ export function getPreDeclaration() {
   /// #if process.env.BUILD_TARGET === 'node'
   if (globalThis.process) { // For TS build
     const fs = require('fs');
-    code = fs.readFileSync(require.resolve(`../../../sandbox-natural/stdlib/nasl.ui.pre.d.ts`), 'utf8');
+    code = fs.readFileSync(require.resolve(`../../../sandbox-natural/stdlib/nasl.ui.d.ts`), 'utf8');
   }
   /// #endif
   /// #if process.env.BUILD_TARGET !== 'node'
   if (globalThis.window) { // For TS build
-    code = require('!!raw-loader!../../../sandbox-natural/stdlib/nasl.ui.pre.d.ts').default;
+    code = require('!!raw-loader!../../../sandbox-natural/stdlib/nasl.ui.d.ts').default;
   }
   /// #endif
   return code;