gtfs-to-html 2.9.2 → 2.9.4

package/dist/app/index.js

@@ -5,7 +5,7 @@ var __export = (target, all) => {
 };
 
 // src/app/index.ts
-import path2 from "node:path";
+import { dirname as dirname2, join as join2 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 import { readFileSync } from "node:fs";
 import { map } from "lodash-es";
@@ -131,7 +131,7 @@ import sqlString from "sqlstring";
 import toposort from "toposort";
 
 // src/lib/file-utils.ts
-import path from "node:path";
+import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import _ from "lodash-es";
 import archiver from "archiver";
@@ -258,13 +258,24 @@ function formatTripNameForCSV(trip, timetable) {
 }
 
 // src/lib/file-utils.ts
-function getTemplatePath(templateFileName, config2) {
-  let fullTemplateFileName = templateFileName;
-  if (config2.noHead !== true) {
-    fullTemplateFileName += "_full";
+function getPathToViewsFolder(config2) {
+  if (config2.templatePath) {
+    return untildify(config2.templatePath);
+  }
+  const __dirname = dirname(fileURLToPath(import.meta.url));
+  let viewsFolderPath;
+  if (__dirname.endsWith("/dist/bin") || __dirname.endsWith("/dist/app")) {
+    viewsFolderPath = resolve(__dirname, "../../views/default");
+  } else if (__dirname.endsWith("/dist")) {
+    viewsFolderPath = resolve(__dirname, "../views/default");
+  } else {
+    viewsFolderPath = resolve(__dirname, "views/default");
   }
-  const templatePath = config2.templatePath === void 0 ? path.join(fileURLToPath(import.meta.url), "../../../views/default") : untildify(config2.templatePath);
-  return path.join(templatePath, `${fullTemplateFileName}.pug`);
+  return viewsFolderPath;
+}
+function getPathToTemplateFile(templateFileName, config2) {
+  const fullTemplateFileName = config2.noHead !== true ? `${templateFileName}_full.pug` : `${templateFileName}.pug`;
+  return join(getPathToViewsFolder(config2), fullTemplateFileName);
 }
 function generateFileName(timetable, config2, extension = "html") {
   let filename = timetable.timetable_id;
@@ -278,7 +289,7 @@ function generateFileName(timetable, config2, extension = "html") {
   return sanitize(filename).toLowerCase();
 }
 async function renderTemplate(templateFileName, templateVars, config2) {
-  const templatePath = getTemplatePath(templateFileName, config2);
+  const templatePath = getPathToTemplateFile(templateFileName, config2);
   const html = await renderFile(templatePath, {
     _,
     md: (text) => insane(marked.parseInline(text)),
@@ -365,7 +376,7 @@ function getAgencyGeoJSON(config2) {
 }
 
 // package.json
-var version = "2.9.1";
+var version = "2.9.3";
 
 // src/lib/utils.ts
 var isTimepoint = (stoptime) => {
@@ -1344,7 +1355,10 @@ function setDefaultConfig(initialConfig) {
     config2.menuType = "none";
   }
   config2.hasGtfsRealtime = config2.agencies.some(
-    (agency) => agency.realtimeTripUpdates?.url || agency.realtimeVehiclePositions?.url
+    (agency) => agency.realtimeTripUpdates?.url || agency.realtimeVehiclePositions?.url || agency.realtimeAlerts?.url
+  );
+  config2.hasGtfsRealtimeAlerts = config2.agencies.some(
+    (agency) => agency.realtimeAlerts?.url
   );
   return config2;
 }
@@ -1772,7 +1786,7 @@ var argv = yargs(hideBin(process.argv)).option("c", {
 }).parseSync();
 var app = express();
 var router = express.Router();
-var configPath = argv.configPath || new URL("../../config.json", import.meta.url);
+var configPath = argv.configPath || join2(process.cwd(), "config.json");
 var selectedConfig = JSON.parse(readFileSync(configPath, "utf8"));
 var config = setDefaultConfig(selectedConfig);
 config.noHead = false;
@@ -1836,24 +1850,21 @@ router.get("/timetables/:timetablePageId", async (request, response, next) => {
     next(error);
   }
 });
-app.set("views", path2.join(fileURLToPath2(import.meta.url), "../../../views"));
+app.set("views", getPathToViewsFolder(config));
 app.set("view engine", "pug");
 app.use(logger("dev"));
-var staticAssetPath = config.templatePath === void 0 ? path2.join(fileURLToPath2(import.meta.url), "../../../views/default") : untildify2(config.templatePath);
+var staticAssetPath = config.templatePath === void 0 ? getPathToViewsFolder(config) : untildify2(config.templatePath);
 app.use(express.static(staticAssetPath));
 app.use(
   "/js",
   express.static(
-    path2.join(fileURLToPath2(import.meta.url), "../../../node_modules/pbf/dist")
+    join2(dirname2(fileURLToPath2(import.meta.resolve("pbf"))), "dist")
   )
 );
 app.use(
   "/js",
   express.static(
-    path2.join(
-      fileURLToPath2(import.meta.url),
-      "../../../node_modules/gtfs-realtime-pbf-js-module"
-    )
+    dirname2(fileURLToPath2(import.meta.resolve("gtfs-realtime-pbf-js-module")))
   )
 );
 app.use("/", router);