@abaplint/transpiler 2.0.32 → 2.0.35

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

@@ -8,7 +8,7 @@ class Requires {
     }
     // todo, refactor this method
     find(obj, _node, filename) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const ret = [];
         if (obj.getType() === "INTF") {
             return [];
@@ -85,6 +85,24 @@ class Requires {
                     });
                 }
             }
+            // include global super classes for local class definitions
+            for (const f of obj.getSequencedFiles()) {
+                for (const c of f.getInfo().listClassDefinitions()) {
+                    if (c.superClassName === undefined) {
+                        continue;
+                    }
+                    const found = this.reg.getObject("CLAS", c.superClassName);
+                    if (found && found instanceof abaplint.ABAPObject) {
+                        const main = (_f = found.getMainABAPFile()) === null || _f === void 0 ? void 0 : _f.getFilename();
+                        if (main) {
+                            add({
+                                filename: main,
+                                name: found.getName().toLowerCase(),
+                            });
+                        }
+                    }
+                }
+            }
         }
         return ret;
     }

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

@@ -4,4 +4,5 @@ import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class DataTranspiler implements IStatementTranspiler {
     transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal): Chunk;
+    static buildValue(node: abaplint.Nodes.StatementNode, name: string, traversal: Traversal): string;
 }

package/build/src/statements/data.js

@@ -21,6 +21,16 @@ class DataTranspiler {
         if (found === undefined) {
             throw new Error("DataTranspiler, var not found, \"" + token.getStr() + "\"");
         }
+        const value = DataTranspiler.buildValue(node, found.getName().toLowerCase(), traversal);
+        const ret = new chunk_1.Chunk()
+            .appendString("let ")
+            .append(found.getName().toLowerCase(), token, traversal)
+            .appendString(" = " + new transpile_types_1.TranspileTypes().toType(found.getType()))
+            .append(";", node.getLastToken(), traversal)
+            .append(value, node.getLastToken(), traversal);
+        return ret;
+    }
+    static buildValue(node, name, traversal) {
         let value = "";
         const val = node.findFirstExpression(abaplint.Expressions.Value);
         if (val) {
@@ -30,20 +40,14 @@ class DataTranspiler {
             }
             if (int) {
                 const escaped = new constant_1.ConstantTranspiler().escape(int.concatTokens());
-                value = "\n" + found.getName().toLowerCase() + ".set(" + escaped + ");";
+                value = "\n" + name + ".set(" + escaped + ");";
             }
             else if (val.getChildren()[1].get() instanceof abaplint.Expressions.SimpleFieldChain) {
                 const s = new expressions_1.FieldChainTranspiler().transpile(val.getChildren()[1], traversal).getCode();
-                value = "\n" + found.getName().toLowerCase() + ".set(" + s + ");";
+                value = "\n" + name + ".set(" + s + ");";
             }
         }
-        const ret = new chunk_1.Chunk()
-            .appendString("let ")
-            .append(found.getName().toLowerCase(), token, traversal)
-            .appendString(" = " + new transpile_types_1.TranspileTypes().toType(found.getType()))
-            .append(";", node.getLastToken(), traversal)
-            .append(value, node.getLastToken(), traversal);
-        return ret;
+        return value;
     }
 }
 exports.DataTranspiler = DataTranspiler;

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

@@ -4,14 +4,27 @@ exports.FieldSymbolTranspiler = void 0;
 const abaplint = require("@abaplint/core");
 const field_symbol_1 = require("../expressions/field_symbol");
 const chunk_1 = require("../chunk");
+const transpile_types_1 = require("../transpile_types");
 class FieldSymbolTranspiler {
     transpile(node, traversal) {
         const name = node.findDirectExpression(abaplint.Expressions.FieldSymbol);
+        const token = name === null || name === void 0 ? void 0 : name.getFirstToken();
+        if (token === undefined) {
+            throw new Error("FieldSymbolTranspiler, token not found");
+        }
+        const scope = traversal.findCurrentScopeByToken(token);
+        if (scope === undefined) {
+            throw new Error("FieldSymbolTranspiler, scope not found");
+        }
+        const found = scope.findVariable(token.getStr());
+        if (found === undefined) {
+            throw new Error("FieldSymbolTranspiler, var not found, \"" + token.getStr() + "\"");
+        }
         if (name) {
             return new chunk_1.Chunk()
                 .append("let ", node, traversal)
                 .appendChunk(new field_symbol_1.FieldSymbolTranspiler().transpile(name, traversal))
-                .append(" = new abap.types.FieldSymbol();", node.getLastToken(), traversal);
+                .append(" = new abap.types.FieldSymbol(" + new transpile_types_1.TranspileTypes().toType(found.getType()) + ");", node.getLastToken(), traversal);
         }
         throw new Error("FieldSymbolTranspiler, name not found");
     }

package/build/src/structures/data.js

@@ -6,11 +6,19 @@ const statements_1 = require("../statements");
 const chunk_1 = require("../chunk");
 class DataTranspiler {
     transpile(node, traversal) {
+        var _a, _b;
         const begin = node.findDirectStatement(abaplint.Statements.DataBegin);
         if (begin === undefined) {
             return new chunk_1.Chunk("");
         }
+        const topName = (_a = begin.findDirectExpression(abaplint.Expressions.DefinitionName)) === null || _a === void 0 ? void 0 : _a.concatTokens().toLowerCase();
         const chunk = new statements_1.DataTranspiler().transpile(begin, traversal);
+        for (const d of node.findDirectStatements(abaplint.Statements.Data)) {
+            const subName = (_b = d.findFirstExpression(abaplint.Expressions.DefinitionName)) === null || _b === void 0 ? void 0 : _b.concatTokens().toLowerCase();
+            if (subName && topName) {
+                chunk.appendString(statements_1.DataTranspiler.buildValue(d, topName + ".get()." + subName, traversal));
+            }
+        }
         chunk.appendString("\n");
         return chunk;
     }

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`;
@@ -32,19 +32,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)) {
@@ -64,44 +64,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)) {
@@ -115,9 +115,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) {
@@ -144,24 +144,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.32",
-  "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.12",
-    "source-map": "^0.7.4"
-  },
-  "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.3"
-  }
-}
+{
+  "name": "@abaplint/transpiler",
+  "version": "2.0.35",
+  "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.91.2",
+    "source-map": "^0.7.4"
+  },
+  "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.3"
+  }
+}