@oino-ts/db 0.16.2 → 0.17.2

package/dist/cjs/OINODbApi.js

@@ -5,11 +5,76 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OINODbApi = exports.OINODbHtmlTemplate = exports.OINODbApiResult = void 0;
+exports.OINODbApi = exports.OINODbHtmlTemplate = exports.OINODbApiResult = exports.OINODbApiRequest = void 0;
 const index_js_1 = require("./index.js");
 const common_1 = require("@oino-ts/common");
 const hashid_1 = require("@oino-ts/hashid");
-const API_EMPTY_PARAMS = { sqlParams: {} };
+class OINODbApiRequest extends common_1.OINOHttpRequest {
+    rowId;
+    data;
+    sqlParams;
+    constructor(init) {
+        super(init);
+        this.rowId = init?.rowId || "";
+        this.data = init?.data || null;
+        this.sqlParams = init?.sqlParams || {};
+        if (init?.filter) {
+            this.sqlParams.filter = init.filter;
+        }
+        if (!this.sqlParams.filter) {
+            const filter_param = this.url?.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_FILTER_PARAM);
+            if (filter_param) {
+                this.sqlParams.filter = index_js_1.OINODbSqlFilter.parse(filter_param);
+            }
+        }
+        if (init?.order) {
+            this.sqlParams.order = init.order;
+        }
+        if (!this.sqlParams.order) {
+            const order_param = this.url?.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_ORDER_PARAM);
+            if (order_param) {
+                this.sqlParams.order = index_js_1.OINODbSqlOrder.parse(order_param);
+            }
+        }
+        if (init?.limit) {
+            this.sqlParams.limit = init.limit;
+        }
+        if (!this.sqlParams.limit) {
+            const limit_param = this.url?.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_LIMIT_PARAM);
+            if (limit_param) {
+                this.sqlParams.limit = index_js_1.OINODbSqlLimit.parse(limit_param);
+            }
+        }
+        if (init?.aggregate) {
+            this.sqlParams.aggregate = init.aggregate;
+        }
+        if (!this.sqlParams.aggregate) {
+            const aggregate_param = this.url?.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_AGGREGATE_PARAM);
+            if (aggregate_param) {
+                this.sqlParams.aggregate = index_js_1.OINODbSqlAggregate.parse(aggregate_param);
+            }
+        }
+        if (init?.select) {
+            this.sqlParams.select = init.select;
+        }
+        if (!this.sqlParams.select) {
+            const select_param = this.url?.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_SELECT_PARAM);
+            if (select_param) {
+                this.sqlParams.select = index_js_1.OINODbSqlSelect.parse(select_param);
+            }
+        }
+    }
+    static async fromRequest(request) {
+        const body = await request.arrayBuffer();
+        return new OINODbApiRequest({
+            url: new URL(request.url),
+            method: request.method,
+            headers: Object.fromEntries(request.headers),
+            data: Buffer.from(body),
+        });
+    }
+}
+exports.OINODbApiRequest = OINODbApiRequest;
 /**
  * OINO API request result object with returned data and/or http status code/message and
  * error / warning messages.
@@ -17,19 +82,19 @@ const API_EMPTY_PARAMS = { sqlParams: {} };
  */
 class OINODbApiResult extends common_1.OINOResult {
     /** DbApi request params */
-    params;
+    request;
     /** Returned data if any */
     data;
     /**
      * Constructor of OINODbApiResult.
      *
-     * @param params DbApi request parameters
+     * @param request DbApi request parameters
      * @param data result data
      *
      */
-    constructor(params, data) {
+    constructor(request, data) {
         super();
-        this.params = params;
+        this.request = request;
         this.data = data;
     }
     /**
@@ -41,11 +106,11 @@ class OINODbApiResult extends common_1.OINOResult {
     async writeApiResponse(headers = {}) {
         let response = null;
         if (this.success && this.data) {
-            const body = await this.data.writeString(this.params.responseType);
-            response = new Response(body, { status: this.statusCode, statusText: this.statusMessage, headers: headers });
+            const body = await this.data.writeString(this.request.responseType);
+            response = new Response(body, { status: this.status, statusText: this.statusText, headers: headers });
         }
         else {
-            response = new Response(JSON.stringify(this, null, 3), { status: this.statusCode, statusText: this.statusMessage, headers: headers });
+            response = new Response(JSON.stringify(this, null, 3), { status: this.status, statusText: this.statusText, headers: headers });
         }
         for (let i = 0; i < this.messages.length; i++) {
             response.headers.set('X-OINO-MESSAGE-' + i, this.messages[i]);
@@ -220,14 +285,14 @@ class OINODbApi {
         }
         //logDebug("OINODbApi.validateHttpValues", {result:result})
     }
-    _parseData(httpResult, body, params) {
+    _parseData(httpResult, request) {
         let rows = [];
         try {
-            if (Array.isArray(body)) {
-                rows = body;
+            if (Array.isArray(request.data)) {
+                rows = request.data;
             }
-            else {
-                rows = index_js_1.OINODbParser.createRows(this.datamodel, body, params);
+            else if (request.data != null) {
+                rows = index_js_1.OINODbParser.createRows(this.datamodel, request.data, request);
             }
         }
         catch (e) {
@@ -235,10 +300,10 @@ class OINODbApi {
         }
         return rows;
     }
-    async _doGet(result, id, params) {
+    async _doGet(result, rowId, request) {
         let sql = "";
         try {
-            sql = this.datamodel.printSqlSelect(id, params.sqlParams || {});
+            sql = this.datamodel.printSqlSelect(rowId, request.sqlParams || {});
             common_1.OINOLog.debug("@oino-ts/db", "OINODbApi", "_doGet", "Print SQL", { sql: sql });
             const sql_res = await this.db.sqlSelect(sql);
             if (sql_res.hasErrors()) {
@@ -248,7 +313,7 @@ class OINODbApi {
                 }
             }
             else {
-                result.data = new index_js_1.OINODbModelSet(this.datamodel, sql_res, params.sqlParams);
+                result.data = new index_js_1.OINODbModelSet(this.datamodel, sql_res, request.sqlParams);
             }
         }
         catch (e) {
@@ -380,28 +445,38 @@ class OINODbApi {
         this._debugOnError = debugOnError;
     }
     /**
-     * Method for handlind a HTTP REST request with GET, POST, PUT, DELETE corresponding to
+     * Method for handling a HTTP REST request with GET, POST, PUT, DELETE corresponding to
+     * SQL select, insert, update and delete.
+     *
+     * @param method HTTP method of the REST request
+     * @param rowId URL id of the REST request
+     * @param data HTTP body data as either serialized string or unserialized JS object or OINODataRow-array or Buffer/Uint8Array binary data
+     * @param sqlParams SQL parameters for the REST request
+     *
+     */
+    async doRequest(method, rowId, data, sqlParams) {
+        return this.runRequest(new OINODbApiRequest({ method: method, rowId: rowId, data: data, sqlParams: sqlParams }));
+    }
+    /**
+     * Method for handling a HTTP REST request with GET, POST, PUT, DELETE corresponding to
      * SQL select, insert, update and delete.
      *
-     * @param method HTTP verb (uppercase)
-     * @param id URL id of the REST request
-     * @param data HTTP body data as either serialized string or unserialized JS object / OINODataRow-array
-     * @param params HTTP URL parameters as key-value-pairs
+     * @param request OINO DB API request
      *
      */
-    async doRequest(method, id, data, params = API_EMPTY_PARAMS) {
-        index_js_1.OINOBenchmark.startMetric("OINODbApi", "doRequest." + method);
-        common_1.OINOLog.debug("@oino-ts/db", "OINODbApi", "doRequest", "Request", { method: method, id: id, data: data });
-        let result = new OINODbApiResult(params);
+    async runRequest(request) {
+        index_js_1.OINOBenchmark.startMetric("OINODbApi", "doRequest." + request.method);
+        common_1.OINOLog.debug("@oino-ts/db", "OINODbApi", "doRequest", "Request", { method: request.method, id: request.rowId, data: request.data });
+        let result = new OINODbApiResult(request);
         let rows = [];
-        if ((method == "POST") || (method == "PUT")) {
-            rows = this._parseData(result, data, params);
+        if ((request.method == "POST") || (request.method == "PUT")) {
+            rows = this._parseData(result, request);
         }
-        if (method == "GET") {
-            await this._doGet(result, id, params);
+        if (request.method == "GET") {
+            await this._doGet(result, request.rowId, request);
         }
-        else if (method == "PUT") {
-            if (!id) {
+        else if (request.method == "PUT") {
+            if (!request.rowId) {
                 result.setError(400, "HTTP PUT method requires an URL ID for the row that is updated!", "DoRequest");
             }
             else if (rows.length != 1) {
@@ -409,15 +484,15 @@ class OINODbApi {
             }
             else {
                 try {
-                    await this._doPut(result, id, rows);
+                    await this._doPut(result, request.rowId, rows);
                 }
                 catch (e) {
                     result.setError(500, "Unhandled exception in HTTP PUT doRequest: " + e.message, "DoRequest");
                 }
             }
         }
-        else if (method == "POST") {
-            if (id) {
+        else if (request.method == "POST") {
+            if (request.rowId) {
                 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");
             }
             else if (rows.length == 0) {
@@ -432,13 +507,13 @@ class OINODbApi {
                 }
             }
         }
-        else if (method == "DELETE") {
-            if (!id) {
+        else if (request.method == "DELETE") {
+            if (!request.rowId) {
                 result.setError(400, "HTTP DELETE method requires an id!", "DoRequest");
             }
             else {
                 try {
-                    await this._doDelete(result, id, null);
+                    await this._doDelete(result, request.rowId, null);
                 }
                 catch (e) {
                     result.setError(500, "Unhandled exception in HTTP DELETE doRequest: " + e.message, "DoRequest");
@@ -446,29 +521,38 @@ class OINODbApi {
             }
         }
         else {
-            result.setError(405, "Unsupported HTTP method '" + method + "' for REST request", "DoRequest");
+            result.setError(405, "Unsupported HTTP method '" + request.method + "' for REST request", "DoRequest");
         }
-        index_js_1.OINOBenchmark.endMetric("OINODbApi", "doRequest." + method);
+        index_js_1.OINOBenchmark.endMetric("OINODbApi", "doRequest." + request.method);
         return Promise.resolve(result);
     }
     /**
-     * Method for handlind a HTTP REST request with GET, POST, PUT, DELETE corresponding to
-     * SQL select, insert, update and delete.
+     * Method for handling a HTTP REST request with batch update using PUT or DELETE methods.
      *
-     * @param method HTTP verb (uppercase)
-     * @param data HTTP body data as either serialized string or unserialized JS object / OINODataRow-array
-     * @param params HTTP URL parameters as key-value-pairs
+     * @param method HTTP method of the REST request
+     * @param rowId URL id of the REST request
+     * @param data HTTP body data as either serialized string or unserialized JS object or OINODataRow-array or Buffer/Uint8Array binary data
      *
      */
-    async doBatchUpdate(method, data, params = API_EMPTY_PARAMS) {
-        index_js_1.OINOBenchmark.startMetric("OINODbApi", "doBatchUpdate." + method);
-        common_1.OINOLog.debug("@oino-ts/db", "OINODbApi", "doBatchUpdate", "Request", { method: method, data: data, params: params });
-        let result = new OINODbApiResult(params);
-        let rows = [];
-        if ((method == "PUT")) {
-            rows = this._parseData(result, data, params);
-        }
-        if (method == "PUT") {
+    async doBatchUpdate(method, rowId, data, sqlParams) {
+        return this.runRequest(new OINODbApiRequest({ method: method, rowId: rowId, data: data, sqlParams: sqlParams }));
+    }
+    /**
+     * Method for handling a HTTP REST request with batch update using PUT or DELETE methods.
+     *
+     * @param request HTTP URL parameters as key-value-pairs
+     *
+     */
+    async runBatchUpdate(request) {
+        common_1.OINOLog.debug("@oino-ts/db", "OINODbApi", "doBatchUpdate", "Request", { request: request, data: request.data });
+        let result = new OINODbApiResult(request);
+        if ((request.method != "PUT") && (request.method != "DELETE")) {
+            result.setError(500, "Batch update only supports PUT and DELETE methods!", "DoBatchUpdate");
+            return Promise.resolve(result);
+        }
+        index_js_1.OINOBenchmark.startMetric("OINODbApi", "doBatchUpdate." + request.method);
+        const rows = [] = this._parseData(result, request);
+        if (request.method == "PUT") {
             try {
                 await this._doPut(result, null, rows);
             }
@@ -476,7 +560,7 @@ class OINODbApi {
                 result.setError(500, "Unhandled exception in HTTP PUT doRequest: " + e.message, "DoBatchUpdate");
             }
         }
-        else if (method == "DELETE") {
+        else if (request.method == "DELETE") {
             try {
                 await this._doDelete(result, null, rows);
             }
@@ -484,10 +568,7 @@ class OINODbApi {
                 result.setError(500, "Unhandled exception in HTTP DELETE doRequest: " + e.message, "DoBatchUpdate");
             }
         }
-        else {
-            result.setError(405, "Unsupported HTTP method '" + method + "' for batch update", "DoBatchUpdate");
-        }
-        index_js_1.OINOBenchmark.endMetric("OINODbApi", "doBatchUpdate." + method);
+        index_js_1.OINOBenchmark.endMetric("OINODbApi", "doBatchUpdate." + request.method);
         return Promise.resolve(result);
     }
     /**

package/dist/cjs/OINODbConfig.js

@@ -18,10 +18,6 @@ class OINODbConfig {
     static OINODB_SQL_AGGREGATE_PARAM = "oinosqlaggregate";
     /** Name of the OINODbSqlSelect-parameter in request */
     static OINODB_SQL_SELECT_PARAM = "oinosqlselect";
-    /** Name of the OINOContentType-parameter request */
-    static OINODB_REQUEST_TYPE = "oinorequesttype";
-    /** Name of the OINOContentType-parameter request */
-    static OINODB_RESPONSE_TYPE = "oinoresponsetype";
     /**
      * Set the name of the OINO ID field
      * @param idField name of the OINO ID field

package/dist/cjs/OINODbFactory.js

@@ -42,13 +42,13 @@ class OINODbFactory {
         if (connect) {
             const connect_res = await result.connect();
             if (connect_res.success == false) {
-                throw new Error("Database connection failed: " + connect_res.statusMessage);
+                throw new Error("Database connection failed: " + connect_res.statusText);
             }
         }
         if (validate) {
             const validate_res = await result.validate();
             if (validate_res.success == false) {
-                throw new Error("Database validation failed: " + validate_res.statusMessage);
+                throw new Error("Database validation failed: " + validate_res.statusText);
             }
         }
         return result;
@@ -64,70 +64,5 @@ class OINODbFactory {
         await db.initializeApiDatamodel(result);
         return result;
     }
-    /**
-     * Creates a key-value-collection from Javascript URL parameters.
-     *
-     * @param request HTTP Request
-     */
-    static createParamsFromRequest(request) {
-        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);
-        }
-        const aggregate = url.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_AGGREGATE_PARAM);
-        if (aggregate) {
-            sql_params.aggregate = index_js_1.OINODbSqlAggregate.parse(aggregate);
-        }
-        const select = url.searchParams.get(index_js_1.OINODbConfig.OINODB_SQL_SELECT_PARAM);
-        if (select) {
-            sql_params.select = index_js_1.OINODbSqlSelect.parse(select);
-        }
-        let result = { sqlParams: sql_params };
-        const request_type = url.searchParams.get(index_js_1.OINODbConfig.OINODB_REQUEST_TYPE) || request.headers.get("content-type"); // content-type header can be overridden by query parameter
-        if (request_type == index_js_1.OINOContentType.csv) {
-            result.requestType = index_js_1.OINOContentType.csv;
-        }
-        else if (request_type == index_js_1.OINOContentType.urlencode) {
-            result.requestType = index_js_1.OINOContentType.urlencode;
-        }
-        else if (request_type?.startsWith(index_js_1.OINOContentType.formdata)) {
-            result.requestType = index_js_1.OINOContentType.formdata;
-            result.multipartBoundary = request_type.split('boundary=')[1] || "";
-        }
-        else {
-            result.requestType = index_js_1.OINOContentType.json;
-        }
-        const response_type = url.searchParams.get(index_js_1.OINODbConfig.OINODB_RESPONSE_TYPE) || request.headers.get("accept"); // accept header can be overridden by query parameter
-        const accept_types = response_type?.split(', ') || [];
-        for (let i = 0; i < accept_types.length; i++) {
-            if (Object.values(index_js_1.OINOContentType).includes(accept_types[i])) {
-                result.responseType = accept_types[i];
-                break;
-            }
-        }
-        if (result.responseType === undefined) {
-            result.responseType = index_js_1.OINOContentType.json;
-        }
-        const last_modified = request.headers.get("if-modified-since");
-        if (last_modified) {
-            result.lastModified = new Date(last_modified).getTime();
-        }
-        const etags = request.headers.get("if-none-match")?.split(',').map(e => e.trim());
-        if (etags) {
-            result.etags = etags;
-        }
-        index_js_1.OINOLog.debug("@oino-ts/db", "OINODbFactory", "createParamsFromRequest", "Result", { params: result });
-        return result;
-    }
 }
 exports.OINODbFactory = OINODbFactory;

package/dist/cjs/OINODbParser.js

@@ -16,20 +16,20 @@ class OINODbParser {
      * Create data rows from request body based on the datamodel.
      *
      * @param datamodel datamodel of the api
-     * @param data data as a string or Buffer or object
-     * @param requestParams parameters
+     * @param data data as either serialized string or unserialized JS object or OINODataRow-array or Buffer/Uint8Array binary data
+     * @param request parameters
      *
      */
-    static createRows(datamodel, data, requestParams) {
+    static createRows(datamodel, data, request) {
         let result = [];
         if (typeof data == "string") {
-            result = this.createRowsFromText(datamodel, data, requestParams);
+            result = this._createRowsFromText(datamodel, data, request);
         }
-        else if (data instanceof Buffer) {
-            result = this.createRowsFromBlob(datamodel, data, requestParams);
+        else if ((data instanceof Buffer) || (data instanceof Uint8Array)) {
+            result = this._createRowsFromBlob(datamodel, data, request);
         }
         else if (typeof data == "object") {
-            result = [this.createRowFromObject(datamodel, data)];
+            result = [this._createRowFromObject(datamodel, data)];
         }
         return result;
     }
@@ -38,28 +38,28 @@ class OINODbParser {
       *
       * @param datamodel datamodel of the api
       * @param data data as a string
-      * @param requestParams parameters
+      * @param request request parameters
       *
       */
-    static createRowsFromText(datamodel, data, requestParams) {
-        if ((requestParams.requestType == index_js_1.OINOContentType.json) || (requestParams.requestType == undefined)) {
+    static _createRowsFromText(datamodel, data, request) {
+        if ((request.requestType == index_js_1.OINOContentType.json) || (request.requestType == undefined)) {
             return this._createRowFromJson(datamodel, data);
         }
-        else if (requestParams.requestType == index_js_1.OINOContentType.csv) {
+        else if (request.requestType == index_js_1.OINOContentType.csv) {
             return this._createRowFromCsv(datamodel, data);
         }
-        else if (requestParams.requestType == index_js_1.OINOContentType.formdata) {
-            return this._createRowFromFormdata(datamodel, Buffer.from(data, "utf8"), requestParams.multipartBoundary || "");
+        else if (request.requestType == index_js_1.OINOContentType.formdata) {
+            return this._createRowFromFormdata(datamodel, Buffer.from(data, "utf8"), request.multipartBoundary || "");
         }
-        else if (requestParams.requestType == index_js_1.OINOContentType.urlencode) {
+        else if (request.requestType == index_js_1.OINOContentType.urlencode) {
             return this._createRowFromUrlencoded(datamodel, data);
         }
-        else if (requestParams.requestType == index_js_1.OINOContentType.html) {
+        else if (request.requestType == 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: requestParams.requestType });
+            index_js_1.OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromText", "Unrecognized input content type!", { contentType: request.requestType });
             return [];
         }
     }
@@ -67,29 +67,32 @@ class OINODbParser {
       * Create data rows from request body based on the datamodel.
       *
       * @param datamodel datamodel of the api
-      * @param data data as an Buffer
-      * @param requestParams parameters
+      * @param data data as an Buffer or Uint8Array
+      * @param request parameters
       *
       */
-    static createRowsFromBlob(datamodel, data, requestParams) {
-        if ((requestParams.requestType == index_js_1.OINOContentType.json) || (requestParams.requestType == undefined)) {
+    static _createRowsFromBlob(datamodel, data, request) {
+        if (data instanceof Uint8Array && !(data instanceof Buffer)) {
+            data = Buffer.from(data);
+        }
+        if ((request.requestType == index_js_1.OINOContentType.json) || (request.requestType == undefined)) {
             return this._createRowFromJson(datamodel, data.toString()); // JSON is always a string
         }
-        else if (requestParams.requestType == index_js_1.OINOContentType.csv) {
+        else if (request.requestType == 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 (requestParams.requestType == index_js_1.OINOContentType.formdata) {
-            return this._createRowFromFormdata(datamodel, data, requestParams.multipartBoundary || "");
+        else if (request.requestType == index_js_1.OINOContentType.formdata) {
+            return this._createRowFromFormdata(datamodel, data, request.multipartBoundary || "");
         }
-        else if (requestParams.requestType == index_js_1.OINOContentType.urlencode) {
+        else if (request.requestType == index_js_1.OINOContentType.urlencode) {
             return this._createRowFromUrlencoded(datamodel, data.toString()); // data is urlencoded so it's a string
         }
-        else if (requestParams.requestType == index_js_1.OINOContentType.html) {
+        else if (request.requestType == 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: requestParams.requestType });
+            index_js_1.OINOLog.error("@oino-ts/db", "OINODbParser", "createRowsFromBlob", "Unrecognized input content type!", { contentType: request.requestType });
             return [];
         }
     }
@@ -101,7 +104,7 @@ class OINODbParser {
      * @param data data as javascript object
      *
      */
-    static createRowFromObject(datamodel, data) {
+    static _createRowFromObject(datamodel, data) {
         const fields = datamodel.fields;
         let result = new Array(fields.length);
         for (let i = 0; i < fields.length; i++) {

package/dist/cjs/OINODbSwagger.js

@@ -56,10 +56,10 @@ class OINODbSwagger {
                 "success": {
                     "type": "boolean"
                 },
-                "statusCode": {
+                "status": {
                     "type": "number"
                 },
-                "statusMessage": {
+                "statusText": {
                     "type": "string"
                 },
                 "messages": {
@@ -71,8 +71,8 @@ class OINODbSwagger {
             },
             "required": [
                 "success",
-                "statusCode",
-                "statusMessage",
+                "status",
+                "statusText",
                 "messages"
             ]
         };

package/dist/cjs/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OINODB_UNDEFINED = exports.OINODB_EMPTY_ROWS = exports.OINODB_EMPTY_ROW = exports.OINODbParser = exports.OINODbSwagger = exports.OINODbFactory = exports.OINODbConfig = exports.OINODbSqlNullCheck = exports.OINODbSqlSelect = exports.OINODbSqlAggregateFunctions = exports.OINODbSqlAggregate = exports.OINODbSqlBooleanOperation = exports.OINODbSqlLimit = exports.OINODbSqlComparison = exports.OINODbSqlOrder = exports.OINODbSqlFilter = exports.OINODb = exports.OINODbMemoryDataSet = exports.OINODbDataSet = 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.OINOMemoryBenchmark = 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_UNDEFINED = exports.OINODB_EMPTY_ROWS = exports.OINODB_EMPTY_ROW = exports.OINODbParser = exports.OINODbSwagger = exports.OINODbFactory = exports.OINODbConfig = exports.OINODbSqlNullCheck = exports.OINODbSqlSelect = exports.OINODbSqlAggregateFunctions = exports.OINODbSqlAggregate = exports.OINODbSqlBooleanOperation = exports.OINODbSqlLimit = exports.OINODbSqlComparison = exports.OINODbSqlOrder = exports.OINODbSqlFilter = exports.OINODb = exports.OINODbMemoryDataSet = exports.OINODbDataSet = exports.OINODatetimeDataField = exports.OINOBlobDataField = exports.OINOStringDataField = exports.OINONumberDataField = exports.OINOBooleanDataField = exports.OINODbDataField = exports.OINODbModelSet = exports.OINODbDataModel = exports.OINODbApiRequest = exports.OINODbApi = exports.OINODbHtmlTemplate = exports.OINODbApiResult = exports.OINOHtmlTemplate = exports.OINOHttpResult = exports.OINOResult = exports.OINOConsoleLog = exports.OINOLogLevel = exports.OINOLog = exports.OINOMemoryBenchmark = 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 common_1 = require("@oino-ts/common");
 Object.defineProperty(exports, "OINOContentType", { enumerable: true, get: function () { return common_1.OINOContentType; } });
 var common_2 = require("@oino-ts/common");
@@ -21,6 +21,7 @@ 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; } });
+Object.defineProperty(exports, "OINODbApiRequest", { enumerable: true, get: function () { return OINODbApi_js_1.OINODbApiRequest; } });
 var OINODbDataModel_js_1 = require("./OINODbDataModel.js");
 Object.defineProperty(exports, "OINODbDataModel", { enumerable: true, get: function () { return OINODbDataModel_js_1.OINODbDataModel; } });
 var OINODbModelSet_js_1 = require("./OINODbModelSet.js");