@oino-ts/common 1.0.0 → 1.0.2

package/dist/cjs/OINOApi.js

@@ -233,13 +233,22 @@ class OINOApiHtmlTemplate extends OINOHtmlTemplate_js_1.OINOHtmlTemplate {
                 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 encoded_primary_key_values = [];
             this.clearVariables();
             this.setVariableFromValue(OINOConfig_js_1.OINOConfig.OINO_ID_FIELD, "");
             for (let i = 0; i < datamodel.fields.length; i++) {
                 const f = datamodel.fields[i];
                 let value;
-                if ((f instanceof OINODataField_js_1.OINODatetimeDataField) && (this._locale != null)) {
+                if (f.fieldParams.isPrimaryKey || f.fieldParams.isForeignKey) {
+                    value = f.serializeCell(row[i]);
+                    if (value && (f instanceof OINODataField_js_1.OINONumberDataField) && (datamodel.api.hashid)) {
+                        value = datamodel.api.hashid.encode(value, f.name + " " + row_id_seed);
+                    }
+                    if (f.fieldParams.isPrimaryKey) {
+                        encoded_primary_key_values.push(value || "");
+                    }
+                }
+                else if ((f instanceof OINODataField_js_1.OINODatetimeDataField) && (this._locale != null)) {
                     value = f.serializeCellWithLocale(row[i], this._locale);
                 }
                 else if ((f instanceof OINODataField_js_1.OINONumberDataField) && (this._numberDecimals >= 0) && (typeof row[i] === "number")) {
@@ -249,18 +258,10 @@ class OINOApiHtmlTemplate extends OINOHtmlTemplate_js_1.OINOHtmlTemplate {
                 else {
                     value = f.serializeCell(row[i]);
                 }
-                if (f.fieldParams.isPrimaryKey || f.fieldParams.isForeignKey) {
-                    if (value && (f instanceof OINODataField_js_1.OINONumberDataField) && (datamodel.api.hashid)) {
-                        value = datamodel.api.hashid.encode(value, f.name + " " + row_id_seed);
-                    }
-                    if (f.fieldParams.isPrimaryKey) {
-                        primary_key_values.push(value || "");
-                    }
-                }
                 this.setVariableFromValue(f.name, value || "");
             }
             this.setVariableFromProperties(overrideValues);
-            this.setVariableFromValue(OINOConfig_js_1.OINOConfig.OINO_ID_FIELD, OINOConfig_js_1.OINOConfig.printOINOId(primary_key_values));
+            this.setVariableFromValue(OINOConfig_js_1.OINOConfig.OINO_ID_FIELD, OINOConfig_js_1.OINOConfig.printOINOId(encoded_primary_key_values));
             html += this._renderHtml() + "\r\n";
             await dataset.next();
         }
@@ -292,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/cjs/OINOModelSet.js

@@ -40,14 +40,14 @@ class OINOModelSet {
         this.queryParams = queryParams;
         this.errors = this.dataset.messages;
     }
-    _encodeAndHashFieldValue(field, value, contentType, primaryKeyValues, rowIdSeed) {
+    _encodeAndHashFieldValue(field, value, contentType, primaryKeyValuesEncoded, rowIdSeed) {
         let result;
         if (field.fieldParams.isPrimaryKey || field.fieldParams.isForeignKey) {
             if (value && (field instanceof OINODataField_js_1.OINONumberDataField) && (this.datamodel.api.hashid) && ((this.queryParams?.aggregate === undefined) || (this.queryParams.aggregate.isAggregated(field.name) == false))) {
                 value = this.datamodel.api.hashid.encode(value, rowIdSeed);
             }
             if (field.fieldParams.isPrimaryKey) {
-                primaryKeyValues.push(value || "");
+                primaryKeyValuesEncoded.push(value || "");
             }
         }
         result = OINOStr_js_1.OINOStr.encode(value, contentType);
@@ -58,7 +58,7 @@ class OINOModelSet {
         const model = this.datamodel;
         const fields = model.fields;
         let row_id_seed = model.getRowPrimarykeyValues(row).join(' ');
-        let primary_key_values = [];
+        let encoded_primary_key_values = [];
         let json_row = "";
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
@@ -75,14 +75,14 @@ class OINOModelSet {
             else {
                 let is_hashed = (f.fieldParams.isPrimaryKey || f.fieldParams.isForeignKey) && (f instanceof OINODataField_js_1.OINONumberDataField) && (this.datamodel.api.hashid != null);
                 let is_value = (f instanceof OINODataField_js_1.OINOBooleanDataField) || ((f instanceof OINODataField_js_1.OINONumberDataField) && !is_hashed);
-                value = this._encodeAndHashFieldValue(f, value, OINOConstants_js_1.OINOContentType.json, primary_key_values, f.name + " " + row_id_seed);
+                value = this._encodeAndHashFieldValue(f, value, OINOConstants_js_1.OINOContentType.json, encoded_primary_key_values, f.name + " " + row_id_seed);
                 if (is_value) {
                     value = value.substring(1, value.length - 1);
                 }
                 json_row += "," + OINOStr_js_1.OINOStr.encode(f.name, OINOConstants_js_1.OINOContentType.json) + ":" + value;
             }
         }
-        json_row = OINOStr_js_1.OINOStr.encode(OINOConfig_js_1.OINOConfig.OINO_ID_FIELD, OINOConstants_js_1.OINOContentType.json) + ":" + OINOStr_js_1.OINOStr.encode(OINOConfig_js_1.OINOConfig.printOINOId(primary_key_values), OINOConstants_js_1.OINOContentType.json) + json_row;
+        json_row = OINOStr_js_1.OINOStr.encode(OINOConfig_js_1.OINOConfig.OINO_ID_FIELD, OINOConstants_js_1.OINOContentType.json) + ":" + OINOStr_js_1.OINOStr.encode(OINOConfig_js_1.OINOConfig.printOINOId(encoded_primary_key_values), OINOConstants_js_1.OINOContentType.json) + json_row;
         return "{" + json_row + "}";
     }
     async _writeStringJson() {
@@ -114,7 +114,7 @@ class OINOModelSet {
         const model = this.datamodel;
         const fields = model.fields;
         let row_id_seed = model.getRowPrimarykeyValues(row).join(' ');
-        let primary_key_values = [];
+        let encoded_primary_key_values = [];
         let csv_row = "";
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
@@ -126,11 +126,11 @@ class OINOModelSet {
                 csv_row += "," + OINOStr_js_1.OINOStr.encode(value, OINOConstants_js_1.OINOContentType.csv); // either null or undefined
             }
             else {
-                value = this._encodeAndHashFieldValue(f, value, OINOConstants_js_1.OINOContentType.csv, primary_key_values, f.name + " " + row_id_seed);
+                value = this._encodeAndHashFieldValue(f, value, OINOConstants_js_1.OINOContentType.csv, encoded_primary_key_values, f.name + " " + row_id_seed);
                 csv_row += "," + value;
             }
         }
-        csv_row = OINOStr_js_1.OINOStr.encode(OINOConfig_js_1.OINOConfig.printOINOId(primary_key_values), OINOConstants_js_1.OINOContentType.csv) + csv_row;
+        csv_row = OINOStr_js_1.OINOStr.encode(OINOConfig_js_1.OINOConfig.printOINOId(encoded_primary_key_values), OINOConstants_js_1.OINOContentType.csv) + csv_row;
         return csv_row;
     }
     async _writeStringCsv() {
@@ -161,7 +161,7 @@ class OINOModelSet {
         const model = this.datamodel;
         const fields = model.fields;
         let row_id_seed = model.getRowPrimarykeyValues(row).join(' ');
-        let primary_key_values = [];
+        let encoded_primary_key_values = [];
         let result = "";
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
@@ -178,7 +178,7 @@ class OINOModelSet {
                 formdata_block = this._writeRowFormdataParameterBlock(fields[i].name, null, multipart_boundary);
             }
             else {
-                value = this._encodeAndHashFieldValue(f, value, OINOConstants_js_1.OINOContentType.formdata, primary_key_values, f.name + " " + row_id_seed);
+                value = this._encodeAndHashFieldValue(f, value, OINOConstants_js_1.OINOContentType.formdata, encoded_primary_key_values, f.name + " " + row_id_seed);
                 if (is_file) {
                     formdata_block = this._writeRowFormdataFileBlock(f.name, value, multipart_boundary);
                 }
@@ -188,7 +188,7 @@ class OINOModelSet {
             }
             result += formdata_block;
         }
-        result = this._writeRowFormdataParameterBlock(OINOConfig_js_1.OINOConfig.OINO_ID_FIELD, OINOConfig_js_1.OINOConfig.printOINOId(primary_key_values), multipart_boundary) + result;
+        result = this._writeRowFormdataParameterBlock(OINOConfig_js_1.OINOConfig.OINO_ID_FIELD, OINOConfig_js_1.OINOConfig.printOINOId(encoded_primary_key_values), multipart_boundary) + result;
         return result;
     }
     _writeStringFormdata() {
@@ -200,7 +200,7 @@ class OINOModelSet {
         const model = this.datamodel;
         const fields = model.fields;
         let row_id_seed = model.getRowPrimarykeyValues(row).join(' ');
-        let primary_key_values = [];
+        let encoded_primary_key_values = [];
         let urlencode_row = "";
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
@@ -212,14 +212,14 @@ class OINOModelSet {
                 // console.log("OINOModelSet._writeRowUrlencode undefined field value:" + fields[i].name)
             }
             else {
-                value = this._encodeAndHashFieldValue(f, value, OINOConstants_js_1.OINOContentType.urlencode, primary_key_values, f.name + " " + row_id_seed);
+                value = this._encodeAndHashFieldValue(f, value, OINOConstants_js_1.OINOContentType.urlencode, encoded_primary_key_values, f.name + " " + row_id_seed);
                 if (urlencode_row != "") {
                     urlencode_row += "&";
                 }
                 urlencode_row += OINOStr_js_1.OINOStr.encode(f.name, OINOConstants_js_1.OINOContentType.urlencode) + "=" + value;
             }
         }
-        urlencode_row = OINOStr_js_1.OINOStr.encode(OINOConfig_js_1.OINOConfig.OINO_ID_FIELD, OINOConstants_js_1.OINOContentType.urlencode) + "=" + OINOStr_js_1.OINOStr.encode(OINOConfig_js_1.OINOConfig.printOINOId(primary_key_values), OINOConstants_js_1.OINOContentType.urlencode) + "&" + urlencode_row;
+        urlencode_row = OINOStr_js_1.OINOStr.encode(OINOConfig_js_1.OINOConfig.OINO_ID_FIELD, OINOConstants_js_1.OINOContentType.urlencode) + "=" + OINOStr_js_1.OINOStr.encode(OINOConfig_js_1.OINOConfig.printOINOId(encoded_primary_key_values), OINOConstants_js_1.OINOContentType.urlencode) + "&" + urlencode_row;
         return urlencode_row;
     }
     async _writeStringUrlencode() {
@@ -241,12 +241,12 @@ class OINOModelSet {
         const model = this.datamodel;
         const fields = model.fields;
         let row_id_seed = model.getRowPrimarykeyValues(row).join(' ');
-        let primary_key_values = [];
+        let encoded_primary_key_values = [];
         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]) || "");
+                encoded_primary_key_values.push(f.serializeCell(row[i]) || "");
             }
             if ((this.queryParams?.select?.isSelected(f.name) === false) && (f.fieldParams.isPrimaryKey == false)) {
                 continue;
@@ -262,7 +262,7 @@ class OINOModelSet {
                 result[f.name] = value;
             }
         }
-        result[OINOConfig_js_1.OINOConfig.OINO_ID_FIELD] = OINOConfig_js_1.OINOConfig.printOINOId(primary_key_values);
+        result[OINOConfig_js_1.OINOConfig.OINO_ID_FIELD] = OINOConfig_js_1.OINOConfig.printOINOId(encoded_primary_key_values);
         return result;
     }
     /**

package/dist/esm/OINOApi.js

@@ -228,13 +228,22 @@ export class OINOApiHtmlTemplate extends OINOHtmlTemplate {
                 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 encoded_primary_key_values = [];
             this.clearVariables();
             this.setVariableFromValue(OINOConfig.OINO_ID_FIELD, "");
             for (let i = 0; i < datamodel.fields.length; i++) {
                 const f = datamodel.fields[i];
                 let value;
-                if ((f instanceof OINODatetimeDataField) && (this._locale != null)) {
+                if (f.fieldParams.isPrimaryKey || f.fieldParams.isForeignKey) {
+                    value = f.serializeCell(row[i]);
+                    if (value && (f instanceof OINONumberDataField) && (datamodel.api.hashid)) {
+                        value = datamodel.api.hashid.encode(value, f.name + " " + row_id_seed);
+                    }
+                    if (f.fieldParams.isPrimaryKey) {
+                        encoded_primary_key_values.push(value || "");
+                    }
+                }
+                else if ((f instanceof OINODatetimeDataField) && (this._locale != null)) {
                     value = f.serializeCellWithLocale(row[i], this._locale);
                 }
                 else if ((f instanceof OINONumberDataField) && (this._numberDecimals >= 0) && (typeof row[i] === "number")) {
@@ -244,18 +253,10 @@ export class OINOApiHtmlTemplate extends OINOHtmlTemplate {
                 else {
                     value = f.serializeCell(row[i]);
                 }
-                if (f.fieldParams.isPrimaryKey || f.fieldParams.isForeignKey) {
-                    if (value && (f instanceof OINONumberDataField) && (datamodel.api.hashid)) {
-                        value = datamodel.api.hashid.encode(value, f.name + " " + row_id_seed);
-                    }
-                    if (f.fieldParams.isPrimaryKey) {
-                        primary_key_values.push(value || "");
-                    }
-                }
                 this.setVariableFromValue(f.name, value || "");
             }
             this.setVariableFromProperties(overrideValues);
-            this.setVariableFromValue(OINOConfig.OINO_ID_FIELD, OINOConfig.printOINOId(primary_key_values));
+            this.setVariableFromValue(OINOConfig.OINO_ID_FIELD, OINOConfig.printOINOId(encoded_primary_key_values));
             html += this._renderHtml() + "\r\n";
             await dataset.next();
         }
@@ -286,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/esm/OINOModelSet.js

@@ -37,14 +37,14 @@ export class OINOModelSet {
         this.queryParams = queryParams;
         this.errors = this.dataset.messages;
     }
-    _encodeAndHashFieldValue(field, value, contentType, primaryKeyValues, rowIdSeed) {
+    _encodeAndHashFieldValue(field, value, contentType, primaryKeyValuesEncoded, rowIdSeed) {
         let result;
         if (field.fieldParams.isPrimaryKey || field.fieldParams.isForeignKey) {
             if (value && (field instanceof OINONumberDataField) && (this.datamodel.api.hashid) && ((this.queryParams?.aggregate === undefined) || (this.queryParams.aggregate.isAggregated(field.name) == false))) {
                 value = this.datamodel.api.hashid.encode(value, rowIdSeed);
             }
             if (field.fieldParams.isPrimaryKey) {
-                primaryKeyValues.push(value || "");
+                primaryKeyValuesEncoded.push(value || "");
             }
         }
         result = OINOStr.encode(value, contentType);
@@ -55,7 +55,7 @@ export class OINOModelSet {
         const model = this.datamodel;
         const fields = model.fields;
         let row_id_seed = model.getRowPrimarykeyValues(row).join(' ');
-        let primary_key_values = [];
+        let encoded_primary_key_values = [];
         let json_row = "";
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
@@ -72,14 +72,14 @@ export class OINOModelSet {
             else {
                 let is_hashed = (f.fieldParams.isPrimaryKey || f.fieldParams.isForeignKey) && (f instanceof OINONumberDataField) && (this.datamodel.api.hashid != null);
                 let is_value = (f instanceof OINOBooleanDataField) || ((f instanceof OINONumberDataField) && !is_hashed);
-                value = this._encodeAndHashFieldValue(f, value, OINOContentType.json, primary_key_values, f.name + " " + row_id_seed);
+                value = this._encodeAndHashFieldValue(f, value, OINOContentType.json, encoded_primary_key_values, f.name + " " + row_id_seed);
                 if (is_value) {
                     value = value.substring(1, value.length - 1);
                 }
                 json_row += "," + OINOStr.encode(f.name, OINOContentType.json) + ":" + value;
             }
         }
-        json_row = OINOStr.encode(OINOConfig.OINO_ID_FIELD, OINOContentType.json) + ":" + OINOStr.encode(OINOConfig.printOINOId(primary_key_values), OINOContentType.json) + json_row;
+        json_row = OINOStr.encode(OINOConfig.OINO_ID_FIELD, OINOContentType.json) + ":" + OINOStr.encode(OINOConfig.printOINOId(encoded_primary_key_values), OINOContentType.json) + json_row;
         return "{" + json_row + "}";
     }
     async _writeStringJson() {
@@ -111,7 +111,7 @@ export class OINOModelSet {
         const model = this.datamodel;
         const fields = model.fields;
         let row_id_seed = model.getRowPrimarykeyValues(row).join(' ');
-        let primary_key_values = [];
+        let encoded_primary_key_values = [];
         let csv_row = "";
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
@@ -123,11 +123,11 @@ export class OINOModelSet {
                 csv_row += "," + OINOStr.encode(value, OINOContentType.csv); // either null or undefined
             }
             else {
-                value = this._encodeAndHashFieldValue(f, value, OINOContentType.csv, primary_key_values, f.name + " " + row_id_seed);
+                value = this._encodeAndHashFieldValue(f, value, OINOContentType.csv, encoded_primary_key_values, f.name + " " + row_id_seed);
                 csv_row += "," + value;
             }
         }
-        csv_row = OINOStr.encode(OINOConfig.printOINOId(primary_key_values), OINOContentType.csv) + csv_row;
+        csv_row = OINOStr.encode(OINOConfig.printOINOId(encoded_primary_key_values), OINOContentType.csv) + csv_row;
         return csv_row;
     }
     async _writeStringCsv() {
@@ -158,7 +158,7 @@ export class OINOModelSet {
         const model = this.datamodel;
         const fields = model.fields;
         let row_id_seed = model.getRowPrimarykeyValues(row).join(' ');
-        let primary_key_values = [];
+        let encoded_primary_key_values = [];
         let result = "";
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
@@ -175,7 +175,7 @@ export class OINOModelSet {
                 formdata_block = this._writeRowFormdataParameterBlock(fields[i].name, null, multipart_boundary);
             }
             else {
-                value = this._encodeAndHashFieldValue(f, value, OINOContentType.formdata, primary_key_values, f.name + " " + row_id_seed);
+                value = this._encodeAndHashFieldValue(f, value, OINOContentType.formdata, encoded_primary_key_values, f.name + " " + row_id_seed);
                 if (is_file) {
                     formdata_block = this._writeRowFormdataFileBlock(f.name, value, multipart_boundary);
                 }
@@ -185,7 +185,7 @@ export class OINOModelSet {
             }
             result += formdata_block;
         }
-        result = this._writeRowFormdataParameterBlock(OINOConfig.OINO_ID_FIELD, OINOConfig.printOINOId(primary_key_values), multipart_boundary) + result;
+        result = this._writeRowFormdataParameterBlock(OINOConfig.OINO_ID_FIELD, OINOConfig.printOINOId(encoded_primary_key_values), multipart_boundary) + result;
         return result;
     }
     _writeStringFormdata() {
@@ -197,7 +197,7 @@ export class OINOModelSet {
         const model = this.datamodel;
         const fields = model.fields;
         let row_id_seed = model.getRowPrimarykeyValues(row).join(' ');
-        let primary_key_values = [];
+        let encoded_primary_key_values = [];
         let urlencode_row = "";
         for (let i = 0; i < fields.length; i++) {
             const f = fields[i];
@@ -209,14 +209,14 @@ export class OINOModelSet {
                 // console.log("OINOModelSet._writeRowUrlencode undefined field value:" + fields[i].name)
             }
             else {
-                value = this._encodeAndHashFieldValue(f, value, OINOContentType.urlencode, primary_key_values, f.name + " " + row_id_seed);
+                value = this._encodeAndHashFieldValue(f, value, OINOContentType.urlencode, encoded_primary_key_values, f.name + " " + row_id_seed);
                 if (urlencode_row != "") {
                     urlencode_row += "&";
                 }
                 urlencode_row += OINOStr.encode(f.name, OINOContentType.urlencode) + "=" + value;
             }
         }
-        urlencode_row = OINOStr.encode(OINOConfig.OINO_ID_FIELD, OINOContentType.urlencode) + "=" + OINOStr.encode(OINOConfig.printOINOId(primary_key_values), OINOContentType.urlencode) + "&" + urlencode_row;
+        urlencode_row = OINOStr.encode(OINOConfig.OINO_ID_FIELD, OINOContentType.urlencode) + "=" + OINOStr.encode(OINOConfig.printOINOId(encoded_primary_key_values), OINOContentType.urlencode) + "&" + urlencode_row;
         return urlencode_row;
     }
     async _writeStringUrlencode() {
@@ -238,12 +238,12 @@ export class OINOModelSet {
         const model = this.datamodel;
         const fields = model.fields;
         let row_id_seed = model.getRowPrimarykeyValues(row).join(' ');
-        let primary_key_values = [];
+        let encoded_primary_key_values = [];
         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]) || "");
+                encoded_primary_key_values.push(f.serializeCell(row[i]) || "");
             }
             if ((this.queryParams?.select?.isSelected(f.name) === false) && (f.fieldParams.isPrimaryKey == false)) {
                 continue;
@@ -259,7 +259,7 @@ export class OINOModelSet {
                 result[f.name] = value;
             }
         }
-        result[OINOConfig.OINO_ID_FIELD] = OINOConfig.printOINOId(primary_key_values);
+        result[OINOConfig.OINO_ID_FIELD] = OINOConfig.printOINOId(encoded_primary_key_values);
         return result;
     }
     /**

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.0",
+  "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.0",
+    "@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 */
@@ -282,13 +284,21 @@ export class OINOApiHtmlTemplate extends OINOHtmlTemplate {
                 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 encoded_primary_key_values:string[] = []
             this.clearVariables()
             this.setVariableFromValue(OINOConfig.OINO_ID_FIELD, "")
             for (let i=0; i<datamodel.fields.length; i++) {
                 const f:OINODataField = datamodel.fields[i]
                 let value:string|null|undefined 
-                if ((f instanceof OINODatetimeDataField) && (this._locale != null)) {
+                if (f.fieldParams.isPrimaryKey || f.fieldParams.isForeignKey) {
+                    value = f.serializeCell(row[i])
+                    if (value && (f instanceof OINONumberDataField) && (datamodel.api.hashid)) {
+                        value = datamodel.api.hashid.encode(value, f.name + " " + row_id_seed)
+                    }
+                    if (f.fieldParams.isPrimaryKey) {
+                        encoded_primary_key_values.push(value || "")
+                    }
+                } else if ((f instanceof OINODatetimeDataField) && (this._locale != null)) {
                     value = f.serializeCellWithLocale(row[i], this._locale)
 
                 } else if ((f instanceof OINONumberDataField) && (this._numberDecimals >= 0) && (typeof row[i] === "number")) {
@@ -298,18 +308,10 @@ export class OINOApiHtmlTemplate extends OINOHtmlTemplate {
                 } else {
                     value = f.serializeCell(row[i])
                 }
-                if (f.fieldParams.isPrimaryKey || f.fieldParams.isForeignKey) {
-                    if (value && (f instanceof OINONumberDataField) && (datamodel.api.hashid)) {
-                        value = datamodel.api.hashid.encode(value, f.name + " " + row_id_seed)
-                    }
-                    if (f.fieldParams.isPrimaryKey) {
-                        primary_key_values.push(value || "")
-                    }
-                }
                 this.setVariableFromValue(f.name, value || "")
             }
             this.setVariableFromProperties(overrideValues)
-            this.setVariableFromValue(OINOConfig.OINO_ID_FIELD, OINOConfig.printOINOId(primary_key_values))
+            this.setVariableFromValue(OINOConfig.OINO_ID_FIELD, OINOConfig.printOINOId(encoded_primary_key_values))
             html += this._renderHtml() + "\r\n"
             await dataset.next()
         }
@@ -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 

package/src/OINOModelSet.ts

@@ -48,14 +48,14 @@ export class OINOModelSet {
         this.errors = this.dataset.messages
     }
 
-    private _encodeAndHashFieldValue(field:OINODataField, value:string|null, contentType:OINOContentType, primaryKeyValues:string[], rowIdSeed:string):string {
+    private _encodeAndHashFieldValue(field:OINODataField, value:string|null, contentType:OINOContentType, primaryKeyValuesEncoded:string[], rowIdSeed:string):string {
         let result:string
         if (field.fieldParams.isPrimaryKey || field.fieldParams.isForeignKey) {
             if (value && (field instanceof OINONumberDataField) && (this.datamodel.api.hashid) && ((this.queryParams?.aggregate === undefined) || (this.queryParams.aggregate.isAggregated(field.name) == false))) {
                 value = this.datamodel.api.hashid.encode(value, rowIdSeed)
             }
             if (field.fieldParams.isPrimaryKey) {
-                primaryKeyValues.push(value || "")
+                primaryKeyValuesEncoded.push(value || "")
             }
         }  
         result = OINOStr.encode(value, contentType)
@@ -67,7 +67,7 @@ export class OINOModelSet {
         const model:OINODataModel = this.datamodel
         const fields:OINODataField[] = model.fields
         let row_id_seed:string = model.getRowPrimarykeyValues(row).join(' ')
-        let primary_key_values:string[] = []
+        let encoded_primary_key_values:string[] = []
         let json_row:string = ""
         for (let i=0; i<fields.length; i++) {
             const f = fields[i]
@@ -85,14 +85,14 @@ export class OINOModelSet {
 
                 let is_hashed:boolean = (f.fieldParams.isPrimaryKey || f.fieldParams.isForeignKey) && (f instanceof OINONumberDataField) && (this.datamodel.api.hashid != null)
                 let is_value = (f instanceof OINOBooleanDataField) || ((f instanceof OINONumberDataField) && !is_hashed)
-                value = this._encodeAndHashFieldValue(f, value, OINOContentType.json, primary_key_values, f.name + " " + row_id_seed)
+                value = this._encodeAndHashFieldValue(f, value, OINOContentType.json, encoded_primary_key_values, f.name + " " + row_id_seed)
                 if (is_value) {
                     value = value.substring(1, value.length-1)
                 }
                 json_row += "," + OINOStr.encode(f.name, OINOContentType.json) + ":" + value
             }
         }
-        json_row = OINOStr.encode(OINOConfig.OINO_ID_FIELD, OINOContentType.json) + ":" + OINOStr.encode(OINOConfig.printOINOId(primary_key_values), OINOContentType.json) + json_row
+        json_row = OINOStr.encode(OINOConfig.OINO_ID_FIELD, OINOContentType.json) + ":" + OINOStr.encode(OINOConfig.printOINOId(encoded_primary_key_values), OINOContentType.json) + json_row
         return "{" + json_row + "}"
     }
 
@@ -127,7 +127,7 @@ export class OINOModelSet {
         const model:OINODataModel = this.datamodel
         const fields:OINODataField[] = model.fields
         let row_id_seed:string = model.getRowPrimarykeyValues(row).join(' ')
-        let primary_key_values:string[] = []
+        let encoded_primary_key_values:string[] = []
         let csv_row:string = ""
         for (let i=0; i<fields.length; i++) {
             const f = fields[i]
@@ -139,11 +139,11 @@ export class OINOModelSet {
                 csv_row += "," + OINOStr.encode(value, OINOContentType.csv) // either null or undefined
     
             } else {
-                value = this._encodeAndHashFieldValue(f, value, OINOContentType.csv, primary_key_values, f.name + " " + row_id_seed)
+                value = this._encodeAndHashFieldValue(f, value, OINOContentType.csv, encoded_primary_key_values, f.name + " " + row_id_seed)
                 csv_row += "," + value        
             }
         }
-        csv_row = OINOStr.encode(OINOConfig.printOINOId(primary_key_values), OINOContentType.csv) + csv_row
+        csv_row = OINOStr.encode(OINOConfig.printOINOId(encoded_primary_key_values), OINOContentType.csv) + csv_row
         return csv_row
     }
 
@@ -177,7 +177,7 @@ export class OINOModelSet {
         const model:OINODataModel = this.datamodel
         const fields:OINODataField[] = model.fields
         let row_id_seed:string = model.getRowPrimarykeyValues(row).join(' ')
-        let primary_key_values:string[] = []
+        let encoded_primary_key_values:string[] = []
         let result:string = ""
         for (let i=0; i<fields.length; i++) {
             const f = fields[i]
@@ -195,7 +195,7 @@ export class OINOModelSet {
                 formdata_block = this._writeRowFormdataParameterBlock(fields[i].name, null, multipart_boundary)
             
             } else {
-                value = this._encodeAndHashFieldValue(f, value, OINOContentType.formdata, primary_key_values, f.name + " " + row_id_seed)
+                value = this._encodeAndHashFieldValue(f, value, OINOContentType.formdata, encoded_primary_key_values, f.name + " " + row_id_seed)
                 if (is_file) {
                     formdata_block = this._writeRowFormdataFileBlock(f.name, value, multipart_boundary)
                 } else {
@@ -205,7 +205,7 @@ export class OINOModelSet {
 
             result += formdata_block
         }
-        result = this._writeRowFormdataParameterBlock(OINOConfig.OINO_ID_FIELD, OINOConfig.printOINOId(primary_key_values), multipart_boundary) + result
+        result = this._writeRowFormdataParameterBlock(OINOConfig.OINO_ID_FIELD, OINOConfig.printOINOId(encoded_primary_key_values), multipart_boundary) + result
         return result
     }
 
@@ -220,7 +220,7 @@ export class OINOModelSet {
         const model:OINODataModel = this.datamodel
         const fields:OINODataField[] = model.fields
         let row_id_seed:string = model.getRowPrimarykeyValues(row).join(' ')
-        let primary_key_values:string[] = []
+        let encoded_primary_key_values:string[] = []
         let urlencode_row:string = ""
         for (let i=0; i<fields.length; i++) {
             const f = fields[i]
@@ -231,14 +231,14 @@ export class OINOModelSet {
             if ((value === undefined)) { // || (value === null)) {
                 // console.log("OINOModelSet._writeRowUrlencode undefined field value:" + fields[i].name)
             } else {
-                value = this._encodeAndHashFieldValue(f, value, OINOContentType.urlencode, primary_key_values, f.name + " " + row_id_seed)
+                value = this._encodeAndHashFieldValue(f, value, OINOContentType.urlencode, encoded_primary_key_values, f.name + " " + row_id_seed)
                 if (urlencode_row != "") {
                     urlencode_row += "&"
                 } 
                 urlencode_row += OINOStr.encode(f.name, OINOContentType.urlencode) + "=" + value
             }
         }
-        urlencode_row = OINOStr.encode(OINOConfig.OINO_ID_FIELD, OINOContentType.urlencode) + "=" + OINOStr.encode(OINOConfig.printOINOId(primary_key_values), OINOContentType.urlencode) + "&" + urlencode_row
+        urlencode_row = OINOStr.encode(OINOConfig.OINO_ID_FIELD, OINOContentType.urlencode) + "=" + OINOStr.encode(OINOConfig.printOINOId(encoded_primary_key_values), OINOContentType.urlencode) + "&" + urlencode_row
         return urlencode_row
     }
 
@@ -262,12 +262,12 @@ export class OINOModelSet {
         const model:OINODataModel = this.datamodel
         const fields:OINODataField[] = model.fields
         let row_id_seed:string = model.getRowPrimarykeyValues(row).join(' ')
-        let primary_key_values:string[] = []
+        let encoded_primary_key_values:string[] = []
         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]) || "")
+                encoded_primary_key_values.push(f.serializeCell(row[i]) || "")
             }
             if ((this.queryParams?.select?.isSelected(f.name) === false) && (f.fieldParams.isPrimaryKey == false)) {
                 continue
@@ -283,7 +283,7 @@ export class OINOModelSet {
                 result[f.name] = value
             }
         }
-        result[OINOConfig.OINO_ID_FIELD] = OINOConfig.printOINOId(primary_key_values)
+        result[OINOConfig.OINO_ID_FIELD] = OINOConfig.printOINOId(encoded_primary_key_values)
         return result
     }