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

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -34,7 +34,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
     ${properties
       .map((property) => {
         const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
-        const label = property.label || property.name;
+        const label = (property.label || property.name).replace(/"/g, '"');
         let formItem = `<u-form-item layout="center"><template #label><u-text text="${label}"></u-text></template>`;
 
         const { typeAnnotation } = property || {};
@@ -64,10 +64,8 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
-            } else
-              return '';
-          } else
-            return '';
+            } else return '';
+          } else return '';
         } else if (propertyTypeName === 'Boolean') {
           formItem += `
                         <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
@@ -76,12 +74,11 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                         </u-select>
                     `;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="0"   placeholder="请输入${label}"></u-number-input>`;
+          formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
         } else if (propertyTypeName === 'Double') {
           formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
         } else if (propertyTypeName === 'Decimal') {
-          let { step, decimalLength } = getDecimalInfo(property)
-          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="${step}"    placeholder="请输入${label}"></u-number-input>`
+          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
         } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
           formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
         } else if (propertyTypeName === 'Date') {
@@ -185,13 +182,13 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                             <u-select-item :value="false" text="否"><u-text text="否"></u-text></u-select-item>
                         </u-select>`;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-          formItem += `<u-number-input :highPrecision="true" :step="0"   v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-number-input>`;
+          formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
+            }></u-number-input>`;
         } else if (propertyTypeName === 'Double') {
           formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
             }></u-number-input>`;
         } else if (propertyTypeName === 'Decimal') {
-          let { step, decimalLength } = getDecimalInfo(property)
-          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="${step}"   placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
+          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
             }></u-number-input>`;
         } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
           formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''

package/src/templator/genEditTableBlock.ts

