@malloydata/malloyyo 0.2.33 → 0.2.34

package/dist/index.js

@@ -86,6 +86,16 @@ function readSiteConfig(dir) {
   return analytics ? { analytics } : {};
 }
 var normalizeUrl = (u) => u.replace(/\/+$/, "");
+function targetUrl(name, cfg) {
+  if (typeof cfg.url !== "string" || cfg.url === "") {
+    throw new Error(
+      `Target "${name}" has no "url" in malloy-config.json. Add one:
+  "malloyyo": { "targets": { "${name}": { "url": "https://<instance>", "dataset": "<dataset>" } } }
+Or name the instance on the command line:  malloyyo publish -i https://<instance>`
+    );
+  }
+  return normalizeUrl(cfg.url);
+}
 function resolveTarget(dir, name) {
   const targets = readTargetMap(dir);
   const entries = Object.entries(targets);
@@ -102,7 +112,7 @@ ${TARGETS_BLOCK_EXAMPLE}`
     const [onlyName, onlyCfg] = entries[0];
     return {
       name: onlyName,
-      url: normalizeUrl(onlyCfg.url),
+      url: targetUrl(onlyName, onlyCfg),
       dataset: onlyCfg.dataset,
       tokenEnv: onlyCfg.malloyyo_token?.env
     };
@@ -114,7 +124,7 @@ ${TARGETS_BLOCK_EXAMPLE}`
   }
   return {
     name,
-    url: normalizeUrl(cfg.url),
+    url: targetUrl(name, cfg),
     dataset: cfg.dataset,
     tokenEnv: cfg.malloyyo_token?.env
   };
@@ -132,14 +142,34 @@ function resolveInstance(dir, arg) {
       const available = entries.map(([n]) => n).join(", ") || "(none defined)";
       throw new Error(`Unknown target "${arg}". Pass a target name, a URL, or one of: ${available}`);
     }
-    return { name: arg, url: normalizeUrl(cfg.url) };
+    return { name: arg, url: targetUrl(arg, cfg) };
   }
   if (entries.length === 0) throw new Error("No targets defined. Pass a target name or a URL.");
-  if (entries.length === 1) return { name: entries[0][0], url: normalizeUrl(entries[0][1].url) };
-  const urls = new Set(entries.map(([, c]) => normalizeUrl(c.url)));
+  if (entries.length === 1) return { name: entries[0][0], url: targetUrl(entries[0][0], entries[0][1]) };
+  const urls = new Set(entries.map(([n, c]) => targetUrl(n, c)));
   if (urls.size === 1) return { name: entries.map(([n]) => n).join("/"), url: [...urls][0] };
   throw new Error(`Multiple targets \u2014 specify which: ${entries.map(([n]) => n).join(", ")} (or a URL).`);
 }
+function resolvePublishTarget(dir, name, overrides = {}) {
+  const { instance, dataset } = overrides;
+  if (instance === void 0 && dataset === void 0) return resolveTarget(dir, name);
+  if (instance !== void 0 && dataset !== void 0 && name === void 0) {
+    const resolved2 = resolveInstance(dir, instance);
+    return { name: resolved2.name, url: resolved2.url, dataset };
+  }
+  const base = resolveTarget(dir, name);
+  if (instance === void 0) return { ...base, dataset };
+  const resolved = resolveInstance(dir, instance);
+  return {
+    name: resolved.name,
+    url: resolved.url,
+    dataset: dataset ?? base.dataset
+    // tokenEnv is deliberately NOT carried over. It names a credential for the
+    // CONFIGURED instance, and this is a different one — sending that token to another
+    // host is both wrong and a leak. Falling through to --token or the stored login for
+    // the new URL is the safe default.
+  };
+}
 
 // src/gather.ts
 import { readFileSync as readFileSync2, existsSync as existsSync2, readdirSync, statSync } from "node:fs";
@@ -2705,7 +2735,7 @@ function clearCreds(url6) {
 }
 
 // package.json
-var version = "0.2.33";
+var version = "0.2.34";
 
 // src/http.ts
 var USER_AGENT = `malloyyo/${version}`;
@@ -5201,9 +5231,23 @@ function requestFailed(what, res, out, t, source) {
   const hint = res.status === 401 || res.status === 403 ? authHint(res.status, t, source) : failureHint(out, t);
   return new Error(`${what} failed: ${detail}${hint}`);
 }
+var PUBLISH_HELP = `Target resolution:
+  The instance and dataset normally come from the \`malloyyo\` block in
+  malloy-config.json. Either can be overridden, and giving BOTH means the
+  config is never read \u2014 so a repo with no targets (or none for this
+  instance) can be published without editing its committed config:
+
+    malloyyo publish -i https://gravity.malloyyo.com --dataset movies --create-dataset
+
+  -i takes what \`login\` takes: a URL, or the name of a configured target
+  whose url should be borrowed. Authenticate the same way as always:
+  \`malloyyo login <url>\`, or pass --token.`;
 async function publish(target, dir, opts) {
   const root = resolve3(dir);
-  const t = resolveTarget(root, target);
+  const t = resolvePublishTarget(root, target, {
+    instance: opts.instance,
+    dataset: opts.dataset
+  });
   const source = tokenSource(t, { tokenFlag: opts.token });
   const bearer = await getAccessToken(t, { tokenFlag: opts.token });
   const { files, config } = gatherDirectory(root);
@@ -5282,7 +5326,12 @@ program.command("logout").argument("[target]", "target name or instance URL (opt
 program.command("publish").argument(
   "[target]",
   "named target from the `malloyyo` config block; optional when the repo defines one"
-).argument("[dir]", "directory to publish", ".").option("--token <token>", "bearer token (overrides login/env)").option("--dry-run", "gather and report what would be sent, but don't POST").option("--skip-lint", "skip the pre-publish dashboard lint").option("--create-dataset", "create the target dataset if it doesn't exist yet (private)").description('push the Malloy model in <dir> (default ".") to <target>').action(publish);
+).argument("[dir]", "directory to publish", ".").option(
+  "-i, --instance <instance>",
+  "instance URL, or a configured target name to borrow the url from; overrides the config"
+).option("--dataset <dataset>", "dataset to publish into; overrides the config").option("--token <token>", "bearer token (overrides login/env)").option("--dry-run", "gather and report what would be sent, but don't POST").option("--skip-lint", "skip the pre-publish dashboard lint").option("--create-dataset", "create the target dataset if it doesn't exist yet (private)").description('push the Malloy model in <dir> (default ".") to <target>').addHelpText("after", `
+${PUBLISH_HELP}
+`).action(publish);
 program.command("lint").argument("[dir]", "directory to lint", ".").description("validate ./dashboards against the model (manifest, query, givens, Dashboard.tsx)").action(async (dir) => {
   const root = resolve3(dir);
   const report = await lintDashboards(root);

package/package.json

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