@abaplint/transpiler 2.1.61 → 2.1.63

package/README.md

@@ -1,3 +1,3 @@
-# @abaplint/transpiler
-
+# @abaplint/transpiler
+
 Transpiler

package/build/src/handle_data_element.js

@@ -18,11 +18,11 @@ class HandleDataElement {
                 fixedValues = doma.getFixedValues();
             }
         }
-        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
-  "objectType": "DTEL",
-  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
-  "domain": ${JSON.stringify(obj.getDomainName())},
-  "fixedValues": ${JSON.stringify(fixedValues)},
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "objectType": "DTEL",
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+  "domain": ${JSON.stringify(obj.getDomainName())},
+  "fixedValues": ${JSON.stringify(fixedValues)},
 };`);
         const output = {
             object: {

package/build/src/handle_table.js

@@ -12,10 +12,10 @@ class HandleTable {
             return [];
         }
         const type = obj.parseType(reg);
-        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
-  "objectType": "TABL",
-  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
-  "keyFields": ${JSON.stringify(obj.listKeys())},
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "objectType": "TABL",
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+  "keyFields": ${JSON.stringify(obj.listKeys())},
 };`);
         const output = {
             object: {

package/build/src/handle_table_type.js

@@ -11,9 +11,9 @@ class HandleTableType {
             return [];
         }
         const type = obj.parseType(reg);
-        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
-  "objectType": "TTYP",
-  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "objectType": "TTYP",
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
 };`);
         const output = {
             object: {

package/build/src/statements/call.js

@@ -7,10 +7,6 @@ const expressions_1 = require("../expressions");
 class CallTranspiler {
     transpile(node, traversal) {
         var _a, _b, _c, _d;
-        if (node.concatTokens().toLowerCase().includes("super->constructor")) {
-            // todo, https://github.com/abaplint/transpiler/issues/133
-            return new chunk_1.Chunk("");
-        }
         const chain = node.findDirectExpression(abaplint.Expressions.MethodCallChain);
         if (chain) {
             let pre = "";
@@ -26,9 +22,9 @@ class CallTranspiler {
             }
             post += ";";
             if (exceptions) {
-                post += `\nabap.builtin.sy.get().subrc.set(0);
-} catch (e) {
-if (e.classic) {
+                post += `\nabap.builtin.sy.get().subrc.set(0);
+} catch (e) {
+if (e.classic) {
   switch (e.classic.toUpperCase()) {\n`;
                 for (const e of exceptions.findAllExpressions(abaplint.Expressions.ParameterException)) {
                     const name = e.getFirstToken().getStr().toUpperCase();
@@ -43,15 +39,21 @@ if (e.classic) {
                         post += `case "${name}": abap.builtin.sy.get().subrc.set(${value}); break;\n`;
                     }
                 }
-                post += `  }
-} else {
-  throw e;
-}
+                post += `  }
+} else {
+  throw e;
+}
 }`;
             }
+            const chainChunk = traversal.traverse(chain);
+            let chainCode = chainChunk.getCode();
+            if (chainCode.startsWith("await super.constructor(")) {
+                // semantics of constructors in JS vs ABAP is different, so the "constructor_" has been introduced,
+                chainCode = chainCode.replace("await super.constructor(", "await super.constructor_(");
+            }
             return new chunk_1.Chunk()
                 .appendString(pre)
-                .appendChunk(traversal.traverse(chain))
+                .appendString(chainCode)
                 .append(post, node.getLastToken(), traversal);
         }
         const methodSource = node.findDirectExpression(abaplint.Expressions.MethodSource);
@@ -69,8 +71,12 @@ if (e.classic) {
                 pre = target.getCode() + ".set(";
                 post = ")";
             }
-            const ms = new expressions_1.MethodSourceTranspiler(pre).transpile(methodSource, traversal);
-            return new chunk_1.Chunk().appendChunk(ms).appendString("(" + body + ")" + post + ";");
+            let ms = new expressions_1.MethodSourceTranspiler(pre).transpile(methodSource, traversal).getCode();
+            if (ms === "await super.get().constructor") {
+                // semantics of constructors in JS vs ABAP is different, so the "constructor_" has been introduced,
+                ms = "await super.constructor_";
+            }
+            return new chunk_1.Chunk().appendString(ms).appendString("(" + body + ")" + post + ";");
         }
         throw new Error("CallTranspiler, todo");
     }

package/build/src/statements/class_implementation.js

@@ -17,8 +17,8 @@ class ClassImplementationTranspiler {
         else if (def === null || def === void 0 ? void 0 : def.getSuperClass()) {
             ret += " extends " + ((_a = def === null || def === void 0 ? void 0 : def.getSuperClass()) === null || _a === void 0 ? void 0 : _a.toLowerCase());
         }
-        return new chunk_1.Chunk().append(ret + ` {
-static INTERNAL_TYPE = 'CLAS';
+        return new chunk_1.Chunk().append(ret + ` {
+static INTERNAL_TYPE = 'CLAS';
 static IMPLEMENTED_INTERFACES = [${def === null || def === void 0 ? void 0 : def.getImplementing().map(e => `"` + e.name.toUpperCase() + `"`).join(",")}];`, 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/select.js

@@ -69,14 +69,14 @@ class SelectTranspiler {
             const faeName = (_d = (_c = (_b = node.findFirstExpression(abaplint.Expressions.SQLForAllEntries)) === null || _b === void 0 ? void 0 : _b.findDirectExpression(abaplint.Expressions.SQLSource)) === null || _c === void 0 ? void 0 : _c.concatTokens()) === null || _d === void 0 ? void 0 : _d.toLowerCase();
             select = select.replace(new RegExp(" " + faeName, "g"), " " + unique);
             select = select.replace(unique + ".get().table_line.get()", unique + ".get()"); // there can be only one?
-            const code = `if (${faeName}.array().length === 0) {
-  throw "FAE, todo, empty table";
-} else {
-  abap.statements.clear(${target});
-  for await (const ${unique} of abap.statements.loop(${faeName})) {
-    await abap.statements.select(${target}, {select: "${select.trim()}"${extra}}, {appending: true});
-  }
-  abap.builtin.sy.get().dbcnt.set(${target}.array().length);
+            const code = `if (${faeName}.array().length === 0) {
+  throw "FAE, todo, empty table";
+} else {
+  abap.statements.clear(${target});
+  for await (const ${unique} of abap.statements.loop(${faeName})) {
+    await abap.statements.select(${target}, {select: "${select.trim()}"${extra}}, {appending: true});
+  }
+  abap.builtin.sy.get().dbcnt.set(${target}.array().length);
 }`;
             return new chunk_1.Chunk().append(code, node, traversal);
         }

package/build/src/structures/class_definition.js

@@ -20,14 +20,14 @@ class ClassDefinitionTranspiler {
         }
         else {
             // its an abstract class with only abstract methods
-            return new chunk_1.Chunk(`
-class ${className === null || className === void 0 ? void 0 : className.toLowerCase()} {
-  static INTERNAL_TYPE = 'CLAS';
-  async constructor_() {
-    this.me = new abap.types.ABAPObject();
-    this.me.set(this);
-    return this;
-  }
+            return new chunk_1.Chunk(`
+class ${className === null || className === void 0 ? void 0 : className.toLowerCase()} {
+  static INTERNAL_TYPE = 'CLAS';
+  async constructor_() {
+    this.me = new abap.types.ABAPObject();
+    this.me.set(this);
+    return this;
+  }
 }`);
         }
     }

package/build/src/traversal.js

@@ -251,16 +251,9 @@ class Traversal {
         return undefined;
     }
     buildConstructorContents(scope, def) {
-        /*
-        const vars = scope?.getData().vars;
-        if (vars === undefined || Object.keys(vars).length === 0) {
-          return "";
-        }
-        */
         let ret = "";
-        if (def.getSuperClass() !== undefined) {
-            // todo, more here, there might be parameters to pass
-            // for now just pass the same input
+        if (def.getSuperClass() !== undefined
+            && def.getMethodDefinitions().getByName("CONSTRUCTOR") === undefined) {
             ret += `await super.constructor_(INPUT);\n`;
         }
         ret += "this.me = new abap.types.ABAPObject();\n";

package/build/src/unit_test.js

@@ -8,16 +8,16 @@ class UnitTest {
     initializationScript(reg, dbSetup, extraSetup, useImport) {
         let ret = "";
         if (useImport === true) {
-            ret = `/* eslint-disable import/newline-after-import */
+            ret = `/* eslint-disable import/newline-after-import */
 import "./_top.mjs";\n`;
         }
         else {
-            ret = `/* eslint-disable import/newline-after-import */
-import runtime from "@abaplint/runtime";
+            ret = `/* eslint-disable import/newline-after-import */
+import runtime from "@abaplint/runtime";
 globalThis.abap = new runtime.ABAP();\n`;
         }
-        ret += `${this.buildImports(reg, useImport)}
-
+        ret += `${this.buildImports(reg, useImport)}
+
 export async function initializeABAP() {\n`;
         ret += `  const sqlite = [];\n`;
         for (const i of dbSetup.schemas.sqlite) {
@@ -45,19 +45,19 @@ export async function initializeABAP() {\n`;
         return filename.replace(/\//g, "%23");
     }
     unitTestScriptOpen(reg, _skip, _only) {
-        let ret = `/* eslint-disable curly */
-import fs from "fs";
-import path from "path";
-import {fileURLToPath} from "url";
-import {initializeABAP} from "./init.mjs";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-async function run() {
-  await initializeABAP();
-  let lt_input = new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30})}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]});
-  let ls_input = new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30})});
-  let ls_result = new abap.types.Structure({list: new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30}), expected: new abap.types.String(), actual: new abap.types.String(), status: new abap.types.String(), runtime: new abap.types.Integer(), message: new abap.types.String(), js_location: new abap.types.String()}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]}), json: new abap.types.String()});
+        let ret = `/* eslint-disable curly */
+import fs from "fs";
+import path from "path";
+import {fileURLToPath} from "url";
+import {initializeABAP} from "./init.mjs";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+async function run() {
+  await initializeABAP();
+  let lt_input = new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30})}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]});
+  let ls_input = new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30})});
+  let ls_result = new abap.types.Structure({list: new abap.types.Table(new abap.types.Structure({class_name: new abap.types.Character({length: 30}), testclass_name: new abap.types.Character({length: 30}), method_name: new abap.types.Character({length: 30}), expected: new abap.types.String(), actual: new abap.types.String(), status: new abap.types.String(), runtime: new abap.types.Integer(), message: new abap.types.String(), js_location: new abap.types.String()}), {"withHeader":false,"type":"STANDARD","isUnique":false,"keyFields":[]}), json: new abap.types.String()});
 `;
         for (const obj of reg.getObjects()) {
             if (reg.isDependency(obj) || !(obj instanceof abaplint.Objects.Class)) {
@@ -77,44 +77,44 @@ async function run() {
                         if (m.isForTesting === false) {
                             continue;
                         }
-                        ret += `  ls_input.get().class_name.set("${obj.getName()}");
-  ls_input.get().testclass_name.set("${def.name.toUpperCase()}");
-  ls_input.get().method_name.set("${m.name.toUpperCase()}");
+                        ret += `  ls_input.get().class_name.set("${obj.getName()}");
+  ls_input.get().testclass_name.set("${def.name.toUpperCase()}");
+  ls_input.get().method_name.set("${m.name.toUpperCase()}");
   abap.statements.append({source: ls_input, target: lt_input});\n`;
                     }
                 }
             }
         }
