@lcap/nasl 3.3.2-beta.4 → 3.3.3-beta.1

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

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">4.22% </span>
+                <span class="strong">4.39% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>19/450</span>
+                <span class='fraction'>20/455</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/196</span>
+                <span class='fraction'>0/204</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">4.2% </span>
+                <span class="strong">4.4% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>17/404</span>
+                <span class='fraction'>18/409</span>
             </div>
         
             
@@ -1135,7 +1135,22 @@
 <a name='L1070'></a><a href='#L1070'>1070</a>
 <a name='L1071'></a><a href='#L1071'>1071</a>
 <a name='L1072'></a><a href='#L1072'>1072</a>
-<a name='L1073'></a><a href='#L1073'>1073</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
+<a name='L1073'></a><a href='#L1073'>1073</a>
+<a name='L1074'></a><a href='#L1074'>1074</a>
+<a name='L1075'></a><a href='#L1075'>1075</a>
+<a name='L1076'></a><a href='#L1076'>1076</a>
+<a name='L1077'></a><a href='#L1077'>1077</a>
+<a name='L1078'></a><a href='#L1078'>1078</a>
+<a name='L1079'></a><a href='#L1079'>1079</a>
+<a name='L1080'></a><a href='#L1080'>1080</a>
+<a name='L1081'></a><a href='#L1081'>1081</a>
+<a name='L1082'></a><a href='#L1082'>1082</a>
+<a name='L1083'></a><a href='#L1083'>1083</a>
+<a name='L1084'></a><a href='#L1084'>1084</a>
+<a name='L1085'></a><a href='#L1085'>1085</a>
+<a name='L1086'></a><a href='#L1086'>1086</a>
+<a name='L1087'></a><a href='#L1087'>1087</a>
+<a name='L1088'></a><a href='#L1088'>1088</a></td><td class="line-coverage quiet"><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-yes">1x</span>
@@ -1169,6 +1184,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>
@@ -1634,6 +1650,10 @@
 <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-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -1682,6 +1702,10 @@
 <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-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -2185,10 +2209,16 @@
 <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-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-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>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -2239,6 +2269,7 @@ export class BatchAssignment extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'BatchAssignment';
 &nbsp;
@@ -2706,11 +2737,15 @@ export class BatchAssignment 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(selectMembers);</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" >selectMembers.__v_raw || selectMembers;</span>
+<span class="cstat-no" title="statement not covered" >      if (Array.isArray((t as any)[parentKey])) {</span>
+        const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].indexOf(n);</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] === selectMembers) {</span>
+      } else <span class="cstat-no" title="statement not covered" >if ((t as any)[parentKey] === 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>
       }
@@ -2754,11 +2789,15 @@ export class BatchAssignment 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(assignmentLine);</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" >assignmentLine.__v_raw || assignmentLine;</span>
+<span class="cstat-no" title="statement not covered" >      if (Array.isArray((t as any)[parentKey])) {</span>
+        const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].indexOf(n);</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] === assignmentLine) {</span>
+      } else <span class="cstat-no" title="statement not covered" >if ((t as any)[parentKey] === 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>
       }
