@abaplint/transpiler 1.7.41 → 1.8.0

package/build/src/expressions/constant.js

@@ -28,6 +28,10 @@ class ConstantTranspiler {
                 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("`") && this.addGet === false) {
+                const code = "new abap.types.String().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() + "'";

package/build/src/expressions/method_source.d.ts

@@ -3,7 +3,7 @@ import { IExpressionTranspiler } from "./_expression_transpiler";
 import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class MethodSourceTranspiler implements IExpressionTranspiler {
-    private readonly prepend;
+    private prepend;
     constructor(prepend?: string);
     transpile(node: Nodes.ExpressionNode, traversal: Traversal): Chunk;
 }

package/build/src/expressions/method_source.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MethodSourceTranspiler = void 0;
+/* eslint-disable max-len */
 const core_1 = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 const _1 = require(".");
@@ -11,36 +12,26 @@ class MethodSourceTranspiler {
     transpile(node, traversal) {
         const ret = new chunk_1.Chunk();
         const children = node.getChildren();
+        let call = "";
         for (let i = 0; i < children.length; i++) {
             const child = children[i];
             const nextChild = children[i + 1];
             if (child.get() instanceof core_1.Expressions.ClassName) {
-                ret.appendString(traversal.lookupClassOrInterface(child.concatTokens(), child.getFirstToken()));
+                call += traversal.lookupClassOrInterface(child.concatTokens(), child.getFirstToken());
             }
             else if (child.get() instanceof core_1.Expressions.Dynamic && (nextChild === null || nextChild === void 0 ? void 0 : nextChild.concatTokens()) === "=>") {
                 const second = child.getChildren()[1];
+                const lookupException = traversal.lookupClassOrInterface("'CX_SY_DYN_CALL_ILLEGAL_CLASS'", child.getFirstToken(), true);
                 if (second.get() instanceof core_1.Expressions.FieldChain && second instanceof core_1.Nodes.ExpressionNode) {
                     const t = new _1.FieldChainTranspiler(true).transpile(second, traversal).getCode();
-                    const lookup = traversal.lookupClassOrInterface(t, child.getFirstToken(), true);
-                    const lookupException = traversal.lookupClassOrInterface("'CX_SY_DYN_CALL_ILLEGAL_CLASS'", child.getFirstToken(), true);
-                    // eslint-disable-next-line max-len
-                    ret.appendString(`if (${lookup} === undefined && ${lookupException} === undefined) { throw "CX_SY_DYN_CALL_ILLEGAL_CLASS not found"; }\n`);
-                    ret.appendString(`if (${lookup} === undefined) { throw new ${lookupException}(); }\n`);
-                    if (i === 0) {
-                        ret.appendString(this.prepend);
-                    }
-                    ret.appendString(lookup);
+                    call = traversal.lookupClassOrInterface(t, child.getFirstToken(), true);
+                    ret.appendString(`if (${call} === undefined && ${lookupException} === undefined) { throw "CX_SY_DYN_CALL_ILLEGAL_CLASS not found"; }\n`);
+                    ret.appendString(`if (${call} === undefined) { throw new ${lookupException}(); }\n`);
                 }
                 else if (second.get() instanceof core_1.Expressions.Constant) {
-                    const lookup = traversal.lookupClassOrInterface(second.getFirstToken().getStr(), child.getFirstToken(), true);
-                    const lookupException = traversal.lookupClassOrInterface("'CX_SY_DYN_CALL_ILLEGAL_CLASS'", child.getFirstToken(), true);
-                    // eslint-disable-next-line max-len
-                    ret.appendString(`if (${lookup} === undefined && ${lookupException} === undefined) { throw "CX_SY_DYN_CALL_ILLEGAL_CLASS not found"; }\n`);
-                    ret.appendString(`if (${lookup} === undefined) { throw new ${lookupException}(); }\n`);
-                    if (i === 0) {
-                        ret.appendString(this.prepend);
-                    }
-                    ret.appendString(lookup);
+                    call = traversal.lookupClassOrInterface(second.getFirstToken().getStr(), child.getFirstToken(), true);
+                    ret.appendString(`if (${call} === undefined && ${lookupException} === undefined) { throw "CX_SY_DYN_CALL_ILLEGAL_CLASS not found"; }\n`);
+                    ret.appendString(`if (${call} === undefined) { throw new ${lookupException}(); }\n`);
                 }
                 else {
                     ret.appendString("MethodSourceTranspiler-Unexpected");
@@ -48,49 +39,51 @@ class MethodSourceTranspiler {
             }
             else if (child.get() instanceof core_1.Expressions.Dynamic) {
                 const second = child.getChildren()[1];
+                const lookupException = traversal.lookupClassOrInterface("'CX_SY_DYN_CALL_ILLEGAL_METHOD'", child.getFirstToken(), true);
                 if (second.get() instanceof core_1.Expressions.FieldChain) {
-                    ret.appendString("[");
-                    ret.appendChunk(traversal.traverse(second));
-                    ret.appendString(".get().toLowerCase()]");
+                    call += "[";
+                    call += traversal.traverse(second).getCode();
+                    call += ".get().toLowerCase()]";
                 }
                 else if (second.get() instanceof core_1.Expressions.Constant) {
-                    if (ret.getCode().endsWith(".") === false) {
-                        ret.appendString(".");
+                    if (call.endsWith(".") === false) {
+                        call += ".";
                     }
-                    ret.appendString(second.getFirstToken().getStr().replace(/\'/g, "").toLowerCase().replace("~", "$"));
+                    call += second.getFirstToken().getStr().replace(/\'/g, "").toLowerCase().replace("~", "$");
                 }
                 else {
                     ret.appendString("MethodSourceTranspiler-Unexpected");
                 }
+                ret.appendString(`if (${call} === undefined && ${lookupException} === undefined) { throw "CX_SY_DYN_CALL_ILLEGAL_METHOD not found"; }\n`);
+                ret.appendString(`if (${call} === undefined) { throw new ${lookupException}(); }\n`);
             }
             else if (child.get() instanceof core_1.Expressions.MethodName) {
                 if (i === 0) {
-                    ret.appendString(this.prepend + "this.");
+                    this.prepend += "this.";
                 }
                 const methodName = child.concatTokens().toLowerCase().replace("~", "$");
-                ret.append(methodName, child.getFirstToken().getStart(), traversal);
+                call += methodName;
             }
             else if (child.concatTokens() === "=>") {
-                ret.append(".", child.getFirstToken().getStart(), traversal);
+                call += ".";
             }
             else if (child.concatTokens() === "->") {
                 if (ret.getCode() !== "super") {
-                    ret.append(".get()", child, traversal);
+                    call += ".get()";
                 }
                 if (!(nextChild.get() instanceof core_1.Expressions.Dynamic)) {
-                    ret.append(".", child, traversal);
+                    call += ".";
                 }
             }
             else if (child.get() instanceof core_1.Expressions.FieldChain) {
-                if (i === 0) {
-                    ret.appendString(this.prepend);
-                }
-                ret.appendChunk(traversal.traverse(child));
+                call += traversal.traverse(child).getCode();
             }
             else {
                 ret.appendString("MethodSourceTranspiler-" + child.get().constructor.name + "-todo");
             }
         }
+        ret.appendString(this.prepend);
+        ret.appendString(call);
         return ret;
     }
 }

package/build/src/expressions/source.js

@@ -66,11 +66,10 @@ class SourceTranspiler {
                 }
             }
             else if (c instanceof core_1.Nodes.TokenNode && (c.getFirstToken().getStr() === "&&" || c.getFirstToken().getStr() === "&")) {
-                if (this.addGet === false) {
-                    return new SourceTranspiler(true).transpile(node, traversal);
-                }
-                else {
-                    ret.append(" + ", c, traversal);
+                ret = new chunk_1.Chunk().appendString("abap.operators.concat(").appendChunk(ret).appendString(",");
+                post.appendString(")");
+                if (this.addGet) {
+                    post.append(".get()", c, traversal);
                 }
             }
             else if (c instanceof core_1.Nodes.TokenNodeRegex && c.getFirstToken().getStr().toUpperCase() === "BOOLC") {

package/build/src/expressions/string_template.js

@@ -33,7 +33,7 @@ class StringTemplateTranspiler {
                 ret += new _1.StringTemplateSourceTranspiler().transpile(c, traversal).getCode();
             }
         }
-        return new chunk_1.Chunk(ret);
+        return new chunk_1.Chunk("new abap.types.String().set(" + ret + ")");
     }
 }
 exports.StringTemplateTranspiler = StringTemplateTranspiler;

package/build/src/handle_data_element.js

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

package/build/src/handle_table.js

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

package/build/src/handle_table_type.js

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

package/build/src/index.js

@@ -28,7 +28,7 @@ class Transpiler {
         return new Transpiler().run(reg);
     }
     async run(reg, progress) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         reg.parse();
         new keywords_1.Keywords().handle(reg);
         this.validate(reg);
@@ -36,6 +36,7 @@ class Transpiler {
         const output = {
             objects: [],
             unitTestScript: new unit_test_1.UnitTest().unitTestScript(reg, (_a = this.options) === null || _a === void 0 ? void 0 : _a.skip, (_b = this.options) === null || _b === void 0 ? void 0 : _b.only),
+            unitTestScriptOpen: new unit_test_1.UnitTest().unitTestScriptOpen(reg, (_c = this.options) === null || _c === void 0 ? void 0 : _c.skip, (_d = this.options) === null || _d === void 0 ? void 0 : _d.only),
             initializationScript: new unit_test_1.UnitTest().initializationScript(reg, dbSetup),
             databaseSetup: dbSetup,
             reg: reg,

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/types.d.ts

@@ -14,6 +14,7 @@ export interface IOutput {
     objects: IOutputFile[];
     reg: abaplint.IRegistry;
     unitTestScript: string;
+    unitTestScriptOpen: string;
     initializationScript: string;
     databaseSetup: string;
 }

package/build/src/unit_test.d.ts

@@ -6,6 +6,7 @@ export declare type TestMethodList = {
 }[];
 export declare class UnitTest {
     initializationScript(reg: abaplint.IRegistry, dbSetup: string): string;
+    unitTestScriptOpen(reg: abaplint.IRegistry, _skip?: TestMethodList, _only?: TestMethodList): string;
     unitTestScript(reg: abaplint.IRegistry, skip?: TestMethodList, _only?: TestMethodList): string;
     private buildImports;
 }

package/build/src/unit_test.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnitTest = void 0;
+/* eslint-disable max-len */
 const abaplint = require("@abaplint/core");
 class UnitTest {
     // todo, move this somewhere else, its much more than just unit test relevant
     initializationScript(reg, dbSetup) {
-        let ret = `import runtime from "@abaplint/runtime";
-global.abap = new runtime.ABAP();
-${this.buildImports(reg)}
+        let ret = `import runtime from "@abaplint/runtime";
+global.abap = new runtime.ABAP();
+${this.buildImports(reg)}
 export async function initializeABAP(settings) {\n`;
         if (dbSetup === "") {
             ret += `// no database artifacts, skip DB initialization\n`;
@@ -18,22 +19,77 @@ export async function initializeABAP(settings) {\n`;
         ret += `}`;
         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()});
+`;
+        for (const obj of reg.getObjects()) {
+            if (reg.isDependency(obj) || !(obj instanceof abaplint.Objects.Class)) {
+                continue;
+            }
+            const hasTestFile = obj.getFiles().some(f => { return f.getFilename().includes(".testclasses."); });
+            if (hasTestFile === true) {
+                ret += `  await import("./${obj.getName().toLowerCase()}.${obj.getType().toLowerCase()}.testclasses.mjs");\n`;
+            }
+            for (const file of obj.getABAPFiles()) {
+                for (const def of file.getInfo().listClassDefinitions()) {
+                    if (def.isForTesting === false || def.isGlobal === true || def.methods.length === 0) {
+                        // todo, fix, there might be global test methods
+                        continue;
+                    }
+                    for (const m of def.methods) {
+                        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()}");
+  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);
+});`;
+        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)) {
@@ -43,14 +99,13 @@ async function run() {
             ret += `    clas = unit.addObject("${obj.getName()}");\n`;
             for (const file of obj.getABAPFiles()) {
                 for (const def of file.getInfo().listClassDefinitions()) {
-                    if (def.isForTesting === false
-                        || def.isGlobal === true // todo, fix, there might be global test methods
-                        || def.methods.length === 0) {
+                    if (def.isForTesting === false || def.isGlobal === true || def.methods.length === 0) {
+                        // 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) {
@@ -77,24 +132,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,41 +1,41 @@
-{
-  "name": "@abaplint/transpiler",
-  "version": "1.7.41",
-  "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.85.9",
-    "source-map": "^0.7.3"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.3.0",
-    "@types/mocha": "^9.1.0",
-    "chai": "^4.3.6",
-    "mocha": "^9.2.0",
-    "source-map-support": "^0.5.21",
-    "typescript": "^4.5.5"
-  }
-}
+{
+  "name": "@abaplint/transpiler",
+  "version": "1.8.0",
+  "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.85.12",
+    "source-map": "^0.7.3"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.3.0",
+    "@types/mocha": "^9.1.0",
+    "chai": "^4.3.6",
+    "mocha": "^9.2.0",
+    "source-map-support": "^0.5.21",
+    "typescript": "^4.5.5"
+  }
+}