@abaplint/transpiler 1.8.38 → 2.0.0

package/build/src/db/database_setup_result.d.ts

@@ -0,0 +1,8 @@
+export declare type DatabaseSetupResult = {
+    schemas: {
+        sqlite: string;
+        pg: string;
+        hdb: string;
+    };
+    insert: string;
+};

package/build/src/db/database_setup_result.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=database_setup_result.js.map

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

@@ -0,0 +1,10 @@
+import * as abaplint from "@abaplint/core";
+import { DatabaseSetupResult } from "./database_setup_result";
+export declare class DatabaseSetup {
+    private readonly reg;
+    constructor(reg: abaplint.IRegistry);
+    run(): DatabaseSetupResult;
+    private buildInsert;
+    private t000Insert;
+    private messageClass;
+}

package/build/src/db/index.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DatabaseSetup = void 0;
+const abaplint = require("@abaplint/core");
+const sqlite_database_schema_1 = require("./sqlite_database_schema");
+class DatabaseSetup {
+    constructor(reg) {
+        this.reg = reg;
+    }
+    run() {
+        return {
+            schemas: {
+                sqlite: new sqlite_database_schema_1.SQLiteDatabaseSchema(this.reg).run(),
+                hdb: "todo",
+                pg: "todo",
+            },
+            insert: this.buildInsert(),
+        };
+    }
+    ////////////////////
+    buildInsert() {
+        let insert = "";
+        // INSERT data
+        for (const obj of this.reg.getObjects()) {
+            if (obj instanceof abaplint.Objects.MessageClass) {
+                insert += this.messageClass(obj);
+            }
+        }
+        insert += this.t000Insert();
+        return insert;
+    }
+    t000Insert() {
+        const obj = this.reg.getObject("TABL", "T000");
+        if (obj === undefined) {
+            return "";
+        }
+        const type = obj.parseType(this.reg);
+        if (type instanceof abaplint.BasicTypes.StructureType && type.getComponents().length === 3) {
+            // todo, this should take the client number from the settings
+            return `INSERT INTO t000 VALUES ('123', '', '');\n`;
+        }
+        else {
+            return "";
+        }
+    }
+    messageClass(msag) {
+        // ignore if T100 is unknown
+        if (this.reg.getObject("TABL", "T100") === undefined) {
+            return "";
+        }
+        let ret = "";
+        for (const m of msag.getMessages()) {
+            ret += `INSERT INTO t100 VALUES ('E', '${msag.getName()}', '${m.getNumber()}', '${m.getMessage()}');\n`;
+        }
+        return ret;
+    }
+}
+exports.DatabaseSetup = DatabaseSetup;
+//# sourceMappingURL=index.js.map

package/build/src/{database_setup.d.ts → db/sqlite_database_schema.d.ts}

@@ -1,10 +1,8 @@
 import * as abaplint from "@abaplint/core";
