@malloydata/malloyyo 0.2.22 → 0.2.23

package/dist/index.js

@@ -7,19 +7,80 @@ import { resolve as resolve2 } from "node:path";
 // src/config.ts
 import { readFileSync, existsSync } from "node:fs";
 import { join } from "node:path";
+var KNOWN_KEYS = /* @__PURE__ */ new Set(["analytics", "targets"]);
+function isTarget(v) {
+  return typeof v === "object" && v !== null && typeof v.url === "string";
+}
+var warned = /* @__PURE__ */ new Set();
+function warnOnce(key, msg) {
+  if (warned.has(key)) return;
+  warned.add(key);
+  console.warn(msg);
+}
+function parseMalloyyoConfig(raw) {
+  const declared = raw.targets;
+  const targets = typeof declared === "object" && declared !== null ? { ...declared } : {};
+  const legacy = [];
+  const unknown = [];
+  for (const [k, v] of Object.entries(raw)) {
+    if (KNOWN_KEYS.has(k)) continue;
+    if (isTarget(v)) {
+      if (!(k in targets)) targets[k] = v;
+      legacy.push(k);
+    } else {
+      unknown.push(k);
+    }
+  }
+  if (legacy.length) {
+    warnOnce(
+      "legacy-targets",
+      `malloy-config.json: publish target(s) ${legacy.map((t) => `"${t}"`).join(", ")} are at the top of the "malloyyo" block. Move them under "targets":
+  "malloyyo": { "targets": { ${legacy.map((t) => `"${t}": { \u2026 }`).join(", ")} } }
+The old shape still works for now.`
+    );
+  }
+  if (unknown.length) {
+    warnOnce(
+      "unknown-keys",
+      `malloy-config.json: ignoring unknown key(s) in the "malloyyo" block: ${unknown.map((k) => `"${k}"`).join(", ")}. Known keys: ${[...KNOWN_KEYS].join(", ")}.`
+    );
+  }
+  const analytics = raw.analytics;
+  return {
+    analytics: typeof analytics === "string" && analytics ? analytics : void 0,
+    targets
+  };
+}
 function readTargetMap(dir) {
+  const raw = readMalloyyoBlock(dir);
+  if (raw) return parseMalloyyoConfig(raw).targets;
+  throw new Error(
+    `No \`malloyyo\` config found in ${dir} (looked for a "malloyyo" block in malloy-config.json, then malloyyo.json).`
+  );
+}
+function readMalloyyoBlock(dir) {
   const malloyConfig = join(dir, "malloy-config.json");
   if (existsSync(malloyConfig)) {
-    const json = JSON.parse(readFileSync(malloyConfig, "utf8"));
-    if (json.malloyyo && typeof json.malloyyo === "object") return json.malloyyo;
+    try {
+      const json = JSON.parse(readFileSync(malloyConfig, "utf8"));
+      if (json.malloyyo && typeof json.malloyyo === "object") return json.malloyyo;
+    } catch {
+    }
   }
   const standalone = join(dir, "malloyyo.json");
   if (existsSync(standalone)) {
-    return JSON.parse(readFileSync(standalone, "utf8"));
+    try {
+      return JSON.parse(readFileSync(standalone, "utf8"));
+    } catch {
+    }
   }
-  throw new Error(
-    `No \`malloyyo\` config found in ${dir} (looked for a "malloyyo" block in malloy-config.json, then malloyyo.json).`
-  );
+  return null;
+}
+function readSiteConfig(dir) {
+  const raw = readMalloyyoBlock(dir);
+  if (!raw) return {};
+  const { analytics } = parseMalloyyoConfig(raw);
+  return analytics ? { analytics } : {};
 }
 var normalizeUrl = (u) => u.replace(/\/+$/, "");
 function resolveTarget(dir, name) {
@@ -3366,6 +3427,7 @@ async function bundleDashboards(opts = {}) {
   const outDir = path7.resolve(root, opts.out ?? "docs");
   const title = opts.title ?? path7.basename(root);
   const target = opts.target ?? "pages";
+  const analytics = opts.analytics ?? readSiteConfig(root).analytics;
   const cleanUrls = target === "vercel";
   const selfHostDuckdb = opts.duckdb === "bundled";
   const runner = await makeRunner(root);
@@ -3502,9 +3564,9 @@ boot(Dashboard);
       if (!got.ok) throw new Error(`dashboard ${d.name}: ${got.error}`);
       specs = got.givens;
     }
-    fs6.writeFileSync(path7.join(outDir, `${d.name}.html`), page(d, dashboards, title, specs, tileSpecs, cleanUrls, opts.analytics));
+    fs6.writeFileSync(path7.join(outDir, `${d.name}.html`), page(d, dashboards, title, specs, tileSpecs, cleanUrls, analytics));
   }
