@lcap/nasl 1.0.0-alpha.2 → 1.0.0-alpha.3

package/out/templator/genEditTableBlock.js

@@ -37,7 +37,7 @@ function genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroup
     const valueExpression = `scope.item.${lowerEntityName}.${property.name}`;
     const title = property.label || property.name;
     const expression = (0, _1.getExpression)(property, `scope.item.${lowerEntityName}.${property.name}`);
-    const canEditable = (property) => property.editable;
+    const canEditable = (property) => !property.readonly;
     const getText = (property) => {
         const propertyTypeName = property.typeAnnotation.typeName;
         if (propertyTypeName === 'Boolean') {
@@ -51,7 +51,7 @@ function genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroup
         }
     };
     const genEditComponent = (property) => {
-        if (!property.editable)
+        if (property.readonly)
             return '';
         const label = property.label || property.name;
         let formItem = '';
@@ -61,7 +61,7 @@ function genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroup
             const relationEntity = parentNode?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity, 'inForm');
+                const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
                 if (displayedProperty) {
                     const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                     const selectNameGroup = selectNameGroupMap.get(relationEntity.name);

package/out/templator/genEditTableBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"genEditTableBlock.js","sourceRoot":"","sources":["../../src/templator/genEditTableBlock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAElC,wBAIW;AACX,mCAGiB;AAEjB;;;GAGG;AACH,SAAgB,0BAA0B,CAAC,MAAc,EAAE,QAAwB,EAAE,SAAoB,EAAE,kBAA2C;IAClJ,MAAM,UAAU,GAAG,MAAM,CAAC,UAA6B,CAAC;IACxD,MAAM,eAAe,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,eAAe,GAAG,cAAc,eAAe,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;IACzE,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC;IAE9C,MAAM,UAAU,GAAG,IAAA,gBAAa,EAAC,QAAQ,EAAE,cAAc,eAAe,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAE7F,MAAM,WAAW,GAAG,CAAC,QAAwB,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAEpE,MAAM,OAAO,GAAG,CAAC,QAAwB,EAAE,EAAE;QACzC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC;QAC1D,IAAI,gBAAgB,KAAK,SAAS,EAAE;YAChC,OAAO;4BACS,UAAU;6BACT,UAAU;aAC1B,CAAC;SACL;aAAM;YACH,OAAO,kBAAkB,UAAU,aAAa,CAAC;SACpD;IACL,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,CAAC,QAAwB,EAAE,EAAE;QAClD,IAAI,CAAC,QAAQ,CAAC,QAAQ;YAClB,OAAO,EAAE,CAAC;QACd,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC;QAC9C,IAAI,QAAQ,GAAG,EAAE,CAAC;QAElB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC;QAC1D,IAAI,QAAQ,CAAC,cAAc,IAAI,kBAAkB,EAAE;YAC/C,QAAQ;YACR,MAAM,cAAc,GAAG,UAAU,EAAE,gBAAgB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YAC7E,IAAI,cAAc,EAAE;gBAChB,MAAM,gBAAgB,GAAG,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,gBAAgB,CAAC,CAAC;gBAC3G,MAAM,iBAAiB,GAAG,IAAA,4BAAyB,EAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;gBAC9E,IAAI,iBAAiB,EAAE;oBACnB,MAAM,eAAe,GAAG,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;oBAClE,MAAM,eAAe,GAAG,kBAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;oBACpE,QAAQ,IAAI;8DAC8B,KAAK,mBAAmB,eAAe,CAAC,aAAa;uFAC5B,SAAS,CAAC,mBAAmB,cAAc,SAAS,CAAC,mBAAmB;0CACrH,eAAe,IAAI,iBAAiB,CAAC,IAAI,kBAAkB,eAAe,IAAI,gBAAgB,CAAC,IAAI,yDAAyD,eAAe;;qBAEhM,CAAC;iBACL;;oBACG,OAAO,EAAE,CAAC;aACjB;;gBACG,OAAO,EAAE,CAAC;SACjB;aAAM,IAAI,gBAAgB,KAAK,SAAS,EAAE;YACvC,QAAQ,IAAI,oCAAoC,eAAe,qBAAqB,KAAK;uEAC9B,SAAS,CAAC,mBAAmB,cAAc,SAAS,CAAC,mBAAmB;;;wBAGvH,CAAC;SAChB;aAAM,IAAI,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,KAAK,MAAM,EAAE;YACtE,QAAQ,GAAG,gCAAgC,eAAe,qBAAqB,KAAK,8BAA8B,SAAS,CAAC,mBAAmB,qBAAqB,CAAC;SACxK;aAAM,IAAI,gBAAgB,KAAK,SAAS,EAAE;YACvC,QAAQ,GAAG,gCAAgC,eAAe,8CAA8C,KAAK,8BAA8B,SAAS,CAAC,mBAAmB,qBAAqB,CAAC;SACjM;aAAM,IAAI,gBAAgB,KAAK,MAAM,EAAE;YACpC,QAAQ,GAAG,iEAAiE,SAAS,CAAC,mBAAmB;uCAC9E,eAAe,qBAAqB,KAAK;2BACrD,CAAC;SACnB;aAAM,IAAI,gBAAgB,KAAK,MAAM,EAAE;YACpC,QAAQ,GAAG,wCAAwC,eAAe,qBAAqB,KAAK,8DAA8D,SAAS,CAAC,mBAAmB,oBAAoB,CAAC;SAC/M;aAAM,IAAI,gBAAgB,KAAK,MAAM,EAAE;YACpC,QAAQ,GAAG,8BAA8B,eAAe,qBAAqB,KAAK,+CAA+C,SAAS,CAAC,mBAAmB,oBAAoB,CAAC;SACtL;aAAM,IAAI,gBAAgB,KAAK,UAAU,EAAE;YACxC,QAAQ,GAAG,6CAA6C,eAAe,qBAAqB,KAAK,8DAA8D,SAAS,CAAC,mBAAmB,yBAAyB,CAAC;SACzN;aAAM;YACH,QAAQ,GAAG,iEAAiE,SAAS,CAAC,mBAAmB;wCAC7E,eAAe,qBAAqB,KAAK;2BACtD,CAAC;SACnB;QACD,OAAO;;kBAEG,QAAQ;;oBAEN,CAAC;IACjB,CAAC,CAAC;IAEF,OAAO,+BAA+B,KAAK,YAAY,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE;;;cAGlJ,OAAO,CAAC,QAAQ,CAAC;;;MAGzB,gBAAgB,CAAC,QAAQ,CAAC;uBACT,CAAC;AACxB,CAAC;AAxFD,gEAwFC;AAED;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,MAAc,EAAE,SAAoB,EAAE,kBAA2C;IAClH,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAA,iBAAc,EAAC,SAAS,CAAC,CAAC,CAAC;IAEvE,OAAO,sBAAsB,SAAS,CAAC,mBAAmB,mBAAmB,SAAS,CAAC,aAAa,kBAAkB,SAAS,CAAC,SAAS;uBACtH,SAAS,CAAC,kBAAkB;;;;MAI7C,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,0BAA0B,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,kBAAkB,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;;;;;kCAK7F,SAAS,CAAC,eAAe;;;;;CAK1D,CAAC;AACF,CAAC;AAnBD,oDAmBC;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,MAAc,EAAE,SAAoB,EAAE,QAAa,EAAE,aAAsB;IAC7G,MAAM,UAAU,GAAG,MAAM,CAAC,UAA6B,CAAC;IACxD,MAAM,eAAe,GAAG,UAAU,EAAE,YAAY,EAAE,CAAC;IACnD,MAAM,MAAM,GAAG;QACX,IAAA,gBAAa,EAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,aAAa,CAAC;QAC1D,IAAA,gBAAa,EAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,aAAa,CAAC;QAC1D,IAAA,gBAAa,EAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,aAAa,CAAC;QAC1D,IAAA,gBAAa,EAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,cAAc,CAAC;KAC9D,CAAC;IAEF,IAAI,aAAa;QACb,MAAM,CAAC,IAAI,CAAC,IAAA,gBAAa,EAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAE3F,OAAO,gBAAQ,CAAC,KAAK,CAAC;QAClB,IAAI,EAAE,SAAS,CAAC,aAAa;QAC7B,MAAM,EAAE;YACJ,gBAAQ,CAAC,KAAK,CAAC;gBACX,IAAI,EAAE,QAAQ;gBACd,cAAc,EAAE,4BAAoB,CAAC,gBAAgB;aACxD,CAAC;SACL;QACD,OAAO,EAAE;YACL,gBAAQ,CAAC,MAAM,CAAC;gBACZ,IAAI,EAAE,QAAQ;gBACd,cAAc,EAAE,oCAA4B,CAAC,MAAM,CAAC;oBAChD,0BAAkB,CAAC,SAAS,CAAC;wBACzB,aAAa,EAAE,GAAG,eAAe,aAAa;wBAC9C,QAAQ,EAAE,SAAS,CAAC,SAAS;qBAChC,CAAC;iBACL,CAAC;aACL,CAAC;SACL;QACD,SAAS,EAAE,EAAgB;QAC3B,IAAI,EAAE;YACF,qBAAa,CAAC,KAAK;YACnB,qBAAa,CAAC,UAAU,CAAC;gBACrB,IAAI,EAAE,qBAAa,CAAC,UAAU,CAAC;oBAC3B,IAAI,EAAE,QAAQ;iBACjB,CAAC;gBACF,KAAK,EAAE,qBAAa,CAAC,SAAS,CAAC;oBAC3B,eAAe,EAAE,GAAG,eAAe,SAAS;oBAC5C,UAAU,EAAE,QAAQ,CAAC,IAAI;oBACzB,SAAS,EAAE,MAAM;iBACpB,CAAC;aACL,CAAC;YACF,qBAAa,CAAC,GAAG;SACpB;KACJ,CAAC,CAAC;AACP,CAAC;AAhDD,sDAgDC;AAED;;;GAGG;AACH,SAAgB,uBAAuB,CAAC,MAAc,EAAE,SAAoB;IACxE,MAAM,eAAe,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,MAAM,CAAC,UAA6B,CAAC;IACxD,MAAM,eAAe,GAAG,UAAU,EAAE,YAAY,EAAE,CAAC;IAEnD,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;IACrB,MAAM,WAAW,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;IACzE,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAE1G,OAAO,gBAAQ,CAAC,KAAK,CAAC;QAClB,IAAI,EAAE,SAAS,CAAC,eAAe;QAC/B,MAAM,EAAE;YACJ,gBAAQ,CAAC,KAAK,CAAC;gBACX,IAAI,EAAE,OAAO;gBACb,cAAc,EAAE,8BAAsB,CAAC,MAAM;aAChD,CAAC;YACF,gBAAQ,CAAC,KAAK,CAAC;gBACX,IAAI,EAAE,OAAO;gBACb,cAAc,EAAE,4BAAoB,CAAC,OAAO,CAAC;oBACzC,0BAAkB,CAAC,SAAS,CAAC;wBACzB,aAAa,EAAE,GAAG,eAAe,aAAa;wBAC9C,QAAQ,EAAE,SAAS,CAAC,SAAS;qBAChC,CAAC;iBACL,CAAC;aACL,CAAC;SACL;QACD,OAAO,EAAE,EAAgB;QACzB,SAAS,EAAE,EAAgB;QAC3B,IAAI,EAAE;YACF,qBAAa,CAAC,KAAK;YAEnB,qBAAa,CAAC,SAAS,CAAC;gBACpB,eAAe,EAAE,WAAW,CAAC,YAAY,EAAE;gBAC3C,UAAU,EAAE,WAAW,CAAC,IAAI;gBAC5B,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;oBACtC,IAAI,cAAc,GAAG,IAAA,oBAAiB,EAAC,WAAW,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;oBACrE,4CAA4C;oBAC5C,IAAI,CAAC,cAAc,EAAE;wBACjB,cAAc,GAAG,IAAA,oBAAiB,EAAC,WAAW,EAAE,IAAI,CAAC,CAAC;qBACzD;oBACD,OAAO,IAAA,gBAAa,EAAC,cAAc,CAAC,IAAI,EAAE,cAAc,eAAe,KAAK,CAAC,CAAC;gBAClF,CAAC,CAAC;aACL,CAAC;YACF,IAAA,wBAAqB,EAAC,SAAS,CAAC,mBAAmB,EAAE,QAAQ,CAAC;YAC9D,qBAAa,CAAC,GAAG;SACpB;KACJ,CAAC,CAAC;AACP,CAAC;AA/CD,0DA+CC;AAED,SAAgB,kBAAkB,CAAC,MAAc,EAAE,SAAoB;IACnE,MAAM,eAAe,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,MAAM,CAAC,UAA6B,CAAC;IACxD,MAAM,eAAe,GAAG,UAAU,EAAE,YAAY,EAAE,CAAC;IACnD,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;IACrB,MAAM,WAAW,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;IACzE,OAAO,gBAAQ,CAAC,KAAK,CAAC;QAClB,IAAI,EAAE,SAAS,CAAC,mBAAmB;QACnC,MAAM,EAAE;YACJ,gBAAQ,CAAC,KAAK,CAAC;gBACX,IAAI,EAAE,OAAO;gBACb,cAAc,EAAE,8BAAsB,CAAC,MAAM;aAEhD,CAAC;YACF,gBAAQ,CAAC,KAAK,CAAC;gBACX,IAAI,EAAE,OAAO;gBACb,cAAc,EAAE,4BAAoB,CAAC,OAAO,CAAC;oBACzC,0BAAkB,CAAC,SAAS,CAAC;wBACzB,aAAa,EAAE,GAAG,eAAe,aAAa;wBAC9C,QAAQ,EAAE,SAAS,CAAC,SAAS;qBAChC,CAAC;iBACL,CAAC;aACL,CAAC;SACL;QACD,OAAO,EAAE,EAAgB;QACzB,IAAI,EAAE;YACF,qBAAa,CAAC,KAAK;YACnB,qBAAa,CAAC,UAAU,CAAC;gBACrB,IAAI,EAAE,IAAA,sBAAmB,EAAC,oBAAoB,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC,SAAS,UAAU,CAAC,CAAC;gBAC3F,KAAK,EAAE,qBAAa,CAAC,aAAa,CAAC;oBAC/B,KAAK,EAAE,EAAE;iBACZ,CAAC;aACL,CAAC;YACF,qBAAa,CAAC,SAAS,CAAC;gBACpB,eAAe,EAAE,WAAW,CAAC,YAAY,EAAE;gBAC3C,UAAU,EAAE,WAAW,CAAC,IAAI;gBAC5B,SAAS,EAAE;oBACP,IAAA,gBAAa,EAAC,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,cAAc,eAAe,EAAE,CAAC;iBAClF;aACJ,CAAC;YACF,qBAAa,CAAC,GAAG;SACpB;QACD,UAAU,EAAE,EAAgB;KAC/B,CAAC,CAAC;AACP,CAAC;AA5CD,gDA4CC"}
+{"version":3,"file":"genEditTableBlock.js","sourceRoot":"","sources":["../../src/templator/genEditTableBlock.ts"],"names":[],"mappings":"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"}

package/out/templator/genGetBlock.js

@@ -120,7 +120,7 @@ function genGetBlock(entity, view) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.View_${view.name}.logics",
+            "calleeNamespace": "${view.getNamespace()}.${view.name}.logics",
             "calleeName": "${nameGroup.viewLogicLoad}"
         }
     ]

