@oino-ts/db 0.4.3 → 0.4.5

package/dist/cjs/OINODbApi.js

@@ -60,7 +60,7 @@ exports.OINODbApiResult = OINODbApiResult;
  */
 class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
     /** Locale validation regex */
-    static LOCALE_REGEX = /^(\w\w)(\-\w\w)?$/g;
+    static LOCALE_REGEX = /^(\w\w)(\-\w\w)?$/;
     /** Locale formatter */
     _locale;
     /**
@@ -73,7 +73,6 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
      */
     constructor(template, dateLocaleStr, dateLocaleStyle) {
         super(template);
-        console.log("OINODbHtmlTemplate.constructor", { dateLocaleStr: dateLocaleStr, dateLocaleStyle: dateLocaleStyle });
         let locale_opts;
         if ((dateLocaleStyle == null) || (dateLocaleStyle == "")) {
             locale_opts = { dateStyle: "medium", timeStyle: "medium" };

package/dist/cjs/OINODbDataModel.js

@@ -236,7 +236,7 @@ class OINODbDataModel {
         const filter_sql = params.filter?.toSql(this) || "";
         const groupby_sql = params.aggregate?.toSql(this, params.select) || "";
         let where_sql = "";
-        // OINOLog.debug("OINODbDataModel.printSqlSelect", {order_sql:order_sql, limit_sql:limit_sql, filter_sql:filter_sql, aggregate_sql:aggregate_sql})
+        // OINOLog.debug("OINODbDataModel.printSqlSelect", {order_sql:order_sql, limit_sql:limit_sql, filter_sql:filter_sql, groupby_sql:groupby_sql})
         if ((id != null) && (id != "") && (filter_sql != "")) {
             where_sql = this._printSqlPrimaryKeyCondition(id) + " AND " + filter_sql;
         }
@@ -247,7 +247,7 @@ class OINODbDataModel {
             where_sql = filter_sql;
         }
         const result = this.api.db.printSqlSelect(this.api.params.tableName, column_names, where_sql, order_sql, limit_sql, groupby_sql);
-        index_js_1.OINOLog.debug("OINODbDataModel.printSqlSelect", { result: result });
+        // OINOLog.debug("OINODbDataModel.printSqlSelect", {result:result})
         return result;
     }
     /**

package/dist/cjs/OINODbSqlParams.js

@@ -412,7 +412,7 @@ class OINODbSqlAggregate {
                 result += f.printSqlColumnName() + ",";
             }
         }
-        // OINOLog.debug("OINODbSqlAggregate.toSql", {result:result})
+        index_js_1.OINOLog.debug("OINODbSqlAggregate.toSql", { result: result });
         return result.substring(0, result.length - 1);
     }
     /**

package/dist/cjs/OINODbSwagger.js

@@ -23,11 +23,14 @@ class OINODbSwagger {
     }
     static _getSchemaApiMethodParamsBody(tableName) {
         return {
-            "schema": {
-                "$ref": "#/components/schemas/" + tableName
-            },
-            "in": "body",
-            "required": true
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "$ref": "#/components/schemas/" + tableName
+                    }
+                }
+            }
         };
     }
     static _getSchemaApiMethodDescription(method, tableName, hasQueryIdParam) {
@@ -130,28 +133,26 @@ class OINODbSwagger {
             return { "$ref": "#/components/schemas/OINOResponse" };
         }
     }
-    static _getSchemaApiMethodParams(tableName, hasQueryIdParam, hasResultData) {
-        if (hasResultData && hasQueryIdParam) {
+    static _getSchemaApiMethodParams(hasQueryIdParam) {
+        if (hasQueryIdParam) {
             return [this._getSchemaApiMethodParamsQueryId()];
         }
-        else if (hasResultData) {
-            return [];
-        }
-        else if (hasQueryIdParam) {
-            return [this._getSchemaApiMethodParamsQueryId(), this._getSchemaApiMethodParamsBody(tableName)];
-        }
         else {
-            return [this._getSchemaApiMethodParamsBody(tableName)];
+            return [];
         }
     }
     static _getSchemaApiMethod(method, tableName, hasQueryIdParam, hasBody, hasResultData) {
-        return {
+        const result = {
             responses: {
                 200: { description: this._getSchemaApiMethodDescription(method, tableName, hasQueryIdParam), content: { "application/json": { schema: this._getSchemaType(tableName, hasQueryIdParam, hasResultData) } } }
             },
             "operationId": this._getSchemaApiMethodOperationId(method, tableName, hasQueryIdParam),
-            "parameters": this._getSchemaApiMethodParams(tableName, hasQueryIdParam, hasResultData)
+            "parameters": this._getSchemaApiMethodParams(hasQueryIdParam)
         };
+        if (hasBody) {
+            result["requestBody"] = this._getSchemaApiMethodParamsBody(tableName);
+        }
+        return result;
     }
     static _getSwaggerApiPath(tableName, hasQueryIdParam) {
         if (hasQueryIdParam) {

package/dist/esm/OINODbApi.js

@@ -56,7 +56,7 @@ export class OINODbApiResult extends OINOResult {
  */
 export class OINODbHtmlTemplate extends OINOHtmlTemplate {
     /** Locale validation regex */
-    static LOCALE_REGEX = /^(\w\w)(\-\w\w)?$/g;
+    static LOCALE_REGEX = /^(\w\w)(\-\w\w)?$/;
     /** Locale formatter */
     _locale;
     /**
@@ -69,7 +69,6 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
      */
     constructor(template, dateLocaleStr, dateLocaleStyle) {
         super(template);
-        console.log("OINODbHtmlTemplate.constructor", { dateLocaleStr: dateLocaleStr, dateLocaleStyle: dateLocaleStyle });
         let locale_opts;
         if ((dateLocaleStyle == null) || (dateLocaleStyle == "")) {
             locale_opts = { dateStyle: "medium", timeStyle: "medium" };

package/dist/esm/OINODbDataModel.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 { OINO_ERROR_PREFIX, OINODbConfig, OINONumberDataField, OINOLog, OINODB_UNDEFINED } from "./index.js";
+import { OINO_ERROR_PREFIX, OINODbConfig, OINONumberDataField, OINODB_UNDEFINED } from "./index.js";
 /**
  * OINO Datamodel object for representing one database table and it's columns.
  *
@@ -233,7 +233,7 @@ export class OINODbDataModel {
         const filter_sql = params.filter?.toSql(this) || "";
         const groupby_sql = params.aggregate?.toSql(this, params.select) || "";
         let where_sql = "";
-        // OINOLog.debug("OINODbDataModel.printSqlSelect", {order_sql:order_sql, limit_sql:limit_sql, filter_sql:filter_sql, aggregate_sql:aggregate_sql})
+        // OINOLog.debug("OINODbDataModel.printSqlSelect", {order_sql:order_sql, limit_sql:limit_sql, filter_sql:filter_sql, groupby_sql:groupby_sql})
         if ((id != null) && (id != "") && (filter_sql != "")) {
             where_sql = this._printSqlPrimaryKeyCondition(id) + " AND " + filter_sql;
         }
@@ -244,7 +244,7 @@ export class OINODbDataModel {
             where_sql = filter_sql;
         }
         const result = this.api.db.printSqlSelect(this.api.params.tableName, column_names, where_sql, order_sql, limit_sql, groupby_sql);
-        OINOLog.debug("OINODbDataModel.printSqlSelect", { result: result });
+        // OINOLog.debug("OINODbDataModel.printSqlSelect", {result:result})
         return result;
     }
     /**

package/dist/esm/OINODbSqlParams.js

@@ -406,7 +406,7 @@ export class OINODbSqlAggregate {
                 result += f.printSqlColumnName() + ",";
             }
         }
-        // OINOLog.debug("OINODbSqlAggregate.toSql", {result:result})
+        OINOLog.debug("OINODbSqlAggregate.toSql", { result: result });
         return result.substring(0, result.length - 1);
     }
     /**

package/dist/esm/OINODbSwagger.js

@@ -20,11 +20,14 @@ export class OINODbSwagger {
     }
     static _getSchemaApiMethodParamsBody(tableName) {
         return {
-            "schema": {
-                "$ref": "#/components/schemas/" + tableName
-            },
-            "in": "body",
-            "required": true
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "$ref": "#/components/schemas/" + tableName
+                    }
+                }
+            }
         };
     }
     static _getSchemaApiMethodDescription(method, tableName, hasQueryIdParam) {
@@ -127,28 +130,26 @@ export class OINODbSwagger {
             return { "$ref": "#/components/schemas/OINOResponse" };
         }
     }
-    static _getSchemaApiMethodParams(tableName, hasQueryIdParam, hasResultData) {
-        if (hasResultData && hasQueryIdParam) {
+    static _getSchemaApiMethodParams(hasQueryIdParam) {
+        if (hasQueryIdParam) {
             return [this._getSchemaApiMethodParamsQueryId()];
         }
-        else if (hasResultData) {
-            return [];
-        }
-        else if (hasQueryIdParam) {
-            return [this._getSchemaApiMethodParamsQueryId(), this._getSchemaApiMethodParamsBody(tableName)];
-        }
         else {
-            return [this._getSchemaApiMethodParamsBody(tableName)];
+            return [];
         }
     }
     static _getSchemaApiMethod(method, tableName, hasQueryIdParam, hasBody, hasResultData) {
-        return {
+        const result = {
             responses: {
                 200: { description: this._getSchemaApiMethodDescription(method, tableName, hasQueryIdParam), content: { "application/json": { schema: this._getSchemaType(tableName, hasQueryIdParam, hasResultData) } } }
             },
             "operationId": this._getSchemaApiMethodOperationId(method, tableName, hasQueryIdParam),
-            "parameters": this._getSchemaApiMethodParams(tableName, hasQueryIdParam, hasResultData)
+            "parameters": this._getSchemaApiMethodParams(hasQueryIdParam)
         };
+        if (hasBody) {
+            result["requestBody"] = this._getSchemaApiMethodParamsBody(tableName);
+        }
+        return result;
     }
     static _getSwaggerApiPath(tableName, hasQueryIdParam) {
         if (hasQueryIdParam) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db",
-  "version": "0.4.3",
+  "version": "0.4.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,12 +19,12 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/common": "0.4.3"
+    "@oino-ts/common": "0.4.5"
   },
   "devDependencies": {
     "@types/node": "^20.14.10",
     "@types/bun": "^1.1.14",
-    "@oino-ts/types": "0.4.3",
+    "@oino-ts/types": "0.4.5",
     "typedoc": "^0.25.13"
   },
   "files": [

package/src/OINODbApi.ts

@@ -62,7 +62,7 @@ export class OINODbApiResult extends OINOResult {
  */
 export class OINODbHtmlTemplate extends OINOHtmlTemplate {
     /** Locale validation regex */
-    static LOCALE_REGEX:RegExp = /^(\w\w)(\-\w\w)?$/g
+    static LOCALE_REGEX:RegExp = /^(\w\w)(\-\w\w)?$/
     /** Locale formatter */
     protected _locale:Intl.DateTimeFormat|null
 
@@ -76,7 +76,6 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
      */
     constructor (template:string, dateLocaleStr?:string, dateLocaleStyle?:string|any) {
         super(template)
-        console.log("OINODbHtmlTemplate.constructor", {dateLocaleStr:dateLocaleStr, dateLocaleStyle:dateLocaleStyle})
         let locale_opts:any
         if ((dateLocaleStyle == null) || (dateLocaleStyle == "")) {
             locale_opts = { dateStyle: "medium", timeStyle: "medium" }

package/src/OINODbDataModel.ts

@@ -246,7 +246,7 @@ export class OINODbDataModel {
         const groupby_sql = params.aggregate?.toSql(this, params.select) || ""
         
         let where_sql = ""
-        // OINOLog.debug("OINODbDataModel.printSqlSelect", {order_sql:order_sql, limit_sql:limit_sql, filter_sql:filter_sql, aggregate_sql:aggregate_sql})
+        // OINOLog.debug("OINODbDataModel.printSqlSelect", {order_sql:order_sql, limit_sql:limit_sql, filter_sql:filter_sql, groupby_sql:groupby_sql})
         if ((id != null) && (id != "") && (filter_sql != ""))  {
             where_sql = this._printSqlPrimaryKeyCondition(id) + " AND " + filter_sql
         } else if ((id != null) && (id != "")) {
@@ -255,7 +255,7 @@ export class OINODbDataModel {
             where_sql = filter_sql
         }
         const result = this.api.db.printSqlSelect(this.api.params.tableName, column_names, where_sql, order_sql, limit_sql, groupby_sql)
-        OINOLog.debug("OINODbDataModel.printSqlSelect", {result:result})
+        // OINOLog.debug("OINODbDataModel.printSqlSelect", {result:result})
         return result;
     }
 

package/src/OINODbSqlParams.ts

@@ -411,7 +411,7 @@ export class OINODbSqlAggregate {
                 result += f.printSqlColumnName() + ","
             }
         }
-        // OINOLog.debug("OINODbSqlAggregate.toSql", {result:result})
+        OINOLog.debug("OINODbSqlAggregate.toSql", {result:result})
         return result.substring(0, result.length-1)
     }
 

package/src/OINODbSwagger.ts

@@ -24,12 +24,15 @@ export class OINODbSwagger {
     }
 
     private static _getSchemaApiMethodParamsBody(tableName:string): any {
-        return {
-            "schema": {
-                "$ref": "#/components/schemas/" + tableName
-            },
-            "in": "body",
-            "required": true
+        return  {
+            "required": true,
+            "content": {
+                "application/json": {
+                    "schema": {
+                        "$ref": "#/components/schemas/" + tableName
+                    }
+                }
+            }
         }
     }
 
@@ -134,29 +137,26 @@ export class OINODbSwagger {
         }
     }
 
-    private static _getSchemaApiMethodParams(tableName:string, hasQueryIdParam:boolean, hasResultData:boolean) {
-        if (hasResultData && hasQueryIdParam) {
+    private static _getSchemaApiMethodParams(hasQueryIdParam:boolean) {
+        if (hasQueryIdParam) {
             return [ this._getSchemaApiMethodParamsQueryId() ]
-
-        } else if (hasResultData) {
-            return []
-
-        } else if (hasQueryIdParam) {
-            return [ this._getSchemaApiMethodParamsQueryId(), this._getSchemaApiMethodParamsBody(tableName) ]
-
         } else {
-            return [ this._getSchemaApiMethodParamsBody(tableName) ]
+            return [  ]
         }
     }
 
     private static _getSchemaApiMethod(method:string, tableName:string, hasQueryIdParam:boolean, hasBody:boolean, hasResultData:boolean) {
-        return {
+        const result:any = {
             responses: {
                 200: { description: this._getSchemaApiMethodDescription(method, tableName, hasQueryIdParam), content: { "application/json": { schema: this._getSchemaType(tableName, hasQueryIdParam, hasResultData) } } }
             },
             "operationId": this._getSchemaApiMethodOperationId(method, tableName, hasQueryIdParam),
-            "parameters": this._getSchemaApiMethodParams(tableName, hasQueryIdParam, hasResultData)
+            "parameters": this._getSchemaApiMethodParams(hasQueryIdParam)
         }
+        if (hasBody) {
+            result["requestBody"] = this._getSchemaApiMethodParamsBody(tableName)
+        }
+        return result
     }
 
     private static _getSwaggerApiPath(tableName:string, hasQueryIdParam:boolean):any {