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

package/src/server/naslServer.ts

@@ -174,9 +174,9 @@ export function getDisplayString2Type(displayString: string) {
       const strs = item.split('.');
       const type = strs[strs.length - 1];
       return type;
-    } 
+    }
       return item;
-    
+
   });
 
   if (targetType) {
@@ -185,6 +185,29 @@ export function getDisplayString2Type(displayString: string) {
   return typeList;
 }
 
+
+function isCoreDateTimeType(n : Argument): boolean {
+  return n?.expression?.__TypeAnnotation?.typeName === 'DateTime' &&
+          n?.expression?.__TypeAnnotation?.typeNamespace === 'nasl.core';
+}
+
+function isFunctionWithFixedTimeZoneParam(calleeName : string): boolean {
+  const fns = ['CurrDateTime', 'CurrDate', 'CurrTime', 'FormatDateTime'];
+  return fns.includes(calleeName);
+}
+
+
+const timeZoneArgumentIndexMap = new Map<string, number>([
+  ['ToString', 1],
+  ['CurrDateTime', 0],
+  ['CurrDate', 0],
+  ['CurrTime', 0],
+  ['FormatDateTime', 2],
+  ['jsonSerialize', 1],
+  ['GetDateCount', 2],
+  ['GetSpecificDaysOfWeek', 3]
+])
+
 @sentryMonitorNaslServer
 class NaslServer {
   /** naslStdlib文件缓存 */
@@ -303,10 +326,10 @@ class NaslServer {
             if (this.changeStackList[findLastIndex]?.field) {
               // 如果当前列表里有，这个文件节点，最后一个是field的话，直接return掉，不用塞这个update了
               return;
-            } 
+            }
               // 如果最后一项是普通的update的话，就可以去掉，后面那个会在塞过来
               this.changeStackList.pop();
-            
+
           }
           this.changeStackList.push(item.originEvent);
         } catch (err) {
@@ -629,9 +652,9 @@ class NaslServer {
       // app的创建内容
       this.contentToFile(app, results);
       // 其他模块的创建内容
+      app.integration?.connectors?.forEach((item) => this.contentToFile(item, results));
       app.dependencies.forEach((item) => this.contentToFile(item, results));
       app.interfaceDependencies.forEach((item) => this.contentToFile(item, results));
-      app.integration?.connectors?.forEach((item) => this.contentToFile(item, results));
     } catch (err) {
       console.log(err);
     }
@@ -779,9 +802,9 @@ class NaslServer {
         value,
         noFilterList,
       });
-    } 
+    }
       console.log('没找到节点', node, currentSource, fileNode);
-    
+
   }
 
   _getValueSelectCompletion(args: any) {
@@ -825,9 +848,9 @@ class NaslServer {
           });
           if (!res.length) {
             return [];
-          } 
+          }
             return [{ title: '基础类型', children: res }];
-          
+
         }
       } catch (err) {
         console.log(err);
@@ -1013,9 +1036,9 @@ class NaslServer {
         },
         noFilterList,
       });
-    } 
+    }
       console.log('没找到节点', currentSource, fileNode);
-    
+
   }
 
   _getSelectNextCompletion(args: any) {
@@ -2370,7 +2393,8 @@ class NaslServer {
         const { calleeNamespace, calleeName } = node.parentNode.parentNode as CallLogic;
         if (
           (calleeNamespace === 'nasl.ui' || calleeNamespace === 'nasl.util') &&
-          (calleeName === 'showMessage' || calleeName === 'consoleLog' || calleeName === 'jsonSerialize' || calleeName === 'jsonDeserialize')
+          (['showMessage', 'consoleLog', 'jsonDeserialize',
+            'jsonSerialize'].includes(calleeName))
         ) {
           showErr = true;
         }
@@ -2481,9 +2505,9 @@ class NaslServer {
           }
         }
         return null;
-      } 
+      }
         return diag;
-      
+
     });
     if (actionArr.length) {
       if (timer) return;
@@ -3712,9 +3736,8 @@ class NaslServer {
         range,
         getFieldKey: fieldKey,
       });