package/out/templator/genGetBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"genGetBlock.js","sourceRoot":"","sources":["../../src/templator/genGetBlock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"genGetBlock.js","sourceRoot":"","sources":["../../src/templator/genGetBlock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAmC;AACnC,gDAAkC;AAElC,mCAGiB;AACjB,wBAA4E;AAE5E,SAAgB,cAAc,CAAC,MAAc,EAAE,SAAoB;IAC/D,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAA,iBAAc,EAAC,UAAU,CAAC,CAAC,CAAC;IAExE,OAAO;;MAEL,UAAU;SACP,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QACd,IAAI,QAAQ,GAAG,wCAAwC,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,IAAI,CAAC;QAE3F,QAAQ,IAAI,iBAAiB,GAAG,IAAA,gBAAa,EAAC,QAAQ,EAAE,GAAG,SAAS,CAAC,kBAAkB,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,aAAa,CAAC;QAE5H,QAAQ,IAAI,mCAAmC,CAAC;QAChD,OAAO,QAAQ,CAAC;IACpB,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC;;eAEF,CAAC;AAChB,CAAC;AAjBD,wCAiBC;AAED,SAAS,YAAY,CAAC,QAAe,EAAE,SAAoB;IACvD,MAAM,MAAM,GAAG,CAAC,IAAA,gBAAa,EAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;IAEnE,OAAO,gBAAQ,CAAC,KAAK,CAAC;QAClB,IAAI,EAAE,SAAS,CAAC,aAAa;QAC7B,WAAW,EAAE,EAAE;QACf,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;QACX,IAAI,EAAE;YACF,qBAAa,CAAC,KAAK;YACnB,qBAAa,CAAC,UAAU,CAAC;gBACrB,IAAI,EAAE,qBAAa,CAAC,UAAU,CAAC;oBAC3B,IAAI,EAAE,SAAS,CAAC,kBAAkB;iBACrC,CAAC;gBACF,KAAK,EAAE,qBAAa,CAAC,SAAS,CAAC;oBAC3B,eAAe,EAAE,QAAQ,CAAC,YAAY,EAAE;oBACxC,UAAU,EAAE,QAAQ,CAAC,IAAI;oBACzB,SAAS,EAAE,MAAM;iBACpB,CAAC;aACL,CAAC;YACF,qBAAa,CAAC,GAAG;SACpB;QACD,UAAU,EAAE,EAAE;KACjB,CAAC,CAAC;AACP,CAAC;AAED,SAAgB,gBAAgB,CAAC,MAAc,EAAE,SAAoB;IACjE,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAA,iBAAc,EAAC,UAAU,CAAC,CAAC,CAAC;IAExE,OAAO;MACL,UAAU;SACP,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QACd,IAAI,QAAQ,GAAG,uCAAuC,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,GAAG,CAAC;QAEzF,QAAQ,IAAI,WAAW,GAAG,IAAA,gBAAa,EAAC,QAAQ,EAAE,GAAG,SAAS,CAAC,kBAAkB,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;QAE7G,QAAQ,IAAI,2BAA2B,CAAC;QACxC,OAAO,QAAQ,CAAC;IACpB,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC;kBACC,CAAC;AACnB,CAAC;AAfD,4CAeC;AAED,SAAgB,WAAW,CAAC,MAAc,EAAE,IAAU;IAClD,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;IACrB,MAAM,QAAQ,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;IAEnE,MAAM,SAAS,GAAc,EAAE,CAAC;IAChC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACtD,SAAS,CAAC,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7F,SAAS,CAAC,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAE1D,OAAO;MACL,eAAM,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,SAAS,CAAC;;;;;;;;uBAQ9E,SAAS,CAAC,WAAW;gCACZ,IAAI,CAAC,SAAS,CAAC,8BAAsB,CAAC,IAAI,CAAC;;;;;;uBAMpD,SAAS,CAAC,kBAAkB;gCACnB,IAAI,CAAC,SAAS,CAAC,0BAAkB,CAAC,SAAS,CAAC;QACpE,aAAa,EAAE,MAAM,CAAC,YAAY,EAAE;QACpC,QAAQ,EAAE,MAAM,CAAC,IAAI;KACxB,CAAC,CAAC;;;;UAIG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;;;;;;;kCAOzB,IAAI,CAAC,YAAY,EAAE,IAAI,IAAI,CAAC,IAAI;6BACrC,SAAS,CAAC,aAAa;;;;;CAKnD,CAAC;AACF,CAAC;AA/CD,kCA+CC;AAED,kBAAe,WAAW,CAAC"}

package/out/templator/genListViewBlock.js

@@ -95,7 +95,7 @@ function genLoadListViewLogic(entity, nameGroup, newStructures, newLogics) {
                     calleeName: entityLogic.name,
                     arguments: [
                         (0, _1.genLogicParam)(`${entityLogic.params[0].name}`, 'params.page'),
-                        (0, _1.genLogicParam)(`${entityLogic.params[0].name}`, 'params.size'),
+                        (0, _1.genLogicParam)(`${entityLogic.params[1].name}`, 'params.size'),
                     ],
                 }),
             }),
