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

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

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">15.48% </span>
+                <span class="strong">15.42% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>107/691</span>
+                <span class='fraction'>108/700</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">8.27% </span>
+                <span class="strong">7.86% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>25/302</span>
+                <span class='fraction'>25/318</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">15.03% </span>
+                <span class="strong">14.97% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>95/632</span>
+                <span class='fraction'>96/641</span>
             </div>
         
             
@@ -1611,7 +1611,29 @@
 <a name='L1546'></a><a href='#L1546'>1546</a>
 <a name='L1547'></a><a href='#L1547'>1547</a>
 <a name='L1548'></a><a href='#L1548'>1548</a>
-<a name='L1549'></a><a href='#L1549'>1549</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
+<a name='L1549'></a><a href='#L1549'>1549</a>
+<a name='L1550'></a><a href='#L1550'>1550</a>
+<a name='L1551'></a><a href='#L1551'>1551</a>
+<a name='L1552'></a><a href='#L1552'>1552</a>
+<a name='L1553'></a><a href='#L1553'>1553</a>
+<a name='L1554'></a><a href='#L1554'>1554</a>
+<a name='L1555'></a><a href='#L1555'>1555</a>
+<a name='L1556'></a><a href='#L1556'>1556</a>
+<a name='L1557'></a><a href='#L1557'>1557</a>
+<a name='L1558'></a><a href='#L1558'>1558</a>
+<a name='L1559'></a><a href='#L1559'>1559</a>
+<a name='L1560'></a><a href='#L1560'>1560</a>
+<a name='L1561'></a><a href='#L1561'>1561</a>
+<a name='L1562'></a><a href='#L1562'>1562</a>
+<a name='L1563'></a><a href='#L1563'>1563</a>
+<a name='L1564'></a><a href='#L1564'>1564</a>
+<a name='L1565'></a><a href='#L1565'>1565</a>
+<a name='L1566'></a><a href='#L1566'>1566</a>
+<a name='L1567'></a><a href='#L1567'>1567</a>
+<a name='L1568'></a><a href='#L1568'>1568</a>
+<a name='L1569'></a><a href='#L1569'>1569</a>
+<a name='L1570'></a><a href='#L1570'>1570</a>
+<a name='L1571'></a><a href='#L1571'>1571</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>
@@ -1650,6 +1672,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>
@@ -2291,6 +2314,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>
@@ -2339,6 +2366,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>
@@ -2387,6 +2418,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>
@@ -2435,6 +2470,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>
@@ -2705,6 +2744,7 @@
 <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>
@@ -2752,6 +2792,7 @@
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</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">6x</span>
@@ -2980,6 +3021,9 @@
 <span class="cline-any cline-yes">1x</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-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -3196,6 +3240,7 @@ export class NewComposite extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'NewComposite';
 &nbsp;
@@ -3839,11 +3884,15 @@ export class NewComposite 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(typeAnnotation);</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" >typeAnnotation.__v_raw || typeAnnotation;</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] === typeAnnotation) {</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>
       }
@@ -3887,11 +3936,15 @@ export class NewComposite 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>
       }
@@ -3935,11 +3988,15 @@ export class NewComposite 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>
       }
@@ -3983,11 +4040,15 @@ export class NewComposite 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>
       }
@@ -4171,7 +4232,7 @@ export class NewComposite extends LogicItem {
     });
     const selectMember = <span class="cstat-no" title="statement not covered" >oldNode.parentNode;</span>
     const autoConnectionIndex = <span class="cstat-no" title="statement not covered" >this.rights.findIndex(<span class="fstat-no" title="function not covered" >(r</span>ight) =&gt; <span class="cstat-no" title="statement not covered" >right === selectMember)</span>;</span>
