@8ms/helpers 1.1.40 → 1.1.43

package/dist/date/format.js

@@ -11,7 +11,11 @@ var getDate_1 = __importDefault(require("./getDate"));
  */
 var format = function (_a) {
     var input = _a.input, dateFormat = _a.dateFormat, _b = _a.setMidnight, setMidnight = _b === void 0 ? true : _b, _c = _a.setTimeZone, setTimeZone = _c === void 0 ? false : _c;
-    var dateInstance = (0, getDate_1.default)({ input: input, setMidnight: setMidnight, setTimeZone: setTimeZone });
+    var dateInstance = (0, getDate_1.default)({
+        input: input,
+        setMidnight: setMidnight,
+        setTimeZone: setTimeZone,
+    });
     return (0, format_1.default)(dateInstance, dateFormat || 'yyyy-MM-dd');
 };
 exports.default = format;

package/dist/date/getDate.d.ts

@@ -8,5 +8,5 @@ declare type GetDateType = GetTimeZonedType & GetMidnightType & {
  * Convert a (number | string | Date) into a Date object.
  * As the user would be providing the input we don't want to change the timezone typically.
  */
-declare const getDate: ({ input, setMidnight, setTimeZone }: GetDateType) => Date;
+declare const getDate: ({ input, setMidnight, setTimeZone, }: GetDateType) => Date;
 export default getDate;

package/dist/date/getDate.js

@@ -45,38 +45,45 @@ var getDate = function (_a) {
         // 20220412
         if (8 === dateString.length) {
             var year = Number(dateString.substring(0, 4));
-            var month = Number(dateString.substring(4, 6));
+            var month = Number(dateString.substring(4, 6)) - 1;
             var day = Number(dateString.substring(6, 8));
             date = new Date();
+            // Reset the date to the 1st initially at 1am
+            date.setDate(1);
+            date.setHours(1, 0, 0, 0);
             date.setFullYear(year);
-            date.setMonth(month - 1);
+            date.setMonth(month);
             date.setDate(day);
-            date.setHours(1, 0, 0, 0);
         }
         // 2022-04-12
         else if (10 === dateString.length) {
             var year = Number(dateString.substring(0, 4));
-            var month = Number(dateString.substring(5, 7));
+            var month = Number(dateString.substring(5, 7)) - 1;
             var day = Number(dateString.substring(8, 10));
             date = new Date();
+            // Reset the date to the 1st initially at 1am
+            date.setDate(1);
+            date.setHours(1, 0, 0, 0);
             date.setFullYear(year);
-            date.setMonth(month - 1);
+            date.setMonth(month);
             date.setDate(day);
-            date.setHours(1, 0, 0, 0);
         }
         // 2022-04-12 01:01:01
         else if (19 === dateString.length) {
             var year = Number(dateString.substring(0, 4));
-            var month = Number(dateString.substring(5, 7));
+            var month = Number(dateString.substring(5, 7)) - 1;
             var day = Number(dateString.substring(8, 10));
             var hours = Number(dateString.substring(11, 13));
             var minutes = Number(dateString.substring(14, 16));
             var seconds = Number(dateString.substring(17, 19));
             date = new Date();
+            // Reset the date to the 1st initially at 1am
+            date.setDate(1);
+            date.setHours(1, 0, 0, 0);
             date.setFullYear(year);
-            date.setMonth(month - 1);
+            date.setMonth(month);
             date.setDate(day);
-            date.setHours(hours, minutes, seconds, 0);
+            date.setHours(hours, minutes, seconds);
         }
         // Unsure date format, try anything
         else {

package/dist/date/getTimeZoned.d.ts

@@ -7,7 +7,7 @@ export declare const timeZoneLondon = "Europe/London";
  * We can't use getDate here as it becomes a circular issue.
  * Returns a new Date instance.
  */
-declare const getTimeZoned: ({ input, setTimeZone }: GetTimeZonedType & {
+declare const getTimeZoned: ({ input, setTimeZone, }: GetTimeZonedType & {
     input: Date;
 }) => Date;
 export default getTimeZoned;

package/dist/date/getTimeZoned.js

@@ -16,7 +16,22 @@ var getTimeZoned = function (_a) {
     var input = _a.input, _b = _a.setTimeZone, setTimeZone = _b === void 0 ? exports.timeZoneLondon : _b;
     var dateInstance = input;
     if (setTimeZone) {
-        dateInstance = new Date((0, date_fns_tz_1.formatInTimeZone)(dateInstance, setTimeZone, 'yyyy-MM-dd HH:mm:ss'));
+        // Cannot convert YYYY-MM-DD into new Date as Safari doesn't support this
+        var dateString = (0, date_fns_tz_1.formatInTimeZone)(dateInstance, setTimeZone, 'yyyy-MM-dd HH:mm:ss');
+        var year = Number(dateString.substring(0, 4));
+        var month = Number(dateString.substring(5, 7)) - 1;
+        var day = Number(dateString.substring(8, 10));
+        var hours = Number(dateString.substring(11, 13));
+        var minutes = Number(dateString.substring(14, 16));
+        var seconds = Number(dateString.substring(17, 19));
+        dateInstance = new Date();
+        // Reset the date to the 1st initially at 1am
+        dateInstance.setDate(1);
+        dateInstance.setHours(1, 0, 0, 0);
+        dateInstance.setFullYear(year);
+        dateInstance.setMonth(month);
+        dateInstance.setDate(day);
+        dateInstance.setHours(hours, minutes, seconds);
         // Fixes the timezone offset due to daylight savings
         dateInstance = (0, addMinutes_1.default)(dateInstance, dateInstance.getTimezoneOffset() * -1);
     }

package/dist/google/drive/index.d.ts

@@ -0,0 +1,2 @@
+import writeFile from './writeFile';
+export { writeFile, };

package/dist/google/drive/index.js

@@ -0,0 +1,8 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeFile = void 0;
+var writeFile_1 = __importDefault(require("./writeFile"));
+exports.writeFile = writeFile_1.default;

package/dist/google/drive/writeFile.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Write a file to Google Drive.
+ */
+export declare const writeFile: ({ GoogleStorageLib, bucket, credentials, data, key }: {
+    GoogleStorageLib: any;
+    bucket: string;
+    credentials: any;
+    data: any;
+    key: string;
+}) => Promise<any>;
+export default writeFile;

package/dist/google/drive/writeFile.js

@@ -0,0 +1,87 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeFile = void 0;
+var stream_1 = __importDefault(require("stream"));
+/**
+ * Write a file to Google Drive.
+ */
+var writeFile = function (_a) {
+    var GoogleStorageLib = _a.GoogleStorageLib, bucket = _a.bucket, credentials = _a.credentials, data = _a.data, key = _a.key;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var Storage, storage, data_stream, google_file;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    Storage = GoogleStorageLib.Storage;
+                    storage = new Storage({
+                        credentials: {
+                            client_email: credentials.client_email,
+                            private_key: credentials.private_key,
+                        },
+                    });
+                    data_stream = new stream_1.default.PassThrough();
+                    google_file = storage.bucket(bucket)
+                        .file(key);
+                    data_stream.push(data);
+                    data_stream.push(null);
+                    return [4 /*yield*/, new Promise(function (resolve, reject) {
+                            data_stream.pipe(google_file.createWriteStream({
+                                contentType: 'auto',
+                                resumable: false,
+                                validation: false,
+                                metadata: {},
+                            }))
+                                .on('error', function (error) {
+                                reject(error);
+                            })
+                                .on('finish', function () {
+                                console.log("File uploaded successfully.");
+                                resolve(true);
+                            });
+                        })];
+                case 1: return [2 /*return*/, _b.sent()];
+            }
+        });
+    });
+};
+exports.writeFile = writeFile;
+exports.default = exports.writeFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@8ms/helpers",
-  "version": "1.1.40",
+  "version": "1.1.43",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"
@@ -21,6 +21,7 @@
     "@babel/preset-env": "7.18.2",
     "@babel/preset-flow": "7.17.12",
     "@babel/preset-typescript": "7.17.12",
+    "@google-cloud/storage": "6.1.0",
     "@types/jest": "27.5.1",
     "@types/lodash": "4.14.182",
     "@types/node": "17.0.35",