@oino-ts/db 0.12.2 → 0.13.1

package/dist/cjs/OINODbDataField.js

@@ -280,14 +280,18 @@ class OINOBlobDataField extends OINODbDataField {
      *
      */
     serializeCell(cellVal) {
+        // console.log("OINOBlobDataField.serializeCell: cellVal", cellVal, typeof(cellVal))
         if ((cellVal === null) || (cellVal === undefined)) {
             return cellVal;
         }
+        else if (cellVal instanceof Buffer) {
+            return cellVal.toString('base64');
+        }
         else if (cellVal instanceof Uint8Array) {
             return Buffer.from(cellVal).toString('base64');
         }
         else {
-            return cellVal.toString();
+            return this.db.parseSqlValueAsCell(cellVal, this.sqlType)?.toString();
         }
     }
     /**

package/dist/cjs/OINODbModelSet.js

@@ -63,7 +63,7 @@ class OINODbModelSet {
             }
             let value = f.serializeCell(row[i]);
             if (value === undefined) {
-                index_js_1.OINOLog.info("@oino-ts/db", "OINODbModelSet", "_writeRowJson", "Undefined value skipped", { field_name: f.name });
+                // skip undefined values
             }
             else if (value === null) {
                 json_row += "," + index_js_1.OINOStr.encode(f.name, index_js_1.OINOContentType.json) + ":null";
@@ -229,6 +229,32 @@ class OINODbModelSet {
         }
         return result;
     }
+    _exportRow(row) {
+        // console.log("OINODbModelSet._exportRow: row=" + row)
+        const model = this.datamodel;
+        const fields = model.fields;
+        let row_id_seed = model.getRowPrimarykeyValues(row).join(' ');
+        let primary_key_values = [];
+        let result = {};
+        for (let i = 0; i < fields.length; i++) {
+            const f = fields[i];
+            if (this.sqlParams?.select?.isSelected(f) === false) {
+                continue;
+            }
+            let value = f.db.parseSqlValueAsCell(row[i], f.sqlType); // retain original value without serialization
+            if (value === undefined) {
+                // skip undefined values
+            }
+            else if (value === null) { // differentiate null and undefined
+                result[f.name] = null;
+            }
+            else {
+                result[f.name] = value;
+            }
+        }
+        result[index_js_1.OINODbConfig.OINODB_ID_FIELD] = index_js_1.OINODbConfig.printOINOId(primary_key_values);
+        return result;
+    }
     /**
      * Serialize model set in the given format.
      *
@@ -276,5 +302,19 @@ class OINODbModelSet {
         }
         return result;
     }
+    /**
+     * Export all rows as a record with OINOId as key and object with row cells as values.
+     *
+     */
+    async exportAsRecord() {
+        const result = {};
+        while (!this.dataset.isEof()) {
+            const row_data = this.dataset.getRow();
+            const row_export = this._exportRow(row_data);
+            result[row_export[index_js_1.OINODbConfig.OINODB_ID_FIELD]] = row_export;
+            await this.dataset.next();
+        }
+        return result;
+    }
 }
 exports.OINODbModelSet = OINODbModelSet;

package/dist/esm/OINODbDataField.js

