some method renames

fullcalendar · Mar 27, 2024 · fe37479 · fe37479
1 parent da37c78
commit fe37479
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 32 deletions.
diff --git a/packages/temporal-polyfill/src/internal/diff.ts b/packages/temporal-polyfill/src/internal/diff.ts
@@ -26,10 +26,10 @@ import { isoMonthsInYear } from './isoMath'
 import { MarkerToEpochNano, MoveMarker } from './markerSystem'
 import {
   moveByIsoDays,
-  moveDateEfficient,
+  moveDate,
   moveDateTime,
   moveToDayOfMonth,
-  moveZonedEpochSlots,
+  moveZonedEpochs,
 } from './move'
 import { RoundingMode } from './options'
 import { DiffOptions, copyOptions, refineDiffOptions } from './optionsRefine'
@@ -143,7 +143,7 @@ export function diffZonedDateTimes<C extends IdLike, T extends IdLike>(
     const timeZoneOps = getTimeZoneOps(timeZoneSlot)
     const calendarOps = getCalendarOps(calendarSlot)
 
-    durationFields = diffZonedEpochs(
+    durationFields = diffZonedEpochsViaCalendar(
       calendarOps,
       timeZoneOps,
       slots0,
@@ -163,7 +163,7 @@ export function diffZonedDateTimes<C extends IdLike, T extends IdLike>(
       // MarkerMoveSystem...
       slots0,
       extractEpochNano as MarkerToEpochNano,
-      bindArgs(moveZonedEpochSlots, calendarOps, timeZoneOps) as MoveMarker,
+      bindArgs(moveZonedEpochs, calendarOps, timeZoneOps) as MoveMarker,
     )
   }
 
@@ -209,7 +209,7 @@ export function diffPlainDateTimes<C extends IdLike>(
   } else {
     const calendarOps = getCalendarOps(calendarSlot)
 
-    durationFields = diffDateTimes(
+    durationFields = diffDateTimesViaCalendar(
       calendarOps,
       plainDateTimeSlots0,
       plainDateTimeSlots1,
@@ -352,7 +352,7 @@ function diffDateLike(
         // MarkerMoveSystem...
         startIsoFields,
         isoToEpochNano as MarkerToEpochNano,
-        bindArgs(moveDateEfficient, calendarOps) as MoveMarker,
+        bindArgs(moveDate, calendarOps) as MoveMarker,
       )
     }
   }
@@ -394,10 +394,10 @@ export function diffPlainTimes(
   )
 }
 
-// Exact Diffing (no rounding): Efficient
+// Exact Diffing (no rounding): Attempt Day/Time, fallback to Calendar
 // -----------------------------------------------------------------------------
 
-export function diffZonedEpochsEfficient(
+export function diffZonedEpochs(
   calendarOps: DiffOps,
   timeZoneOps: TimeZoneOps,
   slots0: ZonedEpochSlots,
@@ -418,7 +418,7 @@ export function diffZonedEpochsEfficient(
     )
   }
 
-  return diffZonedEpochs(
+  return diffZonedEpochsViaCalendar(
     calendarOps,
     timeZoneOps,
     slots0,
@@ -429,7 +429,7 @@ export function diffZonedEpochsEfficient(
   )
 }
 
-export function diffDateTimesEfficient(
+export function diffDateTimes(
   calendarOps: DiffOps,
   startIsoFields: IsoDateTimeFields,
   endIsoFields: IsoDateTimeFields,
@@ -451,7 +451,7 @@ export function diffDateTimesEfficient(
     )
   }
 
-  return diffDateTimes(
+  return diffDateTimesViaCalendar(
     calendarOps,
     startIsoFields,
     endIsoFields,
@@ -461,7 +461,7 @@ export function diffDateTimesEfficient(
   )
 }
 
-// Exact Diffing (no rounding): Low-Level Work
+// Exact Diffing (no rounding): Directly w/ Calendar
 // -----------------------------------------------------------------------------
 
 export function zonedEpochRangeToIso(
@@ -501,7 +501,7 @@ export function zonedEpochRangeToIso(
   return [startIsoFields, midIsoFields, timeDiffNano]
 }
 
-function diffZonedEpochs(
+function diffZonedEpochsViaCalendar(
   calendarOps: DiffOps,
   timeZoneOps: TimeZoneOps,
   slots0: ZonedEpochSlots,
@@ -532,7 +532,7 @@ function diffZonedEpochs(
   return dateTimeDiff
 }
 
-function diffDateTimes(
+function diffDateTimesViaCalendar(
   calendarOps: DiffOps,
   startIsoFields: IsoDateTimeFields,
   endIsoFields: IsoDateTimeFields,

diff --git a/packages/temporal-polyfill/src/internal/diffExtended.ts b/packages/temporal-polyfill/src/internal/diffExtended.ts
@@ -13,7 +13,7 @@ import {
 import { DurationFields } from './durationFields'
 import { IsoDateFields } from './isoFields'
 import { Marker, MarkerToEpochNano, MoveMarker } from './markerSystem'
-import { moveDateTime, moveZonedEpochSlots } from './move'
+import { moveDateTime, moveZonedEpochs } from './move'
 import {
   RoundingMathOptions,
   RoundingModeName,
@@ -53,7 +53,7 @@ function diffZonedLargeUnits(
   return diffDateUnits(
     extractEpochNano as MarkerToEpochNano,
     bindArgs(zonedEpochRangeToIso, timeZoneOps) as MarkersToIsoFields,
-    bindArgs(moveZonedEpochSlots, calendarOps, timeZoneOps) as MoveMarker,
+    bindArgs(moveZonedEpochs, calendarOps, timeZoneOps) as MoveMarker,
     (f0: IsoDateFields, f1: IsoDateFields) =>
       calendarOps.dateUntil(f0, f1, unit),
     unit,
@@ -104,7 +104,7 @@ function diffZonedDayLikeUnits(
   return diffDateUnits(
     extractEpochNano as MarkerToEpochNano,
     bindArgs(zonedEpochRangeToIso, timeZoneOps) as MarkersToIsoFields,
-    bindArgs(moveZonedEpochSlots, calendarOps, timeZoneOps) as MoveMarker,
+    bindArgs(moveZonedEpochs, calendarOps, timeZoneOps) as MoveMarker,
     diffIsoFields,
     unit,
     record0,

diff --git a/packages/temporal-polyfill/src/internal/markerSystem.ts b/packages/temporal-polyfill/src/internal/markerSystem.ts
@@ -1,13 +1,13 @@
 import { BigNano } from './bigNano'
 import { DiffOps, MoveOps } from './calendarOps'
-import { diffDateTimesEfficient, diffZonedEpochsEfficient } from './diff'
+import { diffDateTimes, diffZonedEpochs } from './diff'
 import { DurationFields } from './durationFields'
 import {
   IsoDateFields,
   IsoDateTimeFields,
   isoTimeFieldDefaults,
 } from './isoFields'
-import { moveDateTime, moveZonedEpochSlots } from './move'
+import { moveDateTime, moveZonedEpochs } from './move'
 import { DateSlots, EpochAndZoneSlots, ZonedEpochSlots } from './slots'
 import { isoToEpochNano } from './timeMath'
 import { TimeZoneOps } from './timeZoneOps'
@@ -72,7 +72,7 @@ export function createMoveMarker(
   timeZoneOps: TimeZoneOps | undefined,
 ): MoveMarker {
   if (timeZoneOps) {
-    return bindArgs(moveZonedEpochSlots, calendarOps, timeZoneOps) as Callable
+    return bindArgs(moveZonedEpochs, calendarOps, timeZoneOps) as Callable
   }
   return bindArgs(moveDateTime, calendarOps) as Callable
 }
@@ -82,13 +82,9 @@ export function createDiffMarkers(
   timeZoneOps: TimeZoneOps | undefined,
 ): DiffMarkers {
   if (timeZoneOps) {
-    return bindArgs(
-      diffZonedEpochsEfficient,
-      calendarOps,
-      timeZoneOps,
-    ) as Callable
+    return bindArgs(diffZonedEpochs, calendarOps, timeZoneOps) as Callable
   }
-  return bindArgs(diffDateTimesEfficient, calendarOps) as Callable
+  return bindArgs(diffDateTimes, calendarOps) as Callable
 }
 
 export function anyMarkerToEpochNano(marker: Marker): BigNano {

diff --git a/packages/temporal-polyfill/src/internal/move.ts b/packages/temporal-polyfill/src/internal/move.ts
@@ -92,7 +92,7 @@ export function moveZonedDateTime<C, T>(
 
   return {
     ...zonedDateTimeSlots, // retain timeZone/calendar, order
-    ...moveZonedEpochSlots(
+    ...moveZonedEpochs(
       calendarOps,
       timeZoneOps,
       zonedDateTimeSlots,
@@ -130,7 +130,7 @@ export function movePlainDate<C>(
 ): PlainDateSlots<C> {
   const { calendar } = plainDateSlots
   return createPlainDateSlots(
-    moveDateEfficient(
+    moveDate(
       getCalendarOps(calendar),
       plainDateSlots,
       doSubtract ? negateDurationFields(durationSlots) : durationSlots,
@@ -204,7 +204,7 @@ function moveEpochNano(
 /*
 timeZoneOps must be derived from zonedEpochSlots.timeZone
 */
-export function moveZonedEpochSlots(
+export function moveZonedEpochs(
   calendarOps: MoveOps,
   timeZoneOps: TimeZoneOps,
   slots: ZonedEpochSlots,
@@ -219,7 +219,7 @@ export function moveZonedEpochSlots(
     refineOverflowOptions(options) // for validation only
   } else {
     const isoDateTimeFields = zonedEpochSlotsToIso(slots, timeZoneOps)
-    const movedIsoDateFields = moveDateEfficient(
+    const movedIsoDateFields = moveDate(
       calendarOps,
       isoDateTimeFields,
       {
@@ -256,7 +256,7 @@ export function moveDateTime(
     durationFields,
   )
 
-  const movedIsoDateFields = moveDateEfficient(
+  const movedIsoDateFields = moveDate(
     calendarOps,
     isoDateTimeFields, // only date parts will be used
     {
@@ -276,7 +276,7 @@ export function moveDateTime(
 /*
 Skips calendar if moving days only
 */
-export function moveDateEfficient(
+export function moveDate(
   calendarOps: MoveOps,
   isoDateFields: IsoDateFields,
   durationFields: DurationFields,