@@ -113,7 +113,7 @@ function genListViewBlock(entity, view, property) {
     const nameGroup = (0, _1.genUniqueQueryNameGroup)(parentNode, view, viewElementMainView, false);
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-    const displayedProperty = property || (0, _1.getFirstDisplayedProperty)(entity, 'inDetail');
+    const displayedProperty = property || (0, _1.getFirstDisplayedProperty)(entity);
     const newStructures = [];
     const newLogics = [];
     return `<template>

package/out/templator/genListViewBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"genListViewBlock.js","sourceRoot":"","sources":["../../src/templator/genListViewBlock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"genListViewBlock.js","sourceRoot":"","sources":["../../src/templator/genListViewBlock.ts"],"names":[],"mappings":"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"}

package/out/templator/genSelectBlock.js

@@ -110,7 +110,7 @@ function genSelectBlock(entity, view) {
     const nameGroup = (0, _1.genUniqueQueryNameGroup)(parentNode, view, viewElementMainView, false);
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-    const displayedProperty = (0, _1.getFirstDisplayedProperty)(entity, 'inDetail');
+    const displayedProperty = (0, _1.getFirstDisplayedProperty)(entity);
     const allEntities = [
         entity,
     ];

package/out/templator/genSelectBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"genSelectBlock.js","sourceRoot":"","sources":["../../src/templator/genSelectBlock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAmC;AACnC,gDAAkC;AAElC,wBAAmI;AACnI,mCAGiB;AAEjB;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,QAAwB,EAAE,SAAoB;IAC5E,OAAO,8CAA8C,SAAS,CAAC,mBAAmB,mBAAmB,SAAS,CAAC,aAAa,kBAAkB,SAAS,CAAC,SAAS;kBACnJ,SAAS,CAAC,kBAAkB,IAAI,QAAQ,CAAC,IAAI;mBAC5C,SAAS,CAAC,kBAAkB;YACnC,CAAC;AACb,CAAC;AALD,8CAKC;AAED;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,QAAwB,EAAE,SAAoB;IAC9E,OAAO,oDAAoD,SAAS,CAAC,mBAAmB,mBAAmB,SAAS,CAAC,aAAa,kBAAkB,SAAS,CAAC,SAAS;kBACzJ,SAAS,CAAC,kBAAkB,IAAI,QAAQ,CAAC,IAAI;mBAC5C,SAAS,CAAC,kBAAkB;gBAC/B,CAAC;AACjB,CAAC;AALD,kDAKC;AAED,SAAgB,kBAAkB,CAAC,MAAc,EAAE,SAAoB,EAAE,QAAa;IAClF,MAAM,UAAU,GAAG,MAAM,CAAC,UAA6B,CAAC;IACxD,MAAM,eAAe,GAAG,UAAU,EAAE,YAAY,EAAE,CAAC;IACnD,MAAM,MAAM,GAAG;QACX,IAAA,gBAAa,EAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,aAAa,CAAC;QAC1D,IAAA,gBAAa,EAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,aAAa,CAAC;KAC7D,CAAC;IACF,OAAO,gBAAQ,CAAC,KAAK,CAAC;QAClB,IAAI,EAAE,SAAS,CAAC,aAAa;QAC7B,MAAM,EAAE;YACJ,gBAAQ,CAAC,KAAK,CAAC;gBACX,IAAI,EAAE,QAAQ;gBACd,cAAc,EAAE,4BAAoB,CAAC,gBAAgB;aACxD,CAAC;SACL;QACD,OAAO,EAAE;YACL,gBAAQ,CAAC,MAAM,CAAC;gBACZ,IAAI,EAAE,QAAQ;gBACd,cAAc,EAAE,oCAA4B,CAAC,MAAM,CAAC;oBAChD,0BAAkB,CAAC,SAAS,CAAC;wBACzB,aAAa,EAAE,GAAG,eAAe,aAAa;wBAC9C,QAAQ,EAAE,SAAS,CAAC,SAAS;qBAChC,CAAC;iBACL,CAAC;aACL,CAAC;SACL;QACD,SAAS,EAAE,EAAgB;QAC3B,IAAI,EAAE;YACF,qBAAa,CAAC,KAAK;YACnB,qBAAa,CAAC,UAAU,CAAC;gBACrB,IAAI,EAAE,qBAAa,CAAC,UAAU,CAAC;oBAC3B,IAAI,EAAE,QAAQ;iBACjB,CAAC;gBACF,KAAK,EAAE,qBAAa,CAAC,SAAS,CAAC;oBAC3B,eAAe,EAAE,GAAG,eAAe,SAAS;oBAC5C,UAAU,EAAE,QAAQ,CAAC,IAAI;oBACzB,SAAS,EAAE,MAAM;iBACpB,CAAC;aACL,CAAC;YACF,qBAAa,CAAC,GAAG;SACpB;KACJ,CAAC,CAAC;AACP,CAAC;AA1CD,gDA0CC;AAED;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,MAAc,EAAE,IAAU;IACrD,MAAM,UAAU,GAAG,MAAM,CAAC,UAA6B,CAAC;IAExD,MAAM,mBAAmB,GAAG,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,IAAA,0BAAuB,EAAC,UAAU,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,CAAC,CAAC;IACxF,SAAS,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACpD,SAAS,CAAC,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAE7F,MAAM,iBAAiB,GAAG,IAAA,4BAAyB,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAExE,MAAM,WAAW,GAAG;QAChB,MAAM;KACT,CAAC;IAEF,MAAM,aAAa,GAAe;QAC9B,IAAA,oBAAiB,EAAC,WAAW,EAAE,SAAS,CAAC;KAC5C,CAAC;IACF,MAAM,QAAQ,GAAG,IAAA,gBAAa,EAAC,WAAW,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IACjF,MAAM,SAAS,GAAe;QAC1B,QAAQ;KACX,CAAC;IAEF,OAAO;MACL,eAAM,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,SAAS,CAAC;;;;;;UAMvH,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;;;gBAGzD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;oBACrB,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC;;;CAGhD,CAAC;AACF,CAAC;AArCD,wCAqCC;AAED,kBAAe,cAAc,CAAC"}
+{"version":3,"file":"genSelectBlock.js","sourceRoot":"","sources":["../../src/templator/genSelectBlock.ts"],"names":[],"mappings":"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"}

package/out/templator/genUpdateBlock.js

@@ -46,13 +46,13 @@ function genUpdateFormTemplate(entity, nameGroup, selectNameGroupMap) {
         const rulesStr = rules.join(' | ');
         let formItem = `            <u-form-item label="${label}"${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
         const { typeAnnotation } = property || {};
-        const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace, } = typeAnnotation || {};
+        const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
         if (property.relationEntity) {
             // 有外键关联
             const relationEntity = parentNode?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity, 'inForm');
+                const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
                 if (displayedProperty) {
                     const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                     const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -127,13 +127,13 @@ function genH5UpdateFormTemplate(entity, nameGroup, selectNameGroupMap) {
         const rulesStr = rules.join(' | ');
         let formItem = `            <van-field drole="other" label="${label}"${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
         const { typeAnnotation } = property || {};
-        const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace, } = typeAnnotation || {};
+        const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
         if (property.relationEntity) {
             // 有外键关联
             const relationEntity = parentNode?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity, 'inForm');
+                const displayedProperty = (0, _1.getFirstDisplayedProperty)(relationEntity);
                 if (displayedProperty) {
                     const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                     const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -196,9 +196,7 @@ function genH5UpdateFormTemplate(entity, nameGroup, selectNameGroupMap) {
 }
 exports.genH5UpdateFormTemplate = genH5UpdateFormTemplate;
 function genSubmitLogic(updateLogic, nameGroup) {
-    const params = [
-        (0, _1.genLogicParam)(`${updateLogic.params[0].name}`, nameGroup.viewVariableEntity),
-    ];
+    const params = [(0, _1.genLogicParam)(`${updateLogic.params[0].name}`, nameGroup.viewVariableEntity)];
     return utils_1.NaslNode.Logic({
         name: nameGroup.viewLogicSubmit,
         params: [],
@@ -235,7 +233,7 @@ function genSubmitLogic(updateLogic, nameGroup) {
                     utils_1.NaslLogicItem.CallLogic({
                         label: '弹出消息',
                         shortcut: true,
-                        calleeNamespace: 'nasl.ui.logics',
+                        calleeNamespace: 'nasl.ui',
                         calleeName: 'showMessage',
                         arguments: [
                             utils_1.NaslLogicItem.Argument({
@@ -254,9 +252,7 @@ function genSubmitLogic(updateLogic, nameGroup) {
     });
 }
 function genLoadLogic(getLogic, nameGroup) {
-    const params = [
-        (0, _1.genLogicParam)(`${getLogic.params[0].name}`, 'id'),
-    ];
+    const params = [(0, _1.genLogicParam)(`${getLogic.params[0].name}`, 'id')];
     return utils_1.NaslNode.Logic({
         name: nameGroup.viewLogicLoad,
         description: '',
@@ -348,7 +344,7 @@ function genUpdateBlock(entity, view) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.View_${view.name}.logics",
+            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
             "calleeName": "${nameGroup.viewLogicLoad}"
         }
     ],

package/out/templator/genUpdateBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"genUpdateBlock.js","sourceRoot":"","sources":["../../src/templator/genUpdateBlock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"genUpdateBlock.js","sourceRoot":"","sources":["../../src/templator/genUpdateBlock.ts"],"names":[],"mappings":"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"}

package/out/templator/utils.d.ts

@@ -12,7 +12,7 @@ export declare function getExpression(property: EntityProperty, expression: stri
  * @param paramName
  */
 export declare function getParamFromLogic(logic: Logic, paramName: string): import("..").Param;
-export declare function getFirstDisplayedProperty(entity: Entity, display?: string): EntityProperty;
+export declare function getFirstDisplayedProperty(entity: Entity): EntityProperty;
 /**
  * 生成逻辑 Param
  * @param paramIdOrName 参数 id 或引用名称
@@ -316,7 +316,7 @@ export declare const NaslUITypeAnnotation: {
     };
 };
 export declare const NaslTypeAnnotation: {
-    Reference: ({ typeNamespace, typeName, }: {
+    Reference: ({ typeNamespace, typeName }: {
         typeNamespace: string;
         typeName: string;
     }) => {
@@ -389,7 +389,7 @@ export declare const NaslLogicItem: {
         calleeName: string;
         arguments: any[];
     };
-    Argument: ({ keyword, expression, }: {
+    Argument: ({ keyword, expression }: {
         keyword: string;
         expression: any;
     }) => {
@@ -399,24 +399,24 @@ export declare const NaslLogicItem: {
         keyword: string;
         expression: any;
     };
-    MemberExpression: ({ object, property, }: {
+    MemberExpression: ({ object, property }: {
         object: any;
         property: any;
     }) => {
         concept: string;
         name: string;
         kind: string;
-        objectqwer: any;
+        object: any;
         property: any;
     };
-    Identifier: ({ name, }: {
+    Identifier: ({ name }: {
         name: string;
     }) => {
         concept: string;
         kind: string;
         name: string;
     };
-    StringLiteral: ({ value, }: {
+    StringLiteral: ({ value }: {
         value: string;
     }) => {
         concept: string;
@@ -424,7 +424,7 @@ export declare const NaslLogicItem: {
         kind: string;
         value: string;
     };
-    Assignment: ({ left, right, }: {
+    Assignment: ({ left, right }: {
         left: any;
         right: any;
     }) => {
@@ -435,7 +435,7 @@ export declare const NaslLogicItem: {
         left: any;
         right: any;
     };
-    IfStatement: ({ test, consequent, alternate, }: {
+    IfStatement: ({ test, consequent, alternate }: {
         test: any;
         consequent: any[];
         alternate: any[];
@@ -447,7 +447,7 @@ export declare const NaslLogicItem: {
         consequent: any[];
         alternate: any[];
     };
-    BinaryExpression: ({ operator, left, label, right, }: {
+    BinaryExpression: ({ operator, left, label, right }: {
         operator: string;
         left?: any;
         right?: any;
@@ -463,7 +463,7 @@ export declare const NaslLogicItem: {
     };
 };
 export declare const NaslQueryExpression: {
-    QueryFieldExpression: ({ label, isDotStar, entityAsName, propertyName, }: {
+    QueryFieldExpression: ({ label, isDotStar, entityAsName, propertyName }: {
         label: string;
         isDotStar: boolean;
         entityAsName: string;
@@ -477,7 +477,7 @@ export declare const NaslQueryExpression: {
         entityAsName: string;
         propertyName: string;
     };
-    QueryFromExpression: ({ entityNamespace, entityName, joinParts, }: {
+    QueryFromExpression: ({ entityNamespace, entityName, joinParts }: {
         entityNamespace: string;
         entityName: string;
         joinParts: any[];
@@ -507,7 +507,7 @@ export declare const NaslQueryExpression: {
         onExpressions: any[];
         joinParts: any[];
     };
-    QuerySelectExpression: ({ label, distinct, star, selectElements, }: {
+    QuerySelectExpression: ({ label, distinct, star, selectElements }: {
         label?: string;
         distinct?: boolean;
         star?: boolean;
@@ -521,7 +521,7 @@ export declare const NaslQueryExpression: {
         star: boolean;
         selectElements: any[];
     };
-    QueryOrderByExpression: ({ label, order, orderElement, }: {
+    QueryOrderByExpression: ({ label, order, orderElement }: {
         label?: string;
         order: any;
         orderElement: any;
@@ -531,7 +531,7 @@ export declare const NaslQueryExpression: {
         order: any;
         orderElement: any;
     };
-    QueryLimitExpression: ({ label, pageElement, pageSizeElement, }: {
+    QueryLimitExpression: ({ label, pageElement, pageSizeElement }: {
         label?: string;
         pageElement: any;
         pageSizeElement: any;
@@ -591,7 +591,7 @@ export declare const NaslNode: {
         description: string;
         playground: any[];
     };
-    Structure: ({ name, properties, }: {
+    Structure: ({ name, properties }: {
         name: string;
         properties?: any[];
     }) => {
@@ -599,7 +599,7 @@ export declare const NaslNode: {
         name: string;
         properties: any[];
     };
-    StructureProperty: ({ name, typeAnnotation, }: {
+    StructureProperty: ({ name, typeAnnotation }: {
         name: string;
         typeAnnotation?: any;
     }) => {
@@ -607,7 +607,7 @@ export declare const NaslNode: {
         name: string;
         typeAnnotation: any;
     };
-    Variable: ({ name, typeAnnotation, }: {
+    Variable: ({ name, typeAnnotation }: {
         name: string;
         typeAnnotation?: any;
     }) => {
@@ -615,7 +615,7 @@ export declare const NaslNode: {
         name: string;
         typeAnnotation: any;
     };
-    Param: ({ name, typeAnnotation, }: {
+    Param: ({ name, typeAnnotation }: {
         name: string;
         typeAnnotation?: any;
     }) => {
@@ -623,7 +623,7 @@ export declare const NaslNode: {
         name: string;
         typeAnnotation: any;
     };
-    Return: ({ name, typeAnnotation, }: {
+    Return: ({ name, typeAnnotation }: {
         name: string;
         typeAnnotation?: any;
     }) => {

package/out/templator/utils.js

@@ -16,7 +16,7 @@ exports.filterProperty = filterProperty;
  */
 function getExpression(property, expression) {
     const { typeAnnotation } = property || {};
-    const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace, } = typeAnnotation || {};
+    const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
     if (propertyTypeName === 'DateTime')
         return `$utils['FormatDate'](${expression}, 'YYYY-MM-DD HH:mm:ss')`;
     else if (propertyTypeName === 'Date')
@@ -43,8 +43,8 @@ function getParamFromLogic(logic, paramName) {
     return params.find((item) => item.name === paramName);
 }
 exports.getParamFromLogic = getParamFromLogic;
-function getFirstDisplayedProperty(entity, display = 'inTable') {
-    let property = entity.properties.find((property) => property.editable);
+function getFirstDisplayedProperty(entity) {
+    let property = entity.properties.find((property) => !property.readonly);
     if (!property)
         property = entity.properties[0];
     return property;
@@ -208,7 +208,7 @@ exports.NaslUITypeAnnotation = {
     ScopeOf: genNaslUIGenericTypeAnnotation('ScopeOf'),
 };
 exports.NaslTypeAnnotation = {
-    Reference: ({ typeNamespace, typeName, }) => ({
+    Reference: ({ typeNamespace, typeName }) => ({
         concept: 'TypeAnnotation',
         name: '',
         typeKind: 'reference',
@@ -257,7 +257,7 @@ exports.NaslLogicItem = {
         arguments: args,
     }),
     // 参数
-    Argument: ({ keyword, expression, }) => ({
+    Argument: ({ keyword, expression }) => ({
         concept: 'Argument',
         name: '',
         kind: 'Statement',
@@ -265,27 +265,27 @@ exports.NaslLogicItem = {
         expression,
     }),
     // 成员表达式
-    MemberExpression: ({ object, property, }) => ({
+    MemberExpression: ({ object, property }) => ({
         concept: 'MemberExpression',
         name: '',
         kind: 'Expression',
-        objectqwer: object,
+        object,
         property,
     }),
     // 变量
-    Identifier: ({ name, }) => ({
+    Identifier: ({ name }) => ({
         concept: 'Identifier',
         kind: 'Expression',
         name,
     }),
     // 字面量
-    StringLiteral: ({ value, }) => ({
+    StringLiteral: ({ value }) => ({
         concept: 'StringLiteral',
         name: '',
         kind: 'Expression',
         value,
     }),
-    Assignment: ({ left, right, }) => ({
+    Assignment: ({ left, right }) => ({
         concept: 'Assignment',
         name: '',
         label: '赋值',
@@ -293,7 +293,7 @@ exports.NaslLogicItem = {
         left,
         right,
     }),
-    IfStatement: ({ test, consequent, alternate, }) => ({
+    IfStatement: ({ test, consequent, alternate }) => ({
         concept: 'IfStatement',
         name: '',
         kind: 'Statement',
@@ -302,7 +302,7 @@ exports.NaslLogicItem = {
         alternate,
     }),
     // 二元
-    BinaryExpression: ({ operator, left, label = '算术运算', right, }) => ({
+    BinaryExpression: ({ operator, left, label = '算术运算', right }) => ({
         concept: 'BinaryExpression',
         name: '',
         kind: 'Expression',
@@ -313,7 +313,7 @@ exports.NaslLogicItem = {
     }),
 };
 exports.NaslQueryExpression = {
-    QueryFieldExpression: ({ label, isDotStar, entityAsName, propertyName, }) => ({
+    QueryFieldExpression: ({ label, isDotStar, entityAsName, propertyName }) => ({
         concept: 'QueryFieldExpression',
         name: '',
         label,
@@ -322,7 +322,7 @@ exports.NaslQueryExpression = {
         entityAsName,
         propertyName,
     }),
-    QueryFromExpression: ({ entityNamespace, entityName, joinParts, }) => ({
+    QueryFromExpression: ({ entityNamespace, entityName, joinParts }) => ({
         concept: 'QueryFromExpression',
         name: '',
         kind: 'Expression',
@@ -341,7 +341,7 @@ exports.NaslQueryExpression = {
         onExpressions,
         joinParts,
     }),
-    QuerySelectExpression: ({ label, distinct, star, selectElements, }) => ({
+    QuerySelectExpression: ({ label, distinct, star, selectElements }) => ({
         concept: 'QuerySelectExpression',
         name: '',
         kind: 'Expression',
@@ -350,13 +350,13 @@ exports.NaslQueryExpression = {
         star,
         selectElements,
     }),
-    QueryOrderByExpression: ({ label, order, orderElement, }) => ({
+    QueryOrderByExpression: ({ label, order, orderElement }) => ({
         concept: 'QueryOrderByExpression',
         label,
         order,
         orderElement,
     }),
-    QueryLimitExpression: ({ label, pageElement, pageSizeElement, }) => ({
+    QueryLimitExpression: ({ label, pageElement, pageSizeElement }) => ({
         concept: 'QueryLimitExpression',
         name: '',
         kind: 'Expression',
@@ -392,27 +392,27 @@ exports.NaslNode = {
         description,
         playground,
     }),
-    Structure: ({ name, properties, }) => ({
+    Structure: ({ name, properties }) => ({
         concept: 'Structure',
         name,
         properties,
     }),
-    StructureProperty: ({ name, typeAnnotation, }) => ({
+    StructureProperty: ({ name, typeAnnotation }) => ({
         concept: 'StructureProperty',
         name,
         typeAnnotation,
     }),
-    Variable: ({ name, typeAnnotation, }) => ({
+    Variable: ({ name, typeAnnotation }) => ({
         concept: 'Variable',
         name,
         typeAnnotation,
     }),
-    Param: ({ name, typeAnnotation, }) => ({
+    Param: ({ name, typeAnnotation }) => ({
         concept: 'Param',
         name,
         typeAnnotation,
     }),
-    Return: ({ name, typeAnnotation, }) => ({
+    Return: ({ name, typeAnnotation }) => ({
         concept: 'Return',
         name,
         typeAnnotation,