@fullcalendar/moment 7.0.0-beta.4 → 7.0.0-beta.5

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Adam Shaw
+Copyright (c) 2025 Adam Shaw
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -25,12 +25,18 @@ Instantiate a Calendar with the necessary plugin:
 import { Calendar } from '@fullcalendar/core'
 import momentPlugin from '@fullcalendar/moment'
 import dayGridPlugin from '@fullcalendar/daygrid'
+import classicThemePlugin from '@fullcalendar/theme-classic'
+
+import '@fullcalendar/core/skeleton.css'
+import '@fullcalendar/theme-classic/theme.css'
+import '@fullcalendar/theme-classic/palette.css'
 
 const calendarEl = document.getElementById('calendar')
 const calendar = new Calendar(calendarEl, {
   plugins: [
     momentPlugin,
-    dayGridPlugin
+    dayGridPlugin,
+    classicThemePlugin
   ],
   initialView: 'dayGridMonth',
   titleFormat: 'MMMM D, YYYY' // use Moment format strings

package/{index.cjs → cjs/index.cjs}

@@ -2,16 +2,16 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index_cjs = require('@fullcalendar/core/index.cjs');
+var core = require('@fullcalendar/core');
 var moment = require('moment');
-var internal_cjs = require('@fullcalendar/core/internal.cjs');
+var internal = require('@fullcalendar/core/internal');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 
 function toMoment(date, calendar) {
-    if (!(calendar instanceof internal_cjs.CalendarImpl)) {
+    if (!(calendar instanceof internal.CalendarImpl)) {
         throw new Error('must supply a CalendarApi instance');
     }
     let { dateEnv } = calendar.getCurrentData();
@@ -42,14 +42,17 @@ function convertToMoment(input, timeZone, timeZoneOffset, locale) {
     return mom;
 }
 
-function formatWithCmdStr(cmdStr, arg) {
+function formatWithCmdStr(cmdStr, data) {
     let cmd = parseCmdStr(cmdStr);
-    if (arg.end) {
-        let startMom = convertToMoment(arg.start.array, arg.timeZone, arg.start.timeZoneOffset, arg.localeCodes[0]);
-        let endMom = convertToMoment(arg.end.array, arg.timeZone, arg.end.timeZoneOffset, arg.localeCodes[0]);
-        return formatRange(cmd, createMomentFormatFunc(startMom), createMomentFormatFunc(endMom), arg.defaultSeparator);
+    if (data.end) {
+        let startMom = convertToMoment(data.start.array, data.timeZone, data.start.timeZoneOffset, data.localeCodes[0]);
+        let endMom = convertToMoment(data.end.array, data.timeZone, data.end.timeZoneOffset, data.localeCodes[0]);
+        return formatRange(cmd, createMomentFormatFunc(startMom), createMomentFormatFunc(endMom), data.defaultSeparator);
     }
-    return convertToMoment(arg.date.array, arg.timeZone, arg.date.timeZoneOffset, arg.localeCodes[0]).format(cmd.whole); // TODO: test for this
+    const mom = convertToMoment(data.date.array, data.timeZone, data.date.timeZoneOffset, data.localeCodes[0]);
+    const singleCmdStr = cmd.whole;
+    const singleOutStr = mom.format(singleCmdStr);
+    return emulateParts(singleCmdStr, singleOutStr) || singleOutStr;
 }
 function createMomentFormatFunc(mom) {
     return (cmdStr) => (cmdStr ? mom.format(cmdStr) : '' // because calling with blank string results in ISO8601 :(
@@ -94,8 +97,41 @@ function formatRange(cmd, formatStart, formatEnd, separator) {
     }
     return startWhole + separator + endWhole;
 }
+function emulateParts(cmdStr, outStr) {
+    const numParts = getSingleNumberParts(outStr);
+    if (numParts) {
+        const numType = getSingleNumberType(cmdStr);
+        if (numType) {
+            const [head, numStr, tail] = numParts;
+            const parts = [];
+            if (head) {
+                parts.push({ type: 'literal', value: head });
+            }
+            parts.push({ type: numType, value: numStr });
+            if (tail) {
+                parts.push({ type: 'literal', value: tail });
+            }
+            return parts;
+        }
+    }
+}
+function getSingleNumberParts(outStr) {
+    const parts = outStr.split(/(\d+)/); // capture group keeps match within parts
+    if (parts.length === 3) {
+        return parts;
+    }
+}
+function getSingleNumberType(cmdStr) {
+    const m = cmdStr.match(/D+/); // day-of-month/year
+    if (m) {
+        const [numberStr] = m;
+        if (numberStr.length < 3) { // D/DD -- day-of-month
+            return 'day';
+        } // otherwise DDD/DDDD -- day-of-year
+    }
+}
 
-var index = index_cjs.createPlugin({
+var index = core.createPlugin({
     name: '@fullcalendar/moment',
     cmdFormatter: formatWithCmdStr,
 });

package/{index.js → esm/index.js}

@@ -1,6 +1,6 @@
-import { createPlugin } from '@fullcalendar/core/index.js';
+import { createPlugin } from '@fullcalendar/core';
 import moment from 'moment';
-import { CalendarImpl } from '@fullcalendar/core/internal.js';
+import { CalendarImpl } from '@fullcalendar/core/internal';
 
 function toMoment(date, calendar) {
     if (!(calendar instanceof CalendarImpl)) {
@@ -34,14 +34,17 @@ function convertToMoment(input, timeZone, timeZoneOffset, locale) {
     return mom;
 }
 
-function formatWithCmdStr(cmdStr, arg) {
+function formatWithCmdStr(cmdStr, data) {
     let cmd = parseCmdStr(cmdStr);
-    if (arg.end) {
-        let startMom = convertToMoment(arg.start.array, arg.timeZone, arg.start.timeZoneOffset, arg.localeCodes[0]);
-        let endMom = convertToMoment(arg.end.array, arg.timeZone, arg.end.timeZoneOffset, arg.localeCodes[0]);
-        return formatRange(cmd, createMomentFormatFunc(startMom), createMomentFormatFunc(endMom), arg.defaultSeparator);
+    if (data.end) {
+        let startMom = convertToMoment(data.start.array, data.timeZone, data.start.timeZoneOffset, data.localeCodes[0]);
+        let endMom = convertToMoment(data.end.array, data.timeZone, data.end.timeZoneOffset, data.localeCodes[0]);
+        return formatRange(cmd, createMomentFormatFunc(startMom), createMomentFormatFunc(endMom), data.defaultSeparator);
     }
-    return convertToMoment(arg.date.array, arg.timeZone, arg.date.timeZoneOffset, arg.localeCodes[0]).format(cmd.whole); // TODO: test for this
+    const mom = convertToMoment(data.date.array, data.timeZone, data.date.timeZoneOffset, data.localeCodes[0]);
+    const singleCmdStr = cmd.whole;
+    const singleOutStr = mom.format(singleCmdStr);
+    return emulateParts(singleCmdStr, singleOutStr) || singleOutStr;
 }
 function createMomentFormatFunc(mom) {
     return (cmdStr) => (cmdStr ? mom.format(cmdStr) : '' // because calling with blank string results in ISO8601 :(
@@ -86,6 +89,39 @@ function formatRange(cmd, formatStart, formatEnd, separator) {
     }
     return startWhole + separator + endWhole;
 }
+function emulateParts(cmdStr, outStr) {
+    const numParts = getSingleNumberParts(outStr);
+    if (numParts) {
+        const numType = getSingleNumberType(cmdStr);
+        if (numType) {
+            const [head, numStr, tail] = numParts;
+            const parts = [];
+            if (head) {
+                parts.push({ type: 'literal', value: head });
+            }
+            parts.push({ type: numType, value: numStr });
+            if (tail) {
+                parts.push({ type: 'literal', value: tail });
+            }
+            return parts;
+        }
+    }
+}
+function getSingleNumberParts(outStr) {
+    const parts = outStr.split(/(\d+)/); // capture group keeps match within parts
+    if (parts.length === 3) {
+        return parts;
+    }
+}
+function getSingleNumberType(cmdStr) {
+    const m = cmdStr.match(/D+/); // day-of-month/year
+    if (m) {
+        const [numberStr] = m;
+        if (numberStr.length < 3) { // D/DD -- day-of-month
+            return 'day';
+        } // otherwise DDD/DDDD -- day-of-year
+    }
+}
 
 var index = createPlugin({
     name: '@fullcalendar/moment',

package/{index.global.js → global.js}

@@ -1,7 +1,7 @@
 /*!
-FullCalendar Moment Plugin v7.0.0-beta.4
+FullCalendar Moment Plugin v7.0.0-beta.5
 Docs & License: https://fullcalendar.io/docs/moment-plugin
-(c) 2024 Adam Shaw
+(c) 2025 Adam Shaw
 */
 FullCalendar.Moment = (function (exports, core, moment, internal) {
     'use strict';
@@ -42,14 +42,17 @@ FullCalendar.Moment = (function (exports, core, moment, internal) {
         return mom;
     }
 
-    function formatWithCmdStr(cmdStr, arg) {
+    function formatWithCmdStr(cmdStr, data) {
         let cmd = parseCmdStr(cmdStr);
-        if (arg.end) {
-            let startMom = convertToMoment(arg.start.array, arg.timeZone, arg.start.timeZoneOffset, arg.localeCodes[0]);
-            let endMom = convertToMoment(arg.end.array, arg.timeZone, arg.end.timeZoneOffset, arg.localeCodes[0]);
-            return formatRange(cmd, createMomentFormatFunc(startMom), createMomentFormatFunc(endMom), arg.defaultSeparator);
+        if (data.end) {
+            let startMom = convertToMoment(data.start.array, data.timeZone, data.start.timeZoneOffset, data.localeCodes[0]);
+            let endMom = convertToMoment(data.end.array, data.timeZone, data.end.timeZoneOffset, data.localeCodes[0]);
+            return formatRange(cmd, createMomentFormatFunc(startMom), createMomentFormatFunc(endMom), data.defaultSeparator);
         }
-        return convertToMoment(arg.date.array, arg.timeZone, arg.date.timeZoneOffset, arg.localeCodes[0]).format(cmd.whole); // TODO: test for this
+        const mom = convertToMoment(data.date.array, data.timeZone, data.date.timeZoneOffset, data.localeCodes[0]);
+        const singleCmdStr = cmd.whole;
+        const singleOutStr = mom.format(singleCmdStr);
+        return emulateParts(singleCmdStr, singleOutStr) || singleOutStr;
     }
     function createMomentFormatFunc(mom) {
         return (cmdStr) => (cmdStr ? mom.format(cmdStr) : '' // because calling with blank string results in ISO8601 :(
@@ -94,6 +97,39 @@ FullCalendar.Moment = (function (exports, core, moment, internal) {
         }
         return startWhole + separator + endWhole;
     }
+    function emulateParts(cmdStr, outStr) {
+        const numParts = getSingleNumberParts(outStr);
+        if (numParts) {
+            const numType = getSingleNumberType(cmdStr);
+            if (numType) {
+                const [head, numStr, tail] = numParts;
+                const parts = [];
+                if (head) {
+                    parts.push({ type: 'literal', value: head });
+                }
+                parts.push({ type: numType, value: numStr });
+                if (tail) {
+                    parts.push({ type: 'literal', value: tail });
+                }
+                return parts;
+            }
+        }
+    }
+    function getSingleNumberParts(outStr) {
+        const parts = outStr.split(/(\d+)/); // capture group keeps match within parts
+        if (parts.length === 3) {
+            return parts;
+        }
+    }
+    function getSingleNumberType(cmdStr) {
+        const m = cmdStr.match(/D+/); // day-of-month/year
+        if (m) {
+            const [numberStr] = m;
+            if (numberStr.length < 3) { // D/DD -- day-of-month
+                return 'day';
+            } // otherwise DDD/DDDD -- day-of-year
+        }
+    }
 
     var plugin = core.createPlugin({
         name: '@fullcalendar/moment',

package/global.min.js

@@ -0,0 +1,6 @@
+/*!
+FullCalendar Moment Plugin v7.0.0-beta.5
+Docs & License: https://fullcalendar.io/docs/moment-plugin
+(c) 2025 Adam Shaw
+*/
+FullCalendar.Moment=function(e,t,n,l){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}var r=a(n);function u(e,t,n,l){let a;return"local"===t?a=r.default(e):"UTC"===t?a=r.default.utc(e):r.default.tz?a=r.default.tz(e,t):(a=r.default.utc(e),null!=n&&a.utcOffset(n)),a.locale(l),a}function o(e){return t=>t?e.format(t):""}var i=t.createPlugin({name:"@fullcalendar/moment",cmdFormatter:function(e,t){let n=function e(t){let n=t.match(/^(.*?)\{(.*)\}(.*)$/);if(n){let t=e(n[2]);return{head:n[1],middle:t,tail:n[3],whole:n[1]+t.whole+n[3]}}return{head:null,middle:null,tail:null,whole:t}}(e);if(t.end){let e=u(t.start.array,t.timeZone,t.start.timeZoneOffset,t.localeCodes[0]),l=u(t.end.array,t.timeZone,t.end.timeZoneOffset,t.localeCodes[0]);return function e(t,n,l,a){if(t.middle){let r=n(t.head),u=e(t.middle,n,l,a),o=n(t.tail),i=l(t.head),d=e(t.middle,n,l,a),f=l(t.tail);if(r===i&&o===f)return r+(u===d?u:u+a+d)+o}let r=n(t.whole),u=l(t.whole);if(r===u)return r;return r+a+u}(n,o(e),o(l),t.defaultSeparator)}const l=u(t.date.array,t.timeZone,t.date.timeZoneOffset,t.localeCodes[0]),a=n.whole,r=l.format(a);return function(e,t){const n=function(e){const t=e.split(/(\d+)/);if(3===t.length)return t}(t);if(n){const t=function(e){const t=e.match(/D+/);if(t){const[e]=t;if(e.length<3)return"day"}}(e);if(t){const[e,l,a]=n,r=[];return e&&r.push({type:"literal",value:e}),r.push({type:t,value:l}),a&&r.push({type:"literal",value:a}),r}}}(a,r)||r}});return t.globalPlugins.push(i),e.default=i,e.toMoment=function(e,t){if(!(t instanceof l.CalendarImpl))throw new Error("must supply a CalendarApi instance");let{dateEnv:n}=t.getCurrentData();return u(e,n.timeZone,null,n.locale.codes[0])},e.toMomentDuration=function(e){return r.default.duration(e)},Object.defineProperty(e,"__esModule",{value:!0}),e}({},FullCalendar,moment,FullCalendar.Internal);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fullcalendar/moment",
-  "version": "7.0.0-beta.4",
+  "version": "7.0.0-beta.5",
   "title": "FullCalendar Moment Plugin",
   "description": "Enhanced date formatting and conversion with Moment",
   "keywords": [
@@ -12,7 +12,7 @@
   ],
   "homepage": "https://fullcalendar.io/docs/moment-plugin",
   "peerDependencies": {
-    "@fullcalendar/core": "7.0.0-beta.4",
+    "@fullcalendar/core": "7.0.0-beta.5",
     "moment": "^2.29.1"
   },
   "type": "module",
@@ -28,21 +28,24 @@
     "email": "arshaw@arshaw.com",
     "url": "http://arshaw.com/"
   },
-  "copyright": "2024 Adam Shaw",
-  "types": "./index.d.ts",
-  "main": "./index.cjs",
-  "module": "./index.js",
-  "unpkg": "./index.global.min.js",
-  "jsdelivr": "./index.global.min.js",
+  "copyright": "2025 Adam Shaw",
+  "types": "./esm/index.d.ts",
+  "module": "./esm/index.js",
+  "main": "./cjs/index.cjs",
+  "unpkg": "./global.min.js",
+  "jsdelivr": "./global.min.js",
   "exports": {
     "./package.json": "./package.json",
-    "./index.cjs": "./index.cjs",
-    "./index.js": "./index.js",
     ".": {
-      "types": "./index.d.ts",
-      "require": "./index.cjs",
-      "import": "./index.js"
+      "import": {
+        "types": "./esm/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "require": "./cjs/index.cjs"
     }
   },
-  "sideEffects": false
+  "sideEffects": [
+    "./global.js",
+    "./global.min.js"
+  ]
 }

package/index.global.min.js

@@ -1,6 +0,0 @@
-/*!
-FullCalendar Moment Plugin v7.0.0-beta.4
-Docs & License: https://fullcalendar.io/docs/moment-plugin
-(c) 2024 Adam Shaw
-*/
-FullCalendar.Moment=function(e,t,l,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}var r=a(l);function u(e,t,l,n){let a;return"local"===t?a=r.default(e):"UTC"===t?a=r.default.utc(e):r.default.tz?a=r.default.tz(e,t):(a=r.default.utc(e),null!=l&&a.utcOffset(l)),a.locale(n),a}function o(e){return t=>t?e.format(t):""}var d=t.createPlugin({name:"@fullcalendar/moment",cmdFormatter:function(e,t){let l=function e(t){let l=t.match(/^(.*?)\{(.*)\}(.*)$/);if(l){let t=e(l[2]);return{head:l[1],middle:t,tail:l[3],whole:l[1]+t.whole+l[3]}}return{head:null,middle:null,tail:null,whole:t}}(e);if(t.end){let e=u(t.start.array,t.timeZone,t.start.timeZoneOffset,t.localeCodes[0]),n=u(t.end.array,t.timeZone,t.end.timeZoneOffset,t.localeCodes[0]);return function e(t,l,n,a){if(t.middle){let r=l(t.head),u=e(t.middle,l,n,a),o=l(t.tail),d=n(t.head),i=e(t.middle,l,n,a),f=n(t.tail);if(r===d&&o===f)return r+(u===i?u:u+a+i)+o}let r=l(t.whole),u=n(t.whole);if(r===u)return r;return r+a+u}(l,o(e),o(n),t.defaultSeparator)}return u(t.date.array,t.timeZone,t.date.timeZoneOffset,t.localeCodes[0]).format(l.whole)}});return t.globalPlugins.push(d),e.default=d,e.toMoment=function(e,t){if(!(t instanceof n.CalendarImpl))throw new Error("must supply a CalendarApi instance");let{dateEnv:l}=t.getCurrentData();return u(e,l.timeZone,null,l.locale.codes[0])},e.toMomentDuration=function(e){return r.default.duration(e)},Object.defineProperty(e,"__esModule",{value:!0}),e}({},FullCalendar,moment,FullCalendar.Internal);