@abaplint/transpiler 2.1.92 → 2.2.1

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

@@ -3,6 +3,7 @@ export declare class SQLiteDatabaseSchema {
     private readonly reg;
     constructor(reg: abaplint.IRegistry);
     run(): string[];
-    private transparentTable;
+    private buildVIEW;
+    private buildTABL;
     private toType;
 }

package/build/src/db/sqlite_database_schema.js

@@ -12,13 +12,41 @@ class SQLiteDatabaseSchema {
         for (const obj of this.reg.getObjects()) {
             if (obj instanceof abaplint.Objects.Table
                 && obj.getTableCategory() === abaplint.Objects.TableCategory.Transparent) {
-                statements.push(this.transparentTable(obj).trim());
+                statements.push(this.buildTABL(obj).trim());
+            }
+        }
+        // CREATE VIEWs after TABLEs
+        // todo: what if the view is based on another view?
+        for (const obj of this.reg.getObjects()) {
+            if (obj instanceof abaplint.Objects.View) {
+                statements.push(this.buildVIEW(obj).trim());
             }
         }
         return statements;
     }
     //////////////////
-    transparentTable(tabl) {
+    // https://www.sqlite.org/lang_createview.html
+    buildVIEW(view) {
+        const fields = view.getFields();
+        const columns = fields === null || fields === void 0 ? void 0 : fields.map((f) => f.TABNAME.toLowerCase() + "." + f.FIELDNAME.toLowerCase() + " AS " + f.VIEWFIELD.toLowerCase()).join(", ");
+        let from = "";
+        let previous = "";
+        for (const j of view.getJoin() || []) {
+            if (previous === "") {
+                from += j.LTAB.toLowerCase() + " INNER JOIN " + j.RTAB.toLowerCase() + " ON " + j.LTAB.toLowerCase() + "." + j.LFIELD.toLowerCase() + " = " + j.RTAB.toLowerCase() + "." + j.RFIELD.toLowerCase();
+            }
+            else if (previous === j.LTAB + "," + j.RTAB) {
+                from += " AND " + j.LTAB.toLowerCase() + "." + j.LFIELD.toLowerCase() + " = " + j.RTAB.toLowerCase() + "." + j.RFIELD.toLowerCase();
+            }
+            else {
+                from += " INNER JOIN " + j.RTAB.toLowerCase() + " ON " + j.LTAB.toLowerCase() + "." + j.LFIELD.toLowerCase() + " = " + j.RTAB.toLowerCase() + "." + j.RFIELD.toLowerCase();
+            }
+            previous = j.LTAB + "," + j.RTAB;
+        }
+        from = from.trim();
+        return `CREATE VIEW ${view.getName().toLowerCase()} AS SELECT ${columns} FROM ${from};\n`;
+    }
+    buildTABL(tabl) {
         const type = tabl.parseType(this.reg);
         if (!(type instanceof abaplint.BasicTypes.StructureType)) {
             return "";
@@ -32,7 +60,7 @@ class SQLiteDatabaseSchema {
         const key = ", PRIMARY KEY(" + tabl.listKeys().map(e => "'" + e.toLowerCase() + "'").join(",") + ")";
         return `CREATE TABLE ${tabl.getName().toLowerCase()} (${fields.join(", ")}${key});\n`;
     }
-    toType(type, fieldname, table) {
+    toType(type, fieldname, errorInfo) {
         if (type instanceof abaplint.BasicTypes.CharacterType) {
             return `NCHAR(${type.getLength()})`;
         }
@@ -67,10 +95,10 @@ class SQLiteDatabaseSchema {
             return `DECIMAL(${type.getLength()},${type.getDecimals()})`;
         }
         else if (type instanceof abaplint.BasicTypes.VoidType) {
-            throw `Type of ${table}-${fieldname} is VoidType(${type.getVoided()}), make sure the type is known, enable strict syntax checking`;
+            throw `Type of ${errorInfo}-${fieldname} is VoidType(${type.getVoided()}), make sure the type is known, enable strict syntax checking`;
         }
         else {
-            throw "database_setup: " + table + "-" + fieldname + ", todo toType handle: " + type.constructor.name;
+            throw "database_setup: " + errorInfo + "-" + fieldname + ", todo toType handle: " + type.constructor.name;
         }
     }
 }

package/build/src/{handle_abap.d.ts → handlers/handle_abap.d.ts}

@@ -1,6 +1,6 @@
 import * as abaplint from "@abaplint/core";
-import { IOutputFile, ITranspilerOptions } from "./types";
-import { Chunk } from "./chunk";
+import { IOutputFile, ITranspilerOptions } from "../types";
+import { Chunk } from "../chunk";
 export declare class HandleABAP {
     private readonly options;
     constructor(options?: ITranspilerOptions);

package/build/src/{handle_abap.js → handlers/handle_abap.js}

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HandleABAP = void 0;
 const abaplint = require("@abaplint/core");
-const traversal_1 = require("./traversal");
-const requires_1 = require("./requires");
-const rearranger_1 = require("./rearranger");
-const chunk_1 = require("./chunk");
+const traversal_1 = require("../traversal");
+const requires_1 = require("../requires");
+const rearranger_1 = require("../rearranger");
+const chunk_1 = require("../chunk");
 class HandleABAP {
     constructor(options) {
         this.options = options;

package/build/src/{handle_data_element.d.ts → handlers/handle_data_element.d.ts}

@@ -1,5 +1,5 @@
 import * as abaplint from "@abaplint/core";
-import { IOutputFile } from "./types";
+import { IOutputFile } from "../types";
 export declare class HandleDataElement {
     runObject(obj: abaplint.Objects.DataElement, reg: abaplint.IRegistry): IOutputFile[];
 }

package/build/src/{handle_data_element.js → handlers/handle_data_element.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HandleDataElement = void 0;
-const chunk_1 = require("./chunk");
-const transpile_types_1 = require("./transpile_types");
+const chunk_1 = require("../chunk");
+const transpile_types_1 = require("../transpile_types");
 class HandleDataElement {
     runObject(obj, reg) {
         var _a;

package/build/src/{handle_table.d.ts → handlers/handle_table.d.ts}

@@ -1,5 +1,5 @@
 import * as abaplint from "@abaplint/core";
-import { IOutputFile } from "./types";
+import { IOutputFile } from "../types";
 export declare class HandleTable {
     runObject(obj: abaplint.Objects.Table, reg: abaplint.IRegistry): IOutputFile[];
 }

package/build/src/{handle_table.js → handlers/handle_table.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HandleTable = void 0;
-const chunk_1 = require("./chunk");
-const transpile_types_1 = require("./transpile_types");
+const chunk_1 = require("../chunk");
+const transpile_types_1 = require("../transpile_types");
 // tables or structures
 class HandleTable {
     runObject(obj, reg) {

package/build/src/{handle_table_type.d.ts → handlers/handle_table_type.d.ts}

@@ -1,5 +1,5 @@
 import * as abaplint from "@abaplint/core";
-import { IOutputFile } from "./types";
+import { IOutputFile } from "../types";
 export declare class HandleTableType {
     runObject(obj: abaplint.Objects.TableType, reg: abaplint.IRegistry): IOutputFile[];
 }

package/build/src/{handle_table_type.js → handlers/handle_table_type.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HandleTableType = void 0;
-const chunk_1 = require("./chunk");
-const transpile_types_1 = require("./transpile_types");
+const chunk_1 = require("../chunk");
+const transpile_types_1 = require("../transpile_types");
 class HandleTableType {
     runObject(obj, reg) {
         var _a;

package/build/src/handlers/handle_view.d.ts

@@ -0,0 +1,5 @@
+import * as abaplint from "@abaplint/core";
+import { IOutputFile } from "../types";
+export declare class HandleView {
+    runObject(obj: abaplint.Objects.View, reg: abaplint.IRegistry): IOutputFile[];
+}

package/build/src/handlers/handle_view.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HandleView = void 0;
+const chunk_1 = require("../chunk");
+const transpile_types_1 = require("../transpile_types");
+// view, much like the tables
+class HandleView {
+    runObject(obj, reg) {
+        var _a;
+        const filename = (_a = obj.getXMLFile()) === null || _a === void 0 ? void 0 : _a.getFilename().replace(".xml", ".mjs").toLowerCase();
+        if (filename === undefined) {
+            return [];
+        }
+        const type = obj.parseType(reg);
+        const chunk = new chunk_1.Chunk().appendString(`abap.DDIC["${obj.getName().toUpperCase()}"] = {
+  "objectType": "VIEW",
+  "type": ${new transpile_types_1.TranspileTypes().toType(type)},
+};`);
+        // todo, "keyFields": ${JSON.stringify(obj.listKeys())},
+        const output = {
+            object: {
+                name: obj.getName(),
+                type: obj.getType(),
+            },
+            filename: filename,
+            chunk: chunk,
+            requires: [],
+            exports: [],
+        };
+        return [output];
+    }
+}
+exports.HandleView = HandleView;
+//# sourceMappingURL=handle_view.js.map

package/build/src/index.js

@@ -6,11 +6,12 @@ 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 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");
+const handle_table_1 = require("./handlers/handle_table");
+const handle_abap_1 = require("./handlers/handle_abap");
+const handle_data_element_1 = require("./handlers/handle_data_element");
+const handle_table_type_1 = require("./handlers/handle_table_type");
+const handle_view_1 = require("./handlers/handle_view");
 class Transpiler {
     constructor(options) {
         this.options = options;
@@ -59,6 +60,9 @@ class Transpiler {
             else if (obj instanceof abaplint.Objects.Table) {
                 output.objects.push(...new handle_table_1.HandleTable().runObject(obj, reg));
             }
+            else if (obj instanceof abaplint.Objects.View) {
+                output.objects.push(...new handle_view_1.HandleView().runObject(obj, reg));
+            }
             else if (obj instanceof abaplint.Objects.DataElement) {
                 output.objects.push(...new handle_data_element_1.HandleDataElement().runObject(obj, reg));
             }

package/build/src/keywords.js

@@ -11,9 +11,9 @@ class Keywords {
                 continue;
             }
             for (const f of o.getABAPFiles()) {
-                let tokens = [];
+                const tokens = [];
                 for (const s of f.getStatements()) {
-                    tokens = tokens.concat(this.traverse(s, f));
+                    tokens.push(...this.traverse(s, f));
                 }
                 if (tokens.length === 0) {
                     continue;
@@ -51,6 +51,7 @@ class Keywords {
         ];
         // "with"
         // "delete"
+        keywords.push(...keywords.map(k => "!" + k));
         let ret = [];
         for (const c of node.getChildren()) {
             if (c instanceof abaplint.Nodes.TokenNodeRegex) {

package/build/src/validation.js

@@ -28,7 +28,7 @@ exports.config = {
         },
         "parser_error": true,
         "allowed_object_types": {
-            "allowed": ["INTF", "CLAS", "PROG", "DEVC", "TABL", "SHLP", "XSLT", "SHMA", "SICF", "NROB", "TYPE", "DTEL", "DOMA", "TTYP", "MSAG", "FUGR"],
+            "allowed": ["INTF", "CLAS", "PROG", "DEVC", "TABL", "SHLP", "VIEW", "XSLT", "SHMA", "SICF", "NROB", "TYPE", "DTEL", "DOMA", "TTYP", "MSAG", "FUGR"],
         },
         /*
             "exit_or_check": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.1.92",
+  "version": "2.2.1",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -28,7 +28,7 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.93.33",
+    "@abaplint/core": "^2.93.35",
     "source-map": "^0.7.4"
   },
   "devDependencies": {