@lcap/nasl 3.8.2-alpha.4 → 3.8.2-alpha.5

package/src/concepts/Variable__.ts

@@ -24,7 +24,7 @@ function tryJSONParse(str: string) {
 
   try {
     result = JSON.parse(str);
-  } catch (e) {}
+  } catch (e) { }
 
   return result;
 }
@@ -208,7 +208,7 @@ export class Variable extends BaseNode {
   get __isVirtual() {
     const processV2 = this.getAncestor('ProcessV2') as ProcessV2;
     const process = this.getAncestor('Process') as Process;
-    const isDisabled = !!this.getAncestor('HistoryProcessV2') || ['enabled', 'history'].includes(processV2?.status)
+    const isDisabled = !!this.getAncestor('HistoryProcessV2') || ['enabled', 'history'].includes(processV2?.status);
     return isDisabled || process?.__isVirtual || false;
   }
 
@@ -305,6 +305,9 @@ export class Variable extends BaseNode {
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     let code = this.name;
+    if (state.needNamespace) {
+      code = `${this.getNamespace()}.${code}`;
+    }
     if (this.typeAnnotation) {
       code += ': ';
       code += this.typeAnnotation.toNaturalTS(shiftState(state, code));
@@ -363,9 +366,8 @@ export class Variable extends BaseNode {
    * @param name 一般不用传，用于 rename
    */
   getEmbeddedFilePath(name = this.name) {
-    return `/embedded/${this.getAncestor('App')?.name}/frontendTypes/${
-      this.getAncestor('FrontendType')?.name
-    }/frontends/${this.getAncestor('Frontend')?.name}/variables/${name}.ts`;
+    return `/embedded/${this.getAncestor('App')?.name}/frontendTypes/${this.getAncestor('FrontendType')?.name
+      }/frontends/${this.getAncestor('Frontend')?.name}/variables/${name}.ts`;
   }
 
   *toEmbeddedTSFile(): EmbeddedTSFileGenerator {

package/src/natural/genNaturalTS.ts

@@ -14,6 +14,7 @@ import {
   getDependencies,
   getFrontendVariables,
   getServerVariables,
+  getVariablesCode,
   getFrontendViews,
   getCurrentNodeContext,
   getCurrentNodeContextForUI,
@@ -233,9 +234,9 @@ 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) {
@@ -244,7 +245,9 @@ export const genNaturalTSContextFromJSONForLogic = (
     }
   } else {
     code += '\n### [10] 全局变量\n';
-    code += backendVariables;
+    if (backendVariables?.data?.length) {
+      code += getVariablesCode(backendVariables);
+    }
   }
 
   code += '\n### 当前逻辑上下文\n';
@@ -439,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);

package/src/natural/getContext/index.ts

@@ -544,22 +544,37 @@ export const getDependenciesCode = (dependencies: any, codeType: 'detail' | 'sho
 
 export function getFrontendVariables(frontend: Frontend, state: TranslatorState) {
   let code = '';
+  const data = [] as Snippet[];
+  const namespace = frontend?.variables?.[0]?.getNamespace() || '';
   frontend?.variables?.forEach((variable) => {
-    const tempCode = `let ${variable?.toNaturalTS(shiftState(state, code, { inline: true }))};\n`;
+    const tempCode = `let ${variable?.toNaturalTS(shiftState(state, code, { inline: true, needNamespace: true, }))};\n`;
+    data.push({ description: variable?.description || '', code: tempCode });
     code += tempCode;
   });
-  return { code: wrapTSBlock(code), frontendVariables: code };
+  return { namespace, frontendVariables: { namespace, data } };
 }
 
 export function getServerVariables(app: App, state: TranslatorState) {
   let code = '';
+  const data = [] as Snippet[];
+  const namespace = 'app.backend.variables';
   app.backend?.variables?.forEach((variable) => {
-    const tempCode = `let ${variable?.toNaturalTS(shiftState(state, code, { inline: true }))};\n`;
+    const tempCode = `let ${variable?.toNaturalTS(shiftState(state, code, { inline: true, needNamespace: true, }))};\n`;
+    data.push({ description: variable?.description || '', code: tempCode });
     code += tempCode;
   });
-  return { code: wrapTSBlock(code), backendVariables: code };
+  return { namespace, backendVariables: { namespace, data } };
 }
 
+export const getVariablesCode = (variables: any) => {
+  let code = '';
+  variables?.data?.forEach((item: any) => {
+    code += item.description ? `/* ${item.description} */ \n` : '';
+    code += item.code;
+  });
+  return wrapTSBlock(code);
+};
+
 export function getChildrenViews(view: View, currentNode: BaseNode, convertChildren: boolean, prefix: string) {
   const data = [] as Snippet[];
   if (view?.children?.length > 0) {

package/src/natural/transformTS2UI.ts

@@ -697,6 +697,14 @@ function transformNode2Expression(node: babelTypes.Node, type?: string): any {
         return switchStatement;
       }
       throwError(`Unhandled ArrowFunctionExpression node ${node.type}`);
+    } else if (/nasl.auth./.test(calleeName)) {
+      return new naslTypes.CallLogic({
+        calleeNamespace: 'nasl.auth',
+        calleeName: (callee[callee.length - 1] as babelTypes.Identifier).name,
+        arguments: node?.arguments?.map((arg) => new naslTypes.Argument({
+          expression: transformNode2Expression(arg, type),
+        })) as naslTypes.Argument[],
+      });
     } else {
       throwError(`Unhandled node ${callee.map((item: babelTypes.Identifier) => item.name).join('.')} ${node.type}`);
     }
@@ -783,6 +791,25 @@ function transformNode2Expression(node: babelTypes.Node, type?: string): any {
         }),
       });
     }
+    if (calleeName?.includes('nasl.auth.')) {
+      return new naslTypes.MemberExpression({
+        object: new naslTypes.Identifier({
+          namespace: 'nasl.auth',
+          name: (callee?.[2] as babelTypes.Identifier)?.name,
+        }),
+        property: new naslTypes.Identifier({
+          name: (callee?.[3] as babelTypes.Identifier)?.name,
+        }),
+      });
+    }
+    const regex = /^(app\..+?)\.variables\.(.+)$/;
+    if (regex.test(calleeName)) {
+      const [, namespace, variableName] = calleeName.match(regex);
+      return new naslTypes.Identifier({
+        name: String(variableName),
+        namespace: `${namespace}.variables`
+      });
+    }
     if (node.property.type === 'NumericLiteral') {
       return new naslTypes.CallFunction({
         calleeNamespace: 'nasl.util',

package/src/natural/transformTSCode.ts

@@ -699,19 +699,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
             expression: transformLogicNode(arg),
           })) as naslTypes.Argument[],
         });
