@oino-ts/db 0.10.3 → 0.11.0

package/dist/cjs/OINODb.js

@@ -52,7 +52,6 @@ class OINODb {
             result += " LIMIT " + limitCondition;
         }
         result += ";";
-        index_js_1.OINOLog.debug("@oino-ts/db", "OINODb", "printSqlSelect", "Result", { sql: result });
         return result;
     }
 }

package/dist/cjs/OINODbApi.js

@@ -63,17 +63,17 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
     static LOCALE_REGEX = /^(\w\w)(\-\w\w)?$/;
     /** Locale formatter */
     _locale;
-    _numberOfDecimals = -1;
+    _numberDecimals = -1;
     /**
      * Constructor of OINODbHtmlTemplate.
      *
      * @param template HTML template string
-     * @param numberOfDecimals Number of decimals to use for numbers, -1 for no formatting
+     * @param numberDecimals Number of decimals to use for numbers, -1 for no formatting
      * @param dateLocaleStr Datetime format string, either "iso" for ISO8601 or "default" for system default or valid locale string
      * @param dateLocaleStyle Datetime format style, either "short/medium/long/full" or Intl.DateTimeFormat options
      *
      */
-    constructor(template, numberOfDecimals = -1, dateLocaleStr = "", dateLocaleStyle = "") {
+    constructor(template, numberDecimals = -1, dateLocaleStr = "", dateLocaleStyle = "") {
         super(template);
         let locale_opts;
         if ((dateLocaleStyle == null) || (dateLocaleStyle == "")) {
@@ -86,7 +86,7 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
             locale_opts = dateLocaleStyle;
         }
         this._locale = null;
-        this._numberOfDecimals = numberOfDecimals;
+        this._numberDecimals = numberDecimals;
         if ((dateLocaleStr != null) && (dateLocaleStr != "") && OINODbHtmlTemplate.LOCALE_REGEX.test(dateLocaleStr)) {
             try {
                 this._locale = new Intl.DateTimeFormat(dateLocaleStr, locale_opts);
@@ -124,8 +124,9 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
                 if ((f instanceof index_js_1.OINODatetimeDataField) && (this._locale != null)) {
                     value = f.serializeCellWithLocale(row[i], this._locale);
                 }
-                else if ((f instanceof index_js_1.OINONumberDataField) && (this._numberOfDecimals >= 0) && (typeof row[i] === "number")) {
-                    value = row[i].toFixed(this._numberOfDecimals);
+                else if ((f instanceof index_js_1.OINONumberDataField) && (this._numberDecimals >= 0) && (typeof row[i] === "number")) {
+                    // console.debug("renderFromDbData number decimals", { field: f.name, value: row[i], type: typeof row[i] });
+                    value = row[i].toFixed(this._numberDecimals);
                 }
                 else {
                     value = f.serializeCell(row[i]);
@@ -276,7 +277,6 @@ class OINODbApi {
             else if (result.success) {
                 common_1.OINOLog.debug("@oino-ts/db", "OINODbApi", "_doPost", "Print SQL", { sql: sql });
                 const sql_res = await this.db.sqlExec(sql);
-                // OINOLog.debug("OINODbApi.doPost sql_res", {sql_res:sql_res})
                 if (sql_res.hasErrors()) {
                     result.setError(500, sql_res.getFirstError(), "DoPost");
                     if (this._debugOnError) {

package/dist/cjs/OINODbDataModel.js

@@ -245,7 +245,6 @@ 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("@oino-ts/db", "OINODbDataModel", "printSqlSelect", "Result", { sql: result });
         return result;
     }
     /**
@@ -256,7 +255,6 @@ class OINODbDataModel {
      */
     printSqlInsert(row) {
         let result = "INSERT INTO " + this.api.db.printSqlTablename(this.api.params.tableName) + " " + this._printSqlInsertColumnsAndValues(row) + ";";
-        index_js_1.OINOLog.debug("@oino-ts/db", "OINODbDataModel", "printSqlInsert", "Result", { sql: result });
         return result;
     }
     /**
@@ -268,7 +266,6 @@ class OINODbDataModel {
      */
     printSqlUpdate(id, row) {
         let result = "UPDATE " + this.api.db.printSqlTablename(this.api.params.tableName) + " SET " + this._printSqlUpdateValues(row) + " WHERE " + this._printSqlPrimaryKeyCondition(id) + ";";
-        index_js_1.OINOLog.debug("@oino-ts/db", "OINODbDataModel", "printSqlUpdate", "Result", { sql: result });
         return result;
     }
     /**
@@ -279,7 +276,6 @@ class OINODbDataModel {
      */
     printSqlDelete(id) {
         let result = "DELETE FROM " + this.api.db.printSqlTablename(this.api.params.tableName) + " WHERE " + this._printSqlPrimaryKeyCondition(id) + ";";
-        index_js_1.OINOLog.debug("@oino-ts/db", "OINODbDataModel", "printSqlDelete", "Result", { sql: result });
         return result;
     }
 }

package/dist/esm/OINODb.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, OINODB_EMPTY_ROW, OINOLog } from "./index.js";
+import { OINO_ERROR_PREFIX, OINODB_EMPTY_ROW } from "./index.js";
 /**
  * Base class for database abstraction, implementing methods for connecting, making queries and parsing/formatting data
  * between SQL and serialization formats.
@@ -49,7 +49,6 @@ export class OINODb {
             result += " LIMIT " + limitCondition;
         }
         result += ";";
-        OINOLog.debug("@oino-ts/db", "OINODb", "printSqlSelect", "Result", { sql: result });
         return result;
     }
 }

package/dist/esm/OINODbApi.js

@@ -59,17 +59,17 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
     static LOCALE_REGEX = /^(\w\w)(\-\w\w)?$/;
     /** Locale formatter */
     _locale;
-    _numberOfDecimals = -1;
+    _numberDecimals = -1;
     /**
      * Constructor of OINODbHtmlTemplate.
      *
      * @param template HTML template string
-     * @param numberOfDecimals Number of decimals to use for numbers, -1 for no formatting
+     * @param numberDecimals Number of decimals to use for numbers, -1 for no formatting
      * @param dateLocaleStr Datetime format string, either "iso" for ISO8601 or "default" for system default or valid locale string
      * @param dateLocaleStyle Datetime format style, either "short/medium/long/full" or Intl.DateTimeFormat options
      *
      */
-    constructor(template, numberOfDecimals = -1, dateLocaleStr = "", dateLocaleStyle = "") {
+    constructor(template, numberDecimals = -1, dateLocaleStr = "", dateLocaleStyle = "") {
         super(template);
         let locale_opts;
         if ((dateLocaleStyle == null) || (dateLocaleStyle == "")) {
@@ -82,7 +82,7 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
             locale_opts = dateLocaleStyle;
         }
         this._locale = null;
-        this._numberOfDecimals = numberOfDecimals;
+        this._numberDecimals = numberDecimals;
         if ((dateLocaleStr != null) && (dateLocaleStr != "") && OINODbHtmlTemplate.LOCALE_REGEX.test(dateLocaleStr)) {
             try {
                 this._locale = new Intl.DateTimeFormat(dateLocaleStr, locale_opts);
@@ -120,8 +120,9 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
                 if ((f instanceof OINODatetimeDataField) && (this._locale != null)) {
                     value = f.serializeCellWithLocale(row[i], this._locale);
                 }
-                else if ((f instanceof OINONumberDataField) && (this._numberOfDecimals >= 0) && (typeof row[i] === "number")) {
-                    value = row[i].toFixed(this._numberOfDecimals);
+                else if ((f instanceof OINONumberDataField) && (this._numberDecimals >= 0) && (typeof row[i] === "number")) {
+                    // console.debug("renderFromDbData number decimals", { field: f.name, value: row[i], type: typeof row[i] });
+                    value = row[i].toFixed(this._numberDecimals);
                 }
                 else {
                     value = f.serializeCell(row[i]);
@@ -271,7 +272,6 @@ export class OINODbApi {
             else if (result.success) {
                 OINOLog.debug("@oino-ts/db", "OINODbApi", "_doPost", "Print SQL", { sql: sql });
                 const sql_res = await this.db.sqlExec(sql);
-                // OINOLog.debug("OINODbApi.doPost sql_res", {sql_res:sql_res})
                 if (sql_res.hasErrors()) {
                     result.setError(500, sql_res.getFirstError(), "DoPost");
                     if (this._debugOnError) {

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.
  *
@@ -242,7 +242,6 @@ 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("@oino-ts/db", "OINODbDataModel", "printSqlSelect", "Result", { sql: result });
         return result;
     }
     /**
@@ -253,7 +252,6 @@ export class OINODbDataModel {
      */
     printSqlInsert(row) {
         let result = "INSERT INTO " + this.api.db.printSqlTablename(this.api.params.tableName) + " " + this._printSqlInsertColumnsAndValues(row) + ";";
-        OINOLog.debug("@oino-ts/db", "OINODbDataModel", "printSqlInsert", "Result", { sql: result });
         return result;
     }
     /**
@@ -265,7 +263,6 @@ export class OINODbDataModel {
      */
     printSqlUpdate(id, row) {
         let result = "UPDATE " + this.api.db.printSqlTablename(this.api.params.tableName) + " SET " + this._printSqlUpdateValues(row) + " WHERE " + this._printSqlPrimaryKeyCondition(id) + ";";
-        OINOLog.debug("@oino-ts/db", "OINODbDataModel", "printSqlUpdate", "Result", { sql: result });
         return result;
     }
     /**
@@ -276,7 +273,6 @@ export class OINODbDataModel {
      */
     printSqlDelete(id) {
         let result = "DELETE FROM " + this.api.db.printSqlTablename(this.api.params.tableName) + " WHERE " + this._printSqlPrimaryKeyCondition(id) + ";";
-        OINOLog.debug("@oino-ts/db", "OINODbDataModel", "printSqlDelete", "Result", { sql: result });
         return result;
     }
 }

package/dist/types/OINODbApi.d.ts

@@ -38,17 +38,17 @@ export declare class OINODbHtmlTemplate extends OINOHtmlTemplate {
     static LOCALE_REGEX: RegExp;
     /** Locale formatter */
     protected _locale: Intl.DateTimeFormat | null;
-    protected _numberOfDecimals: number;
+    protected _numberDecimals: number;
     /**
      * Constructor of OINODbHtmlTemplate.
      *
      * @param template HTML template string
-     * @param numberOfDecimals Number of decimals to use for numbers, -1 for no formatting
+     * @param numberDecimals Number of decimals to use for numbers, -1 for no formatting
      * @param dateLocaleStr Datetime format string, either "iso" for ISO8601 or "default" for system default or valid locale string
      * @param dateLocaleStyle Datetime format style, either "short/medium/long/full" or Intl.DateTimeFormat options
      *
      */
-    constructor(template: string, numberOfDecimals?: number, dateLocaleStr?: string, dateLocaleStyle?: string | any);
+    constructor(template: string, numberDecimals?: number, dateLocaleStr?: string, dateLocaleStyle?: string | any);
     /**
      * Creates HTML Response from API modelset.
      *

package/dist/types/index.d.ts

@@ -50,7 +50,6 @@ export type OINODbApiParams = {
 /**
  * Database class (constructor) type
  * @param dbParams database parameters
- * @return OINODb instance
  */
 export type OINODbConstructor = new (dbParams: OINODbParams) => OINODb;
 /** Database parameters */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db",
-  "version": "0.10.3",
+  "version": "0.11.0",
   "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,14 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/common": "0.10.3"
+    "@oino-ts/common": "0.11.0",
+    "oino-ts": "file:.."
   },
   "devDependencies": {
-    "@types/node": "^20.14.10",
+    "@oino-ts/types": "0.11.0",
     "@types/bun": "^1.1.14",
-    "@oino-ts/types": "0.10.3",
-    "typedoc": "^0.25.13"
+    "@types/node": "^20.14.10",
+    "typescript": "~5.9.0"
   },
   "files": [
     "src/*.ts",

package/src/OINODb.ts

@@ -137,7 +137,6 @@ export abstract class OINODb {
             result += " LIMIT " + limitCondition 
         }
         result += ";"
-        OINOLog.debug("@oino-ts/db", "OINODb", "printSqlSelect", "Result", {sql:result})
         return result;
     }
 }

package/src/OINODbApi.ts

@@ -65,18 +65,18 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
     static LOCALE_REGEX:RegExp = /^(\w\w)(\-\w\w)?$/
     /** Locale formatter */
     protected _locale:Intl.DateTimeFormat|null
-    protected _numberOfDecimals:number = -1
+    protected _numberDecimals:number = -1
 
     /**
      * Constructor of OINODbHtmlTemplate.
      *
      * @param template HTML template string
-     * @param numberOfDecimals Number of decimals to use for numbers, -1 for no formatting
+     * @param numberDecimals Number of decimals to use for numbers, -1 for no formatting
      * @param dateLocaleStr Datetime format string, either "iso" for ISO8601 or "default" for system default or valid locale string
      * @param dateLocaleStyle Datetime format style, either "short/medium/long/full" or Intl.DateTimeFormat options
      * 
      */
-    constructor (template:string, numberOfDecimals:number=-1, dateLocaleStr:string="", dateLocaleStyle:string|any="") {
+    constructor (template:string, numberDecimals:number=-1, dateLocaleStr:string="", dateLocaleStyle:string|any="") {
         super(template)
         let locale_opts:any
         if ((dateLocaleStyle == null) || (dateLocaleStyle == "")) {
@@ -87,7 +87,7 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
             locale_opts = dateLocaleStyle
         }
         this._locale = null
-        this._numberOfDecimals = numberOfDecimals
+        this._numberDecimals = numberDecimals
 
         if ((dateLocaleStr != null) && (dateLocaleStr != "") && OINODbHtmlTemplate.LOCALE_REGEX.test(dateLocaleStr)) {
             try {
@@ -127,8 +127,9 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
                 if ((f instanceof OINODatetimeDataField) && (this._locale != null)) {
                     value = f.serializeCellWithLocale(row[i], this._locale)
 
-                } else if ((f instanceof OINONumberDataField) && (this._numberOfDecimals >= 0) && (typeof row[i] === "number")) {
-                    value = (row[i]! as number).toFixed(this._numberOfDecimals)
+                } else if ((f instanceof OINONumberDataField) && (this._numberDecimals >= 0) && (typeof row[i] === "number")) {
+                    // console.debug("renderFromDbData number decimals", { field: f.name, value: row[i], type: typeof row[i] });
+                    value = (row[i]! as number).toFixed(this._numberDecimals)
 
                 } else {
                     value = f.serializeCell(row[i])
@@ -286,7 +287,6 @@ export class OINODbApi {
             } else if (result.success) {
                 OINOLog.debug("@oino-ts/db", "OINODbApi", "_doPost", "Print SQL", {sql:sql})
                 const sql_res:OINODbDataSet = await this.db.sqlExec(sql)
-                // OINOLog.debug("OINODbApi.doPost sql_res", {sql_res:sql_res})
                 if (sql_res.hasErrors()) {
                     result.setError(500, sql_res.getFirstError(), "DoPost")
                     if (this._debugOnError) {

package/src/OINODbDataModel.ts

@@ -252,7 +252,6 @@ 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("@oino-ts/db", "OINODbDataModel", "printSqlSelect", "Result", {sql:result})
         return result;
     }
 
@@ -264,7 +263,6 @@ export class OINODbDataModel {
      */
     printSqlInsert(row: OINODataRow): string {
         let result: string = "INSERT INTO " + this.api.db.printSqlTablename(this.api.params.tableName) + " " + this._printSqlInsertColumnsAndValues(row) + ";";
-        OINOLog.debug("@oino-ts/db", "OINODbDataModel", "printSqlInsert", "Result", {sql:result})
         return result;
     }
 
@@ -277,7 +275,6 @@ export class OINODbDataModel {
      */
     printSqlUpdate(id: string, row: OINODataRow): string {
         let result: string = "UPDATE " + this.api.db.printSqlTablename(this.api.params.tableName) + " SET " + this._printSqlUpdateValues(row) + " WHERE " + this._printSqlPrimaryKeyCondition(id) + ";";
-        OINOLog.debug("@oino-ts/db", "OINODbDataModel", "printSqlUpdate", "Result", {sql:result})
         return result;
     }
 
@@ -289,7 +286,6 @@ export class OINODbDataModel {
      */
     printSqlDelete(id: string): string {
         let result: string = "DELETE FROM " + this.api.db.printSqlTablename(this.api.params.tableName) + " WHERE " + this._printSqlPrimaryKeyCondition(id) + ";";
-        OINOLog.debug("@oino-ts/db", "OINODbDataModel", "printSqlDelete", "Result", {sql:result})
         return result;
     }
 }

package/src/index.ts

@@ -53,7 +53,6 @@ export type OINODbApiParams = {
 /** 
  * Database class (constructor) type 
  * @param dbParams database parameters
- * @return OINODb instance
  */
 export type OINODbConstructor = new (dbParams:OINODbParams) => OINODb