@8ms/helpers 2.2.24 → 2.2.26

package/google/{bigQuery/server/GoogleBigQueryNamespace.d.ts → bigquery/server/GoogleBigqueryNamespace.d.ts}

@@ -14,7 +14,7 @@ type Dataset = {
 type Table = {
     id: string;
 };
-export declare class GoogleBigQueryNamespace extends BaseNamespace {
+export declare class GoogleBigqueryNamespace extends BaseNamespace {
     client: BigQuery;
     config: GoogleCloudConfig & {
         projectId?: string;
@@ -26,7 +26,7 @@ export declare class GoogleBigQueryNamespace extends BaseNamespace {
      */
     createDataset: (datasetId: string, options?: DatasetResource) => Promise<void>;
     /**
-     * Check to see whether a given BigQuery dataset exists.
+     * Check to see whether a given Bigquery dataset exists.
      * Based off:
      * https://github.com/googleapis/nodejs-bigquery/blob/main/samples/getDataset.js
      */

package/google/{bigQuery/server/GoogleBigQueryNamespace.js → bigquery/server/GoogleBigqueryNamespace.js}

@@ -1,6 +1,6 @@
 import { BaseNamespace } from "../../../_class";
 import { getConfig } from "../../server";
-export class GoogleBigQueryNamespace extends BaseNamespace {
+export class GoogleBigqueryNamespace extends BaseNamespace {
     ensureInit = async () => {
         if (!this.client) {
             try {
@@ -26,7 +26,7 @@ export class GoogleBigQueryNamespace extends BaseNamespace {
         }
     };
     /**
-     * Check to see whether a given BigQuery dataset exists.
+     * Check to see whether a given Bigquery dataset exists.
      * Based off:
      * https://github.com/googleapis/nodejs-bigquery/blob/main/samples/getDataset.js
      */

package/google/bigquery/server/index.d.ts

@@ -0,0 +1,6 @@
+import { GoogleBigqueryNamespace } from "./GoogleBigqueryNamespace";
+import type { GoogleAuthOptions } from "@google-cloud/common";
+export declare const googleBigqueryClient: (key?: string, projectId?: string, config?: GoogleAuthOptions, vaultId?: string, itemId?: string) => Promise<GoogleBigqueryNamespace>;
+export declare const getHandlerPath: (input: string) => string;
+export { loadData } from "./loadData";
+export type { QueryInput } from "./GoogleBigqueryNamespace";

package/google/{bigQuery → bigquery}/server/index.js

@@ -1,9 +1,9 @@
-import { GoogleBigQueryNamespace } from "./GoogleBigQueryNamespace";
+import { GoogleBigqueryNamespace } from "./GoogleBigqueryNamespace";
 import { onePasswordClient } from "../../../onePassword/server";
-const googleBigQueryNamespaces = new Map();
-export const googleBigQueryClient = async (key = "default", projectId, config, vaultId, itemId) => {
-    if (googleBigQueryNamespaces.has(key)) {
-        return googleBigQueryNamespaces.get(key);
+const googleBigqueryNamespaces = new Map();
+export const googleBigqueryClient = async (key = "default", projectId, config, vaultId, itemId) => {
+    if (googleBigqueryNamespaces.has(key)) {
+        return googleBigqueryNamespaces.get(key);
     }
     let instanceConfig;
     if (config) {
@@ -31,8 +31,8 @@ export const googleBigQueryClient = async (key = "default", projectId, config, v
     else {
         throw new Error(`Config required for namespace '${key}'`);
     }
-    const namespace = new GoogleBigQueryNamespace(key, instanceConfig);
-    googleBigQueryNamespaces.set(key, namespace);
+    const namespace = new GoogleBigqueryNamespace(key, instanceConfig);
+    googleBigqueryNamespaces.set(key, namespace);
     return namespace;
 };
 export const getHandlerPath = (input) => {

package/google/{bigQuery → bigquery}/server/loadData.d.ts

@@ -1,6 +1,6 @@
-import { GoogleBigQueryNamespace } from "./GoogleBigQueryNamespace";
+import { GoogleBigqueryNamespace } from "./GoogleBigqueryNamespace";
 type LoadData = {
-    googleBigQueryClient: GoogleBigQueryNamespace;
+    googleBigqueryClient: GoogleBigqueryNamespace;
     googleCloudStorageClient: any;
     file: {
         bucket: string;
@@ -15,5 +15,5 @@ type LoadData = {
 /**
  * Load data into a given table using Google Cloud Storage.
  */
-export declare const loadData: ({ file, googleBigQueryClient, googleCloudStorageClient, table }: LoadData) => Promise<void>;
+export declare const loadData: ({ file, googleBigqueryClient, googleCloudStorageClient, table }: LoadData) => Promise<void>;
 export {};

package/google/{bigQuery → bigquery}/server/loadData.js

@@ -1,10 +1,10 @@
 /**
  * Load data into a given table using Google Cloud Storage.
  */
-export const loadData = async ({ file, googleBigQueryClient, googleCloudStorageClient, table }) => {
-    const tableExists = await googleBigQueryClient.tableExists(table.datasetId, table.tableId);
+export const loadData = async ({ file, googleBigqueryClient, googleCloudStorageClient, table }) => {
+    const tableExists = await googleBigqueryClient.tableExists(table.datasetId, table.tableId);
     if (tableExists) {
-        await googleBigQueryClient.client
+        await googleBigqueryClient.client
             .dataset(table.datasetId)
             .table(table.tableId)
             .load(googleCloudStorageClient.client

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@8ms/helpers",
 	"license": "UNLICENSED",
-	"version": "2.2.24",
+	"version": "2.2.26",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"
@@ -681,21 +681,21 @@
 			"types": "./geo/index.d.ts",
 			"default": "./geo/index.d.ts"
 		},
-		"./google/bigQuery/server": {
-			"types": "./google/bigQuery/server/index.d.ts",
-			"import": "./google/bigQuery/server/index.js",
-			"require": "./google/bigQuery/server/index.js",
-			"default": "./google/bigQuery/server/index.js"
-		},
-		"./google/bigQuery/server/index.js": {
-			"types": "./google/bigQuery/server/index.d.ts",
-			"import": "./google/bigQuery/server/index.js",
-			"require": "./google/bigQuery/server/index.js",
-			"default": "./google/bigQuery/server/index.js"
-		},
-		"./google/bigQuery/server/index.d.ts": {
-			"types": "./google/bigQuery/server/index.d.ts",
-			"default": "./google/bigQuery/server/index.d.ts"
+		"./google/bigquery/server": {
+			"types": "./google/bigquery/server/index.d.ts",
+			"import": "./google/bigquery/server/index.js",
+			"require": "./google/bigquery/server/index.js",
+			"default": "./google/bigquery/server/index.js"
+		},
+		"./google/bigquery/server/index.js": {
+			"types": "./google/bigquery/server/index.d.ts",
+			"import": "./google/bigquery/server/index.js",
+			"require": "./google/bigquery/server/index.js",
+			"default": "./google/bigquery/server/index.js"
+		},
+		"./google/bigquery/server/index.d.ts": {
+			"types": "./google/bigquery/server/index.d.ts",
+			"default": "./google/bigquery/server/index.d.ts"
 		},
 		"./google/server": {
 			"types": "./google/server/index.d.ts",

package/util/promiseChunks.d.ts

@@ -2,4 +2,4 @@
  * Chunk a queue of promises into controlled chunks to prevent overloading.
  * https://stackoverflow.com/a/53964407
  */
-export declare const promiseChunks: (promises: Promise<any>[], size: number, sleepSeconds?: number) => Promise<any[]>;
+export declare const promiseChunks: (promises: Promise<any>[], size: number, sleepSeconds?: number, callbackFunction?: Function) => Promise<any[]>;

package/util/promiseChunks.js

@@ -4,13 +4,17 @@ import { sleep } from "./sleep";
  * Chunk a queue of promises into controlled chunks to prevent overloading.
  * https://stackoverflow.com/a/53964407
  */
-export const promiseChunks = async (promises, size, sleepSeconds = 0) => {
+export const promiseChunks = async (promises, size, sleepSeconds = 0, callbackFunction) => {
     const batches = chunk(promises, size);
     let results = [];
     while (batches.length) {
         const batch = batches.shift();
         const result = await Promise.all(batch);
         results.push(result);
+        // If there is a process to do with each chunk
+        if (callbackFunction) {
+            await callbackFunction(result);
+        }
         await sleep(sleepSeconds);
     }
     return flatten(results);

package/google/bigQuery/server/index.d.ts

@@ -1,6 +0,0 @@
-import { GoogleBigQueryNamespace } from "./GoogleBigQueryNamespace";
-import type { GoogleAuthOptions } from "@google-cloud/common";
-export declare const googleBigQueryClient: (key?: string, projectId?: string, config?: GoogleAuthOptions, vaultId?: string, itemId?: string) => Promise<GoogleBigQueryNamespace>;
-export declare const getHandlerPath: (input: string) => string;
-export { loadData } from "./loadData";
-export type { QueryInput } from "./GoogleBigQueryNamespace";