@abaplint/transpiler-cli 2.5.5 → 2.5.6

package/build/bundle.js

@@ -4391,7 +4391,8 @@ class InlineData extends combi_1.Expression {
         const right = (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenRightW), (0, combi_1.tok)(tokens_1.ParenRight));
         const left = (0, combi_1.tok)(tokens_1.ParenLeft);
         const data = (0, combi_1.seq)("DATA", left, _1.TargetField, right);
-        return (0, combi_1.ver)(version_1.Version.v740sp02, data);
+        const final = (0, combi_1.seq)("FINAL", left, _1.TargetField, right);
+        return (0, combi_1.altPrio)((0, combi_1.ver)(version_1.Version.v740sp02, data), (0, combi_1.ver)(version_1.Version.v757, final));
     }
 }
 exports.InlineData = InlineData;
@@ -11700,7 +11701,6 @@ exports.Import = void 0;
 const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/core/build/src/abap/2_statements/combi.js");
 const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules/@abaplint/core/build/src/abap/1_lexer/tokens/index.js");
 const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
-const version_1 = __webpack_require__(/*! ../../../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class Import {
     getMatcher() {
         const dto = (0, combi_1.seq)("TO", expressions_1.Target);
@@ -11719,7 +11719,7 @@ class Import {
         const target = (0, combi_1.alt)(toeq, to, expressions_1.Dynamic, (0, combi_1.plus)(expressions_1.Target));
         const options = (0, combi_1.per)("ACCEPTING PADDING", "IGNORING CONVERSION ERRORS", "IN CHAR-TO-HEX MODE", "IGNORING STRUCTURE BOUNDARIES", "ACCEPTING TRUNCATION", (0, combi_1.seq)("REPLACEMENT CHARACTER", expressions_1.Source), (0, combi_1.seq)("CODE PAGE INTO", expressions_1.Source), (0, combi_1.seq)("ENDIAN INTO", expressions_1.Source));
         const ret = (0, combi_1.seq)("IMPORT", target, "FROM", source, (0, combi_1.opt)(options));
-        return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
+        return ret;
     }
 }
 exports.Import = Import;
@@ -21591,7 +21591,7 @@ class ComponentCompare {
                     throw new Error("ComponentCompare, source not structured");
                 }
                 if (type.getComponentByName(fieldName) === undefined) {
-                    throw new Error("Component " + fieldName + " not part of structure");
+                    throw new Error("Component \"" + fieldName + "\" not part of structure");
                 }
                 // todo, check type compatibility
             }
@@ -46037,7 +46037,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.24";
+        return "2.95.25";
     }
     getDDICReferences() {
         return this.references;
@@ -63413,6 +63413,7 @@ class UncaughtException extends _abap_rule_1.ABAPRule {
         if (stru === undefined) {
             return [];
         }
+        this.findLocalExceptions(obj);
         this.syntax = new syntax_1.SyntaxLogic(this.reg, obj).run();
         if (this.syntax.issues.length > 0) {
             return [];
@@ -63535,7 +63536,6 @@ class UncaughtException extends _abap_rule_1.ABAPRule {
         def.getRaising().forEach(r => { var _a; return (_a = this.sinked) === null || _a === void 0 ? void 0 : _a.push(r); });
     }
     isSinked(name) {
-        // todo: ignore dynamic and no_check exceptions
         if (this.sinked === undefined || name === undefined) {
             return true;
         }
@@ -63543,9 +63543,13 @@ class UncaughtException extends _abap_rule_1.ABAPRule {
         if (sup === "CX_DYNAMIC_CHECK" || sup === "CX_NO_CHECK") {
             return true;
         }
-        // todo, check local class hierarchy
+        const lsup = this.localExceptions[name.toUpperCase()];
+        if (lsup === "CX_DYNAMIC_CHECK" || lsup === "CX_NO_CHECK") {
+            return true;
+        }
         return this.sinked.some(a => a.toUpperCase() === name.toUpperCase())
-            || (sup !== undefined && this.isSinked(sup) === true);
+            || (sup !== undefined && this.isSinked(sup) === true)
+            || (lsup !== undefined && this.isSinked(lsup) === true);
     }
     findGlobalExceptions() {
         var _a, _b;
@@ -63562,6 +63566,17 @@ class UncaughtException extends _abap_rule_1.ABAPRule {
             this.globalExceptions[o.getName().toUpperCase()] = (_b = def.superClassName) === null || _b === void 0 ? void 0 : _b.toUpperCase();
         }
     }
+    findLocalExceptions(obj) {
+        var _a;
+        this.localExceptions = {};
+        for (const file of obj.getABAPFiles()) {
+            for (const def of file.getInfo().listClassDefinitions()) {
+                if (def.isLocal === true && def.superClassName !== undefined) {
+                    this.localExceptions[def.name.toUpperCase()] = (_a = def.superClassName) === null || _a === void 0 ? void 0 : _a.toUpperCase();
+                }
+            }
+        }
+    }
 }
 exports.UncaughtException = UncaughtException;
 //# sourceMappingURL=uncaught_exception.js.map
@@ -69237,7 +69252,7 @@ class HandleABAP {
         this.options = options;
     }
     runObject(obj, reg) {
-        var _a, _b, _c;
+        var _a, _b;
         let ret = [];
         if (obj instanceof abaplint.Objects.Program && obj.isInclude() === true) {
             // includes are only compiled along with the programs where its used?
@@ -69250,7 +69265,7 @@ class HandleABAP {
                 chunk.appendString("// " + file.getFilename() + "\n");
             }
             const rearranged = new rearranger_1.Rearranger().run(obj.getType(), file.getStructure());
-            const contents = new traversal_1.Traversal(spaghetti, file, obj, reg, ((_b = this.options) === null || _b === void 0 ? void 0 : _b.unknownTypes) === "runtimeError").traverse(rearranged);
+            const contents = new traversal_1.Traversal(spaghetti, file, obj, reg, this.options).traverse(rearranged);
             chunk.appendChunk(contents);
             chunk.stripLastNewline();
             chunk.runIndentationLogic();
@@ -69269,7 +69284,7 @@ class HandleABAP {
             ret.push(output);
         }
         ret = this.rearrangeClassLocals(obj, ret);
-        if (((_c = this.options) === null || _c === void 0 ? void 0 : _c.addCommonJS) === true) {
+        if (((_b = this.options) === null || _b === void 0 ? void 0 : _b.addCommonJS) === true) {
             ret.map(output => output.chunk = this.addImportsAndExports(output));
         }
         return ret;
@@ -71380,6 +71395,7 @@ class CreateObjectTranspiler {
         return new chunk_1.Chunk(ret);
     }
     findClassName(node, traversal) {
+        var _a;
         const c = node.findDirectExpression(abaplint.Expressions.ClassName);
         if (c) {
             return c.concatTokens();
@@ -71400,7 +71416,7 @@ class CreateObjectTranspiler {
             return "object";
         }
         else if (!(type instanceof abaplint.BasicTypes.ObjectReferenceType)) {
-            if (traversal.runtimeTypeError === false) {
+            if (((_a = traversal.options) === null || _a === void 0 ? void 0 : _a.unknownTypes) !== "runtimeError") {
                 throw new Error(`CreateObjectTranspiler, target variable "${target === null || target === void 0 ? void 0 : target.concatTokens()}" not a object reference`);
             }
             else {
@@ -75717,7 +75733,7 @@ class FunctionModuleTranspiler {
     }
     //////////////////////
     findSignature(traversal, name, node) {
-        var _a;
+        var _a, _b, _c;
         const group = traversal.getCurrentObject();
         if (group === undefined) {
             throw "FunctionModuleTranspilerGroupNotFound";
@@ -75738,10 +75754,13 @@ class FunctionModuleTranspiler {
                 direction = "importing";
             }
             // note: all directions are optional
-            const name = p.name.toLowerCase();
+            let name = p.name.toLowerCase();
+            if ((_b = (_a = traversal.options) === null || _a === void 0 ? void 0 : _a.keywords) === null || _b === void 0 ? void 0 : _b.some(a => a === name)) {
+                name += "_";
+            }
             ret += `let ${name} = INPUT.${direction}?.${name};\n`;
             if (direction === "exporting" || direction === "importing" || direction === "changing") {
-                const type = (_a = scope === null || scope === void 0 ? void 0 : scope.findVariable(name)) === null || _a === void 0 ? void 0 : _a.getType();
+                const type = (_c = scope === null || scope === void 0 ? void 0 : scope.findVariable(name)) === null || _c === void 0 ? void 0 : _c.getType();
                 if (type !== undefined) {
                     // todo, set DEFAULT value
                     // todo, check for OPTIONALness and raise exceptions and stuff
@@ -76294,13 +76313,13 @@ const transpile_types_1 = __webpack_require__(/*! ./transpile_types */ "./node_m
 const chunk_1 = __webpack_require__(/*! ./chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 const expressions_1 = __webpack_require__(/*! ./expressions */ "./node_modules/@abaplint/transpiler/build/src/expressions/index.js");
 class Traversal {
-    constructor(spaghetti, file, obj, reg, runtimeTypeError = false) {
+    constructor(spaghetti, file, obj, reg, options) {
         this.scopeCache = undefined;
         this.spaghetti = spaghetti;
         this.file = file;
         this.obj = obj;
         this.reg = reg;
-        this.runtimeTypeError = runtimeTypeError;
+        this.options = options;
     }
     static escapeNamespace(name) {
         return name === null || name === void 0 ? void 0 : name.replace(/\//g, "$");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,11 +25,11 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.5.5",
+    "@abaplint/transpiler": "^2.5.6",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@abaplint/core": "^2.95.24",
+    "@abaplint/core": "^2.95.25",
     "progress": "^2.0.3",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1",