-        ret += `
-
-  ls_result.set(await abap.Classes["KERNEL_UNIT_RUNNER"].run({it_input: lt_input}));
-  fs.writeFileSync(__dirname + path.sep + "output.json", ls_result.get().json.get());
-}
-
-run().then(() => {
-  process.exit(0);
-}).catch((err) => {
-  console.log(err);
-  process.exit(1);
+        ret += `
+
+  ls_result.set(await abap.Classes["KERNEL_UNIT_RUNNER"].run({it_input: lt_input}));
+  fs.writeFileSync(__dirname + path.sep + "output.json", ls_result.get().json.get());
+}
+
+run().then(() => {
+  process.exit(0);
+}).catch((err) => {
+  console.log(err);
+  process.exit(1);
 });`;
         return ret;
     }
     unitTestScript(reg, skip, _only) {
-        let ret = `/* eslint-disable curly */
-import fs from "fs";
-import path from "path";
-import {fileURLToPath} from "url";
-import {initializeABAP} from "./init.mjs";
-import runtime from "@abaplint/runtime";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-async function run() {
-  await initializeABAP();
-  const unit = new runtime.UnitTestResult();
-  let clas;
-  let locl;
-  let meth;
+        let ret = `/* eslint-disable curly */
+import fs from "fs";
+import path from "path";
+import {fileURLToPath} from "url";
+import {initializeABAP} from "./init.mjs";
+import runtime from "@abaplint/runtime";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+async function run() {
+  await initializeABAP();
+  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)) {
@@ -128,9 +128,9 @@ async function run() {
                         // todo, fix, there might be global test methods
                         continue;
                     }
-                    ret += `    {
-      const {${def.name}} = await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}.testclasses.mjs");
-      locl = clas.addTestClass("${def.name}");
+                    ret += `    {
+      const {${def.name}} = await import("./${this.escapeNamespace(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}.testclasses.mjs");
+      locl = clas.addTestClass("${def.name}");
       if (${def.name}.class_setup) await ${def.name}.class_setup();\n`;
                     for (const m of def.methods) {
                         if (m.isForTesting === false) {
@@ -157,24 +157,24 @@ async function run() {
                 }
             }
         }
-        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(0);
-}).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(0);
+}).catch((err) => {
+  console.log(err);
+  process.exit(1);
 });`;
         return ret;
     }

package/package.json

@@ -1,42 +1,42 @@
-{
-  "name": "@abaplint/transpiler",
-  "version": "2.1.61",
-  "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:major": "npm --no-git-tag-version version major && rm -rf build && npm install && npm run test && npm publish --access public",
-    "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.93.12",
-    "source-map": "^0.7.4"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.3.3",
-    "@types/mocha": "^9.1.1",
-    "chai": "^4.3.6",
-    "mocha": "^10.0.0",
-    "source-map-support": "^0.5.21",
-    "typescript": "^4.8.3"
-  }
-}
+{
+  "name": "@abaplint/transpiler",
+  "version": "2.1.63",
+  "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:major": "npm --no-git-tag-version version major && rm -rf build && npm install && npm run test && npm publish --access public",
+    "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.93.14",
+    "source-map": "^0.7.4"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.3.3",
+    "@types/mocha": "^9.1.1",
+    "chai": "^4.3.6",
+    "mocha": "^10.0.0",
+    "source-map-support": "^0.5.21",
+    "typescript": "^4.8.3"
+  }
+}