@lcap/nasl 3.6.0-alpha.4 → 3.6.0-alpha.5

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

@@ -374,7 +374,7 @@
 <a name='L309'></a><a href='#L309'>309</a>
 <a name='L310'></a><a href='#L310'>310</a>
 <a name='L311'></a><a href='#L311'>311</a>
-<a name='L312'></a><a href='#L312'>312</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">133x</span>
+<a name='L312'></a><a href='#L312'>312</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">127x</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>
@@ -1003,7 +1003,7 @@ export function <span class="fstat-no" title="function not covered" >genBlurUpda
             <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-20T16:21:15.863Z
+                at 2023-12-07T14:08:08.581Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -244,7 +244,7 @@ export default genEnumSelectBlock;
             <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-20T16:21:15.863Z
+                at 2023-12-07T14:08:08.581Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">27.02% </span>
+                <span class="strong">27.77% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>10/37</span>
+                <span class='fraction'>10/36</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">38.46% </span>
+                <span class="strong">45.45% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>5/13</span>
+                <span class='fraction'>5/11</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">25.71% </span>
+                <span class="strong">26.47% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>9/35</span>
+                <span class='fraction'>9/34</span>
             </div>
         
             
@@ -185,8 +185,7 @@
 <a name='L120'></a><a href='#L120'>120</a>
 <a name='L121'></a><a href='#L121'>121</a>
 <a name='L122'></a><a href='#L122'>122</a>
-<a name='L123'></a><a href='#L123'>123</a>
-<a name='L124'></a><a href='#L124'>124</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">129x</span>
+<a name='L123'></a><a href='#L123'>123</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">123x</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>
@@ -259,7 +258,6 @@
 <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>
@@ -379,15 +377,14 @@ export function <span class="fstat-no" title="function not covered" >genH5GetTem
 }
 &nbsp;
 export function <span class="fstat-no" title="function not covered" >genGetBlock(e</span>ntity: Entity, oldNode: ViewElement) {
-  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 { view } = <span class="cstat-no" title="statement not covered" >oldNode;</span>
   const { ns } = <span class="cstat-no" title="statement not covered" >entity;</span>
   const getLogic = <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 === `get`)</span>;</span>
 &nbsp;
   const nameGroup: NameGroup = <span class="cstat-no" title="statement not covered" >{};</span>
