@abaplint/transpiler 2.6.15 → 2.6.17

package/build/src/chunk.d.ts

@@ -4,7 +4,6 @@ export declare class Chunk {
     private raw;
     mappings: sourceMap.Mapping[];
     constructor(str?: string);
-    copy(): Chunk;
     join(chunks: Chunk[], str?: string): Chunk;
     appendChunk(append: Chunk): Chunk;
     append(input: string, pos: abaplint.Position | abaplint.INode | abaplint.Token, traversal: {

package/build/src/chunk.js

@@ -22,12 +22,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]);
@@ -44,7 +46,7 @@ class Chunk {
         const lines = this.raw.split("\n");
         const lineCount = lines.length;
         const lastLine = lines[lines.length - 1];
-        append.mappings.forEach(m => {
+        for (const m of append.mappings) {
             // original stays the same, but adjust the generated positions
             const add = m;
             if (add.generated.line === 1 && this.raw.endsWith("\n") === false) {
@@ -54,7 +56,7 @@ class Chunk {
                 add.generated.line += lineCount - 1;
             }
             this.mappings.push(add);
-        });
+        }
         this.raw += append.getCode();
         return this;
     }

package/build/src/transpile_types.js

@@ -88,6 +88,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";

package/build/src/traversal.js

@@ -257,21 +257,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) {
@@ -453,7 +460,7 @@ class Traversal {
         }
         const name = def.getName();
         if (def.isGlobal() === false) {
-            const prefix = this.buildPrefix(def);
+            const prefix = this.buildPrefix();
             return `abap.Classes['${prefix}-${name.toUpperCase()}'] = ${Traversal.escapeNamespace(name.toLowerCase())};`;
         }
         else {
@@ -499,7 +506,7 @@ class Traversal {
         }
         if (def) {
             if (def.isGlobal() === false) {
-                const prefix = this.buildPrefix(def);
+                const prefix = this.buildPrefix();
                 return `abap.Classes['${prefix}-${(_a = def === null || def === void 0 ? void 0 : def.getName()) === null || _a === void 0 ? void 0 : _a.toUpperCase()}']`;
             }
             else {
@@ -511,13 +518,8 @@ class Traversal {
             return "abap.Classes['" + name.toUpperCase() + "']";
         }
     }
-    buildPrefix(def) {
-        const file = this.reg.getFileByName(def.getFilename());
-        if (file === undefined) {
-            return "NOT_FOUND";
-        }
-        const obj = this.reg.findObjectForFile(file);
-        return (obj === null || obj === void 0 ? void 0 : obj.getType()) + "-" + (obj === null || obj === void 0 ? void 0 : obj.getName());
+    buildPrefix() {
+        return this.obj.getType() + "-" + this.obj.getName();
     }
     ////////////////////////////
     traverseStructure(node) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.6.15",
+  "version": "2.6.17",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -28,7 +28,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.97.7",
+    "@abaplint/core": "^2.97.12",
     "source-map": "^0.7.4"
   },
   "devDependencies": {