-      }
-      // else if (/destination/.test(calleeName)) {
-      //   const newCallee = flatMemberExpression((node.callee as any).object);
-      //   return new naslTypes.Destination({
-      //     viewNamespace: generate((node.callee as any).object.object).code,
-      //     viewName: (newCallee[newCallee.length - 1] as babelTypes.Identifier).name,
-      //     target: (node.arguments[0] as any).properties[1].value.value,
-      //     anchor: new naslTypes.Anchor({
-      //       expression: transformLogicNode((node.arguments[0] as any).properties[0].value),
-      //     }),
-      //   });
-      // }
-      else if (node.callee.type === 'ArrowFunctionExpression') {
+      } else if (node.callee.type === 'ArrowFunctionExpression') {
         // NOTE: 适用于 if else
         const newCallee = (node.callee.body as any).body;
         if (newCallee[newCallee.length - 1].argument?.callee?.name === '__MatchExpressionFuntion') {
@@ -757,6 +745,14 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           return switchStatement;
         }
         throwError(`Unhandled ArrowFunctionExpression node ${node.type}`);
+      } else if (/nasl.auth./.test(calleeName)) {
+        return new naslTypes.CallLogic({
+          calleeNamespace: 'nasl.auth',
+          calleeName: (callee[callee.length - 1] as babelTypes.Identifier).name,
+          arguments: node?.arguments?.map((arg) => new naslTypes.Argument({
+            expression: transformLogicNode(arg),
+          })) as naslTypes.Argument[],
+        });
       } else {
         throwError(`Unhandled node ${callee.map((item: babelTypes.Identifier) => item.name).join('.')} ${node.type}`);
       }
@@ -843,6 +839,25 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           }),
         });
       }
+      if (calleeName?.includes('nasl.auth.')) {
+        return new naslTypes.MemberExpression({
+          object: new naslTypes.Identifier({
+            namespace: 'nasl.auth',
+            name: (callee?.[2] as babelTypes.Identifier)?.name,
+          }),
+          property: new naslTypes.Identifier({
+            name: (callee?.[3] as babelTypes.Identifier)?.name,
+          }),
+        });
+      }
+      const regex = /^(app\..+?)\.variables\.(.+)$/;
+      if (regex.test(calleeName)) {
+        const [, namespace, variableName] = calleeName.match(regex);
+        return new naslTypes.Identifier({
+          name: String(variableName),
+          namespace: `${namespace}.variables`
+        });
+      }
       if (node.property.type === 'NumericLiteral') {
         return new naslTypes.CallFunction({
           calleeNamespace: 'nasl.util',