-    const newSelectMember = <span class="cstat-no" title="statement not covered" >{ ...selectMember?.toJSON?.() ?? selectMember, expression, members };</span>
+    const newSelectMember = <span class="cstat-no" title="statement not covered" >{ ...(selectMember?.toJSON?.() ?? selectMember), expression, members };</span>
     const splitIndex = <span class="cstat-no" title="statement not covered" >this.rights.findIndex(<span class="fstat-no" title="function not covered" >(r</span>ight) =&gt; <span class="cstat-no" title="statement not covered" >selectMember === right)</span>;</span>
     const newLines: AssignmentLine[] = <span class="cstat-no" title="statement not covered" >this.assignmentLines.filter(<span class="fstat-no" title="function not covered" >({</span> rightIndex }) =&gt; <span class="cstat-no" title="statement not covered" >rightIndex[0] !== splitIndex)</span>;</span>
     let oldLines: AssignmentLine[] = <span class="cstat-no" title="statement not covered" >this.assignmentLines.filter(<span class="fstat-no" title="function not covered" >({</span> rightIndex }) =&gt; <span class="cstat-no" title="statement not covered" >rightIndex[0] === splitIndex)</span>;</span>
@@ -4180,7 +4241,7 @@ export class NewComposite extends LogicItem {
 <span class="cstat-no" title="statement not covered" >      if (keepMembers?.has(item.completeName)) {</span>
         const lines = <span class="cstat-no" title="statement not covered" >this.findlines(item, selectMember);</span>
 <span class="cstat-no" title="statement not covered" >        lines.forEach(<span class="fstat-no" title="function not covered" >(l</span>ine) =&gt; {</span>
-          const newLine = <span class="cstat-no" title="statement not covered" >{ ...line?.toJSON()?.toJSON?.() ?? line, rightIndex: [line.rightIndex[0], index] };</span>
+          const newLine = <span class="cstat-no" title="statement not covered" >{ ...(line?.toJSON()?.toJSON?.() ?? line), rightIndex: [line.rightIndex[0], index] };</span>
 <span class="cstat-no" title="statement not covered" >          newLines.push(newLine as AssignmentLine);</span>
 <span class="cstat-no" title="statement not covered" >          oldLines = oldLines.filter(<span class="fstat-no" title="function not covered" >({</span> leftIndex }) =&gt; <span class="cstat-no" title="statement not covered" >leftIndex[1] !== line.leftIndex[1])</span>;</span>
         });
@@ -4251,8 +4312,9 @@ export class NewComposite extends LogicItem {
           : this.rights[rightIndex[0]].expression;
 <span class="cstat-no" title="statement not covered" >      code += `return ${obj};\n`;</span>
     } else <span class="cstat-no" title="statement not covered" >if (typeAnnotation.typeKind !== 'anonymousStructure') {</span>
-<span class="cstat-no" title="statement not covered" >      code += `const obj = this.$genInitFromSchema('${typeAnnotation.sortedTypeKey</span>
-        }', this.$utils['New'](${typeAnnotation.toUI(shiftState(state, code, { inline: true }))}));\n`;
+<span class="cstat-no" title="statement not covered" >      code += `const obj = this.$genInitFromSchema('${</span>
+        typeAnnotation.sortedTypeKey
+      }', this.$utils['New'](${typeAnnotation.toUI(shiftState(state, code, { inline: true }))}));\n`;
 <span class="cstat-no" title="statement not covered" >      this.assignmentLines.forEach(<span class="fstat-no" title="function not covered" >({</span> leftIndex, rightIndex }, index) =&gt; {</span>
         const leftSecondIndex = <span class="cstat-no" title="statement not covered" >leftIndex[1];</span>
         const [rightFirst, rightSecond] = <span class="cstat-no" title="statement not covered" >[rightIndex[0], rightIndex[1]];</span>
@@ -4298,8 +4360,9 @@ export class NewComposite extends LogicItem {
           : this.rights[rightIndex[0]].expression;
 <span class="cstat-no" title="statement not covered" >      code += `return ${obj.toJS(shiftState(state, code, { inline: true }))};\n`;</span>
     } else <span class="missing-if-branch" title="else path not taken" >E</span>if (typeAnnotation.typeKind !== 'anonymousStructure') {
-      code += `const obj = this.$genInitFromSchema('${typeAnnotation.sortedTypeKey
-        }', this.$utils['New'](${typeAnnotation.toJS(shiftState(state, code, { inline: true }))}));\n`;
+      code += `const obj = this.$genInitFromSchema('${
+        typeAnnotation.sortedTypeKey
+      }', this.$utils['New'](${typeAnnotation.toJS(shiftState(state, code, { inline: true }))}));\n`;
       const rightMap = new Map();
       this.assignmentLines.forEach(({ leftIndex, rightIndex }) =&gt; {
         const rightIndexJson = JSON.stringify(rightIndex);
@@ -4527,7 +4590,10 @@ export class NewComposite extends LogicItem {
   @withSourceMap()
 <span class="fstat-no" title="function not covered" >  toNaturalTS(</span>): string {
     let code = <span class="cstat-no" title="statement not covered" >'nasl.util.';</span>
-<span class="cstat-no" title="statement not covered" >    code += this?.typeAnnotation?.typeKind === 'anonymousStructure' ? 'NewAnonymityStructure' : `NewEntity&lt;${this?.typeAnnotation?.typeName || '__IDENTIFIER__'}&gt;`;</span>
+<span class="cstat-no" title="statement not covered" >    code +=</span>
+      this?.typeAnnotation?.typeKind === 'anonymousStructure'
+        ? 'NewAnonymityStructure'
+        : `NewEntity&lt;${this?.typeAnnotation?.typeName || '__IDENTIFIER__'}&gt;`;
     let params = <span class="cstat-no" title="statement not covered" >'';</span>
 <span class="cstat-no" title="statement not covered" >    this?.properties?.forEach(<span class="fstat-no" title="function not covered" >(i</span>tem, index) =&gt; {</span>
 <span class="cstat-no" title="statement not covered" >      if (item) {</span>
@@ -4714,7 +4780,7 @@ export default NewComposite;
             <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/NewList__.ts.html

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">8.96% </span>
+                <span class="strong">9.21% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>19/212</span>
+                <span class='fraction'>20/217</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/94</span>
+                <span class='fraction'>0/102</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">8.16% </span>
+                <span class="strong">8.45% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>16/196</span>
+                <span class='fraction'>17/201</span>
             </div>
         
             
@@ -574,7 +574,17 @@
 <a name='L509'></a><a href='#L509'>509</a>
 <a name='L510'></a><a href='#L510'>510</a>
 <a name='L511'></a><a href='#L511'>511</a>
-<a name='L512'></a><a href='#L512'>512</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
+<a name='L512'></a><a href='#L512'>512</a>
+<a name='L513'></a><a href='#L513'>513</a>
+<a name='L514'></a><a href='#L514'>514</a>
+<a name='L515'></a><a href='#L515'>515</a>
+<a name='L516'></a><a href='#L516'>516</a>
+<a name='L517'></a><a href='#L517'>517</a>
+<a name='L518'></a><a href='#L518'>518</a>
+<a name='L519'></a><a href='#L519'>519</a>
+<a name='L520'></a><a href='#L520'>520</a>
+<a name='L521'></a><a href='#L521'>521</a>
+<a name='L522'></a><a href='#L522'>522</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-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -605,6 +615,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>
@@ -848,6 +859,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>
@@ -896,6 +911,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>
@@ -1024,6 +1043,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</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>
@@ -1114,6 +1134,7 @@ export class NewList extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'NewList';
 &nbsp;
@@ -1359,11 +1380,15 @@ export class NewList 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(typeAnnotation);</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" >typeAnnotation.__v_raw || typeAnnotation;</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] === typeAnnotation) {</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>
       }
@@ -1407,11 +1432,15 @@ export class NewList 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>
       }
@@ -1535,7 +1564,8 @@ export class NewList extends LogicItem {
   @withSourceMap()
 <span class="fstat-no" title="function not covered" >  toNaturalTS(</span>state = <span class="branch-0 cbranch-no" title="branch not covered" >createCompilerState())</span>: string {
     let code = <span class="cstat-no" title="statement not covered" >'';</span>
-    const typeAnnotation = <span class="cstat-no" title="statement not covered" >this?.typeAnnotation?.typeArguments?.map(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; <span class="cstat-no" title="statement not covered" >item?.toNaturalTS())</span>?.join(', ') || '__IDENTIFIER__';</span>
+    const typeAnnotation =
+<span class="cstat-no" title="statement not covered" >      this?.typeAnnotation?.typeArguments?.map(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; <span class="cstat-no" title="statement not covered" >item?.toNaturalTS())</span>?.join(', ') || '__IDENTIFIER__';</span>
     let params = <span class="cstat-no" title="statement not covered" >'';</span>
 <span class="cstat-no" title="statement not covered" >    this?.items?.forEach(<span class="fstat-no" title="function not covered" >(i</span>tem, index) =&gt; {</span>
 <span class="cstat-no" title="statement not covered" >      if (item) {</span>
@@ -1603,7 +1633,7 @@ export default NewList;
             <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/NewMap__.ts.html

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">5.77% </span>
+                <span class="strong">6.02% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>16/277</span>
+                <span class='fraction'>17/282</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/129</span>
+                <span class='fraction'>0/137</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">5.46% </span>
+                <span class="strong">5.74% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>14/256</span>
+                <span class='fraction'>15/261</span>
             </div>
         
             
@@ -810,7 +810,17 @@
 <a name='L745'></a><a href='#L745'>745</a>
 <a name='L746'></a><a href='#L746'>746</a>
 <a name='L747'></a><a href='#L747'>747</a>
-<a name='L748'></a><a href='#L748'>748</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
+<a name='L748'></a><a href='#L748'>748</a>
+<a name='L749'></a><a href='#L749'>749</a>
+<a name='L750'></a><a href='#L750'>750</a>
+<a name='L751'></a><a href='#L751'>751</a>
+<a name='L752'></a><a href='#L752'>752</a>
+<a name='L753'></a><a href='#L753'>753</a>
+<a name='L754'></a><a href='#L754'>754</a>
+<a name='L755'></a><a href='#L755'>755</a>
+<a name='L756'></a><a href='#L756'>756</a>
+<a name='L757'></a><a href='#L757'>757</a>
+<a name='L758'></a><a href='#L758'>758</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>
@@ -842,6 +852,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>
@@ -1248,6 +1259,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>
@@ -1321,6 +1336,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>
@@ -1493,6 +1512,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</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>
@@ -1587,6 +1607,7 @@ export class NewMap extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'NewMap';
 &nbsp;
@@ -1995,11 +2016,15 @@ export class NewMap 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(typeAnnotation);</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" >typeAnnotation.__v_raw || typeAnnotation;</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] === typeAnnotation) {</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>
       }
@@ -2068,11 +2093,15 @@ export class NewMap 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>
       }
@@ -2240,7 +2269,8 @@ export class NewMap extends LogicItem {
   @withSourceMap()
 <span class="fstat-no" title="function not covered" >  toNaturalTS(</span>): string {
     let code = <span class="cstat-no" title="statement not covered" >'';</span>
-    const typeAnnotation = <span class="cstat-no" title="statement not covered" >this?.typeAnnotation?.typeArguments?.map(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; <span class="cstat-no" title="statement not covered" >item?.toNaturalTS())</span>?.join(', ') || '__IDENTIFIER__';</span>
+    const typeAnnotation =
+<span class="cstat-no" title="statement not covered" >      this?.typeAnnotation?.typeArguments?.map(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; <span class="cstat-no" title="statement not covered" >item?.toNaturalTS())</span>?.join(', ') || '__IDENTIFIER__';</span>
     let params = <span class="cstat-no" title="statement not covered" >'';</span>
 <span class="cstat-no" title="statement not covered" >    this?.keys?.forEach(<span class="fstat-no" title="function not covered" >(i</span>tem, index) =&gt; {</span>
 <span class="cstat-no" title="statement not covered" >      if (item) {</span>
@@ -2311,7 +2341,7 @@ export default NewMap;
             <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/New__.ts.html

@@ -274,7 +274,7 @@ export default New;
             <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>