@lcap/nasl 3.6.0-beta.1 → 3.7.0-beta.1

package/coverage/src/concepts/CallInterface__.ts.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">35.73% </span>
+                <span class="strong">36.53% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>134/375</span>
+                <span class='fraction'>137/375</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">25.62% </span>
+                <span class="strong">25.61% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>51/199</span>
+                <span class='fraction'>52/203</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">30.86% </span>
+                <span class="strong">31.25% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>25/81</span>
+                <span class='fraction'>25/80</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">35.92% </span>
+                <span class="strong">36.82% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>120/334</span>
+                <span class='fraction'>123/334</span>
             </div>
         
             
@@ -941,7 +941,27 @@
 <a name='L876'></a><a href='#L876'>876</a>
 <a name='L877'></a><a href='#L877'>877</a>
 <a name='L878'></a><a href='#L878'>878</a>
-<a name='L879'></a><a href='#L879'>879</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
+<a name='L879'></a><a href='#L879'>879</a>
+<a name='L880'></a><a href='#L880'>880</a>
+<a name='L881'></a><a href='#L881'>881</a>
+<a name='L882'></a><a href='#L882'>882</a>
+<a name='L883'></a><a href='#L883'>883</a>
+<a name='L884'></a><a href='#L884'>884</a>
+<a name='L885'></a><a href='#L885'>885</a>
+<a name='L886'></a><a href='#L886'>886</a>
+<a name='L887'></a><a href='#L887'>887</a>
+<a name='L888'></a><a href='#L888'>888</a>
+<a name='L889'></a><a href='#L889'>889</a>
+<a name='L890'></a><a href='#L890'>890</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
@@ -980,6 +1000,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1149,15 +1170,23 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1374,9 +1403,8 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-yes">7x</span>
@@ -1560,6 +1588,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -1567,17 +1596,10 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -1819,7 +1841,16 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { TranslatorState, shiftState, withSourceMap, createCompilerState  } from '../translator';
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { wrapForEachToGenerator as wrapForEach, returnOrigin } from '../utils/time-slicing';
+import {
+  TranslatorState,
+  shiftState,
+  withSourceMap,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+} from '../translator';
 import Interface from './Interface__';
 import { ElementToVueOptions } from './ViewElement__';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
@@ -1856,6 +1887,7 @@ export class CallInterface extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'CallInterface' | 'CallAuthInterface';
 &nbsp;
@@ -2027,13 +2059,21 @@ export class CallInterface extends LogicItem {
     };
 <span class="cstat-no" title="statement not covered" >    if (parentKey) {</span>
 <span class="cstat-no" title="statement not covered" >      params.parentKey = parentKey;</span>
-<span class="cstat-no" title="statement not covered" >      if (Array.isArray((this as any)[parentKey])) {</span>
-        const index = (<span class="cstat-no" title="statement not covered" >this as any)[parentKey].indexOf(logicItem);</span>
+      // @ts-ignore
+      const t = <span class="cstat-no" title="statement not covered" >this.__v_raw || this;</span>
+      // @ts-ignore
+      const n = <span class="cstat-no" title="statement not covered" >logicItem.__v_raw || logicItem;</span>
+<span class="cstat-no" title="statement not covered" >      if (Array.isArray((t as any)[parentKey])) {</span>
+        // @ts-ignore
+        const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].findIndex(<span class="fstat-no" title="function not covered" >(e</span>l) =&gt; <span class="cstat-no" title="statement not covered" >(el.__v_raw || el) === n)</span>;</span>
 <span class="cstat-no" title="statement not covered" >        ~index &amp;&amp; (this as any)[parentKey].splice(index, 1);</span>
 <span class="cstat-no" title="statement not covered" >        params.index = index;</span>
-      } else <span class="cstat-no" title="statement not covered" >if ((this as any)[parentKey] === logicItem) {</span>
-<span class="cstat-no" title="statement not covered" >        params.index = 0;</span>
-        (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
+      } else {
+        const q = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey];</span>
+<span class="cstat-no" title="statement not covered" >        if ((q.__v_raw || q) === n) {</span>
+<span class="cstat-no" title="statement not covered" >          params.index = 0;</span>
+          (<span class="cstat-no" title="statement not covered" >this as any)[parentKey] = undefined;</span>
+        }
       }
     }
 <span class="cstat-no" title="statement not covered" >    return params;</span>
