@oino-ts/db 0.17.4 → 0.17.5

package/dist/cjs/OINODbApi.js

@@ -293,7 +293,7 @@ class OINODbApi {
                 rows = request.data;
             }
             else if (request.data != null) {
-                rows = index_js_1.OINODbParser.createRows(this.datamodel, request.data, request);
+                rows = index_js_1.OINODbParser.createRows(this.datamodel, request.data, request.requestType, request);
             }
         }
         catch (e) {

package/dist/cjs/OINODbParser.js

@@ -17,82 +17,67 @@ class OINODbParser {
      *
      * @param datamodel datamodel of the api
      * @param data data as either serialized string or unserialized JS object or OINODataRow-array or Buffer/Uint8Array binary data
+     * @param contentType content type of the data
      * @param request parameters
      *
      */
-    static createRows(datamodel, data, request) {
+    static createRows(datamodel, data, contentType, request) {
         let result = [];
         if (typeof data == "string") {
-            result = this._createRowsFromText(datamodel, data, request);
+            result = this._createRowsFromText(datamodel, data, contentType, request);
         }
         else if ((data instanceof Buffer) || (data instanceof Uint8Array)) {
-            result = this._createRowsFromBlob(datamodel, data, request);
+            result = this._createRowsFromBlob(datamodel, data, contentType, request);
         }
         else if (typeof data == "object") {
             result = [this._createRowFromObject(datamodel, data)];
         }
         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 request request parameters
-      *
-      */
-    static _createRowsFromText(datamodel, data, request) {
-        if ((request.requestType == index_js_1.OINOContentType.json) || (request.requestType == undefined)) {
+    static _createRowsFromText(datamodel, data, contentType, request) {
+        if ((contentType == index_js_1.OINOContentType.json) || (contentType == undefined)) {
             return this._createRowFromJson(datamodel, data);
         }
-        else if (request.requestType == index_js_1.OINOContentType.csv) {
+        else if (contentType == index_js_1.OINOContentType.csv) {
             return this._createRowFromCsv(datamodel, data);
         }
-        else if (request.requestType == index_js_1.OINOContentType.formdata) {
-            return this._createRowFromFormdata(datamodel, Buffer.from(data, "utf8"), request.multipartBoundary || "");
+        else if (contentType == index_js_1.OINOContentType.formdata) {
+            return this._createRowFromFormdata(datamodel, Buffer.from(data, "utf8"), request?.multipartBoundary || "");
         }
-        else if (request.requestType == index_js_1.OINOContentType.urlencode) {
+        else if (contentType == index_js_1.OINOContentType.urlencode) {
             return this._createRowFromUrlencoded(datamodel, data);
         }
-        else if (request.requestType == index_js_1.OINOContentType.html) {
+        else if (contentType == index_js_1.OINOContentType.html) {
             index_js_1.OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromText", "HTML can't be used as an input content type!", { contentType: index_js_1.OINOContentType.html });
             return [];
         }
         else {
-            index_js_1.OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromText", "Unrecognized input content type!", { contentType: request.requestType });
+            index_js_1.OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromText", "Unrecognized input content type!", { contentType: contentType });
             return [];
         }
     }
-    /**
-      * Create data rows from request body based on the datamodel.
-      *
-      * @param datamodel datamodel of the api
-      * @param data data as an Buffer or Uint8Array
-      * @param request parameters
-      *
-      */
-    static _createRowsFromBlob(datamodel, data, request) {
+    static _createRowsFromBlob(datamodel, data, contentType, request) {
         if (data instanceof Uint8Array && !(data instanceof Buffer)) {
             data = Buffer.from(data);
         }
-        if ((request.requestType == index_js_1.OINOContentType.json) || (request.requestType == undefined)) {
+        if ((contentType == index_js_1.OINOContentType.json) || (contentType == undefined)) {
             return this._createRowFromJson(datamodel, data.toString()); // JSON is always a string
         }
-        else if (request.requestType == index_js_1.OINOContentType.csv) {
+        else if (contentType == index_js_1.OINOContentType.csv) {
             return this._createRowFromCsv(datamodel, data.toString()); // binary data has to be base64 encoded so it's a string
         }
-        else if (request.requestType == index_js_1.OINOContentType.formdata) {
-            return this._createRowFromFormdata(datamodel, data, request.multipartBoundary || "");
+        else if (contentType == index_js_1.OINOContentType.formdata) {
+            return this._createRowFromFormdata(datamodel, data, request?.multipartBoundary || "");
         }
-        else if (request.requestType == index_js_1.OINOContentType.urlencode) {
+        else if (contentType == index_js_1.OINOContentType.urlencode) {
             return this._createRowFromUrlencoded(datamodel, data.toString()); // data is urlencoded so it's a string
         }
-        else if (request.requestType == index_js_1.OINOContentType.html) {
+        else if (contentType == index_js_1.OINOContentType.html) {
             index_js_1.OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromBlob", "HTML can't be used as an input content type!", { contentType: index_js_1.OINOContentType.html });
             return [];
         }
         else {
-            index_js_1.OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromBlob", "Unrecognized input content type!", { contentType: request.requestType });
+            index_js_1.OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromBlob", "Unrecognized input content type!", { contentType: contentType });
             return [];
         }
     }
@@ -331,6 +316,10 @@ class OINODbParser {
     }
     static _multipartHeaderRegex = /Content-Disposition\: (form-data|file); name=\"([^\"]+)\"(; filename=.*)?/i;
     static _createRowFromFormdata(datamodel, data, multipartBoundary) {
+        if (!multipartBoundary || (multipartBoundary.length == 0)) {
+            index_js_1.OINOLog.error("@oino-ts/db", "OINODbParser", "_createRowFromFormdata", "Multipart boundary missing for formdata parsing!", {});
+            throw new Error(index_js_1.OINO_ERROR_PREFIX + "Multipart boundary missing for formdata parsing!");
+        }
         let result = [];
         try {
             const n = data.length;

package/dist/esm/OINODbApi.js

@@ -287,7 +287,7 @@ export class OINODbApi {
                 rows = request.data;
             }
             else if (request.data != null) {
-                rows = OINODbParser.createRows(this.datamodel, request.data, request);
+                rows = OINODbParser.createRows(this.datamodel, request.data, request.requestType, request);
             }
         }
         catch (e) {

package/dist/esm/OINODbParser.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 { OINOContentType, OINOStr, OINONumberDataField, OINOLog } from "./index.js";
+import { OINOContentType, OINOStr, OINONumberDataField, OINOLog, OINO_ERROR_PREFIX } from "./index.js";
 /**
  * Static factory class for easily creating things based on data
  *
@@ -14,82 +14,67 @@ export class OINODbParser {
      *
      * @param datamodel datamodel of the api
      * @param data data as either serialized string or unserialized JS object or OINODataRow-array or Buffer/Uint8Array binary data
+     * @param contentType content type of the data
      * @param request parameters
      *
      */
-    static createRows(datamodel, data, request) {
+    static createRows(datamodel, data, contentType, request) {
         let result = [];
         if (typeof data == "string") {
-            result = this._createRowsFromText(datamodel, data, request);
+            result = this._createRowsFromText(datamodel, data, contentType, request);
         }
         else if ((data instanceof Buffer) || (data instanceof Uint8Array)) {
-            result = this._createRowsFromBlob(datamodel, data, request);
+            result = this._createRowsFromBlob(datamodel, data, contentType, request);
         }
         else if (typeof data == "object") {
             result = [this._createRowFromObject(datamodel, data)];
         }
         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 request request parameters
-      *
-      */
-    static _createRowsFromText(datamodel, data, request) {
-        if ((request.requestType == OINOContentType.json) || (request.requestType == undefined)) {
+    static _createRowsFromText(datamodel, data, contentType, request) {
+        if ((contentType == OINOContentType.json) || (contentType == undefined)) {
             return this._createRowFromJson(datamodel, data);
         }
-        else if (request.requestType == OINOContentType.csv) {
+        else if (contentType == OINOContentType.csv) {
             return this._createRowFromCsv(datamodel, data);
         }
-        else if (request.requestType == OINOContentType.formdata) {
-            return this._createRowFromFormdata(datamodel, Buffer.from(data, "utf8"), request.multipartBoundary || "");
+        else if (contentType == OINOContentType.formdata) {
+            return this._createRowFromFormdata(datamodel, Buffer.from(data, "utf8"), request?.multipartBoundary || "");
         }
-        else if (request.requestType == OINOContentType.urlencode) {
+        else if (contentType == OINOContentType.urlencode) {
             return this._createRowFromUrlencoded(datamodel, data);
         }
-        else if (request.requestType == OINOContentType.html) {
+        else if (contentType == OINOContentType.html) {
             OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromText", "HTML can't be used as an input content type!", { contentType: OINOContentType.html });
             return [];
         }
         else {
-            OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromText", "Unrecognized input content type!", { contentType: request.requestType });
+            OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromText", "Unrecognized input content type!", { contentType: contentType });
             return [];
         }
     }
-    /**
-      * Create data rows from request body based on the datamodel.
-      *
-      * @param datamodel datamodel of the api
-      * @param data data as an Buffer or Uint8Array
-      * @param request parameters
-      *
-      */
-    static _createRowsFromBlob(datamodel, data, request) {
+    static _createRowsFromBlob(datamodel, data, contentType, request) {
         if (data instanceof Uint8Array && !(data instanceof Buffer)) {
             data = Buffer.from(data);
         }
-        if ((request.requestType == OINOContentType.json) || (request.requestType == undefined)) {
+        if ((contentType == OINOContentType.json) || (contentType == undefined)) {
             return this._createRowFromJson(datamodel, data.toString()); // JSON is always a string
         }
-        else if (request.requestType == OINOContentType.csv) {
+        else if (contentType == OINOContentType.csv) {
             return this._createRowFromCsv(datamodel, data.toString()); // binary data has to be base64 encoded so it's a string
         }
-        else if (request.requestType == OINOContentType.formdata) {
-            return this._createRowFromFormdata(datamodel, data, request.multipartBoundary || "");
+        else if (contentType == OINOContentType.formdata) {
+            return this._createRowFromFormdata(datamodel, data, request?.multipartBoundary || "");
         }
-        else if (request.requestType == OINOContentType.urlencode) {
+        else if (contentType == OINOContentType.urlencode) {
             return this._createRowFromUrlencoded(datamodel, data.toString()); // data is urlencoded so it's a string
         }
-        else if (request.requestType == OINOContentType.html) {
+        else if (contentType == OINOContentType.html) {
             OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromBlob", "HTML can't be used as an input content type!", { contentType: OINOContentType.html });
             return [];
         }
         else {
-            OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromBlob", "Unrecognized input content type!", { contentType: request.requestType });
+            OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromBlob", "Unrecognized input content type!", { contentType: contentType });
             return [];
         }
     }
@@ -328,6 +313,10 @@ export class OINODbParser {
     }
     static _multipartHeaderRegex = /Content-Disposition\: (form-data|file); name=\"([^\"]+)\"(; filename=.*)?/i;
     static _createRowFromFormdata(datamodel, data, multipartBoundary) {
+        if (!multipartBoundary || (multipartBoundary.length == 0)) {
+            OINOLog.error("@oino-ts/db", "OINODbParser", "_createRowFromFormdata", "Multipart boundary missing for formdata parsing!", {});
+            throw new Error(OINO_ERROR_PREFIX + "Multipart boundary missing for formdata parsing!");
+        }
         let result = [];
         try {
             const n = data.length;

package/dist/types/OINODbParser.d.ts

@@ -1,4 +1,4 @@
-import { OINODbDataModel, OINODataRow } from "./index.js";
+import { OINOContentType, OINODbDataModel, OINODataRow } from "./index.js";
 import { OINODbApiRequest } from "./OINODbApi.js";
 /**
  * Static factory class for easily creating things based on data
@@ -10,27 +10,12 @@ export declare class OINODbParser {
      *
      * @param datamodel datamodel of the api
      * @param data data as either serialized string or unserialized JS object or OINODataRow-array or Buffer/Uint8Array binary data
+     * @param contentType content type of the data
      * @param request parameters
      *
      */
-    static createRows(datamodel: OINODbDataModel, data: string | object | Buffer | Uint8Array, request: OINODbApiRequest): OINODataRow[];
-    /**
-      * Create data rows from request body based on the datamodel.
-      *
-      * @param datamodel datamodel of the api
-      * @param data data as a string
-      * @param request request parameters
-      *
-      */
+    static createRows(datamodel: OINODbDataModel, data: string | object | Buffer | Uint8Array, contentType: OINOContentType, request?: OINODbApiRequest): OINODataRow[];
     private static _createRowsFromText;
-    /**
-      * Create data rows from request body based on the datamodel.
-      *
-      * @param datamodel datamodel of the api
-      * @param data data as an Buffer or Uint8Array
-      * @param request parameters
-      *
-      */
     private static _createRowsFromBlob;
     /**
      * Create one data row from javascript object based on the datamodel.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db",
-  "version": "0.17.4",
+  "version": "0.17.5",
   "description": "OINO TS library package for publishing an SQL database tables as a REST API.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -19,13 +19,13 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/common": "0.17.4",
+    "@oino-ts/common": "0.17.5",
     "oino-ts": "file:.."
   },
   "devDependencies": {
-    "@oino-ts/types": "0.17.4",
+    "@oino-ts/types": "0.17.5",
     "@types/bun": "^1.1.14",
-    "@types/node": "^20.17.40",
+    "@types/node": "^20.17.50",
     "typescript": "~5.9.0"
   },
   "files": [

package/src/OINODbApi.ts

@@ -315,7 +315,7 @@ export class OINODbApi {
             if (Array.isArray(request.data)) {
                 rows = request.data as OINODataRow[]
             } else if (request.data != null) {
-                rows = OINODbParser.createRows(this.datamodel, request.data, request)
+                rows = OINODbParser.createRows(this.datamodel, request.data, request.requestType, request)
             }
         
         } catch (e:any) {

package/src/OINODbParser.ts

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { OINOContentType, OINODbDataModel, OINODbDataField, OINODataRow, OINOStr, OINONumberDataField, OINOLog } from "./index.js"
+import { OINOContentType, OINODbDataModel, OINODbDataField, OINODataRow, OINOStr, OINONumberDataField, OINOLog, OINO_ERROR_PREFIX } from "./index.js"
 import { OINODbApiRequest } from "./OINODbApi.js"
 
 /**
@@ -17,16 +17,17 @@ export class OINODbParser {
      * 
      * @param datamodel datamodel of the api
      * @param data data as either serialized string or unserialized JS object or OINODataRow-array or Buffer/Uint8Array binary data
+     * @param contentType content type of the data
      * @param request parameters
      * 
      */
-    static createRows(datamodel:OINODbDataModel, data:string|object|Buffer|Uint8Array, request:OINODbApiRequest ):OINODataRow[] {
+    static createRows(datamodel:OINODbDataModel, data:string|object|Buffer|Uint8Array, contentType:OINOContentType, request?:OINODbApiRequest ):OINODataRow[] {
         let result:OINODataRow[] = []
         if (typeof data == "string") {
-            result = this._createRowsFromText(datamodel, data, request)
+            result = this._createRowsFromText(datamodel, data, contentType, request)
 
         } else if ((data instanceof Buffer) || (data instanceof Uint8Array)) {
-            result = this._createRowsFromBlob(datamodel, data, request)
+            result = this._createRowsFromBlob(datamodel, data, contentType, request)
 
         } else if (typeof data == "object") {
             result = [this._createRowFromObject(datamodel, data)]
@@ -34,64 +35,48 @@ export class OINODbParser {
         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 request request parameters
-     * 
-     */
-    private static _createRowsFromText(datamodel:OINODbDataModel, data:string, request:OINODbApiRequest ):OINODataRow[] {
-        if ((request.requestType == OINOContentType.json) || (request.requestType == undefined)) {
+    private static _createRowsFromText(datamodel:OINODbDataModel, data:string, contentType:OINOContentType, request?:OINODbApiRequest ):OINODataRow[] {
+        if ((contentType == OINOContentType.json) || (contentType == undefined)) {
             return this._createRowFromJson(datamodel, data)
             
-        } else if (request.requestType == OINOContentType.csv) {
+        } else if (contentType == OINOContentType.csv) {
             return this._createRowFromCsv(datamodel, data)
 
-        } else if (request.requestType == OINOContentType.formdata) {
-            return this._createRowFromFormdata(datamodel, Buffer.from(data, "utf8"), request.multipartBoundary || "")
+        } else if (contentType == OINOContentType.formdata) {
+            return this._createRowFromFormdata(datamodel, Buffer.from(data, "utf8"), request?.multipartBoundary || "")
 
-        } else if (request.requestType == OINOContentType.urlencode) {
+        } else if (contentType == OINOContentType.urlencode) {
             return this._createRowFromUrlencoded(datamodel, data)
 
-        } else if (request.requestType == OINOContentType.html) {
+        } else if (contentType == OINOContentType.html) {
             OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromText", "HTML can't be used as an input content type!", {contentType:OINOContentType.html})
             return []
         } else {
-            OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromText", "Unrecognized input content type!", {contentType:request.requestType})
+            OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromText", "Unrecognized input content type!", {contentType:contentType})
             return []
         }
     }
-   /**
-     * Create data rows from request body based on the datamodel. 
-     * 
-     * @param datamodel datamodel of the api
-     * @param data data as an Buffer or Uint8Array
-     * @param request parameters
-     * 
-     */
-    private static _createRowsFromBlob(datamodel:OINODbDataModel, data:Buffer|Uint8Array, request:OINODbApiRequest ):OINODataRow[] {
+    private static _createRowsFromBlob(datamodel:OINODbDataModel, data:Buffer|Uint8Array, contentType:OINOContentType, request?:OINODbApiRequest ):OINODataRow[] {
         if (data instanceof Uint8Array && !(data instanceof Buffer)) {
             data = Buffer.from(data) as Buffer
         }
-        if ((request.requestType == OINOContentType.json) || (request.requestType == undefined)) {
+        if ((contentType == OINOContentType.json) || (contentType == undefined)) {
             return this._createRowFromJson(datamodel, data.toString()) // JSON is always a string
             
-        } else if (request.requestType == OINOContentType.csv) {
+        } else if (contentType == OINOContentType.csv) {
             return this._createRowFromCsv(datamodel, data.toString()) // binary data has to be base64 encoded so it's a string
 
-        } else if (request.requestType == OINOContentType.formdata) {
-            return this._createRowFromFormdata(datamodel, data as Buffer, request.multipartBoundary || "")
+        } else if (contentType == OINOContentType.formdata) {
+            return this._createRowFromFormdata(datamodel, data as Buffer, request?.multipartBoundary || "")
 
-        } else if (request.requestType == OINOContentType.urlencode) {
+        } else if (contentType == OINOContentType.urlencode) {
             return this._createRowFromUrlencoded(datamodel, data.toString()) // data is urlencoded so it's a string
 
-        } else if (request.requestType == OINOContentType.html) {
+        } else if (contentType == OINOContentType.html) {
             OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromBlob", "HTML can't be used as an input content type!", {contentType:OINOContentType.html})
             return []
         } else {
-            OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromBlob", "Unrecognized input content type!", {contentType:request.requestType})
+            OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromBlob", "Unrecognized input content type!", {contentType:contentType})
             return []
         }
     }
@@ -330,6 +315,10 @@ export class OINODbParser {
     private static _multipartHeaderRegex:RegExp = /Content-Disposition\: (form-data|file); name=\"([^\"]+)\"(; filename=.*)?/i
 
     private static _createRowFromFormdata(datamodel:OINODbDataModel, data:Buffer, multipartBoundary:string):OINODataRow[] {
+        if (!multipartBoundary || (multipartBoundary.length == 0)) {
+            OINOLog.error("@oino-ts/db", "OINODbParser", "_createRowFromFormdata", "Multipart boundary missing for formdata parsing!", {})
+            throw new Error(OINO_ERROR_PREFIX + "Multipart boundary missing for formdata parsing!")
+        }
         let result:OINODataRow[] = []
         try {
             const n = data.length