@lcap/nasl 3.3.7-beta.3 → 3.3.7-beta.5

package/coverage/src/templator/genUpdateBlock.ts.html

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">6.83% </span>
+                <span class="strong">6.79% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>11/161</span>
+                <span class='fraction'>11/162</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">4.95% </span>
+                <span class="strong">4.85% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>5/101</span>
+                <span class='fraction'>5/103</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">6.57% </span>
+                <span class="strong">6.53% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>10/152</span>
+                <span class='fraction'>10/153</span>
             </div>
         
             
@@ -460,7 +460,8 @@
 <a name='L395'></a><a href='#L395'>395</a>
 <a name='L396'></a><a href='#L396'>396</a>
 <a name='L397'></a><a href='#L397'>397</a>
-<a name='L398'></a><a href='#L398'>398</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">124x</span>
+<a name='L398'></a><a href='#L398'>398</a>
+<a name='L399'></a><a href='#L399'>399</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">130x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
@@ -775,6 +776,7 @@
 <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-no">&nbsp;</span>
@@ -1166,7 +1168,8 @@ function <span class="fstat-no" title="function not covered" >genLoadLogic(g</sp
 &nbsp;
 // 生成修改区块
 export function <span class="fstat-no" title="function not covered" >genUpdateBlock(e</span>ntity: Entity, oldNode: ViewElement) {
-  const { view } = <span class="cstat-no" title="statement not covered" >oldNode;</span>
+  const likeComponent = <span class="cstat-no" title="statement not covered" >oldNode?.likeComponent;</span>
+  const isBusinessComponent = <span class="cstat-no" title="statement not covered" >likeComponent.concept === 'BusinessComponent';</span>
   const dataSource = <span class="cstat-no" title="statement not covered" >entity.parentNode as DataSource;</span>
   const module = <span class="cstat-no" title="statement not covered" >dataSource.app;</span>
   const { ns } = <span class="cstat-no" title="statement not covered" >entity;</span>
@@ -1174,11 +1177,11 @@ export function <span class="fstat-no" title="function not covered" >genUpdateBl
   const updateLogic = <span class="cstat-no" title="statement not covered" >ns?.logics?.find((<span class="fstat-no" title="function not covered" >logic) =&gt; <span class="cstat-no" title="statement not covered" >l</span>ogic.name === `update`)</span>;</span>
 &nbsp;
   const nameGroup: NameGroup = <span class="cstat-no" title="statement not covered" >{};</span>
-<span class="cstat-no" title="statement not covered" >  nameGroup.viewElementMainView = view.getViewElementUniqueName('form1');</span>
-<span class="cstat-no" title="statement not covered" >  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));</span>
-<span class="cstat-no" title="statement not covered" >  nameGroup.viewParamId = view.getParamUniqueName('id');</span>
-<span class="cstat-no" title="statement not covered" >  nameGroup.viewLogicLoad = view.getLogicUniqueName('load');</span>
-<span class="cstat-no" title="statement not covered" >  nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');</span>
+<span class="cstat-no" title="statement not covered" >  nameGroup.viewElementMainView = likeComponent.getViewElementUniqueName('form1');</span>
+<span class="cstat-no" title="statement not covered" >  nameGroup.viewVariableEntity = likeComponent.getVariableUniqueName(utils.firstLowerCase(entity.name));</span>
+<span class="cstat-no" title="statement not covered" >  nameGroup.viewParamId = likeComponent.getParamUniqueName('id');</span>
+<span class="cstat-no" title="statement not covered" >  nameGroup.viewLogicLoad = likeComponent.getLogicUniqueName('load');</span>
+<span class="cstat-no" title="statement not covered" >  nameGroup.viewLogicSubmit = likeComponent.getLogicUniqueName('submit');</span>
 &nbsp;
   // 收集所有和本实体关联的实体
   const selectNameGroupMap: Map&lt;string, NameGroup&gt; = <span class="cstat-no" title="statement not covered" >new Map();</span>
