@trailstash/ultra 3.1.4 → 3.2.1

package/cli/build.js

@@ -2,9 +2,10 @@ import fs from "fs";
 import path from "path";
 import process from "process";
 import { build } from "esbuild";
-import { Command, Flags } from "@oclif/core";
+import { Args, Command, Flags } from "@oclif/core";
 import { copy } from "esbuild-plugin-copy";
 import { Liquid } from "liquidjs";
+import { parseSettings } from "../lib/settings.js";
 
 const engine = new Liquid();
 export const getHTMLContext = async (configFile) => {
@@ -15,6 +16,19 @@ export const getHTMLContext = async (configFile) => {
   return { title, description, url, mastodon };
 };
 
+export const buildConfigFromQuery = async (config, query) => {
+  const querySettings = parseSettings(fs.readFileSync(query));
+  const { defaultMode, modes } = await import(config);
+  const settings = {
+    ...modes.map.settings,
+    ...querySettings,
+    loadSettingsFromQueryParams: false,
+  };
+  const newConfig = `export const defaultMode = "map";
+export const modes = {map: {settings: ${JSON.stringify(settings, null, 2)}}};`;
+  return `data:text/javascript;base64,${btoa(newConfig)}`;
+};
+
 export const ultraRoot = path.dirname(
   path.dirname(new URL(import.meta.url).pathname),
 );
@@ -52,14 +66,31 @@ export default class Build extends Command {
       default: path.join(process.cwd(), "/config.js"),
     }),
   };
+  static args = {
+    query: Args.file({
+      description: "A query to build an interactive map for",
+    }),
+  };
 
   static description = `Build a release of Ultra`;
 
   async run() {
-    const {
+    let {
       flags: { config },
+      args: { query },
     } = await this.parse(Build);
 
+    if (!fs.existsSync(config)) {
+      console.error(
+        `"${config}" not found, using ${path.join(ultraRoot, "config.js")}`,
+      );
+      config = path.join(ultraRoot, "config.js");
+    }
+
+    if (query) {
+      config = await buildConfigFromQuery(config, query);
+    }
+
     const html = engine.parseAndRenderSync(
       fs.readFileSync(path.join(ultraRoot, "index.html")),
       await getHTMLContext(config),

package/cli/serve.js

@@ -1,8 +1,13 @@
 import fs from "fs";
 import path from "path";
 import { context } from "esbuild";
-import { Command, Flags } from "@oclif/core";
-import Build, { buildOptions, getHTMLContext, ultraRoot } from "./build.js";
+import { Args, Command, Flags } from "@oclif/core";
+import Build, {
+  buildConfigFromQuery,
+  buildOptions,
+  getHTMLContext,
+  ultraRoot,
+} from "./build.js";
 import { Liquid } from "liquidjs";
 
 const engine = new Liquid();
@@ -22,15 +27,31 @@ export default class Serve extends Command {
       parse: parseInt,
     }),
   };
+  static args = {
+    query: Args.file({
+      description: "A query to build an interactive map for",
+    }),
+  };
 
   static description = `Run an Ultra development server`;
 
   async run() {
-    const {
+    let {
       args: { query },
       flags: { config, host, port },
     } = await this.parse(Serve);
 
+    if (!fs.existsSync(config)) {
+      console.error(
+        `"${config}" not found, using ${path.join(ultraRoot, "config.js")}`,
+      );
+      config = path.join(ultraRoot, "config.js");
+    }
+
+    if (query) {
+      config = await buildConfigFromQuery(config, query);
+    }
+
     const html = engine.parseAndRenderSync(
       fs.readFileSync(path.join(ultraRoot, "index.html")),
       await getHTMLContext(config),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.1.4",
+  "version": "3.2.1",
   "description": "A web based tool for making MapLibre GL maps with data from sources such as Overpass, GeoJSON, GPX, KML, TCX, etc",
   "main": "index.js",
   "scripts": {