@abaplint/transpiler-cli 2.6.16 → 2.6.18

package/build/bundle.js

@@ -20454,16 +20454,24 @@ class TypeUtils {
         return false;
     }
     isAssignableStrict(source, target) {
-        var _a;
+        var _a, _b;
         /*
             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();
+        if (source instanceof basic_1.CharacterType) {
+            if (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 (target instanceof basic_1.IntegerType) {
+                if (((_b = source.getAbstractTypeData()) === null || _b === void 0 ? void 0 : _b.derivedFromConstant) === true) {
+                    return true;
+                }
+                return false;
             }
-            return source.getLength() === target.getLength();
         }
         else if (source instanceof basic_1.StringType && target instanceof basic_1.StructureType) {
             if (this.structureContainsString(target)) {
@@ -20471,6 +20479,19 @@ class TypeUtils {
             }
             return true;
         }
+        else if (source instanceof basic_1.StructureType && target instanceof basic_1.StructureType) {
+            const sourceComponents = source.getComponents();
+            const targetComponents = target.getComponents();
+            if (sourceComponents.length !== targetComponents.length) {
+                return false;
+            }
+            for (let i = 0; i < sourceComponents.length; i++) {
+                if (this.isAssignableStrict(sourceComponents[i].type, targetComponents[i].type) === false) {
+                    return false;
+                }
+            }
+            return true;
+        }
         return this.isAssignable(source, target);
     }
     isAssignable(source, target) {
@@ -20488,7 +20509,31 @@ class TypeUtils {
                 return true;
             }
             else if (source instanceof basic_1.TableType) {
-                return this.isAssignableStrict(source.getRowType(), target.getRowType());
+                const targetRowType = target.getRowType();
+                const sourceRowType = source.getRowType();
+                if (targetRowType instanceof basic_1.VoidType || targetRowType instanceof basic_1.AnyType || targetRowType instanceof basic_1.UnknownType) {
+                    return true;
+                }
+                else if (sourceRowType instanceof basic_1.VoidType || sourceRowType instanceof basic_1.AnyType || sourceRowType instanceof basic_1.UnknownType) {
+                    return true;
+                }
+                if (targetRowType instanceof basic_1.StructureType && this.structureContainsString(targetRowType)) {
+                    if (!(sourceRowType instanceof basic_1.StructureType)) {
+                        return false;
+                    }
+                    else if (!(this.structureContainsString(sourceRowType))) {
+                        return false;
+                    }
+                }
+                if (sourceRowType instanceof basic_1.StructureType && this.structureContainsString(sourceRowType)) {
+                    if (!(targetRowType instanceof basic_1.StructureType)) {
+                        return false;
+                    }
+                    else if (!(this.structureContainsString(targetRowType))) {
+                        return false;
+                    }
+                }
+                return true;
             }
             return false;
         }
@@ -46313,7 +46358,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.97.10";
+        return "2.97.12";
     }
     getDDICReferences() {
         return this.references;
@@ -67121,7 +67166,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) {
@@ -67131,7 +67176,7 @@ class Chunk {
                 add.generated.line += lineCount - 1;
             }
             this.mappings.push(add);
-        });
+        }
         this.raw += append.getCode();
         return this;
     }
@@ -67183,10 +67228,13 @@ class Chunk {
     toString() {
         throw "error, dont toString a Chunk";
     }
-    runIndentationLogic() {
+    runIndentationLogic(ignoreSourceMap = false) {
         let i = 0;
         let line = 1;
         const output = [];
+        if (ignoreSourceMap === true) {
+            this.mappings = [];
+        }
         for (const l of this.raw.split("\n")) {
             if (l.startsWith("}")) {
                 i = i - 1;
@@ -70079,7 +70127,7 @@ class HandleABAP {
         this.options = options;
     }
     runObject(obj, reg) {
-        var _a, _b;
+        var _a, _b, _c;
         let ret = [];
         if (obj instanceof abaplint.Objects.Program && obj.isInclude() === true) {
             // includes are only compiled along with the programs where its used?
@@ -70095,7 +70143,7 @@ class HandleABAP {
             const contents = new traversal_1.Traversal(spaghetti, file, obj, reg, this.options).traverse(rearranged);
             chunk.appendChunk(contents);
             chunk.stripLastNewline();
-            chunk.runIndentationLogic();
+            chunk.runIndentationLogic((_b = this.options) === null || _b === void 0 ? void 0 : _b.ignoreSourceMap);
             const exports = this.findExports(file.getStructure());
             const filename = file.getFilename().replace(".abap", ".mjs").toLowerCase();
             const output = {
@@ -70111,7 +70159,7 @@ class HandleABAP {
             ret.push(output);
         }
         ret = this.rearrangeClassLocals(obj, ret);
-        if (((_b = this.options) === null || _b === void 0 ? void 0 : _b.addCommonJS) === true) {
+        if (((_c = this.options) === null || _c === void 0 ? void 0 : _c.addCommonJS) === true) {
             ret.map(output => output.chunk = this.addImportsAndExports(output));
         }
         return ret;
@@ -71197,7 +71245,7 @@ const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 class AssignTranspiler {
     transpile(node, traversal) {
-        var _a;
+        var _a, _b;
         const assignSource = node.findDirectExpression(abaplint.Expressions.AssignSource);
         const sources = (assignSource === null || assignSource === void 0 ? void 0 : assignSource.findDirectExpressions(abaplint.Expressions.Source).map(e => new expressions_1.SourceTranspiler(false).transpile(e, traversal).getCode())) || [];
         const fs = new expressions_1.FieldSymbolTranspiler().transpile(node.findDirectExpression(abaplint.Expressions.FSTarget), traversal).getCode();
@@ -71249,8 +71297,13 @@ class AssignTranspiler {
             if ((first === null || first === void 0 ? void 0 : first.get()) instanceof abaplint.Expressions.Dynamic && first instanceof abaplint.Nodes.ExpressionNode) {
                 const firstFirst = first.getChildren()[1];
                 if ((firstFirst === null || firstFirst === void 0 ? void 0 : firstFirst.get()) instanceof abaplint.Expressions.Constant) {
-                    const s = firstFirst.getFirstToken().getStr().toLowerCase().match(/\w+/);
-                    options.push(`dynamicSource: (() => {try { return ${s}; } catch {}})()`);
+                    const s = (_b = firstFirst.getFirstToken().getStr().toLowerCase().match(/\w+/)) === null || _b === void 0 ? void 0 : _b.toString();
+                    if (s === "me") {
+                        options.push(`dynamicSource: this.me`);
+                    }
+                    else {
+                        options.push(`dynamicSource: (() => {try { return ${s}; } catch {}})()`);
+                    }
                 }
                 else if ((firstFirst === null || firstFirst === void 0 ? void 0 : firstFirst.get()) instanceof abaplint.Expressions.FieldChain && firstFirst instanceof abaplint.Nodes.ExpressionNode) {
                     const code = new expressions_1.FieldChainTranspiler(true).transpile(firstFirst, traversal).getCode();
@@ -77947,7 +78000,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 {
@@ -77993,7 +78046,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 {
@@ -78005,13 +78058,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-cli",
-  "version": "2.6.16",
+  "version": "2.6.18",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,12 +25,12 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.6.16",
+    "@abaplint/transpiler": "^2.6.18",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
     "@types/node": "^18.15.11",
-    "@abaplint/core": "^2.97.10",
+    "@abaplint/core": "^2.97.12",
     "progress": "^2.0.3",
     "webpack": "^5.79.0",
     "webpack-cli": "^5.0.1",