@abaplint/transpiler 1.6.62 → 1.6.66

package/build/src/expressions/component_compare.js

@@ -5,7 +5,7 @@ const core_1 = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 class ComponentCompareTranspiler {
     transpile(node, traversal) {
-        const concat = node.concatTokens();
+        const concat = node.concatTokens().toUpperCase();
         const pre = concat.startsWith("NOT") ? "!" : "";
         const component = traversal.traverse(node.findDirectExpression(core_1.Expressions.ComponentChainSimple)).getCode();
         if (node.findDirectExpression(core_1.Expressions.CompareOperator)) {

package/build/src/expressions/component_cond.js

@@ -5,32 +5,34 @@ const abaplint = require("@abaplint/core");
 const chunk_1 = require("../chunk");
 class ComponentCondTranspiler {
     transpile(node, traversal) {
-        // todo, this is still not correct
         let ret = "";
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.ExpressionNode) {
-                const cond = traversal.traverse(c).getCode();
-                ret += ret === "" ? cond : cond.replace(/^\(i\) => \{return /, "");
+                let cond = traversal.traverse(c).getCode();
+                cond = cond.replace(/^\(i\) => \{return /, "");
+                cond = cond.replace(/;\}$/, "");
+                ret += cond;
             }
             else if (c instanceof abaplint.Nodes.TokenNode) {
-                switch (c.get().getStr()) {
+                switch (c.get().getStr().toUpperCase()) {
                     case "AND":
-                        ret = ret.replace(/;\}$/, " && ");
+                        ret += " && ";
                         break;
                     case "OR":
-                        ret = ret.replace(/;\}$/, " || ");
+                        ret += " || ";
                         break;
                     case "(":
                         ret += "(";
                         break;
                     case ")":
-                        ret = ret.replace(/;\}$/, ");}");
+                        ret += ")";
                         break;
                     default:
                     // todo, runtime error
                 }
             }
         }
+        ret = `(i) => {return ${ret};}`;
         return new chunk_1.Chunk(ret);
     }
 }

package/build/src/expressions/function_exporting.js

