@lcap/nasl 3.3.3-beta.8 → 3.3.5-beta.1

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

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">20.52% </span>
+                <span class="strong">20.13% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>63/307</span>
+                <span class='fraction'>61/303</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">17.78% </span>
+                <span class="strong">18.07% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>45/253</span>
+                <span class='fraction'>45/249</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">15.55% </span>
+                <span class="strong">15.9% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>7/45</span>
+                <span class='fraction'>7/44</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">19.66% </span>
+                <span class="strong">19.19% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>59/300</span>
+                <span class='fraction'>57/297</span>
             </div>
         
             
@@ -866,23 +866,7 @@
 <a name='L801'></a><a href='#L801'>801</a>
 <a name='L802'></a><a href='#L802'>802</a>
 <a name='L803'></a><a href='#L803'>803</a>
-<a name='L804'></a><a href='#L804'>804</a>
-<a name='L805'></a><a href='#L805'>805</a>
-<a name='L806'></a><a href='#L806'>806</a>
-<a name='L807'></a><a href='#L807'>807</a>
-<a name='L808'></a><a href='#L808'>808</a>
-<a name='L809'></a><a href='#L809'>809</a>
-<a name='L810'></a><a href='#L810'>810</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-neutral">&nbsp;</span>
+<a name='L804'></a><a href='#L804'>804</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-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
@@ -925,6 +909,8 @@
 <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>
@@ -937,6 +923,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-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">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1104,18 +1094,14 @@
 <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>
@@ -1570,7 +1556,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1594,6 +1580,7 @@
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">11x</span>
@@ -1604,6 +1591,7 @@
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1681,17 +1669,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></td><td class="text"><pre class="prettyprint lang-js">import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
-import {
-  TranslatorState,
-  shiftState,
-  withSourceMap,
-  indent,
-  createCompilerState,
-  withSourceMapGenerator,
-  withGenerator,
-  TranslatorGenerator,
-} from '../translator';
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import TypeAnnotation, { isUnion } from './TypeAnnotation__';
 import BooleanLiteral from './BooleanLiteral__';
 import MemberExpression from './MemberExpression__';