@@ -79,13 +79,11 @@ export function genEditTableColumnTemplate(
                 <u-select-item :value="false" text="否">否</u-select-item>
             </u-select>`;
     } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-      formItem = `<u-number-input :value.sync="${valueExpression}" :highPrecision="true" :step="0"   placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
+      formItem = `<u-number-input :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
     } else if (propertyTypeName === 'Double') {
       formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
     } else if (propertyTypeName === 'Decimal') {
-      let { step, decimalLength } = getDecimalInfo(property)
-
-      formItem = `<u-number-input :value.sync="${valueExpression}"  :highPrecision="true" :step="${step}"  placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
+      formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
     } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
       formItem = `<u-validator placement="bottom" display="appear" @blur-valid="${nameGroup.viewLogicBlurUpdate}" style="width:100%">
             <u-textarea :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" size="full"></u-textarea>

package/src/templator/genUpdateBlock.ts

@@ -28,11 +28,11 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
         if (property.rules && property.rules.length) {
           property.rules.forEach((rule) => rules.push(rule));
         }
-        if (required)
-          rules.push('required');
+        if (required) rules.push('required');
         const rulesStr = rules.join(' | ');
 
-        let formItem = `            <u-form-item ${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''} layout="center"><template #label><u-text text="${label}"></u-text></template>\n`;
+        let formItem = `            <u-form-item ${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''
+          } layout="center"><template #label><u-text text="${label}"></u-text></template>\n`;
 
         const { typeAnnotation } = property || {};
         const { typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
@@ -56,10 +56,10 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
               const key = [property.name, relationEntity.name].join('-');
               const selectNameGroup = selectNameGroupMap.get(key);
               formItem += `
-                        <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
-                        </u-select>
-                    `;
+                  <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
+                      text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
+                  </u-select>
+              `;
             } else
               return '';
           } else
@@ -72,12 +72,11 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 </u-select>
             `;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="0"   placeholder="请输入${label}"></u-number-input>`;
+          formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
         } else if (propertyTypeName === 'Double') {
           formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
         } else if (propertyTypeName === 'Decimal') {
-          let { step, decimalLength } = getDecimalInfo(property)
-          formItem += `<u-number-input v-model="${vModel}"   :highPrecision="true" :step="${step}"    placeholder="请输入${label}"></u-number-input>`;
+          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
         } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
           formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
         } else if (propertyTypeName === 'Date') {
@@ -154,13 +153,11 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
         } else if (propertyTypeName === 'Boolean') {
           formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-switch v-model="${vModel}"></van-switch></van-linear-layout></template>`;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-          let decimalLength = 0, step = 1
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new :highPrecision="true" step="${step}"   v-model="${vModel}" placeholder="请输入${label}" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
+          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${label}" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
         } else if (propertyTypeName === 'Double') {
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new   v-model="${vModel}" placeholder="请输入${label}" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
+          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${label}" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
         } else if (propertyTypeName === 'Decimal') {
-          let { step, decimalLength } = getDecimalInfo(property)
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new :highPrecision="true" step="${step}"  v-model="${vModel}" placeholder="请输入${label}" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
+          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${label}" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
         } else if (propertyTypeName === 'Text') {
           formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-fieldtextarea v-model="${vModel}" placeholder="请输入${label}"></van-fieldtextarea></van-linear-layout></template>`;
           // @TODO

package/src/templator/utils.ts

@@ -591,7 +591,6 @@ export const NaslNode = {
   }),
 };
 
-
 export const getDecimalInfo = (property: any) => {
   let step
   let typeAnnotation = property?.typeAnnotation
@@ -604,11 +603,11 @@ export const getDecimalInfo = (property: any) => {
   return { step, decimalLength }
 }
 export function transEntityMetadataTypes(typeAnnotation: TypeAnnotation, app: App) {
-    let { typeName: propertyTypeName } = typeAnnotation || {};
-    if (typeAnnotation?.typeNamespace?.endsWith('.metadataTypes')) {
-        const referenceNode = app.findNodeByCompleteName(typeAnnotation.typeNamespace + '.' + typeAnnotation.typeName) || {}
-        const { typeName }  = referenceNode.typeAnnotation || {};
-        propertyTypeName = typeName;
-    }
-    return propertyTypeName;
+  let { typeName: propertyTypeName } = typeAnnotation || {};
+  if (typeAnnotation?.typeNamespace?.endsWith('.metadataTypes')) {
+    const referenceNode = app.findNodeByCompleteName(typeAnnotation.typeNamespace + '.' + typeAnnotation.typeName) || {}
+    const { typeName } = referenceNode.typeAnnotation || {};
+    propertyTypeName = typeName;
+  }
+  return propertyTypeName;
 }

package/test/concepts/anonymous-function/__snapshots__/toJS.spec.ts.snap

@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`anonymous-function:toJS simple 1`] = `"(item) => (this.$global.greaterThanOrEqual((item || {}).length,\\"0\\"))"`;
+exports[`anonymous-function:toJS simple 1`] = `"(item) => (((item || {}).length) >= (0))"`;

package/test/concepts/assignment/__snapshots__/toJS.spec.ts.snap

@@ -2,7 +2,7 @@
 
 exports[`assignment:toJS both-space 1`] = `""`;
 
-exports[`assignment:toJS left-space 1`] = `" = new NaslLong(\\"123\\")"`;
+exports[`assignment:toJS left-space 1`] = `" = 123"`;
 
 exports[`assignment:toJS right-space 1`] = `"result"`;
 

package/test/concepts/batch-assignment/__snapshots__/toJS.spec.ts.snap

@@ -2,8 +2,8 @@
 
 exports[`batch-assignment:toJS muli-var-muli-value 1`] = `
 "param3.property1 = param2;
-param3.createdBy.length = \\"0\\";
-param3.id = \\"0\\";
+param3.createdBy.length = 0;
+param3.id = 0;
 "
 `;
 

package/test/concepts/binary-expression/__snapshots__/toJS.spec.ts.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`binary-expression:toJS constant-nested 1`] = `
-"this.$global.isEqual((\`123\` || {}).length, \\"3\\") && false;
+"(\`123\` || {}).length == 3 && false;
 "
 `;
 
@@ -11,7 +11,6 @@ exports[`binary-expression:toJS constant-simple 1`] = `
 `;
 
 exports[`binary-expression:toJS variable-nested 1`] = `
-"this.$global.isEqual((param1 || {}).length, \\"3\\") ||
-  ((param3 || {}).updatedBy || {}).length != \\"0\\";
+"(param1 || {}).length == 3 || ((param3 || {}).updatedBy || {}).length != 0;
 "
 `;

package/test/concepts/call-interface/__snapshots__/toJS.spec.ts.snap

@@ -20,7 +20,7 @@ exports[`call-interface:toJS with-body-complex-argument 1`] = `
   },
   query: {
     param1: \`123\`,
-    param2: \\"123\\",
+    param2: 123,
   },
   path: {},
   headers: {},
@@ -39,7 +39,7 @@ exports[`call-interface:toJS with-body-complex-argument 1`] = `
           properties: null,
         })
       );