@@ -273,14 +273,18 @@ export class OINOBlobDataField extends OINODbDataField {
      *
      */
     serializeCell(cellVal) {
+        // console.log("OINOBlobDataField.serializeCell: cellVal", cellVal, typeof(cellVal))
         if ((cellVal === null) || (cellVal === undefined)) {
             return cellVal;
         }
+        else if (cellVal instanceof Buffer) {
+            return cellVal.toString('base64');
+        }
         else if (cellVal instanceof Uint8Array) {
             return Buffer.from(cellVal).toString('base64');
         }
         else {
-            return cellVal.toString();
+            return this.db.parseSqlValueAsCell(cellVal, this.sqlType)?.toString();
         }
     }
     /**

package/dist/esm/OINODbModelSet.js

@@ -60,7 +60,7 @@ export class OINODbModelSet {
             }
             let value = f.serializeCell(row[i]);
             if (value === undefined) {
-                OINOLog.info("@oino-ts/db", "OINODbModelSet", "_writeRowJson", "Undefined value skipped", { field_name: f.name });
+                // skip undefined values
             }
             else if (value === null) {
                 json_row += "," + OINOStr.encode(f.name, OINOContentType.json) + ":null";
@@ -226,6 +226,32 @@ export class OINODbModelSet {
         }
         return result;
     }
+    _exportRow(row) {
+        // console.log("OINODbModelSet._exportRow: row=" + row)
+        const model = this.datamodel;
+        const fields = model.fields;
+        let row_id_seed = model.getRowPrimarykeyValues(row).join(' ');
+        let primary_key_values = [];
+        let result = {};
+        for (let i = 0; i < fields.length; i++) {
+            const f = fields[i];
+            if (this.sqlParams?.select?.isSelected(f) === false) {
+                continue;
+            }
+            let value = f.db.parseSqlValueAsCell(row[i], f.sqlType); // retain original value without serialization
+            if (value === undefined) {
+                // skip undefined values
+            }
+            else if (value === null) { // differentiate null and undefined
+                result[f.name] = null;
+            }
+            else {
+                result[f.name] = value;
+            }
+        }
+        result[OINODbConfig.OINODB_ID_FIELD] = OINODbConfig.printOINOId(primary_key_values);
+        return result;
+    }
     /**
      * Serialize model set in the given format.
      *
@@ -273,4 +299,18 @@ export class OINODbModelSet {
         }
         return result;
     }
+    /**
+     * Export all rows as a record with OINOId as key and object with row cells as values.
+     *
+     */
+    async exportAsRecord() {
+        const result = {};
+        while (!this.dataset.isEof()) {
+            const row_data = this.dataset.getRow();
+            const row_export = this._exportRow(row_data);
+            result[row_export[OINODbConfig.OINODB_ID_FIELD]] = row_export;
+            await this.dataset.next();
+        }
+        return result;
+    }
 }

package/dist/types/OINODbModelSet.d.ts