@@ -3257,10 +3296,16 @@ export class BatchAssignment extends LogicItem {
     let code = <span class="cstat-no" title="statement not covered" >'';</span>
     // 根据连线状态，拆分成多个单赋值
 <span class="cstat-no" title="statement not covered" >    this.assignmentLines.forEach(<span class="fstat-no" title="function not covered" >({</span> leftIndex, rightIndex }) =&gt; {</span>
-      const leftValue = <span class="cstat-no" title="statement not covered" >leftIndex.length === 1 ? this.left.expression.toNaturalTS(shiftState(state, code, { inline: true })) : this.left.members[leftIndex[1]]?.toNaturalTS(shiftState(state, code, { inline: true }));</span>
+      const leftValue =
+<span class="cstat-no" title="statement not covered" >        leftIndex.length === 1</span>
+          ? this.left.expression.toNaturalTS(shiftState(state, code, { inline: true }))
+          : this.left.members[leftIndex[1]]?.toNaturalTS(shiftState(state, code, { inline: true }));
 <span class="cstat-no" title="statement not covered" >      code += `${leftValue}`;</span>
 <span class="cstat-no" title="statement not covered" >      code += ' = ';</span>
-      const rightValue = <span class="cstat-no" title="statement not covered" >rightIndex.length === 1 ? this.rights[rightIndex[0]]?.expression?.toNaturalTS(shiftState(state, code, { inline: true })) : this.rights[rightIndex[0]]?.members[rightIndex[1]]?.toNaturalTS(shiftState(state, code, { inline: true }));</span>
+      const rightValue =
+<span class="cstat-no" title="statement not covered" >        rightIndex.length === 1</span>
+          ? this.rights[rightIndex[0]]?.expression?.toNaturalTS(shiftState(state, code, { inline: true }))
+          : this.rights[rightIndex[0]]?.members[rightIndex[1]]?.toNaturalTS(shiftState(state, code, { inline: true }));
 <span class="cstat-no" title="statement not covered" >      code += `${rightValue}`;</span>
 <span class="cstat-no" title="statement not covered" >      code += ';';</span>
 <span class="cstat-no" title="statement not covered" >      code += '\n';</span>
@@ -3268,7 +3313,7 @@ export class BatchAssignment extends LogicItem {
 <span class="cstat-no" title="statement not covered" >    return code;</span>
   }
 &nbsp;
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================
@@ -3286,7 +3331,7 @@ export default BatchAssignment;
             <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-10-31T12:16:02.007Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">9.88% </span>
+                <span class="strong">10.73% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>17/172</span>
+                <span class='fraction'>19/177</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/104</span>
+                <span class='fraction'>0/110</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">14.28% </span>
+                <span class="strong">13.33% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>2/14</span>
+                <span class='fraction'>2/15</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">8.82% </span>
+                <span class="strong">9.71% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>15/170</span>
+                <span class='fraction'>17/175</span>
             </div>
         
             
@@ -515,7 +515,43 @@
 <a name='L450'></a><a href='#L450'>450</a>
 <a name='L451'></a><a href='#L451'>451</a>
 <a name='L452'></a><a href='#L452'>452</a>
-<a name='L453'></a><a href='#L453'>453</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L453'></a><a href='#L453'>453</a>
+<a name='L454'></a><a href='#L454'>454</a>
+<a name='L455'></a><a href='#L455'>455</a>
+<a name='L456'></a><a href='#L456'>456</a>
+<a name='L457'></a><a href='#L457'>457</a>
+<a name='L458'></a><a href='#L458'>458</a>
+<a name='L459'></a><a href='#L459'>459</a>
+<a name='L460'></a><a href='#L460'>460</a>
+<a name='L461'></a><a href='#L461'>461</a>
+<a name='L462'></a><a href='#L462'>462</a>
+<a name='L463'></a><a href='#L463'>463</a>
+<a name='L464'></a><a href='#L464'>464</a>
+<a name='L465'></a><a href='#L465'>465</a>
+<a name='L466'></a><a href='#L466'>466</a>
+<a name='L467'></a><a href='#L467'>467</a>
+<a name='L468'></a><a href='#L468'>468</a>
+<a name='L469'></a><a href='#L469'>469</a>
+<a name='L470'></a><a href='#L470'>470</a>
+<a name='L471'></a><a href='#L471'>471</a>
+<a name='L472'></a><a href='#L472'>472</a>
+<a name='L473'></a><a href='#L473'>473</a>
+<a name='L474'></a><a href='#L474'>474</a>
+<a name='L475'></a><a href='#L475'>475</a>
+<a name='L476'></a><a href='#L476'>476</a>
+<a name='L477'></a><a href='#L477'>477</a>
+<a name='L478'></a><a href='#L478'>478</a>
+<a name='L479'></a><a href='#L479'>479</a>
+<a name='L480'></a><a href='#L480'>480</a>
+<a name='L481'></a><a href='#L481'>481</a>
+<a name='L482'></a><a href='#L482'>482</a>
+<a name='L483'></a><a href='#L483'>483</a>
+<a name='L484'></a><a href='#L484'>484</a>
+<a name='L485'></a><a href='#L485'>485</a>
+<a name='L486'></a><a href='#L486'>486</a>
+<a name='L487'></a><a href='#L487'>487</a></td><td class="line-coverage quiet"><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-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -524,10 +560,26 @@
 <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-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-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>
+<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>
@@ -545,6 +597,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>
@@ -588,6 +641,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-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
@@ -719,6 +773,10 @@
 <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-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -821,19 +879,22 @@
 <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-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-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-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-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-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -850,16 +911,23 @@
 <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-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-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-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>
@@ -967,10 +1035,27 @@
 <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 { v4 as uuidv4 } from 'uuid';
-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 { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 &nbsp;
+const operatorMap = {
+  '&amp;&amp;': 'and',
+  '||': 'or',
+  '+': 'add',
+  '-': 'minus',
+  '*': 'multiply',
+  '/': 'divide',
+  '%': 'remainder',
+  // '==': 'equal',
+  // '!=': 'notEqual',
+  '==': 'isEqual',
+  '!=': 'isNotEqual',
+  '&gt;': 'greaterThan',
+  '&lt;': 'lessThan',
+  '&gt;=': 'greaterThanOrEqual',
+  '&lt;=': 'lessThanOrEqual',
+};
+&nbsp;
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -979,6 +1064,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, className } from '../decorators';
 &nbsp;
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import LogicItem from './LogicItem__';
 &nbsp;
@@ -995,6 +1081,7 @@ export class BinaryExpression extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'BinaryExpression';
 &nbsp;
@@ -1040,7 +1127,8 @@ export class BinaryExpression extends LogicItem {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial&lt;BinaryExpression&gt;) {
-    source = { ...BinaryExpression.getDefaultOptions(), ...source};
+    // source = Object.assign({}, BinaryExpression.getDefaultOptions(), source);
+    source = { ...BinaryExpression.getDefaultOptions(), ...source };
     super(source);
     super.subConstructor(source);
   }
@@ -1127,7 +1215,7 @@ export class BinaryExpression extends LogicItem {
 <span class="cstat-no" title="statement not covered" >    if (typeof options === 'string') {</span>
 <span class="cstat-no" title="statement not covered" >      left = this.left;</span>
 <span class="cstat-no" title="statement not covered" >      if (!left) {</span>
-<span class="cstat-no" title="statement not covered" >        throw new Error(`找不到逻辑项 ${  options}`);</span>
+<span class="cstat-no" title="statement not covered" >        throw new Error(`找不到逻辑项 ${options}`);</span>
       }
     } else {
 <span class="cstat-no" title="statement not covered" >      left = options;</span>
@@ -1152,7 +1240,7 @@ export class BinaryExpression extends LogicItem {
 <span class="cstat-no" title="statement not covered" >    if (typeof options === 'string') {</span>
 <span class="cstat-no" title="statement not covered" >      right = this.right;</span>
 <span class="cstat-no" title="statement not covered" >      if (!right) {</span>
-<span class="cstat-no" title="statement not covered" >        throw new Error(`找不到逻辑项 ${  options}`);</span>
+<span class="cstat-no" title="statement not covered" >        throw new Error(`找不到逻辑项 ${options}`);</span>
       }
     } else {
 <span class="cstat-no" title="statement not covered" >      right = options;</span>
@@ -1161,7 +1249,7 @@ export class BinaryExpression extends LogicItem {
   }
 &nbsp;
 <span class="fstat-no" title="function not covered" >  __removeLogicItem(</span>logicItem: LogicItem) {
-    const {parentKey} = <span class="cstat-no" title="statement not covered" >logicItem;</span>
+    const { parentKey } = <span class="cstat-no" title="statement not covered" >logicItem;</span>
     const params: Params = <span class="cstat-no" title="statement not covered" >{</span>
       parentNode: this,
       parentKey,
@@ -1171,11 +1259,15 @@ export class BinaryExpression 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>
+        const index = (<span class="cstat-no" title="statement not covered" >t as any)[parentKey].indexOf(n);</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>
+      } else <span class="cstat-no" title="statement not covered" >if ((t as any)[parentKey] === 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>
       }
@@ -1273,20 +1365,23 @@ export class BinaryExpression extends LogicItem {
     //    code += right;
     //    code += ')';
     //    return code;
-&nbsp;
-<span class="cstat-no" title="statement not covered" >    if (['+', '-', '*', '/'].includes(this.operator)) {</span>
-      const operatorMap: any = <span class="cstat-no" title="statement not covered" >{</span>
-        '+': 'add',
-        '-': 'minus',
-        '*': 'multiply',
-        '/': 'divide',
-      };
+    const getOperatorCode = <span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >(c</span>ode: string,) =&gt; {</span>
 <span class="cstat-no" title="statement not covered" >      code += `this.$global.${operatorMap[this.operator as keyof typeof operatorMap]}(`;</span>
 <span class="cstat-no" title="statement not covered" >      code += left;</span>
 <span class="cstat-no" title="statement not covered" >      code += `,`;</span>
 <span class="cstat-no" title="statement not covered" >      code += right;</span>
 <span class="cstat-no" title="statement not covered" >      code += ')';</span>
-<span class="cstat-no" title="statement not covered" >      return code;</span>
+<span class="cstat-no" title="statement not covered" >      return code</span>
+    }
+<span class="cstat-no" title="statement not covered" >    if (['+', '-', '*', '/', '%'].includes(this.operator)) {</span>
+      // 之前一年都没有 % 取模 操作符的处理 本次补上
+      // code += `this.$global.${operatorMap[this.operator as keyof typeof operatorMap]}(`;
+      // code += left;
+      // code += `,`;
+      // code += right;
+      // code += ')';
+      // return code
+<span class="cstat-no" title="statement not covered" >      return getOperatorCode(code);</span>
     }
 <span class="cstat-no" title="statement not covered" >    if (['&gt;', '&gt;=', '&lt;', '&lt;='].includes(this.operator)) {</span>
       const leftType = <span class="cstat-no" title="statement not covered" >this.left?.getCurrentAnnotatedJSON();</span>
@@ -1302,14 +1397,21 @@ export class BinaryExpression extends LogicItem {
 <span class="cstat-no" title="statement not covered" >          code += ` ${this.operator} `;</span>
 <span class="cstat-no" title="statement not covered" >          code += `Date.parse(${right})`;</span>
         } else {
+          // code += `(${left})`;
+          // code += ` ${this.operator} `;
+          // code += `(${right})`;
+<span class="cstat-no" title="statement not covered" >          code = getOperatorCode(code);</span>
+&nbsp;
+        }
+      } else {
+<span class="cstat-no" title="statement not covered" >        if (['==', '!=',].includes(this.operator)) {</span>
+<span class="cstat-no" title="statement not covered" >          code = getOperatorCode(code);</span>
+        } else {
 <span class="cstat-no" title="statement not covered" >          code += `(${left})`;</span>
 <span class="cstat-no" title="statement not covered" >          code += ` ${this.operator} `;</span>
 <span class="cstat-no" title="statement not covered" >          code += `(${right})`;</span>
         }
-      } else {
-<span class="cstat-no" title="statement not covered" >        code += `(${left})`;</span>
-<span class="cstat-no" title="statement not covered" >        code += ` ${this.operator} `;</span>
-<span class="cstat-no" title="statement not covered" >        code += `(${right})`;</span>
+&nbsp;
       }
 &nbsp;
 <span class="cstat-no" title="statement not covered" >      return code;</span>
@@ -1408,7 +1510,7 @@ export class BinaryExpression extends LogicItem {
 <span class="cstat-no" title="statement not covered" >    return code;</span>
   }
 &nbsp;
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================
@@ -1426,7 +1528,7 @@ export default BinaryExpression;
             <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-10-31T12:16:02.007Z
             </div>
         <script src="../../prettify.js"></script>
         <script>