@abaplint/transpiler 1.6.68 → 1.7.2

package/build/src/expressions/constant.js

@@ -22,12 +22,15 @@ class ConstantTranspiler {
             str = node.findFirstExpression(core_1.Expressions.TextElementString);
         }
         if (str) {
-            const res = str.getFirstToken().getStr();
+            let res = str.getFirstToken().getStr();
             if (res.startsWith("'") && this.addGet === false) {
                 const code = "new abap.types.Character({length: " + (res.length - 2) + "}).set(" + this.escape(res) + ")";
                 return new chunk_1.Chunk().append(code, node, traversal);
             }
             else {
+                if (res.startsWith("'")) {
+                    res = "'" + res.substring(1, res.length - 1).trimEnd() + "'";
+                }
                 const code = this.escape(res);
                 return new chunk_1.Chunk().append(code, node, traversal);
             }

package/build/src/statements/do.js

@@ -12,14 +12,14 @@ class DoTranspiler {
             const source = new expressions_1.SourceTranspiler(true).transpile(found, traversal).getCode();
             const idSource = unique_identifier_1.UniqueIdentifier.get();
             const id = unique_identifier_1.UniqueIdentifier.get();
-            return new chunk_1.Chunk(`const ${idSource} = ${source};
-for (let ${id} = 0; ${id} < ${idSource}; ${id}++) {
+            return new chunk_1.Chunk(`const ${idSource} = ${source};
+for (let ${id} = 0; ${id} < ${idSource}; ${id}++) {
 abap.builtin.sy.get().index.set(${id} + 1);`);
         }
         else {
             const unique = unique_identifier_1.UniqueIdentifier.get();
-            return new chunk_1.Chunk(`let ${unique} = 1;
-while (true) {
+            return new chunk_1.Chunk(`let ${unique} = 1;
+while (true) {
 abap.builtin.sy.get().index.set(${unique}++);`);
         }
     }

package/build/src/statements/end_method.js

@@ -5,22 +5,38 @@ const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 class EndMethodTranspiler {
     transpile(node, traversal) {
+        var _a, _b;
         const token = node.getFirstToken();
         const scope = traversal.findCurrentScopeByToken(token);
         if (scope === undefined) {
             throw new Error("EndMethodTranspiler, scope not found");
         }
         let returning = "";
+        let methodName = undefined;
+        if ((scope === null || scope === void 0 ? void 0 : scope.getIdentifier().stype) === abaplint.ScopeType.Method) {
+            methodName = scope === null || scope === void 0 ? void 0 : scope.getIdentifier().sname;
+        }
+        let className = undefined;
+        if (((_a = scope === null || scope === void 0 ? void 0 : scope.getParent()) === null || _a === void 0 ? void 0 : _a.getIdentifier().stype) === abaplint.ScopeType.ClassImplementation) {
+            className = (_b = scope === null || scope === void 0 ? void 0 : scope.getParent()) === null || _b === void 0 ? void 0 : _b.getIdentifier().sname;
+        }
+        if (methodName && className) {
+            const classDef = scope.findClassDefinition(className);
+            const methodDef = classDef === null || classDef === void 0 ? void 0 : classDef.getMethodDefinitions().getByName(methodName);
+            if (methodDef && methodDef.getExceptions().length > 0) {
+                returning += "abap.builtin.sy.get().subrc.set(0);\n";
+            }
+        }
         const vars = scope.getData().vars;
         for (const n in vars) {
             const identifier = vars[n];
             if (identifier.getMeta().includes("returning" /* MethodReturning */)) {
-                returning = "return " + n.toLowerCase() + ";\n";
+                returning += "return " + n.toLowerCase() + ";\n";
             }
         }
         const data = scope.getIdentifier();
         if (data.stype === abaplint.ScopeType.Method && data.sname.toLowerCase() === "constructor") {
-            returning = "return this;\n";
+            returning += "return this;\n";
         }
         return new chunk_1.Chunk().append(returning + "}", node, traversal);
     }

package/build/src/traversal.d.ts

@@ -17,7 +17,7 @@ export declare class Traversal {
     findStatementInFile(pos: abaplint.Position): abaplint.Nodes.StatementNode | undefined;
     private scopeCache;
     findCurrentScopeByToken(token: abaplint.Token): abaplint.ISpaghettiScopeNode | undefined;
-    getInterfaceDefinition(token: abaplint.Token): any | undefined;
+    getInterfaceDefinition(token: abaplint.Token): abaplint.IInterfaceDefinition | undefined;
     getClassDefinition(token: abaplint.Token): abaplint.IClassDefinition | undefined;
     private isClassAttribute;
     prefixAndName(t: abaplint.Token, filename?: string): string;
@@ -31,8 +31,9 @@ export declare class Traversal {
     isInterfaceAttribute(token: abaplint.Token): string | undefined;
     private findReadOrWriteReference;
     buildConstructorContents(scope: abaplint.ISpaghettiScopeNode | undefined, def: abaplint.IClassDefinition, inputName: string): string;
+    private dataFromInterfaces;
     determineType(node: abaplint.Nodes.ExpressionNode | abaplint.Nodes.StatementNode, scope: abaplint.ISpaghettiScopeNode | undefined): abaplint.AbstractType | undefined;
-    registerClassOrInterface(def: abaplint.IClassDefinition | undefined): string;
+    registerClassOrInterface(def: abaplint.IClassDefinition | abaplint.IInterfaceDefinition | undefined): string;
     lookupClassOrInterface(name: string | undefined, token: abaplint.Token | undefined): string;
     private buildPrefix;
     protected traverseStructure(node: abaplint.Nodes.StructureNode): Chunk;

package/build/src/traversal.js

@@ -75,7 +75,6 @@ class Traversal {
         }
         return node;
     }
-    // todo, add explicit return type,
     getInterfaceDefinition(token) {
         let scope = this.findCurrentScopeByToken(token);
         while (scope !== undefined) {
@@ -103,8 +102,12 @@ class Traversal {
             throw new Error("isClassAttribute, unable to lookup position");
         }
         const name = token.getStr();
+        if (name.toLowerCase() === "me") {
+            return true;
+        }
         const found = scope.findScopeForVariable(name);
-        if (found && found.stype === abaplint.ScopeType.ClassImplementation) {
+        if (found && (found.stype === abaplint.ScopeType.MethodInstance
+            || found.stype === abaplint.ScopeType.ClassImplementation)) {
             return true;
         }
         return false;
@@ -126,9 +129,9 @@ class Traversal {
                 }
             }
         }
-        const cla = this.isStaticClassAttribute(t);
-        if (cla) {
-            name = cla + "." + name;
+        const className = this.isStaticClassAttribute(t);
+        if (className) {
+            name = className + "." + name;
         }
         else if (name === "super") {
             return name;
@@ -142,7 +145,6 @@ class Traversal {
         return name;
     }
     isStaticClassAttribute(token) {
-        var _a;
         const scope = this.findCurrentScopeByToken(token);
         if (scope === undefined) {
             throw new Error(`isStaticClassAttribute, unable to lookup position, ${token.getStr()},${token.getRow()},${token.getCol()},` +
@@ -154,7 +156,8 @@ class Traversal {
         if (found && id
             && id.getMeta().includes("static" /* Static */)
             && found.stype === abaplint.ScopeType.ClassImplementation) {
-            return (_a = scope.getParent()) === null || _a === void 0 ? void 0 : _a.getIdentifier().sname.toLowerCase();
+            //      console.dir(found.sname);
+            return found.sname.toLowerCase();
         }
         return undefined;
     }
@@ -243,35 +246,30 @@ class Traversal {
         return undefined;
     }
     buildConstructorContents(scope, def, inputName) {
-        const vars = scope === null || scope === void 0 ? void 0 : scope.getData().vars;
+        /*
+        const vars = scope?.getData().vars;
         if (vars === undefined || Object.keys(vars).length === 0) {
-            return "";
+          return "";
         }
+        */
         let ret = "";
         if (def.getSuperClass() !== undefined) {
             // todo, more here, there might be parameters to pass
             // for now just pass the same input
             ret += `await super.constructor_(${inputName});\n`;
         }
-        for (const n in vars) {
-            const identifier = vars[n];
-            if (identifier.getMeta().includes("static" /* Static */) === true) {
+        ret += "this.me = new abap.types.ABAPObject();\n";
+        ret += "this.me.set(this);\n";
+        for (const a of def.getAttributes().getAll()) {
+            if (a.getMeta().includes("static" /* Static */) === true) {
                 continue;
             }
-            const name = n.toLowerCase().replace("~", "$");
-            if (name === "super") {
-                continue; // todo, https://github.com/abaplint/transpiler/issues/133
-            }
-            // todo, better handling of variables from interfaces, it should only initialize those that are directly implemented
-            if (def.getAttributes().findByName(name) === undefined
-                && name.includes("$") === false
-                && name !== "me") {
-                continue;
-            }
-            ret += "this." + name + " = " + new types_1.TranspileTypes().toType(identifier.getType()) + ";\n";
-            if (name === "me") {
-                ret += "this.me.set(this);\n";
-            }
+            const name = a.getName().toLowerCase();
+            ret += "this." + name + " = " + new types_1.TranspileTypes().toType(a.getType()) + ";\n";
+        }
+        // attributes from directly implemented interfaces(not interfaces implemented in super classes)
+        for (const i of def.getImplementing()) {
+            ret += this.dataFromInterfaces(i.name, scope);
         }
         // handle aliases after initialization of carrier variables
         for (const a of def.getAliases().getAll()) {
@@ -283,6 +281,25 @@ class Traversal {
         }
         return ret;
     }
+    dataFromInterfaces(name, scope) {
+        let ret = "";
+        let intf = scope === null || scope === void 0 ? void 0 : scope.findInterfaceDefinition(name);
+        if (intf === undefined) {
+            const iglobal = this.reg.getObject("INTF", name);
+            intf = iglobal === null || iglobal === void 0 ? void 0 : iglobal.getDefinition();
+        }
+        for (const a of (intf === null || intf === void 0 ? void 0 : intf.getAttributes().getAll()) || []) {
+            if (a.getMeta().includes("static" /* Static */) === true) {
+                continue;
+            }
+            const n = name.toLowerCase() + "$" + a.getName().toLowerCase();
+            ret += "this." + n + " = " + new types_1.TranspileTypes().toType(a.getType()) + ";\n";
+        }
+        for (const i of (intf === null || intf === void 0 ? void 0 : intf.getImplementing()) || []) {
+            ret += this.dataFromInterfaces(i.name, scope);
+        }
+        return ret;
+    }
     determineType(node, scope) {
         var _a;
         if (scope === undefined) {

package/build/src/unit_test.js

@@ -4,28 +4,28 @@ exports.UnitTest = void 0;
 const abaplint = require("@abaplint/core");
 class UnitTest {
     initializationScript(reg, dbSetup) {
-        return `import runtime from "@abaplint/runtime";
-global.abap = new runtime.ABAP();
-${this.buildImports(reg)}
-export async function initDB() {
-  return global.abap.initDB(\`${dbSetup}\`);
+        return `import runtime from "@abaplint/runtime";
+global.abap = new runtime.ABAP();
+${this.buildImports(reg)}
+export async function initDB() {
+  return global.abap.initDB(\`${dbSetup}\`);
 }`;
     }
     unitTestScript(reg, skip) {
-        let ret = `import fs from "fs";
-import path from "path";
-import {dirname} from 'path';
-import {fileURLToPath} from 'url';
-const __dirname = dirname(fileURLToPath(import.meta.url));
-import {initDB} from "./init.mjs";
-import runtime from "@abaplint/runtime";
-
-async function run() {
-  await initDB();
-  const unit = new runtime.UnitTestResult();
-  let clas;
-  let locl;
-  let meth;
+        let ret = `import fs from "fs";
+import path from "path";
+import {dirname} from 'path';
+import {fileURLToPath} from 'url';
+const __dirname = dirname(fileURLToPath(import.meta.url));
+import {initDB} from "./init.mjs";
+import runtime from "@abaplint/runtime";
+
+async function run() {
+  await initDB();
+  const unit = new runtime.UnitTestResult();
+  let clas;
+  let locl;
+  let meth;
 try {\n`;
         for (const obj of reg.getObjects()) {
             if (reg.isDependency(obj) || !(obj instanceof abaplint.Objects.Class)) {
@@ -40,8 +40,8 @@ try {\n`;
                         || def.methods.length === 0) {
                         continue;
                     }
-                    ret += `{
-const {${def.name}} = await import("./${obj.getName().toLowerCase()}.${obj.getType().toLowerCase()}.testclasses.mjs");
+                    ret += `{
+const {${def.name}} = await import("./${obj.getName().toLowerCase()}.${obj.getType().toLowerCase()}.testclasses.mjs");
 locl = clas.addTestClass("${def.name}");\n`;
                     ret += `if (${def.name}.class_setup) await ${def.name}.class_setup();\n`;
                     for (const m of def.methods) {
@@ -69,24 +69,24 @@ locl = clas.addTestClass("${def.name}");\n`;
                 }
             }
         }
-        ret += `// -------------------END-------------------
-console.log(abap.console.get());
-fs.writeFileSync(__dirname + path.sep + "output.xml", unit.xUnitXML());
-} catch (e) {
-  if (meth) {
-    meth.fail();
-  }
-  console.log(abap.console.get());
-  fs.writeFileSync(__dirname + path.sep + "output.xml", unit.xUnitXML());
-  throw e;
-}
-}
-
-run().then(() => {
-  process.exit();
-}).catch((err) => {
-  console.log(err);
-  process.exit(1);
+        ret += `// -------------------END-------------------
+console.log(abap.console.get());
+fs.writeFileSync(__dirname + path.sep + "output.xml", unit.xUnitXML());
+} catch (e) {
+  if (meth) {
+    meth.fail();
+  }
+  console.log(abap.console.get());
+  fs.writeFileSync(__dirname + path.sep + "output.xml", unit.xUnitXML());
+  throw e;
+}
+}
+
+run().then(() => {
+  process.exit();
+}).catch((err) => {
+  console.log(err);
+  process.exit(1);
 });`;
         return ret;
     }

package/package.json

@@ -1,40 +1,41 @@
-{
-  "name": "@abaplint/transpiler",
-  "version": "1.6.68",
-  "description": "Transpiler",
-  "main": "build/src/index.js",
-  "typings": "build/src/index.d.ts",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/abaplint/transpiler.git"
-  },
-  "scripts": {
-    "compile": "tsc",
-    "publish:patch": "npm --no-git-tag-version version patch && rm -rf build && npm install && npm run test && npm publish --access public",
-    "test": "npm run compile && mocha"
-  },
-  "mocha": {
-    "recursive": true,
-    "reporter": "progress",
-    "spec": "build/test/**/*.js",
-    "require": "source-map-support/register"
-  },
-  "keywords": [
-    "ABAP",
-    "abaplint"
-  ],
-  "author": "abaplint",
-  "license": "MIT",
-  "dependencies": {
-    "@abaplint/core": "=2.80.10",
-    "source-map": "^0.7.3"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.2.22",
-    "@types/mocha": "^9.0.0",
-    "chai": "^4.3.4",
-    "mocha": "^9.1.3",
-    "source-map-support": "^0.5.21",
-    "typescript": "^4.5.2"
-  }
-}
+{
+  "name": "@abaplint/transpiler",
+  "version": "1.7.2",
+  "description": "Transpiler",
+  "main": "build/src/index.js",
+  "typings": "build/src/index.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/abaplint/transpiler.git"
+  },
+  "scripts": {
+    "compile": "tsc",
+    "publish:minor": "npm --no-git-tag-version version minor && rm -rf build && npm install && npm run test && npm publish --access public",
+    "publish:patch": "npm --no-git-tag-version version patch && rm -rf build && npm install && npm run test && npm publish --access public",
+    "test": "npm run compile && mocha"
+  },
+  "mocha": {
+    "recursive": true,
+    "reporter": "progress",
+    "spec": "build/test/**/*.js",
+    "require": "source-map-support/register"
+  },
+  "keywords": [
+    "ABAP",
+    "abaplint"
+  ],
+  "author": "abaplint",
+  "license": "MIT",
+  "dependencies": {
+    "@abaplint/core": "^2.83.16",
+    "source-map": "^0.7.3"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.3.0",
+    "@types/mocha": "^9.0.0",
+    "chai": "^4.3.4",
+    "mocha": "^9.1.3",
+    "source-map-support": "^0.5.21",
+    "typescript": "^4.5.4"
+  }
+}