@@ -35,6 +35,7 @@ export declare class OINODbModelSet {
     private _writeStringFormdata;
     private _writeRowUrlencode;
     private _writeStringUrlencode;
+    private _exportRow;
     /**
      * Serialize model set in the given format.
      *
@@ -51,4 +52,9 @@ export declare class OINODbModelSet {
      *
      */
     getValueByFieldName(fieldName: string, serialize?: boolean): OINODataCell;
+    /**
+     * Export all rows as a record with OINOId as key and object with row cells as values.
+     *
+     */
+    exportAsRecord(): Promise<Record<string, any>>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db",
-  "version": "0.12.2",
+  "version": "0.13.1",
   "description": "OINO TS library package for publishing an SQL database tables as a REST API.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -19,11 +19,11 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/common": "0.12.2",
+    "@oino-ts/common": "0.13.1",
     "oino-ts": "file:.."
   },
   "devDependencies": {
-    "@oino-ts/types": "0.12.2",
+    "@oino-ts/types": "0.13.1",
     "@types/bun": "^1.1.14",
     "@types/node": "^20.14.10",
     "typescript": "~5.9.0"

package/src/OINODbApi.test.ts

@@ -108,6 +108,7 @@ const OWASP_TESTS:OINOTestParams[] = [
 const API_CROSSCHECKS:string[] = [
     "[HTTP GET] select *: GET JSON 1",
     "[HTTP GET] select * with template: GET HTML 1",
+    "[HTTP GET] select *: GET RECORD 1",
     "[HTTP POST] insert: GET JSON 1",
     "[HTTP POST] insert: GET CSV 1",
     "[HTTP PUT] update JSON: GET JSON 1",
@@ -127,6 +128,7 @@ const OWASP_CROSSCHECKS:string[] = [
 Math.random()
 
 OINOLog.setInstance(new OINOConsoleLog(OINOLogLevel.warning))
+// OINOLog.setLogLevel(OINOLogLevel.debug, "@oino-ts/db-mssql", "OINODbMsSql", "printSqlSelect")
 OINODbFactory.registerDb("OINODbBunSqlite", OINODbBunSqlite)
 OINODbFactory.registerDb("OINODbPostgresql", OINODbPostgresql)
 OINODbFactory.registerDb("OINODbMariadb", OINODbMariadb)
@@ -218,6 +220,10 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
         expect(encodeData(await (await api.doRequest("GET", "", "", empty_params)).data?.writeString(OINOContentType.csv))).toMatchSnapshot("GET CSV")
     })
 
+    await test(target_name + target_db + target_table + target_group + " select *", async () => {
+        expect(encodeData(JSON.stringify(await (await api.doRequest("GET", "", "", empty_params)).data?.exportAsRecord()))).toMatchSnapshot("GET RECORD")
+    })
+
     await test(target_name + target_db + target_table + target_group + " select * with template", async () => {
         const template = createApiTemplate(api)
         const api_result:OINODbApiResult = await api.doRequest("GET", "", "", empty_params)
@@ -228,6 +234,7 @@ export async function OINOTestApi(dbParams:OINODbParams, testParams: OINOTestPar
     await test(target_name + target_db + target_table + target_group + " select * with filter", async () => {
         expect(encodeData(await (await api.doRequest("GET", "", "", request_params_with_filters)).data?.writeString())).toMatchSnapshot("GET JSON FILTER")
     })
+
     
     // remove filter so it does not affect rest of the tests
     request_params.sqlParams.filter = undefined 

package/src/OINODbDataField.ts

@@ -292,14 +292,18 @@ export class OINOBlobDataField extends OINODbDataField {
      *
      */
     serializeCell(cellVal: OINODataCell):string|null|undefined {
+        // console.log("OINOBlobDataField.serializeCell: cellVal", cellVal, typeof(cellVal))
         if ((cellVal === null) || (cellVal === undefined))  {
             return cellVal
 
+        } else if (cellVal instanceof Buffer) {
+            return cellVal.toString('base64')
+
         } else if (cellVal instanceof Uint8Array) {
-            return Buffer.from(cellVal as Uint8Array).toString('base64')
+            return Buffer.from(cellVal).toString('base64')
 
         } else {
-            return cellVal.toString()
+            return this.db.parseSqlValueAsCell(cellVal, this.sqlType)?.toString()
         }
     }
 

package/src/OINODbModelSet.ts

@@ -69,7 +69,7 @@ export class OINODbModelSet {
             }
             let value:string|null|undefined = f.serializeCell(row[i])
             if (value === undefined) {
-                OINOLog.info("@oino-ts/db", "OINODbModelSet", "_writeRowJson", "Undefined value skipped", {field_name:f.name})
+                // skip undefined values
 
             } else if (value === null) {
                 json_row += "," + OINOStr.encode(f.name, OINOContentType.json) + ":null"
@@ -247,6 +247,34 @@ export class OINODbModelSet {
         return result
     }
 
+    private _exportRow(row:OINODataRow):any {
+        // console.log("OINODbModelSet._exportRow: row=" + row)
+        const model:OINODbDataModel = this.datamodel
+        const fields:OINODbDataField[] = model.fields
+        let row_id_seed:string = model.getRowPrimarykeyValues(row).join(' ')
+        let primary_key_values:string[] = []
+        let result:any = {}
+        for (let i=0; i<fields.length; i++) {
+            const f = fields[i]
+            if (this.sqlParams?.select?.isSelected(f) === false) {
+                continue
+            }
+            let value:OINODataCell = f.db.parseSqlValueAsCell(row[i], f.sqlType) // retain original value without serialization
+            if (value === undefined) {
+                // skip undefined values
+                
+            } else if (value === null) { // differentiate null and undefined
+                result[f.name] = null
+
+            } else {
+                result[f.name] = value
+            }
+        }
+        result[OINODbConfig.OINODB_ID_FIELD] = OINODbConfig.printOINOId(primary_key_values)
+        return result
+    }
+
+
     /**
      * Serialize model set in the given format.
      * 
@@ -295,5 +323,21 @@ export class OINODbModelSet {
         }
         return result
     }
-}
 
+    /**
+     * Export all rows as a record with OINOId as key and object with row cells as values.
+     *
+     */
+
+    async exportAsRecord():Promise<Record<string, any>> {
+        const result:Record<string, any> = {}
+        while (!this.dataset.isEof()) {
+            const row_data:OINODataRow = this.dataset.getRow()
+            const row_export = this._exportRow(row_data)
+            result[row_export[OINODbConfig.OINODB_ID_FIELD]] = row_export
+            await this.dataset.next()
+        }
+        return result
+    }
+
+}