@abaplint/transpiler-cli 2.6.15 → 2.6.16

package/build/bundle.js

@@ -12686,7 +12686,8 @@ class Message {
         const mwith = (0, combi_1.seq)("WITH", s, (0, combi_1.opt)(sourc));
         const foo = (0, combi_1.seq)(expressions_1.MessageSource, (0, combi_1.opt)(options), (0, combi_1.opt)(mwith));
         const text = (0, combi_1.seq)(s, type, (0, combi_1.optPrio)(like), (0, combi_1.optPrio)(raising));
-        const ret = (0, combi_1.seq)("MESSAGE", (0, combi_1.altPrio)(foo, text));
+        const cloud = (0, combi_1.seq)(expressions_1.MessageSource, (0, combi_1.opt)((0, combi_1.seq)("WITH", expressions_1.Source, (0, combi_1.opt)(expressions_1.Source), (0, combi_1.opt)(expressions_1.Source), (0, combi_1.opt)(expressions_1.Source))), into);
+        const ret = (0, combi_1.seq)("MESSAGE", (0, combi_1.altPrio)((0, combi_1.verNot)(version_1.Version.Cloud, foo), (0, combi_1.verNot)(version_1.Version.Cloud, text), (0, combi_1.ver)(version_1.Version.Cloud, cloud)));
         return ret;
     }
 }
