date-and-time 0.14.2 → 2.0.1

package/locale/zh-cn.js

@@ -1,12 +1,16 @@
-/**
- * @preserve date-and-time.js locale configuration
- * @preserve Chinese (zh-cn)
- * @preserve It is using moment.js locale configuration as a reference.
- */
-(function (global) {
-    'use strict';
+(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+    typeof define === 'function' && define.amd ? define(factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, (global.date = global.date || {}, global.date.locale = global.date.locale || {}, global.date.locale["zh-cn"] = factory()));
+})(this, (function () { 'use strict';
 
-    var exec = function (date) {
+    /**
+     * @preserve date-and-time.js locale configuration
+     * @preserve Chinese (zh-cn)
+     * @preserve It is using moment.js locale configuration as a reference.
+     */
+
+    var zh_cn = function (date) {
         var code = 'zh-cn';
 
         date.locale(code, {
@@ -47,15 +51,6 @@
         return code;
     };
 
-    if (typeof module === 'object' && typeof module.exports === 'object') {
-        (module.paths || []).push('./');
-        module.exports = exec;
-        // This line will be removed in the next version.
-        exec(require('date-and-time'));
-    } else if (typeof define === 'function' && define.amd) {
-        define(['date-and-time'], exec);
-    } else {
-        exec(global.date);
-    }
+    return zh_cn;
 
-}(this));
+}));

package/locale/zh-tw.js

@@ -1,12 +1,16 @@
-/**
- * @preserve date-and-time.js locale configuration
- * @preserve Chinese (zh-tw)
- * @preserve It is using moment.js locale configuration as a reference.
- */
-(function (global) {
-    'use strict';
+(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+    typeof define === 'function' && define.amd ? define(factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, (global.date = global.date || {}, global.date.locale = global.date.locale || {}, global.date.locale["zh-tw"] = factory()));
+})(this, (function () { 'use strict';
 
-    var exec = function (date) {
+    /**
+     * @preserve date-and-time.js locale configuration
+     * @preserve Chinese (zh-tw)
+     * @preserve It is using moment.js locale configuration as a reference.
+     */
+
+    var zh_tw = function (date) {
         var code = 'zh-tw';
 
         date.locale(code, {
@@ -45,15 +49,6 @@
         return code;
     };
 
-    if (typeof module === 'object' && typeof module.exports === 'object') {
-        (module.paths || []).push('./');
-        module.exports = exec;
-        // This line will be removed in the next version.
-        exec(require('date-and-time'));
-    } else if (typeof define === 'function' && define.amd) {
-        define(['date-and-time'], exec);
-    } else {
-        exec(global.date);
-    }
+    return zh_tw;
 
-}(this));
+}));

package/package.json

@@ -1,11 +1,30 @@
 {
   "name": "date-and-time",
-  "version": "0.14.2",
+  "version": "2.0.1",
   "description": "A Minimalist DateTime utility for Node.js and the browser",
   "main": "date-and-time.js",
+  "module": "esm/date-and-time.es.js",
+  "unpkg": "date-and-time.min.js",
+  "exports": {
+    ".": {
+      "browser": "./esm/date-and-time.es.js",
+      "import": "./esm/date-and-time.mjs",
+      "require": "./date-and-time.js"
+    },
+    "./locale/*": {
+      "browser": "./esm/locale/*.es.js",
+      "import": "./esm/locale/*.mjs",
+      "require": "./locale/*.js"
+    },
+    "./plugin/*": {
+      "browser": "./esm/plugin/*.es.js",
+      "import": "./esm/plugin/*.mjs",
+      "require": "./plugin/*.js"
+    }
+  },
   "scripts": {
-    "test": "./test.sh",
-    "compile": "./compile.sh date-and-time.js date-and-time.min.js"
+    "build": "rollup --config rollup.config.js",
+    "test": "./test.sh"
   },
   "repository": {
     "type": "git",
@@ -25,14 +44,10 @@
   },
   "homepage": "https://github.com/knowledgecode/date-and-time",
   "devDependencies": {
-    "babel-preset-env": "^1.7.0",
-    "babelify": "^7.3.0",
-    "browserify": "^16.5.2",
+    "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",
     "expect.js": "^0.3.1",
-    "mocha": "^7.2.0",
-    "mocha-headless-chrome": "^3.1.0"
-  },
-  "browser": {
-    "date-and-time": "./date-and-time.js"
+    "mocha": "^9.1.2",
+    "mocha-headless-chrome": "^3.1.0",
+    "rollup": "^2.58.0"
   }
 }

package/plugin/day-of-week.js

@@ -1,7 +1,15 @@
-(function (global) {
-    'use strict';
+(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+    typeof define === 'function' && define.amd ? define(factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, (global.date = global.date || {}, global.date.plugin = global.date.plugin || {}, global.date.plugin["day-of-week"] = factory()));
+})(this, (function () { 'use strict';
 
-    var exec = function (date) {
+    /**
+     * @preserve date-and-time.js plugin
+     * @preserve day-of-week
+     */
+
+    var plugin = function (date) {
         var name = 'day-of-week';
 
         date.plugin(name, {
@@ -14,15 +22,6 @@
         return name;
     };
 
-    if (typeof module === 'object' && typeof module.exports === 'object') {
-        (module.paths || []).push('./');
-        module.exports = exec;
-        // This line will be removed in the next version.
-        exec(require('date-and-time'));
-    } else if (typeof define === 'function' && define.amd) {
-        define(['date-and-time'], exec);
-    } else {
-        exec(global.date);
-    }
+    return plugin;
 
-}(this));
+}));

package/plugin/meridiem.js

@@ -1,31 +1,48 @@
-(function (global) {
-    'use strict';
+(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+    typeof define === 'function' && define.amd ? define(factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, (global.date = global.date || {}, global.date.plugin = global.date.plugin || {}, global.date.plugin.meridiem = factory()));
+})(this, (function () { 'use strict';
 
-    var exec = function (date) {
+    /**
+     * @preserve date-and-time.js plugin
+     * @preserve meridiem
+     */
+
+    var plugin = function (date) {
         var name = 'meridiem';
 
         date.plugin(name, {
             res: {
-                A: ['AM', 'PM', 'A.M.', 'P.M.', 'am', 'pm', 'a.m.', 'p.m.']
+                AA: ['A.M.', 'P.M.'],
+                a: ['am', 'pm'],
+                aa: ['a.m.', 'p.m.']
             },
             formatter: {
                 AA: function (d) {
-                    // A.M. / P.M.
-                    return this.res.A[d.getHours() > 11 | 0 + 2];
+                    return this.res.AA[d.getHours() > 11 | 0];
                 },
                 a: function (d) {
-                    // am / pm
-                    return this.res.A[d.getHours() > 11 | 0 + 4];
+                    return this.res.a[d.getHours() > 11 | 0];
                 },
                 aa: function (d) {
-                    // a.m. / p.m.
-                    return this.res.A[d.getHours() > 11 | 0 + 6];
+                    return this.res.aa[d.getHours() > 11 | 0];
                 }
             },
             parser: {
-                A: function (str) {
-                    var result = this.find(this.res.A, str);
-                    result.value %= 2;
+                AA: function (str) {
+                    var result = this.find(this.res.AA, str);
+                    result.token = 'A';
+                    return result;
+                },
+                a: function (str) {
+                    var result = this.find(this.res.a, str);
+                    result.token = 'A';
+                    return result;
+                },
+                aa: function (str) {
+                    var result = this.find(this.res.aa, str);
+                    result.token = 'A';
                     return result;
                 }
             }
@@ -33,15 +50,6 @@
         return name;
     };
 
-    if (typeof module === 'object' && typeof module.exports === 'object') {
-        (module.paths || []).push('./');
-        module.exports = exec;
-        // This line will be removed in the next version.
-        exec(require('date-and-time'));
-    } else if (typeof define === 'function' && define.amd) {
-        define(['date-and-time'], exec);
-    } else {
-        exec(global.date);
-    }
+    return plugin;
 
-}(this));
+}));

package/plugin/microsecond.js

@@ -1,10 +1,18 @@
-(function (global) {
-    'use strict';
+(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+    typeof define === 'function' && define.amd ? define(factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, (global.date = global.date || {}, global.date.plugin = global.date.plugin || {}, global.date.plugin.microsecond = factory()));
+})(this, (function () { 'use strict';
 
-    var exec = function (date) {
+    /**
+     * @preserve date-and-time.js plugin
+     * @preserve microsecond
+     */
+
+    var plugin = function (date) {
         var name = 'microsecond';
 
-        date.plugin('microsecond', {
+        date.plugin(name, {
             parser: {
                 SSSSSS: function (str) {
                     var result = this.exec(/^\d{1,6}/, str);
@@ -26,15 +34,6 @@
         return name;
     };
 
-    if (typeof module === 'object' && typeof module.exports === 'object') {
-        (module.paths || []).push('./');
-        module.exports = exec;
-        // This line will be removed in the next version.
-        exec(require('date-and-time'));
-    } else if (typeof define === 'function' && define.amd) {
-        define(['date-and-time'], exec);
-    } else {
-        exec(global.date);
-    }
+    return plugin;
 
-}(this));
+}));

package/plugin/ordinal.js

@@ -1,7 +1,15 @@
-(function (global) {
-    'use strict';
+(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+    typeof define === 'function' && define.amd ? define(factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, (global.date = global.date || {}, global.date.plugin = global.date.plugin || {}, global.date.plugin.ordinal = factory()));
+})(this, (function () { 'use strict';
 
-    var exec = function (date) {
+    /**
+     * @preserve date-and-time.js plugin
+     * @preserve ordinal
+     */
+
+    var plugin = function (date) {
         var name = 'ordinal';
 
         date.plugin(name, {
@@ -29,15 +37,6 @@
         return name;
     };
 
-    if (typeof module === 'object' && typeof module.exports === 'object') {
-        (module.paths || []).push('./');
-        module.exports = exec;
-        // This line will be removed in the next version.
-        exec(require('date-and-time'));
-    } else if (typeof define === 'function' && define.amd) {
-        define(['date-and-time'], exec);
-    } else {
-        exec(global.date);
-    }
+    return plugin;
 
-}(this));
+}));

package/plugin/timespan.js

@@ -1,7 +1,15 @@
-(function (global) {
-    'use strict';
+(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+    typeof define === 'function' && define.amd ? define(factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, (global.date = global.date || {}, global.date.plugin = global.date.plugin || {}, global.date.plugin.timespan = factory()));
+})(this, (function () { 'use strict';
 
-    var exec = function (date) {
+    /**
+     * @preserve date-and-time.js plugin
+     * @preserve timespan
+     */
+
+    var plugin = function (date) {
         var timeSpan = function (date1, date2) {
             var milliseconds = function (dt, time) {
                     dt.S = time;
@@ -70,15 +78,6 @@
         return name;
     };
 
-    if (typeof module === 'object' && typeof module.exports === 'object') {
-        (module.paths || []).push('./');
-        module.exports = exec;
-        // This line will be removed in the next version.
-        exec(require('date-and-time'));
-    } else if (typeof define === 'function' && define.amd) {
-        define(['date-and-time'], exec);
-    } else {
-        exec(global.date);
-    }
+    return plugin;
 
-}(this));
+}));

package/plugin/timezone.js

@@ -0,0 +1,81 @@
+(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+    typeof define === 'function' && define.amd ? define(factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, (global.date = global.date || {}, global.date.plugin = global.date.plugin || {}, global.date.plugin.timezone = factory()));
+})(this, (function () { 'use strict';
+
+    /**
+     * @preserve date-and-time.js plugin
+     * @preserve timezone
+     */
+
+    var plugin = function (date, localized_date) {
+        var options = {
+            year: 'numeric', month: 'numeric', day: 'numeric',
+            hour: 'numeric', minute: 'numeric', second: 'numeric'
+        };
+        var pattern = date.compile('M/D/Y, h:mm:ss A');
+        var formatTZ = function (dateObj, arg, timeZone) {
+            options.timeZone = 'UTC';
+            var utcObj = date.parse(new Intl.DateTimeFormat('en-US', options).format(dateObj), pattern);
+
+            options.timeZone = timeZone;
+            var dateObj2 = date.parse(new Intl.DateTimeFormat('en-US', options).format(dateObj), pattern);
+
+            var dateObj3 = date.addMilliseconds(dateObj2, dateObj.getMilliseconds());
+
+            dateObj3.getTimezoneOffset = function () { return (utcObj.getTime() - dateObj2.getTime()) / 60000 | 0; };
+            return localized_date.format(dateObj3, arg);
+        };
+        var adjustments = [
+            -60, -30, -20,
+            0,
+            60, 30, 20
+        ];
+        var parseTZ = function (dateString, arg, timeZone) {
+            var pattern2 = typeof arg === 'string' ? date.compile(arg) : arg;
+            var dateObj = localized_date.parse(dateString, pattern2, true);
+
+            for (var i = 1, len = pattern2.length; i < len; i++) {
+                if (pattern2[i].indexOf('Z') === 0) {
+                    return dateObj;
+                }
+            }
+
+            options.timeZone = timeZone;
+            var dateTimeFormat = new Intl.DateTimeFormat('en-US', options);
+            var dateObj2 = date.addMilliseconds(
+                date.parse(dateTimeFormat.format(dateObj), pattern, true),
+                dateObj.getMilliseconds()
+            );
+            var offset = dateObj.getTime() - dateObj2.getTime();
+            var dateString2 = date.format(localized_date.parse(dateString, pattern2), pattern);
+
+            var comparer = function (d) {
+                return dateString2 === dateTimeFormat.format(d);
+            };
+
+            // Trying to adjust for daylight saving time.
+            for (var j = 0, len2 = adjustments.length; j < len2; j++) {
+                var d = date.addMilliseconds(dateObj, offset + adjustments[j] * 60000);
+                if (comparer(d)) {
+                    return d;
+                }
+            }
+            return NaN;
+        };
+
+        var name = 'timezone';
+
+        date.plugin(name, {
+            extender: {
+                formatTZ: formatTZ,
+                parseTZ: parseTZ
+            }
+        });
+        return name;
+    };
+
+    return plugin;
+
+}));

package/plugin/two-digit-year.js

@@ -1,7 +1,15 @@
-(function (global) {
-    'use strict';
+(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+    typeof define === 'function' && define.amd ? define(factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, (global.date = global.date || {}, global.date.plugin = global.date.plugin || {}, global.date.plugin["two-digit-year"] = factory()));
+})(this, (function () { 'use strict';
 
-    var exec = function (date) {
+    /**
+     * @preserve date-and-time.js plugin
+     * @preserve two-digit-year
+     */
+
+    var plugin = function (date) {
         var name = 'two-digit-year';
 
         date.plugin(name, {
@@ -10,26 +18,12 @@
                     var result = this.exec(/^\d\d/, str);
                     result.value += result.value < 70 ? 2000 : 1900;
                     return result;
-                },
-                Y: function (str) {
-                    var result = this.exec(/^\d\d?/, str);
-                    result.value += result.value < 70 ? 2000 : 1900;
-                    return result;
                 }
             }
         });
         return name;
     };
 
-    if (typeof module === 'object' && typeof module.exports === 'object') {
-        (module.paths || []).push('./');
-        module.exports = exec;
-        // This line will be removed in the next version.
-        exec(require('date-and-time'));
-    } else if (typeof define === 'function' && define.amd) {
-        define(['date-and-time'], exec);
-    } else {
-        exec(global.date);
-    }
+    return plugin;
 
-}(this));
+}));