@@ -1732,7 +1710,9 @@ export class Match extends LogicItem {
   /**
    * 逻辑项
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   expression!: LogicItem;
 &nbsp;
@@ -1745,7 +1725,11 @@ export class Match extends LogicItem {
   /**
    * 匹配分支列表
    */
-  @property('MatchCase')
+  @property({
+    objectRef: 'MatchCase',
+    isArray: true,
+    defaultValue: [],
+  })
   cases: Array&lt;MatchCase&gt; = [];
 &nbsp;
   /**
@@ -1913,16 +1897,12 @@ export class Match extends LogicItem {
       // @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>
+        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 {
-        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>
-        }
+      } 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>
       }
     }
 <span class="cstat-no" title="statement not covered" >    return params;</span>
@@ -2376,25 +2356,25 @@ export class Match extends LogicItem {
     return code;
   }
 &nbsp;
-  @withSourceMapGenerator
-  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
-    const self = this;
+  @withSourceMap()
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
-    if (self.parentNode.concept === 'Logic') {
+&nbsp;
+    if (this.parentNode.concept === 'Logic') {
       code += '\n';
     }
     code += indent(state?.tabSize || 0);
     code += '(() =&gt; { \n';
     let parentCode: string;
-    <span class="missing-if-branch" title="else path not taken" >E</span>if (self.expression) {
+    <span class="missing-if-branch" title="else path not taken" >E</span>if (this.expression) {
       code += indent(state?.tabSize || 0);
       // Identifier会使用自己本身的类型，来推导，因为右侧放的内容关系关系到内部类型推断
-      <span class="missing-if-branch" title="else path not taken" >E</span>if (self.expression instanceof Identifier || <span class="branch-1 cbranch-no" title="branch not covered" >self.expression instanceof MemberExpression)</span> {
-        code += parentCode = yield* self.expression.toEmbeddedTS(shiftState(state, code));
+      <span class="missing-if-branch" title="else path not taken" >E</span>if (this.expression instanceof Identifier || <span class="branch-1 cbranch-no" title="branch not covered" >this.expression instanceof MemberExpression)</span> {
+        code += parentCode = this.expression.toEmbeddedTS(shiftState(state, code));
       } else {
 <span class="cstat-no" title="statement not covered" >        parentCode = '__matchExpression';</span>
 <span class="cstat-no" title="statement not covered" >        code += `let ${parentCode} = `;</span>
-<span class="cstat-no" title="statement not covered" >        code += yield* self.expression.toEmbeddedTS(shiftState(state, code));</span>
+<span class="cstat-no" title="statement not covered" >        code += this.expression.toEmbeddedTS(shiftState(state, code));</span>
       }
       code += ';\n';
     } else {
@@ -2402,10 +2382,11 @@ export class Match extends LogicItem {
     }
     code += indent(state?.tabSize + 1 || <span class="branch-1 cbranch-no" title="branch not covered" >0)</span>;
     code += ' function __MatchExpressionFuntion() {\n';
+&nbsp;
     //  最后一项是else
-    yield* wrapForEach(self.cases, function* warpForEachGenerator(item, index) {
+    this.cases.forEach((item, index) =&gt; {
       // 如果是最后一项
-      code += yield* item.toEmbeddedTS(shiftState(state, code, { tabSize: state?.tabSize || 0 }), index, parentCode);
+      code += item.toEmbeddedTS(shiftState(state, code, { tabSize: state?.tabSize || 0 }), index, parentCode);
     });
     code += indent(state?.tabSize || 0);
     code += '};\n';
@@ -2413,19 +2394,20 @@ export class Match extends LogicItem {
     code += 'return __MatchExpressionFuntion();\n';
     code += indent(state?.tabSize || 0);
     code += '})()';
+&nbsp;
     if (
-      self.parentNode.concept !== 'Argument' &amp;&amp;
-      self.parentKey !== 'test' &amp;&amp;
-      self.parentKey !== 'patterns' &amp;&amp;
-      self.parentNode.concept !== 'Assignment' &amp;&amp;
-      self.parentNode.concept !== 'ForEachStatement' &amp;&amp;
-      self.parentNode.concept !== 'SelectMembers' &amp;&amp;
-      self.parentNode.concept !== 'UnaryExpression' &amp;&amp;
-      self.parentNode.concept !== 'BinaryExpression' &amp;&amp;
-      self.parentNode.concept !== 'StringInterpolation' &amp;&amp;
-      self.parentNode.concept !== 'MemberExpression' &amp;&amp;
-      !['NewMap', 'NewList'].includes(self.parentNode.concept) &amp;&amp;
-      self.parentKey !== 'returnExpression'
+      this.parentNode.concept !== 'Argument' &amp;&amp;
+      this.parentKey !== 'test' &amp;&amp;
+      this.parentKey !== 'patterns' &amp;&amp;
+      this.parentNode.concept !== 'Assignment' &amp;&amp;
+      this.parentNode.concept !== 'ForEachStatement' &amp;&amp;
+      this.parentNode.concept !== 'SelectMembers' &amp;&amp;
+      this.parentNode.concept !== 'UnaryExpression' &amp;&amp;
+      this.parentNode.concept !== 'BinaryExpression' &amp;&amp;
+      this.parentNode.concept !== 'StringInterpolation' &amp;&amp;
+      this.parentNode.concept !== 'MemberExpression' &amp;&amp;
+      !['NewMap', 'NewList'].includes(this.parentNode.concept) &amp;&amp;
+      this.parentKey !== 'returnExpression'
     ) {
       code += ';\n';
     }
@@ -2497,7 +2479,7 @@ export default Match;
             <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-11-18T16:22:11.588Z
+                at 2023-10-27T11:50:55.546Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">43.14% </span>
+                <span class="strong">43.03% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>107/248</span>
+                <span class='fraction'>105/244</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">36.14% </span>
+                <span class="strong">35.37% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>90/249</span>
+                <span class='fraction'>81/229</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">29.16% </span>
+                <span class="strong">30.43% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>7/24</span>
+                <span class='fraction'>7/23</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">43.38% </span>
+                <span class="strong">43.09% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>105/242</span>
+                <span class='fraction'>103/239</span>
             </div>
         
             
@@ -616,28 +616,7 @@
 <a name='L551'></a><a href='#L551'>551</a>
 <a name='L552'></a><a href='#L552'>552</a>
 <a name='L553'></a><a href='#L553'>553</a>
-<a name='L554'></a><a href='#L554'>554</a>
-<a name='L555'></a><a href='#L555'>555</a>
-<a name='L556'></a><a href='#L556'>556</a>
-<a name='L557'></a><a href='#L557'>557</a>
-<a name='L558'></a><a href='#L558'>558</a>
-<a name='L559'></a><a href='#L559'>559</a>
-<a name='L560'></a><a href='#L560'>560</a>
-<a name='L561'></a><a href='#L561'>561</a>
-<a name='L562'></a><a href='#L562'>562</a>
-<a name='L563'></a><a href='#L563'>563</a>
-<a name='L564'></a><a href='#L564'>564</a>
-<a name='L565'></a><a href='#L565'>565</a>
-<a name='L566'></a><a href='#L566'>566</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>
+<a name='L554'></a><a href='#L554'>554</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>
@@ -688,6 +667,8 @@
 <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>
@@ -695,6 +676,8 @@
 <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>
@@ -776,18 +759,14 @@
 <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>
@@ -1089,9 +1068,6 @@
 <span class="cline-any cline-yes">78x</span>
 <span class="cline-any cline-yes">78x</span>
 <span class="cline-any cline-yes">78x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">78x</span>
 <span class="cline-any cline-yes">78x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1193,16 +1169,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></td><td class="text"><pre class="prettyprint lang-js">import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
-import {
-  TranslatorState,
-  shiftState,
-  withSourceMap,
-  createCompilerState,
-  withSourceMapGenerator,
-  withGenerator,
-  TranslatorGenerator,
-} 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 { Enum, TypeAnnotation } from '..';
 import { ElementToVueOptions } from './ViewElement__';
 import Identifier from './Identifier__';
@@ -1251,14 +1218,18 @@ export class MemberExpression extends LogicItem {
   /**
    * 逻辑项
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   object!: LogicItem;
 &nbsp;
   /**
    * 逻辑项
    */
-  @property('LogicItem')
+  @property({
+    objectRef: 'LogicItem',
+  })
   // @ts-ignore
   property!: LogicItem;
 &nbsp;
@@ -1341,16 +1312,12 @@ export class MemberExpression extends LogicItem {
       // @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>
+        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 {
-        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>
-        }
+      } 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>
       }
     }
 <span class="cstat-no" title="statement not covered" >    return params;</span>
