@wizzlethorpe/vaults 0.9.4 → 0.9.6

package/dist/foundry-importer.js

@@ -1,50 +1,23 @@
-// Build helper: bundle the Foundry-side importer scripts into a single
-// ESM file plus a sidecar version manifest. The bundle is served by
-// every deploy at `_foundry/importer.js` and `_foundry/version.json`.
+// Build helper: the Foundry-side importer is pre-bundled at CLI build time
+// (see scripts/bundle-importer.mjs) into `dist/foundry-importer.bundle.js`,
+// which ships inside the npm package. At deploy time we copy that bundle to
+// `_foundry/importer.js` and emit a `_foundry/version.json` sidecar carrying
+// `{ version, sha256 }` so the Foundry host can detect skew before evaluating.
 //
-// The Foundry module fetches the bundle, hash-checks against its
-// trust cache, evaluates it, and calls runSync / runRemove against a
-// host it constructs. The version manifest carries `{ version, sha256 }`
-// so the host can detect skew before evaluating.
-import { build } from "esbuild";
+// Bundling ahead of publish (not here) means the installed CLI never runs
+// esbuild on the user's machine and doesn't need the foundry/ source tree,
+// which isn't part of the npm package.
 import { createHash } from "node:crypto";
-import { mkdir, writeFile } from "node:fs/promises";
-import { dirname, join, resolve } from "node:path";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { basename, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { CLI_VERSION } from "./version.js";
-const ENTRY_RELATIVE_TO_REPO = "foundry/scripts/importer-entry.mjs";
-/** Locate the Foundry-side entry point. The CLI is published from `cli/`
- *  but runs against the monorepo checkout during dev / `vaults build` —
- *  walk up from this file until we find the foundry/ sibling. */
-function resolveEntry() {
-    const here = dirname(fileURLToPath(import.meta.url));
-    // dev: cli/src/ → cli → vaults/ → vaults/foundry/scripts/importer-entry.mjs
-    // installed: dist/ → cli → vaults/ → vaults/foundry/scripts/importer-entry.mjs (same)
-    return resolve(here, "..", "..", ENTRY_RELATIVE_TO_REPO);
-}
-async function bundleImporter() {
-    const entry = resolveEntry();
-    const result = await build({
-        entryPoints: [entry],
-        bundle: true,
-        format: "esm",
-        platform: "browser",
-        target: "es2022",
-        write: false,
-        // Foundry globals are present at runtime; esbuild treats them as
-        // externals automatically because they're not imported. No need to
-        // mark anything as external explicitly.
-        minify: false,
-        sourcemap: false,
-        legalComments: "none",
-    });
-    if (result.outputFiles.length !== 1) {
-        throw new Error(`expected 1 bundle output, got ${result.outputFiles.length}`);
-    }
-    const source = result.outputFiles[0].text;
-    const sha256 = createHash("sha256").update(source).digest("hex");
-    return { source, sha256 };
-}
+// scripts/bundle-importer.mjs always emits the bundle into dist/. This module
+// runs from dist/ once published, but from src/ under tsx (tests) — resolve to
+// dist/ either way.
+const here = dirname(fileURLToPath(import.meta.url));
+const distDir = basename(here) === "src" ? join(here, "..", "dist") : here;
+const BUNDLE_PATH = join(distDir, "foundry-importer.bundle.js");
 /**
  * Write `_foundry/importer.js` + `_foundry/version.json` into the deploy.
  * Called from build.ts after the variant outputs are in place — the
@@ -52,7 +25,8 @@ async function bundleImporter() {
  * no role-gated content.
  */
 export async function writeFoundryImporter(outputDir) {
-    const { source, sha256 } = await bundleImporter();
+    const source = await readFile(BUNDLE_PATH, "utf8");
+    const sha256 = createHash("sha256").update(source).digest("hex");
     const dir = join(outputDir, "_foundry");
     await mkdir(dir, { recursive: true });
     await writeFile(join(dir, "importer.js"), source);

package/dist/foundry-importer.js.map

@@ -1 +1 @@
-{"version":3,"file":"foundry-importer.js","sourceRoot":"","sources":["../src/foundry-importer.ts"],"names":[],"mappings":"AAAA,uEAAuE;AACvE,oEAAoE;AACpE,sEAAsE;AACtE,EAAE;AACF,iEAAiE;AACjE,qEAAqE;AACrE,yEAAyE;AACzE,iDAAiD;AAEjD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,sBAAsB,GAAG,oCAAoC,CAAC;AASpE;;iEAEiE;AACjE,SAAS,YAAY;IACnB,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACrD,4EAA4E;IAC5E,sFAAsF;IACtF,OAAO,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,sBAAsB,CAAC,CAAC;AAC3D,CAAC;AAED,KAAK,UAAU,cAAc;IAC3B,MAAM,KAAK,GAAG,YAAY,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC;QACzB,WAAW,EAAE,CAAC,KAAK,CAAC;QACpB,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,KAAK;QACb,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,QAAQ;QAChB,KAAK,EAAE,KAAK;QACZ,iEAAiE;QACjE,mEAAmE;QACnE,wCAAwC;QACxC,MAAM,EAAE,KAAK;QACb,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,MAAM;KACtB,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,iCAAiC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IAChF,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC;IAC3C,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC5B,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,SAAiB;IAC1D,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,cAAc,EAAE,CAAC;IAClD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACxC,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACtC,MAAM,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,CAAC;IAClD,MAAM,SAAS,CACb,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EACzB,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAC1D,CAAC;AACJ,CAAC"}
+{"version":3,"file":"foundry-importer.js","sourceRoot":"","sources":["../src/foundry-importer.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,4EAA4E;AAC5E,4EAA4E;AAC5E,6EAA6E;AAC7E,+EAA+E;AAC/E,EAAE;AACF,0EAA0E;AAC1E,2EAA2E;AAC3E,uCAAuC;AAEvC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,8EAA8E;AAC9E,+EAA+E;AAC/E,oBAAoB;AACpB,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACrD,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC3E,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,4BAA4B,CAAC,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,SAAiB;IAC1D,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjE,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACxC,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACtC,MAAM,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,CAAC;IAClD,MAAM,SAAS,CACb,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EACzB,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAC1D,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wizzlethorpe/vaults",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "description": "Sync an Obsidian vault to a Cloudflare-hosted wiki with role-based access. Renders locally, deploys to Cloudflare Pages.",
   "keywords": [
     "obsidian",
@@ -61,7 +61,7 @@
     "typescript": "^5.9.3"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "tsc && node scripts/bundle-importer.mjs",
     "start": "node dist/index.js",
     "test": "node --import tsx --test test/*.test.ts",
     "typecheck:test": "tsc -p tsconfig.test.json --noEmit"

package/dist/migrate/0.6-legacy-auth-settings.js

@@ -1,96 +0,0 @@
-// Migration: copy legacy auth fields out of settings.md frontmatter into
-// the CLI-managed config (formerly .vaultrc.json, now .vaults/config.json).
-//
-// Earlier versions stored `roles`, `auth_type`, and `role_passwords` in
-// settings.md. The settings canonicaliser strips unknown keys, so if we
-// don't lift them out before settings.md is rewritten, they're silently
-// dropped. This migration copies anything we still see in settings.md
-// over to the config — but only when the destination is empty / default,
-// so re-running on an already-migrated vault is a no-op.
-//
-// This was previously inline in build.ts as migrateLegacyAuthFromSettings();
-// moved here so all migrations live in one registry.
-import { readFile } from "node:fs/promises";
-import { join } from "node:path";
-import matter from "gray-matter";
-import { loadConfig, saveConfig } from "../config.js";
-import { SETTINGS_FILE } from "../paths.js";
-export const legacyAuthSettingsMigration = {
-    id: "0.6-legacy-auth-settings",
-    description: "settings.md roles/auth_type/role_passwords → CLI-managed config",
-    async needs(vaultPath) {
-        const fm = await readSettingsFrontmatter(vaultPath);
-        if (!fm)
-            return false;
-        if (!hasAnyLegacyKey(fm))
-            return false;
-        const cfg = await loadConfig(vaultPath, {});
-        return liftLegacyAuth(fm, cfg, { dryRun: true }).length > 0;
-    },
-    async apply(vaultPath) {
-        const fm = await readSettingsFrontmatter(vaultPath);
-        if (!fm)
-            return;
-        const cfg = await loadConfig(vaultPath, {});
-        const moved = liftLegacyAuth(fm, cfg, { dryRun: false });
-        if (moved.length === 0)
-            return;
-        await saveConfig(vaultPath, cfg);
-        console.log(`    moved ${moved.join(", ")} from settings.md → config`);
-    },
-};
-async function readSettingsFrontmatter(vaultPath) {
-    try {
-        const raw = await readFile(join(vaultPath, SETTINGS_FILE), "utf8");
-        return (matter(raw).data ?? {});
-    }
-    catch {
-        return null;
-    }
-}
-function hasAnyLegacyKey(fm) {
-    return "roles" in fm || "auth_type" in fm || "role_passwords" in fm;
-}
-/**
- * Single source of truth for which legacy fields qualify for lift, what
- * they get moved to, and (when `dryRun=false`) the actual mutation.
- *
- * Returns the names of fields that qualified (= would move when not a dry
- * run). `needs()` runs this dry; `apply()` runs it for real.
- */
-function liftLegacyAuth(fm, cfg, opts) {
-    const moved = [];
-    if (Array.isArray(fm.roles)) {
-        const list = fm.roles.filter((r) => typeof r === "string");
-        const isDefault = cfg.roles.length === 0 || (cfg.roles.length === 1 && cfg.roles[0] === "public");
-        if (list.length > 0 && isDefault && !arraysEqual(list, ["public"])) {
-            if (!opts.dryRun)
-                cfg.roles = list;
-            moved.push("roles");
-        }
-    }
-    // `auth_type` was a forward-looking knob (password vs cloudflare-access vs
-    // oauth-jwt) that nothing has ever read. The field was removed from
-    // VaultConfig; lifting it would be a no-op, so we don't bother.
-    if (fm.role_passwords && typeof fm.role_passwords === "object" && !Array.isArray(fm.role_passwords)
-        && Object.keys(cfg.rolePasswords).length === 0) {
-        const cleaned = filterStringValues(fm.role_passwords);
-        if (Object.keys(cleaned).length > 0) {
-            if (!opts.dryRun)
-                cfg.rolePasswords = cleaned;
-            moved.push("role_passwords");
-        }
-    }
-    return moved;
-}
-function filterStringValues(map) {
-    const out = {};
-    for (const [k, v] of Object.entries(map))
-        if (typeof v === "string")
-            out[k] = v;
-    return out;
-}
-function arraysEqual(a, b) {
-    return a.length === b.length && a.every((x, i) => x === b[i]);
-}
-//# sourceMappingURL=0.6-legacy-auth-settings.js.map

package/dist/migrate/0.6-legacy-auth-settings.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"0.6-legacy-auth-settings.js","sourceRoot":"","sources":["../../src/migrate/0.6-legacy-auth-settings.ts"],"names":[],"mappings":"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"}