@@ -2085,12 +2125,12 @@ export class CallInterface extends LogicItem {
 <span class="cstat-no" title="statement not covered" >            this.app.emit('collect:start', { actionMsg: '删除接口' });</span>
             const parentModule = <span class="cstat-no" title="statement not covered" >oldItf.module || oldItf.connector;</span>
 <span class="cstat-no" title="statement not covered" >            if (oldItf.module) {</span>
-              const shouldDeleteStructures: Structure[] = <span class="cstat-no" title="statement not covered" >[]</span>
+              const shouldDeleteStructures: Structure[] = <span class="cstat-no" title="statement not covered" >[];</span>
 <span class="cstat-no" title="statement not covered" >              oldItf.module.getInterfaceStructureMap().forEach(<span class="fstat-no" title="function not covered" >(i</span>tfs, stru) =&gt; {</span>
 <span class="cstat-no" title="statement not covered" >                if (itfs.size === 1 &amp;&amp; itfs.has(oldItf)) {</span>
-<span class="cstat-no" title="statement not covered" >                  shouldDeleteStructures.push(stru)</span>
+<span class="cstat-no" title="statement not covered" >                  shouldDeleteStructures.push(stru);</span>
                 }
-              })
+              });
 <span class="cstat-no" title="statement not covered" >              shouldDeleteStructures.forEach(<span class="fstat-no" title="function not covered" >(s</span>: Structure) =&gt; <span class="cstat-no" title="statement not covered" >s.delete())</span>;</span>
             } else {
               const shouldDeleteStructures = <span class="cstat-no" title="statement not covered" >oldItf.getRefStructures(parentModule.structures);</span>
@@ -2249,17 +2289,16 @@ export class CallInterface extends LogicItem {
     return code;
   }
 &nbsp;
-  @withSourceMap()
-  toEmbeddedTS(state = createCompilerState()): string {
-    const { completeArguments, parentNode, parentKey, tsCalleeKey } = this;
-&nbsp;
+  @withSourceMapGenerator
+  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
+    const self = this;
+    const { completeArguments, parentNode, parentKey, tsCalleeKey } = self;
     let code = `${tsCalleeKey}(`;
-&nbsp;
     if (completeArguments?.length) {
       code += '{';
-      completeArguments?.forEach((arg, index) =&gt; {
-        code += arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true);
-        if (index !== this.arguments?.length - 1) code += ', ';
+      yield* wrapForEach(completeArguments, function* warpForEachGenerator(arg, index) {
+        code += yield* arg?.toEmbeddedTS(shiftState(state, code), arg.paramRequired, true) ?? <span class="branch-1 cbranch-no" title="branch not covered" >returnOrigin('');</span>
+        if (index !== self.arguments?.length - 1) code += ', ';
       });
       code += '}';
     }
@@ -2438,24 +2477,18 @@ export class CallInterface extends LogicItem {
 <span class="fstat-no" title="function not covered" >  setCallee(</span>_interface: Interface) {
     const calleeNamespace = <span class="cstat-no" title="statement not covered" >_interface.getNamespace();</span>
     const calleeName = <span class="cstat-no" title="statement not covered" >_interface.name;</span>
+    // 保留之前的参数
     const params = <span class="cstat-no" title="statement not covered" >_interface.params.map(<span class="fstat-no" title="function not covered" >(p</span>aram) =&gt; {</span>
-      const oldArgument = <span class="cstat-no" title="statement not covered" >this.arguments.find(<span class="fstat-no" title="function not covered" >(n</span>ode) =&gt; <span class="cstat-no" title="statement not covered" >node.keyword === param.name)</span></span>
-<span class="cstat-no" title="statement not covered" >      return Argument.from({</span>
-        keyword: param.name,
-        expression: oldArgument ? oldArgument.expression : undefined
-      }, this, 'arguments');
+      const oldArgument = <span class="cstat-no" title="statement not covered" >this.arguments.find(<span class="fstat-no" title="function not covered" >(n</span>ode) =&gt; <span class="cstat-no" title="statement not covered" >node.keyword === param.name)</span>;</span>
+<span class="cstat-no" title="statement not covered" >      return Argument.from(</span>
+        {
+          keyword: param.name,
+          expression: oldArgument?.expression,
+        },
+        this,
+        'arguments',
+      );
     });
-    const oldArguments = <span class="cstat-no" title="statement not covered" >this.arguments.reduce(<span class="fstat-no" title="function not covered" >(r</span>es, argumentNode) =&gt; {</span>
-      const targetParam = <span class="cstat-no" title="statement not covered" >_interface.params.find(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; <span class="cstat-no" title="statement not covered" >item.name === argumentNode.keyword)</span></span>
-<span class="cstat-no" title="statement not covered" >      if (!targetParam) {</span>
-<span class="cstat-no" title="statement not covered" >        res.push(Argument.from({</span>
-          keyword: argumentNode.keyword,
-          expression: argumentNode ? argumentNode.expression : undefined
-        }, this, 'arguments'))
-      }
-<span class="cstat-no" title="statement not covered" >      return res</span>
-    }, [])
-<span class="cstat-no" title="statement not covered" >    params.push(...oldArguments)</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >    if (this.app) {</span>
 <span class="cstat-no" title="statement not covered" >      this.app.emit('collect:start', {</span>
@@ -2654,13 +2687,13 @@ export class CallInterface extends LogicItem {
         // 仅被自己引用则删除
 <span class="cstat-no" title="statement not covered" >        if (!isSameItf &amp;&amp; isSelfRef &amp;&amp; refCount === 1) {</span>
           //  删除旧的数据结构
-          const shouldDeleteStructures: Structure[] = <span class="cstat-no" title="statement not covered" >[]</span>
-          const structureMap = <span class="cstat-no" title="statement not covered" >oldItf.module.getInterfaceStructureMap()</span>
+          const shouldDeleteStructures: Structure[] = <span class="cstat-no" title="statement not covered" >[];</span>
+          const structureMap = <span class="cstat-no" title="statement not covered" >oldItf.module.getInterfaceStructureMap();</span>
 <span class="cstat-no" title="statement not covered" >          structureMap.forEach(<span class="fstat-no" title="function not covered" >(i</span>tfs, stru) =&gt; {</span>
 <span class="cstat-no" title="statement not covered" >            if (itfs.size === 1 &amp;&amp; itfs.has(oldItf)) {</span>
-<span class="cstat-no" title="statement not covered" >              shouldDeleteStructures.push(stru)</span>
+<span class="cstat-no" title="statement not covered" >              shouldDeleteStructures.push(stru);</span>
             }
-          })
+          });
 <span class="cstat-no" title="statement not covered" >          shouldDeleteStructures.forEach(<span class="fstat-no" title="function not covered" >(s</span>: Structure) =&gt; <span class="cstat-no" title="statement not covered" >s.delete())</span>;</span>
 <span class="cstat-no" title="statement not covered" >          oldItf.delete();</span>
 <span class="cstat-no" title="statement not covered" >          oldItf.afterDelete();</span>
@@ -2675,12 +2708,12 @@ export class CallInterface extends LogicItem {
     // 递归找出 response/request 的 Body/Returns 引用的数据结构
     const newStructuresSet = <span class="cstat-no" title="statement not covered" >targetItf.getRefStructures(moduleData.structures);</span>
     // 新导入的数据结构在系统中已存在时 提前进行删除
-<span class="cstat-no" title="statement not covered" >    newStructuresSet.forEach(<span class="fstat-no" title="function not covered" >stru </span>=&gt; {</span>
-      const target = <span class="cstat-no" title="statement not covered" >targetItf.module.structures.find(<span class="fstat-no" title="function not covered" >node </span>=&gt; <span class="cstat-no" title="statement not covered" >node.name === stru.name)</span></span>
+<span class="cstat-no" title="statement not covered" >    newStructuresSet.forEach(<span class="fstat-no" title="function not covered" >(s</span>tru) =&gt; {</span>
+      const target = <span class="cstat-no" title="statement not covered" >targetItf.module.structures.find(<span class="fstat-no" title="function not covered" >(n</span>ode) =&gt; <span class="cstat-no" title="statement not covered" >node.name === stru.name)</span>;</span>
 <span class="cstat-no" title="statement not covered" >      if (target) {</span>
-<span class="cstat-no" title="statement not covered" >        oldStructuresSet.add(target)</span>
+<span class="cstat-no" title="statement not covered" >        oldStructuresSet.add(target);</span>
       }
-    })
+    });
     // 删除旧的数据结构
 <span class="cstat-no" title="statement not covered" >    oldStructuresSet.forEach(<span class="fstat-no" title="function not covered" >(s</span>) =&gt; <span class="cstat-no" title="statement not covered" >s.delete())</span>;</span>
 <span class="cstat-no" title="statement not covered" >    newStructuresSet.forEach(<span class="fstat-no" title="function not covered" >(s</span>) =&gt; <span class="cstat-no" title="statement not covered" >module.addStructure(Structure.from(s)))</span>;</span>
@@ -2704,7 +2737,7 @@ export default CallInterface;
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2023-10-18T11:36:07.885Z
+                at 2023-12-14T04:42:19.254Z
             </div>
         <script src="../../prettify.js"></script>
         <script>