@oino-ts/common 1.0.1 → 1.0.2

package/dist/cjs/OINOApi.js

@@ -293,7 +293,7 @@ class OINOApi {
         this.datasource = datasource;
         this.params = params;
         if (this.params.hashidKey) {
-            this.hashid = new hashid_1.OINOHashid(this.params.hashidKey, this.params.apiName, this.params.hashidLength, this.params.hashidStaticIds);
+            this.hashid = new hashid_1.OINOHashid(this.params.hashidKey, this.params.hashidDomain || this.params.apiName, this.params.hashidLength, this.params.hashidStaticIds);
         }
         else {
             this.hashid = null;

package/dist/cjs/OINODataField.js

@@ -79,10 +79,10 @@ class OINODataField {
         return this.datasource.printCellAsValue(cellVal, this.nativeType);
     }
     /**
-     * Print name of column as SQL.
+     * Print name of the field in datasource specific format.
      *
      */
-    printColumnName() {
+    printFieldName() {
         return this.datasource.printColumnName(this.name);
     }
 }

package/dist/esm/OINOApi.js

@@ -287,7 +287,7 @@ export class OINOApi {
         this.datasource = datasource;
         this.params = params;
         if (this.params.hashidKey) {
-            this.hashid = new OINOHashid(this.params.hashidKey, this.params.apiName, this.params.hashidLength, this.params.hashidStaticIds);
+            this.hashid = new OINOHashid(this.params.hashidKey, this.params.hashidDomain || this.params.apiName, this.params.hashidLength, this.params.hashidStaticIds);
         }
         else {
             this.hashid = null;

package/dist/esm/OINODataField.js

@@ -76,10 +76,10 @@ export class OINODataField {
         return this.datasource.printCellAsValue(cellVal, this.nativeType);
     }
     /**
-     * Print name of column as SQL.
+     * Print name of the field in datasource specific format.
      *
      */
-    printColumnName() {
+    printFieldName() {
         return this.datasource.printColumnName(this.name);
     }
 }

package/dist/types/OINOApi.d.ts

@@ -38,6 +38,8 @@ export type OINOApiParams = {
     hashidLength?: number;
     /** Make hashids static per row/table */
     hashidStaticIds?: boolean;
+    /** Defaults to api name but should be set to a domain unique value among those apis that need hashids to be compatible (e.g. hashid of a foreign key works in the main api)  */
+    hashidDomain?: string;
     /** Name of field that has the modified field */
     cacheModifiedField?: string;
     /** Return inserted id values */

package/dist/types/OINODataField.d.ts

@@ -51,10 +51,10 @@ export declare class OINODataField {
      */
     printCellAsValue(cellVal: OINODataCell): string;
     /**
-     * Print name of column as SQL.
+     * Print name of the field in datasource specific format.
      *
      */
-    printColumnName(): string;
+    printFieldName(): string;
 }
 /**
  * Specialised class for a string column.

package/dist/types/OINODataSource.d.ts

@@ -25,28 +25,21 @@ export declare abstract class OINODataSource {
      */
     abstract disconnect(): Promise<void>;
     /**
-     * Print a table name using database specific SQL escaping.
+     * Print a column name with correct datasource specific formatting.
      *
-     * @param sqlTable name of the table
+     * @param column name of the column
      *
      */
-    abstract printTableName(sqlTable: string): string;
-    /**
-     * Print a column name with correct SQL escaping.
-     *
-     * @param sqlColumn name of the column
-     *
-     */
-    abstract printColumnName(sqlColumn: string): string;
+    abstract printColumnName(column: string): string;
     /**
      * Print a single data value from serialization using the context of the native data
      * type with the correct SQL escaping.
      *
      * @param cellValue data from sql results
-     * @param sqlType native type name for table column
+     * @param nativeType native type name for table column
      *
      */
-    abstract printCellAsValue(cellValue: OINODataCell, sqlType: string): string;
+    abstract printCellAsValue(cellValue: OINODataCell, nativeType: string): string;
     /**
      * Print a single string value as valid sql literal
      *
@@ -59,10 +52,10 @@ export declare abstract class OINODataSource {
      * type.
      *
      * @param sqlValue data from serialization
-     * @param sqlType native type name for table column
+     * @param nativeType native type name for table column
      *
      */
-    abstract parseValueAsCell(sqlValue: OINODataCell, sqlType: string): OINODataCell;
+    abstract parseValueAsCell(sqlValue: OINODataCell, nativeType: string): OINODataCell;
     /**
      * Initialize a data model by getting the SQL schema and populating OINODataFields of
      * the model.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/common",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "OINO TS package for common classes.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -19,7 +19,7 @@
   "dependencies": {
   },
   "devDependencies": {
-    "@oino-ts/types": "1.0.1",
+    "@oino-ts/types": "1.0.2",
     "@types/node": "^22.0.0",
     "typescript": "~5.9.0"
   },

package/src/OINOApi.ts

@@ -41,6 +41,8 @@ export type OINOApiParams = {
     hashidLength?:number,
     /** Make hashids static per row/table */
     hashidStaticIds?: boolean,
+    /** Defaults to api name but should be set to a domain unique value among those apis that need hashids to be compatible (e.g. hashid of a foreign key works in the main api)  */
+    hashidDomain?: string, 
     /** Name of field that has the modified field */
     cacheModifiedField?:string,
     /** Return inserted id values */
@@ -350,7 +352,7 @@ export abstract class OINOApi {
         this.params = params
 
         if (this.params.hashidKey) {
-            this.hashid = new OINOHashid(this.params.hashidKey, this.params.apiName, this.params.hashidLength, this.params.hashidStaticIds)
+            this.hashid = new OINOHashid(this.params.hashidKey, this.params.hashidDomain || this.params.apiName, this.params.hashidLength, this.params.hashidStaticIds)
         } else {
             this.hashid = null
         }

package/src/OINODataField.ts

@@ -89,10 +89,10 @@ export class OINODataField {
     }
 
     /**
-     * Print name of column as SQL.
+     * Print name of the field in datasource specific format.
      * 
      */
-    printColumnName():string {
+    printFieldName():string {
         return this.datasource.printColumnName(this.name)
     }
 }

package/src/OINODataSource.ts

@@ -31,30 +31,22 @@ export abstract class OINODataSource {
     abstract disconnect(): Promise<void>    
 
     /**
-     * Print a table name using database specific SQL escaping.
+     * Print a column name with correct datasource specific formatting.
      * 
-     * @param sqlTable name of the table
+     * @param column name of the column
      *
      */
-    abstract printTableName(sqlTable:string): string
-
-    /**
-     * Print a column name with correct SQL escaping.
-     * 
-     * @param sqlColumn name of the column
-     *
-     */
-    abstract printColumnName(sqlColumn:string): string
+    abstract printColumnName(column:string): string
 
     /**
      * Print a single data value from serialization using the context of the native data
      * type with the correct SQL escaping.
      * 
      * @param cellValue data from sql results
-     * @param sqlType native type name for table column
+     * @param nativeType native type name for table column
      *
      */
-    abstract printCellAsValue(cellValue:OINODataCell, sqlType: string): string
+    abstract printCellAsValue(cellValue:OINODataCell, nativeType: string): string
 
     /**
      * Print a single string value as valid sql literal
@@ -69,10 +61,10 @@ export abstract class OINODataSource {
      * type.
      * 
      * @param sqlValue data from serialization
-     * @param sqlType native type name for table column
+     * @param nativeType native type name for table column
      * 
      */
-    abstract parseValueAsCell(sqlValue:OINODataCell, sqlType: string): OINODataCell
+    abstract parseValueAsCell(sqlValue:OINODataCell, nativeType: string): OINODataCell
     
     /**
      * Initialize a data model by getting the SQL schema and populating OINODataFields of