@fullcalendar/luxon3 7.0.0-beta.4 → 7.0.0-beta.6

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 luxon3Plugin from '@fullcalendar/luxon3'
 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: [
     luxon3Plugin,
-    dayGridPlugin
+    dayGridPlugin,
+    classicThemePlugin
   ],
   initialView: 'dayGridMonth',
   titleFormat: 'LLLL d, yyyy', // use Luxon format strings

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

@@ -2,12 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index_cjs = require('@fullcalendar/core/index.cjs');
+var core = require('@fullcalendar/core');
 var luxon = require('luxon');
-var internal_cjs = require('@fullcalendar/core/internal.cjs');
+var internal = require('@fullcalendar/core/internal');
 
 function toLuxonDateTime(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();
@@ -17,7 +17,7 @@ function toLuxonDateTime(date, calendar) {
     });
 }
 function toLuxonDuration(duration, calendar) {
-    if (!(calendar instanceof internal_cjs.CalendarImpl)) {
+    if (!(calendar instanceof internal.CalendarImpl)) {
         throw new Error('must supply a CalendarApi instance');
     }
     let { dateEnv } = calendar.getCurrentData();
@@ -52,7 +52,7 @@ function arrayToLuxon(arr, timeZone, locale) {
     });
 }
 
-class LuxonNamedTimeZone extends internal_cjs.NamedTimeZoneImpl {
+class LuxonNamedTimeZone extends internal.NamedTimeZoneImpl {
     offsetForArray(a) {
         return arrayToLuxon(a, this.timeZoneName).offset;
     }
@@ -63,14 +63,17 @@ class LuxonNamedTimeZone extends internal_cjs.NamedTimeZoneImpl {
     }
 }
 
-function formatWithCmdStr(cmdStr, arg) {
+function formatWithCmdStr(cmdStr, data) {
     let cmd = parseCmdStr(cmdStr);
-    if (arg.end) {
-        let start = arrayToLuxon(arg.start.array, arg.timeZone, arg.localeCodes[0]);
-        let end = arrayToLuxon(arg.end.array, arg.timeZone, arg.localeCodes[0]);
-        return formatRange(cmd, start.toFormat.bind(start), end.toFormat.bind(end), arg.defaultSeparator);
+    if (data.end) {
+        let start = arrayToLuxon(data.start.array, data.timeZone, data.localeCodes[0]);
+        let end = arrayToLuxon(data.end.array, data.timeZone, data.localeCodes[0]);
+        return formatRange(cmd, start.toFormat.bind(start), end.toFormat.bind(end), data.defaultSeparator);
     }
-    return arrayToLuxon(arg.date.array, arg.timeZone, arg.localeCodes[0]).toFormat(cmd.whole);
+    const lux = arrayToLuxon(data.date.array, data.timeZone, data.localeCodes[0]);
+    const singleCmdStr = cmd.whole;
+    const singleOutStr = lux.toFormat(singleCmdStr);
+    return emulateParts(singleCmdStr, singleOutStr) || singleOutStr;
 }
 function parseCmdStr(cmdStr) {
     let parts = cmdStr.match(/^(.*?)\{(.*)\}(.*)$/); // TODO: lookbehinds for escape characters
@@ -111,8 +114,38 @@ 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+/); // d/dd -- day-of-month
+    if (m) {
+        return 'day';
+    }
+}
 
-var index = index_cjs.createPlugin({
+var index = core.createPlugin({
     name: '@fullcalendar/luxon3',
     cmdFormatter: formatWithCmdStr,
     namedTimeZonedImpl: LuxonNamedTimeZone,

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

@@ -1,6 +1,6 @@
-import { createPlugin } from '@fullcalendar/core/index.js';
+import { createPlugin } from '@fullcalendar/core';
 import { DateTime, Duration } from 'luxon';
-import { CalendarImpl, NamedTimeZoneImpl } from '@fullcalendar/core/internal.js';
+import { CalendarImpl, NamedTimeZoneImpl } from '@fullcalendar/core/internal';
 
 function toLuxonDateTime(date, calendar) {
     if (!(calendar instanceof CalendarImpl)) {
@@ -59,14 +59,17 @@ class LuxonNamedTimeZone extends NamedTimeZoneImpl {
     }
 }
 
-function formatWithCmdStr(cmdStr, arg) {
+function formatWithCmdStr(cmdStr, data) {
     let cmd = parseCmdStr(cmdStr);
-    if (arg.end) {
-        let start = arrayToLuxon(arg.start.array, arg.timeZone, arg.localeCodes[0]);
-        let end = arrayToLuxon(arg.end.array, arg.timeZone, arg.localeCodes[0]);
-        return formatRange(cmd, start.toFormat.bind(start), end.toFormat.bind(end), arg.defaultSeparator);
+    if (data.end) {
+        let start = arrayToLuxon(data.start.array, data.timeZone, data.localeCodes[0]);
+        let end = arrayToLuxon(data.end.array, data.timeZone, data.localeCodes[0]);
+        return formatRange(cmd, start.toFormat.bind(start), end.toFormat.bind(end), data.defaultSeparator);
     }
-    return arrayToLuxon(arg.date.array, arg.timeZone, arg.localeCodes[0]).toFormat(cmd.whole);
+    const lux = arrayToLuxon(data.date.array, data.timeZone, data.localeCodes[0]);
+    const singleCmdStr = cmd.whole;
+    const singleOutStr = lux.toFormat(singleCmdStr);
+    return emulateParts(singleCmdStr, singleOutStr) || singleOutStr;
 }
 function parseCmdStr(cmdStr) {
     let parts = cmdStr.match(/^(.*?)\{(.*)\}(.*)$/); // TODO: lookbehinds for escape characters
@@ -107,6 +110,36 @@ 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+/); // d/dd -- day-of-month
+    if (m) {
+        return 'day';
+    }
+}
 
 var index = createPlugin({
     name: '@fullcalendar/luxon3',

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

@@ -1,7 +1,7 @@
 /*!
-FullCalendar Luxon 3 Plugin v7.0.0-beta.4
+FullCalendar Luxon 3 Plugin v7.0.0-beta.6
 Docs & License: https://fullcalendar.io/docs/luxon
-(c) 2024 Adam Shaw
+(c) 2025 Adam Shaw
 */
 FullCalendar.Luxon3 = (function (exports, core, luxon, internal) {
     'use strict';
@@ -63,14 +63,17 @@ FullCalendar.Luxon3 = (function (exports, core, luxon, internal) {
         }
     }
 
-    function formatWithCmdStr(cmdStr, arg) {
+    function formatWithCmdStr(cmdStr, data) {
         let cmd = parseCmdStr(cmdStr);
-        if (arg.end) {
-            let start = arrayToLuxon(arg.start.array, arg.timeZone, arg.localeCodes[0]);
-            let end = arrayToLuxon(arg.end.array, arg.timeZone, arg.localeCodes[0]);
-            return formatRange(cmd, start.toFormat.bind(start), end.toFormat.bind(end), arg.defaultSeparator);
+        if (data.end) {
+            let start = arrayToLuxon(data.start.array, data.timeZone, data.localeCodes[0]);
+            let end = arrayToLuxon(data.end.array, data.timeZone, data.localeCodes[0]);
+            return formatRange(cmd, start.toFormat.bind(start), end.toFormat.bind(end), data.defaultSeparator);
         }
-        return arrayToLuxon(arg.date.array, arg.timeZone, arg.localeCodes[0]).toFormat(cmd.whole);
+        const lux = arrayToLuxon(data.date.array, data.timeZone, data.localeCodes[0]);
+        const singleCmdStr = cmd.whole;
+        const singleOutStr = lux.toFormat(singleCmdStr);
+        return emulateParts(singleCmdStr, singleOutStr) || singleOutStr;
     }
     function parseCmdStr(cmdStr) {
         let parts = cmdStr.match(/^(.*?)\{(.*)\}(.*)$/); // TODO: lookbehinds for escape characters
@@ -111,6 +114,36 @@ FullCalendar.Luxon3 = (function (exports, core, luxon, 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+/); // d/dd -- day-of-month
+        if (m) {
+            return 'day';
+        }
+    }
 
     var plugin = core.createPlugin({
         name: '@fullcalendar/luxon3',

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

@@ -1,6 +1,6 @@
 /*!
-FullCalendar Luxon 3 Plugin v7.0.0-beta.4
+FullCalendar Luxon 3 Plugin v7.0.0-beta.6
 Docs & License: https://fullcalendar.io/docs/luxon
-(c) 2024 Adam Shaw
+(c) 2025 Adam Shaw
 */
-FullCalendar.Luxon3=function(e,t,n,a){"use strict";function l(e,t,a){return n.DateTime.fromObject({year:e[0],month:e[1]+1,day:e[2],hour:e[3],minute:e[4],second:e[5],millisecond:e[6]},{locale:a,zone:t})}class r extends a.NamedTimeZoneImpl{offsetForArray(e){return l(e,this.timeZoneName).offset}timestampToArray(e){return[(t=n.DateTime.fromMillis(e,{zone:this.timeZoneName})).year,t.month-1,t.day,t.hour,t.minute,t.second,t.millisecond];var t}}var o=t.createPlugin({name:"@fullcalendar/luxon3",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=l(t.start.array,t.timeZone,t.localeCodes[0]),a=l(t.end.array,t.timeZone,t.localeCodes[0]);return function e(t,n,a,l){if(t.middle){let r=n(t.head),o=e(t.middle,n,a,l),i=n(t.tail),u=a(t.head),d=e(t.middle,n,a,l),m=a(t.tail);if(r===u&&i===m)return r+(o===d?o:o+l+d)+i}let r=n(t.whole),o=a(t.whole);if(r===o)return r;return r+l+o}(n,e.toFormat.bind(e),a.toFormat.bind(a),t.defaultSeparator)}return l(t.date.array,t.timeZone,t.localeCodes[0]).toFormat(n.whole)},namedTimeZonedImpl:r});return t.globalPlugins.push(o),e.default=o,e.toLuxonDateTime=function(e,t){if(!(t instanceof a.CalendarImpl))throw new Error("must supply a CalendarApi instance");let{dateEnv:l}=t.getCurrentData();return n.DateTime.fromJSDate(e,{zone:l.timeZone,locale:l.locale.codes[0]})},e.toLuxonDuration=function(e,t){if(!(t instanceof a.CalendarImpl))throw new Error("must supply a CalendarApi instance");let{dateEnv:l}=t.getCurrentData();return n.Duration.fromObject(e,{locale:l.locale.codes[0]})},Object.defineProperty(e,"__esModule",{value:!0}),e}({},FullCalendar,luxon,FullCalendar.Internal);
+FullCalendar.Luxon3=function(e,t,n,a){"use strict";function l(e,t,a){return n.DateTime.fromObject({year:e[0],month:e[1]+1,day:e[2],hour:e[3],minute:e[4],second:e[5],millisecond:e[6]},{locale:a,zone:t})}class r extends a.NamedTimeZoneImpl{offsetForArray(e){return l(e,this.timeZoneName).offset}timestampToArray(e){return[(t=n.DateTime.fromMillis(e,{zone:this.timeZoneName})).year,t.month-1,t.day,t.hour,t.minute,t.second,t.millisecond];var t}}var o=t.createPlugin({name:"@fullcalendar/luxon3",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=l(t.start.array,t.timeZone,t.localeCodes[0]),a=l(t.end.array,t.timeZone,t.localeCodes[0]);return function e(t,n,a,l){if(t.middle){let r=n(t.head),o=e(t.middle,n,a,l),i=n(t.tail),u=a(t.head),d=e(t.middle,n,a,l),m=a(t.tail);if(r===u&&i===m)return r+(o===d?o:o+l+d)+i}let r=n(t.whole),o=a(t.whole);if(r===o)return r;return r+l+o}(n,e.toFormat.bind(e),a.toFormat.bind(a),t.defaultSeparator)}const a=l(t.date.array,t.timeZone,t.localeCodes[0]),r=n.whole,o=a.toFormat(r);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){if(e.match(/d+/))return"day"}(e);if(t){const[e,a,l]=n,r=[];return e&&r.push({type:"literal",value:e}),r.push({type:t,value:a}),l&&r.push({type:"literal",value:l}),r}}}(r,o)||o},namedTimeZonedImpl:r});return t.globalPlugins.push(o),e.default=o,e.toLuxonDateTime=function(e,t){if(!(t instanceof a.CalendarImpl))throw new Error("must supply a CalendarApi instance");let{dateEnv:l}=t.getCurrentData();return n.DateTime.fromJSDate(e,{zone:l.timeZone,locale:l.locale.codes[0]})},e.toLuxonDuration=function(e,t){if(!(t instanceof a.CalendarImpl))throw new Error("must supply a CalendarApi instance");let{dateEnv:l}=t.getCurrentData();return n.Duration.fromObject(e,{locale:l.locale.codes[0]})},Object.defineProperty(e,"__esModule",{value:!0}),e}({},FullCalendar,luxon,FullCalendar.Internal);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fullcalendar/luxon3",
-  "version": "7.0.0-beta.4",
+  "version": "7.0.0-beta.6",
   "title": "FullCalendar Luxon 3 Plugin",
   "description": "Enhanced date formatting, conversion, and named time zone functionality with Luxon 3",
   "keywords": [
@@ -14,7 +14,7 @@
   ],
   "homepage": "https://fullcalendar.io/docs/luxon",
   "peerDependencies": {
-    "@fullcalendar/core": "7.0.0-beta.4",
+    "@fullcalendar/core": "7.0.0-beta.6",
     "luxon": "^3.0.0"
   },
   "type": "module",
@@ -30,21 +30,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"
+  ]
 }