@oino-ts/db 0.0.11 → 0.0.13

package/README.md

@@ -22,7 +22,7 @@
  ```
  
  ### Register database and logger
- Register your database implementation and logger (see [`OINOConsoleLog`](https://pragmatta.github.io/oino-ts/classes/core_src.OINOConsoleLog.html) how to implement your own)
+ Register your database implementation and logger (see [`OINOConsoleLog`](https://pragmatta.github.io/oino-ts/classes/types_src.OINOConsoleLog.html) how to implement your own)
 
  ```
  OINOLog.setLogger(new OINOConsoleLog())
@@ -30,13 +30,13 @@
  ```
 
  ### Create a database
- Creating a database connection [`OINODb`](https://pragmatta.github.io/oino-ts/classes/core_src_OINODb.OINODb.html) is done by passing [`OINODbParams`](https://pragmatta.github.io/oino-ts/types/core_src.OINODbParams.html) to the factory method. For [`OINODbBunSqlite`](https://pragmatta.github.io/oino-ts/classes/bunsqlite_OINODbBunSqlite.OINODbBunSqlite.html) that means a file url for the database file, for others network host, port, credentials etc.
+ Creating a database connection [`OINODb`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODb.html) is done by passing [`OINODbParams`](https://pragmatta.github.io/oino-ts/types/db_src.OINODbParams.html) to the factory method. For [`OINODbBunSqlite`](https://pragmatta.github.io/oino-ts/classes/db_bunsqlite_src.OINODbBunSqlite.html) that means a file url for the database file, for others network host, port, credentials etc.
  ```
  const db:OINODb = await OINOFactory.createDb( { type: "OINODbBunSqlite", url: "file://../localDb/northwind.sqlite" } )
  ```
 
  ### Create an API
- From a database you can create an [`OINOApi`](https://pragmatta.github.io/oino-ts/classes/core_src_OINOApi.OINOApi.html) by passing [`OINOApiParams`](https://pragmatta.github.io/oino-ts/types/core_src.OINOApiParams.html) with table name and preferences to the factory method.
+ From a database you can create an [`OINOApi`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbApi.html) by passing [`OINOApiParams`](https://pragmatta.github.io/oino-ts/types/db_src.OINODbApiParams.html) with table name and preferences to the factory method.
  ```
  const api_employees:OINOApi = await OINOFactory.createApi(db, { tableName: "Employees", excludeFields:["BirthDate"] })
  ```
@@ -49,7 +49,7 @@
  ```
 
  ### Write results back to HTTP Response