-<span class="cstat-no" title="statement not covered" >  nameGroup.viewParamId = likeComponent.getParamUniqueName('id');</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.viewLogicLoad = likeComponent.getLogicUniqueName('load');</span>
+<span class="cstat-no" title="statement not covered" >  nameGroup.viewParamId = view.getParamUniqueName('id');</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.viewLogicLoad = view.getLogicUniqueName('load');</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  return `&lt;template&gt;</span>
     ${config.scope === 'h5' ? genH5GetTemplate(entity, nameGroup) : genGetTemplate(entity, nameGroup)}
@@ -397,7 +394,7 @@ export function <span class="fstat-no" title="function not covered" >genGetBlock
 {
     "viewParams": [
         {
-            "concept": "${isBusinessComponent ? 'ParamWithGroup' : 'Param'}",
+            "concept": "Param",
             "name": "${nameGroup.viewParamId}",
             "typeAnnotation": ${JSON.stringify(NaslCoreTypeAnnotation.Long)}
         }
@@ -439,7 +436,7 @@ export default genGetBlock;
             <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-20T16:21:15.863Z
+                at 2023-12-07T14:08:08.581Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -406,7 +406,7 @@
 <a name='L341'></a><a href='#L341'>341</a>
 <a name='L342'></a><a href='#L342'>342</a>
 <a name='L343'></a><a href='#L343'>343</a>
-<a name='L344'></a><a href='#L344'>344</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">148x</span>
+<a name='L344'></a><a href='#L344'>344</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">142x</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>
@@ -996,16 +996,16 @@ export function <span class="fstat-no" title="function not covered" >genGridView
  */
 // 数据网格（简）
 export function <span class="fstat-no" title="function not covered" >genGridViewBlock(e</span>ntity: Entity, oldNode: ViewElement) {
-  const likeComponent = <span class="cstat-no" title="statement not covered" >oldNode?.likeComponent;</span>
+  const { view } = <span class="cstat-no" title="statement not covered" >oldNode;</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>
 &nbsp;
-  const viewElementMainView = <span class="cstat-no" title="statement not covered" >likeComponent.getViewElementUniqueName('gridView');</span>
-  const <span class="cstat-no" title="statement not covered" >nameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementMainView);</span>
+  const viewElementMainView = <span class="cstat-no" title="statement not covered" >view.getViewElementUniqueName('gridView');</span>
+  const <span class="cstat-no" title="statement not covered" >nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);</span>
 <span class="cstat-no" title="statement not covered" >  nameGroup.viewElementMainView = viewElementMainView;</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.viewLogicRemove = likeComponent.getLogicUniqueName('remove');</span>
-<span class="cstat-no" title="statement not covered" >  nameGroup.viewVariableFilter = likeComponent.getVariableUniqueName('filter');</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.viewLogicRemove = view.getLogicUniqueName('remove');</span>
+<span class="cstat-no" title="statement not covered" >  nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');</span>
 &nbsp;
   // 当前节点的currentName
 <span class="cstat-no" title="statement not covered" >  nameGroup.currentName = oldNode.getCurrentName();</span>
@@ -1045,17 +1045,17 @@ export function <span class="fstat-no" title="function not covered" >genGridView
 }
 &nbsp;
 export function <span class="fstat-no" title="function not covered" >genGridViewCardBlock(p</span>roperty: EntityProperty, oldNode: ViewElement) {
-  const likeComponent = <span class="cstat-no" title="statement not covered" >oldNode?.likeComponent;</span>
+  const { view } = <span class="cstat-no" title="statement not covered" >oldNode;</span>
   const { entity } = <span class="cstat-no" title="statement not covered" >property;</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>
 &nbsp;
-  const viewElementMainView = <span class="cstat-no" title="statement not covered" >likeComponent.getViewElementUniqueName('gridView');</span>
-  const <span class="cstat-no" title="statement not covered" >nameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementMainView);</span>
+  const viewElementMainView = <span class="cstat-no" title="statement not covered" >view.getViewElementUniqueName('gridView');</span>
+  const <span class="cstat-no" title="statement not covered" >nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);</span>
 <span class="cstat-no" title="statement not covered" >  nameGroup.viewElementMainView = viewElementMainView;</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.viewLogicRemove = likeComponent.getLogicUniqueName('remove');</span>
-<span class="cstat-no" title="statement not covered" >  nameGroup.viewVariableFilter = likeComponent.getVariableUniqueName('filter');</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.viewLogicRemove = view.getLogicUniqueName('remove');</span>
+<span class="cstat-no" title="statement not covered" >  nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');</span>
 &nbsp;
   // 收集所有和本实体关联的实体
   const entitySet: Set&lt;Entity&gt; = <span class="cstat-no" title="statement not covered" >new Set();</span>
@@ -1099,7 +1099,7 @@ export default genGridViewBlock;
             <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-20T16:21:15.863Z
+                at 2023-12-07T14:08:08.581Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -193,7 +193,7 @@
 <a name='L128'></a><a href='#L128'>128</a>
 <a name='L129'></a><a href='#L129'>129</a>
 <a name='L130'></a><a href='#L130'>130</a>
-<a name='L131'></a><a href='#L131'>131</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">132x</span>
+<a name='L131'></a><a href='#L131'>131</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">126x</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>
@@ -419,14 +419,14 @@ export function <span class="fstat-no" title="function not covered" >genLoadList
  * 生成实体选择框区块
  */
 export function <span class="fstat-no" title="function not covered" >genListViewBlock(e</span>ntity: Entity, oldNode: ViewElement, property: EntityProperty) {
-  const likeComponent = <span class="cstat-no" title="statement not covered" >oldNode?.likeComponent;</span>
+  const { view } = <span class="cstat-no" title="statement not covered" >oldNode;</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>
 &nbsp;
-  const viewElementMainView = <span class="cstat-no" title="statement not covered" >likeComponent.getViewElementUniqueName('listView');</span>
-  const <span class="cstat-no" title="statement not covered" >nameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementMainView, false);</span>
+  const viewElementMainView = <span class="cstat-no" title="statement not covered" >view.getViewElementUniqueName('listView');</span>
+  const <span class="cstat-no" title="statement not covered" >nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView, false);</span>
 <span class="cstat-no" title="statement not covered" >  nameGroup.viewElementMainView = viewElementMainView;</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.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));</span>
   // 当前节点的currentName
 <span class="cstat-no" title="statement not covered" >  nameGroup.currentName = oldNode.getCurrentName();</span>
   const displayedProperty = <span class="cstat-no" title="statement not covered" >property || getFirstDisplayedProperty(entity);</span>
@@ -460,7 +460,7 @@ export default genListViewBlock;
             <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-20T16:21:15.863Z
+                at 2023-12-07T14:08:08.581Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">12.22% </span>
+                <span class="strong">12.35% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>11/90</span>
+                <span class='fraction'>11/89</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">12.34% </span>
+                <span class="strong">12.5% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>10/81</span>
+                <span class='fraction'>10/80</span>
             </div>
         
             
@@ -432,7 +432,12 @@
 <a name='L367'></a><a href='#L367'>367</a>
 <a name='L368'></a><a href='#L368'>368</a>
 <a name='L369'></a><a href='#L369'>369</a>
-<a name='L370'></a><a href='#L370'>370</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">137x</span>
+<a name='L370'></a><a href='#L370'>370</a>
+<a name='L371'></a><a href='#L371'>371</a>
+<a name='L372'></a><a href='#L372'>372</a>
+<a name='L373'></a><a href='#L373'>373</a>
+<a name='L374'></a><a href='#L374'>374</a>
+<a name='L375'></a><a href='#L375'>375</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">131x</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>
@@ -624,7 +629,12 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-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>
@@ -965,40 +975,45 @@ export function <span class="fstat-no" title="function not covered" >genQueryAss
       })
     ),
   ];
-  const callQueryComponent = <span class="cstat-no" title="statement not covered" >NaslQueryExpression.CallQueryComponent({</span>
-    label: '数据查询',
-    // 2.11版本的数据查询，返回类型将自动推断
-    // 2.22版本的数据查询，实体支持列筛选，(select.selectElements 会初始化实体对应的 QueryFieldExpression 节点)
-    ideVersion: '2.22',
-    typeAnnotation: NaslTypeAnnotation.AnonymousStructure(aStructureProperties),
-    select,
-    from,
-    where,
-    groupBy: [],
-    having: null,
-    orderBy: supportSort
-      ? [
-          NaslQueryExpression.QueryOrderByExpression({
-            label: '查询组件OrderBy元素',
-            order: NaslLogicItem.Identifier({
-              name: 'order',
-            }),
-            orderElement: NaslLogicItem.Identifier({
-              name: 'sort',
-            }),
-          }),
-        ]
-      : [],
-    logicName: nameGroup.logic,
-    structureName: nameGroup.structure,
-    limit: null,
-  });
 <span class="cstat-no" title="statement not covered" >  return NaslLogicItem.Assignment({</span>
-    left: NaslLogicItem.Identifier({ name: 'result' }),
-    right: NaslLogicItem.Paginate({
-      list: callQueryComponent,
-      page: NaslLogicItem.Identifier({ name: 'page' }),
-      size: NaslLogicItem.Identifier({ name: 'size' }),
+    left: NaslLogicItem.Identifier({
+      name: 'result',
+    }),
+    right: NaslQueryExpression.CallQueryComponent({
+      label: '数据查询',
+      // 2.11版本的数据查询，返回类型将自动推断
+      // 2.22版本的数据查询，实体支持列筛选，(select.selectElements 会初始化实体对应的 QueryFieldExpression 节点)
+      ideVersion: '2.22',
+      typeAnnotation: NaslTypeAnnotation.AnonymousStructure(aStructureProperties),
+      select,
+      from,
+      where,
+      groupBy: [],
+      having: null,
+      orderBy: supportSort
+        ? [
+            NaslQueryExpression.QueryOrderByExpression({
+              label: '查询组件OrderBy元素',
+              order: NaslLogicItem.Identifier({
+                name: 'order',
+              }),
+              orderElement: NaslLogicItem.Identifier({
+                name: 'sort',
+              }),
+            }),
+          ]
+        : [],
+      logicName: nameGroup.logic,
+      structureName: nameGroup.structure,
+      limit: NaslQueryExpression.QueryLimitExpression({
+        label: '查询组件 Limit 子句',
+        pageElement: NaslLogicItem.Identifier({
+          name: 'page',
+        }),
+        pageSizeElement: NaslLogicItem.Identifier({
+          name: 'size',
+        }),
+      }),
     }),
   });
 }
@@ -1177,7 +1192,7 @@ export function <span class="fstat-no" title="function not covered" >genEditQuer
             <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-20T16:21:15.863Z
+                at 2023-12-07T14:08:08.581Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -476,7 +476,7 @@
 <a name='L411'></a><a href='#L411'>411</a>
 <a name='L412'></a><a href='#L412'>412</a>
 <a name='L413'></a><a href='#L413'>413</a>
-<a name='L414'></a><a href='#L414'>414</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">140x</span>
+<a name='L414'></a><a href='#L414'>414</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">134x</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>
@@ -995,12 +995,12 @@ export function <span class="fstat-no" title="function not covered" >genLoadSele
  * @returns
  */
 export function <span class="fstat-no" title="function not covered" >genSelectBlock(e</span>ntity: Entity, oldNode: ViewElement) {
-  const likeComponent = <span class="cstat-no" title="statement not covered" >oldNode?.likeComponent;</span>
+  const { view } = <span class="cstat-no" title="statement not covered" >oldNode;</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>
 &nbsp;
-  const viewElementMainView = <span class="cstat-no" title="statement not covered" >likeComponent.getViewElementUniqueName('select');</span>
-  const <span class="cstat-no" title="statement not covered" >nameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementMainView, false);</span>
+  const viewElementMainView = <span class="cstat-no" title="statement not covered" >view.getViewElementUniqueName('select');</span>
+  const <span class="cstat-no" title="statement not covered" >nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView, false);</span>
 <span class="cstat-no" title="statement not covered" >  nameGroup.viewElementMainView = viewElementMainView;</span>
 <span class="cstat-no" title="statement not covered" >  nameGroup.lowerEntity = utils.firstLowerCase(entity.name);</span>
 &nbsp;
@@ -1309,7 +1309,7 @@ export function <span class="fstat-no" title="function not covered" >genSelectIt
             <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-20T16:21:15.863Z
+                at 2023-12-07T14:08:08.581Z
             </div>
         <script src="../../prettify.js"></script>
         <script>