Simplify date handling in API

johanbrook · Mar 15, 2024 · 2af2f6a · 2af2f6a
1 parent ddd18be
commit 2af2f6a
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 704 deletions.
diff --git a/api/date.ts b/api/date.ts
@@ -1,5 +1,3 @@
-import { DateTimeFormatterTemporal } from './vendor/datetime-format-temporal.ts';
-
 // => 'yyyy-MM-dd HH:mm:ss'
 // fileName: true => 'yyyy-MM-dd-HH-mm-ss'
 export const formatDate = (date: Date, fileName = false) => {
@@ -19,13 +17,22 @@ export const formatDate = (date: Date, fileName = false) => {
     return datePart + ' ' + timePart;
 };
 
-// Temporal proposal doesn't include nice strftime stuff yet:
-// https://github.com/js-temporal/proposal-temporal-v2/issues/5
-// This function only supports "simple" formats, like `yyyy-MM-dd HH:mm:ss`
-export const formatTemporalDate = (thing: Temporal.PlainDateTimeLike, format: string): string => {
-    const formatter = new DateTimeFormatterTemporal(format);
-    return formatter.format(thing);
-};
+/** Formats into `2024-03-15T10:24:35+01:00`. */
+export const formatISO = (d: Temporal.ZonedDateTime): string =>
+    d.toString({
+        timeZoneName: 'never',
+        smallestUnit: 'seconds',
+    });
+
+/** Format appropriate for file name: `2024-03-15-10-24-35`. */
+export const formatFileName = (d: Temporal.ZonedDateTime): string =>
+    d.toString({
+        timeZoneName: 'never',
+        smallestUnit: 'seconds',
+        offset: 'never',
+    })
+        .replace('T', '-')
+        .replaceAll(':', '-');
 
 export const safeTemporalZonedDateTime = (str: string): Temporal.ZonedDateTime | null => {
     try {

diff --git a/api/routes/book.ts b/api/routes/book.ts
@@ -42,13 +42,6 @@ interface Body {
 
 // TODO abstract
 const finishBookParseBody = (json: any): Body => {
-    if (typeof json.finishedAt != 'string') {
-        throw new ProblemError(
-            ProblemKind.BodyParseError,
-            `"finishedAt" must be a string, got ${typeof json.finishedAt}`,
-        );
-    }
-
     const zonedDateTime = ((): Temporal.ZonedDateTime => {
         if (typeof json.finishedAt != 'string') {
             throw new ProblemError(

diff --git a/api/routes/note.ts b/api/routes/note.ts
@@ -1,5 +1,5 @@
 import { Meta } from './index.ts';
-import { formatTemporalDate, safeTemporalZonedDateTime } from '../date.ts';
+import { formatFileName, formatISO, safeTemporalZonedDateTime } from '../date.ts';
 import { ProblemError, ProblemKind } from '../problem.ts';
 import { join } from 'std/path/mod.ts';
 import * as Yaml from 'std/yaml/mod.ts';
@@ -69,13 +69,12 @@ const inputOf = (json: any): Input => {
 
     // I want both of these to be in the *local* time:
 
-    // Will go into the frontmatter:
-    const metaDate = formatTemporalDate(
+    // Will go into the frontmatter: "2024-03-15T10:24:35+01:00"
+    const metaDate = formatISO(
         zonedDateTime,
-        `yyyy-MM-dd'T'HH:mm:ss${zonedDateTime.offset}`,
     );
-    // Will be the filename:
-    const fileDate = formatTemporalDate(zonedDateTime, 'yyyy-MM-dd-HH-mm-ss');
+    // Will be the filename: "2024-03-15-10-24-35"
+    const fileDate = formatFileName(zonedDateTime);
 
     return {
         contents: json.contents.trim(),