@oino-ts/db 0.17.5 → 0.19.0

package/dist/cjs/OINODb.js

@@ -6,6 +6,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OINODbMemoryDataSet = exports.OINODbDataSet = exports.OINODb = void 0;
+const common_1 = require("@oino-ts/common");
 const index_js_1 = require("./index.js");
 /**
  * Base class for database abstraction, implementing methods for connecting, making queries and parsing/formatting data
@@ -85,7 +86,7 @@ class OINODbDataSet {
      */
     hasErrors() {
         for (let i = 0; i < this.messages.length; i++) {
-            if (this.messages[i].startsWith(index_js_1.OINO_ERROR_PREFIX)) {
+            if (this.messages[i].startsWith(common_1.OINO_ERROR_PREFIX)) {
                 return true;
             }
         }
@@ -97,7 +98,7 @@ class OINODbDataSet {
      */
     getFirstError() {
         for (let i = 0; i < this.messages.length; i++) {
-            if (this.messages[i].startsWith(index_js_1.OINO_ERROR_PREFIX)) {
+            if (this.messages[i].startsWith(common_1.OINO_ERROR_PREFIX)) {
                 return this.messages[i];
             }
         }
@@ -124,7 +125,7 @@ class OINODbMemoryDataSet extends OINODbDataSet {
     constructor(data, errors = []) {
         super(data, errors);
         if ((data == null) || !(Array.isArray(data))) {
-            throw new Error(index_js_1.OINO_ERROR_PREFIX + ": Data needs to be compatible with OINORow[]!"); // TODO: maybe check all rows
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": Data needs to be compatible with OINORow[]!"); // TODO: maybe check all rows
         }
         this._rows = data;
         if (this.isEmpty()) {

package/dist/cjs/OINODbApi.js

@@ -7,20 +7,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OINODbApi = exports.OINODbHtmlTemplate = exports.OINODbApiResult = exports.OINODbApiRequest = void 0;
 const node_buffer_1 = require("node:buffer");
-const index_js_1 = require("./index.js");
 const common_1 = require("@oino-ts/common");
+const index_js_1 = require("./index.js");
 const hashid_1 = require("@oino-ts/hashid");
 class OINODbApiRequest extends common_1.OINOHttpRequest {
     rowId;
-    data;
+    rowData;
     sqlParams;
     constructor(init) {
         super(init);
         this.rowId = init?.rowId || "";
-        this.data = init?.data || null;
+        this.rowData = init?.rowData || null;
         this.sqlParams = init?.sqlParams || {};
         if (init?.filter) {
-            this.sqlParams.filter = init.filter;
+            if (init.filter instanceof index_js_1.OINODbSqlFilter) {
+                this.sqlParams.filter = init.filter;
+            }
+            else {
+                this.sqlParams.filter = index_js_1.OINODbSqlFilter.parse(init.filter);
+            }
         }
         if (!this.sqlParams.filter) {
             const filter_param = this.url?.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_FILTER_PARAM);
@@ -29,7 +34,12 @@ class OINODbApiRequest extends common_1.OINOHttpRequest {
             }
         }
         if (init?.order) {
-            this.sqlParams.order = init.order;
+            if (init.order instanceof index_js_1.OINODbSqlOrder) {
+                this.sqlParams.order = init.order;
+            }
+            else {
+                this.sqlParams.order = index_js_1.OINODbSqlOrder.parse(init.order);
+            }
         }
         if (!this.sqlParams.order) {
             const order_param = this.url?.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_ORDER_PARAM);
@@ -38,7 +48,12 @@ class OINODbApiRequest extends common_1.OINOHttpRequest {
             }
         }
         if (init?.limit) {
-            this.sqlParams.limit = init.limit;
+            if (init.limit instanceof index_js_1.OINODbSqlLimit) {
+                this.sqlParams.limit = init.limit;
+            }
+            else {
+                this.sqlParams.limit = index_js_1.OINODbSqlLimit.parse(init.limit);
+            }
         }
         if (!this.sqlParams.limit) {
             const limit_param = this.url?.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_LIMIT_PARAM);
@@ -47,7 +62,12 @@ class OINODbApiRequest extends common_1.OINOHttpRequest {
             }
         }
         if (init?.aggregate) {
-            this.sqlParams.aggregate = init.aggregate;
+            if (init.aggregate instanceof index_js_1.OINODbSqlAggregate) {
+                this.sqlParams.aggregate = init.aggregate;
+            }
+            else {
+                this.sqlParams.aggregate = index_js_1.OINODbSqlAggregate.parse(init.aggregate);
+            }
         }
         if (!this.sqlParams.aggregate) {
             const aggregate_param = this.url?.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_AGGREGATE_PARAM);
@@ -56,7 +76,12 @@ class OINODbApiRequest extends common_1.OINOHttpRequest {
             }
         }
         if (init?.select) {
-            this.sqlParams.select = init.select;
+            if (init.select instanceof index_js_1.OINODbSqlSelect) {
+                this.sqlParams.select = init.select;
+            }
+            else {
+                this.sqlParams.select = index_js_1.OINODbSqlSelect.parse(init.select);
+            }
         }
         if (!this.sqlParams.select) {
             const select_param = this.url?.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_SELECT_PARAM);
@@ -65,13 +90,28 @@ class OINODbApiRequest extends common_1.OINOHttpRequest {
             }
         }
     }
-    static async fromFetchRequest(request) {
-        const body = await request.arrayBuffer();
+    static async fromFetchRequest(request, rowId, rowData, sqlParams) {
         return new OINODbApiRequest({
             url: new URL(request.url),
             method: request.method,
             headers: Object.fromEntries(request.headers),
-            data: node_buffer_1.Buffer.from(body),
+            rowId: rowId,
+            rowData: rowData ?? node_buffer_1.Buffer.from(await request.arrayBuffer()),
+            sqlParams: sqlParams
+        });
+    }
+    static fromHttpRequest(request, rowId, rowData, sqlParams) {
+        return new OINODbApiRequest({
+            url: typeof request.url === "string" ? new URL(request.url) : request.url,
+            method: request.method,
+            headers: Object.fromEntries(request.headers),
+            rowId: rowId,
+            rowData: rowData ?? request.bodyAsBuffer(),
+            requestType: request.requestType,
+            responseType: request.responseType,
+            multipartBoundary: request.multipartBoundary,
+            lastModified: request.lastModified,
+            sqlParams: sqlParams
         });
     }
 }
@@ -124,7 +164,7 @@ exports.OINODbApiResult = OINODbApiResult;
  * Specialized HTML template that can render ´OINODbApiResult´.
  *
  */
-class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
+class OINODbHtmlTemplate extends common_1.OINOHtmlTemplate {
     /** Locale validation regex */
     static LOCALE_REGEX = /^(\w\w)(\-\w\w)?$/;
     /** Locale formatter */
@@ -168,7 +208,7 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
      *
      */
     async renderFromDbData(modelset, overrideValues) {
-        index_js_1.OINOBenchmark.startMetric("OINOHtmlTemplate", "renderFromDbData");
+        common_1.OINOBenchmark.startMetric("OINOHtmlTemplate", "renderFromDbData");
         let html = "";
         const dataset = modelset.dataset;
         const datamodel = modelset.datamodel;
@@ -214,7 +254,7 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
         }
         this.modified = last_modified;
         const result = this._createHttpResult(html);
-        index_js_1.OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromDbData");
+        common_1.OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromDbData");
         return result;
     }
 }
@@ -244,7 +284,7 @@ class OINODbApi {
      */
     constructor(db, params) {
         if (!params.tableName) {
-            throw new Error(index_js_1.OINO_ERROR_PREFIX + ": OINODbApiParams needs to define a table name!");
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": OINODbApiParams needs to define a table name!");
         }
         this.db = db;
         this.params = params;
@@ -288,12 +328,13 @@ class OINODbApi {
     }
     _parseData(httpResult, request) {
         let rows = [];
+        const data = request.rowData ?? request.body;
         try {
-            if (Array.isArray(request.data)) {
-                rows = request.data;
+            if (Array.isArray(data)) {
+                rows = data;
             }
-            else if (request.data != null) {
-                rows = index_js_1.OINODbParser.createRows(this.datamodel, request.data, request.requestType, request);
+            else if (data != null) {
+                rows = index_js_1.OINODbParser.createRows(this.datamodel, data, request.requestType, request.multipartBoundary);
             }
         }
         catch (e) {
@@ -449,25 +490,33 @@ class OINODbApi {
      * Method for handling a HTTP REST request with GET, POST, PUT, DELETE corresponding to
      * SQL select, insert, update and delete.
      *
-     * @param method HTTP method of the REST request
+     * @param request OINO HTTP request object containing all parameters of the REST request
      * @param rowId URL id of the REST request
-     * @param data HTTP body data as either serialized string or unserialized JS object or OINODataRow-array or Buffer/Uint8Array binary data
+     * @param rowData HTTP body data as either serialized string or unserialized JS object or OINODataRow-array or Buffer/Uint8Array binary data
      * @param sqlParams SQL parameters for the REST request
      *
      */
-    async doRequest(method, rowId, data, sqlParams) {
-        return this.runRequest(new OINODbApiRequest({ method: method, rowId: rowId, data: data, sqlParams: sqlParams }));
+    async doHttpRequest(request, rowId, rowData, sqlParams) {
+        const api_request = OINODbApiRequest.fromHttpRequest(request, rowId, rowData, sqlParams);
+        return this.doApiRequest(api_request);
     }
     /**
      * Method for handling a HTTP REST request with GET, POST, PUT, DELETE corresponding to
      * SQL select, insert, update and delete.
      *
-     * @param request OINO DB API request
+     * @param method HTTP method of the REST request
+     * @param rowId URL id of the REST request
+     * @param rowData HTTP body data as either serialized string or unserialized JS object or OINODataRow-array or Buffer/Uint8Array binary data
+     * @param sqlParams SQL parameters for the REST request
+     * @param contentType content type of the HTTP body data, default is JSON
      *
      */
-    async runRequest(request) {
-        index_js_1.OINOBenchmark.startMetric("OINODbApi", "doRequest." + request.method);
-        common_1.OINOLog.debug("@oino-ts/db", "OINODbApi", "doRequest", "Request", { method: request.method, id: request.rowId, data: request.data });
+    async doRequest(method, rowId, rowData, sqlParams, contentType = common_1.OINOContentType.json) {
+        return this.doApiRequest(new OINODbApiRequest({ method: method, rowId: rowId, rowData: rowData, sqlParams: sqlParams, requestType: contentType }));
+    }
+    async doApiRequest(request) {
+        common_1.OINOBenchmark.startMetric("OINODbApi", "doRequest." + request.method);
+        common_1.OINOLog.debug("@oino-ts/db", "OINODbApi", "doRequest", "Request", { method: request.method, id: request.rowId, data: request.rowData });
         let result = new OINODbApiResult(request);
         let rows = [];
         if ((request.method == "POST") || (request.method == "PUT")) {
@@ -524,7 +573,7 @@ class OINODbApi {
         else {
             result.setError(405, "Unsupported HTTP method '" + request.method + "' for REST request", "DoRequest");
         }
-        index_js_1.OINOBenchmark.endMetric("OINODbApi", "doRequest." + request.method);
+        common_1.OINOBenchmark.endMetric("OINODbApi", "doRequest." + request.method);
         return Promise.resolve(result);
     }
     /**
@@ -532,11 +581,11 @@ class OINODbApi {
      *
      * @param method HTTP method of the REST request
      * @param rowId URL id of the REST request
-     * @param data HTTP body data as either serialized string or unserialized JS object or OINODataRow-array or Buffer/Uint8Array binary data
+     * @param rowData HTTP body data as either serialized string or unserialized JS object or OINODataRow-array or Buffer/Uint8Array binary data
      *
      */
-    async doBatchUpdate(method, rowId, data, sqlParams) {
-        return this.runRequest(new OINODbApiRequest({ method: method, rowId: rowId, data: data, sqlParams: sqlParams }));
+    async doBatchUpdate(method, rowId, rowData, sqlParams) {
+        return this.doApiRequest(new OINODbApiRequest({ method: method, rowId: rowId, rowData: rowData, sqlParams: sqlParams }));
     }
     /**
      * Method for handling a HTTP REST request with batch update using PUT or DELETE methods.
@@ -545,13 +594,13 @@ class OINODbApi {
      *
      */
     async runBatchUpdate(request) {
-        common_1.OINOLog.debug("@oino-ts/db", "OINODbApi", "doBatchUpdate", "Request", { request: request, data: request.data });
+        common_1.OINOLog.debug("@oino-ts/db", "OINODbApi", "doBatchUpdate", "Request", { request: request, data: request.rowData });
         let result = new OINODbApiResult(request);
         if ((request.method != "PUT") && (request.method != "DELETE")) {
             result.setError(500, "Batch update only supports PUT and DELETE methods!", "DoBatchUpdate");
             return Promise.resolve(result);
         }
-        index_js_1.OINOBenchmark.startMetric("OINODbApi", "doBatchUpdate." + request.method);
+        common_1.OINOBenchmark.startMetric("OINODbApi", "doBatchUpdate." + request.method);
         const rows = [] = this._parseData(result, request);
         if (request.method == "PUT") {
             try {
@@ -569,7 +618,7 @@ class OINODbApi {
                 result.setError(500, "Unhandled exception in HTTP DELETE doRequest: " + e.message, "DoBatchUpdate");
             }
         }
-        index_js_1.OINOBenchmark.endMetric("OINODbApi", "doBatchUpdate." + request.method);
+        common_1.OINOBenchmark.endMetric("OINODbApi", "doBatchUpdate." + request.method);
         return Promise.resolve(result);
     }
     /**

package/dist/cjs/OINODbDataField.js

@@ -6,7 +6,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OINODatetimeDataField = exports.OINOBlobDataField = exports.OINONumberDataField = exports.OINOBooleanDataField = exports.OINOStringDataField = exports.OINODbDataField = void 0;
-const index_js_1 = require("./index.js");
+const buffer_1 = require("buffer");
+const common_1 = require("@oino-ts/common");
 /**
  * Base class for a column of data responsible for appropriatelly serializing/deserializing the data.
  *
@@ -247,8 +248,8 @@ class OINONumberDataField extends OINODbDataField {
         else {
             const result = parseFloat(value);
             if (isNaN(result)) {
-                index_js_1.OINOLog.error("@oino-ts/db", "OINONumberDataField", "toSql", "Invalid value!", { value: value });
-                throw new Error(index_js_1.OINO_ERROR_PREFIX + ": OINONumberDataField.deserializeCell - Invalid value '" + value + "'"); // incorrectly formatted data could be a security risk, abort processing
+                common_1.OINOLog.error("@oino-ts/db", "OINONumberDataField", "toSql", "Invalid value!", { value: value });
+                throw new Error(common_1.OINO_ERROR_PREFIX + ": OINONumberDataField.deserializeCell - Invalid value '" + value + "'"); // incorrectly formatted data could be a security risk, abort processing
             }
             return result;
         }
@@ -284,11 +285,11 @@ class OINOBlobDataField extends OINODbDataField {
         if ((cellVal === null) || (cellVal === undefined)) {
             return cellVal;
         }
-        else if (cellVal instanceof Buffer) {
+        else if (cellVal instanceof buffer_1.Buffer) {
             return cellVal.toString('base64');
         }
         else if (cellVal instanceof Uint8Array) {
-            return Buffer.from(cellVal).toString('base64');
+            return buffer_1.Buffer.from(cellVal).toString('base64');
         }
         else {
             return this.db.parseSqlValueAsCell(cellVal, this.sqlType)?.toString();
@@ -302,10 +303,10 @@ class OINOBlobDataField extends OINODbDataField {
      */
     deserializeCell(value) {
         if (value == null) {
-            return Buffer.alloc(0);
+            return buffer_1.Buffer.alloc(0);
         }
         else {
-            return Buffer.from(value, 'base64'); // Blob-field data is base64 encoded and converted internally to UInt8Array / Buffer
+            return buffer_1.Buffer.from(value, 'base64'); // Blob-field data is base64 encoded and converted internally to UInt8Array / Buffer
         }
     }
 }

package/dist/cjs/OINODbDataModel.js

@@ -6,6 +6,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OINODbDataModel = void 0;
+const common_1 = require("@oino-ts/common");
 const index_js_1 = require("./index.js");
 /**
  * OINO Datamodel object for representing one database table and it's columns.
@@ -97,14 +98,14 @@ class OINODbDataModel {
                 }
                 value = f.printCellAsSqlValue(value);
                 if (value == "") { // ids are user input and could be specially crafted to be empty
-                    throw new Error(index_js_1.OINO_ERROR_PREFIX + ": empty condition for id '" + id_value + "' for table " + this.api.params.tableName);
+                    throw new Error(common_1.OINO_ERROR_PREFIX + ": empty condition for id '" + id_value + "' for table " + this.api.params.tableName);
                 }
                 result += f.printSqlColumnName() + "=" + value;
                 i = i + 1;
             }
         }
         if (i != id_parts.length) {
-            throw new Error(index_js_1.OINO_ERROR_PREFIX + ": id '" + id_value + "' is not a valid key for table " + this.api.params.tableName);
+            throw new Error(common_1.OINO_ERROR_PREFIX + ": id '" + id_value + "' is not a valid key for table " + this.api.params.tableName);
         }
         return "(" + result + ")";
     }

package/dist/cjs/OINODbModelSet.js

@@ -6,6 +6,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OINODbModelSet = void 0;
+const common_1 = require("@oino-ts/common");
 const index_js_1 = require("./index.js");
 /**
  * Class for dataset based on a data model that can be serialized to
@@ -46,7 +47,7 @@ class OINODbModelSet {
                 primaryKeyValues.push(value || "");
             }
         }
-        result = index_js_1.OINOStr.encode(value, contentType);
+        result = common_1.OINOStr.encode(value, contentType);
         return result;
     }
     _writeRowJson(row) {
@@ -66,19 +67,19 @@ class OINODbModelSet {
                 // skip undefined values
             }
             else if (value === null) {
-                json_row += "," + index_js_1.OINOStr.encode(f.name, index_js_1.OINOContentType.json) + ":null";
+                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_value = (f instanceof index_js_1.OINOBooleanDataField) || ((f instanceof index_js_1.OINONumberDataField) && !is_hashed);
-                value = this._encodeAndHashFieldValue(f, value, index_js_1.OINOContentType.json, primary_key_values, f.name + " " + row_id_seed);
+                value = this._encodeAndHashFieldValue(f, value, common_1.OINOContentType.json, primary_key_values, f.name + " " + row_id_seed);
                 if (is_value) {
                     value = value.substring(1, value.length - 1);
                 }
-                json_row += "," + index_js_1.OINOStr.encode(f.name, index_js_1.OINOContentType.json) + ":" + value;
+                json_row += "," + common_1.OINOStr.encode(f.name, common_1.OINOContentType.json) + ":" + value;
             }
         }
-        json_row = index_js_1.OINOStr.encode(index_js_1.OINODbConfig.OINODB_ID_FIELD, index_js_1.OINOContentType.json) + ":" + index_js_1.OINOStr.encode(index_js_1.OINODbConfig.printOINOId(primary_key_values), index_js_1.OINOContentType.json) + json_row;
+        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;
         return "{" + json_row + "}";
     }
     async _writeStringJson() {
@@ -119,14 +120,14 @@ class OINODbModelSet {
             }
             let value = f.serializeCell(row[i]);
             if (value == null) {
-                csv_row += "," + index_js_1.OINOStr.encode(value, index_js_1.OINOContentType.csv); // either null or undefined
+                csv_row += "," + common_1.OINOStr.encode(value, common_1.OINOContentType.csv); // either null or undefined
             }
             else {
-                value = this._encodeAndHashFieldValue(f, value, index_js_1.OINOContentType.csv, primary_key_values, f.name + " " + row_id_seed);
+                value = this._encodeAndHashFieldValue(f, value, common_1.OINOContentType.csv, primary_key_values, f.name + " " + row_id_seed);
                 csv_row += "," + value;
             }
         }
-        csv_row = index_js_1.OINOStr.encode(index_js_1.OINODbConfig.printOINOId(primary_key_values), index_js_1.OINOContentType.csv) + csv_row;
+        csv_row = common_1.OINOStr.encode(index_js_1.OINODbConfig.printOINOId(primary_key_values), common_1.OINOContentType.csv) + csv_row;
         return csv_row;
     }
     async _writeStringCsv() {
@@ -168,13 +169,13 @@ class OINODbModelSet {
             let formdata_block = "";
             let is_file = (f instanceof index_js_1.OINOBlobDataField);
             if (value === undefined) {
-                index_js_1.OINOLog.info("@oino-ts/db", "OINODbModelSet", "_writeRowFormdata", "Undefined value skipped", { field_name: f.name });
+                common_1.OINOLog.info("@oino-ts/db", "OINODbModelSet", "_writeRowFormdata", "Undefined value skipped", { field_name: f.name });
             }
             else if (value === null) {
                 formdata_block = this._writeRowFormdataParameterBlock(fields[i].name, null, multipart_boundary);
             }
             else {
-                value = this._encodeAndHashFieldValue(f, value, index_js_1.OINOContentType.formdata, primary_key_values, f.name + " " + row_id_seed);
+                value = this._encodeAndHashFieldValue(f, value, common_1.OINOContentType.formdata, primary_key_values, f.name + " " + row_id_seed);
                 if (is_file) {
                     formdata_block = this._writeRowFormdataFileBlock(f.name, value, multipart_boundary);
                 }
@@ -208,14 +209,14 @@ class OINODbModelSet {
                 // console.log("OINODbModelSet._writeRowUrlencode undefined field value:" + fields[i].name)
             }
             else {
-                value = this._encodeAndHashFieldValue(f, value, index_js_1.OINOContentType.urlencode, primary_key_values, f.name + " " + row_id_seed);
+                value = this._encodeAndHashFieldValue(f, value, common_1.OINOContentType.urlencode, primary_key_values, f.name + " " + row_id_seed);
                 if (urlencode_row != "") {
                     urlencode_row += "&";
                 }
-                urlencode_row += index_js_1.OINOStr.encode(f.name, index_js_1.OINOContentType.urlencode) + "=" + value;
+                urlencode_row += common_1.OINOStr.encode(f.name, common_1.OINOContentType.urlencode) + "=" + value;
             }
         }
-        urlencode_row = index_js_1.OINOStr.encode(index_js_1.OINODbConfig.OINODB_ID_FIELD, index_js_1.OINOContentType.urlencode) + "=" + index_js_1.OINOStr.encode(index_js_1.OINODbConfig.printOINOId(primary_key_values), index_js_1.OINOContentType.urlencode) + "&" + urlencode_row;
+        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;
         return urlencode_row;
     }
     async _writeStringUrlencode() {
@@ -228,7 +229,7 @@ class OINODbModelSet {
             line_count += 1;
         }
         if (line_count > 1) {
-            index_js_1.OINOLog.warning("@oino-ts/db", "OINODbModelSet", "_writeStringUrlencode", "Content type " + index_js_1.OINOContentType.urlencode + " does not officially support multiline content!", {});
+            common_1.OINOLog.warning("@oino-ts/db", "OINODbModelSet", "_writeStringUrlencode", "Content type " + common_1.OINOContentType.urlencode + " does not officially support multiline content!", {});
         }
         return result;
     }
@@ -267,22 +268,22 @@ class OINODbModelSet {
      * @param [contentType=OINOContentType.json] serialization content type
      *
      */
-    async writeString(contentType = index_js_1.OINOContentType.json) {
+    async writeString(contentType = common_1.OINOContentType.json) {
         let result = "";
-        if (contentType == index_js_1.OINOContentType.csv) {
+        if (contentType == common_1.OINOContentType.csv) {
             result += await this._writeStringCsv();
         }
-        else if (contentType == index_js_1.OINOContentType.json) {
+        else if (contentType == common_1.OINOContentType.json) {
             result += await this._writeStringJson();
         }
-        else if (contentType == index_js_1.OINOContentType.formdata) {
+        else if (contentType == common_1.OINOContentType.formdata) {
             result += await this._writeStringFormdata();
         }
-        else if (contentType == index_js_1.OINOContentType.urlencode) {
+        else if (contentType == common_1.OINOContentType.urlencode) {
             result += await this._writeStringUrlencode();
         }
         else {
-            index_js_1.OINOLog.error("@oino-ts/db", "OINODbModelSet", "writeString", "Content type is only for input!", { contentType: contentType });
+            common_1.OINOLog.error("@oino-ts/db", "OINODbModelSet", "writeString", "Content type is only for input!", { contentType: contentType });
         }
         return result;
     }