@@ -7,17 +7,19 @@ class FunctionExportingTranspiler {
     transpile(node, traversal) {
         const parameters = [];
         let chunk = new chunk_1.Chunk();
-        for (const child of node.getChildren()) {
-            if (child.getFirstToken().getStr() === "=") {
-                chunk.appendString(": ");
-            }
-            else if (child.get() instanceof abaplint.Expressions.ParameterName) {
-                chunk = new chunk_1.Chunk();
-                chunk.appendChunk(traversal.traverse(child));
-            }
-            else {
-                chunk.appendChunk(traversal.traverse(child));
-                parameters.push(chunk);
+        for (const parameter of node.getChildren()) {
+            for (const child of parameter.getChildren()) {
+                if (child.getFirstToken().getStr() === "=") {
+                    chunk.appendString(": ");
+                }
+                else if (child.get() instanceof abaplint.Expressions.ParameterName) {
+                    chunk = new chunk_1.Chunk();
+                    chunk.appendChunk(traversal.traverse(child));
+                }
+                else {
+                    chunk.appendChunk(traversal.traverse(child));
+                    parameters.push(chunk);
+                }
             }
         }
         return new chunk_1.Chunk().appendString("{").join(parameters).appendString("}");

package/build/src/index.d.ts

@@ -15,8 +15,8 @@ export interface IObjectIdentifier {
 export interface IOutput {
     objects: IOutputFile[];
     reg: abaplint.IRegistry;
-    /** Output experimental file to run unit tests */
-    unitTest: string;
+    unitTestScript: string;
+    initializationScript: string;
     databaseSetup: string;
 }
 export interface IRequire {

package/build/src/index.js

@@ -35,7 +35,8 @@ class Transpiler {
         const dbSetup = new database_setup_1.DatabaseSetup(reg).run();
         const output = {
             objects: [],
-            unitTest: new unit_test_1.UnitTest().run(reg, dbSetup, (_a = this.options) === null || _a === void 0 ? void 0 : _a.skip),
+            unitTestScript: new unit_test_1.UnitTest().unitTestScript(reg, (_a = this.options) === null || _a === void 0 ? void 0 : _a.skip),
+            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/statements/get_locale.d.ts

@@ -0,0 +1,7 @@
+import * as abaplint from "@abaplint/core";
+import { IStatementTranspiler } from "./_statement_transpiler";
+import { Traversal } from "../traversal";
+import { Chunk } from "../chunk";
+export declare class GetLocaleTranspiler implements IStatementTranspiler {
+    transpile(_node: abaplint.Nodes.StatementNode, _traversal: Traversal): Chunk;
+}

package/build/src/statements/get_locale.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetLocaleTranspiler = void 0;
+const chunk_1 = require("../chunk");
+class GetLocaleTranspiler {
+    transpile(_node, _traversal) {
+        return new chunk_1.Chunk(`throw new Error("GetLocale, transpiler todo");`);
+    }
+}
+exports.GetLocaleTranspiler = GetLocaleTranspiler;
+//# sourceMappingURL=get_locale.js.map

package/build/src/statements/index.d.ts

@@ -12,6 +12,7 @@ export * from "./class_deferred";
 export * from "./class_implementation";
 export * from "./class_local_friends";
 export * from "./clear";
+export * from "./get_locale";
 export * from "./raise_event";
 export * from "./collect";
 export * from "./commit";

package/build/src/statements/index.js

@@ -24,6 +24,7 @@ __exportStar(require("./class_deferred"), exports);
 __exportStar(require("./class_implementation"), exports);
 __exportStar(require("./class_local_friends"), exports);
 __exportStar(require("./clear"), exports);
+__exportStar(require("./get_locale"), exports);
 __exportStar(require("./raise_event"), exports);
 __exportStar(require("./collect"), exports);
 __exportStar(require("./commit"), exports);

package/build/src/statements/replace.js

@@ -11,7 +11,14 @@ class ReplaceTranspiler {
             sources.push(new expressions_1.SourceTranspiler().transpile(s, traversal).getCode());
         }
         const target = traversal.traverse(node.findDirectExpression(abaplint.Expressions.Target)).getCode();
-        const all = node.concatTokens().toUpperCase().startsWith("REPLACE ALL");
+        const concat = node.concatTokens().toUpperCase();
+        const all = concat.startsWith("REPLACE ALL");
+        if (concat.includes("SECTION LENGTH")) {
+            // TODO,
+            const last = sources.pop();
+            sources.pop();
+            sources.push(last);
+        }
         return new chunk_1.Chunk()
             .append("abap.statements.replace(", node, traversal)
             .appendString(target + ", " + all + ", " + sources.join(", "))

package/build/src/structures/case.js

@@ -34,6 +34,9 @@ class CaseTranspiler {
                     ret.appendString(") {\n");
                 }
                 else if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.WhenOthers) {
+                    if (first === true) {
+                        continue;
+                    }
                     ret.appendString("} else {\n");
                 }
                 else {

package/build/src/unit_test.d.ts

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

package/build/src/unit_test.js

@@ -3,25 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnitTest = void 0;
 const abaplint = require("@abaplint/core");
 class UnitTest {
-    run(reg, dbSetup, skip) {
-        let ret = `import fs from "fs";
-import path from "path";
-import runtime from "@abaplint/runtime";
-import {dirname} from 'path';
-import {fileURLToPath} from 'url';
-global.abap = new runtime.ABAP();
-${this.buildImports(reg)}
-const __dirname = dirname(fileURLToPath(import.meta.url));
-async function initDB() {
-  return global.abap.initDB(\`${dbSetup}\`);
-}
-
-async function run() {
-  await initDB();
-  const unit = new runtime.UnitTestResult();
-  let clas;
-  let locl;
-  let meth;
+    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}\`);
+}`;
+    }
+    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;
 try {\n`;
         for (const obj of reg.getObjects()) {
             if (reg.isDependency(obj) || !(obj instanceof abaplint.Objects.Class)) {
@@ -36,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) {
@@ -65,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,41 +1,40 @@
-{
-  "name": "@abaplint/transpiler",
-  "version": "1.6.62",
-  "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",
-    "prepublishOnly": "rm -rf build && npm run test",
-    "pretest": "npm run compile",
-    "test": "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.79.35",
-    "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.20",
-    "typescript": "^4.4.4"
-  }
-}
+{
+  "name": "@abaplint/transpiler",
+  "version": "1.6.66",
+  "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"
+  }
+}