@@ -1384,7 +1351,7 @@ export class MemberExpression extends LogicItem {
       this.object?.namespace?.endsWith('.property')
     ) {
       let elementName = '';
-      <span class="missing-if-branch" title="if path not taken" >I</span>if (this.object?.namespace?.startsWith('elements.$ce')) {
+      <span class="missing-if-branch" title="if path not taken" >I</span>if (this.object.namespace.startsWith('elements.$ce')) {
 <span class="cstat-no" title="statement not covered" >        elementName = this.getAncestor('ViewElement')?.name;</span>
       } else {
         elementName = this.object.name;
@@ -1394,9 +1361,9 @@ export class MemberExpression extends LogicItem {
       }
       let propertyName = '';
       let subProperty = '';
-      <span class="missing-if-branch" title="else path not taken" >E</span>if (this.property instanceof Identifier &amp;&amp; this.property?.namespace) {
-        const namespace = this.property?.namespace ?? <span class="branch-1 cbranch-no" title="branch not covered" >'';</span>
-        const namespaceList = namespace?.includes('.') ? <span class="branch-0 cbranch-no" title="branch not covered" >namespace?.split('.') </span>: [namespace];
+      <span class="missing-if-branch" title="else path not taken" >E</span>if (this.property instanceof Identifier) {
+        const namespace = this.property.namespace;
+        const namespaceList = namespace.includes('.') ? <span class="branch-0 cbranch-no" title="branch not covered" >namespace.split('.') </span>: [namespace];
         propertyName = namespaceList[0];
         subProperty = namespaceList?.[1] ? <span class="branch-0 cbranch-no" title="branch not covered" >`?.()['${namespaceList?.[1]}']` </span>: '';
       }
@@ -1480,7 +1447,7 @@ export class MemberExpression extends LogicItem {
       this.object?.namespace?.endsWith('.property')
     ) {
       let elementName = '';
-      <span class="missing-if-branch" title="if path not taken" >I</span>if (this.object?.namespace.startsWith('elements.$ce')) {
+      <span class="missing-if-branch" title="if path not taken" >I</span>if (this.object.namespace.startsWith('elements.$ce')) {
 <span class="cstat-no" title="statement not covered" >        elementName = this.getAncestor('ViewElement')?.name;</span>
       } else {
         elementName = this.object.name;
@@ -1490,9 +1457,9 @@ export class MemberExpression extends LogicItem {
       }
       let propertyName = '';
       let subProperty = '';
-      <span class="missing-if-branch" title="else path not taken" >E</span>if (this.property instanceof Identifier &amp;&amp; this.property?.namespace) {
-        const namespace = this.property?.namespace ?? <span class="branch-1 cbranch-no" title="branch not covered" >'';</span>
-        const namespaceList = namespace?.includes('.') ? <span class="branch-0 cbranch-no" title="branch not covered" >namespace?.split('.') </span>: [namespace];
+      <span class="missing-if-branch" title="else path not taken" >E</span>if (this.property instanceof Identifier) {
+        const namespace = this.property.namespace;
+        const namespaceList = namespace.includes('.') ? <span class="branch-0 cbranch-no" title="branch not covered" >namespace.split('.') </span>: [namespace];
         propertyName = namespaceList[0];
         subProperty = namespaceList?.[1] ? <span class="branch-0 cbranch-no" title="branch not covered" >`?.()['${namespaceList?.[1]}']` </span>: '';
       }
@@ -1649,15 +1616,12 @@ export class MemberExpression extends LogicItem {
    * @param state
    * @returns
    */
-  @withSourceMapGenerator
-  *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
-    const self = this;
+  @withSourceMap()
+  toEmbeddedTS(state = createCompilerState()): string {
     let code = '';
-    const leftCode = self.object
-      ? `${yield* self.object.toEmbeddedTS(shiftState(state, code, { inline: true }))}.`
-      : <span class="branch-1 cbranch-no" title="branch not covered" >'';</span>
-    code += self.object ? `${yield* self.object.toEmbeddedTS(shiftState(state, code, { inline: true }))}.` : <span class="branch-1 cbranch-no" title="branch not covered" >'';</span>
-    code += self.property ? yield* self.property.toEmbeddedTS(shiftState(state, code, { inline: true })) : <span class="branch-1 cbranch-no" title="branch not covered" >'';</span>
+    const leftCode = this.object ? `${this.object.toEmbeddedTS(shiftState(state, code, { inline: true }))}.` : <span class="branch-1 cbranch-no" title="branch not covered" >'';</span>
+    code += this.object ? `${this.object.toEmbeddedTS(shiftState(state, code, { inline: true }))}.` : <span class="branch-1 cbranch-no" title="branch not covered" >'';</span>
+    code += this.property ? this.property.toEmbeddedTS(shiftState(state, code, { inline: true })) : <span class="branch-1 cbranch-no" title="branch not covered" >'';</span>
     // 就说明这是一个枚举取值操作，直接啊app.enums.color.red 要转成字符串
     // 解决枚举可能全是数字的问题
     // app.enums.color  || extensions.tool.enums.color
@@ -1667,27 +1631,27 @@ export class MemberExpression extends LogicItem {
       code = newCode;
     }
     if (
-      self.object instanceof Identifier &amp;&amp;
-      self.object?.namespace?.startsWith('elements.') &amp;&amp;
-      self.object?.namespace?.endsWith('.property')
+      this.object instanceof Identifier &amp;&amp;
+      this.object?.namespace?.startsWith('elements.') &amp;&amp;
+      this.object?.namespace?.endsWith('.property')
     ) {
       let newCode = '';
-      <span class="missing-if-branch" title="if path not taken" >I</span>if (self.object?.namespace?.startsWith('elements.$ce')) {
-        const elementName = <span class="cstat-no" title="statement not covered" >self.getAncestor('ViewElement')?.name;</span>
+      <span class="missing-if-branch" title="if path not taken" >I</span>if (this.object?.namespace?.startsWith('elements.$ce')) {
+        const elementName = <span class="cstat-no" title="statement not covered" >this.getAncestor('ViewElement')?.name;</span>
 <span class="cstat-no" title="statement not covered" >        newCode += `__elements_completionProperty.${elementName}`;</span>
-<span class="cstat-no" title="statement not covered" >        if (self.property instanceof Identifier &amp;&amp; self.property?.namespace) {</span>
-          const namespace = <span class="cstat-no" title="statement not covered" >self.property?.namespace ?? '';</span>
-          const namespaceList = <span class="cstat-no" title="statement not covered" >namespace?.includes('.') ? namespace?.split('.') : [namespace];</span>
-<span class="cstat-no" title="statement not covered" >          yield* wrapForEach(namespaceList, function* <span class="fstat-no" title="function not covered" >warpForEachGenerator(</span>item) {</span>
+<span class="cstat-no" title="statement not covered" >        if (this.property instanceof Identifier) {</span>
+          const namespace = <span class="cstat-no" title="statement not covered" >this.property.namespace;</span>
+          const namespaceList = <span class="cstat-no" title="statement not covered" >namespace.includes('.') ? namespace.split('.') : [namespace];</span>
+<span class="cstat-no" title="statement not covered" >          namespaceList.forEach(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; {</span>
 <span class="cstat-no" title="statement not covered" >            newCode += `.${attrConvertCamelCase(item)}`;</span>
           });
         }
       } else {
-        newCode += `__elements_completionProperty.${self.object?.name}`;
-        <span class="missing-if-branch" title="else path not taken" >E</span>if (self.property instanceof Identifier &amp;&amp; self.property?.namespace) {
-          const namespace = self.property?.namespace ?? <span class="branch-1 cbranch-no" title="branch not covered" >'';</span>
-          const namespaceList = namespace?.includes('.') ? <span class="branch-0 cbranch-no" title="branch not covered" >namespace?.split('.') </span>: [namespace];
-          yield* wrapForEach(namespaceList, function* warpForEachGenerator(item) {
+        newCode += `__elements_completionProperty.${this.object?.name}`;
+        <span class="missing-if-branch" title="else path not taken" >E</span>if (this.property instanceof Identifier) {
+          const namespace = this.property.namespace;
+          const namespaceList = namespace.includes('.') ? <span class="branch-0 cbranch-no" title="branch not covered" >namespace.split('.') </span>: [namespace];
+          namespaceList.forEach((item) =&gt; {
             newCode += `.${attrConvertCamelCase(item)}`;
           });
         }
@@ -1695,17 +1659,17 @@ export class MemberExpression extends LogicItem {
       return newCode;
     }
     if (
-      self.object instanceof MemberExpression &amp;&amp;
-      self.object?.object?.name === 'elements' &amp;&amp;
-      self.object?.property?.name === '$ce'
+      this.object instanceof MemberExpression &amp;&amp;
+      this.object?.object?.name === 'elements' &amp;&amp;
+      this.object?.property?.name === '$ce'
     ) {
       let newCode = '';
-      const elementName = self.getAncestor('ViewElement')?.name;
+      const elementName = this.getAncestor('ViewElement')?.name;
       newCode += `__elements_completionProperty['${elementName}']`;
-      <span class="missing-if-branch" title="else path not taken" >E</span>if (atrrParamsMap[self.property.name]) {
-        const name = atrrParamsMap[self.property.name];
+      <span class="missing-if-branch" title="else path not taken" >E</span>if (atrrParamsMap[this.property.name]) {
+        const name = atrrParamsMap[this.property.name];
         const nameList = name.includes('.') ? name.split('.') : [name];
-        yield* wrapForEach(nameList, function* warpForEachGenerator(item) {
+        nameList.forEach((item) =&gt; {
           newCode += `.${attrConvertCamelCase(item)}`;
         });
       }
@@ -1765,7 +1729,7 @@ export default MemberExpression;
             <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-11-18T16:22:11.588Z
+                at 2023-10-27T11:50:55.546Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -424,7 +424,7 @@ export default MicroApp;
             <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-11-18T16:22:11.588Z
+                at 2023-10-27T11:50:55.546Z
             </div>
         <script src="../../prettify.js"></script>
         <script>