@centia-io/sdk 0.0.31 → 0.0.33

package/dist/centia-io-sdk.umd.js

@@ -358,7 +358,8 @@ var CodeFlow = class {
 				params.delete("code");
 				params.delete("state");
 				const loc = window.location;
-				loc.origin + loc.pathname + (params.size > 0 ? "?" + params.toString() : "");
+				const newUrl = loc.origin + loc.pathname + (params.size > 0 ? "?" + params.toString() : "");
+				history.pushState(null, "", newUrl);
 				return Promise.resolve(true);
 			} catch (e) {
 				throw new Error(e.message);
@@ -374,7 +375,7 @@ var CodeFlow = class {
 	}
 	signOut() {
 		this.clear();
-		window.location = this.service.getSignOutURL();
+		window.location.assign(this.service.getSignOutURL());
 	}
 	clear() {
 		clearTokens();
@@ -643,7 +644,7 @@ var SignUp = class {
 		this.service = new Gc2Service(options);
 	}
 	async signUp() {
-		window.location = this.service.getSignUpURL();
+		window.location.assign(this.service.getSignUpURL());
 	}
 };
 
@@ -899,7 +900,7 @@ var TableQueryImpl = class {
 					}
 					parts.push(`select ${selectParts.join(", ")} from "${schema.name}"."${table.name}"`);
 					for (const j of state.joins) {
-						const onExpr = j.on.map((p$1) => `"${table.name}"."${p$1.left}" = "${j.target.name}"."${p$1.right}"`).join(" and ");
+						const onExpr = j.on.map((p$1) => `"${j.source.name}"."${p$1.left}" = "${j.target.name}"."${p$1.right}"`).join(" and ");
 						parts.push(`${j.type} join "${schema.name}"."${j.target.name}" on ${onExpr}`);
 					}
 					const andParts = [];
@@ -1047,7 +1048,7 @@ var TableQueryImpl = class {
 					if (state.offset !== void 0) parts.push("offset " + state.offset);
 					return {
 						q: parts.join(" "),
-						params,
+						params: Object.keys(params).length > 0 ? params : void 0,
 						type_hints: Object.keys(type_hints).length ? type_hints : void 0
 					};
 				};
@@ -1181,12 +1182,31 @@ var TableQueryImpl = class {
 			}
 			join(tableName, type = "inner") {
 				const target = findTable(schema, String(tableName));
-				const pairs = findJoinOn(table, target);
-				if (!pairs || !pairs.length) throw new Error(`No foreign key relation found between ${table.name} and ${target.name}`);
+				const sources = [];
+				for (let i = this.s.joins.length - 1; i >= 0; i--) {
+					const src = this.s.joins[i].target;
+					if (!sources.some((s) => s.name === src.name)) sources.push(src);
+				}
+				if (!sources.some((s) => s.name === table.name)) sources.push(table);
+				let pickedSource = null;
+				let pairs = null;
+				for (const src of sources) {
+					const p = findJoinOn(src, target);
+					if (p && p.length) {
+						pickedSource = src;
+						pairs = p;
+						break;
+					}
+				}
+				if (!pairs || !pickedSource) {
+					const candidates = sources.map((s) => s.name).join(", ");
+					throw new Error(`No foreign key relation found between any of [${candidates}] and ${target.name}`);
+				}
 				const jt = String(type);
 				if (jt !== "inner" && jt !== "left" && jt !== "right" && jt !== "full") throw new Error(`Invalid join type: ${jt}. Allowed: inner | left | right | full`);
 				this.s.joins.push({
 					type: jt,
+					source: pickedSource,
 					target,
 					on: pairs
 				});
@@ -1228,7 +1248,7 @@ var TableQueryImpl = class {
 					if (state.returning.length) parts.push("returning " + state.returning.join(", "));
 					return {
 						q: parts.join(" "),
-						params,
+						params: Object.keys(params).length > 0 ? params : void 0,
 						type_hints: Object.keys(type_hints).length ? type_hints : void 0
 					};
 				};
@@ -1320,7 +1340,7 @@ var TableQueryImpl = class {
 					if (state.returning.length) parts.push("returning " + state.returning.join(", "));
 					return {
 						q: parts.join(" "),
-						params,
+						params: Object.keys(params).length > 0 ? params : void 0,
 						type_hints: Object.keys(type_hints).length ? type_hints : void 0
 					};
 				};
@@ -1393,7 +1413,7 @@ var TableQueryImpl = class {
 					if (state.returning.length) parts.push("returning " + state.returning.join(", "));
 					return {
 						q: parts.join(" "),
-						params,
+						params: Object.keys(params).length > 0 ? params : void 0,
 						type_hints: Object.keys(type_hints).length ? type_hints : void 0
 					};
 				};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@centia-io/sdk",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "Centia-io TypeScript SDK",
   "author": "Martin Høgh",
   "license": "MIT",