@oino-ts/db 0.0.12 → 0.0.13

package/dist/cjs/OINODbApi.js

@@ -68,8 +68,14 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
         let html = "";
         const dataset = modelset.dataset;
         const datamodel = modelset.datamodel;
+        const api = modelset.datamodel.api;
+        const modified_index = datamodel.findFieldIndexByName(api.params.cacheModifiedField || "");
+        let last_modified = this.modified;
         while (!dataset.isEof()) {
             const row = dataset.getRow();
+            if (modified_index >= 0) {
+                last_modified = Math.max(last_modified, new Date(row[modified_index]).getTime());
+            }
             let row_id_seed = datamodel.getRowPrimarykeyValues(row).join(' ');
             let primary_key_values = [];
             let html_row = this.template.replaceAll('###' + index_js_1.OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###');
@@ -82,6 +88,7 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
                     }
                     primary_key_values.push(value || "");
                 }
+                // OINOLog.debug("renderFromDbData replace field value", {field:f.name, value:value }) 
                 html_row = html_row.replaceAll('###' + f.name + '###', index_js_1.OINOStr.encode(value, index_js_1.OINOContentType.html));
             }
             html_row = html_row.replaceAll('###createHtmlFromData_temporary_oinoid###', index_js_1.OINOStr.encode(index_js_1.OINODbConfig.printOINOId(primary_key_values), index_js_1.OINOContentType.html));
@@ -89,6 +96,7 @@ class OINODbHtmlTemplate extends index_js_1.OINOHtmlTemplate {
             dataset.next();
         }
         const result = new index_js_1.OINOHttpResult(html);
+        result.lastModified = last_modified;
         return result;
     }
 }

package/dist/cjs/OINODbDataField.js

@@ -235,8 +235,11 @@ class OINONumberDataField extends OINODbDataField {
      *
      */
     deserializeCell(value) {
-        if (!value) {
-            return 0;
+        if (value === undefined) {
+            return undefined;
+        }
+        else if ((value == "") || (value == null)) {
+            return null;
         }
         else {
             return Number.parseFloat(value);

package/dist/cjs/OINODbFactory.js

@@ -101,6 +101,14 @@ class OINODbFactory {
         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;
+        }
         // OINOLog.debug("createParamsFromRequest", {params:result})
         return result;
     }

package/dist/esm/OINODbApi.js

@@ -64,8 +64,14 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
         let html = "";
         const dataset = modelset.dataset;
         const datamodel = modelset.datamodel;
+        const api = modelset.datamodel.api;
+        const modified_index = datamodel.findFieldIndexByName(api.params.cacheModifiedField || "");
+        let last_modified = this.modified;
         while (!dataset.isEof()) {
             const row = dataset.getRow();
+            if (modified_index >= 0) {
+                last_modified = Math.max(last_modified, new Date(row[modified_index]).getTime());
+            }
             let row_id_seed = datamodel.getRowPrimarykeyValues(row).join(' ');
             let primary_key_values = [];
             let html_row = this.template.replaceAll('###' + OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###');
@@ -78,6 +84,7 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
                     }
                     primary_key_values.push(value || "");
                 }
+                // OINOLog.debug("renderFromDbData replace field value", {field:f.name, value:value }) 
                 html_row = html_row.replaceAll('###' + f.name + '###', OINOStr.encode(value, OINOContentType.html));
             }
             html_row = html_row.replaceAll('###createHtmlFromData_temporary_oinoid###', OINOStr.encode(OINODbConfig.printOINOId(primary_key_values), OINOContentType.html));
@@ -85,6 +92,7 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
             dataset.next();
         }
         const result = new OINOHttpResult(html);
+        result.lastModified = last_modified;
         return result;
     }
 }

package/dist/esm/OINODbDataField.js

