@8ms/helpers 2.4.24 → 3.0.1

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

@@ -1,4 +1,4 @@
-import { GoogleCloudBigqueryNamespace, QueryInput } from "./GoogleCloudBigqueryNamespace.mjs";
-import { getHandlerPath, googleCloudBigqueryClient } from "./googleCloudBigquery.mjs";
+import { GoogleCloudBigquery, QueryInput } from "./GoogleCloudBigquery.mjs";
+import { getHandlerPath } from "./getHandlerPath.mjs";
 import { loadData } from "./loadData.mjs";
-export { GoogleCloudBigqueryNamespace, QueryInput, getHandlerPath, googleCloudBigqueryClient, loadData };
+export { GoogleCloudBigquery, QueryInput, getHandlerPath, loadData };

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

@@ -1,4 +1,4 @@
-import { GoogleCloudBigqueryNamespace } from "./GoogleCloudBigqueryNamespace.mjs";
-import { getHandlerPath, googleCloudBigqueryClient } from "./googleCloudBigquery.mjs";
+import { GoogleCloudBigquery } from "./GoogleCloudBigquery.mjs";
+import { getHandlerPath } from "./getHandlerPath.mjs";
 import { loadData } from "./loadData.mjs";
-export { GoogleCloudBigqueryNamespace, getHandlerPath, googleCloudBigqueryClient, loadData };
+export { GoogleCloudBigquery, getHandlerPath, loadData };

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

