@abaplint/transpiler 1.7.43 → 1.8.2

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/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/index.js

@@ -36,7 +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),
-            unitTestScriptKernel: new unit_test_1.UnitTest().unitTestScriptKernel(reg, (_c = this.options) === null || _c === void 0 ? void 0 : _c.skip, (_d = this.options) === null || _d === void 0 ? void 0 : _d.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/method_implementation.js

@@ -102,7 +102,7 @@ class MethodImplementationTranspiler {
             const intfName = split[0];
             name = split[1];
             const scope = traversal.findCurrentScopeByToken(cdef.getToken());
-            const intf = scope === null || scope === void 0 ? void 0 : scope.findInterfaceDefinition(intfName);
+            const intf = traversal.findInterfaceDefinition(intfName, scope);
             return (_a = intf === null || intf === void 0 ? void 0 : intf.getMethodDefinitions()) === null || _a === void 0 ? void 0 : _a.getByName(name);
         }
         else {

package/build/src/types.d.ts

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

package/build/src/unit_test.d.ts

@@ -6,7 +6,7 @@ export declare type TestMethodList = {
 }[];
 export declare class UnitTest {
     initializationScript(reg: abaplint.IRegistry, dbSetup: string): string;
-    unitTestScriptKernel(reg: abaplint.IRegistry, _skip?: TestMethodList, _only?: TestMethodList): 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

@@ -19,7 +19,7 @@ export async function initializeABAP(settings) {\n`;
         ret += `}`;
         return ret;
     }
-    unitTestScriptKernel(reg, _skip, _only) {
+    unitTestScriptOpen(reg, _skip, _only) {
         let ret = `/* eslint-disable curly */
 import fs from "fs";
 import path from "path";
@@ -38,6 +38,10 @@ async function run() {
             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) {
@@ -48,8 +52,7 @@ async function run() {
                         if (m.isForTesting === false) {
                             continue;
                         }
-                        ret += `
-  ls_input.get().class_name.set("${obj.getName()}");
+                        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});`;
@@ -60,7 +63,6 @@ async function run() {
         ret += `
 
   ls_result.set(await abap.Classes["KERNEL_UNIT_RUNNER"].run({it_input: lt_input}));
-  console.dir(ls_result);
   fs.writeFileSync(__dirname + path.sep + "output.json", ls_result.get().json.get());
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "1.7.43",
+  "version": "1.8.2",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -27,7 +27,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.85.10",
+    "@abaplint/core": "^2.85.13",
     "source-map": "^0.7.3"
   },
   "devDependencies": {