@oino-ts/db 0.10.4 → 0.12.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

@@ -125,6 +125,7 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
                     value = f.serializeCellWithLocale(row[i], this._locale);
                 }
                 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 {
@@ -146,7 +147,7 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
             await dataset.next();
         }
         this.modified = last_modified;
-        const result = this._createHttpResult(html, false);
+        const result = this._createHttpResult(html);
         index_js_1.OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromDbData");
         return result;
     }
@@ -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

@@ -121,6 +121,7 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
                     value = f.serializeCellWithLocale(row[i], this._locale);
                 }
                 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 {
@@ -142,7 +143,7 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
             await dataset.next();
         }
         this.modified = last_modified;
-        const result = this._createHttpResult(html, false);
+        const result = this._createHttpResult(html);
         OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromDbData");
         return result;
     }
@@ -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/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.4",
+  "version": "0.12.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.4"
+    "@oino-ts/common": "0.12.0",
+    "oino-ts": "file:.."
   },
   "devDependencies": {
-    "@types/node": "^20.14.10",
+    "@oino-ts/types": "0.12.0",
     "@types/bun": "^1.1.14",
-    "@oino-ts/types": "0.10.4",
-    "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.test.ts

@@ -151,7 +151,7 @@ function encodeResult(o:any|undefined):string {
 function createApiTemplate(api:OINODbApi):OINODbHtmlTemplate {
 	let template_str = ""
 	for (let i=0; i<api.datamodel.fields.length; i++) {
-		template_str += "<input type='text' name='" + api.datamodel.fields[i].name + "' value='###" + api.datamodel.fields[i].name + "###'></input>"
+		template_str += "<input type='text' name='" + api.datamodel.fields[i].name + "' value='{{{" + api.datamodel.fields[i].name + "}}}'></input>"
 	}
 	return new OINODbHtmlTemplate(template_str, -1, "fi", "medium")
 }

package/src/OINODbApi.ts

@@ -128,6 +128,7 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
                     value = f.serializeCellWithLocale(row[i], this._locale)
 
                 } 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 {
@@ -149,7 +150,7 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
             await dataset.next()
         }
         this.modified = last_modified
-        const result:OINOHttpResult = this._createHttpResult(html, false)
+        const result:OINOHttpResult = this._createHttpResult(html)
         OINOBenchmark.endMetric("OINOHtmlTemplate", "renderFromDbData")
         return result
     }
@@ -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