@oino-ts/db 0.0.16 → 0.0.18

package/README.md

@@ -59,20 +59,8 @@
  
  ## RESTfull
  OINO maps HTTP methods GET/POST/PUT/DELETE to SQL operations SELECT/INSERT/UPDATE/DELETE. The GET/POST requests can be made without URL ID to get all rows or insert new ones and others target a single row using URL ID. 
- 
- ### HTTP GET
- ```
- Request and response:
- > curl.exe -X GET http://localhost:3001/orderdetails/11077:77
- [
-   {"_OINOID_":"11077:77","OrderID":11077,"ProductID":77,"UnitPrice":13,"Quantity":2,"Discount":0}
- ]
-
- SQL:
- SELECT "OrderID","ProductID","UnitPrice","Quantity","Discount" FROM [OrderDetails] WHERE ("OrderID"=11077 AND "ProductID"=77);
- ```
 
- ### HTTP POST 
+ For example HTTP POST 
  ```
  Request and response:
  > curl.exe -X POST http://localhost:3001/orderdetails -H "Content-Type: application/json" --data '[{\"OrderID\":11077,\"ProductID\":99,\"UnitPrice\":19,\"Quantity\":1,\"Discount\":0}]'
@@ -82,31 +70,12 @@
  INSERT INTO [OrderDetails] ("OrderID","ProductID","UnitPrice","Quantity","Discount") VALUES (11077,99,19,1,0);
  ```
 
- ### HTTP PUT
- ```
- Request and response:
- > curl.exe -X PUT http://localhost:3001/orderdetails/11077:99 -H "Content-Type: application/json" --data '[{\"UnitPrice\":20}]'
- {"success":true,"statusCode":200,"statusMessage":"OK","messages":[]}
 
- SQL:
- UPDATE [OrderDetails] SET "UnitPrice"=20 WHERE ("OrderID"=11077 AND "ProductID"=99);
- ```
- 
- ### HTTP DELETE
- ```
- Request and response:
- > curl.exe -X DELETE http://localhost:3001/orderdetails/11077:99
- {"success":true,"statusCode":200,"statusMessage":"OK","messages":[]}
-
- SQL:
- DELETE FROM [OrderDetails] WHERE ("OrderID"=11077 AND "ProductID"=99);
- ```
-  
  ## Universal Serialization
  OINO handles serialization of data to JSON/CSV/etc. and back based on the data model. It knows what columns exist, what is their data type and how to convert each to JSON/CSV and back. This allows also partial data to be sent, i.e. you can send only columns that need updating or even send extra columns and have them ignored.
 
  ### Features
- - Files can be sent to BLOB fields using BASE64 encoding.
+ - Files can be sent to BLOB fields using BASE64 or MIME multipart encoding. Also supports standard HTML form file submission to blob fields and returning them data url images.
  - Datetimes are (optionally) normalized to ISO 8601 format.
  - Extended JSON-encoding
    - Unquoted literal `undefined` can be used to represent non-existent values (leaving property out works too but preserving structure might be easier e.g. when translating data).
@@ -131,11 +100,11 @@
  - 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
