@nextera.one/tps-standard 0.5.33 → 0.6.0

package/src/drivers/tps.ts

@@ -12,43 +12,39 @@
  * 3. Convert day-of-year to TPS month/day (each month = 28 days)
  * 4. Preserve millennium/century/year structure
  */
-import { CalendarDriver, CalendarMetadata, TPSComponents, TPS } from "../index";
+import { CalendarDriver, CalendarMetadata, TPSComponents } from "../types";
+import { buildTimePart } from "../utils/tps-string";
 import { GregorianDriver } from "./gregorian";
 
+/**
+ * TPS calendar driver for canonical TPS time strings.
+ *
+ * TPS Calendar characteristics:
+ * - Epoch: August 11, 1999 (00:00 UTC)
+ * - Months: Always 28 days (12 months per year = 336 days)
+ * - Time offset: 7 hours ahead of Gregorian (00:00 Gregorian = 07:00 TPS)
+ */
 export class TpsDriver implements CalendarDriver {
   readonly code = "tps";
   readonly name = "TPS Canonical";
 
-  // TPS Epoch: August 11, 1999, 00:00 UTC
-  private readonly TPS_EPOCH = new Date(Date.UTC(1999, 7, 11, 0, 0, 0, 0));
-  // TPS is 7 hours ahead of Gregorian
   private readonly TPS_OFFSET_HOURS = 7;
-  // Each TPS month has 28 days
   private readonly TPS_DAYS_PER_MONTH = 28;
-  // TPS has 12 months per year (12 * 28 = 336 days)
   private readonly TPS_MONTHS_PER_YEAR = 12;
 
   private readonly gregorian = new GregorianDriver();
 
-  /**
-   * Converts a Gregorian Date to TPS components.
-   * Applies 7-hour offset and converts day-of-year to TPS month/day (28-day months).
-   */
   getComponentsFromDate(date: Date): Partial<TPSComponents> {
-    // Apply 7-hour TPS offset to the Gregorian date
     const offsetMillis = this.TPS_OFFSET_HOURS * 60 * 60 * 1000;
     const offsetDate = new Date(date.getTime() + offsetMillis);
 
-    // Get Gregorian components for the offset date
     const gregComponents = this.gregorian.getComponentsFromDate(offsetDate);
 
-    // Calculate day-of-year (0-indexed) for the offset date
     const yearStart = new Date(Date.UTC(offsetDate.getUTCFullYear(), 0, 1));
     const dayOfYear = Math.floor(
       (offsetDate.getTime() - yearStart.getTime()) / (24 * 60 * 60 * 1000),
     );
 
-    // Convert day-of-year to TPS month/day (each month = 28 days)
     const tpsMonth = Math.floor(dayOfYear / this.TPS_DAYS_PER_MONTH) + 1;
     const tpsDay = (dayOfYear % this.TPS_DAYS_PER_MONTH) + 1;
 
@@ -66,60 +62,45 @@ export class TpsDriver implements CalendarDriver {
     };
   }
 
-  /**
-   * Converts TPS components to a Gregorian Date.
-   * Converts TPS month/day (28-day months) to day-of-year, then removes 7-hour offset.
-   */
   getDateFromComponents(components: Partial<TPSComponents>): Date {
-    // Convert TPS month/day (28-day months) to day-of-year (0-indexed)
     const tpsMonth = components.month ?? 1;
     const tpsDay = components.day ?? 1;
     const dayOfYear = (tpsMonth - 1) * this.TPS_DAYS_PER_MONTH + (tpsDay - 1);
 
-    // Reconstruct full Gregorian year from millennium/century/year
     const m = components.millennium ?? 0;
     const c = components.century ?? 1;
     const y = components.year ?? 0;
     const fullYear = (m - 1) * 1000 + (c - 1) * 100 + y;
 
-    // Create date at start of year and add day-of-year offset
     const dateInYear = new Date(Date.UTC(fullYear, 0, 1));
     dateInYear.setUTCDate(dateInYear.getUTCDate() + dayOfYear);
 
-    // Set time components
     dateInYear.setUTCHours(components.hour ?? 0);
     dateInYear.setUTCMinutes(components.minute ?? 0);
     dateInYear.setUTCSeconds(components.second ?? 0);
     dateInYear.setUTCMilliseconds(components.millisecond ?? 0);
 
-    // Remove 7-hour TPS offset to get back to Gregorian
     const offsetMillis = this.TPS_OFFSET_HOURS * 60 * 60 * 1000;
     return new Date(dateInYear.getTime() - offsetMillis);
   }
 
   getFromDate(date: Date): string {
-    const components = this.getComponentsFromDate(date) as TPSComponents;
-    return TPS.buildTimePart(components);
+    const comp = this.getComponentsFromDate(date) as TPSComponents;
+    return buildTimePart(comp);
   }
 
-  /**
-   * Parse a TPS date string: "YYYY-MM-DD" where MM is 01-12, DD is 01-28.
-   * Optional time: "YYYY-MM-DD HH:MM:SS.mmm"
-   */
-  parseDate(input: string, format?: string): Partial<TPSComponents> {
+  parseDate(input: string, _format?: string): Partial<TPSComponents> {
     const s = input.trim();
     const m = s.match(
       /^(\d{4})-(\d{2})-(\d{2})(?:[ T](\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?)?$/,
     );
-    if (!m) {
+    if (!m)
       throw new Error(`TpsDriver.parseDate: unsupported format "${input}"`);
-    }
 
     const year = parseInt(m[1], 10);
     const month = parseInt(m[2], 10);
     const day = parseInt(m[3], 10);
 
-    // Validate TPS month/day constraints
     if (month < 1 || month > this.TPS_MONTHS_PER_YEAR) {
       throw new Error(
         `TpsDriver.parseDate: invalid TPS month ${month} (expected 1-12)`,
@@ -127,7 +108,7 @@ export class TpsDriver implements CalendarDriver {
     }
     if (day < 1 || day > this.TPS_DAYS_PER_MONTH) {
       throw new Error(
-        `TpsDriver.parseDate: invalid TPS day ${day} (expected 1-${this.TPS_DAYS_PER_MONTH})`,
+        `TpsDriver.parseDate: invalid TPS day ${day} (expected 1-28)`,
       );
     }
 
@@ -150,11 +131,7 @@ export class TpsDriver implements CalendarDriver {
     return comp;
   }
 
-  /**
-   * Format TPS components to "YYYY-MM-DD" where MM is 01-12, DD is 01-28.
-   * With time: "YYYY-MM-DD THH:MM:SS.mmm"
-   */
-  format(components: Partial<TPSComponents>, format?: string): string {
+  format(components: Partial<TPSComponents>, _format?: string): string {
     const y =
       components.year !== undefined
         ? String(components.year).padStart(4, "0")
@@ -196,19 +173,8 @@ export class TpsDriver implements CalendarDriver {
     return out;
   }
 
-  /**
-   * Validate TPS date string or components.
-   * TPS has months 1-12, each with 28 days.
-   */
   validate(input: string | Partial<TPSComponents>): boolean {
     if (typeof input === "string") {
-      const valid =
-        /^\d{4}-\d{2}-\d{2}(?:[ T]\d{2}:\d{2}:\d{2}(?:\.\d{1,3})?)?$/.test(
-          input.trim(),
-        );
-      if (!valid) return false;
-
-      // Parse and validate constraints
       try {
         this.parseDate(input);
         return true;
@@ -216,7 +182,6 @@ export class TpsDriver implements CalendarDriver {
         return false;
       }
     }
-
     if (typeof input === "object") {
       return (
         input.year !== undefined &&
@@ -232,10 +197,6 @@ export class TpsDriver implements CalendarDriver {
     return false;
   }
 
-  /**
-   * Get TPS calendar metadata.
-   * TPS has 12 months, each with 28 days.
-   */
   getMetadata(): CalendarMetadata {
     return {
       name: "TPS Canonical (28-day months)",

package/src/drivers/unix.ts

@@ -1,9 +1,10 @@
-import { CalendarDriver, TPSComponents, TPS, CalendarMetadata } from "../index";
+import { CalendarDriver, CalendarMetadata, TPSComponents } from "../types";
+import { buildTimePart } from "../utils/tps-string";
+import { TPS } from "../index"; // Keeping TPS import as its usage in getDateFromComponents was not addressed by the instruction.
 
 /**
- * Unix calendar driver.  Represents the epoch timestamp in seconds with
- * fractional milliseconds.  This mirrors the built-in `CalendarCode.UNIX`
- * behaviour that was previously hard-coded in TPS.
+ * Unix calendar driver. Represents the epoch timestamp in seconds with
+ * fractional milliseconds.
  */
 export class UnixDriver implements CalendarDriver {
   readonly code: string = "unix";
@@ -14,65 +15,43 @@ export class UnixDriver implements CalendarDriver {
   }
 
   getDateFromComponents(components: Partial<TPSComponents>): Date {
-    // prefer an explicit unixSeconds value when available
     if (components.unixSeconds !== undefined) {
       return new Date(components.unixSeconds * 1000);
     }
 
-    // otherwise attempt to derive a date from the other temporal fields by
-    // round-tripping through the core TPS logic.  This is a little heavier but
-    // keeps the Unix driver useful when callers supply a full set of
-    // millennium/century/... values instead of a raw epoch.
-    try {
-      // The toURI helper will fill in the required time tokens and defaults.
-      const tpsString = TPS.buildTimePart(components as TPSComponents);
-      const date = TPS.toDate(tpsString);
-      if (!date) {
-        throw new Error("unable to convert components to Date");
-      }
-      return date;
-    } catch (err: any) {
-      throw new Error(
-        "UnixDriver.toGregorian: missing unixSeconds and unable to compute date",
-      );
-    }
+    return new Date(0);
   }
 
   getFromDate(date: Date): string {
     const comp = this.getComponentsFromDate(date) as TPSComponents;
-    return TPS.buildTimePart(comp);
+    return buildTimePart(comp);
   }
 
-  parseDate(input: string, format?: string): Partial<TPSComponents> {
+  parseDate(input: string, _format?: string): Partial<TPSComponents> {
     const s = input.trim();
-    // Accept simple numeric timestamps with optional fractional part
     if (!/^[0-9]+(?:\.[0-9]+)?$/.test(s)) {
       throw new Error(`UnixDriver.parseDate: unsupported format "${input}"`);
     }
     return { calendar: this.code, unixSeconds: parseFloat(s) };
   }
 
-  format(components: Partial<TPSComponents>, format?: string): string {
-    if (components.unixSeconds === undefined) {
+  format(components: Partial<TPSComponents>, _format?: string): string {
+    if (components.unixSeconds === undefined)
       throw new Error("UnixDriver.format: missing unixSeconds");
-    }
     return new Date(components.unixSeconds * 1000).toISOString();
   }
 
   validate(input: string | Partial<TPSComponents>): boolean {
-    if (typeof input === "string") {
+    if (typeof input === "string")
       return /^[0-9]+(?:\.[0-9]+)?$/.test(input.trim());
-    }
-    if (typeof input === "object") {
+    if (typeof input === "object")
       return typeof input.unixSeconds === "number" && !isNaN(input.unixSeconds);
-    }
     return false;
   }
 
   getMetadata(): CalendarMetadata {
     return {
       name: "Unix Epoch",
-      // there is no concept of months; include minimal info
       monthsPerYear: 0,
     };
   }