@oino-ts/db 0.13.1 → 0.13.4

package/dist/cjs/OINODbDataModel.js

@@ -12,7 +12,7 @@ const index_js_1 = require("./index.js");
  *
  */
 class OINODbDataModel {
-    _columnLookup;
+    _fieldIndexLookup;
     /** Database refererence of the table */
     api;
     /** Field refererences of the API */
@@ -25,7 +25,7 @@ class OINODbDataModel {
      *
      */
     constructor(api) {
-        this._columnLookup = {};
+        this._fieldIndexLookup = {};
         this.api = api;
         this.fields = [];
     }
@@ -116,7 +116,7 @@ class OINODbDataModel {
      */
     addField(field) {
         this.fields.push(field);
-        this._columnLookup[field.name] = this.fields.length - 1;
+        this._fieldIndexLookup[field.name] = this.fields.length - 1;
     }
     /**
      * Find a field of a given name if any.
@@ -125,7 +125,7 @@ class OINODbDataModel {
      *
      */
     findFieldByName(name) {
-        const i = this._columnLookup[name];
+        const i = this._fieldIndexLookup[name];
         if (i >= 0) {
             return this.fields[i];
         }
@@ -140,7 +140,7 @@ class OINODbDataModel {
      *
      */
     findFieldIndexByName(name) {
-        const i = this._columnLookup[name];
+        const i = this._fieldIndexLookup[name];
         if (i >= 0) {
             return i;
         }

package/dist/cjs/OINODbModelSet.js

@@ -238,6 +238,9 @@ class OINODbModelSet {
         let result = {};
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
+            if (f.fieldParams.isPrimaryKey) {
+                primary_key_values.push(f.serializeCell(row[i]) || "");
+            }
             if (this.sqlParams?.select?.isSelected(f) === false) {
                 continue;
             }
@@ -305,13 +308,16 @@ class OINODbModelSet {
     /**
      * Export all rows as a record with OINOId as key and object with row cells as values.
      *
+     * @param idFieldName optional field name to use as key instead of OINOId
      */
-    async exportAsRecord() {
+    async exportAsRecord(idFieldName) {
         const result = {};
+        const row_id_field = idFieldName || index_js_1.OINODbConfig.OINODB_ID_FIELD;
         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;
+            const row_id = row_export[row_id_field];
+            result[row_id] = row_export;
             await this.dataset.next();
         }
         return result;

package/dist/esm/OINODbDataModel.js

@@ -9,7 +9,7 @@ import { OINO_ERROR_PREFIX, OINODbConfig, OINONumberDataField, OINODB_UNDEFINED
  *
  */
 export class OINODbDataModel {
-    _columnLookup;
+    _fieldIndexLookup;
     /** Database refererence of the table */
     api;
     /** Field refererences of the API */
@@ -22,7 +22,7 @@ export class OINODbDataModel {
      *
      */
     constructor(api) {
-        this._columnLookup = {};
+        this._fieldIndexLookup = {};
         this.api = api;
         this.fields = [];
     }
@@ -113,7 +113,7 @@ export class OINODbDataModel {
      */
     addField(field) {
         this.fields.push(field);
-        this._columnLookup[field.name] = this.fields.length - 1;
+        this._fieldIndexLookup[field.name] = this.fields.length - 1;
     }
     /**
      * Find a field of a given name if any.
@@ -122,7 +122,7 @@ export class OINODbDataModel {
      *
      */
     findFieldByName(name) {
-        const i = this._columnLookup[name];
+        const i = this._fieldIndexLookup[name];
         if (i >= 0) {
             return this.fields[i];
         }
@@ -137,7 +137,7 @@ export class OINODbDataModel {
      *
      */
     findFieldIndexByName(name) {
-        const i = this._columnLookup[name];
+        const i = this._fieldIndexLookup[name];
         if (i >= 0) {
             return i;
         }

package/dist/esm/OINODbModelSet.js

@@ -235,6 +235,9 @@ export class OINODbModelSet {
         let result = {};
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
+            if (f.fieldParams.isPrimaryKey) {
+                primary_key_values.push(f.serializeCell(row[i]) || "");
+            }
             if (this.sqlParams?.select?.isSelected(f) === false) {
                 continue;
             }
@@ -302,13 +305,16 @@ export class OINODbModelSet {
     /**
      * Export all rows as a record with OINOId as key and object with row cells as values.
      *
+     * @param idFieldName optional field name to use as key instead of OINOId
      */
-    async exportAsRecord() {
+    async exportAsRecord(idFieldName) {
         const result = {};
+        const row_id_field = idFieldName || OINODbConfig.OINODB_ID_FIELD;
         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;
+            const row_id = row_export[row_id_field];
+            result[row_id] = row_export;
             await this.dataset.next();
         }
         return result;

package/dist/types/OINODbDataModel.d.ts

@@ -4,7 +4,7 @@ import { OINODbDataField, OINODbApi, OINODataRow, OINODbDataFieldFilter, OINODbS
  *
  */
 export declare class OINODbDataModel {
-    private _columnLookup;
+    private _fieldIndexLookup;
     /** Database refererence of the table */
     readonly api: OINODbApi;
     /** Field refererences of the API */

package/dist/types/OINODbModelSet.d.ts

@@ -55,6 +55,7 @@ export declare class OINODbModelSet {
     /**
      * Export all rows as a record with OINOId as key and object with row cells as values.
      *
+     * @param idFieldName optional field name to use as key instead of OINOId
      */
-    exportAsRecord(): Promise<Record<string, any>>;
+    exportAsRecord(idFieldName?: string): Promise<Record<string, any>>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db",
-  "version": "0.13.1",
+  "version": "0.13.4",
   "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.13.1",
+    "@oino-ts/common": "0.13.4",
     "oino-ts": "file:.."
   },
   "devDependencies": {
-    "@oino-ts/types": "0.13.1",
+    "@oino-ts/types": "0.13.4",
     "@types/bun": "^1.1.14",
     "@types/node": "^20.14.10",
     "typescript": "~5.9.0"

package/src/OINODbDataModel.ts

@@ -11,7 +11,7 @@ import { OINODbDataField, OINODbApi, OINODataRow, OINO_ERROR_PREFIX, OINODbDataF
  *
  */
 export class OINODbDataModel {
-    private _columnLookup:Record<string, number>;
+    private _fieldIndexLookup:Record<string, number>;
 
     /** Database refererence of the table */
     readonly api:OINODbApi 
@@ -27,7 +27,7 @@ export class OINODbDataModel {
      *
      */
     constructor(api:OINODbApi) {
-        this._columnLookup = {}
+        this._fieldIndexLookup = {}
         this.api = api
         this.fields = []
     }
@@ -122,7 +122,7 @@ export class OINODbDataModel {
      */
     addField(field:OINODbDataField) {
         this.fields.push(field)
-        this._columnLookup[field.name] = this.fields.length-1
+        this._fieldIndexLookup[field.name] = this.fields.length-1
     }
 
     /**
@@ -132,7 +132,7 @@ export class OINODbDataModel {
      *
      */
     findFieldByName(name:string):OINODbDataField|null {
-        const i:number = this._columnLookup[name]
+        const i:number = this._fieldIndexLookup[name]
         if (i >= 0) {
             return this.fields[i]
         } else {
@@ -147,7 +147,7 @@ export class OINODbDataModel {
      *
      */
     findFieldIndexByName(name:string):number {
-        const i:number = this._columnLookup[name]
+        const i:number = this._fieldIndexLookup[name]
         if (i >= 0) {
             return i
         } else {

package/src/OINODbModelSet.ts

@@ -256,6 +256,9 @@ export class OINODbModelSet {
         let result:any = {}
         for (let i=0; i<fields.length; i++) {
             const f = fields[i]
+            if (f.fieldParams.isPrimaryKey) {
+                primary_key_values.push(f.serializeCell(row[i]) || "")
+            }
             if (this.sqlParams?.select?.isSelected(f) === false) {
                 continue
             }
@@ -326,15 +329,18 @@ export class OINODbModelSet {
 
     /**
      * Export all rows as a record with OINOId as key and object with row cells as values.
-     *
+     * 
+     * @param idFieldName optional field name to use as key instead of OINOId
      */
 
-    async exportAsRecord():Promise<Record<string, any>> {
+    async exportAsRecord(idFieldName?:string):Promise<Record<string, any>> {
         const result:Record<string, any> = {}
+        const row_id_field = idFieldName || OINODbConfig.OINODB_ID_FIELD
         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
+            const row_id = row_export[row_id_field]
+            result[row_id] = row_export
             await this.dataset.next()
         }
         return result