@abaplint/transpiler 2.7.165 → 2.8.1

package/build/src/traversal.js

@@ -18,7 +18,7 @@ class Traversal {
         this.options = options;
     }
     static escapeNamespace(name) {
-        return name === null || name === void 0 ? void 0 : name.replace(/\//g, "$");
+        return name?.replace(/\//g, "$");
     }
     getCurrentObject() {
         return this.obj;
@@ -83,7 +83,7 @@ class Traversal {
         let scope = this.findCurrentScopeByToken(token);
         while (scope !== undefined) {
             if (scope.getIdentifier().stype === abaplint.ScopeType.Interface) {
-                return scope.findInterfaceDefinition(scope === null || scope === void 0 ? void 0 : scope.getIdentifier().sname);
+                return scope.findInterfaceDefinition(scope?.getIdentifier().sname);
             }
             scope = scope.getParent();
         }
@@ -94,7 +94,7 @@ class Traversal {
         while (scope !== undefined) {
             if (scope.getIdentifier().stype === abaplint.ScopeType.ClassImplementation
                 || scope.getIdentifier().stype === abaplint.ScopeType.ClassDefinition) {
-                return scope.findClassDefinition(scope === null || scope === void 0 ? void 0 : scope.getIdentifier().sname);
+                return scope.findClassDefinition(scope?.getIdentifier().sname);
             }
             scope = scope.getParent();
         }
@@ -201,18 +201,17 @@ class Traversal {
         }
     }
     buildAttributes(def, scope, prefix = "") {
-        var _a, _b;
         const attr = [];
         if (def === undefined) {
             return attr;
         }
-        for (const a of ((_a = def.getAttributes()) === null || _a === void 0 ? void 0 : _a.getAll()) || []) {
+        for (const a of def.getAttributes()?.getAll() || []) {
             const type = new transpile_types_1.TranspileTypes().toType(a.getType());
             const runtime = this.mapVisibility(a.getVisibility());
             const isClass = a.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) ? "X" : " ";
             attr.push(`"${prefix + a.getName().toUpperCase()}": {"type": () => {return ${type};}, "visibility": "${runtime}", "is_constant": " ", "is_class": "${isClass}"}`);
         }
-        for (const a of ((_b = def.getAttributes()) === null || _b === void 0 ? void 0 : _b.getConstants()) || []) {
+        for (const a of def.getAttributes()?.getConstants() || []) {
             const type = new transpile_types_1.TranspileTypes().toType(a.getType());
             let runtime = "";
             switch (a.getVisibility()) {
@@ -248,7 +247,7 @@ class Traversal {
     }
     isSQLConversion(token) {
         const scope = this.findCurrentScopeByToken(token);
-        for (const s of (scope === null || scope === void 0 ? void 0 : scope.getData().sqlConversion) || []) {
+        for (const s of scope?.getData().sqlConversion || []) {
             if (s.token.getStart().equals(token.getStart())) {
                 return s.fieldName;
             }
@@ -256,7 +255,6 @@ class Traversal {
         return undefined;
     }
     findMethodReference(token, scope) {
-        var _a, _b;
         let candidate = undefined;
         if (scope === undefined) {
             return undefined;
@@ -266,7 +264,7 @@ class Traversal {
                 && r.position.getStart().equals(token.getStart())
                 && r.resolved instanceof abaplint.Types.MethodDefinition) {
                 let name = r.resolved.getName();
-                if (((_a = r.extra) === null || _a === void 0 ? void 0 : _a.ooName) && ((_b = r.extra) === null || _b === void 0 ? void 0 : _b.ooType) === "INTF") {
+                if (r.extra?.ooName && r.extra?.ooType === "INTF") {
                     name = r.extra.ooName + "$" + name;
                 }
                 candidate = { def: r.resolved, name };
@@ -300,13 +298,13 @@ class Traversal {
     }
     isTypePool(token) {
         const ref = this.findReadOrWriteReference(token);
-        if (ref === null || ref === void 0 ? void 0 : ref.getFilename().endsWith(".type.abap")) {
+        if (ref?.getFilename().endsWith(".type.abap")) {
             const file = this.reg.getFileByName(ref.getFilename());
             if (file === undefined) {
                 return undefined;
             }
             const obj = this.reg.findObjectForFile(file);
-            return obj === null || obj === void 0 ? void 0 : obj.getName();
+            return obj?.getName();
         }
         return undefined;
     }
@@ -319,8 +317,8 @@ class Traversal {
         // 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;
+            if (scope?.getIdentifier().stype === abaplint.ScopeType.Interface) {
+                return scope?.getIdentifier().sname;
             }
         }
         // global
@@ -355,7 +353,6 @@ class Traversal {
         return undefined;
     }
     buildConstructorContents(scope, def) {
-        var _a, _b, _c;
         let ret = "";
         if (def.getSuperClass() !== undefined || def.getName().toUpperCase() === "CX_ROOT") {
             ret += "super();\n";
@@ -363,7 +360,7 @@ class Traversal {
         const cName = Traversal.escapeNamespace(def.getName().toLowerCase());
         ret += "this.me = new abap.types.ABAPObject();\n";
         ret += "this.me.set(this);\n";
-        for (const a of ((_a = def.getAttributes()) === null || _a === void 0 ? void 0 : _a.getAll()) || []) {
+        for (const a of def.getAttributes()?.getAll() || []) {
             const escaped = Traversal.escapeNamespace(a.getName().toLowerCase());
             if (a.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) === true) {
                 ret += "this." + escaped + " = " + cName + "." + escaped + ";\n";
@@ -379,20 +376,20 @@ class Traversal {
             ret += this.aliasesFromInterfaces(i.name, scope, cName);
         }
         // handle aliases after initialization of carrier variables
-        for (const a of ((_b = def.getAliases()) === null || _b === void 0 ? void 0 : _b.getAll()) || []) {
+        for (const a of def.getAliases()?.getAll() || []) {
             ret += "this." + a.getName().toLowerCase() + " = this." + Traversal.escapeNamespace(a.getComponent().replace("~", "$").toLowerCase()) + ";\n";
         }
         // constants can be accessed both statically and via reference
-        for (const c of ((_c = def.getAttributes()) === null || _c === void 0 ? void 0 : _c.getConstants()) || []) {
+        for (const c of def.getAttributes()?.getConstants() || []) {
             ret += "this." + Traversal.escapeNamespace(c.getName().toLowerCase()) + " = " + cName + "." + Traversal.escapeNamespace(c.getName().toLowerCase()) + ";\n";
         }
         return ret;
     }
     findInterfaceDefinition(name, scope) {
-        let intf = scope === null || scope === void 0 ? void 0 : scope.findInterfaceDefinition(name);
+        let intf = scope?.findInterfaceDefinition(name);
         if (intf === undefined) {
             const iglobal = this.reg.getObject("INTF", name);
-            intf = iglobal === null || iglobal === void 0 ? void 0 : iglobal.getDefinition();
+            intf = iglobal?.getDefinition();
         }
         return intf;
     }
@@ -407,24 +404,24 @@ class Traversal {
         let clas = scope.findClassDefinition(name);
         if (clas === undefined) {
             const iglobal = this.reg.getObject("CLAS", name);
-            clas = iglobal === null || iglobal === void 0 ? void 0 : iglobal.getDefinition();
+            clas = iglobal?.getDefinition();
         }
         return clas;
     }
     dataFromInterfaces(name, scope, cname) {
         let ret = "";
         const intf = this.findInterfaceDefinition(name, scope);
-        for (const a of (intf === null || intf === void 0 ? void 0 : intf.getAttributes().getConstants()) || []) {
+        for (const a of intf?.getAttributes().getConstants() || []) {
             const fname = Traversal.escapeNamespace(a.getName().toLowerCase());
-            const iname = Traversal.escapeNamespace(intf === null || intf === void 0 ? void 0 : intf.getName().toLowerCase());
-            if ((intf === null || intf === void 0 ? void 0 : intf.isGlobal()) === true) {
-                ret += "this." + iname + "$" + fname + " = abap.Classes['" + (intf === null || intf === void 0 ? void 0 : intf.getName().toUpperCase()) + "']." + iname + "$" + fname + ";\n";
+            const iname = Traversal.escapeNamespace(intf?.getName().toLowerCase());
+            if (intf?.isGlobal() === true) {
+                ret += "this." + iname + "$" + fname + " = abap.Classes['" + intf?.getName().toUpperCase() + "']." + iname + "$" + fname + ";\n";
             }
             else {
                 ret += "this." + iname + "$" + fname + " = " + iname + "." + iname + "$" + fname + ";\n";
             }
         }
-        for (const a of (intf === null || intf === void 0 ? void 0 : intf.getAttributes().getAll()) || []) {
+        for (const a of intf?.getAttributes().getAll() || []) {
             const n = Traversal.escapeNamespace(name.toLowerCase()) + "$" + a.getName().toLowerCase();
             // note: interface inheritenace and super inheritance might be strange,
             if (a.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) === true) {
@@ -434,7 +431,7 @@ class Traversal {
                 ret += "if (this." + n + " === undefined) this." + n + " = " + new transpile_types_1.TranspileTypes().toType(a.getType()) + ";\n";
             }
         }
-        for (const i of (intf === null || intf === void 0 ? void 0 : intf.getImplementing()) || []) {
+        for (const i of intf?.getImplementing() || []) {
             ret += this.dataFromInterfaces(i.name, scope, cname);
         }
         return ret;
@@ -442,19 +439,18 @@ class Traversal {
     aliasesFromInterfaces(name, scope, cname) {
         let ret = "";
         const intf = this.findInterfaceDefinition(name, scope);
-        for (const a of (intf === null || intf === void 0 ? void 0 : intf.getAliases().getAll()) || []) {
-            const iname = Traversal.escapeNamespace(intf === null || intf === void 0 ? void 0 : intf.getName().toLowerCase());
+        for (const a of intf?.getAliases().getAll() || []) {
+            const iname = Traversal.escapeNamespace(intf?.getName().toLowerCase());
             const aname = Traversal.escapeNamespace(a.getName().toLowerCase());
             const cname = Traversal.escapeNamespace(a.getComponent().toLowerCase().replace("~", "$"));
             ret += "this." + iname + "$" + aname + " = this." + cname + ";\n";
         }
-        for (const i of (intf === null || intf === void 0 ? void 0 : intf.getImplementing()) || []) {
+        for (const i of intf?.getImplementing() || []) {
             ret += this.aliasesFromInterfaces(i.name, scope, cname);
         }
         return ret;
     }
     determineType(node, scope) {
-        var _a, _b, _c;
         if (scope === undefined) {
             return undefined;
         }
@@ -465,7 +461,7 @@ class Traversal {
         let context = undefined;
         for (const c of found.getChildren()) {
             if (context === undefined) {
-                context = (_a = scope.findVariable(c.getFirstToken().getStr())) === null || _a === void 0 ? void 0 : _a.getType();
+                context = scope.findVariable(c.getFirstToken().getStr())?.getType();
             }
             else if (c.get() instanceof abaplint.Expressions.ComponentName
                 && context instanceof abaplint.BasicTypes.StructureType) {
@@ -479,10 +475,10 @@ class Traversal {
                     if (concat.includes("~")) {
                         const [iname, aname] = concat.split("~");
                         const intf = this.findInterfaceDefinition(iname, scope);
-                        context = (_b = intf === null || intf === void 0 ? void 0 : intf.getAttributes().findByName(aname)) === null || _b === void 0 ? void 0 : _b.getType();
+                        context = intf?.getAttributes().findByName(aname)?.getType();
                     }
                     else {
-                        context = (_c = id.getAttributes().findByName(concat)) === null || _c === void 0 ? void 0 : _c.getType();
+                        context = id.getAttributes().findByName(concat)?.getType();
                     }
                 }
             }
@@ -569,14 +565,13 @@ class Traversal {
         return ret;
     }
     buildInternalName(name, def) {
-        var _a, _b;
         if (def) {
             if (def.isGlobal() === false) {
                 const prefix = this.buildPrefix();
-                return `${prefix}${(_a = def === null || def === void 0 ? void 0 : def.getName()) === null || _a === void 0 ? void 0 : _a.toUpperCase()}`;
+                return `${prefix}${def?.getName()?.toUpperCase()}`;
             }
             else {
-                return (_b = def === null || def === void 0 ? void 0 : def.getName()) === null || _b === void 0 ? void 0 : _b.toUpperCase();
+                return def?.getName()?.toUpperCase();
             }
         }
         // assume global
@@ -590,9 +585,9 @@ class Traversal {
             return "abap.Classes[" + name + ".trimEnd()]";
         }
         const scope = this.findCurrentScopeByToken(token);
-        let def = scope === null || scope === void 0 ? void 0 : scope.findClassDefinition(name);
+        let def = scope?.findClassDefinition(name);
         if (def === undefined) {
-            def = scope === null || scope === void 0 ? void 0 : scope.findInterfaceDefinition(name);
+            def = scope?.findInterfaceDefinition(name);
         }
         const internalName = this.buildInternalName(name, def);
         return "abap.Classes['" + internalName + "']";

package/build/src/unit_test.js

@@ -357,11 +357,10 @@ run().then(() => {
     // class constructors might make early use of eg. constants from interfaces
     // sub classes will import() super classes and trigger a class constructor of the super
     hasClassConstructor(reg, clas) {
-        var _a, _b;
-        if (((_a = clas.getDefinition()) === null || _a === void 0 ? void 0 : _a.getMethodDefinitions().getByName("CLASS_CONSTRUCTOR")) !== undefined) {
+        if (clas.getDefinition()?.getMethodDefinitions().getByName("CLASS_CONSTRUCTOR") !== undefined) {
             return true;
         }
-        const sup = (_b = clas.getDefinition()) === null || _b === void 0 ? void 0 : _b.getSuperClass();
+        const sup = clas.getDefinition()?.getSuperClass();
         if (sup !== undefined) {
             const superClass = reg.getObject("CLAS", sup);
             if (superClass) {

package/build/src/validation.js

@@ -112,15 +112,14 @@ class Validation {
         this.options = options;
     }
     run(reg) {
-        var _a, _b, _c;
-        if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.ignoreSyntaxCheck) === true) {
+        if (this.options?.ignoreSyntaxCheck === true) {
             exports.config.rules["check_syntax"] = false;
         }
         else {
             exports.config.rules["check_syntax"] = true;
         }
         exports.config.rules["forbidden_identifier"]["check"] = ["^unique\\d+$"];
-        if (((_b = this.options) === null || _b === void 0 ? void 0 : _b.keywords) === undefined) {
+        if (this.options?.keywords === undefined) {
             for (const d of keywords_1.defaultKeywords) {
                 const add = "^" + d + "$";
                 exports.config.rules["forbidden_identifier"]["check"].push(add);
@@ -132,7 +131,7 @@ class Validation {
                 exports.config.rules["forbidden_identifier"]["check"].push(add);
             }
         }
-        if (((_c = this.options) === null || _c === void 0 ? void 0 : _c.unknownTypes) === types_1.UnknownTypesEnum.runtimeError) {
+        if (this.options?.unknownTypes === types_1.UnknownTypesEnum.runtimeError) {
             // this is not a constant, just a regex that happens to not match anything
             exports.config.syntax.errorNamespace = "VOID_EVERYTHING";
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.7.165",
+  "version": "2.8.1",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",