gtfs-to-html 2.9.2 → 2.9.3

package/dist/bin/gtfs-to-html.js

@@ -11,7 +11,7 @@ import { hideBin } from "yargs/helpers";
 import PrettyError from "pretty-error";
 
 // src/lib/file-utils.ts
-import path from "node:path";
+import { dirname, join, resolve } from "node:path";
 import { createWriteStream } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { access, cp, copyFile, mkdir, readFile, rm } from "node:fs/promises";
@@ -323,7 +323,7 @@ function formatTripNameForCSV(trip, timetable) {
 }
 
 // package.json
-var version = "2.9.1";
+var version = "2.9.2";
 
 // src/lib/utils.ts
 var isTimepoint = (stoptime) => {
@@ -1789,7 +1789,7 @@ async function getConfig(argv2) {
   let data;
   let config;
   try {
-    data = await readFile(path.resolve(untildify(argv2.configPath)), "utf8");
+    data = await readFile(resolve(untildify(argv2.configPath)), "utf8");
   } catch (error) {
     throw new Error(
       `Cannot find configuration file at \`${argv2.configPath}\`. Use config-sample.json as a starting point, pass --configPath option`
@@ -1810,13 +1810,24 @@ async function getConfig(argv2) {
   }
   return config;
 }
-function getTemplatePath(templateFileName, config) {
-  let fullTemplateFileName = templateFileName;
-  if (config.noHead !== true) {
-    fullTemplateFileName += "_full";
+function getPathToViewsFolder(config) {
+  if (config.templatePath) {
+    return untildify(config.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 = config.templatePath === void 0 ? path.join(fileURLToPath(import.meta.url), "../../../views/default") : untildify(config.templatePath);
-  return path.join(templatePath, `${fullTemplateFileName}.pug`);
+  return viewsFolderPath;
+}
+function getPathToTemplateFile(templateFileName, config) {
+  const fullTemplateFileName = config.noHead !== true ? `${templateFileName}_full.pug` : `${templateFileName}.pug`;
+  return join(getPathToViewsFolder(config), fullTemplateFileName);
 }
 async function prepDirectory(exportPath) {
   await rm(exportPath, { recursive: true, force: true });
@@ -1832,35 +1843,31 @@ async function prepDirectory(exportPath) {
   }
 }
 async function copyStaticAssets(config, exportPath) {
-  const staticAssetPath = config.templatePath === void 0 ? path.join(fileURLToPath(import.meta.url), "../../../views/default") : untildify(config.templatePath);
+  const viewsFolderPath = getPathToViewsFolder(config);
   const foldersToCopy = ["css", "js", "img"];
   for (const folder of foldersToCopy) {
-    if (await access(path.join(staticAssetPath, folder)).then(() => true).catch(() => false)) {
-      await cp(
-        path.join(staticAssetPath, folder),
-        path.join(exportPath, folder),
-        {
-          recursive: true
-        }
-      );
+    if (await access(join(viewsFolderPath, folder)).then(() => true).catch(() => false)) {
+      await cp(join(viewsFolderPath, folder), join(exportPath, folder), {
+        recursive: true
+      });
     }
   }
   if (config.hasGtfsRealtime) {
     await copyFile(
       "node_modules/pbf/dist/pbf.js",
-      path.join(exportPath, "js/pbf.js")
+      join(exportPath, "js/pbf.js")
     );
     await copyFile(
       "node_modules/gtfs-realtime-pbf-js-module/gtfs-realtime.browser.proto.js",
-      path.join(exportPath, "js/gtfs-realtime.browser.proto.js")
+      join(exportPath, "js/gtfs-realtime.browser.proto.js")
     );
   }
 }
 function zipFolder(exportPath) {
-  const output = createWriteStream(path.join(exportPath, "timetables.zip"));
+  const output = createWriteStream(join(exportPath, "timetables.zip"));
   const archive = archiver("zip");
-  return new Promise((resolve, reject) => {
-    output.on("close", resolve);
+  return new Promise((resolve2, reject) => {
+    output.on("close", resolve2);
     archive.on("error", reject);
     archive.pipe(output);
     archive.glob("**/*.{txt,css,js,html}", {
@@ -1888,7 +1895,7 @@ function generateFolderName(timetablePage) {
   return sanitize(`${timetable.start_date}-${timetable.end_date}`);
 }
 async function renderTemplate(templateFileName, templateVars, config) {
-  const templatePath = getTemplatePath(templateFileName, config);
+  const templatePath = getPathToTemplateFile(templateFileName, config);
   const html = await renderFile(templatePath, {
     _,
     md: (text) => insane(marked.parseInline(text)),
@@ -2072,7 +2079,7 @@ function progressBar(formatString, barTotal, config) {
 }
 
 // src/lib/gtfs-to-html.ts
-import path2 from "node:path";
+import path from "node:path";
 import { mkdir as mkdir2, writeFile } from "node:fs/promises";
 import { map } from "lodash-es";
 import { openDb as openDb2, importGtfs } from "gtfs";
@@ -2104,7 +2111,7 @@ var gtfsToHtml = async (initialConfig) => {
   const agencyKey = config.agencies.map(
     (agency) => agency.agencyKey ?? agency.agency_key ?? "unknown"
   ).join("-");
-  const exportPath = path2.join(process.cwd(), "html", sanitize2(agencyKey));
+  const exportPath = path.join(process.cwd(), "html", sanitize2(agencyKey));
   const outputStats = {
     timetables: 0,
     timetablePages: 0,
@@ -2148,16 +2155,16 @@ var gtfsToHtml = async (initialConfig) => {
       outputStats.timetables += timetablePage.consolidatedTimetables.length;
       outputStats.timetablePages += 1;
       const datePath = generateFolderName(timetablePage);
-      await mkdir2(path2.join(exportPath, datePath), { recursive: true });
+      await mkdir2(path.join(exportPath, datePath), { recursive: true });
       config.assetPath = "../";
-      timetablePage.relativePath = path2.join(
+      timetablePage.relativePath = path.join(
         datePath,
         sanitize2(timetablePage.filename)
       );
       if (config.outputFormat === "csv") {
         for (const timetable of timetablePage.consolidatedTimetables) {
           const csv = await generateTimetableCSV(timetable);
-          const csvPath = path2.join(
+          const csvPath = path.join(
             exportPath,
             datePath,
             generateFileName(timetable, config, "csv")
@@ -2166,7 +2173,7 @@ var gtfsToHtml = async (initialConfig) => {
         }
       } else {
         const html = await generateTimetableHTML(timetablePage, config);
-        const htmlPath = path2.join(
+        const htmlPath = path.join(
           exportPath,
           datePath,
           sanitize2(timetablePage.filename)
@@ -2191,14 +2198,14 @@ var gtfsToHtml = async (initialConfig) => {
   if (config.outputFormat === "html") {
     config.assetPath = "";
     const html = await generateOverviewHTML(timetablePages, config);
-    await writeFile(path2.join(exportPath, "index.html"), html);
+    await writeFile(path.join(exportPath, "index.html"), html);
   }
   const logText = generateLogText(outputStats, config);
-  await writeFile(path2.join(exportPath, "log.txt"), logText);
+  await writeFile(path.join(exportPath, "log.txt"), logText);
   if (config.zipOutput) {
     await zipFolder(exportPath);
   }
-  const fullExportPath = path2.join(
+  const fullExportPath = path.join(
     exportPath,
     config.zipOutput ? "/timetables.zip" : ""
   );