-    } 
-      console.log('没找到节点', currentSource, fileNode);
-    
+    }
+
   }
 
   _getFieldKeySelectCompletion(args: any) {
@@ -3889,10 +3912,7 @@ class NaslServer {
             'QueryFieldExpression',
             'QueryGroupByExpression',
             'Param',
-            'AuthLogic',
-            'AuthLogic',
             'BackendVariable',
-            'AuthLogicForCallInterface',
             'CallAuthInterface',
           ].includes(node.concept)
         )
@@ -3979,80 +3999,90 @@ class NaslServer {
         }
         args.push(fileDetail);
       },
-      { minimum: 1000 }
+      { minimum: 1000 },
     );
 
     const resultMap: any = (await this.getNaslNodeTypeFull(args))?.response;
-    await utils.timeSlicing(args, ({ file, line, offset }, index) => {
-      const item = (resultMap as any)?.[file]?.[line]?.[offset];
-      const itemType = item?.[0]?.nodeType;
-      const nodeTypeAnnotation = type2TypeAnnotation(itemType);
-      const {node} = newQuickInfoNodes[index];
-
-      types.set(node, Object.freeze(nodeTypeAnnotation) as TypeAnnotation);
-
-      const type = itemType ? (Object.isFrozen(itemType) ? itemType : Object.freeze(itemType)) : null;
-
-      if (type) {
-        (node as any).__nodeType = type;
-      } else {
-        delete (node as any).__nodeType;
-      }
-    });
-
-    await utils.timeSlicing(Array.from(getFromOthers.entries()), ([node]) => {
-      if (node instanceof Assignment) {
-        if (!types.get(node.left)) {
-          types.set(node.left, types.get(node.right));
+    await utils.timeSlicing(
+      args,
+      ({ file, line, offset }, index) => {
+        const item = (resultMap as any)?.[file]?.[line]?.[offset];
+        const itemType = item?.[0]?.nodeType;
+        const nodeTypeAnnotation = type2TypeAnnotation(itemType);
+        const {node} = newQuickInfoNodes[index];
+
+        types.set(node, Object.freeze(nodeTypeAnnotation) as TypeAnnotation);
+
+        const type = itemType ? (Object.isFrozen(itemType) ? itemType : Object.freeze(itemType)) : null;
+        if (type) {
+          (node as any).__nodeType = type;
+        } else {
+          delete (node as any).__nodeType;
         }
-      } else if (node instanceof Argument) {
-        // 如果Argument，但是没可以用的类型，就用原来logic的参数类型
-        const argType = this.getArgumentTypeAnnotation(node, newQuickInfoNodes, types as any);
-        types.set(node, argType);
-      } else if (node instanceof MatchCase) {
-        // matchCase的类型
-        // 直接从最后一项的返回值取，有就有没有就没有
-        if (node.body?.length) {
-          const last = node.body[node.body.length - 1];
-          if (types.get(last)) {
-            types.set(node, types.get(last));
+      },
+      { minimum: 100 },
+    );
+    await utils.timeSlicing(
+      Array.from(getFromOthers.entries()),
+      ([node]) => {
+        if (node instanceof Assignment) {
+          if (!types.get(node.left)) {
+            types.set(node.left, types.get(node.right));
+          }
+        } else if (node instanceof Argument) {
+          // 如果Argument，但是没可以用的类型，就用原来logic的参数类型
+          const argType = this.getArgumentTypeAnnotation(node, newQuickInfoNodes, types as any);
+          types.set(node, argType);
+        } else if (node instanceof MatchCase) {
+          // matchCase的类型
+          // 直接从最后一项的返回值取，有就有没有就没有
+          if (node.body?.length) {
+            const last = node.body[node.body.length - 1];
+            if (types.get(last)) {
+              types.set(node, types.get(last));
+            }
           }
         }
-      }
-    });
-    await utils.timeSlicing(Array.from(types.entries()), ([node, value]) => {
-      try {
-        // 因为node可能是经过处理的TypeAnnotation
-        node.__isCorrectTypeAnnotation = true;
-        if (value) {
-          if (node instanceof OqlQueryComponent) {
-            // 自动推导情况
-            const typeAnnotation = value as TypeAnnotation;
-            if (!node.typeAnnotation && typeAnnotation) {
-              if (typeAnnotation.typeName === 'List' && typeAnnotation.typeKind === 'generic') {
-                const {typeArguments} = typeAnnotation;
-                if (typeArguments.length && typeArguments[0].isComplexType()) {
-                  delete node.__TypeAnnotation;
-                  return;
+      },
+      { minimum: 100 },
+    );
+    await utils.timeSlicing(
+      Array.from(types.entries()),
+      ([node, value]) => {
+        try {
+          // 因为node可能是经过处理的TypeAnnotation
+          node.__isCorrectTypeAnnotation = true;
+          if (value) {
+            if (node instanceof OqlQueryComponent) {
+              // 自动推导情况
+              const typeAnnotation = value as TypeAnnotation;
+              if (!node.typeAnnotation && typeAnnotation) {
+                if (typeAnnotation.typeName === 'List' && typeAnnotation.typeKind === 'generic') {
+                  const {typeArguments} = typeAnnotation;
+                  if (typeArguments.length && typeArguments[0].isComplexType()) {
+                    delete node.__TypeAnnotation;
+                    return;
+                  }
                 }
               }
             }
+            if (value instanceof TypeAnnotation) {
+              node.__TypeAnnotation = value;
+            } else if (value.typeAnnotation) {
+              node.__TypeAnnotation = value.typeAnnotation;
+            }
+          } else {
+            // 清空原来已经赋值上去的类型，可能原来有现在没有了
+            delete node.__TypeAnnotation;
           }
-          if (value instanceof TypeAnnotation) {
-            node.__TypeAnnotation = value;
-          } else if (value.typeAnnotation) {
-            node.__TypeAnnotation = value.typeAnnotation;
-          }
-        } else {
-          // 清空原来已经赋值上去的类型，可能原来有现在没有了
-          delete node.__TypeAnnotation;
+        } catch (err) {
+          // if (globalThis.window) {
+          //   console.log(err);
+          // }
         }
-      } catch (err) {
-        // if (globalThis.window) {
-        //   console.log(err);
-        // }
-      }
-    });
+      },
+      { minimum: 100 },
+    );
     return types;
   }
 
@@ -4223,6 +4253,19 @@ class NaslServer {
         const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
         jsonNode.typeAnnotation = (value as TypeAnnotation).toJSON();
       }
+
+      // jsonSerializer 是 CallLogic，其余是 CallFunction
+      if (node instanceof CallFunction || node instanceof CallLogic) {
+        const tzArgIdx = timeZoneArgumentIndexMap.get(node.calleeName);
+        const args = node.arguments;
+        const tzArg = args ? args[tzArgIdx] : undefined;
+
+        if (tzArgIdx && tzArg?.keyword === '时区' && !isCoreDateTimeType(node.arguments[0])) {
+          if (!isFunctionWithFixedTimeZoneParam(node.calleeName)) {
+            node.arguments.pop();
+          }
+        }
+      }
     });
   }
 

package/src/service/creator/errHandles.js

@@ -1,17 +1,11 @@
 import eventBus from '../../eventBus';
 
-function showError(message) {
-    try {
-        const Vue = require('vue').default || window?.Vue;
-        if (Vue.prototype?.$toast) {
-            Vue.prototype.$toast.error(message);
-        } else {
-            const UToast = Vue.component('UToast');
-            UToast && UToast.extendOptions.error(message);
-        }
-    } catch (e) {
-        console.error(message);
+const showError = (error) => (message) => {
+    if (typeof window === 'undefined') {
+        return;
     }
+
+    window.$showError && window.$showError(error)(message)
 }
 
 const versionStatus = {
@@ -50,30 +44,30 @@ export default {
                 message: err.msg,
             });
 
-        showError(err.msg || '系统繁忙');
+        showError(err)(err.msg || '系统繁忙');
     },
     401({ config }, err = {}) {
         if (config.noErrorTip)
             return;
 
-        showError(err.msg || '系统繁忙');
+        showError(err)(err.msg || '系统繁忙');
     },
     500({ config }, err = {}) {
         if (config.noErrorTip)
             return;
 
-        showError(err.msg || '系统繁忙');
+        showError(err)(err.msg || '系统繁忙');
     },
     400({ config }, err = {}) {
         if (config.noErrorTip || err.result)
             return;
 
-        showError(err.msg || '系统繁忙');
+        showError(err)(err.msg || '系统繁忙');
     },
     localError({ config }, err = {}) {
         if (config.noErrorTip)
             return;
 
-        showError(err.msg || '系统繁忙');
+        showError(err)(err.msg || '系统繁忙');
     },
 };

package/src/service/storage/init.ts

@@ -11,6 +11,8 @@ import * as jsoner from './jsoner';
 import type { NaslServer } from 'src/server/naslServer';
 /// #endif
 
+
+
 export const batchQuery = storageService.batchQuery;
 export const batchAction = storageService.batchAction;
 export const batchInstruct = storageService.batchInstruct;
@@ -259,11 +261,13 @@ async function doAction(app: any, actionItem: any) {
           if (getMiniAppChange(emitTarget, event?.originEvent?.object, event?.originEvent?.action)) {
             hasBackEnd = true;
           }
+         
           const isDelete = event?.originEvent?.action === 'delete';
           const isAuthView = emitTarget.auth && event?.originEvent?.object?.name;
-          const isUpdateAuth = event?.originEvent?.action === 'update' && event?.originEvent?.object && event?.originEvent?.object?.auth
+          const isUpdateAuth = event?.originEvent?.action === 'update' && "auth" in (event?.originEvent?.object || {});
+          const isUpdateAuthDes =  event?.originEvent?.action === 'update' &&  "authDescription" in (event?.originEvent?.object || {});
           const isUpdateBindRoles = event?.originEvent?.action === 'update' && event?.originEvent?.object && event?.originEvent?.object?.bindRoles;
-          if (isDelete || isUpdateAuth || isUpdateBindRoles || isAuthView) {
+          if (isDelete || isUpdateAuth || isUpdateBindRoles || isAuthView||isUpdateAuthDes) {
             hasBackEnd = true;
             // const app = emitTarget.app;
             // const diffArr: string[] = [];
@@ -283,7 +287,10 @@ async function doAction(app: any, actionItem: any) {
           }
           hasFrontEnd = true;
         }
-        if (emitTarget.concept === 'ViewElement') {
+          if (emitTarget.concept === 'ViewElement') {
+            if ("authDescription" in (event?.originEvent?.object || {})) {
+              hasBackEnd = true;
+            } ;
           if (event?.originEvent?.object?.name) {
             const bindDirective = emitTarget.bindDirectives.find(
               (item: BindDirective) => item.name === 'auth'

package/src/service/storage/jsoner.ts

@@ -69,9 +69,9 @@ export async function batchQuery(json: any, queryList: Array<Query>) {
         if (node) {
             if (Array.isArray(node)) {
                 return node.map((nodeItem) => excludeProperties(nodeItem, excludes));
-            } else {
+            } 
                 return excludeProperties(node, excludes);
-            }
+            
         }
         return null;
     });

package/src/templator/genEditTableBlock.ts

@@ -128,6 +128,12 @@ export function genEditTableColumnTemplate(
             ${getText(property)}
         </u-linear-layout>
     </template>
+    <template #expander="current">
+        <u-table-view-expander
+            :item="current.item"
+            @toggle="current.toggle">
+        </u-table-view-expander>
+    </template>
     ${genEditComponent(property)}
 </u-table-view-column>`;
 }
@@ -146,17 +152,33 @@ export function genEditTableTemplate(entity: Entity, nameGroup: NameGroup, newLo
   return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
         :pagination="true" :show-sizer="true" :page-size="20" :page-number="1" :default-column-width="300" editable>
-    <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template><template #cell="current"></template></u-table-view-column>
+    <u-table-view-column type="index" width="60">
+        <template #title><u-text text="序号"></u-text></template>
+        <template #cell="current"></template>
+        <template #expander="current">
+            <u-table-view-expander
+                :item="current.item"
+                @toggle="current.toggle">
+            </u-table-view-expander>
+        </template>
+    </u-table-view-column>
+
 
     ${properties.map((property) => `${genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroupMap)}\n`).join('')}
 
     <u-table-view-column>
-    <template #title><u-text text="操作"></u-text></template>
+        <template #title><u-text text="操作"></u-text></template>
         <template #cell="current">
             <u-linear-layout gap="small">
                 <u-link @click="${nameGroup.viewLogicRemove}">删除</u-link>
             </u-linear-layout>
         </template>
+        <template #expander="current">
+            <u-table-view-expander
+                :item="current.item"
+                @toggle="current.toggle">
+            </u-table-view-expander>
+        </template>
     </u-table-view-column>
 </u-table-view>
 `;

package/src/templator/genTableBlock.ts

@@ -48,6 +48,12 @@ export function genTableColumnTemplate(property: EntityProperty, currentName: st
             ${getText(property)}
         </u-linear-layout>
     </template>
+    <template #expander="current">
+        <u-table-view-expander
+            :item="current.item"
+            @toggle="current.toggle">
+        </u-table-view-expander>
+    </template>
 </u-table-view-column>`;
 }
 
@@ -66,7 +72,16 @@ export function genTableTemplate(entity: Entity, nameGroup: NameGroup,newLogic:
   return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${dataSourceValue}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
         :pagination="true" :show-sizer="true" :page-size="20" :page-number="1">
-    <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template><template #cell="current"></template></u-table-view-column>
+    <u-table-view-column type="index" width="60">
+        <template #title><u-text text="序号"></u-text></template>
+        <template #cell="current"></template>
+        <template #expander="current">
+            <u-table-view-expander
+                :item="current.item"
+                @toggle="current.toggle">
+            </u-table-view-expander>
+        </template>
+    </u-table-view-column>
 
     ${properties.map((property) => `${genTableColumnTemplate(property, currentName)}\n`).join('')}
 
@@ -78,6 +93,12 @@ export function genTableTemplate(entity: Entity, nameGroup: NameGroup,newLogic:
                 <u-link @click="${nameGroup.viewLogicRemove}">删除</u-link>
             </u-linear-layout>
         </template>
+        <template #expander="current">
+            <u-table-view-expander
+                :item="current.item"
+                @toggle="current.toggle">
+            </u-table-view-expander>
+        </template>
     </u-table-view-column>
 </u-table-view>
 `;

package/src/translator/types.ts

@@ -37,4 +37,5 @@ export interface TranslatorState {
   preferQuote?: 'single' | 'double' | 'backtick';
   sourceMap?: SourceMap;
   finalCode?: boolean;
+  focusedNodePath?: string;
 }

package/src/translator/utils.ts

@@ -59,6 +59,7 @@ export function isSameRange(rangeA: Range, rangeB : Range) {
 export function withSourceMap() {
   return function handleAction(target: any, key: string | number | symbol, descriptor: PropertyDescriptor) {
     const oldMethod = descriptor.value;
+    const isNatural = oldMethod.name === 'toNaturalTS';
 
     descriptor.value = function (this: BaseNode, state?: TranslatorState, ...args: any[]) {
       // 重新生成ts代码就先把类型清除掉
@@ -85,6 +86,20 @@ export function withSourceMap() {
           });
         }
 
+        if (isNatural && state.focusedNodePath) {
+          const needAddComment = this.nodePath === state.focusedNodePath;
+          // if (!needAddComment) {
+          //   const parts = state.focusedNodePath.split('.');
+          //   const lastPart = parts.pop();
+          // }
+          if (needAddComment) {
+            const beforeComment = `// 当前位置\n${before}`;
+            before += beforeComment;
+            state = shiftState(state, beforeComment);
+          }
+
+        }
+
         // 调用真实方法, 可能有剩余参数
         const code = oldMethod.call(this, state, ...args);
 

package/test/concepts/call-logic/__snapshots__/toJS.spec.ts.snap

@@ -115,10 +115,11 @@ exports[`call-logic:toJS nested-call-logic 1`] = `
     body: {
       url:
         this.$utils[\\"ToString\\"](
-          \`https://dysmsapi.aliyuncs.com/?AccessKeyId=LTAI5tPhPfe7NDP1qzrQjkuV&Action=SendSms&Format=JSON&Signature=\`,
-          \\"nasl.core.String\\"
+          \\"nasl.core.String\\",
+          \`https://dysmsapi.aliyuncs.com/?AccessKeyId=LTAI5tPhPfe7NDP1qzrQjkuV&Action=SendSms&Format=JSON&Signature=\`
         ) +
         this.$utils[\\"ToString\\"](
+          \\"nasl.core.String\\",
           await(
             this.$logics[\\"extensions.encrypt_tool.logics.encryptWithUrlEncode\\"](
               {
@@ -135,14 +136,14 @@ exports[`call-logic:toJS nested-call-logic 1`] = `
                 },
               }
             )
-          ),
-          \\"nasl.core.String\\"
+          )
         ) +
         this.$utils[\\"ToString\\"](
-          \`&SignatureMethod=HMAC-SHA1&SignatureVersion=1.0&Timestamp=\`,
-          \\"nasl.core.String\\"
+          \\"nasl.core.String\\",
+          \`&SignatureMethod=HMAC-SHA1&SignatureVersion=1.0&Timestamp=\`
         ) +
         this.$utils[\\"ToString\\"](
+          \\"nasl.core.String\\",
           await(
             this.$logics[\\"extensions.encrypt_tool.logics.encryptWithUrlEncode\\"](
               {
@@ -159,22 +160,22 @@ exports[`call-logic:toJS nested-call-logic 1`] = `
                 },
               }
             )
-          ),
-          \\"nasl.core.String\\"
+          )
         ) +
         this.$utils[\\"ToString\\"](
-          \`&Version=2017-05-25&SignatureNonce=\`,
-          \\"nasl.core.String\\"
+          \\"nasl.core.String\\",
+          \`&Version=2017-05-25&SignatureNonce=\`
         ) +
-        this.$utils[\\"ToString\\"](SignatureNonce, \\"nasl.core.String\\") +
-        this.$utils[\\"ToString\\"](\`&PhoneNumbers=\`, \\"nasl.core.String\\") +
-        this.$utils[\\"ToString\\"](receiver, \\"nasl.core.String\\") +
-        this.$utils[\\"ToString\\"](\`&SignName=\`, \\"nasl.core.String\\") +
-        this.$utils[\\"ToString\\"](signName, \\"nasl.core.String\\") +
-        this.$utils[\\"ToString\\"](\`&TemplateCode=\`, \\"nasl.core.String\\") +
-        this.$utils[\\"ToString\\"](templateCode, \\"nasl.core.String\\") +
-        this.$utils[\\"ToString\\"](\`&TemolateParam=\`, \\"nasl.core.String\\") +
+        this.$utils[\\"ToString\\"](\\"nasl.core.String\\", SignatureNonce) +
+        this.$utils[\\"ToString\\"](\\"nasl.core.String\\", \`&PhoneNumbers=\`) +
+        this.$utils[\\"ToString\\"](\\"nasl.core.String\\", receiver) +
+        this.$utils[\\"ToString\\"](\\"nasl.core.String\\", \`&SignName=\`) +
+        this.$utils[\\"ToString\\"](\\"nasl.core.String\\", signName) +
+        this.$utils[\\"ToString\\"](\\"nasl.core.String\\", \`&TemplateCode=\`) +
+        this.$utils[\\"ToString\\"](\\"nasl.core.String\\", templateCode) +
+        this.$utils[\\"ToString\\"](\\"nasl.core.String\\", \`&TemolateParam=\`) +
         this.$utils[\\"ToString\\"](
+          \\"nasl.core.String\\",
           await(
             this.$logics[\\"extensions.encrypt_tool.logics.encryptWithUrlEncode\\"](
               {
@@ -191,8 +192,7 @@ exports[`call-logic:toJS nested-call-logic 1`] = `
                 },
               }
             )
-          ),
-          \\"nasl.core.String\\"
+          )
         ),
       httpMethod: \`Get\`,
       header: header,

package/test/concepts/match/__snapshots__/toJS.spec.ts.snap

@@ -22,7 +22,7 @@ exports[`match:toJS lastBodyIf 1`] = `
 } else if (this.$isInstanceOf(variable1, \\"nasl.core.Long\\")) {
   while (variable1) {}
 } else if (this.$isInstanceOf(variable1, \\"nasl.core.String\\")) {
-  await(this.INFO(this.$utils[\\"ToString\\"](variable1, \\"undefined\\")));
+  await(this.INFO(this.$utils[\\"ToString\\"](\\"undefined\\", variable1)));
 } else {
 }
 "

package/test/concepts/member-expression/__snapshots__/toEmbeddedTS.spec.ts.snap

@@ -6,7 +6,7 @@ exports[`member-expression:toEmbeddedTS app.enums.UserStatusEnum 1`] = `
 `;
 
 exports[`member-expression:toEmbeddedTS elements.table-view.data 1`] = `
-"__elements.tableView[\\"data-source\\"];
+"__elements_completionProperty.tableView.dataSource;
 "
 `;