gtfs-to-html 2.11.4 → 2.12.0

package/dist/app/index.js

@@ -123,6 +123,7 @@ import toposort from "toposort";
 
 // src/lib/file-utils.ts
 import { dirname, join, resolve } from "path";
+import cssEscape from "css.escape";
 import { createWriteStream } from "fs";
 import { fileURLToPath } from "url";
 import {
@@ -149,7 +150,6 @@ import { marked } from "marked";
 // src/lib/template-functions.ts
 var template_functions_exports = {};
 __export(template_functions_exports, {
-  formatHtmlId: () => formatHtmlId,
   formatTripName: () => formatTripName,
   formatTripNameForCSV: () => formatTripNameForCSV,
   getNotesForStop: () => getNotesForStop,
@@ -162,9 +162,6 @@ __export(template_functions_exports, {
   timetablePageHasDifferentLabels: () => timetablePageHasDifferentLabels
 });
 import { every } from "lodash-es";
-function formatHtmlId(id) {
-  return id.replace(/([^\w[\]{}.:-])\s?/g, "");
-}
 function timetableHasDifferentDays(timetable) {
   return !every(timetable.orderedTrips, (trip, idx) => {
     if (idx === 0) {
@@ -309,6 +306,7 @@ async function renderTemplate(templateFileName, templateVars, config2) {
   const templatePath = getPathToTemplateFile(templateFileName, config2);
   const html = await renderFile(templatePath, {
     _,
+    cssEscape,
     md: (text) => sanitizeHtml(marked.parseInline(text)),
     ...template_functions_exports,
     formatRouteColor,
@@ -430,7 +428,7 @@ function getAgencyGeoJSON(config2) {
 // package.json
 var package_default = {
   name: "gtfs-to-html",
-  version: "2.11.4",
+  version: "2.12.0",
   private: false,
   description: "Build human readable transit timetables as HTML, PDF or CSV from GTFS",
   keywords: [
@@ -477,23 +475,26 @@ var package_default = {
     prepare: "husky"
   },
   dependencies: {
+    "@maplibre/maplibre-gl-geocoder": "^1.9.1",
     "@turf/helpers": "^7.2.0",
     "@turf/simplify": "^7.2.0",
     anchorme: "^3.0.8",
     archiver: "^7.0.1",
     "cli-table": "^0.3.11",
+    "css.escape": "^1.5.1",
     "csv-stringify": "^6.6.0",
     express: "^5.1.0",
     gtfs: "^4.18.1",
     "gtfs-realtime-pbf-js-module": "^1.0.0",
     "js-beautify": "^1.15.4",
     "lodash-es": "^4.17.21",
-    marked: "^16.4.1",
+    "maplibre-gl": "^5.12.0",
+    marked: "^17.0.0",
     moment: "^2.30.1",
     pbf: "^4.0.1",
     "pretty-error": "^4.0.0",
     pug: "^3.0.3",
-    puppeteer: "^24.26.1",
+    puppeteer: "^24.29.1",
     "sanitize-filename": "^1.6.3",
     "sanitize-html": "^2.17.0",
     sqlstring: "^2.3.3",
@@ -504,7 +505,7 @@ var package_default = {
   devDependencies: {
     "@types/archiver": "^7.0.0",
     "@types/cli-table": "^0.3.4",
-    "@types/express": "^5.0.4",
+    "@types/express": "^5.0.5",
     "@types/insane": "^1.0.0",
     "@types/js-beautify": "^1.14.3",
     "@types/lodash-es": "^4.17.12",
@@ -665,7 +666,12 @@ var getCalendarDatesForTimetable = (timetable, config2) => {
   const excludedDates = /* @__PURE__ */ new Set();
   const includedDates = /* @__PURE__ */ new Set();
   for (const calendarDate of calendarDates) {
-    if (moment2(calendarDate.date, "YYYYMMDD").isBetween(start, end, "day", "[]")) {
+    if (moment2(calendarDate.date, "YYYYMMDD").isBetween(
+      start,
+      end,
+      void 0,
+      "[]"
+    )) {
       if (calendarDate.exception_type === 1) {
         includedDates.add(formatDate(calendarDate, config2.dateFormat));
       } else if (calendarDate.exception_type === 2) {
@@ -2187,27 +2193,30 @@ app.use((req, res, next) => {
 });
 var staticAssetPath = config.templatePath === void 0 ? getPathToViewsFolder(config) : untildify(config.templatePath);
 app.use(express.static(staticAssetPath));
-app.use(
-  "/js",
-  express.static(
-    join2(dirname2(fileURLToPath2(import.meta.resolve("pbf"))), "dist")
-  )
-);
-app.use(
-  "/js",
-  express.static(
-    dirname2(fileURLToPath2(import.meta.resolve("gtfs-realtime-pbf-js-module")))
-  )
-);
-app.use(
-  "/js",
-  express.static(
-    join2(
-      dirname2(fileURLToPath2(import.meta.resolve("anchorme"))),
-      "../../dist/browser"
-    )
-  )
-);
+var frontendLibraryPaths = [
+  { route: "/js", package: "pbf", subPath: "dist" },
+  { route: "/js", package: "gtfs-realtime-pbf-js-module", subPath: "" },
+  { route: "/js", package: "anchorme", subPath: "../../dist/browser" },
+  { route: "/js", package: "maplibre-gl", subPath: "../dist" },
+  {
+    route: "/js",
+    package: "@maplibre/maplibre-gl-geocoder",
+    subPath: "../dist"
+  },
+  { route: "/css", package: "maplibre-gl", subPath: "../dist" },
+  {
+    route: "/css",
+    package: "@maplibre/maplibre-gl-geocoder",
+    subPath: "../dist"
+  }
+];
+var resolvePackagePath = (packageName, subPath) => {
+  const packagePath = dirname2(fileURLToPath2(import.meta.resolve(packageName)));
+  return subPath ? join2(packagePath, subPath) : packagePath;
+};
+for (const { route, package: pkg, subPath } of frontendLibraryPaths) {
+  app.use(route, express.static(resolvePackagePath(pkg, subPath)));
+}
 app.get("/", async (req, res, next) => {
   try {
     const timetablePages = [];