@@ -1191,8 +1194,8 @@ export function <span class="fstat-no" title="function not covered" >genUpdateBl
 <span class="cstat-no" title="statement not covered" >      if (relationEntity) {</span>
         const <span class="cstat-no" title="statement not covered" >displayedProperty = getFirstDisplayedProperty(relationEntity);</span>
 <span class="cstat-no" title="statement not covered" >        if (displayedProperty) {</span>
-          const viewElementSelect = <span class="cstat-no" title="statement not covered" >view.getViewElementUniqueName('select');</span>
-          const <span class="cstat-no" title="statement not covered" >selectNameGroup = genUniqueQueryNameGroup(module, view, viewElementSelect, false, relationEntity.name);</span>
+          const viewElementSelect = <span class="cstat-no" title="statement not covered" >likeComponent.getViewElementUniqueName('select');</span>
+          const <span class="cstat-no" title="statement not covered" >selectNameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementSelect, false, relationEntity.name);</span>
 <span class="cstat-no" title="statement not covered" >          selectNameGroup.viewElementSelect = viewElementSelect;</span>
           // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
           const key = <span class="cstat-no" title="statement not covered" >[property.name, relationEntity.name].join('-');</span>
@@ -1216,7 +1219,7 @@ export function <span class="fstat-no" title="function not covered" >genUpdateBl
 {
     "viewParams": [
         {
-            "concept": "Param",
+            "concept": "${isBusinessComponent ? 'ParamWithGroup' : 'Param'}",
             "name": "${nameGroup.viewParamId}",
             "typeAnnotation": ${JSON.stringify(NaslCoreTypeAnnotation.Long)}
         }
@@ -1261,7 +1264,7 @@ export default genUpdateBlock;
             <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-12-13T06:31:12.835Z
+                at 2023-12-20T14:01:00.156Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/src/templator/index.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">11.96% </span>
+                <span class="strong">11.11% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>175/1463</span>
+                <span class='fraction'>188/1692</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">8.76% </span>
+                <span class="strong">7.42% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>72/821</span>
+                <span class='fraction'>72/970</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">8.63% </span>
+                <span class="strong">7.63% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>19/220</span>
+                <span class='fraction'>19/249</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">11.73% </span>
+                <span class="strong">10.91% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>163/1389</span>
+                <span class='fraction'>176/1612</span>
             </div>
         
             
@@ -125,17 +125,17 @@
 
 <tr>
 	<td class="file low" data-value="genCurdMultipleKeyBlock.ts"><a href="genCurdMultipleKeyBlock.ts.html">genCurdMultipleKeyBlock.ts</a></td>
-	<td data-value="6.33" class="pic low">
-	<div class="chart"><div class="cover-fill" style="width: 6%"></div><div class="cover-empty" style="width: 94%"></div></div>
+	<td data-value="5.98" class="pic low">
+	<div class="chart"><div class="cover-fill" style="width: 5%"></div><div class="cover-empty" style="width: 95%"></div></div>
 	</td>
-	<td data-value="6.33" class="pct low">6.33%</td>
-	<td data-value="221" class="abs low">14/221</td>
-	<td data-value="4.2" class="pct low">4.2%</td>
-	<td data-value="119" class="abs low">5/119</td>
-	<td data-value="4.16" class="pct low">4.16%</td>
-	<td data-value="24" class="abs low">1/24</td>
-	<td data-value="6.51" class="pct low">6.51%</td>
-	<td data-value="215" class="abs low">14/215</td>
+	<td data-value="5.98" class="pct low">5.98%</td>
+	<td data-value="418" class="abs low">25/418</td>
+	<td data-value="2.05" class="pct low">2.05%</td>
+	<td data-value="243" class="abs low">5/243</td>
+	<td data-value="2.08" class="pct low">2.08%</td>
+	<td data-value="48" class="abs low">1/48</td>
+	<td data-value="6.15" class="pct low">6.15%</td>
+	<td data-value="406" class="abs low">25/406</td>
 	</tr>
 
 <tr>
@@ -170,17 +170,17 @@
 
 <tr>
 	<td class="file low" data-value="genGetBlock.ts"><a href="genGetBlock.ts.html">genGetBlock.ts</a></td>
-	<td data-value="27.77" class="pic low">
+	<td data-value="27.02" class="pic low">
 	<div class="chart"><div class="cover-fill" style="width: 27%"></div><div class="cover-empty" style="width: 73%"></div></div>
 	</td>
-	<td data-value="27.77" class="pct low">27.77%</td>
-	<td data-value="36" class="abs low">10/36</td>
-	<td data-value="45.45" class="pct low">45.45%</td>
-	<td data-value="11" class="abs low">5/11</td>
+	<td data-value="27.02" class="pct low">27.02%</td>
+	<td data-value="37" class="abs low">10/37</td>
+	<td data-value="38.46" class="pct low">38.46%</td>
+	<td data-value="13" class="abs low">5/13</td>
 	<td data-value="12.5" class="pct low">12.5%</td>
 	<td data-value="8" class="abs low">1/8</td>
-	<td data-value="26.47" class="pct low">26.47%</td>
-	<td data-value="34" class="abs low">9/34</td>
+	<td data-value="25.71" class="pct low">25.71%</td>
+	<td data-value="35" class="abs low">9/35</td>
 	</tr>
 
 <tr>
@@ -245,32 +245,32 @@
 
 <tr>
 	<td class="file low" data-value="genTableBlock.ts"><a href="genTableBlock.ts.html">genTableBlock.ts</a></td>
-	<td data-value="11" class="pic low">
-	<div class="chart"><div class="cover-fill" style="width: 11%"></div><div class="cover-empty" style="width: 89%"></div></div>
+	<td data-value="10" class="pic low">
+	<div class="chart"><div class="cover-fill" style="width: 10%"></div><div class="cover-empty" style="width: 90%"></div></div>
 	</td>
-	<td data-value="11" class="pct low">11%</td>
-	<td data-value="100" class="abs low">11/100</td>
-	<td data-value="12.5" class="pct low">12.5%</td>
-	<td data-value="40" class="abs low">5/40</td>
-	<td data-value="6.66" class="pct low">6.66%</td>
-	<td data-value="15" class="abs low">1/15</td>
-	<td data-value="10.63" class="pct low">10.63%</td>
-	<td data-value="94" class="abs low">10/94</td>
+	<td data-value="10" class="pct low">10%</td>
+	<td data-value="130" class="abs low">13/130</td>
+	<td data-value="8.19" class="pct low">8.19%</td>
+	<td data-value="61" class="abs low">5/61</td>
+	<td data-value="5" class="pct low">5%</td>
+	<td data-value="20" class="abs low">1/20</td>
+	<td data-value="9.67" class="pct low">9.67%</td>
+	<td data-value="124" class="abs low">12/124</td>
 	</tr>
 
 <tr>
 	<td class="file low" data-value="genUpdateBlock.ts"><a href="genUpdateBlock.ts.html">genUpdateBlock.ts</a></td>
-	<td data-value="6.83" class="pic low">
+	<td data-value="6.79" class="pic low">
 	<div class="chart"><div class="cover-fill" style="width: 6%"></div><div class="cover-empty" style="width: 94%"></div></div>
 	</td>
-	<td data-value="6.83" class="pct low">6.83%</td>
-	<td data-value="161" class="abs low">11/161</td>
-	<td data-value="4.95" class="pct low">4.95%</td>
-	<td data-value="101" class="abs low">5/101</td>
+	<td data-value="6.79" class="pct low">6.79%</td>
+	<td data-value="162" class="abs low">11/162</td>
+	<td data-value="4.85" class="pct low">4.85%</td>
+	<td data-value="103" class="abs low">5/103</td>
 	<td data-value="5.88" class="pct low">5.88%</td>
 	<td data-value="17" class="abs low">1/17</td>
-	<td data-value="6.57" class="pct low">6.57%</td>
-	<td data-value="152" class="abs low">10/152</td>
+	<td data-value="6.53" class="pct low">6.53%</td>
+	<td data-value="153" class="abs low">10/153</td>
 	</tr>
 
 <tr>
@@ -311,7 +311,7 @@
             <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-12-13T06:31:12.835Z
+                at 2023-12-20T14:01:00.156Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/src/templator/index.ts.html

@@ -86,7 +86,7 @@
 <a name='L21'></a><a href='#L21'>21</a>
 <a name='L22'></a><a href='#L22'>22</a>
 <a name='L23'></a><a href='#L23'>23</a>
-<a name='L24'></a><a href='#L24'>24</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">443x</span>
+<a name='L24'></a><a href='#L24'>24</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">471x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
@@ -139,7 +139,7 @@ export function <span class="fstat-no" title="function not covered" >setDragSour
             <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-12-13T06:31:12.835Z
+                at 2023-12-20T14:01:00.156Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/src/templator/utils.ts.html

@@ -1290,7 +1290,7 @@
 <span class="cline-any cline-no">&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"><span class="branch-2 cbranch-no" title="branch not covered" >import { utils } from '</span>..';
-import { App, Module, Entity, EntityProperty, Logic, View, Namespace, TypeAnnotation } from '../concepts';
+import { App, Module, Entity, EntityProperty, Logic, View, Namespace, TypeAnnotation, BusinessComponent } from '../concepts';
 &nbsp;
 export const filterProperty = (<span class="fstat-no" title="function not covered" >key: 'inTable' | 'inFilter' | 'inForm' | 'inDetail') =&gt; (<span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >p</span>roperty: EntityProperty) =&gt; {</span></span>
 <span class="cstat-no" title="statement not covered" >  if (property.display) {</span>
@@ -1422,7 +1422,7 @@ function <span class="fstat-no" title="function not covered" >capFirstLetter(w</
  */
 export function <span class="fstat-no" title="function not covered" >genUniqueQueryNameGroup(</span>
   scope: App | Module | Namespace,
-  view: View,
+  view: View | BusinessComponent,
   componentName: string = <span class="branch-0 cbranch-no" title="branch not covered" >'',</span>
   defaultInView: boolean = <span class="branch-0 cbranch-no" title="branch not covered" >true,</span>
   suffix: string = <span class="branch-0 cbranch-no" title="branch not covered" >''</span>
@@ -1909,7 +1909,7 @@ export function <span class="fstat-no" title="function not covered" >transEntity
             <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-12-13T06:31:12.835Z
+                at 2023-12-20T14:01:00.156Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/src/translator/constant.ts.html

@@ -91,7 +91,7 @@ export const embeddedTSEmitter = new EventEmitter();
             <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-12-13T06:31:12.835Z
+                at 2023-12-20T14:01:00.156Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/src/translator/index.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">70.09% </span>
+                <span class="strong">66.1% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>75/107</span>
+                <span class='fraction'>78/118</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">50% </span>
+                <span class="strong">45.2% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>32/64</span>
+                <span class='fraction'>33/73</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">80% </span>
+                <span class="strong">76.19% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>16/20</span>
+                <span class='fraction'>16/21</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">69.52% </span>
+                <span class="strong">66.08% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>73/105</span>
+                <span class='fraction'>76/115</span>
             </div>
         
             
@@ -125,17 +125,17 @@
 
 <tr>
 	<td class="file medium" data-value="utils.ts"><a href="utils.ts.html">utils.ts</a></td>
-	<td data-value="68" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 68%"></div><div class="cover-empty" style="width: 32%"></div></div>
+	<td data-value="63.96" class="pic medium">
+	<div class="chart"><div class="cover-fill" style="width: 63%"></div><div class="cover-empty" style="width: 37%"></div></div>
 	</td>
-	<td data-value="68" class="pct medium">68%</td>
-	<td data-value="100" class="abs medium">68/100</td>
-	<td data-value="42.85" class="pct low">42.85%</td>
-	<td data-value="49" class="abs low">21/49</td>
-	<td data-value="76.47" class="pct medium">76.47%</td>
-	<td data-value="17" class="abs medium">13/17</td>
-	<td data-value="67.67" class="pct medium">67.67%</td>
-	<td data-value="99" class="abs medium">67/99</td>
+	<td data-value="63.96" class="pct medium">63.96%</td>
+	<td data-value="111" class="abs medium">71/111</td>
+	<td data-value="37.93" class="pct low">37.93%</td>
+	<td data-value="58" class="abs low">22/58</td>
+	<td data-value="72.22" class="pct medium">72.22%</td>
+	<td data-value="18" class="abs medium">13/18</td>
+	<td data-value="64.22" class="pct medium">64.22%</td>
+	<td data-value="109" class="abs medium">70/109</td>
 	</tr>
 
 </tbody>
@@ -146,7 +146,7 @@
             <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-12-13T06:31:12.835Z
+                at 2023-12-20T14:01:00.156Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/src/translator/index.ts.html

@@ -66,7 +66,7 @@
 <tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
 <a name='L2'></a><a href='#L2'>2</a>
 <a name='L3'></a><a href='#L3'>3</a>
-<a name='L4'></a><a href='#L4'>4</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">2228x</span>
+<a name='L4'></a><a href='#L4'>4</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">2233x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js"><span class="branch-2 cbranch-no" title="branch not covered" >export * from '</span>./constant';
@@ -79,7 +79,7 @@ export * from './utils';
             <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-12-13T06:31:12.835Z
+                at 2023-12-20T14:01:00.156Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/src/translator/types.ts.html

@@ -241,7 +241,7 @@ export type TranslatorMethod = (state: TranslatorState) => TranslatorGenerato
             <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-12-13T06:31:12.835Z
+                at 2023-12-20T14:01:00.156Z
             </div>
         <script src="../../prettify.js"></script>
         <script>