-      obj.id = \\"1\\";
+      obj.id = 1;
       obj.value = \`val_text\`;
       obj.property1 = \`prop1\`;
       return obj;

package/test/concepts/call-logic/__snapshots__/toJS.spec.ts.snap

@@ -11,7 +11,7 @@ exports[`call-logic:toJS entries-get-with-arguments 1`] = `
       \\"lcap-calllogic-uuid\\": \\"050b4ece455845679874a48344f8540a\\",
     },
     query: {
-      id: \\"123\\",
+      id: 123,
     },
     body: {},
   })
@@ -44,9 +44,9 @@ exports[`call-logic:toJS entries-update-with-arguments 1`] = `
             properties: null,
           })
         );
-        obj.id = \\"123\\";
+        obj.id = 123;
         obj.name = \`测试属性1\`;
-        obj.value = \\"1234\\";
+        obj.value = 1234;
         return obj;
       })(),
     },

package/test/concepts/match/__snapshots__/toJS.spec.ts.snap

@@ -5,7 +5,7 @@ exports[`match:toJS isExpression 1`] = `
   if (this.$isInstanceOf(variable1, \\"nasl.core.Boolean\\")) {
     throw Error(\\"程序中止\\");
   } else if (this.$isInstanceOf(variable1, \\"nasl.core.Long\\")) {
-    return \\"0\\";
+    return 0;
   } else if (this.$isInstanceOf(variable1, \\"nasl.core.String\\")) {
     return \`\`;
   } else {

package/test/concepts/numeric-literal/__snapshots__/toJS.spec.ts.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`numeric-literal:toJS number 1`] = `
-"\\"0\\";
+"0;
 "
 `;

package/test/concepts/validation-rule/__snapshots__/toJS.spec.ts.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`validation-rule:toJS argument-without-keyword 1`] = `
-"({ validate: \\"max\\", args: [\\"10\\"], trigger: \\"input+blur\\", message: undefined });
+"({ validate: \\"max\\", args: [10], trigger: \\"input+blur\\", message: undefined });
 "
 `;
 
@@ -11,12 +11,12 @@ exports[`validation-rule:toJS empty-rule 1`] = `
 `;
 
 exports[`validation-rule:toJS with-param-with-target 1`] = `
-"({ validate: \\"max\\", args: [\\"10\\"], trigger: \\"input+blur\\", message: undefined });
+"({ validate: \\"max\\", args: [10], trigger: \\"input+blur\\", message: undefined });
 "
 `;
 
 exports[`validation-rule:toJS with-param-without-target 1`] = `
-"({ validate: \\"max\\", args: [\\"10\\"], trigger: \\"input+blur\\", message: undefined });
+"({ validate: \\"max\\", args: [10], trigger: \\"input+blur\\", message: undefined });
 "
 `;
 

package/test/concepts/view-element/__snapshots__/toVue.spec.ts.snap

@@ -124,7 +124,6 @@ exports[`view-element:toVue with-table 1`] = `
               :step=\\"0\\"
               :placeholder=\\"\`请输入property1\`\\"
               :value.sync=\\"filter1.property1\\"
-              :highPrecision=\\"true\\"
             ></u-number-input>
           </u-form-item>
           <u-form-item
@@ -316,7 +315,6 @@ exports[`view-element:toVue with-table 1`] = `
                 :step=\\"0\\"
                 :placeholder=\\"\`请输入property1\`\\"
                 :value.sync=\\"input1.property1\\"
-                :highPrecision=\\"true\\"
               ></u-number-input>
             </u-form-item>
           </u-form>