@abaplint/cli 2.112.5 → 2.112.7

package/build/cli.js

@@ -9653,7 +9653,7 @@ class StatementParser {
                             continue; // probably punctuation
                         }
                         const s = this.categorizeStatement(new nodes_1.StatementNode(new _statement_1.Unknown()).setChildren(this.tokensToNodes(second)));
-                        if (!(s.get() instanceof _statement_1.Unknown)) {
+                        if (!(s.get() instanceof _statement_1.Unknown) && !(s.get() instanceof _statement_1.Empty)) {
                             result.push(new nodes_1.StatementNode(new _statement_1.Unknown()).setChildren(this.tokensToNodes(first)));
                             statement = s;
                             break;
@@ -22098,9 +22098,9 @@ class ObjectOriented {
         return ignore;
     }
     // returns list of interfaces implemented
-    fromInterfaces(classDefinition, skip) {
+    fromInterfaces(definition, skip) {
         const ignore = [];
-        for (const i of classDefinition.getImplementing()) {
+        for (const i of definition.getImplementing()) {
             ignore.push(...this.fromInterfaceByName(i.name, ignore.concat(skip || [])));
         }
         return ignore;
@@ -38730,6 +38730,7 @@ const _scope_type_1 = __webpack_require__(/*! ../5_syntax/_scope_type */ "./node
 const event_definition_1 = __webpack_require__(/*! ./event_definition */ "./node_modules/@abaplint/core/build/src/abap/types/event_definition.js");
 const method_definitions_1 = __webpack_require__(/*! ./method_definitions */ "./node_modules/@abaplint/core/build/src/abap/types/method_definitions.js");
 const _reference_1 = __webpack_require__(/*! ../5_syntax/_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
+const _object_oriented_1 = __webpack_require__(/*! ../5_syntax/_object_oriented */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_object_oriented.js");
 class InterfaceDefinition extends _identifier_1.Identifier {
     constructor(node, input) {
         if (!(node.get() instanceof Structures.Interface)) {
@@ -38795,32 +38796,12 @@ class InterfaceDefinition extends _identifier_1.Identifier {
     }
     parse(input, node) {
         this.checkInterfacesExists(input, node);
+        const helper = new _object_oriented_1.ObjectOriented(input.scope);
+        helper.fromInterfaces(this);
         // todo, proper sequencing, the statements should be processed line by line
         this.attributes = new class_attributes_1.Attributes(node, input);
         this.typeDefinitions = this.attributes.getTypes();
         this.aliases = this.attributes.getAliases();
-        // todo, cleanup aliases, vs "object_oriented.ts" vs "class_implementation.ts"
-        // this adds the aliased types to scope?
-        /*
-        for (const a of this.aliases) {
-          const [objName, fieldName] = a.getComponent().split("~");
-          const idef = input.scope.findInterfaceDefinition(objName);
-          if (idef) {
-            const foundType = idef.getTypeDefinitions().getByName(fieldName);
-            if (foundType) {
-              input.scope.addTypeNamed(a.getName(), foundType);
-            } else {
-              const foundField = idef.getAttributes().findByName(fieldName);
-              if (foundField && foundField instanceof ClassConstant) {
-                const token = new TokenIdentifier(a.getStart(), a.getName());
-                const id = new TypedIdentifier(token, input.filename, foundField.getType());
-                const constant = new ClassConstant(id, Visibility.Public, foundField.getValue());
-                input.scope.addIdentifier(constant);
-              }
-            }
-          }
-        }
-        */
         const events = node.findAllStatements(Statements.Events);
         for (const e of events) {
             this.events.push(new event_definition_1.EventDefinition(e, visibility_1.Visibility.Public, input));
@@ -52350,7 +52331,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.112.5";
+        return "2.112.7";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -76419,6 +76400,7 @@ Builder.prototype.j2x = function(jObj, level) {
       //repeated nodes
       const arrLen = jObj[key].length;
       let listTagVal = "";
+      let listTagAttr = "";
       for (let j = 0; j < arrLen; j++) {
         const item = jObj[key][j];
         if (typeof item === 'undefined') {
@@ -76428,17 +76410,27 @@ Builder.prototype.j2x = function(jObj, level) {
           else val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
           // val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
         } else if (typeof item === 'object') {
-          if(this.options.oneListGroup ){
-            listTagVal += this.j2x(item, level + 1).val;
+          if(this.options.oneListGroup){
+            const result = this.j2x(item, level + 1);
+            listTagVal += result.val;
+            if (this.options.attributesGroupName && item.hasOwnProperty(this.options.attributesGroupName)) {
+              listTagAttr += result.attrStr
+            }
           }else{
             listTagVal += this.processTextOrObjNode(item, key, level)
           }
         } else {
-          listTagVal += this.buildTextValNode(item, key, '', level);
+          if (this.options.oneListGroup) {
+            let textValue = this.options.tagValueProcessor(key, item);
+            textValue = this.replaceEntitiesValue(textValue);
+            listTagVal += textValue;
+          } else {
+            listTagVal += this.buildTextValNode(item, key, '', level);
+          }
         }
       }
       if(this.options.oneListGroup){
-        listTagVal = this.buildObjectNode(listTagVal, key, '', level);
+        listTagVal = this.buildObjectNode(listTagVal, key, listTagAttr, level);
       }
       val += listTagVal;
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.112.5",
+    "version": "2.112.7",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,23 +38,23 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.112.5",
+        "@abaplint/core": "^2.112.7",
         "@types/chai": "^4.3.16",
         "@types/glob": "^8.1.0",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.7",
-        "@types/node": "^20.14.11",
+        "@types/node": "^22.0.0",
         "@types/progress": "^2.0.7",
-        "chai": "^4.4.1",
+        "chai": "^4.5.0",
         "chalk": "^5.3.0",
         "eslint": "^8.57.0",
         "glob": "^7.2.3",
         "json5": "^2.2.3",
-        "memfs": "^4.9.3",
+        "memfs": "=4.9.3",
         "minimist": "^1.2.8",
         "mocha": "^10.7.0",
         "progress": "^2.0.3",
-        "typescript": "^5.5.3",
+        "typescript": "^5.5.4",
         "webpack": "^5.93.0",
         "webpack-cli": "^5.1.4",
         "xml-js": "^1.6.11"