-  fs6.writeFileSync(path7.join(outDir, "index.html"), indexPage(dashboards, title, !!landing, cleanUrls, opts.analytics));
+  fs6.writeFileSync(path7.join(outDir, "index.html"), indexPage(dashboards, title, !!landing, cleanUrls, analytics));
   if (landing) {
     await esbuild3.build({
       stdin: {
@@ -3542,6 +3604,7 @@ bundled ${dashboards.length} dashboard(s) \u2192 ${path7.relative(process.cwd(),
     selfHostDuckdb ? `  duckdb     ${duck.length} assets (self-hosted)` : `  duckdb     jsDelivr CDN (nothing copied)`
   );
   console.log(`  model      ${Object.keys(modelFiles).length} .malloy files inlined`);
+  if (analytics) console.log(`  analytics  ${analytics}`);
   if (copiedData.length) {
     const mb = copiedData.reduce((a, r) => a + fs6.statSync(path7.join(root, r)).size, 0) / 1048576;
     console.log(`  data       ${copiedData.length} file(s) copied, ${mb.toFixed(1)} MB (same-origin)`);
@@ -3677,7 +3740,7 @@ async function launchCmd(mode, opts) {
 }
 
 // package.json
-var version = "0.2.22";
+var version = "0.2.23";
 
 // src/index.ts
 function shortSha(sha) {
@@ -3784,7 +3847,7 @@ program.command("author").option("-C, --root <dir>", "project root (default: cur
 program.command("test").option("-C, --root <dir>", "project root (default: current directory)").description("launch Claude wired ONLY to the explore surface \u2014 the claude.ai web preview").action(async (opts) => {
   await launchCmd("test", opts);
 });
-program.command("dashboard").argument("<action>", "action to run (dev | bundle)").option("-C, --root <dir>", "project root (default: current directory)").option("-p, --port <port>", "port to serve on (dev)", "4173").option("-o, --out <dir>", "output directory (bundle)", "docs").option("--title <title>", "site title (bundle; default: project directory name)").option("--target <target>", "deploy target: pages | vercel (bundle)", "pages").option("--duckdb <source>", "DuckDB binaries: cdn | bundled (bundle)", "cdn").option("--analytics <id>", "Google Analytics 4 Measurement ID, e.g. G-XXXXXXXXXX (bundle)").option("--no-serve", "bundle only; don't serve the result (bundle)").description("preview dashboards locally (dev), or build a static site from them (bundle)").action(
+program.command("dashboard").argument("<action>", "action to run (dev | bundle)").option("-C, --root <dir>", "project root (default: current directory)").option("-p, --port <port>", "port to serve on (dev)", "4173").option("-o, --out <dir>", "output directory (bundle)", "docs").option("--title <title>", "site title (bundle; default: project directory name)").option("--target <target>", "deploy target: pages | vercel (bundle)", "pages").option("--duckdb <source>", "DuckDB binaries: cdn | bundled (bundle)", "cdn").option("--analytics <id>", "GA4 Measurement ID, overriding malloyyo.analytics in malloy-config.json (bundle)").option("--no-serve", "bundle only; don't serve the result (bundle)").description("preview dashboards locally (dev), or build a static site from them (bundle)").action(
   async (action, opts) => {
     if (action === "dev") {
       await serveDashboard({ root: opts.root, port: Number(opts.port) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloyyo",
-  "version": "0.2.22",
+  "version": "0.2.23",
   "description": "Publish Malloy models to a Malloyyo instance",
   "license": "MIT",
   "repository": {