-export declare class DatabaseSetup {
+export declare class SQLiteDatabaseSchema {
     private readonly reg;
     constructor(reg: abaplint.IRegistry);
     run(): string;
-    private t000Insert;
-    private messageClass;
     private transparentTable;
     private toType;
 }

package/build/src/{database_setup.js → db/sqlite_database_schema.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DatabaseSetup = void 0;
+exports.SQLiteDatabaseSchema = void 0;
 const abaplint = require("@abaplint/core");
-class DatabaseSetup {
+class SQLiteDatabaseSchema {
     constructor(reg) {
         this.reg = reg;
     }
@@ -14,41 +14,9 @@ class DatabaseSetup {
                 ret += this.transparentTable(obj);
             }
         }
-        // INSERT data
-        for (const obj of this.reg.getObjects()) {
-            if (obj instanceof abaplint.Objects.MessageClass) {
-                ret += this.messageClass(obj);
-            }
-        }
-        ret += this.t000Insert();
         return ret.trim();
     }
     //////////////////
-    t000Insert() {
-        const obj = this.reg.getObject("TABL", "T000");
-        if (obj === undefined) {
-            return "";
-        }
-        const type = obj.parseType(this.reg);
-        if (type instanceof abaplint.BasicTypes.StructureType && type.getComponents().length === 3) {
-            // todo, this should take the client number from the settings
-            return `INSERT INTO t000 VALUES ('123', '', '');\n`;
-        }
-        else {
-            return "";
-        }
-    }
-    messageClass(msag) {
-        // ignore if T100 is unknown
-        if (this.reg.getObject("TABL", "T100") === undefined) {
-            return "";
-        }
-        let ret = "";
-        for (const m of msag.getMessages()) {
-            ret += `INSERT INTO t100 VALUES ('E', '${msag.getName()}', '${m.getNumber()}', '${m.getMessage()}');\n`;
-        }
-        return ret;
-    }
     transparentTable(tabl) {
         const type = tabl.parseType(this.reg);
         if (!(type instanceof abaplint.BasicTypes.StructureType)) {
@@ -85,5 +53,5 @@ class DatabaseSetup {
         }
     }
 }
-exports.DatabaseSetup = DatabaseSetup;
-//# sourceMappingURL=database_setup.js.map
+exports.SQLiteDatabaseSchema = SQLiteDatabaseSchema;
+//# sourceMappingURL=sqlite_database_schema.js.map

package/build/src/index.js

@@ -6,11 +6,11 @@ const validation_1 = require("./validation");
 Object.defineProperty(exports, "config", { enumerable: true, get: function () { return validation_1.config; } });
 const unit_test_1 = require("./unit_test");
 const keywords_1 = require("./keywords");
-const database_setup_1 = require("./database_setup");
 const handle_table_1 = require("./handle_table");
 const handle_abap_1 = require("./handle_abap");
 const handle_data_element_1 = require("./handle_data_element");
 const handle_table_type_1 = require("./handle_table_type");
+const db_1 = require("./db");
 class Transpiler {
     constructor(options) {
         this.options = options;
@@ -32,7 +32,7 @@ class Transpiler {
         reg.parse();
         new keywords_1.Keywords().handle(reg);
         this.validate(reg);
-        const dbSetup = new database_setup_1.DatabaseSetup(reg).run();
+        const dbSetup = new db_1.DatabaseSetup(reg).run();
         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),

package/build/src/statements/delete_database.js

@@ -12,7 +12,7 @@ class DeleteDatabaseTranspiler {
             const ttab = traversal.traverse(tab);
             options.push(`"table": ` + ttab.getCode());
         }
-        return new chunk_1.Chunk(`abap.statements.deleteDatabase(${table.getCode()}, {${options.join(", ")}});`);
+        return new chunk_1.Chunk(`await abap.statements.deleteDatabase(${table.getCode()}, {${options.join(", ")}});`);
     }
 }
 exports.DeleteDatabaseTranspiler = DeleteDatabaseTranspiler;

package/build/src/statements/insert_database.js

@@ -12,7 +12,7 @@ class InsertDatabaseTranspiler {
             const tvalues = traversal.traverse(values);
             options.push(`"values": ` + tvalues.getCode());
         }
-        return new chunk_1.Chunk(`abap.statements.insertDatabase(${table.getCode()}, {${options.join(", ")}});`);
+        return new chunk_1.Chunk(`await abap.statements.insertDatabase(${table.getCode()}, {${options.join(", ")}});`);
     }
 }
 exports.InsertDatabaseTranspiler = InsertDatabaseTranspiler;

package/build/src/statements/message.js

@@ -55,7 +55,7 @@ class MessageTranspiler {
             options.push("with: [" + w.join(",") + "]");
         }
         return new chunk_1.Chunk()
-            .append("abap.statements.message({", node, traversal)
+            .append("await abap.statements.message({", node, traversal)
             .appendString(options.join(", "))
             .append("});", node.getLastToken(), traversal);
     }

package/build/src/statements/modify_database.js