@@ -18342,7 +18343,7 @@ class BuiltIn {
         ret.push(this.buildConstant("col_normal", new basic_1.IntegerType(), "2"));
         ret.push(this.buildConstant("col_positive", new basic_1.IntegerType(), "5"));
         ret.push(this.buildConstant("col_total", new basic_1.IntegerType(), "3"));
-        ret.push(this.buildConstant("space", new basic_1.CharacterType(1), "' '"));
+        ret.push(this.buildConstant("space", new basic_1.CharacterType(1, { derivedFromConstant: true }), "' '"));
         for (const e of extras) {
             const id = new tokens_1.Identifier(new position_1.Position(this.row++, 1), e);
             ret.push(new _typed_identifier_1.TypedIdentifier(id, BuiltIn.filename, new basic_1.VoidType(e), ["read_only" /* IdentifierMeta.ReadOnly */, "built-in" /* IdentifierMeta.BuiltIn */], "'?'"));
@@ -19547,6 +19548,9 @@ class CurrentScope {
     /** Lookup interface in local and global scope */
     findInterfaceDefinition(name) {
         var _a;
+        if (name === undefined) {
+            return undefined;
+        }
         const ilocal = (_a = this.current) === null || _a === void 0 ? void 0 : _a.findInterfaceDefinition(name);
         if (ilocal) {
             return ilocal;
@@ -20254,6 +20258,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TypeUtils = void 0;
 const types_1 = __webpack_require__(/*! ../types */ "./node_modules/@abaplint/core/build/src/abap/types/index.js");
 const basic_1 = __webpack_require__(/*! ../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const cgeneric_type_1 = __webpack_require__(/*! ../types/basic/cgeneric_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/cgeneric_type.js");
 class TypeUtils {
     constructor(scope) {
         this.scope = scope;
@@ -20274,6 +20279,7 @@ class TypeUtils {
             || type instanceof basic_1.AnyType
             || type instanceof basic_1.CharacterType
             || type instanceof basic_1.SimpleType
+            || type instanceof cgeneric_type_1.CGenericType
             || type instanceof basic_1.CLikeType
             || type instanceof basic_1.DateType
             || type instanceof basic_1.CSequenceType
@@ -20302,6 +20308,7 @@ class TypeUtils {
             return true;
         }
         else if (type instanceof basic_1.StringType
+            || type instanceof basic_1.CharacterType
             || type instanceof basic_1.VoidType
             || type instanceof basic_1.AnyType
             || type instanceof basic_1.UnknownType
@@ -20315,11 +20322,11 @@ class TypeUtils {
             || type instanceof basic_1.DecFloat34Type
             || type instanceof basic_1.NumericGenericType
             || type instanceof basic_1.CSequenceType
+            || type instanceof cgeneric_type_1.CGenericType
             || type instanceof basic_1.DateType
             || type instanceof basic_1.CLikeType
             || type instanceof basic_1.PackedType
-            || type instanceof basic_1.TimeType
-            || type instanceof basic_1.CharacterType) {
+            || type instanceof basic_1.TimeType) {
             return true;
         }
         return false;
@@ -20438,6 +20445,34 @@ class TypeUtils {
         // todo
         return true;
     }
+    structureContainsString(structure) {
+        for (const c of structure.getComponents()) {
+            if (c.type instanceof basic_1.StringType) {
+                return true;
+            }
+        }
+        return false;
+    }
+    isAssignableStrict(source, target) {
+        var _a;
+        /*
+            console.dir(source);
+            console.dir(target);
+        */
+        if (source instanceof basic_1.CharacterType && target instanceof basic_1.CharacterType) {
+            if (((_a = source.getAbstractTypeData()) === null || _a === void 0 ? void 0 : _a.derivedFromConstant) === true) {
+                return source.getLength() <= target.getLength();
+            }
+            return source.getLength() === target.getLength();
+        }
+        else if (source instanceof basic_1.StringType && target instanceof basic_1.StructureType) {
+            if (this.structureContainsString(target)) {
+                return false;
+            }
+            return true;
+        }
+        return this.isAssignable(source, target);
+    }
     isAssignable(source, target) {
         /*
             console.dir(source);
@@ -20447,12 +20482,14 @@ class TypeUtils {
             if (target.isWithHeader()) {
                 return this.isAssignable(source, target.getRowType());
             }
-            if (source instanceof basic_1.TableType
-                || source instanceof basic_1.VoidType
+            if (source instanceof basic_1.VoidType
                 || source instanceof basic_1.AnyType
                 || source instanceof basic_1.UnknownType) {
                 return true;
             }
+            else if (source instanceof basic_1.TableType) {
+                return this.isAssignableStrict(source.getRowType(), target.getRowType());
+            }
             return false;
         }
         else if (target instanceof basic_1.ObjectReferenceType && source instanceof basic_1.ObjectReferenceType) {
@@ -20482,12 +20519,17 @@ class TypeUtils {
             if (source instanceof basic_1.TableType && source.isWithHeader()) {
                 return this.isAssignable(source.getRowType(), target);
             }
-            else if (source instanceof basic_1.StructureType
-                || source instanceof basic_1.VoidType
+            else if (source instanceof basic_1.VoidType
                 || source instanceof basic_1.AnyType
                 || source instanceof basic_1.UnknownType) {
                 return true;
             }
+            else if (source instanceof basic_1.StructureType) {
+                if (this.structureContainsString(target) && !this.structureContainsString(source)) {
+                    return false;
+                }
+                return true;
+            }
             else if (target.containsVoid() === true) {
                 return true;
             }
@@ -21997,7 +22039,7 @@ class Constant {
             if (len <= 0) {
                 len = 1;
             }
-            return new basic_1.CharacterType(len);
+            return new basic_1.CharacterType(len, { derivedFromConstant: true });
         }
         else {
             return new basic_1.StringType({ qualifiedName: "STRING" });
@@ -23007,6 +23049,7 @@ class MethodCallBody {
         if (param) {
             new method_call_param_1.MethodCallParam().runSyntax(param, scope, method, filename);
         }
+        // for PARAMETER-TABLE and EXCEPTION-TABLE
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
@@ -23218,7 +23261,7 @@ class MethodCallParam {
             if (sourceType === undefined) {
                 throw new Error("No source type determined, method source");
             }
-            else if (new _type_utils_1.TypeUtils(scope).isAssignable(sourceType, targetType) === false) {
+            else if (new _type_utils_1.TypeUtils(scope).isAssignableStrict(sourceType, targetType) === false) {
                 throw new Error("Method parameter type not compatible");
             }
         }
@@ -23295,6 +23338,7 @@ const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@ab
 const basic_types_1 = __webpack_require__(/*! ../basic_types */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/basic_types.js");
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const default_1 = __webpack_require__(/*! ./default */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/default.js");
+const cgeneric_type_1 = __webpack_require__(/*! ../../types/basic/cgeneric_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/cgeneric_type.js");
 class MethodParam {
     runSyntax(node, scope, filename, meta) {
         const name = node.findDirectExpression(Expressions.MethodParamName);
@@ -23314,6 +23358,10 @@ class MethodParam {
                 return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, new basic_1.UnknownType(e.toString()), meta);
             }
         }
+        const concat = type.concatTokens().toUpperCase();
+        if (concat === "TYPE C" || concat.startsWith("TYPE C ")) {
+            return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, new cgeneric_type_1.CGenericType(), meta);
+        }
         const found = new basic_types_1.BasicTypes(filename, scope).parseType(type);
         if (found) {
             return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), filename, found, meta);
@@ -23466,7 +23514,7 @@ class MethodParameters {
             if (parameter === undefined) {
                 throw new Error("Method importing parameter \"" + item.name + "\" does not exist");
             }
-            else if (new _type_utils_1.TypeUtils(scope).isAssignable(item.sourceType, parameter.getType()) === false) {
+            else if (new _type_utils_1.TypeUtils(scope).isAssignableStrict(item.sourceType, parameter.getType()) === false) {
                 throw new Error("Method parameter type not compatible, " + item.name);
             }
             this.requiredParameters.delete(item.name);
@@ -26449,6 +26497,11 @@ class CreateObject {
                     if (id instanceof types_1.InterfaceDefinition && type === undefined) {
                         throw new Error("Interface reference, cannot be instantiated");
                     }
+                    else if (found instanceof basic_1.ObjectReferenceType
+                        && type === undefined
+                        && scope.findInterfaceDefinition(found.getQualifiedName())) {
+                        throw new Error("Interface reference, cannot be instantiated");
+                    }
                     else if (id instanceof types_1.ClassDefinition && cdef === undefined) {
                         cdef = id;
                     }
@@ -32601,6 +32654,39 @@ exports.AnyType = AnyType;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/core/build/src/abap/types/basic/cgeneric_type.js":
+/*!*********************************************************************************!*\
+  !*** ./node_modules/@abaplint/core/build/src/abap/types/basic/cgeneric_type.js ***!
+  \*********************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CGenericType = void 0;
+const _abstract_type_1 = __webpack_require__(/*! ./_abstract_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/_abstract_type.js");
+class CGenericType extends _abstract_type_1.AbstractType {
+    toText() {
+        return "```c```";
+    }
+    isGeneric() {
+        return true;
+    }
+    toABAP() {
+        throw new Error("c, generic");
+    }
+    containsVoid() {
+        return false;
+    }
+    toCDS() {
+        return "abap.TODO_CGENERIC";
+    }
+}
+exports.CGenericType = CGenericType;
+//# sourceMappingURL=cgeneric_type.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/types/basic/character_type.js":
 /*!**********************************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/types/basic/character_type.js ***!
@@ -33113,6 +33199,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__webpack_require__(/*! ./any_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/any_type.js"), exports);
+__exportStar(__webpack_require__(/*! ./cgeneric_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/cgeneric_type.js"), exports);
 __exportStar(__webpack_require__(/*! ./character_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/character_type.js"), exports);
 __exportStar(__webpack_require__(/*! ./clike_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/clike_type.js"), exports);
 __exportStar(__webpack_require__(/*! ./csequence_type */ "./node_modules/@abaplint/core/build/src/abap/types/basic/csequence_type.js"), exports);
@@ -46226,7 +46313,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.97.7";
+        return "2.97.10";
     }
     getDDICReferences() {
         return this.references;
@@ -67010,12 +67097,14 @@ class Chunk {
             this.appendString(str);
         }
     }
-    copy() {
+    /*
+      public copy(): Chunk {
         const ret = new Chunk();
         ret.raw = this.raw;
         ret.mappings = [...this.mappings];
         return ret;
-    }
+      }
+    */
     join(chunks, str = ", ") {
         for (let i = 0; i < chunks.length; i++) {
             this.appendChunk(chunks[i]);
@@ -77298,6 +77387,7 @@ class TranspileTypes {
             }
         }
         else if (type instanceof abaplint.BasicTypes.CLikeType
+            || type instanceof abaplint.BasicTypes.CGenericType
             || type instanceof abaplint.BasicTypes.CSequenceType) {
             // if not supplied its a Character(1)
             resolved = "Character";
@@ -77654,21 +77744,28 @@ class Traversal {
         if (ref === undefined) {
             return undefined;
         }
-        // local classes
+        // local
         if (ref.getFilename() === this.getFilename()) {
             const scope = this.findCurrentScopeByToken(ref.getToken());
             if ((scope === null || scope === void 0 ? void 0 : scope.getIdentifier().stype) === abaplint.ScopeType.Interface) {
                 return scope === null || scope === void 0 ? void 0 : scope.getIdentifier().sname;
             }
         }
-        // global classes
-        const file = this.reg.getFileByName(ref.getFilename());
-        if (file) {
-            const obj = this.reg.findObjectForFile(file);
-            if ((obj === null || obj === void 0 ? void 0 : obj.getType()) === "INTF") {
+        // global
+        for (const obj of this.reg.getObjectsByType("INTF")) {
+            if (obj.getFiles().some(f => f.getFilename() === ref.getFilename())) {
                 return obj.getName().toLowerCase();
             }
         }
+        /*
+        const file = this.reg.getFileByName(ref.getFilename());
+        if (file) {
+          const obj = this.reg.findObjectForFile(file);
+          if (obj?.getType() === "INTF") {
+            return obj.getName().toLowerCase();
+          }
+        }
+        */
         return undefined;
     }
     findReadOrWriteReference(token) {
@@ -79842,6 +79939,10 @@ const defaultOptions = {
     ignorePiTags: false,
     transformTagName: false,
     transformAttributeName: false,
+    updateTag: function(tagName, jPath, attrs){
+      return tagName
+    },
+    // skipEmptyListItem: false
 };
    
 const buildOptions = function(options) {
@@ -79912,6 +80013,7 @@ class OrderedObjParser{
     this.replaceEntitiesValue = replaceEntitiesValue;
     this.readStopNodeData = readStopNodeData;
     this.saveTextToParentTag = saveTextToParentTag;
+    this.addChild = addChild;
   }
 
 }
@@ -79983,7 +80085,7 @@ function resolveNameSpace(tagname) {
 //const attrsRegx = new RegExp("([\\w\\-\\.\\:]+)\\s*=\\s*(['\"])((.|\n)*?)\\2","gm");
 const attrsRegx = new RegExp('([^\\s=]+)\\s*(=\\s*([\'"])([\\s\\S]*?)\\3)?', 'gm');
 
-function buildAttributesMap(attrStr, jPath) {
+function buildAttributesMap(attrStr, jPath, tagName) {
   if (!this.options.ignoreAttributes && typeof attrStr === 'string') {
     // attrStr = attrStr.replace(/\r?\n/g, ' ');
     //attrStr = attrStr || attrStr.trim();
@@ -80033,7 +80135,7 @@ function buildAttributesMap(attrStr, jPath) {
       attrCollection[this.options.attributesGroupName] = attrs;
       return attrCollection;
     }
-    return attrs;
+    return attrs
   }
 }
 
@@ -80069,7 +80171,7 @@ const parseXml = function(xmlData) {
 
         jPath = jPath.substr(0, jPath.lastIndexOf("."));
         
-        currentNode = this.tagsNodeStack.pop();//avoid recurssion, set the parent tag scope
+        currentNode = this.tagsNodeStack.pop();//avoid recursion, set the parent tag scope
         textData = "";
         i = closeIndex;
       } else if( xmlData[i+1] === '?') {
@@ -80086,9 +80188,9 @@ const parseXml = function(xmlData) {
           childNode.add(this.options.textNodeName, "");
           
           if(tagData.tagName !== tagData.tagExp && tagData.attrExpPresent){
-            childNode[":@"] = this.buildAttributesMap(tagData.tagExp, jPath);
+            childNode[":@"] = this.buildAttributesMap(tagData.tagExp, jPath, tagData.tagName);
           }
-          currentNode.addChild(childNode);
+          this.addChild(currentNode, childNode, jPath)
 
         }
 
@@ -80176,7 +80278,7 @@ const parseXml = function(xmlData) {
 
           const childNode = new xmlNode(tagName);
           if(tagName !== tagExp && attrExpPresent){
-            childNode[":@"] = this.buildAttributesMap(tagExp, jPath);
+            childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
           }
           if(tagContent) {
             tagContent = this.parseTextData(tagContent, tagName, jPath, true, attrExpPresent, true, true);
@@ -80185,7 +80287,7 @@ const parseXml = function(xmlData) {
           jPath = jPath.substr(0, jPath.lastIndexOf("."));
           childNode.add(this.options.textNodeName, tagContent);
           
-          currentNode.addChild(childNode);
+          this.addChild(currentNode, childNode, jPath)
         }else{
   //selfClosing tag
           if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){
@@ -80202,10 +80304,10 @@ const parseXml = function(xmlData) {
 
             const childNode = new xmlNode(tagName);
             if(tagName !== tagExp && attrExpPresent){
-              childNode[":@"] = this.buildAttributesMap(tagExp, jPath);
+              childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
             }
             jPath = jPath.substr(0, jPath.lastIndexOf("."));
-            currentNode.addChild(childNode);
+            this.addChild(currentNode, childNode, jPath)
           }
     //opening tag
           else{
@@ -80213,9 +80315,9 @@ const parseXml = function(xmlData) {
             this.tagsNodeStack.push(currentNode);
             
             if(tagName !== tagExp && attrExpPresent){
-              childNode[":@"] = this.buildAttributesMap(tagExp, jPath);
+              childNode[":@"] = this.buildAttributesMap(tagExp, jPath, tagName);
             }
-            currentNode.addChild(childNode);
+            this.addChild(currentNode, childNode, jPath)
             currentNode = childNode;
           }
           textData = "";
@@ -80229,6 +80331,17 @@ const parseXml = function(xmlData) {
   return xmlObj.child;
 }
 
+function addChild(currentNode, childNode, jPath){
+  const result = this.options.updateTag(childNode.tagname, jPath, childNode[":@"])
+  if(result === false){
+  }else if(typeof result === "string"){
+    childNode.tagname = result
+    currentNode.addChild(childNode);
+  }else{
+    currentNode.addChild(childNode);
+  }
+}
+
 const replaceEntitiesValue = function(val){
 
   if(this.options.processEntities){
@@ -80285,7 +80398,7 @@ function isItStopNode(stopNodes, jPath, currentTagName){
 }
 
 /**
- * Returns the tag Expression and where it is ending handling single-dobule quotes situation
+ * Returns the tag Expression and where it is ending handling single-double quotes situation
  * @param {string} xmlData 
  * @param {number} i starting index
  * @returns 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.6.15",
+  "version": "2.6.16",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,14 +25,14 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.6.15",
+    "@abaplint/transpiler": "^2.6.16",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
     "@types/node": "^18.15.11",
-    "@abaplint/core": "^2.97.7",
+    "@abaplint/core": "^2.97.10",
     "progress": "^2.0.3",
-    "webpack": "^5.78.0",
+    "webpack": "^5.79.0",
     "webpack-cli": "^5.0.1",
     "typescript": "^5.0.4"
   }