@8ms/helpers 2.4.21 → 2.4.23

package/dist/googleCloud/bigquery/server/GoogleCloudBigqueryNamespace.cjs

@@ -4,6 +4,11 @@ const require__class_BaseNamespace = require("../../../_class/BaseNamespace.cjs"
 const require_googleCloud_server_googleCloud = require("../../server/googleCloud.cjs");
 //#region src/googleCloud/bigquery/server/GoogleCloudBigqueryNamespace.ts
 var GoogleCloudBigqueryNamespace = class extends require__class_BaseNamespace.BaseNamespace {
+	region;
+	constructor(key, config, region) {
+		super(key, config);
+		this.region = region;
+	}
 	ensureInit = async () => {
 		if (!this.client) try {
 			const { BigQuery } = await import("@google-cloud/bigquery");
@@ -17,20 +22,25 @@ var GoogleCloudBigqueryNamespace = class extends require__class_BaseNamespace.Ba
 	* Create a Dataset if it doesn't already exist.
 	* Returns table instance.
 	*/
-	createDataset = async (datasetId, options = {}) => {
+	createDataset = async (datasetId, options = {}, region) => {
 		await this.ensureInit();
-		if (!await this.datasetExists(datasetId)) await this.client.createDataset(datasetId);
+		const resolvedRegion = region ?? this.region;
+		if (!await this.datasetExists(datasetId, resolvedRegion)) await this.client.createDataset(datasetId, {
+			...options,
+			...resolvedRegion ? { location: resolvedRegion } : {}
+		});
 	};
 	/**
 	* Check to see whether a given Bigquery dataset exists.
 	* Based off:
 	* https://github.com/googleapis/nodejs-bigquery/blob/main/samples/getDataset.js
 	*/
-	datasetExists = async (datasetId) => {
+	datasetExists = async (datasetId, region) => {
 		await this.ensureInit();
+		const resolvedRegion = region ?? this.region;
 		let response;
 		try {
-			await this.client.dataset(datasetId).get();
+			await this.client.dataset(datasetId, { location: resolvedRegion }).get();
 			response = true;
 		} catch (exception) {
 			response = false;
@@ -54,10 +64,13 @@ var GoogleCloudBigqueryNamespace = class extends require__class_BaseNamespace.Ba
 	query = async (props) => {
 		await this.ensureInit();
 		let options = { query: "" };
-		if ("string" === typeof props) options.query = props;
-		else if (require_lodash_isObject.isObject(props)) {
+		if ("string" === typeof props) {
+			options.query = props;
+			if (this.region) options.location = this.region;
+		} else if (require_lodash_isObject.isObject(props)) {
 			options.query = props.query;
-			if (props?.location) options["location"] = props.location;
+			const resolvedLocation = props.location ?? this.region;
+			if (resolvedLocation) options.location = resolvedLocation;
 			if (props?.params) options["params"] = props.params;
 		}
 		return await this.client.query(options);
@@ -74,20 +87,20 @@ var GoogleCloudBigqueryNamespace = class extends require__class_BaseNamespace.Ba
 	* Check to see whether a given BigQuery table exists.
 	* https://cloud.google.com/bigquery/docs/samples/bigquery-table-exists
 	*/
-	tableExists = async (datasetId, tableId) => {
+	tableExists = async (datasetId, tableId, region) => {
 		await this.ensureInit();
 		let response = false;
-		const tables = await this.getTables(datasetId);
+		const tables = await this.getTables(datasetId, region ?? this.region);
 		for (let i = 0; i < tables.length; i++) if (tables[i].id === tableId) {
 			response = true;
 			break;
 		}
 		return response;
 	};
-	getTables = async (datasetId) => {
+	getTables = async (datasetId, region) => {
 		await this.ensureInit();
 		let response = [];
-		const tables = await this.client.dataset(datasetId).getTables();
+		const tables = await this.client.dataset(datasetId, { location: region ?? this.region }).getTables();
 		if (tables?.[0]) for (let i = 0; i < tables[0].length; i++) response.push({ id: tables[0][i].id });
 		return response;
 	};

package/dist/googleCloud/bigquery/server/GoogleCloudBigqueryNamespace.d.cts

@@ -21,18 +21,22 @@ declare class GoogleCloudBigqueryNamespace extends BaseNamespace {
   config: GoogleCloudConfig & {
     projectId?: string;
   };
+  region?: string;
+  constructor(key: string, config: GoogleCloudConfig & {
+    projectId?: string;
+  }, region?: string);
   ensureInit: () => Promise<void>;
   /**
    * Create a Dataset if it doesn't already exist.
    * Returns table instance.
    */
-  createDataset: (datasetId: string, options?: DatasetResource) => Promise<void>;
+  createDataset: (datasetId: string, options?: DatasetResource, region?: string) => Promise<void>;
   /**
    * Check to see whether a given Bigquery dataset exists.
    * Based off:
    * https://github.com/googleapis/nodejs-bigquery/blob/main/samples/getDataset.js
    */
-  datasetExists: (datasetId: string) => Promise<boolean>;
+  datasetExists: (datasetId: string, region?: string) => Promise<boolean>;
   /**
    * Retrieve all the Datasets
    */
@@ -46,8 +50,8 @@ declare class GoogleCloudBigqueryNamespace extends BaseNamespace {
    * Check to see whether a given BigQuery table exists.
    * https://cloud.google.com/bigquery/docs/samples/bigquery-table-exists
    */
-  tableExists: (datasetId: string, tableId: string) => Promise<boolean>;
-  getTables: (datasetId: string) => Promise<Table[]>;
+  tableExists: (datasetId: string, tableId: string, region?: string) => Promise<boolean>;
+  getTables: (datasetId: string, region?: string) => Promise<Table[]>;
 }
 //#endregion
 export { GoogleCloudBigqueryNamespace, QueryInput };

package/dist/googleCloud/bigquery/server/GoogleCloudBigqueryNamespace.d.mts

@@ -21,18 +21,22 @@ declare class GoogleCloudBigqueryNamespace extends BaseNamespace {
   config: GoogleCloudConfig & {
     projectId?: string;
   };
+  region?: string;
+  constructor(key: string, config: GoogleCloudConfig & {
+    projectId?: string;
+  }, region?: string);
   ensureInit: () => Promise<void>;
   /**
    * Create a Dataset if it doesn't already exist.
    * Returns table instance.
    */
-  createDataset: (datasetId: string, options?: DatasetResource) => Promise<void>;
+  createDataset: (datasetId: string, options?: DatasetResource, region?: string) => Promise<void>;
   /**
    * Check to see whether a given Bigquery dataset exists.
    * Based off:
    * https://github.com/googleapis/nodejs-bigquery/blob/main/samples/getDataset.js
    */
-  datasetExists: (datasetId: string) => Promise<boolean>;
+  datasetExists: (datasetId: string, region?: string) => Promise<boolean>;
   /**
    * Retrieve all the Datasets
    */
@@ -46,8 +50,8 @@ declare class GoogleCloudBigqueryNamespace extends BaseNamespace {
    * Check to see whether a given BigQuery table exists.
    * https://cloud.google.com/bigquery/docs/samples/bigquery-table-exists
    */
-  tableExists: (datasetId: string, tableId: string) => Promise<boolean>;
-  getTables: (datasetId: string) => Promise<Table[]>;
+  tableExists: (datasetId: string, tableId: string, region?: string) => Promise<boolean>;
+  getTables: (datasetId: string, region?: string) => Promise<Table[]>;
 }
 //#endregion
 export { GoogleCloudBigqueryNamespace, QueryInput };

package/dist/googleCloud/bigquery/server/GoogleCloudBigqueryNamespace.mjs

@@ -3,6 +3,11 @@ import { BaseNamespace } from "../../../_class/BaseNamespace.mjs";
 import { getConfig } from "../../server/googleCloud.mjs";
 //#region src/googleCloud/bigquery/server/GoogleCloudBigqueryNamespace.ts
 var GoogleCloudBigqueryNamespace = class extends BaseNamespace {
+	region;
+	constructor(key, config, region) {
+		super(key, config);
+		this.region = region;
+	}
 	ensureInit = async () => {
 		if (!this.client) try {
 			const { BigQuery } = await import("@google-cloud/bigquery");
@@ -16,20 +21,25 @@ var GoogleCloudBigqueryNamespace = class extends BaseNamespace {
 	* Create a Dataset if it doesn't already exist.
 	* Returns table instance.
 	*/
-	createDataset = async (datasetId, options = {}) => {
+	createDataset = async (datasetId, options = {}, region) => {
 		await this.ensureInit();
-		if (!await this.datasetExists(datasetId)) await this.client.createDataset(datasetId);
+		const resolvedRegion = region ?? this.region;
+		if (!await this.datasetExists(datasetId, resolvedRegion)) await this.client.createDataset(datasetId, {
+			...options,
+			...resolvedRegion ? { location: resolvedRegion } : {}
+		});
 	};
 	/**
 	* Check to see whether a given Bigquery dataset exists.
 	* Based off:
 	* https://github.com/googleapis/nodejs-bigquery/blob/main/samples/getDataset.js
 	*/
-	datasetExists = async (datasetId) => {
+	datasetExists = async (datasetId, region) => {
 		await this.ensureInit();
+		const resolvedRegion = region ?? this.region;
 		let response;
 		try {
-			await this.client.dataset(datasetId).get();
+			await this.client.dataset(datasetId, { location: resolvedRegion }).get();
 			response = true;
 		} catch (exception) {
 			response = false;
@@ -53,10 +63,13 @@ var GoogleCloudBigqueryNamespace = class extends BaseNamespace {
 	query = async (props) => {
 		await this.ensureInit();
 		let options = { query: "" };
-		if ("string" === typeof props) options.query = props;
-		else if (isObject(props)) {
+		if ("string" === typeof props) {
+			options.query = props;
+			if (this.region) options.location = this.region;
+		} else if (isObject(props)) {
 			options.query = props.query;
-			if (props?.location) options["location"] = props.location;
+			const resolvedLocation = props.location ?? this.region;
+			if (resolvedLocation) options.location = resolvedLocation;
 			if (props?.params) options["params"] = props.params;
 		}
 		return await this.client.query(options);
@@ -73,20 +86,20 @@ var GoogleCloudBigqueryNamespace = class extends BaseNamespace {
 	* Check to see whether a given BigQuery table exists.
 	* https://cloud.google.com/bigquery/docs/samples/bigquery-table-exists
 	*/
-	tableExists = async (datasetId, tableId) => {
+	tableExists = async (datasetId, tableId, region) => {
 		await this.ensureInit();
 		let response = false;
-		const tables = await this.getTables(datasetId);
+		const tables = await this.getTables(datasetId, region ?? this.region);
 		for (let i = 0; i < tables.length; i++) if (tables[i].id === tableId) {
 			response = true;
 			break;
 		}
 		return response;
 	};
-	getTables = async (datasetId) => {
+	getTables = async (datasetId, region) => {
 		await this.ensureInit();
 		let response = [];
-		const tables = await this.client.dataset(datasetId).getTables();
+		const tables = await this.client.dataset(datasetId, { location: region ?? this.region }).getTables();
 		if (tables?.[0]) for (let i = 0; i < tables[0].length; i++) response.push({ id: tables[0][i].id });
 		return response;
 	};

package/dist/googleCloud/bigquery/server/googleCloudBigquery.cjs

@@ -4,7 +4,7 @@ require("../../../onePassword/server/index.cjs");
 const require_googleCloud_bigquery_server_GoogleCloudBigqueryNamespace = require("./GoogleCloudBigqueryNamespace.cjs");
 //#region src/googleCloud/bigquery/server/googleCloudBigquery.ts
 const googleCloudBigqueryNamespaces = /* @__PURE__ */ new Map();
-const googleCloudBigqueryClient = async (key = "default", projectId, config, vaultId, itemId) => {
+const googleCloudBigqueryClient = async (key = "default", projectId, config, vaultId, itemId, region) => {
 	if (googleCloudBigqueryNamespaces.has(key)) return googleCloudBigqueryNamespaces.get(key);
 	let instanceConfig;
 	if (config) instanceConfig = {
@@ -20,7 +20,7 @@ const googleCloudBigqueryClient = async (key = "default", projectId, config, vau
 		projectId
 	};
 	else throw new Error(`Config required for namespace '${key}'`);
-	const namespace = new require_googleCloud_bigquery_server_GoogleCloudBigqueryNamespace.GoogleCloudBigqueryNamespace(key, instanceConfig);
+	const namespace = new require_googleCloud_bigquery_server_GoogleCloudBigqueryNamespace.GoogleCloudBigqueryNamespace(key, instanceConfig, region);
 	googleCloudBigqueryNamespaces.set(key, namespace);
 	return namespace;
 };

package/dist/googleCloud/bigquery/server/googleCloudBigquery.d.cts

@@ -2,7 +2,7 @@ import { GoogleCloudBigqueryNamespace } from "./GoogleCloudBigqueryNamespace.cjs
 import { GoogleAuthOptions } from "@google-cloud/common";
 
 //#region src/googleCloud/bigquery/server/googleCloudBigquery.d.ts
-declare const googleCloudBigqueryClient: (key?: string, projectId?: string, config?: GoogleAuthOptions, vaultId?: string, itemId?: string) => Promise<GoogleCloudBigqueryNamespace>;
+declare const googleCloudBigqueryClient: (key?: string, projectId?: string, config?: GoogleAuthOptions, vaultId?: string, itemId?: string, region?: string) => Promise<GoogleCloudBigqueryNamespace>;
 declare const getHandlerPath: (input: string) => string;
 //#endregion
 export { type GoogleCloudBigqueryNamespace, getHandlerPath, googleCloudBigqueryClient };

package/dist/googleCloud/bigquery/server/googleCloudBigquery.d.mts

@@ -2,7 +2,7 @@ import { GoogleCloudBigqueryNamespace } from "./GoogleCloudBigqueryNamespace.mjs
 import { GoogleAuthOptions } from "@google-cloud/common";
 
 //#region src/googleCloud/bigquery/server/googleCloudBigquery.d.ts
-declare const googleCloudBigqueryClient: (key?: string, projectId?: string, config?: GoogleAuthOptions, vaultId?: string, itemId?: string) => Promise<GoogleCloudBigqueryNamespace>;
+declare const googleCloudBigqueryClient: (key?: string, projectId?: string, config?: GoogleAuthOptions, vaultId?: string, itemId?: string, region?: string) => Promise<GoogleCloudBigqueryNamespace>;
 declare const getHandlerPath: (input: string) => string;
 //#endregion
 export { type GoogleCloudBigqueryNamespace, getHandlerPath, googleCloudBigqueryClient };

package/dist/googleCloud/bigquery/server/googleCloudBigquery.mjs

@@ -3,7 +3,7 @@ import "../../../onePassword/server/index.mjs";
 import { GoogleCloudBigqueryNamespace } from "./GoogleCloudBigqueryNamespace.mjs";
 //#region src/googleCloud/bigquery/server/googleCloudBigquery.ts
 const googleCloudBigqueryNamespaces = /* @__PURE__ */ new Map();
-const googleCloudBigqueryClient = async (key = "default", projectId, config, vaultId, itemId) => {
+const googleCloudBigqueryClient = async (key = "default", projectId, config, vaultId, itemId, region) => {
 	if (googleCloudBigqueryNamespaces.has(key)) return googleCloudBigqueryNamespaces.get(key);
 	let instanceConfig;
 	if (config) instanceConfig = {
@@ -19,7 +19,7 @@ const googleCloudBigqueryClient = async (key = "default", projectId, config, vau
 		projectId
 	};
 	else throw new Error(`Config required for namespace '${key}'`);
-	const namespace = new GoogleCloudBigqueryNamespace(key, instanceConfig);
+	const namespace = new GoogleCloudBigqueryNamespace(key, instanceConfig, region);
 	googleCloudBigqueryNamespaces.set(key, namespace);
 	return namespace;
 };

package/dist/googleCloud/bigquery/server/loadData.cjs

@@ -4,7 +4,10 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 * Load data into a given table using Google Cloud Storage.
 */
 const loadData = async ({ file, googleCloudBigqueryClient, googleCloudStorageClient, table }) => {
-	if (await googleCloudBigqueryClient.tableExists(table.datasetId, table.tableId)) await googleCloudBigqueryClient.client.dataset(table.datasetId).table(table.tableId).load(googleCloudStorageClient.client.bucket(file.bucket).file(file.key), file.metadata);
+	if (await googleCloudBigqueryClient.tableExists(table.datasetId, table.tableId)) await googleCloudBigqueryClient.client.dataset(table.datasetId, { location: table?.region }).table(table.tableId).load(googleCloudStorageClient.client.bucket(file.bucket).file(file.key), {
+		...file?.metadata ?? {},
+		location: file?.region
+	});
 };
 //#endregion
 exports.loadData = loadData;

package/dist/googleCloud/bigquery/server/loadData.d.cts

@@ -7,10 +7,12 @@ type LoadData = {
   file: {
     bucket: string;
     key: string;
-    metadata: object;
+    metadata?: object;
+    region?: string;
   };
   table: {
     datasetId: string;
+    region?: string;
     tableId: string;
   };
 };

package/dist/googleCloud/bigquery/server/loadData.d.mts

@@ -7,10 +7,12 @@ type LoadData = {
   file: {
     bucket: string;
     key: string;
-    metadata: object;
+    metadata?: object;
+    region?: string;
   };
   table: {
     datasetId: string;
+    region?: string;
     tableId: string;
   };
 };

package/dist/googleCloud/bigquery/server/loadData.mjs

@@ -3,7 +3,10 @@
 * Load data into a given table using Google Cloud Storage.
 */
 const loadData = async ({ file, googleCloudBigqueryClient, googleCloudStorageClient, table }) => {
-	if (await googleCloudBigqueryClient.tableExists(table.datasetId, table.tableId)) await googleCloudBigqueryClient.client.dataset(table.datasetId).table(table.tableId).load(googleCloudStorageClient.client.bucket(file.bucket).file(file.key), file.metadata);
+	if (await googleCloudBigqueryClient.tableExists(table.datasetId, table.tableId)) await googleCloudBigqueryClient.client.dataset(table.datasetId, { location: table?.region }).table(table.tableId).load(googleCloudStorageClient.client.bucket(file.bucket).file(file.key), {
+		...file?.metadata ?? {},
+		location: file?.region
+	});
 };
 //#endregion
 export { loadData };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@8ms/helpers",
 	"license": "UNLICENSED",
-	"version": "2.4.21",
+	"version": "2.4.23",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"