svelte-copyright 1.1.4 → 1.2.0

package/lib/index.js

@@ -2,7 +2,7 @@
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
     typeof define === 'function' && define.amd ? define(['exports'], factory) :
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Copyright = {}));
-}(this, (function (exports) { 'use strict';
+})(this, (function (exports) { 'use strict';
 
     function noop() { }
     function assign(tar, src) {
@@ -58,13 +58,23 @@
         }
         return $$scope.dirty;
     }
-    function update_slot(slot, slot_definition, ctx, $$scope, dirty, get_slot_changes_fn, get_slot_context_fn) {
-        const slot_changes = get_slot_changes(slot_definition, $$scope, dirty, get_slot_changes_fn);
+    function update_slot_base(slot, slot_definition, ctx, $$scope, slot_changes, get_slot_context_fn) {
         if (slot_changes) {
             const slot_context = get_slot_context(slot_definition, ctx, $$scope, get_slot_context_fn);
             slot.p(slot_context, slot_changes);
         }
     }
+    function get_all_dirty_from_scope($$scope) {
+        if ($$scope.ctx.length > 32) {
+            const dirty = [];
+            const length = $$scope.ctx.length / 32;
+            for (let i = 0; i < length; i++) {
+                dirty[i] = -1;
+            }
+            return dirty;
+        }
+        return -1;
+    }
     function exclude_internal_props(props) {
         const result = {};
         for (const k in props)
@@ -80,7 +90,6 @@
                 rest[k] = props[k];
         return rest;
     }
-
     function append(target, node) {
         target.appendChild(node);
     }
@@ -88,7 +97,9 @@
         target.insertBefore(node, anchor || null);
     }
     function detach(node) {
-        node.parentNode.removeChild(node);
+        if (node.parentNode) {
+            node.parentNode.removeChild(node);
+        }
     }
     function element(name) {
         return document.createElement(name);
@@ -150,22 +161,40 @@
     function add_render_callback(fn) {
         render_callbacks.push(fn);
     }
-    let flushing = false;
+    // flush() calls callbacks in this order:
+    // 1. All beforeUpdate callbacks, in order: parents before children
+    // 2. All bind:this callbacks, in reverse order: children before parents.
+    // 3. All afterUpdate callbacks, in order: parents before children. EXCEPT
+    //    for afterUpdates called during the initial onMount, which are called in
+    //    reverse order: children before parents.
+    // Since callbacks might update component values, which could trigger another
+    // call to flush(), the following steps guard against this:
+    // 1. During beforeUpdate, any updated components will be added to the
+    //    dirty_components array and will cause a reentrant call to flush(). Because
+    //    the flush index is kept outside the function, the reentrant call will pick
+    //    up where the earlier call left off and go through all dirty components. The
+    //    current_component value is saved and restored so that the reentrant call will
+    //    not interfere with the "parent" flush() call.
+    // 2. bind:this callbacks cannot trigger new flush() calls.
+    // 3. During afterUpdate, any updated components will NOT have their afterUpdate
+    //    callback called a second time; the seen_callbacks set, outside the flush()
+    //    function, guarantees this behavior.
     const seen_callbacks = new Set();
+    let flushidx = 0; // Do *not* move this inside the flush() function
     function flush() {
-        if (flushing)
-            return;
-        flushing = true;
+        const saved_component = current_component;
         do {
             // first, call beforeUpdate functions
             // and update components
-            for (let i = 0; i < dirty_components.length; i += 1) {
-                const component = dirty_components[i];
+            while (flushidx < dirty_components.length) {
+                const component = dirty_components[flushidx];
+                flushidx++;
                 set_current_component(component);
                 update(component.$$);
             }
             set_current_component(null);
             dirty_components.length = 0;
+            flushidx = 0;
             while (binding_callbacks.length)
                 binding_callbacks.pop()();
             // then, once components are updated, call
@@ -185,8 +214,8 @@
             flush_callbacks.pop()();
         }
         update_scheduled = false;
-        flushing = false;
         seen_callbacks.clear();
+        set_current_component(saved_component);
     }
     function update($$) {
         if ($$.fragment !== null) {
@@ -221,6 +250,9 @@
             });
             block.o(local);
         }
+        else if (callback) {
+            callback();
+        }
     }
 
     function get_spread_update(levels, updates) {
@@ -257,14 +289,17 @@
         return update;
     }
     function mount_component(component, target, anchor, customElement) {
-        const { fragment, on_mount, on_destroy, after_update } = component.$$;
+        const { fragment, after_update } = component.$$;
         fragment && fragment.m(target, anchor);
         if (!customElement) {
             // onMount happens before the initial afterUpdate
             add_render_callback(() => {
-                const new_on_destroy = on_mount.map(run).filter(is_function);
-                if (on_destroy) {
-                    on_destroy.push(...new_on_destroy);
+                const new_on_destroy = component.$$.on_mount.map(run).filter(is_function);
+                // if the component was destroyed immediately
+                // it will update the `$$.on_destroy` reference to `null`.
+                // the destructured on_destroy may still reference to the old array
+                if (component.$$.on_destroy) {
+                    component.$$.on_destroy.push(...new_on_destroy);
                 }
                 else {
                     // Edge case - component was destroyed immediately,
@@ -295,12 +330,12 @@
         }
         component.$$.dirty[(i / 31) | 0] |= (1 << (i % 31));
     }
-    function init(component, options, instance, create_fragment, not_equal, props, dirty = [-1]) {
+    function init(component, options, instance, create_fragment, not_equal, props, append_styles, dirty = [-1]) {
         const parent_component = current_component;
         set_current_component(component);
         const $$ = component.$$ = {
             fragment: null,
-            ctx: null,
+            ctx: [],
             // state
             props,
             update: noop,
@@ -312,12 +347,14 @@
             on_disconnect: [],
             before_update: [],
             after_update: [],
-            context: new Map(parent_component ? parent_component.$$.context : options.context || []),
+            context: new Map(options.context || (parent_component ? parent_component.$$.context : [])),
             // everything else
             callbacks: blank_object(),
             dirty,
-            skip_bound: false
+            skip_bound: false,
+            root: options.target || parent_component.$$.root
         };
+        append_styles && append_styles($$.root);
         let ready = false;
         $$.ctx = instance
             ? instance(component, options.props || {}, (i, ret, ...rest) => {
@@ -363,6 +400,9 @@
             this.$destroy = noop;
         }
         $on(type, callback) {
+            if (!is_function(callback)) {
+                return noop;
+            }
             const callbacks = (this.$$.callbacks[type] || (this.$$.callbacks[type] = []));
             callbacks.push(callback);
             return () => {
@@ -406,39 +446,58 @@
       return date.getFullYear().toString();
     }
 
-    //  HOF which is injected with the format and returns the date formatter function.
-    function withFormatGetDate(format = FORMAT.NUMERIC) {
-      return function formatDate(date = today()) {
-        if (format === FORMAT.NUMERIC) {
-          return toYear(date);
-        }
-        if (format === FORMAT.TWO_DIGIT) {
-          return `’${toYear(date).slice(-2)}`;
-        }
+    /**
+     * Formats the date, just for you!
+     *
+     * @param {Date} date - Date to format
+     * @param {'numeric' | '2-digit'} format - Format for the date.
+     */
+    function formatDate(date = today(), format = FORMAT.NUMERIC) {
+      if (format === FORMAT.NUMERIC) {
+        return toYear(date);
+      }
+      if (format === FORMAT.TWO_DIGIT) {
+        return `’${toYear(date).slice(-2)}`;
       }
     }
 
-    //  A default for the getDateRange formatter.
-    function defaultFormatDate(date) {
-      return date;
+    /**
+     * Returns the "range string", unless the dates are the same.
+     *
+     * @param {string} date1 - First date (formatted to a string)
+     * @param {string} date2 - Second date (formatted to a string).
+     */
+    function getRange(date1, date2) {
+      //  Don't show a range if years are the same, as that would be dumb.
+      if (date1 === date2) {
+        return date1;
+      }
+      return `${date1} - ${date2}`;
     }
 
-    //  HOF which is injected with the showRange and returns a getDateRange function.
-    function withGetDateRange(showRange = false) {
-      return function getDateRange(date = today(), formatDate = defaultFormatDate) {
-        const formattedToday = formatDate(today());
-        const formattedDate = formatDate(date);
-        if (showRange && formattedToday !== formattedDate) { // Make sure that if it's a range, the two years aren't the same.
-          return [
-            formattedDate,
-            formattedToday
-          ].join(' - ');
-        }
-        return formattedDate;
+    /**
+     * Returns the displayed date for the component.
+     *
+     * @param {boolean} options.showRange - If a date range should be displayed.
+     * @param {Date} options.date - Copyright year to be used. If showRange is true, this is the start year of the range.
+     * @param {'numeric' | '2-digit'} options.format - Date format to be used.
+     */
+    function getDisplayDate({
+      showRange = false,
+      date = today(),
+      format = FORMAT.NUMERIC,
+    }) {
+      const formatted = formatDate(date, format);
+      //  Early return if we don't show the range
+      if (!showRange) {
+        return formatted;
       }
+      //  Get today's year, formatted correctly.
+      const formattedToday = formatDate(today(), format);
+      return getRange(formatted, formattedToday);
     }
 
-    /* src/Copyright.svelte generated by Svelte v3.37.0 */
+    /* src/Copyright.svelte generated by Svelte v3.54.0 */
 
     function create_if_block_1(ctx) {
     	let t0;
@@ -461,7 +520,7 @@
     	};
     }
 
-    // (26:2) {#if position === POSITION.POST}
+    // (27:2) {#if position === POSITION.POST}
     function create_if_block(ctx) {
     	let t0;
     	let t1;
@@ -537,8 +596,17 @@
     			}
 
     			if (default_slot) {
-    				if (default_slot.p && dirty & /*$$scope*/ 64) {
-    					update_slot(default_slot, default_slot_template, ctx, /*$$scope*/ ctx[6], dirty, null, null);
+    				if (default_slot.p && (!current || dirty & /*$$scope*/ 64)) {
+    					update_slot_base(
+    						default_slot,
+    						default_slot_template,
+    						ctx,
+    						/*$$scope*/ ctx[6],
+    						!current
+    						? get_all_dirty_from_scope(/*$$scope*/ ctx[6])
+    						: get_slot_changes(default_slot_template, /*$$scope*/ ctx[6], dirty, null),
+    						null
+    					);
     				}
     			}
 
@@ -579,25 +647,22 @@
     	const omit_props_names = ["date","format","position","showRange"];
     	let $$restProps = compute_rest_props($$props, omit_props_names);
     	let { $$slots: slots = {}, $$scope } = $$props;
-    	let { date = new Date() } = $$props;
+    	let { date = today() } = $$props;
     	let { format = FORMAT.NUMERIC } = $$props;
     	let { position = POSITION.PRE } = $$props;
     	let { showRange = false } = $$props;
 
     	//  Get the formatDate function
-    	const formatDate = withFormatGetDate(format);
-
-    	const getDateRange = withGetDateRange(showRange);
-    	let displayDate = getDateRange(date, formatDate);
+    	let displayDate = getDisplayDate({ showRange, format, date });
 
     	$$self.$$set = $$new_props => {
     		$$props = assign(assign({}, $$props), exclude_internal_props($$new_props));
     		$$invalidate(2, $$restProps = compute_rest_props($$props, omit_props_names));
-    		if ("date" in $$new_props) $$invalidate(3, date = $$new_props.date);
-    		if ("format" in $$new_props) $$invalidate(4, format = $$new_props.format);
-    		if ("position" in $$new_props) $$invalidate(0, position = $$new_props.position);
-    		if ("showRange" in $$new_props) $$invalidate(5, showRange = $$new_props.showRange);
-    		if ("$$scope" in $$new_props) $$invalidate(6, $$scope = $$new_props.$$scope);
+    		if ('date' in $$new_props) $$invalidate(3, date = $$new_props.date);
+    		if ('format' in $$new_props) $$invalidate(4, format = $$new_props.format);
+    		if ('position' in $$new_props) $$invalidate(0, position = $$new_props.position);
+    		if ('showRange' in $$new_props) $$invalidate(5, showRange = $$new_props.showRange);
+    		if ('$$scope' in $$new_props) $$invalidate(6, $$scope = $$new_props.$$scope);
     	};
 
     	return [position, displayDate, $$restProps, date, format, showRange, $$scope, slots];
@@ -616,9 +681,11 @@
     	}
     }
 
+    var Copyright$1 = Copyright;
+
     exports.constants = constants;
-    exports.default = Copyright;
+    exports.default = Copyright$1;
 
     Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));

package/lib/index.mjs

@@ -52,13 +52,23 @@ function get_slot_changes(definition, $$scope, dirty, fn) {
     }
     return $$scope.dirty;
 }
-function update_slot(slot, slot_definition, ctx, $$scope, dirty, get_slot_changes_fn, get_slot_context_fn) {
-    const slot_changes = get_slot_changes(slot_definition, $$scope, dirty, get_slot_changes_fn);
+function update_slot_base(slot, slot_definition, ctx, $$scope, slot_changes, get_slot_context_fn) {
     if (slot_changes) {
         const slot_context = get_slot_context(slot_definition, ctx, $$scope, get_slot_context_fn);
         slot.p(slot_context, slot_changes);
     }
 }
+function get_all_dirty_from_scope($$scope) {
+    if ($$scope.ctx.length > 32) {
+        const dirty = [];
+        const length = $$scope.ctx.length / 32;
+        for (let i = 0; i < length; i++) {
+            dirty[i] = -1;
+        }
+        return dirty;
+    }
+    return -1;
+}
 function exclude_internal_props(props) {
     const result = {};
     for (const k in props)
@@ -74,7 +84,6 @@ function compute_rest_props(props, keys) {
             rest[k] = props[k];
     return rest;
 }
-
 function append(target, node) {
     target.appendChild(node);
 }
@@ -82,7 +91,9 @@ function insert(target, node, anchor) {
     target.insertBefore(node, anchor || null);
 }
 function detach(node) {
-    node.parentNode.removeChild(node);
+    if (node.parentNode) {
+        node.parentNode.removeChild(node);
+    }
 }
 function element(name) {
     return document.createElement(name);
@@ -144,22 +155,40 @@ function schedule_update() {
 function add_render_callback(fn) {
     render_callbacks.push(fn);
 }
-let flushing = false;
+// flush() calls callbacks in this order:
+// 1. All beforeUpdate callbacks, in order: parents before children
+// 2. All bind:this callbacks, in reverse order: children before parents.
+// 3. All afterUpdate callbacks, in order: parents before children. EXCEPT
+//    for afterUpdates called during the initial onMount, which are called in
+//    reverse order: children before parents.
+// Since callbacks might update component values, which could trigger another
+// call to flush(), the following steps guard against this:
+// 1. During beforeUpdate, any updated components will be added to the
+//    dirty_components array and will cause a reentrant call to flush(). Because
+//    the flush index is kept outside the function, the reentrant call will pick
+//    up where the earlier call left off and go through all dirty components. The
+//    current_component value is saved and restored so that the reentrant call will
+//    not interfere with the "parent" flush() call.
+// 2. bind:this callbacks cannot trigger new flush() calls.
+// 3. During afterUpdate, any updated components will NOT have their afterUpdate
+//    callback called a second time; the seen_callbacks set, outside the flush()
+//    function, guarantees this behavior.
 const seen_callbacks = new Set();
+let flushidx = 0; // Do *not* move this inside the flush() function
 function flush() {
-    if (flushing)
-        return;
-    flushing = true;
+    const saved_component = current_component;
     do {
         // first, call beforeUpdate functions
         // and update components
-        for (let i = 0; i < dirty_components.length; i += 1) {
-            const component = dirty_components[i];
+        while (flushidx < dirty_components.length) {
+            const component = dirty_components[flushidx];
+            flushidx++;
             set_current_component(component);
             update(component.$$);
         }
         set_current_component(null);
         dirty_components.length = 0;
+        flushidx = 0;
         while (binding_callbacks.length)
             binding_callbacks.pop()();
         // then, once components are updated, call
@@ -179,8 +208,8 @@ function flush() {
         flush_callbacks.pop()();
     }
     update_scheduled = false;
-    flushing = false;
     seen_callbacks.clear();
+    set_current_component(saved_component);
 }
 function update($$) {
     if ($$.fragment !== null) {
@@ -215,6 +244,9 @@ function transition_out(block, local, detach, callback) {
         });
         block.o(local);
     }
+    else if (callback) {
+        callback();
+    }
 }
 
 function get_spread_update(levels, updates) {
@@ -251,14 +283,17 @@ function get_spread_update(levels, updates) {
     return update;
 }
 function mount_component(component, target, anchor, customElement) {
-    const { fragment, on_mount, on_destroy, after_update } = component.$$;
+    const { fragment, after_update } = component.$$;
     fragment && fragment.m(target, anchor);
     if (!customElement) {
         // onMount happens before the initial afterUpdate
         add_render_callback(() => {
-            const new_on_destroy = on_mount.map(run).filter(is_function);
-            if (on_destroy) {
-                on_destroy.push(...new_on_destroy);
+            const new_on_destroy = component.$$.on_mount.map(run).filter(is_function);
+            // if the component was destroyed immediately
+            // it will update the `$$.on_destroy` reference to `null`.
+            // the destructured on_destroy may still reference to the old array
+            if (component.$$.on_destroy) {
+                component.$$.on_destroy.push(...new_on_destroy);
             }
             else {
                 // Edge case - component was destroyed immediately,
@@ -289,12 +324,12 @@ function make_dirty(component, i) {
     }
     component.$$.dirty[(i / 31) | 0] |= (1 << (i % 31));
 }
-function init(component, options, instance, create_fragment, not_equal, props, dirty = [-1]) {
+function init(component, options, instance, create_fragment, not_equal, props, append_styles, dirty = [-1]) {
     const parent_component = current_component;
     set_current_component(component);
     const $$ = component.$$ = {
         fragment: null,
-        ctx: null,
+        ctx: [],
         // state
         props,
         update: noop,
@@ -306,12 +341,14 @@ function init(component, options, instance, create_fragment, not_equal, props, d
         on_disconnect: [],
         before_update: [],
         after_update: [],
-        context: new Map(parent_component ? parent_component.$$.context : options.context || []),
+        context: new Map(options.context || (parent_component ? parent_component.$$.context : [])),
         // everything else
         callbacks: blank_object(),
         dirty,
-        skip_bound: false
+        skip_bound: false,
+        root: options.target || parent_component.$$.root
     };
+    append_styles && append_styles($$.root);
     let ready = false;
     $$.ctx = instance
         ? instance(component, options.props || {}, (i, ret, ...rest) => {
@@ -357,6 +394,9 @@ class SvelteComponent {
         this.$destroy = noop;
     }
     $on(type, callback) {
+        if (!is_function(callback)) {
+            return noop;
+        }
         const callbacks = (this.$$.callbacks[type] || (this.$$.callbacks[type] = []));
         callbacks.push(callback);
         return () => {
@@ -400,39 +440,58 @@ function toYear(date = today()) {
   return date.getFullYear().toString();
 }
 
-//  HOF which is injected with the format and returns the date formatter function.
-function withFormatGetDate(format = FORMAT.NUMERIC) {
-  return function formatDate(date = today()) {
-    if (format === FORMAT.NUMERIC) {
-      return toYear(date);
-    }
-    if (format === FORMAT.TWO_DIGIT) {
-      return `’${toYear(date).slice(-2)}`;
-    }
+/**
+ * Formats the date, just for you!
+ *
+ * @param {Date} date - Date to format
+ * @param {'numeric' | '2-digit'} format - Format for the date.
+ */
+function formatDate(date = today(), format = FORMAT.NUMERIC) {
+  if (format === FORMAT.NUMERIC) {
+    return toYear(date);
+  }
+  if (format === FORMAT.TWO_DIGIT) {
+    return `’${toYear(date).slice(-2)}`;
   }
 }
 
-//  A default for the getDateRange formatter.
-function defaultFormatDate(date) {
-  return date;
+/**
+ * Returns the "range string", unless the dates are the same.
+ *
+ * @param {string} date1 - First date (formatted to a string)
+ * @param {string} date2 - Second date (formatted to a string).
+ */
+function getRange(date1, date2) {
+  //  Don't show a range if years are the same, as that would be dumb.
+  if (date1 === date2) {
+    return date1;
+  }
+  return `${date1} - ${date2}`;
 }
 
-//  HOF which is injected with the showRange and returns a getDateRange function.
-function withGetDateRange(showRange = false) {
-  return function getDateRange(date = today(), formatDate = defaultFormatDate) {
-    const formattedToday = formatDate(today());
-    const formattedDate = formatDate(date);
-    if (showRange && formattedToday !== formattedDate) { // Make sure that if it's a range, the two years aren't the same.
-      return [
-        formattedDate,
-        formattedToday
-      ].join(' - ');
-    }
-    return formattedDate;
+/**
+ * Returns the displayed date for the component.
+ *
+ * @param {boolean} options.showRange - If a date range should be displayed.
+ * @param {Date} options.date - Copyright year to be used. If showRange is true, this is the start year of the range.
+ * @param {'numeric' | '2-digit'} options.format - Date format to be used.
+ */
+function getDisplayDate({
+  showRange = false,
+  date = today(),
+  format = FORMAT.NUMERIC,
+}) {
+  const formatted = formatDate(date, format);
+  //  Early return if we don't show the range
+  if (!showRange) {
+    return formatted;
   }
+  //  Get today's year, formatted correctly.
+  const formattedToday = formatDate(today(), format);
+  return getRange(formatted, formattedToday);
 }
 
-/* src/Copyright.svelte generated by Svelte v3.37.0 */
+/* src/Copyright.svelte generated by Svelte v3.54.0 */
 
 function create_if_block_1(ctx) {
 	let t0;
@@ -455,7 +514,7 @@ function create_if_block_1(ctx) {
 	};
 }
 
-// (26:2) {#if position === POSITION.POST}
+// (27:2) {#if position === POSITION.POST}
 function create_if_block(ctx) {
 	let t0;
 	let t1;
@@ -531,8 +590,17 @@ function create_fragment(ctx) {
 			}
 
 			if (default_slot) {
-				if (default_slot.p && dirty & /*$$scope*/ 64) {
-					update_slot(default_slot, default_slot_template, ctx, /*$$scope*/ ctx[6], dirty, null, null);
+				if (default_slot.p && (!current || dirty & /*$$scope*/ 64)) {
+					update_slot_base(
+						default_slot,
+						default_slot_template,
+						ctx,
+						/*$$scope*/ ctx[6],
+						!current
+						? get_all_dirty_from_scope(/*$$scope*/ ctx[6])
+						: get_slot_changes(default_slot_template, /*$$scope*/ ctx[6], dirty, null),
+						null
+					);
 				}
 			}
 
@@ -573,25 +641,22 @@ function instance($$self, $$props, $$invalidate) {
 	const omit_props_names = ["date","format","position","showRange"];
 	let $$restProps = compute_rest_props($$props, omit_props_names);
 	let { $$slots: slots = {}, $$scope } = $$props;
-	let { date = new Date() } = $$props;
+	let { date = today() } = $$props;
 	let { format = FORMAT.NUMERIC } = $$props;
 	let { position = POSITION.PRE } = $$props;
 	let { showRange = false } = $$props;
 
 	//  Get the formatDate function
-	const formatDate = withFormatGetDate(format);
-
-	const getDateRange = withGetDateRange(showRange);
-	let displayDate = getDateRange(date, formatDate);
+	let displayDate = getDisplayDate({ showRange, format, date });
 
 	$$self.$$set = $$new_props => {
 		$$props = assign(assign({}, $$props), exclude_internal_props($$new_props));
 		$$invalidate(2, $$restProps = compute_rest_props($$props, omit_props_names));
-		if ("date" in $$new_props) $$invalidate(3, date = $$new_props.date);
-		if ("format" in $$new_props) $$invalidate(4, format = $$new_props.format);
-		if ("position" in $$new_props) $$invalidate(0, position = $$new_props.position);
-		if ("showRange" in $$new_props) $$invalidate(5, showRange = $$new_props.showRange);
-		if ("$$scope" in $$new_props) $$invalidate(6, $$scope = $$new_props.$$scope);
+		if ('date' in $$new_props) $$invalidate(3, date = $$new_props.date);
+		if ('format' in $$new_props) $$invalidate(4, format = $$new_props.format);
+		if ('position' in $$new_props) $$invalidate(0, position = $$new_props.position);
+		if ('showRange' in $$new_props) $$invalidate(5, showRange = $$new_props.showRange);
+		if ('$$scope' in $$new_props) $$invalidate(6, $$scope = $$new_props.$$scope);
 	};
 
 	return [position, displayDate, $$restProps, date, format, showRange, $$scope, slots];
@@ -610,5 +675,6 @@ class Copyright extends SvelteComponent {
 	}
 }
 
-export default Copyright;
-export { constants };
+var Copyright$1 = Copyright;
+
+export { constants, Copyright$1 as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "svelte-copyright",
   "description": "A Svelte component to format and display a copyright notice.",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "author": {
     "name": "himynameisdave",
     "email": "d@velunny.com",
@@ -15,24 +15,25 @@
     "lib"
   ],
   "scripts": {
-    "build": "rollup -c",
+    "build": "rollup -c --bundleConfigAsCjs",
     "test": "jest src",
     "release": "np --no-yarn"
   },
   "devDependencies": {
-    "@babel/core": "^7.13.15",
-    "@babel/preset-env": "^7.13.15",
-    "@rollup/plugin-node-resolve": "^11.2.1",
-    "@testing-library/jest-dom": "^5.11.10",
-    "@testing-library/svelte": "^3.0.3",
-    "babel-jest": "^26.6.3",
-    "husky": "^6.0.0",
-    "jest": "^26.6.3",
-    "np": "^7.4.0",
-    "rollup": "^2.45.1",
+    "@babel/core": "^7.20.5",
+    "@babel/preset-env": "^7.20.2",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/svelte": "^3.2.2",
+    "babel-jest": "^29.3.1",
+    "husky": "^8.0.2",
+    "jest": "^29.3.1",
+    "jest-environment-jsdom": "^29.3.1",
+    "np": "^7.6.2",
+    "rollup": "^3.7.3",
     "rollup-plugin-svelte": "^7.1.0",
-    "svelte": "^3.37.0",
-    "svelte-jester": "^1.3.2"
+    "svelte": "^3.54.0",
+    "svelte-jester": "^2.3.2"
   },
   "peerDependencies": {
     "svelte": "^3.0.0"

package/src/Copyright.svelte

@@ -1,9 +1,9 @@
 <script>
   import { FORMAT, POSITION } from './constants';
-  import { withFormatGetDate, withGetDateRange } from './utils';
+  import { getDisplayDate, today } from './utils';
 
   //  The date year to be displayed (default: today)
-  export let date = new Date();
+  export let date = today();
   //  Date format ('numeric' | '2-digit')
   export let format = FORMAT.NUMERIC;
   //  Position of the copyright + date message relative to component "children" slot.
@@ -12,10 +12,11 @@
   export let showRange = false;
 
   //  Get the formatDate function
-  const formatDate = withFormatGetDate(format);
-  const getDateRange = withGetDateRange(showRange);
-
-  let displayDate = getDateRange(date, formatDate);
+  let displayDate = getDisplayDate({
+    showRange,
+    format,
+    date,
+  });
 </script>
 
 <span {...$$restProps}>

package/src/__tests__/Copyright.spec.js

@@ -1,60 +1,58 @@
-import '@testing-library/jest-dom/extend-expect';
 import { render } from '@testing-library/svelte';
 import Copyright from './Copyright.spec.svelte';
 
+const FIXED_DATE = new Date('2022-05-29');
+const FIXED_YEAR = FIXED_DATE.getFullYear();
 
 // Get around some of the stupidity of this testing library
 function renderCopyright(props = {}) {
-  //  Fixed date so that tests don't fail next year.
-  const fixedDate = new Date('2021-05-29');
   const { container } = render(Copyright, {
-    date: fixedDate,
+    date: FIXED_DATE,
     ...props,
   });
   return container.firstChild.firstChild;
 }
 
 describe('<Copyright />', () => {
-
-  test('it uses the provided date for the year', () => {
+  it('uses the provided date for the year', () => {
     const container = renderCopyright({ date: new Date(1990, 0, 1) });
     expect(container).toHaveTextContent('© Copyright 1990 Dave Lunny');
   });
 
-  test('it formats the year for format="numeric"', () => {
+  it('formats the year for format="numeric"', () => {
     const container = renderCopyright({ format: 'numeric' });
-    expect(container).toHaveTextContent('© Copyright 2021 Dave Lunny');
+    expect(container).toHaveTextContent(`© Copyright ${FIXED_YEAR} Dave Lunny`);
   });
 
-  test('it formats the year for format="2-digit"', () => {
+  it('formats the year for format="2-digit"', () => {
     const container = renderCopyright({ format: '2-digit' });
-    expect(container).toHaveTextContent('© Copyright ’21 Dave Lunny');
+    expect(container).toHaveTextContent(`© Copyright ’${FIXED_YEAR.toString().slice(2)} Dave Lunny`);
   });
 
-  test('it positions the copyright for position="pre"', () => {
+  it('positions the copyright for position="pre"', () => {
     const container = renderCopyright({ position: 'pre' });
-    expect(container).toHaveTextContent('© Copyright 2021 Dave Lunny');
+    expect(container).toHaveTextContent(`© Copyright ${FIXED_YEAR} Dave Lunny`);
   });
 
-  test('it positions the copyright for position="post"', () => {
+  it('positions the copyright for position="post"', () => {
     const container = renderCopyright({ position: 'post' });
-    expect(container).toHaveTextContent('Dave Lunny © Copyright 2021');
+    expect(container).toHaveTextContent(`Dave Lunny © Copyright ${FIXED_YEAR}`);
   });
 
-  test('it displays a date range when showRange=true', () => {
+  it('displays a date range when showRange=true', () => {
     const container = renderCopyright({
       date: new Date(1990, 0, 1),
       showRange: true,
     });
-    expect(container).toHaveTextContent('© Copyright 1990 - 2021 Dave Lunny');
+    expect(container).toHaveTextContent(`© Copyright 1990 - ${FIXED_YEAR} Dave Lunny`);
   });
 
-  test('if showRange=true but no date is provided, just display current year', () => {
+  it('showRange=true but no date is provided, just display current year', () => {
     const container = renderCopyright({ showRange: true });
-    expect(container).toHaveTextContent('© Copyright 2021 Dave Lunny');
+    expect(container).toHaveTextContent(`© Copyright ${FIXED_YEAR} Dave Lunny`);
   });
 
-  test('it spreads the rest of the props correctly', () => {
+  it('spreads the rest of the props correctly', () => {
     const mockCustomClass = 'custom-class';
     const container = renderCopyright({ class: mockCustomClass });
     expect(container.classList.contains('custom-class')).toBe(true);

package/src/utils/__test__/date.spec.js

@@ -1,9 +1,9 @@
 import * as dateUtils from '../date';
 import * as constants from '../../constants';
 
-
 describe('utils/date', () => {
   const mockDate = new Date('1990-08-08');
+  const currentYear = dateUtils.today().getFullYear();
 
   describe('toYear', () => {
     it('returns the year value for a given date', () => {
@@ -12,36 +12,77 @@ describe('utils/date', () => {
     });
   });
 
-  describe('withFormatGetDate', () => {
+  describe('formatDate', () => {
     it('handles formatting a "numeric" year', () => {
-      const formatDate = dateUtils.withFormatGetDate(constants.FORMAT.NUMERIC);
-      const actual = formatDate(mockDate);
+      const actual = dateUtils.formatDate(mockDate, constants.FORMAT.NUMERIC);
       expect(actual).toBe('1990');
     });
+
     it('handles formatting a "2-digit" year', () => {
-      const formatDate = dateUtils.withFormatGetDate(constants.FORMAT.TWO_DIGIT);
-      const actual = formatDate(mockDate);
+      const actual = dateUtils.formatDate(mockDate, constants.FORMAT.TWO_DIGIT);
       expect(actual).toBe('’90');
     });
+
+    it('does nothing if invalid format is passed', () => {
+      const actual = dateUtils.formatDate(mockDate, 'haha wrong!');
+      expect(actual).toBeUndefined();
+    });
   });
 
-  describe('withGetDateRange', () => {
-    it('it will just return the year when showRange is false', () => {
-      const getDateRange = dateUtils.withGetDateRange(false);
-      const actual = getDateRange(mockDate, dateUtils.toYear);
-      expect(actual).toBe('1990');
+  describe('getRange', () => {
+    it('returns the first date if it is the same as second', () => {
+      const year = dateUtils.toYear(mockDate);
+      const actual = dateUtils.getRange(year, year);
+      expect(actual).toBe(year);
+    });
+
+    it('returns the range string if different years', () => {
+      const year1 = dateUtils.toYear(mockDate);
+      const year2 = dateUtils.toYear(dateUtils.today());
+      const actual = dateUtils.getRange(year1, year2);
+      expect(actual).toBe(`${year1} - ${year2}`);
     });
-    //  TODO: this test will break in 2022
-    it('it will return the date range when showRange is true', () => {
-      const getDateRange = dateUtils.withGetDateRange(true);
-      const actual = getDateRange(mockDate, dateUtils.toYear);
-      expect(actual).toBe('1990 - 2021');
-    });
-    //  TODO: this test will break in 2022
-    it('it will return the year when showRange is true, but the given year is the current year', () => {
-      const getDateRange = dateUtils.withGetDateRange(true);
-      const actual = getDateRange(undefined, dateUtils.toYear);
-      expect(actual).toBe('2021');
+  });
+
+  describe('getDisplayDate', () => {
+    describe('when showRange is true', () => {
+      it('handles formatting a "numeric" year', () => {
+        const actual = dateUtils.getDisplayDate({
+          showRange: true,
+          format: constants.FORMAT.NUMERIC,
+          date: mockDate,
+        });
+        expect(actual).toBe(`1990 - ${currentYear}`);
+      });
+
+      it('handles formatting a "2-digit" year', () => {
+        const actual = dateUtils.getDisplayDate({
+          showRange: true,
+          format: constants.FORMAT.TWO_DIGIT,
+          date: mockDate,
+        });
+        expect(actual).toBe(`’90 - ’${currentYear.toString().slice(2)}`);
+      });
+    });
+
+    describe('when showRange is false', () => {
+      it('handles formatting a "numeric" year', () => {
+        const actual = dateUtils.getDisplayDate({
+          showRange: false,
+          format: constants.FORMAT.NUMERIC,
+          date: mockDate,
+        });
+        expect(actual).toBe('1990');
+      });
+
+      it('handles formatting a "2-digit" year', () => {
+        const actual = dateUtils.getDisplayDate({
+          showRange: false,
+          format: constants.FORMAT.TWO_DIGIT,
+          date: mockDate,
+        });
+        expect(actual).toBe('’90');
+      });
     });
   });
 });

package/src/utils/date.js

@@ -10,34 +10,53 @@ export function toYear(date = today()) {
   return date.getFullYear().toString();
 }
 
-//  HOF which is injected with the format and returns the date formatter function.
-export function withFormatGetDate(format = FORMAT.NUMERIC) {
-  return function formatDate(date = today()) {
-    if (format === FORMAT.NUMERIC) {
-      return toYear(date);
-    }
-    if (format === FORMAT.TWO_DIGIT) {
-      return `’${toYear(date).slice(-2)}`;
-    }
+/**
+ * Formats the date, just for you!
+ *
+ * @param {Date} date - Date to format
+ * @param {'numeric' | '2-digit'} format - Format for the date.
+ */
+export function formatDate(date = today(), format = FORMAT.NUMERIC) {
+  if (format === FORMAT.NUMERIC) {
+    return toYear(date);
+  }
+  if (format === FORMAT.TWO_DIGIT) {
+    return `’${toYear(date).slice(-2)}`;
   }
 }
 
-//  A default for the getDateRange formatter.
-function defaultFormatDate(date) {
-  return date;
+/**
+ * Returns the "range string", unless the dates are the same.
+ *
+ * @param {string} date1 - First date (formatted to a string)
+ * @param {string} date2 - Second date (formatted to a string).
+ */
+export function getRange(date1, date2) {
+  //  Don't show a range if years are the same, as that would be dumb.
+  if (date1 === date2) {
+    return date1;
+  }
+  return `${date1} - ${date2}`;
 }
 
-//  HOF which is injected with the showRange and returns a getDateRange function.
-export function withGetDateRange(showRange = false) {
-  return function getDateRange(date = today(), formatDate = defaultFormatDate) {
-    const formattedToday = formatDate(today());
-    const formattedDate = formatDate(date);
-    if (showRange && formattedToday !== formattedDate) { // Make sure that if it's a range, the two years aren't the same.
-      return [
-        formattedDate,
-        formattedToday
-      ].join(' - ');
-    }
-    return formattedDate;
+/**
+ * Returns the displayed date for the component.
+ *
+ * @param {boolean} options.showRange - If a date range should be displayed.
+ * @param {Date} options.date - Copyright year to be used. If showRange is true, this is the start year of the range.
+ * @param {'numeric' | '2-digit'} options.format - Date format to be used.
+ */
+export function getDisplayDate({
+  showRange = false,
+  date = today(),
+  format = FORMAT.NUMERIC,
+}) {
+  const formatted = formatDate(date, format);
+  //  Early return if we don't show the range
+  if (!showRange) {
+    return formatted;
   }
+  //  Get today's year, formatted correctly.
+  const formattedToday = formatDate(today(), format);
+  return getRange(formatted, formattedToday);
 }

package/src/utils/index.js

@@ -1 +1 @@
-export { withFormatGetDate, withGetDateRange } from './date';
+export { getDisplayDate, today } from './date';