@amimpact/willy-utils 1.3.5 → 1.3.8-beta.1

package/dist/date.d.ts

@@ -17,6 +17,13 @@ interface FormatCraftDateOptions {
      * @memberof FormatCraftDateOptions
      */
     format: string;
+    /**
+     * i18n Locale mee kunnen geven
+     *
+     * @type {string}
+     * @memberof FormatCraftDateOptions
+     */
+    locale: string;
     /**
      * Amerikaans formaat maken om in Craft op te kunnen slaan, anders Nederlands
      *
@@ -79,6 +86,13 @@ interface FormatDateFromNowOptions {
      * @memberof FormatDateFromNowOptions
      */
     strict: boolean;
+    /**
+     * Welke locale is default
+     *
+     * @type {any}
+     * @memberof FormatDateFromNowOptions
+     */
+    locale: any;
 }
 /**
  * Opties voor parseISODuration

package/dist/date.js

@@ -8,8 +8,16 @@ var formatDuration_1 = require("date-fns/formatDuration");
 var isBefore_1 = require("date-fns/isBefore");
 var subDays_1 = require("date-fns/subDays");
 var locale_1 = require("date-fns/locale");
-var date_fns_timezone_1 = require("date-fns-timezone");
+var date_fns_tz_1 = require("date-fns-tz");
 var tinyduration_1 = require("./includes/tinyduration");
+/**
+ * Momenteel beschikbare locales
+ * Engels is default (leeg)
+ */
+var availableLocales = {
+    en: '',
+    nl: locale_1.nl,
+};
 /**
  * Format date object uit Craft naar iets leesbaars
  *
@@ -18,6 +26,7 @@ var tinyduration_1 = require("./includes/tinyduration");
  */
 exports.formatCraftDate = function (dateObject, options) {
     var dateFormat = options && options.systemFormat ? 'yyyy-MM-dd' : 'dd-MM-yyyy';
+    var localeString = 'nl';
     if (options && options.showTime) {
         dateFormat += ' HH:mm';
     }
@@ -25,6 +34,10 @@ exports.formatCraftDate = function (dateObject, options) {
     if (options && options.format) {
         dateFormat = options.format;
     }
+    // Locale mee kunnen geven
+    if (options && options.locale) {
+        localeString = options.locale;
+    }
     if (!dateObject || !dateObject.date) {
         return '';
     }
@@ -36,7 +49,7 @@ exports.formatCraftDate = function (dateObject, options) {
     var dateToFormat = dateObject.date.replace(/-/g, '/').split('.')[0];
     // De spatie tussen datum en tijd vervangen door 'T', anders snapt IE het niet
     return format_1.default(new Date(dateToFormat), dateFormat, {
-        locale: locale_1.nl,
+        locale: availableLocales[localeString],
     });
 };
 /**
@@ -51,6 +64,7 @@ exports.formatDateFromNow = function (dateObject, options) {
         showDateForOldFormat: 'dd-MM-yyyy',
         numberOfDaysShowDateForOld: 7,
         strict: false,
+        locale: locale_1.nl,
     };
     var opts = defaultOptions;
     if (options) {
@@ -59,23 +73,21 @@ exports.formatDateFromNow = function (dateObject, options) {
     if (!dateObject || !dateObject.date) {
         return '';
     }
-    var parsed = date_fns_timezone_1.parseFromTimeZone(dateObject.date, {
-        timeZone: dateObject.timezone,
-    });
+    var parsed = date_fns_tz_1.zonedTimeToUtc(dateObject.date, dateObject.timezone);
     /**
      * Datum tonen voor ouder dan x tijd
      */
     if (opts.showDateForOld &&
         isBefore_1.default(parsed, subDays_1.default(new Date(), opts.numberOfDaysShowDateForOld))) {
         return format_1.default(new Date(dateObject.date.replace(' ', 'T')), opts.showDateForOldFormat, {
-            locale: locale_1.nl,
+            locale: availableLocales[opts.locale],
         });
     }
     else {
         var formatDistanceOptions = {
             includeSeconds: opts.includeSeconds,
             addSuffix: opts.addSuffix,
-            locale: locale_1.nl,
+            locale: availableLocales[opts.locale],
         };
         /**
          * De postdate moet bepaald worden met timezone erbij. Anders krijg je in Engeland bijv de melding 'over ongeveer een uur'
@@ -102,10 +114,8 @@ exports.formatNewDate = function (dateObject) {
      * Safari begrijpt dit niet en geeft dan een NaN met new Date(date)
      * Safari begrijpt het wel als alle - vervangen worden door /, en het laatste gedeelte achter de punt weg is
      */
-    var dateString = dateObject.date.replace(/-/g, '/').split('.')[0];
-    var parsed = date_fns_timezone_1.parseFromTimeZone(dateString, {
-        timeZone: dateObject.timezone,
-    });
+    // const dateString = dateObject.date.replace(/-/g, '/').split('.')[0];
+    var parsed = date_fns_tz_1.zonedTimeToUtc(dateObject.date, dateObject.timezone);
     return new Date(parsed);
 };
 /**

package/dist/misc.d.ts

@@ -3,6 +3,13 @@
  * @param {string | number} bytes
  */
 export declare const bytesToSize: (bytes: number) => string;
+/**
+ * Downloaden van een bestand
+ *
+ * @param {any} data
+ * @param {string} fileName
+ */
+export declare const downloadFile: (data: any, fileName: string) => void;
 /**
  * Flat structure array ombouwen naar een array met children
  * @param {array} entries
@@ -16,6 +23,14 @@ export declare const getNestedSet: (entries: any[] | undefined, level: number |
  * @param {string} content - html
  */
 export declare const getUrlsFromString: (content: string) => RegExpMatchArray | null;
+/**
+ * Bekijken of een waarde een object is
+ * https://github.com/reduxjs/redux/blob/master/src/utils/isPlainObject.ts
+ *
+ * @param {any} value - Waarde welke je wilt checken of het een object is
+ * @returns {boolean}
+ */
+export declare const isPlainObject: (value: any) => boolean;
 /**
  * Wrap een element in een nieuw element
  *
@@ -23,10 +38,3 @@ export declare const getUrlsFromString: (content: string) => RegExpMatchArray |
  * @param {HTMLElement} wrapper
  */
 export declare const wrap: (el: HTMLElement, wrapper: HTMLElement) => void;
-/**
- * Downloaden van een bestand
- *
- * @param {any} data
- * @param {string} fileName
- */
-export declare const downloadFile: (data: any, fileName: string) => void;

package/dist/misc.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadFile = exports.wrap = exports.getUrlsFromString = exports.getNestedSet = exports.bytesToSize = void 0;
+exports.wrap = exports.isPlainObject = exports.getUrlsFromString = exports.getNestedSet = exports.downloadFile = exports.bytesToSize = void 0;
 /**
  * Toon mooier bestandsformaat
  * @param {string | number} bytes
@@ -15,6 +15,25 @@ exports.bytesToSize = function (bytes) {
     var i = Math.floor(Math.log(bytes) / Math.log(1024));
     return Math.round(bytes / Math.pow(1024, i)) + ' ' + sizes[i];
 };
+/**
+ * Downloaden van een bestand
+ *
+ * @param {any} data
+ * @param {string} fileName
+ */
+exports.downloadFile = function (data, fileName) {
+    if (typeof window.navigator.msSaveBlob !== 'undefined') {
+        window.navigator.msSaveOrOpenBlob(new Blob([data]), fileName);
+    }
+    else {
+        var fileURL = window.URL.createObjectURL(new Blob([data]));
+        var fileLink = document.createElement('a');
+        fileLink.href = fileURL;
+        fileLink.setAttribute('download', fileName);
+        document.body.appendChild(fileLink);
+        fileLink.click();
+    }
+};
 /**
  * Flat structure array ombouwen naar een array met children
  * @param {array} entries
@@ -48,6 +67,23 @@ exports.getUrlsFromString = function (content) {
     var m = content.match(regex);
     return m || null;
 };
+/**
+ * Bekijken of een waarde een object is
+ * https://github.com/reduxjs/redux/blob/master/src/utils/isPlainObject.ts
+ *
+ * @param {any} value - Waarde welke je wilt checken of het een object is
+ * @returns {boolean}
+ */
+exports.isPlainObject = function (value) {
+    if (typeof value !== 'object' || value === null) {
+        return false;
+    }
+    var proto = value;
+    while (Object.getPrototypeOf(proto) !== null) {
+        proto = Object.getPrototypeOf(proto);
+    }
+    return Object.getPrototypeOf(value) === proto;
+};
 /**
  * Wrap een element in een nieuw element
  *
@@ -60,22 +96,3 @@ exports.wrap = function (el, wrapper) {
         wrapper.appendChild(el);
     }
 };
-/**
- * Downloaden van een bestand
- *
- * @param {any} data
- * @param {string} fileName
- */
-exports.downloadFile = function (data, fileName) {
-    if (typeof window.navigator.msSaveBlob !== 'undefined') {
-        window.navigator.msSaveOrOpenBlob(new Blob([data]), fileName);
-    }
-    else {
-        var fileURL = window.URL.createObjectURL(new Blob([data]));
-        var fileLink = document.createElement('a');
-        fileLink.href = fileURL;
-        fileLink.setAttribute('download', fileName);
-        document.body.appendChild(fileLink);
-        fileLink.click();
-    }
-};

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@amimpact/willy-utils",
-  "version": "1.3.5",
+  "version": "1.3.8-beta.1",
   "description": "Javascript utils",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "publish:patch": "npm version patch",
-    "publish:minor": "npm version minor",
-    "publish:major": "npm version major",
+    "publish:prerelease": "npm version prerelease --preid beta && npm publish --tag beta",
+    "publish:prepatch": "npm version prepatch --preid beta && npm publish --tag beta",
+    "publish:patch": "npm version patch && npm publish",
+    "publish:preminor": "npm version preminor --preid beta && npm publish --tag beta",
+    "publish:minor": "npm version minor && npm publish",
     "postpublish": "git push origin --all; git push origin --tags",
-    "postversion": "npm publish",
     "preversion": "npm run build",
     "watch": "onchange src/* -- npm run build"
   },
@@ -31,7 +32,7 @@
     "typescript": "4.0.5"
   },
   "dependencies": {
-    "date-fns": "2.16.1",
-    "date-fns-timezone": "0.1.4"
+    "date-fns": "2.27.0",
+    "date-fns-tz": "1.1.6"
   }
 }