@oino-ts/db 0.21.2 → 1.0.1

package/dist/cjs/OINODbModelSet.js

@@ -21,7 +21,7 @@ class OINODbModelSet {
     /** Reference to data set */
     dataset;
     /** SQL parameters */
-    sqlParams;
+    queryParams;
     /** Collection of errors */
     errors;
     /**
@@ -29,21 +29,21 @@ class OINODbModelSet {
      *
      * @param datamodel data model
      * @param dataset data set
-     * @param sqlParams SQL parameters
+     * @param queryParams SQL parameters
      */
-    constructor(datamodel, dataset, sqlParams) {
+    constructor(datamodel, dataset, queryParams) {
         this.datamodel = datamodel;
         this.dataset = dataset;
-        this.sqlParams = sqlParams;
+        this.queryParams = queryParams;
         this.errors = this.dataset.messages;
     }
     _encodeAndHashFieldValue(field, value, contentType, primaryKeyValues, rowIdSeed) {
         let result;
-        if (field.fieldParams.isPrimaryKey || field.fieldParams.isForeignKey) {
-            if (value && (field instanceof index_js_1.OINONumberDataField) && (this.datamodel.api.hashid) && ((this.sqlParams?.aggregate === undefined) || (this.sqlParams.aggregate.isAggregated(field) == false))) {
+        if (field.fieldParams.isDbPrimaryKey || field.fieldParams.isDbForeignKey) {
+            if (value && (field instanceof index_js_1.OINONumberDataField) && (this.datamodel.api.hashid) && ((this.queryParams?.aggregate === undefined) || (this.queryParams.aggregate.isAggregated(field.name) == false))) {
                 value = this.datamodel.api.hashid.encode(value, rowIdSeed);
             }
-            if (field.fieldParams.isPrimaryKey) {
+            if (field.fieldParams.isDbPrimaryKey) {
                 primaryKeyValues.push(value || "");
             }
         }
@@ -59,7 +59,7 @@ class OINODbModelSet {
         let json_row = "";
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
-            if (this.sqlParams?.select?.isSelected(f) === false) {
+            if ((this.queryParams?.select?.isSelected(f.name) === false) && (f.fieldParams.isDbPrimaryKey == false)) {
                 continue;
             }
             let value = f.serializeCell(row[i]);
@@ -70,7 +70,7 @@ class OINODbModelSet {
                 json_row += "," + common_1.OINOStr.encode(f.name, common_1.OINOContentType.json) + ":null";
             }
             else {
-                let is_hashed = (f.fieldParams.isPrimaryKey || f.fieldParams.isForeignKey) && (f instanceof index_js_1.OINONumberDataField) && (this.datamodel.api.hashid != null);
+                let is_hashed = (f.fieldParams.isDbPrimaryKey || f.fieldParams.isDbForeignKey) && (f instanceof index_js_1.OINONumberDataField) && (this.datamodel.api.hashid != null);
                 let is_value = (f instanceof index_js_1.OINOBooleanDataField) || ((f instanceof index_js_1.OINONumberDataField) && !is_hashed);
                 value = this._encodeAndHashFieldValue(f, value, common_1.OINOContentType.json, primary_key_values, f.name + " " + row_id_seed);
                 if (is_value) {
@@ -79,7 +79,7 @@ class OINODbModelSet {
                 json_row += "," + common_1.OINOStr.encode(f.name, common_1.OINOContentType.json) + ":" + value;
             }
         }
-        json_row = common_1.OINOStr.encode(index_js_1.OINODbConfig.OINODB_ID_FIELD, common_1.OINOContentType.json) + ":" + common_1.OINOStr.encode(index_js_1.OINODbConfig.printOINOId(primary_key_values), common_1.OINOContentType.json) + json_row;
+        json_row = common_1.OINOStr.encode(common_1.OINOConfig.OINO_ID_FIELD, common_1.OINOContentType.json) + ":" + common_1.OINOStr.encode(common_1.OINOConfig.printOINOId(primary_key_values), common_1.OINOContentType.json) + json_row;
         return "{" + json_row + "}";
     }
     async _writeStringJson() {
@@ -98,9 +98,9 @@ class OINODbModelSet {
     _writeHeaderCsv() {
         const model = this.datamodel;
         const fields = model.fields;
-        let csv_header = "\"" + index_js_1.OINODbConfig.OINODB_ID_FIELD + "\"";
+        let csv_header = "\"" + common_1.OINOConfig.OINO_ID_FIELD + "\"";
         for (let i = 0; i < fields.length; i++) {
-            if (this.sqlParams?.select?.isSelected(fields[i]) === false) {
+            if ((this.queryParams?.select?.isSelected(fields[i].name) === false) && (fields[i].fieldParams.isDbPrimaryKey == false)) {
                 continue;
             }
             csv_header += ",\"" + fields[i].name + "\"";
@@ -115,7 +115,7 @@ class OINODbModelSet {
         let csv_row = "";
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
-            if (this.sqlParams?.select?.isSelected(f) === false) {
+            if ((this.queryParams?.select?.isSelected(f.name) === false) && (f.fieldParams.isDbPrimaryKey == false)) {
                 continue;
             }
             let value = f.serializeCell(row[i]);
@@ -127,7 +127,7 @@ class OINODbModelSet {
                 csv_row += "," + value;
             }
         }
-        csv_row = common_1.OINOStr.encode(index_js_1.OINODbConfig.printOINOId(primary_key_values), common_1.OINOContentType.csv) + csv_row;
+        csv_row = common_1.OINOStr.encode(common_1.OINOConfig.printOINOId(primary_key_values), common_1.OINOContentType.csv) + csv_row;
         return csv_row;
     }
     async _writeStringCsv() {
@@ -162,7 +162,7 @@ class OINODbModelSet {
         let result = "";
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
-            if (this.sqlParams?.select?.isSelected(f) === false) {
+            if ((this.queryParams?.select?.isSelected(f.name) === false) && (f.fieldParams.isDbPrimaryKey == false)) {
                 continue;
             }
             let value = f.serializeCell(row[i]);
@@ -185,7 +185,7 @@ class OINODbModelSet {
             }
             result += formdata_block;
         }
-        result = this._writeRowFormdataParameterBlock(index_js_1.OINODbConfig.OINODB_ID_FIELD, index_js_1.OINODbConfig.printOINOId(primary_key_values), multipart_boundary) + result;
+        result = this._writeRowFormdataParameterBlock(common_1.OINOConfig.OINO_ID_FIELD, common_1.OINOConfig.printOINOId(primary_key_values), multipart_boundary) + result;
         return result;
     }
     _writeStringFormdata() {
@@ -201,7 +201,7 @@ class OINODbModelSet {
         let urlencode_row = "";
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
-            if (this.sqlParams?.select?.isSelected(f) === false) {
+            if ((this.queryParams?.select?.isSelected(f.name) === false) && (f.fieldParams.isDbPrimaryKey == false)) {
                 continue;
             }
             let value = f.serializeCell(row[i]);
@@ -216,7 +216,7 @@ class OINODbModelSet {
                 urlencode_row += common_1.OINOStr.encode(f.name, common_1.OINOContentType.urlencode) + "=" + value;
             }
         }
-        urlencode_row = common_1.OINOStr.encode(index_js_1.OINODbConfig.OINODB_ID_FIELD, common_1.OINOContentType.urlencode) + "=" + common_1.OINOStr.encode(index_js_1.OINODbConfig.printOINOId(primary_key_values), common_1.OINOContentType.urlencode) + "&" + urlencode_row;
+        urlencode_row = common_1.OINOStr.encode(common_1.OINOConfig.OINO_ID_FIELD, common_1.OINOContentType.urlencode) + "=" + common_1.OINOStr.encode(common_1.OINOConfig.printOINOId(primary_key_values), common_1.OINOContentType.urlencode) + "&" + urlencode_row;
         return urlencode_row;
     }
     async _writeStringUrlencode() {
@@ -242,13 +242,13 @@ class OINODbModelSet {
         let result = {};
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
-            if (f.fieldParams.isPrimaryKey) {
+            if (f.fieldParams.isDbPrimaryKey) {
                 primary_key_values.push(f.serializeCell(row[i]) || "");
             }
-            if (this.sqlParams?.select?.isSelected(f) === false) {
+            if ((this.queryParams?.select?.isSelected(f.name) === false) && (f.fieldParams.isDbPrimaryKey == false)) {
                 continue;
             }
-            let value = f.db.parseSqlValueAsCell(row[i], f.sqlType); // retain original value without serialization
+            let value = f.datasource.parseValueAsCell(row[i], f.sqlType); // retain original value without serialization
             if (value === undefined) {
                 // skip undefined values
             }
@@ -259,7 +259,7 @@ class OINODbModelSet {
                 result[f.name] = value;
             }
         }
-        result[index_js_1.OINODbConfig.OINODB_ID_FIELD] = index_js_1.OINODbConfig.printOINOId(primary_key_values);
+        result[common_1.OINOConfig.OINO_ID_FIELD] = common_1.OINOConfig.printOINOId(primary_key_values);
         return result;
     }
     /**
@@ -316,7 +316,7 @@ class OINODbModelSet {
      */
     async exportAsRecord(idFieldName) {
         const result = {};
-        const row_id_field = idFieldName || index_js_1.OINODbConfig.OINODB_ID_FIELD;
+        const row_id_field = idFieldName || common_1.OINOConfig.OINO_ID_FIELD;
         while (!this.dataset.isEof()) {
             const row_data = this.dataset.getRow();
             const row_export = this._exportRow(row_data);

package/dist/cjs/OINODbQueryParams.js

@@ -0,0 +1,201 @@
+"use strict";
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OINODbQueryAggregate = exports.OINODbQueryLimit = exports.OINODbQueryOrder = exports.OINODbQueryFilter = void 0;
+const common_1 = require("@oino-ts/common");
+/**
+ * Class for recursively parsing of filters and printing them as SQL conditions.
+ * Supports three types of statements
+ * - comparison: (field)-lt|le|eq|ge|gt|like(value)
+ * - negation: -not(filter)
+ * - conjunction/disjunction: (filter)-and|or(filter)
+ * Supported conditions are comparisons (<, <=, =, >=, >) and substring match (LIKE).
+ *
+ */
+class OINODbQueryFilter extends common_1.OINOQueryFilter {
+    static operatorToSql(filter) {
+        switch (filter.operator) {
+            case "and": return " AND ";
+            case "or": return " OR ";
+            case "not": return "NOT ";
+            case "lt": return " < ";
+            case "le": return " <= ";
+            case "eq": return " = ";
+            case "ne": return " != ";
+            case "ge": return " >= ";
+            case "gt": return " > ";
+            case "like": return " LIKE ";
+            case "isnull": return " IS NULL";
+            case "isNotNull": return " IS NOT NULL";
+        }
+        return " ";
+    }
+    /**
+     * Print filter as SQL condition based on the datamodel of the API.
+     *
+     * @param dataModel data model (and database) to use for formatting of values
+     *
+     */
+    static printSql(filter, dataModel) {
+        if (filter.isEmpty()) {
+            return "";
+        }
+        let result = "";
+        let field = null;
+        if (filter.leftSide instanceof common_1.OINOQueryFilter) {
+            result += OINODbQueryFilter.printSql(filter.leftSide, dataModel);
+        }
+        else {
+            field = dataModel.findFieldByName(filter.leftSide);
+            if (!field) {
+                common_1.OINOLog.error("@oino-ts/db", "OINODbQueryFilter", "toSql", "Invalid field!", { field: filter.leftSide });
+                throw new Error(common_1.OINO_ERROR_PREFIX + ": OINODbQueryFilter.toSql - Invalid field '" + filter.leftSide + "'"); // invalid field name could be a security risk, stop processing
+            }
+            result += dataModel.api.datasource.printColumnName(field.name);
+        }
+        result += OINODbQueryFilter.operatorToSql(filter);
+        if (filter.rightSide instanceof common_1.OINOQueryFilter) {
+            result += OINODbQueryFilter.printSql(filter.rightSide, dataModel);
+        }
+        else if (filter.operator == common_1.OINOQueryNullCheck.isnull || filter.operator == common_1.OINOQueryNullCheck.isNotNull) {
+            // nothing to do, IS NULL and IS NOT NULL do not have a right side
+        }
+        else {
+            const value = field.deserializeCell(filter.rightSide);
+            if ((value == null) || (value === "")) {
+                common_1.OINOLog.error("@oino-ts/db", "OINODbQueryFilter", "toSql", "Invalid value!", { value: value });
+                throw new Error(common_1.OINO_ERROR_PREFIX + ": OINODbQueryFilter.toSql - Invalid value '" + value + "'"); // invalid value could be a security risk, stop processing
+            }
+            result += field.printCellAsValue(value);
+        }
+        result = "(" + result + ")";
+        common_1.OINOLog.debug("@oino-ts/db", "OINODbQueryFilter", "toSql", "Result", { sql: result });
+        return result;
+    }
+}
+exports.OINODbQueryFilter = OINODbQueryFilter;
+/**
+ * Class for ordering select results on a number of columns.
+ *
+ */
+class OINODbQueryOrder extends common_1.OINOQueryOrder {
+    /**
+     * Print order as SQL condition based on the datamodel of the API.
+     *
+     * @param order order instance
+     * @param dataModel data model (and database) to use for formatting of values
+     *
+     */
+    static printSql(order, dataModel) {
+        if (order.isEmpty()) {
+            return "";
+        }
+        let result = "";
+        for (let i = 0; i < order.columns.length; i++) {
+            const field = dataModel.findFieldByName(order.columns[i]);
+            if (!field) {
+                common_1.OINOLog.error("@oino-ts/db", "OINODbQueryOrder", "toSql", "Invalid field!", { field: order.columns[i] });
+                throw new Error(common_1.OINO_ERROR_PREFIX + ": OINODbQueryOrder.toSql - Invalid field '" + order.columns[i] + "'"); // invalid field name could be a security risk, stop processing
+            }
+            if (result) {
+                result += ",";
+            }
+            result += dataModel.api.datasource.printColumnName(field.name) + " ";
+            if (order.descending[i]) {
+                result += "DESC";
+            }
+            else {
+                result += "ASC";
+            }
+        }
+        common_1.OINOLog.debug("@oino-ts/db", "OINODbQueryOrder", "toSql", "Result", { sql: result });
+        return result;
+    }
+}
+exports.OINODbQueryOrder = OINODbQueryOrder;
+/**
+ * Class for limiting the number of results.
+ *
+ */
+class OINODbQueryLimit extends common_1.OINOQueryLimit {
+    /**
+     * Print order as SQL condition based on the datamodel of the API.
+     *
+     * @param limit limit instance
+     * @param dataModel data model (and database) to use for formatting of values
+     *
+     */
+    static printSql(limit, dataModel) {
+        if (limit.isEmpty()) {
+            return "";
+        }
+        let result = limit.limit.toString();
+        if (limit.page > 0) {
+            result += " OFFSET " + (limit.limit * (limit.page - 1) + 1).toString();
+        }
+        common_1.OINOLog.debug("@oino-ts/db", "OINODbQueryLimit", "toSql", "Result", { sql: result });
+        return result;
+    }
+}
+exports.OINODbQueryLimit = OINODbQueryLimit;
+/**
+ * Class for limiting the number of results.
+ *
+ */
+class OINODbQueryAggregate extends common_1.OINOQueryAggregate {
+    /**
+     * Print non-aggregated fields as SQL GROUP BY-condition based on the datamodel of the API.
+     *
+     * @param aggregate aggregate instance
+     * @param dataModel data model (and database) to use for formatting of values
+     * @param select what fields to select
+     *
+     */
+    static printSql(aggregate, dataModel, select) {
+        if (aggregate.isEmpty()) {
+            return "";
+        }
+        let result = "";
+        for (let i = 0; i < dataModel.fields.length; i++) {
+            const f = dataModel.fields[i];
+            if ((select?.isSelected(f.name) || (f.fieldParams.isPrimaryKey == true)) && (aggregate.fields.includes(f.name) == false)) {
+                result += f.printColumnName() + ",";
+            }
+        }
+        result = result.substring(0, result.length - 1);
+        common_1.OINOLog.debug("@oino-ts/db", "OINODbQueryAggregate", "toSql", "Result", { sql: result });
+        return result;
+    }
+    /**
+     * Print non-aggregated fields as SQL GROUP BY-condition based on the datamodel of the API.
+     *
+     * @param dataModel data model (and database) to use for formatting of values
+     * @param select what fields to select
+     *
+     */
+    static printColumnNames(aggregate, dataModel, select) {
+        let result = "";
+        for (let i = 0; i < dataModel.fields.length; i++) {
+            const f = dataModel.fields[i];
+            if ((select?.isSelected(f.name) === false) && (f.fieldParams.isPrimaryKey == false)) { // if a field is not selected, we include an aggregated constant (min of const string) and correct fieldname instead so that dimensions of the data don't change, it does not need a group by but no unnecessary data is fetched
+                result += common_1.OINOQueryAggregateFunctions.min + "(" + f.datasource.printStringValue("") + ") as " + f.printColumnName() + ",";
+            }
+            else {
+                const aggregate_index = aggregate.fields.indexOf(f.name);
+                const col_name = f.printColumnName();
+                if (aggregate_index >= 0) {
+                    result += aggregate.functions[aggregate_index] + "(" + col_name + ") as " + col_name + ",";
+                }
+                else {
+                    result += col_name + ",";
+                }
+            }
+        }
+        return result.substring(0, result.length - 1);
+    }
+}
+exports.OINODbQueryAggregate = OINODbQueryAggregate;

package/dist/cjs/index.js

@@ -1,47 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OINODB_UNDEFINED = exports.OINODB_EMPTY_ROWS = exports.OINODB_EMPTY_ROW = exports.OINODbParser = exports.OINODbSwagger = exports.OINODbFactory = exports.OINODbConfig = exports.OINODbSqlNullCheck = exports.OINODbSqlSelect = exports.OINODbSqlAggregateFunctions = exports.OINODbSqlAggregate = exports.OINODbSqlBooleanOperation = exports.OINODbSqlLimit = exports.OINODbSqlComparison = exports.OINODbSqlOrder = exports.OINODbSqlFilter = exports.OINODb = exports.OINODbMemoryDataSet = exports.OINODbDataSet = exports.OINODatetimeDataField = exports.OINOBlobDataField = exports.OINOStringDataField = exports.OINONumberDataField = exports.OINOBooleanDataField = exports.OINODbDataField = exports.OINODbModelSet = exports.OINODbDataModel = exports.OINODbApiRequest = exports.OINODbApi = exports.OINODbHtmlTemplate = exports.OINODbApiResult = void 0;
-var OINODbApi_js_1 = require("./OINODbApi.js");
-Object.defineProperty(exports, "OINODbApiResult", { enumerable: true, get: function () { return OINODbApi_js_1.OINODbApiResult; } });
-Object.defineProperty(exports, "OINODbHtmlTemplate", { enumerable: true, get: function () { return OINODbApi_js_1.OINODbHtmlTemplate; } });
-Object.defineProperty(exports, "OINODbApi", { enumerable: true, get: function () { return OINODbApi_js_1.OINODbApi; } });
-Object.defineProperty(exports, "OINODbApiRequest", { enumerable: true, get: function () { return OINODbApi_js_1.OINODbApiRequest; } });
-var OINODbDataModel_js_1 = require("./OINODbDataModel.js");
-Object.defineProperty(exports, "OINODbDataModel", { enumerable: true, get: function () { return OINODbDataModel_js_1.OINODbDataModel; } });
-var OINODbModelSet_js_1 = require("./OINODbModelSet.js");
-Object.defineProperty(exports, "OINODbModelSet", { enumerable: true, get: function () { return OINODbModelSet_js_1.OINODbModelSet; } });
-var OINODbDataField_js_1 = require("./OINODbDataField.js");
-Object.defineProperty(exports, "OINODbDataField", { enumerable: true, get: function () { return OINODbDataField_js_1.OINODbDataField; } });
-Object.defineProperty(exports, "OINOBooleanDataField", { enumerable: true, get: function () { return OINODbDataField_js_1.OINOBooleanDataField; } });
-Object.defineProperty(exports, "OINONumberDataField", { enumerable: true, get: function () { return OINODbDataField_js_1.OINONumberDataField; } });
-Object.defineProperty(exports, "OINOStringDataField", { enumerable: true, get: function () { return OINODbDataField_js_1.OINOStringDataField; } });
-Object.defineProperty(exports, "OINOBlobDataField", { enumerable: true, get: function () { return OINODbDataField_js_1.OINOBlobDataField; } });
-Object.defineProperty(exports, "OINODatetimeDataField", { enumerable: true, get: function () { return OINODbDataField_js_1.OINODatetimeDataField; } });
+exports.OINODB_UNDEFINED = exports.OINODbQueryAggregate = exports.OINODbQueryLimit = exports.OINODbQueryOrder = exports.OINODbQueryFilter = exports.OINODbApi = exports.OINODbFactory = exports.OINODbDataModel = exports.OINODb = void 0;
 var OINODb_js_1 = require("./OINODb.js");
-Object.defineProperty(exports, "OINODbDataSet", { enumerable: true, get: function () { return OINODb_js_1.OINODbDataSet; } });
-Object.defineProperty(exports, "OINODbMemoryDataSet", { enumerable: true, get: function () { return OINODb_js_1.OINODbMemoryDataSet; } });
 Object.defineProperty(exports, "OINODb", { enumerable: true, get: function () { return OINODb_js_1.OINODb; } });
-var OINODbSqlParams_js_1 = require("./OINODbSqlParams.js");
-Object.defineProperty(exports, "OINODbSqlFilter", { enumerable: true, get: function () { return OINODbSqlParams_js_1.OINODbSqlFilter; } });
-Object.defineProperty(exports, "OINODbSqlOrder", { enumerable: true, get: function () { return OINODbSqlParams_js_1.OINODbSqlOrder; } });
-Object.defineProperty(exports, "OINODbSqlComparison", { enumerable: true, get: function () { return OINODbSqlParams_js_1.OINODbSqlComparison; } });
-Object.defineProperty(exports, "OINODbSqlLimit", { enumerable: true, get: function () { return OINODbSqlParams_js_1.OINODbSqlLimit; } });
-Object.defineProperty(exports, "OINODbSqlBooleanOperation", { enumerable: true, get: function () { return OINODbSqlParams_js_1.OINODbSqlBooleanOperation; } });
-Object.defineProperty(exports, "OINODbSqlAggregate", { enumerable: true, get: function () { return OINODbSqlParams_js_1.OINODbSqlAggregate; } });
-Object.defineProperty(exports, "OINODbSqlAggregateFunctions", { enumerable: true, get: function () { return OINODbSqlParams_js_1.OINODbSqlAggregateFunctions; } });
-Object.defineProperty(exports, "OINODbSqlSelect", { enumerable: true, get: function () { return OINODbSqlParams_js_1.OINODbSqlSelect; } });
-Object.defineProperty(exports, "OINODbSqlNullCheck", { enumerable: true, get: function () { return OINODbSqlParams_js_1.OINODbSqlNullCheck; } });
-var OINODbConfig_js_1 = require("./OINODbConfig.js");
-Object.defineProperty(exports, "OINODbConfig", { enumerable: true, get: function () { return OINODbConfig_js_1.OINODbConfig; } });
+var OINODbDataModel_js_1 = require("./OINODbDataModel.js");
+Object.defineProperty(exports, "OINODbDataModel", { enumerable: true, get: function () { return OINODbDataModel_js_1.OINODbDataModel; } });
 var OINODbFactory_js_1 = require("./OINODbFactory.js");
 Object.defineProperty(exports, "OINODbFactory", { enumerable: true, get: function () { return OINODbFactory_js_1.OINODbFactory; } });
-var OINODbSwagger_js_1 = require("./OINODbSwagger.js");
-Object.defineProperty(exports, "OINODbSwagger", { enumerable: true, get: function () { return OINODbSwagger_js_1.OINODbSwagger; } });
-var OINODbParser_js_1 = require("./OINODbParser.js");
-Object.defineProperty(exports, "OINODbParser", { enumerable: true, get: function () { return OINODbParser_js_1.OINODbParser; } });
-/** Empty row instance */
-exports.OINODB_EMPTY_ROW = [];
-/** Empty row array instance */
-exports.OINODB_EMPTY_ROWS = [];
-/** Constant for undefined values */
-exports.OINODB_UNDEFINED = ""; // original idea was to have a defined literal that get's swapped back to undefined, but current implementation just leaves it out at serialization (so value does not matter)
+var OINODbApi_js_1 = require("./OINODbApi.js");
+Object.defineProperty(exports, "OINODbApi", { enumerable: true, get: function () { return OINODbApi_js_1.OINODbApi; } });
+var OINODbQueryParams_js_1 = require("./OINODbQueryParams.js");
+Object.defineProperty(exports, "OINODbQueryFilter", { enumerable: true, get: function () { return OINODbQueryParams_js_1.OINODbQueryFilter; } });
+Object.defineProperty(exports, "OINODbQueryOrder", { enumerable: true, get: function () { return OINODbQueryParams_js_1.OINODbQueryOrder; } });
+Object.defineProperty(exports, "OINODbQueryLimit", { enumerable: true, get: function () { return OINODbQueryParams_js_1.OINODbQueryLimit; } });
+Object.defineProperty(exports, "OINODbQueryAggregate", { enumerable: true, get: function () { return OINODbQueryParams_js_1.OINODbQueryAggregate; } });
+var OINODbConstants_js_1 = require("./OINODbConstants.js");
+Object.defineProperty(exports, "OINODB_UNDEFINED", { enumerable: true, get: function () { return OINODbConstants_js_1.OINODB_UNDEFINED; } });

package/dist/esm/OINODb.js

@@ -3,15 +3,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-import { OINO_ERROR_PREFIX, OINOResult } from "@oino-ts/common";
-import { OINODB_EMPTY_ROW } from "./index.js";
+import { OINODataSource } from "@oino-ts/common";
 /**
  * Base class for database abstraction, implementing methods for connecting, making queries and parsing/formatting data
  * between SQL and serialization formats.
  *
  */
-export class OINODb {
-    _params;
+export class OINODb extends OINODataSource {
+    dbParams;
     /** Name of the database */
     name;
     isConnected = false;
@@ -21,8 +20,9 @@ export class OINODb {
      * @param params database parameters
      */
     constructor(params) {
-        this._params = { ...params }; // make a shallow copy of params so that changes to them do not affect the original object
-        this.name = this._params.database;
+        super();
+        this.dbParams = { ...params }; // make a shallow copy of params so that changes to them do not affect the original object
+        this.name = this.dbParams.database;
     }
     /**
      * Print SQL select statement with DB specific formatting.
@@ -70,139 +70,3 @@ export class OINODb {
         return result;
     }
 }
-/**
- * Base class for SQL results that can be asynchronously iterated (but
- * not necessarity rewinded). Idea is to handle database specific mechanisms
- * for returning and formatting conventions in the database specific
- * implementation. Data might be in memory or streamed in chunks and
- * `OINODbDataSet` will serve it out consistently.
- *
- */
-export class OINODbDataSet extends OINOResult {
-    _data;
-    /** Error messages */
-    messages;
-    /**
-     * Constructor for `OINODbDataSet`.
-     *
-     * @param data internal database specific data type (constructor will throw if invalid)
-     * @param messages error messages from SQL-query
-     *
-     */
-    constructor(data, messages = []) {
-        super();
-        this._data = data;
-        this.messages = messages;
-    }
-    /**
-     * Checks if the messages contain errors.
-     *
-     */
-    hasErrors() {
-        for (let i = 0; i < this.messages.length; i++) {
-            if (this.messages[i].startsWith(OINO_ERROR_PREFIX)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    /**
-     * Checks if the messages contain errors.
-     *
-     */
-    getFirstError() {
-        for (let i = 0; i < this.messages.length; i++) {
-            if (this.messages[i].startsWith(OINO_ERROR_PREFIX)) {
-                return this.messages[i];
-            }
-        }
-        return "";
-    }
-}
-/**
- * Generic in memory implementation of a data set where data is an array of rows. Used
- * by BunSqlite and automated testing. Can be rewinded.
- *
- */
-export class OINODbMemoryDataSet extends OINODbDataSet {
-    _rows;
-    _currentRow;
-    _eof;
-    /**
-     * Constructor of `OINODbMemoryDataSet`.
-     *
-     * @param data data as OINODataRow[] (constructor will throw if invalid)
-     * @param errors error messages from SQL-query
-     *
-     */
-    constructor(data, errors = []) {
-        super(data, errors);
-        if ((data == null) || !(Array.isArray(data))) {
-            throw new Error(OINO_ERROR_PREFIX + ": Data needs to be compatible with OINORow[]!"); // TODO: maybe check all rows
-        }
-        this._rows = data;
-        if (this.isEmpty()) {
-            this._currentRow = -1;
-            this._eof = true;
-        }
-        else {
-            this._currentRow = 0;
-            this._eof = false;
-        }
-    }
-    /**
-     * Is data set empty.
-     *
-     */
-    isEmpty() {
-        return (this._rows.length == 0);
-    }
-    /**
-     * Is there no more content, i.e. either dataset is empty or we have moved beyond last line
-     *
-     */
-    isEof() {
-        return (this._eof);
-    }
-    /**
-     * Attempts to moves dataset to the next row, possibly waiting for more data to become available. Returns !isEof().
-     *
-     */
-    async next() {
-        if (this._currentRow < this._rows.length - 1) {
-            this._currentRow = this._currentRow + 1;
-        }
-        else {
-            this._eof = true;
-        }
-        return Promise.resolve(!this._eof);
-    }
-    /**
-     * Gets current row of data.
-     *
-     */
-    getRow() {
-        if ((this._currentRow >= 0) && (this._currentRow < this._rows.length)) {
-            return this._rows[this._currentRow];
-        }
-        else {
-            return OINODB_EMPTY_ROW;
-        }
-    }
-    /**
-     * Gets all rows of data.
-     *
-     */
-    async getAllRows() {
-        return this._rows; // at the moment theres no result streaming, so we can just return the rows
-    }
-    /**
-     * Rewinds data set to the first row, returns !isEof().
-     *
-     */
-    first() {
-        this._currentRow = 0;
-        this._eof = this._rows.length == 0;
-        return !this._eof;
-    }
-}