@@ -12,7 +12,7 @@ class ModifyDatabaseTranspiler {
             const ttab = traversal.traverse(tab);
             options.push(`"table": ` + ttab.getCode());
         }
-        return new chunk_1.Chunk(`abap.statements.modifyDatabase(${table.getCode()}, {${options.join(", ")}});`);
+        return new chunk_1.Chunk(`await abap.statements.modifyDatabase(${table.getCode()}, {${options.join(", ")}});`);
     }
 }
 exports.ModifyDatabaseTranspiler = ModifyDatabaseTranspiler;

package/build/src/statements/select.js

@@ -22,7 +22,7 @@ class SelectTranspiler {
         if (node.concatTokens().toUpperCase().startsWith("SELECT SINGLE ")) {
             select += "LIMIT 1";
         }
-        return new chunk_1.Chunk().append(`abap.statements.select(${target}, "${select.trim()}");`, node, traversal);
+        return new chunk_1.Chunk().append(`await abap.statements.select(${target}, "${select.trim()}");`, node, traversal);
     }
 }
 exports.SelectTranspiler = SelectTranspiler;

package/build/src/types.d.ts

@@ -1,6 +1,7 @@
 import { Chunk } from "./chunk";
 import * as abaplint from "@abaplint/core";
 import { TestMethodList } from "./unit_test";
+import { DatabaseSetupResult } from "./db/database_setup_result";
 export interface IFile {
     filename: string;
     relative?: string;
@@ -16,7 +17,7 @@ export interface IOutput {
     unitTestScript: string;
     unitTestScriptOpen: string;
     initializationScript: string;
-    databaseSetup: string;
+    databaseSetup: DatabaseSetupResult;
 }
 export interface IRequire {
     name: string | undefined;

package/build/src/unit_test.d.ts

@@ -1,11 +1,12 @@
 import * as abaplint from "@abaplint/core";
+import { DatabaseSetupResult } from "./db/database_setup_result";
 export declare type TestMethodList = {
     object: string;
     class: string;
     method: string;
 }[];
 export declare class UnitTest {
-    initializationScript(reg: abaplint.IRegistry, dbSetup: string, extraSetup?: string): string;
+    initializationScript(reg: abaplint.IRegistry, dbSetup: DatabaseSetupResult, extraSetup?: 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

@@ -4,24 +4,25 @@ 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
+    // 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)}
+
 export async function initializeABAP() {\n`;
-        if (dbSetup === "") {
-            ret += `// no database artifacts, skip DB initialization\n`;
-        }
-        else {
-            ret += `  await global.abap.initDB(\`${dbSetup}\`);\n`;
-        }
+        ret += `  const sqlite = \`${dbSetup.schemas.sqlite}\`;\n`;
+        ret += `  const hdb = \`${dbSetup.schemas.hdb}\`;\n`;
+        ret += `  const pg = \`${dbSetup.schemas.pg}\`;\n`;
+        ret += `  const schemas = {sqlite, hdb, pg};\n`;
+        ret += `  const insert = \`${dbSetup.insert}\`;\n`;
         if (extraSetup === undefined) {
-            ret += `// no extra setup\n`;
+            ret += `// no setup logic specified in config\n`;
         }
         else {
-            ret += `  await import("../test/extra.mjs");\n`;
+            ret += `  const {setup} = await import("${extraSetup}");\n` +
+                `  await setup(global.abap, schemas, insert);\n`;
         }
         ret += `}`;
         return ret;
@@ -190,7 +191,7 @@ run().then(() => {
             }
         }
         list.sort();
-        return list.join("\n") + "\n";
+        return list.join("\n");
     }
 }
 exports.UnitTest = UnitTest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "1.8.38",
+  "version": "2.0.0",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -10,6 +10,7 @@
   },
   "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"
@@ -27,7 +28,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.86.6",
+    "@abaplint/core": "^2.87.0",
     "source-map": "^0.7.3"
   },
   "devDependencies": {