@oino-ts/db 0.0.14 → 0.0.16

package/README.md

@@ -10,15 +10,15 @@
  # GETTING STARTED
  
  ### Setup
- Install the `@oino-ts/core` npm package and necessary database packages and import them in your code.
+ Install the `@oino-ts/db` npm package and necessary database packages and import them in your code.
  ```
- bun install @oino-ts/core
- bun install @oino-ts/bunsqlite
+ bun install @oino-ts/db
+ bun install @oino-ts/db-bunsqlite
  ```
  
  ```
- import { OINODb, OINOApi, OINOFactory } from "@oino-ts/core";
- import { OINODbBunSqlite } from "@oino-ts/bunsqlite"
+ import { OINODb, OINOApi, OINOFactory } from "@oino-ts/db";
+ import { OINODbBunSqlite } from "@oino-ts/db-bunsqlite"
  ```
  
  ### Register database and logger
@@ -51,7 +51,7 @@
  ### Write results back to HTTP Response
  The results for a GET request will contain [`OINOModelSet`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbModelSet.html) data that can be written out as JSON or CSV as needed. For other requests result is just success or error with messages.
  ```
- return new Response(result.modelset.writeString(OINOContentType.json))
+ return new Response(result.data.writeString(OINOContentType.json))
  ```
  
  