+ ## Composite 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 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.
+ Since OINO is just generating SQL, WHERE-conditions can be defined with [`OINOSqlFilter`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlFilter.html), order with [`OINOSqlOrder`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlOrder.html) and limits/paging with [`OINOSqlLimit`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlLimit.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.
@@ -152,7 +121,7 @@
  ## HTMX support
  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
+ ## 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.
 
 
@@ -164,9 +133,6 @@
 
  ### Realistic app
  There needs to be a realistic app built on top of OINO to get a better grasp of the edge cases.
-
- ### Security review
- Handling of SQL-injection attacks needs a thorough review, what are the relevant attack vectors are for OINO and what protections are still needed.
  
  ## Roadmap
  Things that need to happen in some order before beta-status are at least following:
@@ -179,8 +145,8 @@
  ### Batch updates
  Supporting batch updates similar to batch inserts is slightly bending the RESTfull principles but would still be a useful optional feature.
 
- ### Aggregation and limits
- Similar to filtering and ordering, aggregation and limits can be implemented as HTTP request parameters telling what column is aggregated or used for ordering or how many results to return.
+ ### Aggregation
+ Similar to filtering, ordering and limits, aggregation could be implemented as HTTP request parameters telling what column is aggregated or used for ordering or how many results to return.
 
  ### Streaming
  One core idea is to be efficient in not making unnecessary copies of the data and minimizing garbage collection debt. This can be taken further by implementing streaming, allowing large dataset to be written to HTTP response as SQL result rows are received.
@@ -222,4 +188,3 @@
  
  ## SQL Scripts
  The SQL scripts for creating the sample Northwind database are based on [Google Code archive](https://code.google.com/archive/p/northwindextended/downloads) and have been further customized to ensure they would have identical data (in the scope of the automated testing).
-

package/dist/cjs/OINODb.js

@@ -23,5 +23,31 @@ class OINODb {
         this._params = params;
         this.name = params.database;
     }
+    /**
+     * Print SQL select statement with DB specific formatting.
+     *
+     * @param tableName - The name of the table to select from.
+     * @param columnNames - The columns to be selected.
+     * @param whereCondition - The WHERE clause to filter the results.
+     * @param orderCondition - The ORDER BY clause to sort the results.
+     * @param limitCondition - The LIMIT clause to limit the number of results.
+     *
+     */
+    printSqlSelect(tableName, columnNames, whereCondition, orderCondition, limitCondition) {
+        let result = "SELECT " + columnNames + " FROM " + tableName;
+        // OINOLog.debug("OINODb.printSqlSelect", {tableName:tableName, columnNames:columnNames, whereCondition:whereCondition, orderCondition:orderCondition, limitCondition:limitCondition })
+        if (whereCondition != "") {
+            result += " WHERE " + whereCondition;
+        }
+        if (orderCondition != "") {
+            result += " ORDER BY " + orderCondition;
+        }
+        if (limitCondition != "") {
+            result += " LIMIT " + limitCondition;
+        }
+        result += ";";
+        // OINOLog.debug("OINODb.printSqlSelect", {result:result})
+        return result;
+    }
 }
 exports.OINODb = OINODb;

package/dist/cjs/OINODbApi.js

@@ -9,6 +9,7 @@ exports.OINODbApi = exports.OINODbHtmlTemplate = exports.OINODbApiResult = void
 const index_js_1 = require("./index.js");
 const types_1 = require("@oino-ts/types");
 const hashid_1 = require("@oino-ts/hashid");
+const types_2 = require("@oino-ts/types");
 const API_EMPTY_PARAMS = { sqlParams: {} };
 /**
  * OINO API request result object with returned data and/or http status code/message and
@@ -38,7 +39,7 @@ class OINODbApiResult extends types_1.OINOResult {
      * @param headers Headers to include in the response
      *
      */
-    async createResponseFromResult(headers = {}) {
+    async getResponse(headers = {}) {
         let response = null;
         if (this.success && this.data) {
             const body = await this.data.writeString(this.params.responseType);
@@ -89,11 +90,13 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
             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 (f.fieldParams.isPrimaryKey || f.fieldParams.isForeignKey) {
                     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 || "");
+                    if (f.fieldParams.isPrimaryKey) {
+                        primary_key_values.push(value || "");
+                    }
                 }
                 // OINOLog.debug("renderFromDbData replace field value", {field:f.name, value:value }) 
                 this.setVariableFromValue(f.name, value || "");
@@ -182,9 +185,10 @@ class OINODbApi {
         //logDebug("OINODbApi.validateHttpValues", {result:result})
     }
     async _doGet(result, id, params) {
-        const sql = this.datamodel.printSqlSelect(id, params.sqlParams || {});
-        // OINOLog.debug("OINODbApi.doGet sql", {sql:sql})
+        let sql = "";
         try {
+            sql = this.datamodel.printSqlSelect(id, params.sqlParams || {});
+            // OINOLog.debug("OINODbApi.doGet sql", {sql:sql})
             const sql_res = await this.db.sqlSelect(sql);
             // OINOLog.debug("OINODbApi.doGet sql_res", {sql_res:sql_res})
             if (sql_res.hasErrors()) {
@@ -287,14 +291,16 @@ class OINODbApi {
         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)];
+            try {
+                if (Array.isArray(body)) {
+                    rows = body;
+                }
+                else {
+                    rows = types_2.OINOParser.createRows(this.datamodel, body, params);
+                }
             }
-            else if (typeof (body) == "string") {
-                rows = index_js_1.OINODbFactory.createRows(this.datamodel, body, params);
+            catch (e) {
+                result.setError(400, "Invalid data: " + e.message, "DoRequest");
             }
             // OINOLog.debug("OINODbApi.doRequest - OINODataRow rows", {rows:rows})        
         }

package/dist/cjs/OINODbDataField.js

@@ -6,6 +6,7 @@
  */
 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");
 /**
  * Base class for a column of data responsible for appropriatelly serializing/deserializing the data.
  *
@@ -54,6 +55,9 @@ class OINODbDataField {
         if (this.fieldParams.isPrimaryKey) {
             params += "PK ";
         }
+        if (this.fieldParams.isForeignKey) {
+            params += "FK ";
+        }
         if (this.fieldParams.isAutoInc) {
             params += "AUTOINC ";
         }
@@ -242,7 +246,12 @@ class OINONumberDataField extends OINODbDataField {
             return null;
         }
         else {
-            return Number.parseFloat(value);
+            const result = parseFloat(value);
+            if (isNaN(result)) {
+                index_js_1.OINOLog.error("OINODbSqlFilter.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
+            }
+            return result;
         }
     }
 }
@@ -291,7 +300,7 @@ class OINOBlobDataField extends OINODbDataField {
      */
     deserializeCell(value) {
         if (value == null) {
-            return new Buffer(0);
+            return Buffer.alloc(0);
         }
         else {
             return Buffer.from(value, 'base64'); // Blob-field data is base64 encoded and converted internally to UInt8Array / Buffer

package/dist/cjs/OINODbDataModel.js

@@ -220,27 +220,22 @@ class OINODbDataModel {
      *
      */
     printSqlSelect(id, params) {
-        let result = "SELECT " + this._printSqlColumnNames() + " FROM " + this.api.db.printSqlTablename(this.api.params.tableName);
-        const filter_sql = params.filter?.toSql(this) || "";
+        const column_names = this._printSqlColumnNames();
         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})
+        const filter_sql = params.filter?.toSql(this) || "";
+        let where_sql = "";
+        // OINOLog.debug("OINODbDataModel.printSqlSelect", {id:id, select_sql:result, filter_sql:filter_sql, order_sql:order_sql})
         if ((id != null) && (id != "") && (filter_sql != "")) {
-            result += "\nWHERE " + this._printSqlPrimaryKeyCondition(id) + " AND " + filter_sql;
+            where_sql = this._printSqlPrimaryKeyCondition(id) + " AND " + filter_sql;
         }
         else if ((id != null) && (id != "")) {
-            result += "\nWHERE " + this._printSqlPrimaryKeyCondition(id);
+            where_sql = this._printSqlPrimaryKeyCondition(id);
         }
         else if (filter_sql != "") {
-            result += "\nWHERE " + filter_sql;
-        }
-        if (order_sql) {
-            result += "\nORDER BY " + order_sql;
-        }
-        if (limit_sql) {
-            result += "\nLIMIT " + limit_sql;
+            where_sql = filter_sql;
         }
-        result += ";";
+        const result = this.api.db.printSqlSelect(this.api.params.tableName, column_names, where_sql, order_sql, limit_sql);
         // OINOLog.debug("OINODbDataModel.printSqlSelect", {result:result})
         return result;
     }

package/dist/cjs/OINODbFactory.js

@@ -111,361 +111,5 @@ class OINODbFactory {
         // OINOLog.debug("createParamsFromRequest", {params:result})
         return result;
     }
-    static _findCsvLineEnd(csvData, start) {
-        const n = csvData.length;
-        if (start >= n) {
-            return start;
-        }
-        let end = start;
-        let quote_open = false;
-        while (end < n) {
-            if (csvData[end] == "\"") {
-                if (!quote_open) {
-                    quote_open = true;
-                }
-                else if ((end < n - 1) && (csvData[end + 1] == "\"")) {
-                    end++;
-                }
-                else {
-                    quote_open = false;
-                }
-            }
-            else if ((!quote_open) && (csvData[end] == "\r")) {
-                return end;
-            }
-            end++;
-        }
-        return n;
-    }
-    static _parseCsvLine(csvLine) {
-        let result = [];
-        const n = csvLine.length;
-        let start = 0;
-        let end = 0;
-        let quote_open = false;
-        let has_quotes = false;
-        let has_escaped_quotes = false;
-        let found_field = false;
-        while (end < n) {
-            if (csvLine[end] == "\"") {
-                if (!quote_open) {
-                    quote_open = true;
-                }
-                else if ((end < n - 1) && (csvLine[end + 1] == "\"")) {
-                    end++;
-                    has_escaped_quotes = true;
-                }
-                else {
-                    has_quotes = true;
-                    quote_open = false;
-                }
-            }
-            if ((!quote_open) && ((end == n - 1) || (csvLine[end] == ","))) {
-                found_field = true;
-                if (end == n - 1) {
-                    end++;
-                }
-            }
-            if (found_field) {
-                // console.log("OINODB_csvParseLine: next field=" + csvLine.substring(start,end) + ", start="+start+", end="+end)
-                let field_str;
-                if (has_quotes) {
-                    field_str = csvLine.substring(start + 1, end - 1);
-                }
-                else if (start == end) {
-                    field_str = undefined;
-                }
-                else {
-                    field_str = csvLine.substring(start, end);
-                    if (field_str == "null") {
-                        field_str = null;
-                    }
-                }
-                result.push(field_str);
-                has_quotes = false;
-                has_escaped_quotes = true;
-                found_field = false;
-                start = end + 1;
-            }
-            end++;
-        }
-        return result;
-    }
-    static createRowFromCsv(datamodel, data) {
-        let result = [];
-        const n = data.length;
-        let start = 0;
-        let end = this._findCsvLineEnd(data, start);
-        const header_str = data.substring(start, end);
-        const headers = this._parseCsvLine(header_str);
-        let field_to_header_mapping = new Array(datamodel.fields.length);
-        let headers_found = false;
-        for (let i = 0; i < field_to_header_mapping.length; i++) {
-            field_to_header_mapping[i] = headers.indexOf(datamodel.fields[i].name);
-            headers_found = headers_found || (field_to_header_mapping[i] >= 0);
-        }
-        // OINOLog.debug("createRowFromCsv", {headers:headers, field_to_header_mapping:field_to_header_mapping})
-        if (!headers_found) {
-            return result;
-        }
-        start = end + 1;
-        end = start;
-        while (end < n) {
-            while ((start < n) && ((data[start] == "\r") || (data[start] == "\n"))) {
-                start++;
-            }
-            if (start >= n) {
-                return result;
-            }
-            end = this._findCsvLineEnd(data, start);
-            const row_data = this._parseCsvLine(data.substring(start, end));
-            const row = new Array(field_to_header_mapping.length);
-            for (let i = 0; i < datamodel.fields.length; i++) {
-                const field = datamodel.fields[i];
-                let j = field_to_header_mapping[i];
-                let value = row_data[j];
-                if ((value === undefined) || (value === null)) { // null/undefined-decoding built into the parser
-                    row[i] = value;
-                }
-                else if ((j >= 0) && (j < row_data.length)) {
-                    value = index_js_1.OINOStr.decode(value, index_js_1.OINOContentType.csv);
-                    if (value && field.fieldParams.isPrimaryKey && (field instanceof index_js_1.OINONumberDataField) && (datamodel.api.hashid)) {
-                        value = datamodel.api.hashid.decode(value);
-                    }
-                    row[i] = field.deserializeCell(value);
-                }
-                else {
-                    row[i] = undefined;
-                }
-            }
-            // console.log("createRowFromCsv: next row=" + row)
-            result.push(row);
-            start = end;
-            end = start;
-        }
-        return result;
-    }
-    static _createRowFromJsonObj(obj, datamodel) {
-        // console.log("createRowFromJsonObj: obj=" + JSON.stringify(obj))
-        const fields = datamodel.fields;
-        let result = new Array(fields.length);
-        //  console.log("createRowFromJsonObj: " + result)
-        for (let i = 0; i < fields.length; i++) {
-            const field = fields[i];
-            let value = obj[field.name];
-            // console.log("createRowFromJsonObj: key=" + field.name + ", val=" + val)
-            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") {
-                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])
-        }
-        // console.log("createRowFromJsonObj: " + result)
-        return result;
-    }
-    static _createRowFromJson(datamodel, data) {
-        try {
-            let result = [];
-            // console.log("OINORowFactoryJson: data=" + data)
-            const obj = JSON.parse(data);
-            if (Array.isArray(obj)) {
-                obj.forEach(row => {
-                    result.push(this._createRowFromJsonObj(row, datamodel));
-                });
-            }
-            else {
-                result.push(this._createRowFromJsonObj(obj, datamodel));
-            }
-            return result;
-        }
-        catch (e) {
-            return [];
-        }
-    }
-    static _findMultipartBoundary(formData, multipartBoundary, start) {
-        let n = formData.indexOf(multipartBoundary, start);
-        if (n >= 0) {
-            n += multipartBoundary.length + 2;
-        }
-        else {
-            n = formData.length;
-        }
-        return n;
-    }
-    static _parseMultipartLine(csvData, start) {
-        let line_end = csvData.indexOf('\r\n', start);
-        if (line_end >= start) {
-            return csvData.substring(start, line_end);
-        }
-        else {
-            return '';
-        }
-    }
-    static _multipartHeaderRegex = /Content-Disposition\: (form-data|file); name=\"([^\"]+)\"(; filename=.*)?/i;
-    static createRowFromFormdata(datamodel, data, multipartBoundary) {
-        let result = [];
-        const n = data.length;
-        let start = this._findMultipartBoundary(data, multipartBoundary, 0);
-        let end = this._findMultipartBoundary(data, multipartBoundary, start);
-        // OINOLog.debug("createRowFromFormdata: enter", {start:start, end:end, multipartBoundary:multipartBoundary})
-        const row = new Array(datamodel.fields.length);
-        while (end < n) {
-            // OINOLog.debug("createRowFromFormdata: next block", {start:start, end:end, block:data.substring(start, end)})
-            let block_ok = true;
-            let l = this._parseMultipartLine(data, start);
-            // OINOLog.debug("createRowFromFormdata: next line", {start:start, end:end, line:l})
-            start += l.length + 2;
-            const header_matches = OINODbFactory._multipartHeaderRegex.exec(l);
-            if (!header_matches) {
-                index_js_1.OINOLog.warning("OINODbFactory.createRowFromFormdata: unsupported block skipped!", { header_line: l });
-                block_ok = false;
-            }
-            else {
-                const field_name = header_matches[2];
-                const is_file = header_matches[3] != null;
-                let is_base64 = false;
-                const field_index = datamodel.findFieldIndexByName(field_name);
-                // OINOLog.debug("createRowFromFormdata: header", {field_name:field_name, field_index:field_index, is_file:is_file})
-                if (field_index < 0) {
-                    index_js_1.OINOLog.warning("OINODbFactory.createRowFromFormdata: form field not found and skipped!", { field_name: field_name });
-                    block_ok = false;
-                }
-                else {
-                    const field = datamodel.fields[field_index];
-                    l = this._parseMultipartLine(data, start);
-                    // OINOLog.debug("createRowFromFormdata: next line", {start:start, end:end, line:l})
-                    while (block_ok && (l != '')) {
-                        if (l.startsWith('Content-Type:') && (l.indexOf('multipart/mixed') >= 0)) {
-                            index_js_1.OINOLog.warning("OINODbFactory.createRowFromFormdata: mixed multipart files not supported and skipped!", { header_line: l });
-                            block_ok = false;
-                        }
-                        else if (l.startsWith('Content-Transfer-Encoding:') && (l.indexOf('BASE64') >= 0)) {
-                            is_base64 = true;
-                        }
-                        start += l.length + 2;
-                        l = this._parseMultipartLine(data, start);
-                        // OINOLog.debug("createRowFromFormdata: next line", {start:start, end:end, line:l})
-                    }
-                    start += 2;
-                    if (!block_ok) {
-                        index_js_1.OINOLog.warning("OINODbFactory.createRowFromFormdata: invalid block skipped", { field_name: field_name });
-                    }
-                    else if (start + multipartBoundary.length + 2 >= end) {
-                        // OINOLog.debug("OINODbFactory.createRowFromFormdata: null value", {field_name:field_name})
-                        row[field_index] = null;
-                    }
-                    else if (is_file) {
-                        const value = this._parseMultipartLine(data, start).trim();
-                        if (is_base64) {
-                            row[field_index] = field.deserializeCell(index_js_1.OINOStr.decode(value, index_js_1.OINOContentType.formdata));
-                        }
-                        else {
-                            row[field_index] = Buffer.from(value, "binary");
-                        }
-                    }
-                    else {
-                        let value = index_js_1.OINOStr.decode(this._parseMultipartLine(data, start).trim(), index_js_1.OINOContentType.formdata);
-                        // OINOLog.debug("OINODbFactory.createRowFromFormdata: parse form field", {field_name:field_name, value:value})
-                        if (value && field.fieldParams.isPrimaryKey && (field instanceof index_js_1.OINONumberDataField) && (datamodel.api.hashid)) {
-                            value = datamodel.api.hashid.decode(value);
-                        }
-                        row[field_index] = field.deserializeCell(value);
-                    }
-                }
-            }
-            start = end;
-            end = this._findMultipartBoundary(data, multipartBoundary, start);
-        }
-        // OINOLog.debug("createRowFromFormdata: next row", {row:row})
-        result.push(row);
-        return result;
-    }
-    static createRowFromUrlencoded(datamodel, data) {
-        // OINOLog.debug("createRowFromUrlencoded: enter", {data:data})
-        let result = [];
-        const row = new Array(datamodel.fields.length);
-        const data_parts = data.trim().split('&');
-        for (let i = 0; i < data_parts.length; i++) {
-            const param_parts = data_parts[i].split('=');
-            // 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);
-                if (field_index < 0) {
-                    index_js_1.OINOLog.info("createRowFromUrlencoded: param field not found", { field: key });
-                }
-                else {
-                    const field = datamodel.fields[field_index];
-                    let value = index_js_1.OINOStr.decode(param_parts[1], index_js_1.OINOContentType.urlencode);
-                    if (value && field.fieldParams.isPrimaryKey && (field instanceof index_js_1.OINONumberDataField) && (datamodel.api.hashid)) {
-                        value = datamodel.api.hashid.decode(value);
-                    }
-                    row[field_index] = field.deserializeCell(value);
-                }
-            }
-            // const value = requestParams[]
-        }
-        // console.log("createRowFromUrlencoded: next row=" + row)
-        result.push(row);
-        return result;
-    }
-    /**
-      * Create data rows from request body based on the datamodel.
-      *
-      * @param datamodel datamodel of the api
-      * @param data data as a string
-      * @param requestParams parameters
-      *
-      */
-    static createRows(datamodel, data, requestParams) {
-        if ((requestParams.requestType == index_js_1.OINOContentType.json) || (requestParams.requestType == undefined)) {
-            return this._createRowFromJson(datamodel, data);
-        }
-        else if (requestParams.requestType == index_js_1.OINOContentType.csv) {
-            return this.createRowFromCsv(datamodel, data);
-        }
-        else if (requestParams.requestType == index_js_1.OINOContentType.formdata) {
-            return this.createRowFromFormdata(datamodel, data, requestParams.multipartBoundary || "");
-        }
-        else if (requestParams.requestType == index_js_1.OINOContentType.urlencode) {
-            return this.createRowFromUrlencoded(datamodel, data);
-        }
-        else if (requestParams.requestType == index_js_1.OINOContentType.html) {
-            index_js_1.OINOLog.error("HTML can't be used as an input content type!", { contentType: index_js_1.OINOContentType.html });
-            return [];
-        }
-        else {
-            index_js_1.OINOLog.error("Unrecognized input content type!", { contentType: requestParams.requestType });
-            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;