@@ -1,8 +1,8 @@
-import { GoogleCloudBigqueryNamespace } from "./GoogleCloudBigqueryNamespace.cjs";
+import { GoogleCloudBigquery } from "./GoogleCloudBigquery.cjs";
 
 //#region src/googleCloud/bigquery/server/loadData.d.ts
 type LoadData = {
-  googleCloudBigqueryClient: GoogleCloudBigqueryNamespace;
+  googleCloudBigqueryClient: GoogleCloudBigquery;
   googleCloudStorageClient: any;
   file: {
     bucket: string;

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

@@ -1,8 +1,8 @@
-import { GoogleCloudBigqueryNamespace } from "./GoogleCloudBigqueryNamespace.mjs";
+import { GoogleCloudBigquery } from "./GoogleCloudBigquery.mjs";
 
 //#region src/googleCloud/bigquery/server/loadData.d.ts
 type LoadData = {
-  googleCloudBigqueryClient: GoogleCloudBigqueryNamespace;
+  googleCloudBigqueryClient: GoogleCloudBigquery;
   googleCloudStorageClient: any;
   file: {
     bucket: string;

package/dist/googleCloud/server/getGoogleCloudConfig.cjs

@@ -0,0 +1,81 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_environment_environment = require("../../environment/environment.cjs");
+//#region src/googleCloud/server/getGoogleCloudConfig.ts
+/**
+* Used to return the correct Google Cloud Config based on the environment/service.
+*/
+const getGoogleCloudConfig = (props) => {
+	if (props?.oidcV9 && require_environment_environment.isVercel()) return getOidcAuthV9(props.oidcV9);
+	if (props?.oidcV10 && require_environment_environment.isVercel()) return getOidcAuthV10(props.oidcV10);
+	const privateKey = props.json["private_key"].replace(/\\n/g, "\n");
+	return {
+		type: props.json["type"],
+		project_id: props.json["project_id"],
+		private_key_id: props.json["private_key_id"],
+		private_key: privateKey,
+		client_email: props.json["client_email"],
+		client_id: props.json["client_id"],
+		auth_uri: props.json["auth_uri"],
+		token_uri: props.json["token_uri"],
+		auth_provider_x509_cert_url: props.json["auth_provider_x509_cert_url"],
+		client_x509_cert_url: props.json["client_x509_cert_url"]
+	};
+};
+const buildOidcCredentialConfig = (props) => {
+	return {
+		type: "external_account",
+		audience: `//iam.googleapis.com/projects/${props.googleCloudProjectNumber}/locations/global/workloadIdentityPools/${props.workloadIdentityPoolId}/providers/${props.workloadIdentityPoolProviderId}`,
+		subject_token_type: "urn:ietf:params:oauth:token-type:jwt",
+		token_url: "https://sts.googleapis.com/v1/token",
+		service_account_impersonation_url: `https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/${props.serviceAccountEmail}:generateAccessToken`,
+		credential_source: void 0,
+		subject_token_supplier: { getSubjectToken: async () => {
+			const { getVercelOidcToken } = await import("@vercel/oidc");
+			const token = await getVercelOidcToken();
+			if (!token) throw new Error("Vercel OIDC token is undefined or unavailable at runtime");
+			return token;
+		} }
+	};
+};
+/**
+* Returns Storage constructor options for @google-cloud/storage.
+* Token exchange is done via google-auth-library v10, then passed via a
+* gaxios-based authClient stub so Storage never touches ADC or v10 types.
+*/
+const getOidcAuthV9 = async (props) => {
+	const { ExternalAccountClient } = await import("google-auth-library");
+	const client = ExternalAccountClient.fromJSON(buildOidcCredentialConfig(props));
+	if (!client) throw new Error("ExternalAccountClient.fromJSON returned null — check credential config");
+	const tokenResponse = await client.getAccessToken();
+	if (!tokenResponse?.token) throw new Error("Google Token Exchange response did not emit a valid token payload");
+	const accessToken = tokenResponse.token;
+	const { request: gaxiosRequest } = await import("gaxios");
+	return {
+		projectId: props.googleCloudProjectId,
+		authClient: {
+			getRequestHeaders: async () => ({ Authorization: `Bearer ${accessToken}` }),
+			getAccessToken: async () => ({ token: accessToken }),
+			request: (opts) => gaxiosRequest({
+				...opts,
+				headers: {
+					...opts.headers ?? {},
+					Authorization: `Bearer ${accessToken}`
+				}
+			})
+		}
+	};
+};
+/**
+* Returns an ExternalAccountClient from google-auth-library v10.
+* Use this wherever you need a full AuthClient (e.g. BigQuery, direct API calls).
+*/
+const getOidcAuthV10 = async (props) => {
+	const { ExternalAccountClient } = await import("google-auth-library");
+	const client = ExternalAccountClient.fromJSON(buildOidcCredentialConfig(props));
+	if (!client) throw new Error("ExternalAccountClient.fromJSON returned null — check credential config");
+	return client;
+};
+//#endregion
+exports.getGoogleCloudConfig = getGoogleCloudConfig;
+exports.getOidcAuthV10 = getOidcAuthV10;
+exports.getOidcAuthV9 = getOidcAuthV9;

package/dist/googleCloud/server/getGoogleCloudConfig.d.cts

@@ -0,0 +1,77 @@
+import * as _$gaxios from "gaxios";
+import * as _$google_auth_library0 from "google-auth-library";
+
+//#region src/googleCloud/server/getGoogleCloudConfig.d.ts
+type VercelGcpOidcConfig = {
+  googleCloudProjectId: string;
+  googleCloudProjectNumber: number;
+  serviceAccountEmail: string;
+  workloadIdentityPoolId: string;
+  workloadIdentityPoolProviderId: string;
+};
+type GetGoogleCloudConfigProps = {
+  json: {
+    type: string;
+    project_id: string;
+    private_key_id: string;
+    private_key: string;
+    client_email: string;
+    client_id: string;
+    auth_uri: string;
+    token_uri: string;
+    auth_provider_x509_cert_url: string;
+    client_x509_cert_url: string;
+  };
+  oidcV9?: VercelGcpOidcConfig;
+  oidcV10?: VercelGcpOidcConfig;
+};
+/**
+ * Used to return the correct Google Cloud Config based on the environment/service.
+ */
+declare const getGoogleCloudConfig: (props: GetGoogleCloudConfigProps) => Promise<{
+  projectId: string;
+  authClient: {
+    getRequestHeaders: () => Promise<{
+      Authorization: string;
+    }>;
+    getAccessToken: () => Promise<{
+      token: string;
+    }>;
+    request: (opts: any) => Promise<_$gaxios.GaxiosResponse<unknown>>;
+  };
+}> | Promise<_$google_auth_library0.BaseExternalAccountClient> | {
+  type: string;
+  project_id: string;
+  private_key_id: string;
+  private_key: string;
+  client_email: string;
+  client_id: string;
+  auth_uri: string;
+  token_uri: string;
+  auth_provider_x509_cert_url: string;
+  client_x509_cert_url: string;
+};
+/**
+ * Returns Storage constructor options for @google-cloud/storage.
+ * Token exchange is done via google-auth-library v10, then passed via a
+ * gaxios-based authClient stub so Storage never touches ADC or v10 types.
+ */
+declare const getOidcAuthV9: (props: VercelGcpOidcConfig) => Promise<{
+  projectId: string;
+  authClient: {
+    getRequestHeaders: () => Promise<{
+      Authorization: string;
+    }>;
+    getAccessToken: () => Promise<{
+      token: string;
+    }>;
+    request: (opts: any) => Promise<_$gaxios.GaxiosResponse<unknown>>;
+  };
+}>;
+/**
+ * Returns an ExternalAccountClient from google-auth-library v10.
+ * Use this wherever you need a full AuthClient (e.g. BigQuery, direct API calls).
+ */
+declare const getOidcAuthV10: (props: VercelGcpOidcConfig) => Promise<_$google_auth_library0.BaseExternalAccountClient>;
+//#endregion
+export { getGoogleCloudConfig, getOidcAuthV10, getOidcAuthV9 };

package/dist/googleCloud/server/getGoogleCloudConfig.d.mts

@@ -0,0 +1,77 @@
+import * as _$gaxios from "gaxios";
+import * as _$google_auth_library0 from "google-auth-library";
+
+//#region src/googleCloud/server/getGoogleCloudConfig.d.ts
+type VercelGcpOidcConfig = {
+  googleCloudProjectId: string;
+  googleCloudProjectNumber: number;
+  serviceAccountEmail: string;
+  workloadIdentityPoolId: string;
+  workloadIdentityPoolProviderId: string;
+};
+type GetGoogleCloudConfigProps = {
+  json: {
+    type: string;
+    project_id: string;
+    private_key_id: string;
+    private_key: string;
+    client_email: string;
+    client_id: string;
+    auth_uri: string;
+    token_uri: string;
+    auth_provider_x509_cert_url: string;
+    client_x509_cert_url: string;
+  };
+  oidcV9?: VercelGcpOidcConfig;
+  oidcV10?: VercelGcpOidcConfig;
+};
+/**
+ * Used to return the correct Google Cloud Config based on the environment/service.
+ */
+declare const getGoogleCloudConfig: (props: GetGoogleCloudConfigProps) => Promise<{
+  projectId: string;
+  authClient: {
+    getRequestHeaders: () => Promise<{
+      Authorization: string;
+    }>;
+    getAccessToken: () => Promise<{
+      token: string;
+    }>;
+    request: (opts: any) => Promise<_$gaxios.GaxiosResponse<unknown>>;
+  };
+}> | Promise<_$google_auth_library0.BaseExternalAccountClient> | {
+  type: string;
+  project_id: string;
+  private_key_id: string;
+  private_key: string;
+  client_email: string;
+  client_id: string;
+  auth_uri: string;
+  token_uri: string;
+  auth_provider_x509_cert_url: string;
+  client_x509_cert_url: string;
+};
+/**
+ * Returns Storage constructor options for @google-cloud/storage.
+ * Token exchange is done via google-auth-library v10, then passed via a
+ * gaxios-based authClient stub so Storage never touches ADC or v10 types.
+ */
+declare const getOidcAuthV9: (props: VercelGcpOidcConfig) => Promise<{
+  projectId: string;
+  authClient: {
+    getRequestHeaders: () => Promise<{
+      Authorization: string;
+    }>;
+    getAccessToken: () => Promise<{
+      token: string;
+    }>;
+    request: (opts: any) => Promise<_$gaxios.GaxiosResponse<unknown>>;
+  };
+}>;
+/**
+ * Returns an ExternalAccountClient from google-auth-library v10.
+ * Use this wherever you need a full AuthClient (e.g. BigQuery, direct API calls).
+ */
+declare const getOidcAuthV10: (props: VercelGcpOidcConfig) => Promise<_$google_auth_library0.BaseExternalAccountClient>;
+//#endregion
+export { getGoogleCloudConfig, getOidcAuthV10, getOidcAuthV9 };

package/dist/googleCloud/server/getGoogleCloudConfig.mjs

@@ -0,0 +1,78 @@
+import { isVercel } from "../../environment/environment.mjs";
+//#region src/googleCloud/server/getGoogleCloudConfig.ts
+/**
+* Used to return the correct Google Cloud Config based on the environment/service.
+*/
+const getGoogleCloudConfig = (props) => {
+	if (props?.oidcV9 && isVercel()) return getOidcAuthV9(props.oidcV9);
+	if (props?.oidcV10 && isVercel()) return getOidcAuthV10(props.oidcV10);
+	const privateKey = props.json["private_key"].replace(/\\n/g, "\n");
+	return {
+		type: props.json["type"],
+		project_id: props.json["project_id"],
+		private_key_id: props.json["private_key_id"],
+		private_key: privateKey,
+		client_email: props.json["client_email"],
+		client_id: props.json["client_id"],
+		auth_uri: props.json["auth_uri"],
+		token_uri: props.json["token_uri"],
+		auth_provider_x509_cert_url: props.json["auth_provider_x509_cert_url"],
+		client_x509_cert_url: props.json["client_x509_cert_url"]
+	};
+};
+const buildOidcCredentialConfig = (props) => {
+	return {
+		type: "external_account",
+		audience: `//iam.googleapis.com/projects/${props.googleCloudProjectNumber}/locations/global/workloadIdentityPools/${props.workloadIdentityPoolId}/providers/${props.workloadIdentityPoolProviderId}`,
+		subject_token_type: "urn:ietf:params:oauth:token-type:jwt",
+		token_url: "https://sts.googleapis.com/v1/token",
+		service_account_impersonation_url: `https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/${props.serviceAccountEmail}:generateAccessToken`,
+		credential_source: void 0,
+		subject_token_supplier: { getSubjectToken: async () => {
+			const { getVercelOidcToken } = await import("@vercel/oidc");
+			const token = await getVercelOidcToken();
+			if (!token) throw new Error("Vercel OIDC token is undefined or unavailable at runtime");
+			return token;
+		} }
+	};
+};
+/**
+* Returns Storage constructor options for @google-cloud/storage.
+* Token exchange is done via google-auth-library v10, then passed via a
+* gaxios-based authClient stub so Storage never touches ADC or v10 types.
+*/
+const getOidcAuthV9 = async (props) => {
+	const { ExternalAccountClient } = await import("google-auth-library");
+	const client = ExternalAccountClient.fromJSON(buildOidcCredentialConfig(props));
+	if (!client) throw new Error("ExternalAccountClient.fromJSON returned null — check credential config");
+	const tokenResponse = await client.getAccessToken();
+	if (!tokenResponse?.token) throw new Error("Google Token Exchange response did not emit a valid token payload");
+	const accessToken = tokenResponse.token;
+	const { request: gaxiosRequest } = await import("gaxios");
+	return {
+		projectId: props.googleCloudProjectId,
+		authClient: {
+			getRequestHeaders: async () => ({ Authorization: `Bearer ${accessToken}` }),
+			getAccessToken: async () => ({ token: accessToken }),
+			request: (opts) => gaxiosRequest({
+				...opts,
+				headers: {
+					...opts.headers ?? {},
+					Authorization: `Bearer ${accessToken}`
+				}
+			})
+		}
+	};
+};
+/**
+* Returns an ExternalAccountClient from google-auth-library v10.
+* Use this wherever you need a full AuthClient (e.g. BigQuery, direct API calls).
+*/
+const getOidcAuthV10 = async (props) => {
+	const { ExternalAccountClient } = await import("google-auth-library");
+	const client = ExternalAccountClient.fromJSON(buildOidcCredentialConfig(props));
+	if (!client) throw new Error("ExternalAccountClient.fromJSON returned null — check credential config");
+	return client;
+};
+//#endregion
+export { getGoogleCloudConfig, getOidcAuthV10, getOidcAuthV9 };

package/dist/googleCloud/server/index.cjs

@@ -1,3 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_googleCloud_server_googleCloud = require("./googleCloud.cjs");
-exports.getConfig = require_googleCloud_server_googleCloud.getConfig;
+const require_googleCloud_server_getGoogleCloudConfig = require("./getGoogleCloudConfig.cjs");
+exports.getGoogleCloudConfig = require_googleCloud_server_getGoogleCloudConfig.getGoogleCloudConfig;
+exports.getOidcAuthV10 = require_googleCloud_server_getGoogleCloudConfig.getOidcAuthV10;
+exports.getOidcAuthV9 = require_googleCloud_server_getGoogleCloudConfig.getOidcAuthV9;

package/dist/googleCloud/server/index.d.cts

@@ -1,2 +1,2 @@
-import { GoogleCloudConfig, getConfig } from "./googleCloud.cjs";
-export { GoogleCloudConfig, getConfig };
+import { getGoogleCloudConfig, getOidcAuthV10, getOidcAuthV9 } from "./getGoogleCloudConfig.cjs";
+export { getGoogleCloudConfig, getOidcAuthV10, getOidcAuthV9 };

package/dist/googleCloud/server/index.d.mts

@@ -1,2 +1,2 @@
-import { GoogleCloudConfig, getConfig } from "./googleCloud.mjs";
-export { GoogleCloudConfig, getConfig };
+import { getGoogleCloudConfig, getOidcAuthV10, getOidcAuthV9 } from "./getGoogleCloudConfig.mjs";
+export { getGoogleCloudConfig, getOidcAuthV10, getOidcAuthV9 };

package/dist/googleCloud/server/index.mjs

@@ -1,2 +1,2 @@
-import { getConfig } from "./googleCloud.mjs";
-export { getConfig };
+import { getGoogleCloudConfig, getOidcAuthV10, getOidcAuthV9 } from "./getGoogleCloudConfig.mjs";
+export { getGoogleCloudConfig, getOidcAuthV10, getOidcAuthV9 };

package/dist/googleCloud/sheets/server/{GoogleCloudSheetsNamespace.cjs → GoogleCloudSheets.cjs}

@@ -1,14 +1,17 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require__class_BaseNamespace = require("../../../_class/BaseNamespace.cjs");
-const require_googleCloud_server_googleCloud = require("../../server/googleCloud.cjs");
-//#region src/googleCloud/sheets/server/GoogleCloudSheetsNamespace.ts
-var GoogleCloudSheetsNamespace = class extends require__class_BaseNamespace.BaseNamespace {
-	ensureInit = async () => {
+//#region src/googleCloud/sheets/server/GoogleCloudSheets.ts
+var GoogleCloudSheets = class extends require__class_BaseNamespace.BaseNamespace {
+	/**
+	* Either a Google Cloud JSON Config or V10 Auth helper.
+	*/
+	init = async (isOidc, config, projectId, region) => {
 		if (!this.client) try {
 			const googleApisSheets = await import("@googleapis/sheets");
-			const formattedConfig = require_googleCloud_server_googleCloud.getConfig(this.config, this.config?.projectId);
 			this.client = new googleApisSheets.auth.GoogleAuth({
-				...formattedConfig,
+				authClient: isOidc ? config : void 0,
+				credentials: isOidc ? void 0 : config,
+				projectId,
 				scopes: ["https://www.googleapis.com/auth/spreadsheets"]
 			});
 		} catch (e) {
@@ -16,7 +19,6 @@ var GoogleCloudSheetsNamespace = class extends require__class_BaseNamespace.Base
 		}
 	};
 	getBatchData = async (props) => {
-		await this.ensureInit();
 		return (await (await import("@googleapis/sheets")).sheets("v4").spreadsheets.values.batchGet({
 			auth: this.client,
 			dateTimeRenderOption: props?.dateTimeRender || "FORMATTED_STRING",
@@ -27,4 +29,4 @@ var GoogleCloudSheetsNamespace = class extends require__class_BaseNamespace.Base
 	};
 };
 //#endregion
-exports.GoogleCloudSheetsNamespace = GoogleCloudSheetsNamespace;
+exports.GoogleCloudSheets = GoogleCloudSheets;

package/dist/googleCloud/sheets/server/{GoogleCloudSheetsNamespace.d.cts → GoogleCloudSheets.d.cts}

@@ -1,22 +1,22 @@
 import { BaseNamespace } from "../../../_class/BaseNamespace.cjs";
-import { GoogleCloudConfig } from "../../server/googleCloud.cjs";
 import * as _$_googleapis_sheets0 from "@googleapis/sheets";
 import { GoogleAuth } from "googleapis-common";
 
-//#region src/googleCloud/sheets/server/GoogleCloudSheetsNamespace.d.ts
+//#region src/googleCloud/sheets/server/GoogleCloudSheets.d.ts
 type GetBatchDataProps = {
   spreadsheetId: string;
   ranges: string[];
   dateTimeRender?: string;
   valueRender?: string;
 };
-declare class GoogleCloudSheetsNamespace extends BaseNamespace {
+declare class GoogleCloudSheets extends BaseNamespace {
   client: GoogleAuth;
-  config: GoogleCloudConfig & {
-    projectId?: string;
-  };
-  ensureInit: () => Promise<void>;
+  config: any;
+  /**
+   * Either a Google Cloud JSON Config or V10 Auth helper.
+   */
+  init: (isOidc: boolean, config: any, projectId: string, region?: string) => Promise<void>;
   getBatchData: (props: GetBatchDataProps) => Promise<_$_googleapis_sheets0.sheets_v4.Schema$BatchGetValuesResponse>;
 }
 //#endregion
-export { GoogleCloudSheetsNamespace };
+export { GoogleCloudSheets };

package/dist/googleCloud/sheets/server/{GoogleCloudSheetsNamespace.d.mts → GoogleCloudSheets.d.mts}

@@ -1,22 +1,22 @@
 import { BaseNamespace } from "../../../_class/BaseNamespace.mjs";
-import { GoogleCloudConfig } from "../../server/googleCloud.mjs";
 import * as _$_googleapis_sheets0 from "@googleapis/sheets";
 import { GoogleAuth } from "googleapis-common";
 
-//#region src/googleCloud/sheets/server/GoogleCloudSheetsNamespace.d.ts
+//#region src/googleCloud/sheets/server/GoogleCloudSheets.d.ts
 type GetBatchDataProps = {
   spreadsheetId: string;
   ranges: string[];
   dateTimeRender?: string;
   valueRender?: string;
 };
-declare class GoogleCloudSheetsNamespace extends BaseNamespace {
+declare class GoogleCloudSheets extends BaseNamespace {
   client: GoogleAuth;
-  config: GoogleCloudConfig & {
-    projectId?: string;
-  };
-  ensureInit: () => Promise<void>;
+  config: any;
+  /**
+   * Either a Google Cloud JSON Config or V10 Auth helper.
+   */
+  init: (isOidc: boolean, config: any, projectId: string, region?: string) => Promise<void>;
   getBatchData: (props: GetBatchDataProps) => Promise<_$_googleapis_sheets0.sheets_v4.Schema$BatchGetValuesResponse>;
 }
 //#endregion
-export { GoogleCloudSheetsNamespace };
+export { GoogleCloudSheets };

package/dist/googleCloud/sheets/server/{GoogleCloudSheetsNamespace.mjs → GoogleCloudSheets.mjs}

@@ -1,13 +1,16 @@
 import { BaseNamespace } from "../../../_class/BaseNamespace.mjs";
-import { getConfig } from "../../server/googleCloud.mjs";
-//#region src/googleCloud/sheets/server/GoogleCloudSheetsNamespace.ts
-var GoogleCloudSheetsNamespace = class extends BaseNamespace {
-	ensureInit = async () => {
+//#region src/googleCloud/sheets/server/GoogleCloudSheets.ts
+var GoogleCloudSheets = class extends BaseNamespace {
+	/**
+	* Either a Google Cloud JSON Config or V10 Auth helper.
+	*/
+	init = async (isOidc, config, projectId, region) => {
 		if (!this.client) try {
 			const googleApisSheets = await import("@googleapis/sheets");
-			const formattedConfig = getConfig(this.config, this.config?.projectId);
 			this.client = new googleApisSheets.auth.GoogleAuth({
-				...formattedConfig,
+				authClient: isOidc ? config : void 0,
+				credentials: isOidc ? void 0 : config,
+				projectId,
 				scopes: ["https://www.googleapis.com/auth/spreadsheets"]
 			});
 		} catch (e) {
@@ -15,7 +18,6 @@ var GoogleCloudSheetsNamespace = class extends BaseNamespace {
 		}
 	};
 	getBatchData = async (props) => {
-		await this.ensureInit();
 		return (await (await import("@googleapis/sheets")).sheets("v4").spreadsheets.values.batchGet({
 			auth: this.client,
 			dateTimeRenderOption: props?.dateTimeRender || "FORMATTED_STRING",
@@ -26,4 +28,4 @@ var GoogleCloudSheetsNamespace = class extends BaseNamespace {
 	};
 };
 //#endregion
-export { GoogleCloudSheetsNamespace };
+export { GoogleCloudSheets };

package/dist/googleCloud/sheets/server/index.cjs

@@ -1,3 +1,3 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_googleCloud_sheets_server_GoogleCloudSheetsNamespace = require("./GoogleCloudSheetsNamespace.cjs");
-exports.GoogleCloudSheetsNamespace = require_googleCloud_sheets_server_GoogleCloudSheetsNamespace.GoogleCloudSheetsNamespace;
+const require_googleCloud_sheets_server_GoogleCloudSheets = require("./GoogleCloudSheets.cjs");
+exports.GoogleCloudSheets = require_googleCloud_sheets_server_GoogleCloudSheets.GoogleCloudSheets;

package/dist/googleCloud/sheets/server/index.d.cts

@@ -1,2 +1,2 @@
-import { GoogleCloudSheetsNamespace } from "./GoogleCloudSheetsNamespace.cjs";
-export { GoogleCloudSheetsNamespace };
+import { GoogleCloudSheets } from "./GoogleCloudSheets.cjs";
+export { GoogleCloudSheets };

package/dist/googleCloud/sheets/server/index.d.mts

@@ -1,2 +1,2 @@
-import { GoogleCloudSheetsNamespace } from "./GoogleCloudSheetsNamespace.mjs";
-export { GoogleCloudSheetsNamespace };
+import { GoogleCloudSheets } from "./GoogleCloudSheets.mjs";
+export { GoogleCloudSheets };

package/dist/googleCloud/sheets/server/index.mjs

@@ -1,2 +1,2 @@
-import { GoogleCloudSheetsNamespace } from "./GoogleCloudSheetsNamespace.mjs";
-export { GoogleCloudSheetsNamespace };
+import { GoogleCloudSheets } from "./GoogleCloudSheets.mjs";
+export { GoogleCloudSheets };

package/dist/googleCloud/storage/server/{GoogleCloudStorageNamespace.cjs → GoogleCloudStorage.cjs}

@@ -1,16 +1,24 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_runtime = require("../../../_virtual/_rolldown/runtime.cjs");
 const require__class_BaseNamespace = require("../../../_class/BaseNamespace.cjs");
-const require_googleCloud_server_googleCloud = require("../../server/googleCloud.cjs");
 let stream = require("stream");
 stream = require_runtime.__toESM(stream);
-//#region src/googleCloud/storage/server/GoogleCloudStorageNamespace.ts
-var GoogleCloudStorageNamespace = class extends require__class_BaseNamespace.BaseNamespace {
-	ensureInit = async () => {
+//#region src/googleCloud/storage/server/GoogleCloudStorage.ts
+var GoogleCloudStorage = class extends require__class_BaseNamespace.BaseNamespace {
+	/**
+	* Either a Google Cloud JSON Config or V9 Auth helper.
+	*/
+	init = async (isOidc, config, projectId, region) => {
 		if (!this.client) try {
 			const { Storage } = await import("@google-cloud/storage");
-			const formattedConfig = require_googleCloud_server_googleCloud.getConfig(this.config, this.config?.projectId);
-			this.client = new Storage(formattedConfig);
+			this.client = new Storage({
+				authClient: isOidc ? config : void 0,
+				credentials: isOidc ? void 0 : config,
+				projectId
+			});
+			this.config = config;
+			this.projectId = projectId;
+			this.region = region ?? "europe-west2";
 		} catch (e) {
 			throw new Error("Google Cloud Storage Client not installed");
 		}
@@ -19,21 +27,18 @@ var GoogleCloudStorageNamespace = class extends require__class_BaseNamespace.Bas
 	* Copy a local file to Google Cloud Storage.
 	*/
 	copyToCloud = async (bucket, localFile, options = {}) => {
-		await this.ensureInit();
 		return await this.client.bucket(bucket).upload(localFile, options);
 	};
 	/**
 	* Check to see if a file exists but don't get the contents.
 	*/
 	fileExists = async (bucket, key) => {
-		await this.ensureInit();
 		return (await this.client.bucket(bucket).file(key).exists())?.[0];
 	};
 	/**
 	* Write a file to Google Cloud Storage.
 	*/
 	writeFile = async (bucket, key, data, options = {}) => {
-		await this.ensureInit();
 		const dataStream = new stream.default.PassThrough();
 		const googleFile = this.client.bucket(bucket).file(key);
 		dataStream.push(data);
@@ -54,4 +59,4 @@ var GoogleCloudStorageNamespace = class extends require__class_BaseNamespace.Bas
 	};
 };
 //#endregion
-exports.GoogleCloudStorageNamespace = GoogleCloudStorageNamespace;
+exports.GoogleCloudStorage = GoogleCloudStorage;

package/dist/googleCloud/storage/server/{GoogleCloudStorageNamespace.d.cts → GoogleCloudStorage.d.cts}

@@ -1,15 +1,17 @@
 import { BaseNamespace } from "../../../_class/BaseNamespace.cjs";
-import { GoogleCloudConfig } from "../../server/googleCloud.cjs";
 import * as _$_google_cloud_storage0 from "@google-cloud/storage";
 import { Storage } from "@google-cloud/storage";
 
-//#region src/googleCloud/storage/server/GoogleCloudStorageNamespace.d.ts
-declare class GoogleCloudStorageNamespace extends BaseNamespace {
+//#region src/googleCloud/storage/server/GoogleCloudStorage.d.ts
+declare class GoogleCloudStorage extends BaseNamespace {
   client: Storage;
-  config: GoogleCloudConfig & {
-    projectId?: string;
-  };
-  ensureInit: () => Promise<void>;
+  config: any;
+  projectId: string;
+  region: string;
+  /**
+   * Either a Google Cloud JSON Config or V9 Auth helper.
+   */
+  init: (isOidc: boolean, config: any, projectId: string, region?: string) => Promise<void>;
   /**
    * Copy a local file to Google Cloud Storage.
    */
@@ -24,4 +26,4 @@ declare class GoogleCloudStorageNamespace extends BaseNamespace {
   writeFile: (bucket: string, key: string, data: any, options?: {}) => Promise<unknown>;
 }
 //#endregion
-export { GoogleCloudStorageNamespace };
+export { GoogleCloudStorage };