@abaplint/transpiler 2.0.24 → 2.0.27

package/README.md

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

package/build/src/expressions/source.js

@@ -12,7 +12,10 @@ class SourceTranspiler {
     transpile(node, traversal) {
         let ret = new chunk_1.Chunk();
         const post = new chunk_1.Chunk();
-        for (const c of node.getChildren()) {
+        const children = node.getChildren();
+        for (let i = 0; i < children.length; i++) {
+            const c = children[i];
+            const last = i === children.length - 1;
             if (c instanceof core_1.Nodes.ExpressionNode) {
                 if (c.get() instanceof core_1.Expressions.FieldChain) {
                     ret.appendChunk(new _1.FieldChainTranspiler(this.addGet).transpile(c, traversal));
@@ -35,14 +38,12 @@ class SourceTranspiler {
                 }
                 else if (c.get() instanceof core_1.Expressions.MethodCallChain) {
                     ret.appendChunk(traversal.traverse(c));
-                    if (this.addGet) {
-                        const code = ret.getCode();
-                        if (code.includes("await")) {
-                            ret = new chunk_1.Chunk().appendString("(").appendChunk(ret).appendString(").get()");
-                        }
-                        else {
-                            ret.append(".get()", c, traversal);
-                        }
+                    const code = ret.getCode();
+                    if (code.includes("await")) {
+                        ret = new chunk_1.Chunk().appendString("(").appendChunk(ret).appendString(")");
+                    }
+                    if (this.addGet && last === true) {
+                        ret.append(".get()", c, traversal);
                     }
                 }
                 else if (c.get() instanceof core_1.Expressions.Source) {
@@ -57,6 +58,9 @@ class SourceTranspiler {
                 else if (c.get() instanceof core_1.Expressions.ComponentChain) {
                     ret = new chunk_1.Chunk().appendString("(").appendChunk(ret).appendString(").get().");
                     ret.appendChunk(new _1.ComponentChainTranspiler().transpile(c, traversal));
+                    if (this.addGet && last === true) {
+                        ret.append(".get()", c, traversal);
+                    }
                 }
                 else if (c.get() instanceof core_1.Expressions.Dereference) {
                     ret = new chunk_1.Chunk().appendString("(").appendChunk(ret).appendString(").getPointer()");
@@ -82,6 +86,7 @@ class SourceTranspiler {
             }
         }
         ret.appendChunk(post);
+        //    console.dir(ret.getCode());
         return ret;
     }
 }

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/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

@@ -15,7 +15,7 @@ class EndMethodTranspiler {
         const vars = scope.getData().vars;
         for (const n in vars) {
             const identifier = vars[n];
-            if (identifier.getMeta().includes("returning" /* MethodReturning */)) {
+            if (identifier.getMeta().includes("returning" /* abaplint.IdentifierMeta.MethodReturning */)) {
                 returning += "return " + n.toLowerCase() + ";\n";
             }
         }

package/build/src/statements/method_implementation.js

@@ -31,14 +31,14 @@ class MethodImplementationTranspiler {
         for (const n in vars) {
             const identifier = vars[n];
             const varName = n.toLowerCase();
-            if (identifier.getMeta().includes("importing" /* MethodImporting */)
-                || identifier.getMeta().includes("changing" /* MethodChanging */)
-                || identifier.getMeta().includes("exporting" /* MethodExporting */)) {
+            if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */)
+                || identifier.getMeta().includes("changing" /* abaplint.IdentifierMeta.MethodChanging */)
+                || identifier.getMeta().includes("exporting" /* abaplint.IdentifierMeta.MethodExporting */)) {
                 if (unique === "") {
                     unique = "INPUT";
                 }
                 after = after + new transpile_types_1.TranspileTypes().declare(identifier) + "\n";
-                if (identifier.getMeta().includes("importing" /* MethodImporting */) && identifier.getType().isGeneric() === false) {
+                if (identifier.getMeta().includes("importing" /* abaplint.IdentifierMeta.MethodImporting */) && identifier.getType().isGeneric() === false) {
                     after += "if (" + unique + " && " + unique + "." + varName + ") {" + varName + ".set(" + unique + "." + varName + ");}\n";
                 }
                 else {
@@ -71,7 +71,7 @@ class MethodImplementationTranspiler {
                     after += "if (" + unique + " === undefined || " + unique + "." + varName + " === undefined) {" + varName + " = " + val + ";}\n";
                 }
             }
-            else if (identifier.getMeta().includes("returning" /* MethodReturning */)) {
+            else if (identifier.getMeta().includes("returning" /* abaplint.IdentifierMeta.MethodReturning */)) {
                 after = after + new transpile_types_1.TranspileTypes().declare(identifier) + "\n";
             }
         }

package/build/src/statements/return.js

@@ -9,7 +9,7 @@ class ReturnTranspiler {
         const vars = scope === null || scope === void 0 ? void 0 : scope.getData().vars;
         for (const n in vars) {
             const identifier = vars[n];
-            if (identifier.getMeta().includes("returning" /* MethodReturning */)) {
+            if (identifier.getMeta().includes("returning" /* abaplint.IdentifierMeta.MethodReturning */)) {
                 extra = " " + n.toLowerCase();
             }
         }

package/build/src/structures/interface.js

@@ -36,8 +36,8 @@ class InterfaceTranspiler {
         let ret = "\n";
         for (const n in vars) {
             const identifier = vars[n];
-            if (identifier.getMeta().includes("static" /* Static */) === false
-                || identifier.getMeta().includes("read_only" /* ReadOnly */) === false) {
+            if (identifier.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) === false
+                || identifier.getMeta().includes("read_only" /* abaplint.IdentifierMeta.ReadOnly */) === false) {
                 continue;
             }
             const interfaceName = node.getFirstToken().getStr().toLowerCase();

package/build/src/traversal.js

@@ -154,7 +154,7 @@ class Traversal {
         const found = scope.findScopeForVariable(name);
         const id = scope.findVariable(name);
         if (found && id
-            && id.getMeta().includes("static" /* Static */)
+            && id.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */)
             && found.stype === abaplint.ScopeType.ClassImplementation) {
             //      console.dir(found.sname);
             return found.sname.toLowerCase();
@@ -261,7 +261,7 @@ class Traversal {
         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) {
+            if (a.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) === true) {
                 continue;
             }
             const name = a.getName().toLowerCase();
@@ -305,7 +305,7 @@ class Traversal {
         let ret = "";
         const intf = this.findInterfaceDefinition(name, scope);
         for (const a of (intf === null || intf === void 0 ? void 0 : intf.getAttributes().getAll()) || []) {
-            if (a.getMeta().includes("static" /* Static */) === true) {
+            if (a.getMeta().includes("static" /* abaplint.IdentifierMeta.Static */) === true) {
                 continue;
             }
             const n = name.toLowerCase() + "$" + a.getName().toLowerCase();

package/build/src/unit_test.js

@@ -6,11 +6,11 @@ const abaplint = require("@abaplint/core");
 class UnitTest {
     // todo, move this method somewhere else, its much more than just unit test relevant
     initializationScript(reg, dbSetup, extraSetup) {
-        let ret = `/* eslint-disable import/newline-after-import */
-import runtime from "@abaplint/runtime";
-global.abap = new runtime.ABAP();
-${this.buildImports(reg)}
-
+        let ret = `/* eslint-disable import/newline-after-import */
+import runtime from "@abaplint/runtime";
+global.abap = new runtime.ABAP();
+${this.buildImports(reg)}
+
 export async function initializeABAP() {\n`;
         ret += `  const sqlite = \`${dbSetup.schemas.sqlite}\`;\n`;
         ret += `  const hdb = \`${dbSetup.schemas.hdb}\`;\n`;
@@ -28,19 +28,19 @@ export async function initializeABAP() {\n`;
         return ret;
     }
     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)) {
@@ -60,44 +60,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});`;
                     }
                 }
             }
         }
-        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)) {
@@ -111,9 +111,9 @@ async function run() {
                         // todo, fix, there might be global test methods
                         continue;
                     }
-                    ret += `    {
-      const {${def.name}} = await import("./${obj.getName().toLowerCase()}.${obj.getType().toLowerCase()}.testclasses.mjs");
-      locl = clas.addTestClass("${def.name}");
+                    ret += `    {
+      const {${def.name}} = await import("./${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) {
@@ -140,24 +140,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.0.24",
-  "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.90.4",
-    "source-map": "^0.7.3"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.3.1",
-    "@types/mocha": "^9.1.1",
-    "chai": "^4.3.6",
-    "mocha": "^10.0.0",
-    "source-map-support": "^0.5.21",
-    "typescript": "^4.6.4"
-  }
-}
+{
+  "name": "@abaplint/transpiler",
+  "version": "2.0.27",
+  "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.90.9",
+    "source-map": "^0.7.3"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.3.1",
+    "@types/mocha": "^9.1.1",
+    "chai": "^4.3.6",
+    "mocha": "^10.0.0",
+    "source-map-support": "^0.5.21",
+    "typescript": "^4.7.2"
+  }
+}