Merge remote-tracking branch 'origin/deps'

Author: pirxpilot

.github/workflows/check.yaml

@@ -1,12 +1,18 @@
 name: check
-on: [push]
+on:
+  push:
+    tags-ignore:
+      - '[0-9]+.[0-9]+.[0-9]+'
+    branches:
+      - '**'
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v6
         with:
-          node-version: 'lts/*'
-      - run: yarn install
+          node-version: lts/*
+      - run: npm install
       - run: make check

.github/workflows/publish.yaml

@@ -0,0 +1,26 @@
+name: publish
+
+on:
+  push:
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+
+permissions:
+  id-token: write # Required for OIDC
+  contents: read
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v6
+        with:
+          node-version: 'lts/*'
+
+      # Ensure npm 11.5.1 or later is installed
+      - name: update npm
+        run: npm install -g npm@latest
+      - run: npm install
+      - run: make check
+      - run: npm publish

biome.json

@@ -1,14 +1,19 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
-  "organizeImports": {
-    "enabled": true
+  "$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
+  "assist": {
+    "actions": {
+      "source": {
+        "organizeImports": "on"
+      }
+    }
   },
   "vcs": {
+    "enabled": true,
+    "clientKind": "git",
     "useIgnoreFile": true
   },
   "files": {
-    "ignoreUnknown": true,
-    "ignore": ["package.json"]
+    "ignoreUnknown": true
   },
   "formatter": {
     "enabled": true,
@@ -22,22 +27,35 @@
       "arrowParentheses": "asNeeded"
     }
   },
+  "json": {
+    "formatter": {
+      "expand": "always"
+    }
+  },
   "linter": {
     "enabled": true,
+    "domains": {
+      "project": "recommended"
+    },
     "rules": {
       "recommended": true,
       "correctness": {
+        "noUndeclaredDependencies": "error",
         "noUndeclaredVariables": "error",
-        "noUnusedVariables": "error"
+        "noUnusedVariables": "error",
+        "useImportExtensions": "error",
+        "useJsonImportAttributes": "error"
       },
       "complexity": {
-        "noForEach": "off",
-        "useArrowFunction": "off",
-        "useLiteralKeys": "off"
+        "noForEach": "off"
       },
       "style": {
-        "noParameterAssign": "off",
-        "useTemplate": "off"
+        "noUnusedTemplateLiteral": "error",
+        "noUselessElse": "error",
+        "useBlockStatements": "error",
+        "useDefaultParameterLast": "error",
+        "useNumberNamespace": "error",
+        "useSingleVarDeclarator": "error"
       },
       "performance": {
         "noDelete": "off"

lib/ical.js

@@ -11,15 +11,19 @@ function id2uuid(id, day) {
   if (day) {
     id += day;
   }
-  return uuid(id, NAMESPACE) + '@furkot.com';
+  return `${uuid(id, NAMESPACE)}@furkot.com`;
 }
 
 function ts2date(ts) {
   // remove dashes and colons and strip milliseconds
   return new Date(ts).toISOString().replace(/[-:]/g, '').slice(0, -5);
 }
 
-export default function* ical({ metadata, routes }) {
+function tzid(property, tz) {
+  return tz ? `${property};TZID=${tz}` : property;
+}
+
+export default function* ical({ metadata, routes, options = {} }) {
   const dtstamp = ts2date(Date.now());
 
   yield* property('BEGIN', 'VCALENDAR');
@@ -40,8 +44,9 @@ export default function* ical({ metadata, routes }) {
     yield* property('URL', step.url);
     yield* property('LOCATION', step.address);
     yield* property('GEO', [step.coordinates.lat, step.coordinates.lon], formatArray);
-    yield* property('DTSTART', ts2date(step.arrival_time));
-    yield* property('DTEND', ts2date(step.departure_time));
+    const tz = options.tzid && step.timezone?.name;
+    yield* property(tzid('DTSTART', tz), ts2date(step.arrival_time));
+    yield* property(tzid('DTEND', tz), ts2date(step.departure_time));
     yield* property('END', 'VEVENT');
   }
   yield* property('END', 'VCALENDAR');

lib/property.js

@@ -10,7 +10,7 @@ export default function* property(name, value, format = formatText) {
     return;
   }
   value = format(value);
-  const line = name + ':' + value;
+  const line = `${name}:${value}`;
   const ab = encoder.encode(line);
 
   const buffer = new Uint8Array(ab);

package.json

@@ -25,10 +25,10 @@
     "iCal"
   ],
   "dependencies": {
-    "uuid": "~11"
+    "uuid": "~13"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.9.4"
+    "@biomejs/biome": "2.3.13"
   },
   "scripts": {
     "test": "make check"

test/fixtures/simple-trip.json

@@ -34,7 +34,10 @@
           "visit_duration": 0,
           "nights": 0,
           "arrival_time": 1373274000000,
-          "departure_time": 1373274000000
+          "departure_time": 1373274000000,
+          "timezone": {
+            "name": "America/Los_Angeles"
+          }
         },
         {
           "id": "5144f7cbd6e4d26079000009",
@@ -58,7 +61,10 @@
           "driving": 11580,
           "nights": 0,
           "arrival_time": 1373285580000,
-          "departure_time": 1373286480000
+          "departure_time": 1373286480000,
+          "timezone": {
+            "name": "America/Los_Angeles"
+          }
         },
         {
           "id": "5144f7dfd6e4d2607900000a",
@@ -84,6 +90,9 @@
           "nights": 0,
           "arrival_time": 1373304660000,
           "departure_time": 1373305560000,
+          "timezone": {
+            "name": "America/Los_Angeles"
+          },
           "symbol": "Gas Station"
         },
         {
@@ -108,7 +117,10 @@
           "driving": 6595,
           "nights": 0,
           "arrival_time": 1373312155000,
-          "departure_time": 1373312155000
+          "departure_time": 1373312155000,
+          "timezone": {
+            "name": "America/Los_Angeles"
+          }
         }
       ],
       "name": ""

test/fixtures/simple_tz.ics

@@ -0,0 +1,41 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//code42day//Furkot - road trip planner//EN
+BEGIN:VEVENT
+DTSTAMP:20220529T071758
+UID:50d1b16d-3cc5-501a-9ab1-fa68286a011f@furkot.com
+SUMMARY:San Francisco
+LOCATION:San Francisco\, CA
+GEO:37.7749295;-122.41941550000001
+DTSTART;TZID=America/Los_Angeles:20130708T090000
+DTEND;TZID=America/Los_Angeles:20130708T090000
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20220529T071758
+UID:d2a184cf-7264-570f-9880-003054b10222@furkot.com
+SUMMARY:Redding
+LOCATION:1510 Gordon Lane\, Redding\, CA 96002\, USA
+GEO:40.54720023441049;-122.34375
+DTSTART;TZID=America/Los_Angeles:20130708T121300
+DTEND;TZID=America/Los_Angeles:20130708T122800
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20220529T071758
+UID:b66792fd-6bd2-5c84-91e7-27c6cd532a54@furkot.com
+SUMMARY:Lane
+LOCATION:51-559 Walnut Place\, Springfield\, OR 97477\, USA
+GEO:44.04811573082351;-123.046875
+DTSTART;TZID=America/Los_Angeles:20130708T173100
+DTEND;TZID=America/Los_Angeles:20130708T174600
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20220529T071758
+UID:924fc5db-ab1d-5406-8a50-af6943d1c2f1@furkot.com
+SUMMARY:Portland
+DESCRIPTION:Trip notes for first stop
+LOCATION:Portland\, OR
+GEO:45.5234515;-122.6762071
+DTSTART;TZID=America/Los_Angeles:20130708T193555
+DTEND;TZID=America/Los_Angeles:20130708T193555
+END:VEVENT
+END:VCALENDAR

test/ical.js

@@ -46,6 +46,13 @@ describe('ical', () => {
     compareLines(generated, expected);
   });
 
+  it('simple trip with TZID', () => {
+    const generated = ical({ ...simpleTrip, options: { tzid: true } });
+    const expected = readFileSync('fixtures/simple_tz.ics');
+
+    compareLines(generated, expected);
+  });
+
   it('multi trip', () => {
     const generated = ical(multiTrip);
     const expected = readFileSync('fixtures/multi.ics');