@@ -129,12 +129,13 @@
  - Bun Sqlite through Bun native implementation
  - Postgresql through [pg](https://www.npmjs.com/package/pg)-package
  - Mariadb / Mysql-support through [mariadb](https://www.npmjs.com/package/mariadb)-package
+ - Sql Server through [mssql](https://www.npmjs.com/package/mssql)-package
 
  ## Complex Keys
  To support tables with multipart primary keys OINO generates a composite key `_OINOID_` that is included in the result and can be used as the REST ID. For example in the example above table `OrderDetails` has two primary keys `OrderID` and `ProductID` making the `_OINOID_` of form `11077:99`. 
 
  ## Power Of SQL
- Since OINO controls the SQL, WHERE-conditions can be defined with [`OINOSqlFilter`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlFilter.html) and order with [`OINOSqlOrder`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlOrder.html) that are passed as HTTP request parameters. No more API development where you make unique API endpoints for each filter that fetch all data with original API and filter in backend code. Every API can be filtered when and as needed without unnessecary data tranfer and utilizing SQL indexing when available.
+ Since OINO is just generating SQL, WHERE-conditions can be defined with [`OINOSqlFilter`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlFilter.html) and order with [`OINOSqlOrder`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlOrder.html) that are passed as HTTP request parameters. No more API development where you make unique API endpoints for each filter that fetch all data with original API and filter in backend code. Every API can be filtered when and as needed without unnessecary data tranfer and utilizing SQL indexing when available.
 
  ## Swagger Support
  Swagger is great as long as the definitions are updated and with OINO you can automatically get a Swagger definition including a data model schema.
@@ -158,7 +159,7 @@
  # STATUS
  OINO is currently a hobby project which should and should considered in alpha status. That also means compatibility breaking changes can be made without prior notice when architectual issues are discovered.
 
- ## Beta
+ ## Beta 
  For a beta status following milestones are planned:
 
  ### Realistic app
@@ -205,14 +206,16 @@
  # LINKS
  - [Github repository](https://github.com/pragmatta/oino-ts)
  - [NPM repository](https://www.npmjs.com/org/oino-ts) 
-
+ 
  
  # ACKNOWLEDGEMENTS
  
  ## Libraries
  OINO uses the following open source libraries and npm packages and I would like to thank everyone for their contributions:
- - Postgresql support by [node-postgres package](https://www.npmjs.com/package/pg)
- - Mariadb / Mysql-support by [mariadb package](https://www.npmjs.com/package/mariadb)
+ - Postgresql [node-postgres package](https://www.npmjs.com/package/pg)
+ - Mariadb / Mysql [mariadb package](https://www.npmjs.com/package/mariadb)
+ - Sql Server [mssql package](https://www.npmjs.com/package/mssql)
+ - Custom base encoding [base-x package](https://www.npmjs.com/package/base-x)
 
  ## Bun
  OINO has been developed using the Bun runtime, not because of the speed improvements but for the first class Typescript support and integrated developper experience. Kudos on the bun team for making Typescript work more exiting again.

package/dist/cjs/OINODbApi.js

@@ -38,18 +38,19 @@ class OINODbApiResult extends types_1.OINOResult {
      * @param headers Headers to include in the response
      *
      */
-    getResponse(headers = {}) {
+    async createResponseFromResult(headers = {}) {
         let response = null;
         if (this.success && this.data) {
-            response = new Response(this.data.writeString(this.params.responseType), { status: this.statusCode, statusText: this.statusMessage, headers: headers });
+            const body = await this.data.writeString(this.params.responseType);
+            response = new Response(body, { status: this.statusCode, statusText: this.statusMessage, headers: headers });
         }
         else {
-            response = new Response(JSON.stringify(this), { status: this.statusCode, statusText: this.statusMessage, headers: headers });
+            response = new Response(JSON.stringify(this, null, 3), { status: this.statusCode, statusText: this.statusMessage, headers: headers });
         }
         for (let i = 0; i < this.messages.length; i++) {
             response.headers.set('X-OINO-MESSAGE-' + i, this.messages[i]);
         }
-        return response;
+        return Promise.resolve(response);
     }
 }
 exports.OINODbApiResult = OINODbApiResult;
@@ -62,9 +63,10 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
      * Creates HTML Response from API modelset.
      *
      * @param modelset OINO API dataset
+     * @param overrideValues values to override in the data
      *
      */
-    renderFromDbData(modelset) {
+    async renderFromDbData(modelset, overrideValues) {
         index_js_1.OINOBenchmark.start("OINOHtmlTemplate", "renderFromDbData");
         let html = "";
         const dataset = modelset.dataset;
@@ -72,14 +74,18 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
         const api = modelset.datamodel.api;
         const modified_index = datamodel.findFieldIndexByName(api.params.cacheModifiedField || "");
         let last_modified = this.modified;
+        // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
         while (!dataset.isEof()) {
             const row = dataset.getRow();
             if (modified_index >= 0) {
                 last_modified = Math.max(last_modified, new Date(row[modified_index]).getTime());
+                // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
             }
             let row_id_seed = datamodel.getRowPrimarykeyValues(row).join(' ');
             let primary_key_values = [];
-            let html_row = this.template.replaceAll('###' + index_js_1.OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###');
+            this.clearVariables();
+            this.setVariableFromValue(index_js_1.OINODbConfig.OINODB_ID_FIELD, "");
+            // let html_row:string = this.template.replaceAll('###' + OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###')
             for (let i = 0; i < datamodel.fields.length; i++) {
                 const f = datamodel.fields[i];
                 let value = f.serializeCell(row[i]);
@@ -90,14 +96,17 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
                     primary_key_values.push(value || "");
                 }
                 // OINOLog.debug("renderFromDbData replace field value", {field:f.name, value:value }) 
-                html_row = html_row.replaceAll('###' + f.name + '###', index_js_1.OINOStr.encode(value, index_js_1.OINOContentType.html));
+                this.setVariableFromValue(f.name, value || "");
             }
-            html_row = html_row.replaceAll('###createHtmlFromData_temporary_oinoid###', index_js_1.OINOStr.encode(index_js_1.OINODbConfig.printOINOId(primary_key_values), index_js_1.OINOContentType.html));
-            html += html_row + "\r\n";
-            dataset.next();
+            this.setVariableFromProperties(overrideValues);
+            this.setVariableFromValue(index_js_1.OINODbConfig.OINODB_ID_FIELD, index_js_1.OINODbConfig.printOINOId(primary_key_values));
+            // html_row = html_row.replaceAll('###createHtmlFromData_temporary_oinoid###', OINOStr.encode(OINODbConfig.printOINOId(primary_key_values), OINOContentType.html)) 
+            html += this._renderHtml() + "\r\n";
+            await dataset.next();
         }
-        const result = new index_js_1.OINOHttpResult(html);
-        result.lastModified = last_modified;
+        // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
+        this.modified = last_modified;
+        const result = this._createHttpResult(html, false);
         index_js_1.OINOBenchmark.end("OINOHtmlTemplate", "renderFromDbData");
         return result;
     }
@@ -317,7 +326,7 @@ class OINODbApi {
             }
             else {
                 try {
-                    index_js_1.OINOLog.debug("OINODbApi.doRequest / POST", { rows: rows });
+                    // OINOLog.debug("OINODbApi.doRequest / POST", {rows:rows})
                     await this._doPost(result, rows);
                 }
                 catch (e) {
@@ -342,7 +351,7 @@ class OINODbApi {
             result.setError(405, "Unsupported HTTP method '" + method + "'", "DoRequest");
         }
         index_js_1.OINOBenchmark.end("OINODbApi", "doRequest", method);
-        return result;
+        return Promise.resolve(result);
     }
 }
 exports.OINODbApi = OINODbApi;

package/dist/cjs/OINODbDataModel.js

@@ -225,10 +225,10 @@ class OINODbDataModel {
         const order_sql = params.order?.toSql(this) || "";
         const limit_sql = params.limit?.toSql(this) || "";
         // OINOLog.debug("OINODbDataModel.printSqlSelect", {select_sql:result, filter_sql:filter_sql, order_sql:order_sql})
-        if ((id != "") && (filter_sql != "")) {
+        if ((id != null) && (id != "") && (filter_sql != "")) {
             result += "\nWHERE " + this._printSqlPrimaryKeyCondition(id) + " AND " + filter_sql;
         }
-        else if (id != "") {
+        else if ((id != null) && (id != "")) {
             result += "\nWHERE " + this._printSqlPrimaryKeyCondition(id);
         }
         else if (filter_sql != "") {

package/dist/cjs/OINODbDataSet.js

@@ -88,9 +88,9 @@ class OINODbMemoryDataSet extends OINODbDataSet {
         }
     }
     /**
-      * Is data set empty.
-      *
-      */
+     * Is data set empty.
+     *
+     */
     isEmpty() {
         return (this._rows.length == 0);
     }
@@ -102,17 +102,17 @@ class OINODbMemoryDataSet extends OINODbDataSet {
         return (this._eof);
     }
     /**
-     * Moves dataset to the next row, returns !isEof().
+     * Attempts to moves dataset to the next row, possibly waiting for more data to become available. Returns !isEof().
      *
      */
-    next() {
+    async next() {
         if (this._currentRow < this._rows.length - 1) {
             this._currentRow = this._currentRow + 1;
         }
         else {
             this._eof = true;
         }
-        return !this._eof;
+        return Promise.resolve(!this._eof);
     }
     /**
      * Gets current row of data.

package/dist/cjs/OINODbFactory.js

@@ -111,77 +111,6 @@ class OINODbFactory {
         // OINOLog.debug("createParamsFromRequest", {params:result})
         return result;
     }
-    /**
-     * Creates HTML Response from API modelset.
-     *
-     * @param modelset OINO API dataset
-     * @param template HTML template
-     *
-     */
-    static createHtmlFromData(modelset, template) {
-        let html = "";
-        const dataset = modelset.dataset;
-        const datamodel = modelset.datamodel;
-        while (!dataset.isEof()) {
-            const row = dataset.getRow();
-            let row_id_seed = datamodel.getRowPrimarykeyValues(row).join(' ');
-            let primary_key_values = [];
-            let html_row = template.replaceAll('###' + index_js_1.OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###');
-            for (let i = 0; i < datamodel.fields.length; i++) {
-                const f = datamodel.fields[i];
-                let value = f.serializeCell(row[i]);
-                if (f.fieldParams.isPrimaryKey) {
-                    if (value && (f instanceof index_js_1.OINONumberDataField) && (datamodel.api.hashid)) {
-                        value = datamodel.api.hashid.encode(value, f.name + " " + row_id_seed);
-                    }
-                    primary_key_values.push(value || "");
-                }
-                html_row = html_row.replaceAll('###' + f.name + '###', index_js_1.OINOStr.encode(value, index_js_1.OINOContentType.html));
-            }
-            html_row = html_row.replaceAll('###createHtmlFromData_temporary_oinoid###', index_js_1.OINOStr.encode(index_js_1.OINODbConfig.printOINOId(primary_key_values), index_js_1.OINOContentType.html));
-            html += html_row + "\r\n";
-            dataset.next();
-        }
-        const result = new index_js_1.OINOHttpResult(html);
-        return result;
-    }
-    /**
-     * Creates HTML Response from API result.
-     *
-     * @param result OINOResult-object
-     * @param template HTML template
-     * @param includeErrorMessages include debug messages in result
-     * @param includeWarningMessages include debug messages in result
-     * @param includeInfoMessages include debug messages in result
-     * @param includeDebugMessages include debug messages in result
-     *
-     */
-    static createHtmlNotificationFromResult(result, template, includeErrorMessages = false, includeWarningMessages = false, includeInfoMessages = false, includeDebugMessages = false) {
-        let html = template;
-        html = html.replaceAll('###statusCode###', index_js_1.OINOStr.encode(result.statusCode.toString(), index_js_1.OINOContentType.html));
-        html = html.replaceAll('###statusMessage###', index_js_1.OINOStr.encode(result.statusMessage.toString(), index_js_1.OINOContentType.html));
-        let messages = "";
-        for (let i = 0; i < result.messages.length; i++) {
-            if (includeErrorMessages && result.messages[i].startsWith(index_js_1.OINO_ERROR_PREFIX)) {
-                messages += "<li>" + index_js_1.OINOStr.encode(result.messages[i], index_js_1.OINOContentType.html) + "</li>";
-            }
-            if (includeWarningMessages && result.messages[i].startsWith(index_js_1.OINO_WARNING_PREFIX)) {
-                messages += "<li>" + index_js_1.OINOStr.encode(result.messages[i], index_js_1.OINOContentType.html) + "</li>";
-            }
-            if (includeInfoMessages && result.messages[i].startsWith(index_js_1.OINO_INFO_PREFIX)) {
-                messages += "<li>" + index_js_1.OINOStr.encode(result.messages[i], index_js_1.OINOContentType.html) + "</li>";
-            }
-            if (includeDebugMessages && result.messages[i].startsWith(index_js_1.OINO_DEBUG_PREFIX)) {
-                messages += "<li>" + index_js_1.OINOStr.encode(result.messages[i], index_js_1.OINOContentType.html) + "</li>";
-            }
-        }
-        if (messages) {
-            html = html.replaceAll('###messages###', "<ul>" + messages + "</ul>");
-        }
-        html = html.replace(/###[^#]*###/g, "");
-        const http_result = new index_js_1.OINOHttpResult(html);
-        return http_result;
-    }
     static _findCsvLineEnd(csvData, start) {
         const n = csvData.length;
         if (start >= n) {
@@ -323,21 +252,23 @@ class OINODbFactory {
         //  console.log("createRowFromJsonObj: " + result)
         for (let i = 0; i < fields.length; i++) {
             const field = fields[i];
-            let value = index_js_1.OINOStr.decode(obj[field.name], index_js_1.OINOContentType.json);
+            let value = obj[field.name];
             // console.log("createRowFromJsonObj: key=" + field.name + ", val=" + val)
-            if ((value === undefined) || (value === null)) {
+            if ((value === null) || (value === undefined)) { // must be checed first as null is an object
                 result[i] = value;
             }
-            else {
-                if (Array.isArray(value) || typeof value === "object") { // only single level deep object, rest is handled as JSON-strings
-                    result[i] = JSON.stringify(value).replaceAll("\"", "\\\"");
-                }
-                else {
-                    if (value && field.fieldParams.isPrimaryKey && (field instanceof index_js_1.OINONumberDataField) && (datamodel.api.hashid)) {
-                        value = datamodel.api.hashid.decode(value);
-                    }
-                    result[i] = field.deserializeCell(value);
+            else if (Array.isArray(value) || typeof value === "object") {
+                result[i] = JSON.stringify(value).replaceAll("\"", "\\\""); // only single level deep objects, rest is handled as JSON-strings
+            }
+            else if (typeof value === "string") {
+                value = index_js_1.OINOStr.decode(value, index_js_1.OINOContentType.json);
+                if (value && field.fieldParams.isPrimaryKey && (field instanceof index_js_1.OINONumberDataField) && (datamodel.api.hashid)) {
+                    value = datamodel.api.hashid.decode(value);
                 }
+                result[i] = field.deserializeCell(value);
+            }
+            else {
+                result[i] = value; // value types are passed as-is
             }
             // console.log("createRowFromJsonObj: result["+i+"]=" + result[i])
         }

package/dist/cjs/OINODbModelSet.js

@@ -33,14 +33,15 @@ class OINODbModelSet {
         this.errors = this.dataset.messages;
     }
     _encodeAndHashFieldValue(field, value, contentType, primaryKeyValues, rowIdSeed) {
+        let result;
         if (field.fieldParams.isPrimaryKey) {
             if (value && (field instanceof index_js_1.OINONumberDataField) && (this.datamodel.api.hashid)) {
                 value = this.datamodel.api.hashid.encode(value, rowIdSeed);
             }
             primaryKeyValues.push(value || "");
         }
-        value = index_js_1.OINOStr.encode(value, contentType);
-        return value;
+        result = index_js_1.OINOStr.encode(value, contentType);
+        return result;
     }
     _writeRowJson(row) {
         // console.log("OINODbModelSet._writeRowJson: row=" + row)
@@ -72,14 +73,16 @@ class OINODbModelSet {
         // OINOLog_debug("OINODbModelSet._writeRowJson="+json_row)
         return "{" + json_row + "}";
     }
-    _writeStringJson() {
+    async _writeStringJson() {
         let result = "";
         while (!this.dataset.isEof()) {
             if (result != "") {
                 result += ",\r\n";
             }
-            result += this._writeRowJson(this.dataset.getRow());
-            this.dataset.next();
+            const row = this.dataset.getRow();
+            // OINOLog.debug("OINODbModelSet._writeStringJson: row", {row:row})
+            result += this._writeRowJson(row);
+            await this.dataset.next();
         }
         result = "[\r\n" + result + "\r\n]";
         // OINOLog_debug("OINODbModelSet._writeStringJson="+result)
@@ -117,14 +120,16 @@ class OINODbModelSet {
         // OINOLog_debug("OINODbModelSet._writeRowCsv="+csv_row)
         return csv_row;
     }
-    _writeStringCsv() {
+    async _writeStringCsv() {
         let result = this._writeHeaderCsv();
         while (!this.dataset.isEof()) {
             if (result != "") {
                 result += "\r\n";
             }
-            result += this._writeRowCsv(this.dataset.getRow());
-            this.dataset.next();
+            const row = this.dataset.getRow();
+            // OINOLog.debug("OINODbModelSet._writeStringCsv: row", {row:row})
+            result += this._writeRowCsv(row);
+            await this.dataset.next();
         }
         // OINOLog_debug("OINODbModelSet._writeStringCsv="+result)
         return result;
@@ -141,6 +146,7 @@ class OINODbModelSet {
         return multipartBoundary + "\r\n" + "Content-Disposition: form-data; name=\"" + blockName + "\"; filename=" + blockName + "\"\r\nContent-Type: application/octet-stream\r\nContent-Transfer-Encoding: BASE64\r\n\r\n" + blockValue + "\r\n";
     }
     _writeRowFormdata(row) {
+        // console.log("OINODbModelSet._writeRowFormdata: row", row)
         const multipart_boundary = "---------OINOMultipartBoundary35424568"; // this method is just used for test data generation and we want it to be static
         const model = this.datamodel;
         const fields = model.fields;
@@ -174,15 +180,13 @@ class OINODbModelSet {
         return result;
     }
     _writeStringFormdata() {
-        let result = this._writeRowFormdata(this.dataset.getRow());
-        this.dataset.next();
-        if (!this.dataset.isEof()) {
-            index_js_1.OINOLog.warning("OINODbModelSet._writeStringUrlencode: content type " + index_js_1.OINOContentType.formdata + " does not mixed part content and only first row has been written!");
-        }
+        const row = this.dataset.getRow();
+        // OINOLog.debug("OINODbModelSet._writeStringFormdata: row", {row:row})
+        let result = this._writeRowFormdata(row);
         return result;
     }
     _writeRowUrlencode(row) {
-        // console.log("OINODbModelSet._writeRowCsv row=" + row)
+        // console.log("OINODbModelSet._writeRowUrlencode row=" + row)
         const model = this.datamodel;
         const fields = model.fields;
         let row_id_seed = model.getRowPrimarykeyValues(row).join(' ');
@@ -206,12 +210,14 @@ class OINODbModelSet {
         // OINOLog_debug("OINODbModelSet._writeRowCsv="+csv_row)
         return urlencode_row;
     }
-    _writeStringUrlencode() {
+    async _writeStringUrlencode() {
         let result = "";
         let line_count = 0;
         while (!this.dataset.isEof()) {
-            result += this._writeRowUrlencode(this.dataset.getRow()) + "\r\n";
-            this.dataset.next();
+            const row = this.dataset.getRow();
+            // OINOLog.debug("OINODbModelSet._writeStringUrlencode: row", {row:row})
+            result += this._writeRowUrlencode(row) + "\r\n";
+            await this.dataset.next();
             line_count += 1;
         }
         // OINOLog_debug("OINODbModelSet._writeStringCsv="+result)
@@ -226,19 +232,19 @@ class OINODbModelSet {
      * @param [contentType=OINOContentType.json] serialization content type
      *
      */
-    writeString(contentType = index_js_1.OINOContentType.json) {
+    async writeString(contentType = index_js_1.OINOContentType.json) {
         let result = "";
         if (contentType == index_js_1.OINOContentType.csv) {
-            result += this._writeStringCsv();
+            result += await this._writeStringCsv();
         }
         else if (contentType == index_js_1.OINOContentType.json) {
-            result += this._writeStringJson();
+            result += await this._writeStringJson();
         }
         else if (contentType == index_js_1.OINOContentType.formdata) {
-            result += this._writeStringFormdata();
+            result += await this._writeStringFormdata();
         }
         else if (contentType == index_js_1.OINOContentType.urlencode) {
-            result += this._writeStringUrlencode();
+            result += await this._writeStringUrlencode();
         }
         else {
             index_js_1.OINOLog.error("OINODbModelSet.writeString: content type is only for input!", { contentType: contentType });
@@ -250,15 +256,19 @@ class OINODbModelSet {
      * field not found or value does not exist.
      *
      * @param fieldName name of the field
+     * @param serialize serialize the value
      *
      */
-    getValueByFieldName(fieldName) {
+    getValueByFieldName(fieldName, serialize = false) {
         let result = undefined;
         if (!this.dataset.isEof()) {
             const current_row = this.dataset.getRow();
             const field_index = this.datamodel.findFieldIndexByName(fieldName);
             if (field_index >= 0) {
                 result = current_row[field_index];
+                if (serialize) {
+                    result = this.datamodel.fields[field_index].serializeCell(result);
+                }
             }
         }
         return result;

package/dist/esm/OINODbApi.js

@@ -3,7 +3,7 @@
  * 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 { OINODbDataModel, OINOStringDataField, OINO_ERROR_PREFIX, OINODbModelSet, OINOBenchmark, OINODbFactory, OINOLog, OINODbConfig, OINOHttpResult, OINOHtmlTemplate, OINONumberDataField, OINOContentType, OINOStr } from "./index.js";
+import { OINODbDataModel, OINOStringDataField, OINO_ERROR_PREFIX, OINODbModelSet, OINOBenchmark, OINODbFactory, OINODbConfig, OINOHtmlTemplate, OINONumberDataField } from "./index.js";
 import { OINOResult } from "@oino-ts/types";
 import { OINOHashid } from "@oino-ts/hashid";
 const API_EMPTY_PARAMS = { sqlParams: {} };
@@ -35,18 +35,19 @@ export class OINODbApiResult extends OINOResult {
      * @param headers Headers to include in the response
      *
      */
-    getResponse(headers = {}) {
+    async createResponseFromResult(headers = {}) {
         let response = null;
         if (this.success && this.data) {
-            response = new Response(this.data.writeString(this.params.responseType), { status: this.statusCode, statusText: this.statusMessage, headers: headers });
+            const body = await this.data.writeString(this.params.responseType);
+            response = new Response(body, { status: this.statusCode, statusText: this.statusMessage, headers: headers });
         }
         else {
-            response = new Response(JSON.stringify(this), { status: this.statusCode, statusText: this.statusMessage, headers: headers });
+            response = new Response(JSON.stringify(this, null, 3), { status: this.statusCode, statusText: this.statusMessage, headers: headers });
         }
         for (let i = 0; i < this.messages.length; i++) {
             response.headers.set('X-OINO-MESSAGE-' + i, this.messages[i]);
         }
-        return response;
+        return Promise.resolve(response);
     }
 }
 /**
@@ -58,9 +59,10 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
      * Creates HTML Response from API modelset.
      *
      * @param modelset OINO API dataset
+     * @param overrideValues values to override in the data
      *
      */
-    renderFromDbData(modelset) {
+    async renderFromDbData(modelset, overrideValues) {
         OINOBenchmark.start("OINOHtmlTemplate", "renderFromDbData");
         let html = "";
         const dataset = modelset.dataset;
@@ -68,14 +70,18 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
         const api = modelset.datamodel.api;
         const modified_index = datamodel.findFieldIndexByName(api.params.cacheModifiedField || "");
         let last_modified = this.modified;
+        // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
         while (!dataset.isEof()) {
             const row = dataset.getRow();
             if (modified_index >= 0) {
                 last_modified = Math.max(last_modified, new Date(row[modified_index]).getTime());
+                // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
             }
             let row_id_seed = datamodel.getRowPrimarykeyValues(row).join(' ');
             let primary_key_values = [];
-            let html_row = this.template.replaceAll('###' + OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###');
+            this.clearVariables();
+            this.setVariableFromValue(OINODbConfig.OINODB_ID_FIELD, "");
+            // let html_row:string = this.template.replaceAll('###' + OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###')
             for (let i = 0; i < datamodel.fields.length; i++) {
                 const f = datamodel.fields[i];
                 let value = f.serializeCell(row[i]);
@@ -86,14 +92,17 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
                     primary_key_values.push(value || "");
                 }
                 // OINOLog.debug("renderFromDbData replace field value", {field:f.name, value:value }) 
-                html_row = html_row.replaceAll('###' + f.name + '###', OINOStr.encode(value, OINOContentType.html));
+                this.setVariableFromValue(f.name, value || "");
             }
-            html_row = html_row.replaceAll('###createHtmlFromData_temporary_oinoid###', OINOStr.encode(OINODbConfig.printOINOId(primary_key_values), OINOContentType.html));
-            html += html_row + "\r\n";
-            dataset.next();
+            this.setVariableFromProperties(overrideValues);
+            this.setVariableFromValue(OINODbConfig.OINODB_ID_FIELD, OINODbConfig.printOINOId(primary_key_values));
+            // html_row = html_row.replaceAll('###createHtmlFromData_temporary_oinoid###', OINOStr.encode(OINODbConfig.printOINOId(primary_key_values), OINOContentType.html)) 
+            html += this._renderHtml() + "\r\n";
+            await dataset.next();
         }
-        const result = new OINOHttpResult(html);
-        result.lastModified = last_modified;
+        // OINOLog.debug("OINOHtmlTemplate.renderFromDbData", {last_modified:last_modified})
+        this.modified = last_modified;
+        const result = this._createHttpResult(html, false);
         OINOBenchmark.end("OINOHtmlTemplate", "renderFromDbData");
         return result;
     }
@@ -312,7 +321,7 @@ export class OINODbApi {
             }
             else {
                 try {
-                    OINOLog.debug("OINODbApi.doRequest / POST", { rows: rows });
+                    // OINOLog.debug("OINODbApi.doRequest / POST", {rows:rows})
                     await this._doPost(result, rows);
                 }
                 catch (e) {
@@ -337,6 +346,6 @@ export class OINODbApi {
             result.setError(405, "Unsupported HTTP method '" + method + "'", "DoRequest");
         }
         OINOBenchmark.end("OINODbApi", "doRequest", method);
-        return result;
+        return Promise.resolve(result);
     }
 }

package/dist/esm/OINODbDataModel.js

@@ -222,10 +222,10 @@ export class OINODbDataModel {
         const order_sql = params.order?.toSql(this) || "";
         const limit_sql = params.limit?.toSql(this) || "";
         // OINOLog.debug("OINODbDataModel.printSqlSelect", {select_sql:result, filter_sql:filter_sql, order_sql:order_sql})
-        if ((id != "") && (filter_sql != "")) {
+        if ((id != null) && (id != "") && (filter_sql != "")) {
             result += "\nWHERE " + this._printSqlPrimaryKeyCondition(id) + " AND " + filter_sql;
         }
-        else if (id != "") {
+        else if ((id != null) && (id != "")) {
             result += "\nWHERE " + this._printSqlPrimaryKeyCondition(id);
         }
         else if (filter_sql != "") {

package/dist/esm/OINODbDataSet.js

@@ -84,9 +84,9 @@ export class OINODbMemoryDataSet extends OINODbDataSet {
         }
     }
     /**
-      * Is data set empty.
-      *
-      */
+     * Is data set empty.
+     *
+     */
     isEmpty() {
         return (this._rows.length == 0);
     }
@@ -98,17 +98,17 @@ export class OINODbMemoryDataSet extends OINODbDataSet {
         return (this._eof);
     }
     /**
-     * Moves dataset to the next row, returns !isEof().
+     * Attempts to moves dataset to the next row, possibly waiting for more data to become available. Returns !isEof().
      *
      */
-    next() {
+    async next() {
         if (this._currentRow < this._rows.length - 1) {
             this._currentRow = this._currentRow + 1;
         }
         else {
             this._eof = true;
         }
-        return !this._eof;
+        return Promise.resolve(!this._eof);
     }
     /**
      * Gets current row of data.