- The results for a GET request will contain [`OINOModelSet`](https://pragmatta.github.io/oino-ts/classes/core_src_OINOModelSet.OINOModelSet.html) data that can be written out as JSON or CSV as needed. For other requests result is just success or error with messages.
+ 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))
  ```
@@ -134,7 +134,7 @@
  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/core_src.OINOSqlFilter.html) and order with [`OINOSqlOrder`](https://pragmatta.github.io/oino-ts/classes/core_src.OINOSqlOrder.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 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.
 
  ## 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.
@@ -149,7 +149,7 @@
  OINO is developped Typescript first but compiles to standard CommonJS and the NPM packages should work on either ESM / CommonJS. Checkout sample apps `readmeApp` (ESM) and `nodeApp` (CommonJS).
 
  ## HTMX support
- OINO is [htmx.org](https://htmx.org) friendly, allowing easy translation of [`OINODataRow`](https://pragmatta.github.io/oino-ts/types/core_src.OINODataRow.html) to HTML output using templates (cf. the [htmx sample app](https://github.com/pragmatta/oino-ts/tree/main/samples/htmxApp)).
+ OINO is [htmx.org](https://htmx.org) friendly, allowing easy translation of [`OINODataRow`](https://pragmatta.github.io/oino-ts/types/db_src.OINODataRow.html) to HTML output using templates (cf. the [htmx sample app](https://github.com/pragmatta/oino-ts/tree/main/samples/htmxApp)).
 
  ### Hashids
  Autoinc numeric id's are very pragmatic and fit well with OINO (e.g. using a form without primary key fields to insert new rows with database assigned ids). However it's not always sensible to share information about the sequence. Hashids solve this by masking the original values by encrypting the ids using AES-128 and some randomness. Length of the hashid can be chosen from 12-32 characters where longer ids provide more security. However this should not be considereded a cryptographic solution for keeping ids secret but rather making it infeasible to iterate all ids.

package/dist/cjs/OINODbApi.js

@@ -5,29 +5,102 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OINODbApi = exports.OINODbApiResult = void 0;
+exports.OINODbApi = exports.OINODbHtmlTemplate = exports.OINODbApiResult = void 0;
 const index_js_1 = require("./index.js");
+const types_1 = require("@oino-ts/types");
 const hashid_1 = require("@oino-ts/hashid");
+const API_EMPTY_PARAMS = { sqlParams: {} };
 /**
  * OINO API request result object with returned data and/or http status code/message and
  * error / warning messages.
  *
  */
-class OINODbApiResult extends index_js_1.OINOResult {
+class OINODbApiResult extends types_1.OINOResult {
+    /** DbApi request params */
+    params;
     /** Returned data if any */
     data;
     /**
      * Constructor of OINODbApiResult.
      *
+     * @param params DbApi request parameters
      * @param data result data
      *
      */
-    constructor(data) {
+    constructor(params, data) {
         super();
+        this.params = params;
         this.data = data;
     }
+    /**
+     * Creates a HTTP Response from API results.
+     *
+     * @param headers Headers to include in the response
+     *
+     */
+    getResponse(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 });
+        }
+        else {
+            response = new Response(JSON.stringify(this), { 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;
+    }
 }
 exports.OINODbApiResult = OINODbApiResult;
+/**
+ * Specialized HTML template that can render ´OINODbApiResult´.
+ *
+ */
+class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
+    /**
+     * Creates HTML Response from API modelset.
+     *
+     * @param modelset OINO API dataset
+     *
+     */
+    renderFromDbData(modelset) {
+        let html = "";
+        const dataset = modelset.dataset;
+        const datamodel = modelset.datamodel;
+        const api = modelset.datamodel.api;
+        const modified_index = datamodel.findFieldIndexByName(api.params.cacheModifiedField || "");
+        let last_modified = this.modified;
+        while (!dataset.isEof()) {
+            const row = dataset.getRow();
+            if (modified_index >= 0) {
+                last_modified = Math.max(last_modified, new Date(row[modified_index]).getTime());
+            }
+            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###');
+            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 || "");
+                }
+                // 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));
+            }
+            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);
+        result.lastModified = last_modified;
+        return result;
+    }
+}
+exports.OINODbHtmlTemplate = OINODbHtmlTemplate;
 /**
  * API class with method to process HTTP REST requests.
  *
@@ -99,7 +172,7 @@ class OINODbApi {
     }
     async _doGet(result, id, params) {
         index_js_1.OINOBenchmark.start("doGet");
-        const sql = this.datamodel.printSqlSelect(id, params.sqlParams);
+        const sql = this.datamodel.printSqlSelect(id, params.sqlParams || {});
         // OINOLog.debug("OINODbApi.doGet sql", {sql:sql})
         try {
             const sql_res = await this.db.sqlSelect(sql);
@@ -201,19 +274,31 @@ class OINODbApi {
      *
      * @param method HTTP verb (uppercase)
      * @param id URL id of the REST request
-     * @param body HTTP body data as string
+     * @param body HTTP body data as either serialized string or unserialized JS object / OINODataRow-array
      * @param params HTTP URL parameters as key-value-pairs
      *
      */
-    async doRequest(method, id, body, params) {
+    async doRequest(method, id, body, params = API_EMPTY_PARAMS) {
         index_js_1.OINOBenchmark.start("doRequest");
-        let result = new OINODbApiResult();
-        index_js_1.OINOLog.debug("OINODbApi.doRequest enter", { method: method, id: id, body: body, searchParams: params });
+        // OINOLog.debug("OINODbApi.doRequest enter", {method:method, id:id, body:body, params:params})
+        let result = new OINODbApiResult(params);
+        let rows = [];
+        if ((method == "POST") || (method == "PUT")) {
+            if (Array.isArray(body)) {
+                rows = body;
+            }
+            else if (typeof (body) == "object") {
+                rows = [index_js_1.OINODbFactory.createRowFromObject(this.datamodel, body)];
+            }
+            else if (typeof (body) == "string") {
+                rows = index_js_1.OINODbFactory.createRows(this.datamodel, body, params);
+            }
+            // OINOLog.debug("OINODbApi.doRequest - OINODataRow rows", {rows:rows})        
+        }
         if (method == "GET") {
             await this._doGet(result, id, params);
         }
         else if (method == "PUT") {
-            const rows = index_js_1.OINODbFactory.createRows(this.datamodel, body, params);
             if (!id) {
                 result.setError(400, "HTTP PUT method requires an URL ID for the row that is updated!", "DoRequest");
             }
@@ -230,7 +315,6 @@ class OINODbApi {
             }
         }
         else if (method == "POST") {
-            const rows = index_js_1.OINODbFactory.createRows(this.datamodel, body, params);
             if (id) {
                 result.setError(400, "HTTP POST method must not have an URL ID as it does not target an existing row but creates a new one!", "DoRequest");
             }

package/dist/cjs/OINODbDataField.js

@@ -235,8 +235,11 @@ class OINONumberDataField extends OINODbDataField {
      *
      */
     deserializeCell(value) {
-        if (!value) {
-            return 0;
+        if (value === undefined) {
+            return undefined;
+        }
+        else if ((value == "") || (value == null)) {
+            return null;
         }
         else {
             return Number.parseFloat(value);

package/dist/cjs/OINODbDataModel.js

@@ -241,7 +241,7 @@ class OINODbDataModel {
             result += "\nLIMIT " + limit_sql;
         }
         result += ";";
-        index_js_1.OINOLog.debug("OINODbDataModel.printSqlSelect", { result: result });
+        // OINOLog.debug("OINODbDataModel.printSqlSelect", {result:result})
         return result;
     }
     /**

package/dist/cjs/OINODbFactory.js

@@ -6,6 +6,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OINODbFactory = void 0;
+const OINOResult_js_1 = require("../../types/src/OINOResult.js");
 const index_js_1 = require("./index.js");
 /**
  * Static factory class for easily creating things based on data
@@ -58,8 +59,21 @@ class OINODbFactory {
      * @param request HTTP Request
      */
     static createParamsFromRequest(request) {
-        let result = { sqlParams: {} };
         const url = new URL(request.url);
+        let sql_params = {};
+        const filter = url.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_FILTER_PARAM);
+        if (filter) {
+            sql_params.filter = index_js_1.OINODbSqlFilter.parse(filter);
+        }
+        const order = url.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_ORDER_PARAM);
+        if (order) {
+            sql_params.order = index_js_1.OINODbSqlOrder.parse(order);
+        }
+        const limit = url.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_LIMIT_PARAM);
+        if (limit) {
+            sql_params.limit = index_js_1.OINODbSqlLimit.parse(limit);
+        }
+        let result = { sqlParams: sql_params };
         const content_type = request.headers.get("content-type");
         if (content_type == index_js_1.OINOContentType.csv) {
             result.requestType = index_js_1.OINOContentType.csv;
@@ -87,42 +101,17 @@ class OINODbFactory {
         if (result.responseType === undefined) {
             result.responseType = index_js_1.OINOContentType.json;
         }
-        const filter = url.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_FILTER_PARAM);
-        if (filter) {
-            result.sqlParams.filter = index_js_1.OINODbSqlFilter.parse(filter);
+        const last_modified = request.headers.get("if-modified-since");
+        if (last_modified) {
+            result.lastModified = new Date(last_modified).getTime();
         }
-        const order = url.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_ORDER_PARAM);
-        if (order) {
-            result.sqlParams.order = new index_js_1.OINODbSqlOrder(order);
-        }
-        const limit = url.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_LIMIT_PARAM);
-        if (limit) {
-            result.sqlParams.limit = new index_js_1.OINODbSqlLimit(limit);
+        const etags = request.headers.get("if-none-match")?.split(',').map(e => e.trim());
+        if (etags) {
+            result.etags = etags;
         }
         // OINOLog.debug("createParamsFromRequest", {params:result})
         return result;
     }
-    /**
-     * Creates a HTTP Response from API results.
-     *
-     * @param apiResult API results
-     * @param requestParams API request parameters
-     * @param responseHeaders Headers to include in the response
-     *
-     */
-    static createResponseFromApiResult(apiResult, requestParams, responseHeaders = {}) {
-        let response = null;
-        if (apiResult.success && apiResult.data) {
-            response = new Response(apiResult.data.writeString(requestParams.responseType), { status: apiResult.statusCode, statusText: apiResult.statusMessage, headers: responseHeaders });
-        }
-        else {
-            response = new Response(JSON.stringify(apiResult), { status: apiResult.statusCode, statusText: apiResult.statusMessage, headers: responseHeaders });
-        }
-        for (let i = 0; i < apiResult.messages.length; i++) {
-            response.headers.set('X-OINO-MESSAGE-' + i, apiResult.messages[i]);
-        }
-        return response;
-    }
     /**
      * Creates HTML Response from API modelset.
      *
@@ -131,7 +120,7 @@ class OINODbFactory {
      *
      */
     static createHtmlFromData(modelset, template) {
-        let result = "";
+        let html = "";
         const dataset = modelset.dataset;
         const datamodel = modelset.datamodel;
         while (!dataset.isEof()) {
@@ -151,44 +140,16 @@ class OINODbFactory {
                 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));
-            result += html_row + "\r\n";
+            html += html_row + "\r\n";
             dataset.next();
         }
-        return result;
-    }
-    /**
-     * Creates HTML Response from a row id.
-     *
-     * @param oinoId OINO id
-     * @param template HTML template
-     *
-     */
-    static createHtmlFromOinoId(oinoId, template) {
-        let result = template.replaceAll('###' + index_js_1.OINODbConfig.OINODB_ID_FIELD + '###', index_js_1.OINOStr.encode(oinoId, index_js_1.OINOContentType.html));
-        return result;
-    }
-    /**
-     * Creates HTML Response from object properties.
-     *
-     * @param object object
-     * @param template HTML template
-     *
-     */
-    static createHtmlFromObject(object, template) {
-        let result = template;
-        for (let key in object) {
-            const value = object[key];
-            if (value) {
-                result = result.replaceAll('###' + key + '###', index_js_1.OINOStr.encode(value.toString(), index_js_1.OINOContentType.html));
-            }
-        }
-        result = result.replace(/###[^#]*###/g, "");
+        const result = new OINOResult_js_1.OINOHttpResult(html);
         return result;
     }
     /**
      * Creates HTML Response from API result.
      *
-     * @param apiResult object
+     * @param result OINOResult-object
      * @param template HTML template
      * @param includeErrorMessages include debug messages in result
      * @param includeWarningMessages include debug messages in result
@@ -196,30 +157,31 @@ class OINODbFactory {
      * @param includeDebugMessages include debug messages in result
      *
      */
-    static createHtmlFromApiResult(apiResult, template, includeErrorMessages = false, includeWarningMessages = false, includeInfoMessages = false, includeDebugMessages = false) {
-        let result = template;
-        result = result.replaceAll('###statusCode###', index_js_1.OINOStr.encode(apiResult.statusCode.toString(), index_js_1.OINOContentType.html));
-        result = result.replaceAll('###statusMessage###', index_js_1.OINOStr.encode(apiResult.statusMessage.toString(), index_js_1.OINOContentType.html));
+    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 < apiResult.messages.length; i++) {
-            if (includeErrorMessages && apiResult.messages[i].startsWith(index_js_1.OINO_ERROR_PREFIX)) {
-                messages += "<li>" + index_js_1.OINOStr.encode(apiResult.messages[i], index_js_1.OINOContentType.html) + "</li>";
+        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 && apiResult.messages[i].startsWith(index_js_1.OINO_WARNING_PREFIX)) {
-                messages += "<li>" + index_js_1.OINOStr.encode(apiResult.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 && apiResult.messages[i].startsWith(index_js_1.OINO_INFO_PREFIX)) {
-                messages += "<li>" + index_js_1.OINOStr.encode(apiResult.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 && apiResult.messages[i].startsWith(index_js_1.OINO_DEBUG_PREFIX)) {
-                messages += "<li>" + index_js_1.OINOStr.encode(apiResult.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) {
-            result = result.replaceAll('###messages###', "<ul>" + messages + "</ul>");
+            html = html.replaceAll('###messages###', "<ul>" + messages + "</ul>");
         }
-        result = result.replace(/###[^#]*###/g, "");
-        return result;
+        html = html.replace(/###[^#]*###/g, "");
+        const http_result = new OINOResult_js_1.OINOHttpResult(html);
+        return http_result;
     }
     static _findCsvLineEnd(csvData, start) {
         const n = csvData.length;
@@ -496,7 +458,7 @@ class OINODbFactory {
             start = end;
             end = this._findMultipartBoundary(data, multipartBoundary, start);
         }
-        index_js_1.OINOLog.debug("createRowFromFormdata: next row", { row: row });
+        // OINOLog.debug("createRowFromFormdata: next row", {row:row})
         result.push(row);
         return result;
     }
@@ -507,7 +469,7 @@ class OINODbFactory {
         const data_parts = data.trim().split('&');
         for (let i = 0; i < data_parts.length; i++) {
             const param_parts = data_parts[i].split('=');
-            index_js_1.OINOLog.debug("createRowFromUrlencoded: next param", { param_parts: param_parts });
+            // OINOLog.debug("createRowFromUrlencoded: next param", {param_parts:param_parts})
             if (param_parts.length == 2) {
                 const key = index_js_1.OINOStr.decodeUrlencode(param_parts[0]) || "";
                 const field_index = datamodel.findFieldIndexByName(key);
@@ -525,7 +487,7 @@ class OINODbFactory {
             }
             // const value = requestParams[]
         }
-        console.log("createRowFromUrlencoded: next row=" + row);
+        // console.log("createRowFromUrlencoded: next row=" + row)
         result.push(row);
         return result;
     }
@@ -559,5 +521,21 @@ class OINODbFactory {
             return [];
         }
     }
+    /**
+      * Create one data row from javascript object based on the datamodel.
+      * NOTE! Data assumed to be unserialized i.e. of the native type (string, number, boolean, Buffer)
+      *
+      * @param datamodel datamodel of the api
+      * @param data data as javascript object
+      *
+      */
+    static createRowFromObject(datamodel, data) {
+        const fields = datamodel.fields;
+        let result = new Array(fields.length);
+        for (let i = 0; i < fields.length; i++) {
+            result[i] = data[fields[i].name];
+        }
+        return result;
+    }
 }
 exports.OINODbFactory = OINODbFactory;

package/dist/cjs/OINODbRequestParams.js

@@ -173,7 +173,7 @@ class OINODbSqlFilter {
                 result += this._rightSide;
             }
         }
-        index_js_1.OINOLog.debug("OINOFilter.toSql", { result: result });
+        // OINOLog.debug("OINOFilter.toSql", {result:result})
         return "(" + result + ")";
     }
 }
@@ -185,26 +185,47 @@ exports.OINODbSqlFilter = OINODbSqlFilter;
 class OINODbSqlOrder {
     static _orderColumnRegex = /^\s*(\w+)\s?(ASC|DESC)?\s*?$/i;
     _columns;
-    _directions;
+    _descending;
     /**
      * Constructor for `OINODbSqlOrder`.
      *
-     * @param orderString string representation of filter from HTTP-request
+     * @param column_or_array single or array of columns to order on
+     * @param descending_or_array single or array of booleans if ordes is descending
      *
      */
-    constructor(orderString) {
-        // OINOLog.debug("OINODbSqlOrder.constructor", {orderString:orderString})
-        this._columns = [];
-        this._directions = [];
+    constructor(column_or_array, descending_or_array) {
+        index_js_1.OINOLog.debug("OINODbSqlOrder.constructor", { columns: column_or_array, directions: descending_or_array });
+        if (Array.isArray(column_or_array)) {
+            this._columns = column_or_array;
+        }
+        else {
+            this._columns = [column_or_array];
+        }
+        if (Array.isArray(descending_or_array)) {
+            this._descending = descending_or_array;
+        }
+        else {
+            this._descending = [descending_or_array];
+        }
+    }
+    /**
+     * Constructor for `OINODbSqlOrder` as parser of http parameter.
+     *
+     * @param orderString string representation of ordering from HTTP-request
+     *
+     */
+    static parse(orderString) {
+        let columns = [];
+        let directions = [];
         const column_strings = orderString.split(',');
         for (let i = 0; i < column_strings.length; i++) {
             let match = OINODbSqlOrder._orderColumnRegex.exec(column_strings[i]);
             if (match != null) {
-                this._columns.push(match[1]);
-                this._directions.push((match[2] || "ASC").toUpperCase());
+                columns.push(match[1]);
+                directions.push((match[2] || "DESC").toUpperCase() == "DESC");
             }
         }
-        // OINOLog.debug("OINODbSqlOrder.constructor", {columns:this._columns, directions:this._directions})
+        return new OINODbSqlOrder(columns, directions);
     }
     /**
      * Does filter contain any valid conditions.
@@ -231,7 +252,13 @@ class OINODbSqlOrder {
                 if (result) {
                     result += ",";
                 }
-                result += dataModel.api.db.printSqlColumnname(field.name) + " " + this._directions[i];
+                result += dataModel.api.db.printSqlColumnname(field.name) + " ";
+                if (this._descending[i]) {
+                    result += "DESC";
+                }
+                else {
+                    result += "ASC";
+                }
             }
         }
         // OINOLog.debug("OINODbSqlOrder.toSql", {result:result})
@@ -249,12 +276,25 @@ class OINODbSqlLimit {
     /**
      * Constructor for `OINODbSqlLimit`.
      *
-     * @param limitString string representation of filter from HTTP-request
+     * @param limit maximum number of items to return
+     *
+     */
+    constructor(limit) {
+        this._limit = limit;
+    }
+    /**
+     * Constructor for `OINODbSqlLimit` as parser of http parameter.
+     *
+     * @param limitString string representation of limit from HTTP-request
      *
      */
-    constructor(limitString) {
-        this._limit = 0;
-        this._limit = Number.parseInt(limitString);
+    static parse(limitString) {
+        try {
+            return new OINODbSqlLimit(Number.parseInt(limitString));
+        }
+        catch {
+            return new OINODbSqlLimit(-1);
+        }
     }
     /**
      * Does filter contain any valid conditions.

package/dist/cjs/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OINODB_EMPTY_ROWS = exports.OINODB_EMPTY_ROW = exports.OINODbSwagger = exports.OINODbFactory = exports.OINODbConfig = exports.OINODbSqlBooleanOperation = exports.OINODbSqlLimit = exports.OINODbSqlComparison = exports.OINODbSqlOrder = exports.OINODbSqlFilter = exports.OINODbMemoryDataSet = exports.OINODbDataSet = exports.OINODb = exports.OINODatetimeDataField = exports.OINOBlobDataField = exports.OINOStringDataField = exports.OINONumberDataField = exports.OINOBooleanDataField = exports.OINODbDataField = exports.OINODbModelSet = exports.OINODbDataModel = exports.OINODbApi = exports.OINODbApiResult = exports.OINOResult = exports.OINOConsoleLog = exports.OINOLogLevel = exports.OINOLog = exports.OINOBenchmark = exports.OINOStr = exports.OINO_DEBUG_PREFIX = exports.OINO_INFO_PREFIX = exports.OINO_WARNING_PREFIX = exports.OINO_ERROR_PREFIX = exports.OINOContentType = void 0;
+exports.OINODB_EMPTY_ROWS = exports.OINODB_EMPTY_ROW = exports.OINODbSwagger = exports.OINODbFactory = exports.OINODbConfig = exports.OINODbSqlBooleanOperation = exports.OINODbSqlLimit = exports.OINODbSqlComparison = exports.OINODbSqlOrder = exports.OINODbSqlFilter = exports.OINODbMemoryDataSet = exports.OINODbDataSet = exports.OINODb = exports.OINODatetimeDataField = exports.OINOBlobDataField = exports.OINOStringDataField = exports.OINONumberDataField = exports.OINOBooleanDataField = exports.OINODbDataField = exports.OINODbModelSet = exports.OINODbDataModel = exports.OINODbApi = exports.OINODbHtmlTemplate = exports.OINODbApiResult = exports.OINOHtmlTemplate = exports.OINOHttpResult = exports.OINOResult = exports.OINOConsoleLog = exports.OINOLogLevel = exports.OINOLog = exports.OINOBenchmark = exports.OINOStr = exports.OINO_DEBUG_PREFIX = exports.OINO_INFO_PREFIX = exports.OINO_WARNING_PREFIX = exports.OINO_ERROR_PREFIX = exports.OINOContentType = void 0;
 const types_1 = require("@oino-ts/types");
 Object.defineProperty(exports, "OINOContentType", { enumerable: true, get: function () { return types_1.OINOContentType; } });
 var types_2 = require("@oino-ts/types");
@@ -14,8 +14,11 @@ Object.defineProperty(exports, "OINOLog", { enumerable: true, get: function () {
 Object.defineProperty(exports, "OINOLogLevel", { enumerable: true, get: function () { return types_2.OINOLogLevel; } });
 Object.defineProperty(exports, "OINOConsoleLog", { enumerable: true, get: function () { return types_2.OINOConsoleLog; } });
 Object.defineProperty(exports, "OINOResult", { enumerable: true, get: function () { return types_2.OINOResult; } });
+Object.defineProperty(exports, "OINOHttpResult", { enumerable: true, get: function () { return types_2.OINOHttpResult; } });
+Object.defineProperty(exports, "OINOHtmlTemplate", { enumerable: true, get: function () { return types_2.OINOHtmlTemplate; } });
 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; } });
 var OINODbDataModel_js_1 = require("./OINODbDataModel.js");
 Object.defineProperty(exports, "OINODbDataModel", { enumerable: true, get: function () { return OINODbDataModel_js_1.OINODbDataModel; } });