@@ -229,8 +229,11 @@ export class OINONumberDataField extends OINODbDataField {
      *
      */
     deserializeCell(value) {
-        if (!value) {
-            return 0;
+        if (value === undefined) {
+            return undefined;
+        }
+        else if ((value == "") || (value == null)) {
+            return null;
         }
         else {
             return Number.parseFloat(value);

package/dist/esm/OINODbFactory.js

@@ -98,6 +98,14 @@ export class OINODbFactory {
         if (result.responseType === undefined) {
             result.responseType = 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;
+        }
         // OINOLog.debug("createParamsFromRequest", {params:result})
         return result;
     }

package/dist/types/index.d.ts

@@ -36,6 +36,8 @@ export type OINODbApiParams = {
     hashidLength?: number;
     /** Make hashids static per row/table */
     hashidRandomIds?: boolean;
+    /** Name of field that has the modified field */
+    cacheModifiedField?: string;
 };
 /**
  * Database class (constructor) type
@@ -88,6 +90,10 @@ export type OINODbApiRequestParams = {
     responseType?: OINOContentType;
     /** Multipart boundary token */
     multipartBoundary?: string;
+    /** Request last-modified value */
+    lastModified?: number;
+    /** Request etag values */
+    etags?: string[];
     /** SQL parameters */
     sqlParams?: OINODbSqlParams;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "OINO TS library package for publishing an SQL database tables as a REST API.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -20,7 +20,7 @@
   "types": "./dist/types/index.d.ts",
   "dependencies": {
     "@types/node": "^20.14.10",
-    "@oino-ts/types": "0.0.12"
+    "@oino-ts/types": "0.0.13"
   },
   "devDependencies": {
     "@types/bun": "latest",

package/src/OINODbApi.ts

@@ -71,8 +71,15 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
         let html:string = ""
         const dataset:OINODbDataSet|undefined = modelset.dataset
         const datamodel:OINODbDataModel = modelset.datamodel
+        const api:OINODbApi = modelset.datamodel.api
+        const modified_index = datamodel.findFieldIndexByName(api.params.cacheModifiedField || "")
+        let last_modified:number = this.modified
+        
         while (!dataset.isEof()) {
             const row:OINODataRow = dataset.getRow()
+            if (modified_index >= 0) {
+                last_modified = Math.max(last_modified, new Date(row[modified_index] as Date).getTime())
+            }
             let row_id_seed:string = datamodel.getRowPrimarykeyValues(row).join(' ')
             let primary_key_values:string[] = []
             let html_row:string = this.template.replaceAll('###' + OINODbConfig.OINODB_ID_FIELD + '###', '###createHtmlFromData_temporary_oinoid###')
@@ -85,6 +92,7 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
                     }
                     primary_key_values.push(value || "")
                 }
+                // OINOLog.debug("renderFromDbData replace field value", {field:f.name, value:value }) 
                 html_row = html_row.replaceAll('###' + f.name + '###', OINOStr.encode(value, OINOContentType.html))
             }
             html_row = html_row.replaceAll('###createHtmlFromData_temporary_oinoid###', OINOStr.encode(OINODbConfig.printOINOId(primary_key_values), OINOContentType.html)) 
@@ -92,6 +100,7 @@ export class OINODbHtmlTemplate extends OINOHtmlTemplate {
             dataset.next()
         }
         const result:OINOHttpResult = new OINOHttpResult(html)
+        result.lastModified = last_modified
         return result
     }
 

package/src/OINODbDataField.ts

@@ -248,10 +248,12 @@ export class OINONumberDataField extends OINODbDataField {
      *
      */
     deserializeCell(value: string|null|undefined): OINODataCell {
-        if (!value) { 
-            return 0
+        if (value === undefined) { 
+            return undefined
+        } else if ((value == "") || (value == null)) {
+            return null
         } else {
-            return Number.parseFloat(value)
+            return Number.parseFloat(value) 
         }
     }
 }

package/src/OINODbFactory.ts

@@ -106,6 +106,14 @@ export class OINODbFactory {
         if (result.responseType === undefined) {
             result.responseType = 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
+        }
 
         // OINOLog.debug("createParamsFromRequest", {params:result})
         return result

package/src/index.ts

@@ -39,7 +39,9 @@ export type OINODbApiParams = {
     /** Set (minimum) length (12-32 chars) of the hashids */
     hashidLength?:number,
     /** Make hashids static per row/table */
-    hashidRandomIds?: boolean
+    hashidRandomIds?: boolean,
+    /** Name of field that has the modified field */
+    cacheModifiedField?:string
 }
 
 /** 
@@ -98,6 +100,10 @@ export type OINODbApiRequestParams = {
     responseType?:OINOContentType
     /** Multipart boundary token */
     multipartBoundary?:string
+    /** Request last-modified value */
+    lastModified?:number
+    /** Request etag values */
+    etags?:string[]
     /** SQL parameters */
     sqlParams?:OINODbSqlParams
 }