@8ms/helpers 1.2.15 → 1.2.17

package/global/read.js

@@ -18,7 +18,7 @@ const read = async ({ key }) => {
     // Exists (0 is determined as forever)
     else if (0 != global['ems_cache'][key].expires) {
         // https://ui.dev/get-current-timestamp-javascript
-        const expiresAt = Math.floor(global['ems_cache'][key].insertedAt / 1000) + global[key].expires;
+        const expiresAt = Math.floor(global['ems_cache'][key].insertedAt / 1000) + global['ems_cache'][key].expires;
         const now = Math.floor(Date.now() / 1000);
         // If we are now beyond the expiry date, update the data
         if (now > expiresAt) {

package/google/bigQuery/loadData.d.ts

@@ -1,12 +1,16 @@
 type LoadData = {
-    bucket: string;
-    key: string;
-    datasetId: string;
-    tableId: string;
-    metadata: object;
+    file: {
+        bucket: string;
+        key: string;
+        metadata: object;
+    };
+    table: {
+        datasetId: string;
+        tableId: string;
+    };
 };
 /**
  * Load data into a given table.
  */
-declare const loadData: ({ bucket, datasetId, key, metadata, tableId }: LoadData) => Promise<void>;
+declare const loadData: ({ file, table }: LoadData) => Promise<void>;
 export default loadData;

package/google/bigQuery/loadData.js

@@ -7,12 +7,16 @@ const IsTableExists_1 = __importDefault(require("./IsTableExists"));
 /**
  * Load data into a given table.
  */
-const loadData = async ({ bucket, datasetId, key, metadata, tableId }) => {
-    const tableExists = await (0, IsTableExists_1.default)({ datasetId, tableId });
+const loadData = async ({ file, table }) => {
+    const tableExists = await (0, IsTableExists_1.default)({
+        datasetId: table.datasetId,
+        tableId: table.tableId,
+    });
     if (tableExists) {
-        await global.googleBigQueryClient.dataset(datasetId)
-            .table(tableId)
-            .load(global.googleStorageClient.bucket(bucket).file(key), metadata);
+        await global.googleBigQueryClient.dataset(table.datasetId)
+            .table(table.tableId)
+            .load(global.googleStorageClient.bucket(file.bucket)
+            .file(file.key), file.metadata);
     }
 };
 exports.default = loadData;

package/package.json

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