@cancia/astro 0.2.1 → 0.4.0

package/dist/runtime.d.ts

@@ -1,6 +1,6 @@
 import { C as CanciaStorage, a as CanciaStorageV2 } from './types-BMlLS-OS.js';
 import { U as UploadHandler } from './upload-DwCGjXbz.js';
-import { G as GitHubCommitter } from './github-client-BAZ1pW24.js';
+import { G as GitHubCommitter } from './github-client-Db0pIrqE.js';
 
 interface CanciaRuntime {
     /** v1 KV-only storage. Kept for the existing /content endpoint. */
@@ -27,12 +27,37 @@ interface CanciaRuntime {
     secret: string | undefined;
     uploadHandler: UploadHandler;
     deployHook: string | undefined;
+    /**
+     * Auth token for the deploy hook (e.g. Coolify's "auth required" hook).
+     * SECRET — read from CANCIA_DEPLOY_HOOK_TOKEN at runtime, never baked. When
+     * set the publish POST sends `Authorization: Bearer <token>`.
+     */
+    deployHookToken: string | undefined;
+    /** Optional HTTP method for the hook (default POST). Non-secret, baked. */
+    deployHookMethod: string | undefined;
+    /** Optional extra headers merged into the hook request. Non-secret, baked. */
+    deployHookHeaders: Record<string, string> | undefined;
+    /**
+     * "owner/name" of the GitHub repo whose `cancia-publish` workflow rebuilds
+     * the site (031). Non-secret, baked. When set (with CANCIA_GITHUB_TOKEN in
+     * env) the publish route fires a repository_dispatch instead of the raw
+     * deploy hook — the host-independent standard publish path.
+     */
+    publishRepo?: string | undefined;
+    /**
+     * GitHub PAT (contents:write) used to fire the repository_dispatch. SECRET —
+     * read from CANCIA_GITHUB_TOKEN at runtime, never baked into dist/.
+     */
+    publishGithubToken?: string | undefined;
     maxUploadMB: number;
 }
 /** Describes which storage adapter to build lazily in the server process. */
 type BakedStorageDescriptor = {
     kind: "json-file";
     dbPath?: string;
+} | {
+    kind: "sqlite-v2";
+    dbPath?: string;
 } | {
     kind: "git-backed";
     repo: string;
@@ -58,6 +83,16 @@ interface BakedConfig {
     public: boolean;
     /** Whether a deploy hook exists — the value itself is read from env. */
     hasDeployHook: boolean;
+    /** Optional deploy-hook HTTP method (default POST). Non-secret. */
+    deployHookMethod: string | undefined;
+    /** Optional deploy-hook extra headers. Non-secret (the token stays in env). */
+    deployHookHeaders: Record<string, string> | undefined;
+    /**
+     * "owner/name" of the GitHub repo for repository_dispatch publish (031).
+     * Non-secret, baked. The token (CANCIA_GITHUB_TOKEN) is read from env at
+     * runtime. Absent = no dispatch path (falls through to the deploy hook).
+     */
+    publishRepo?: string | undefined;
     /** How to build the v2 storage adapter at runtime. Absent = no v2 storage. */
     storage: BakedStorageDescriptor | undefined;
     /** When set, build an R2 upload handler; secrets come from env at runtime. */

package/dist/runtime.js

@@ -2,9 +2,10 @@ import {
   getCanciaRuntime,
   setBakedConfig,
   setCanciaRuntime
-} from "./chunk-7MPOERVU.js";
-import "./chunk-5ELSN6LI.js";
-import "./chunk-ST44VULL.js";
+} from "./chunk-U46HCJN3.js";
+import "./chunk-5AUIPW2I.js";
+import "./chunk-U7V53JX7.js";
+import "./chunk-L2VKQJPY.js";
 import "./chunk-7IA5B5CF.js";
 import "./chunk-5IPHDIC6.js";
 export {

package/dist/storage/index.d.ts

@@ -1,84 +1,13 @@
-import { C as CanciaStorage, a as CanciaStorageV2 } from '../types-BMlLS-OS.js';
-export { b as CanciaKVStore, c as CanciaListStore, d as CanciaPageStore, L as ListEntry, P as PageMeta, e as PageRecord, f as PageSEO, R as Rev, g as RevConflictError } from '../types-BMlLS-OS.js';
-import { G as GitHubCommitter, a as GitHubClient, F as FetchLike } from '../github-client-BAZ1pW24.js';
-export { C as CommitFile, b as GitHubClientOptions, c as createGitHubClient } from '../github-client-BAZ1pW24.js';
-
-declare function createJsonFileAdapter(filePath?: string): CanciaStorage;
-
-interface JsonFileV2Options {
-    /** Project root. Defaults to process.cwd(). */
-    projectRoot?: string;
-    /** Override the KV file path. Defaults to <root>/cancia-content.json. */
-    kvPath?: string;
-    /** Override the pages file path. Defaults to <root>/.cancia/pages.json. */
-    pagesPath?: string;
-    /** Override the lists directory. Defaults to <root>/.cancia/lists. */
-    listsDir?: string;
-}
-declare function createJsonFileAdapterV2(opts?: JsonFileV2Options): CanciaStorageV2;
-
-declare function createSQLiteAdapter(dbPath?: string): CanciaStorage;
-
-interface GitBackedContentPaths {
-    /** KV file path. Default <projectRoot>/cancia-content.json. */
-    kvPath?: string;
-    /** Pages file path. Default <projectRoot>/.cancia/pages.json. */
-    pagesPath?: string;
-    /** Lists directory. Default <projectRoot>/.cancia/lists. */
-    listsDir?: string;
-}
-interface GitBackedOptions {
-    /** The wrapped local adapter — the on-disk source of truth. */
-    local: CanciaStorageV2;
-    /** "owner/name" of the GitHub repo whose builds carry the content. */
-    repo: string;
-    /** Branch to commit onto. Default "main". */
-    branch?: string;
-    /**
-     * GitHub PAT. Reads CANCIA_GITHUB_TOKEN if omitted. When absent entirely the
-     * adapter runs in local-only mode (disk writes only; no commits) + warns once.
-     */
-    token?: string;
-    /** Optional committer identity for commits. */
-    committer?: GitHubCommitter;
-    /**
-     * Project root the local adapter writes under — needed to turn absolute
-     * on-disk paths into repo-relative commit paths. Default process.cwd().
-     */
-    projectRoot?: string;
-    /** Override where the local adapter's content lives (must match `local`). */
-    contentPaths?: GitBackedContentPaths;
-    /** Quiet window (ms) before a flush fires. Default 3000. */
-    debounceMs?: number;
-    /** Commit message for content updates. */
-    commitMessage?: string;
-    /** Injected GitHub client (tests pass a mock). Overrides token/fetch. */
-    client?: GitHubClient;
-    /** Injected fetch, forwarded to the default GitHub client. */
-    fetch?: FetchLike;
-    /** API base override, forwarded to the default GitHub client (tests). */
-    apiBase?: string;
-    /** Warn sink (tests capture). Default console.warn. */
-    warn?: (msg: string) => void;
-    /** Error sink for push failures (tests capture). Default console.error. */
-    onError?: (msg: string, err: unknown) => void;
-}
-/** The extra control surface the git adapter adds on top of CanciaStorageV2. */
-interface GitBackedControls {
-    /**
-     * Force any pending dirty files to commit now, bypassing the debounce.
-     * Resolves once the flush completes (or rejects if the push failed — the
-     * files stay dirty for the next flush). For tests + graceful shutdown.
-     */
-    flush(): Promise<void>;
-    /** True if git commits are active (token present). */
-    readonly gitEnabled: boolean;
-    /** Snapshot of currently-dirty repo-relative paths (for tests/inspection). */
-    pendingPaths(): string[];
-}
-type GitBackedStorage = CanciaStorageV2 & {
-    git: GitBackedControls;
-};
-declare function createGitBackedAdapter(opts: GitBackedOptions): GitBackedStorage;
-
-export { CanciaStorage, CanciaStorageV2, type GitBackedContentPaths, type GitBackedControls, type GitBackedOptions, type GitBackedStorage, GitHubClient, GitHubCommitter, createGitBackedAdapter, createJsonFileAdapter, createJsonFileAdapterV2, createSQLiteAdapter };
+import { R as Rev } from '../types-BMlLS-OS.js';
+export { b as CanciaKVStore, c as CanciaListStore, d as CanciaPageStore, C as CanciaStorage, a as CanciaStorageV2, L as ListEntry, P as PageMeta, e as PageRecord, f as PageSEO, g as RevConflictError } from '../types-BMlLS-OS.js';
+export { G as GitBackedContentPaths, a as GitBackedControls, b as GitBackedOptions, c as GitBackedStorage, S as SqliteV2Options, d as closeSqliteAdapterV2, e as createGitBackedAdapter, f as createJsonFileAdapter, g as createJsonFileAdapterV2, h as createSQLiteAdapter, i as createSqliteAdapterV2 } from '../git-backed-DtiH52EI.js';
+export { C as CommitFile, a as GitHubClient, b as GitHubClientOptions, G as GitHubCommitter, c as createGitHubClient } from '../github-client-Db0pIrqE.js';
+
+/**
+ * Canonical JSON: keys sorted alphabetically at every level. Two values that
+ * are logically equal hash to the same _rev regardless of insertion order.
+ */
+declare function canonicalize(value: unknown): string;
+declare function hashRev(value: unknown): Rev;
+
+export { Rev, canonicalize, hashRev };

package/dist/storage/index.js

@@ -2,21 +2,31 @@ import {
   createSQLiteAdapter
 } from "../chunk-AE4SIY24.js";
 import {
+  closeSqliteAdapterV2,
   createGitBackedAdapter,
+  createSqliteAdapterV2
+} from "../chunk-5AUIPW2I.js";
+import {
   createGitHubClient
-} from "../chunk-5ELSN6LI.js";
+} from "../chunk-U7V53JX7.js";
 import {
+  canonicalize,
   createJsonFileAdapter,
-  createJsonFileAdapterV2
-} from "../chunk-ST44VULL.js";
+  createJsonFileAdapterV2,
+  hashRev
+} from "../chunk-L2VKQJPY.js";
 import {
   RevConflictError
 } from "../chunk-7IA5B5CF.js";
 export {
   RevConflictError,
+  canonicalize,
+  closeSqliteAdapterV2,
   createGitBackedAdapter,
   createGitHubClient,
   createJsonFileAdapter,
   createJsonFileAdapterV2,
-  createSQLiteAdapter
+  createSQLiteAdapter,
+  createSqliteAdapterV2,
+  hashRev
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cancia/astro",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "description": "Astro integration for Cancia CMS — inline editing with zero separate server",
   "license": "MIT",
   "repository": {

package/dist/chunk-5ELSN6LI.js

@@ -1,244 +0,0 @@
-// src/storage/github-client.ts
-function toBase64(text) {
-  if (typeof Buffer !== "undefined") {
-    return Buffer.from(text, "utf-8").toString("base64");
-  }
-  const bytes = new TextEncoder().encode(text);
-  let binary = "";
-  for (const b of bytes) binary += String.fromCharCode(b);
-  return btoa(binary);
-}
-function createGitHubClient(opts) {
-  const { repo, branch, token, committer } = opts;
-  const doFetch = opts.fetch ?? globalThis.fetch;
-  const apiBase = (opts.apiBase ?? "https://api.github.com").replace(/\/$/, "");
-  if (!doFetch) {
-    throw new Error("createGitHubClient: no fetch available (pass opts.fetch)");
-  }
-  const headers = () => ({
-    Authorization: `Bearer ${token}`,
-    Accept: "application/vnd.github+json",
-    "X-GitHub-Api-Version": "2022-11-28"
-  });
-  const contentsUrl = (path) => {
-    const encoded = path.split("/").map((seg) => encodeURIComponent(seg)).join("/");
-    return `${apiBase}/repos/${repo}/contents/${encoded}`;
-  };
-  async function getFileSha(path) {
-    const url = `${contentsUrl(path)}?ref=${encodeURIComponent(branch)}`;
-    const res = await doFetch(url, { method: "GET", headers: headers() });
-    if (res.status === 404) return null;
-    if (!res.ok) {
-      const detail = await res.text().catch(() => "");
-      throw new Error(`GitHub getFileSha ${path} failed: ${res.status} ${detail}`);
-    }
-    const body = await res.json();
-    return body.sha ?? null;
-  }
-  async function putFile(file, message) {
-    const sha = await getFileSha(file.path);
-    const payload = {
-      message,
-      content: toBase64(file.content),
-      branch
-    };
-    if (sha) payload.sha = sha;
-    if (committer) payload.committer = committer;
-    const res = await doFetch(contentsUrl(file.path), {
-      method: "PUT",
-      headers: headers(),
-      body: JSON.stringify(payload)
-    });
-    if (!res.ok) {
-      const detail = await res.text().catch(() => "");
-      throw new Error(`GitHub commit ${file.path} failed: ${res.status} ${detail}`);
-    }
-  }
-  async function commitFiles(files, message) {
-    for (const file of files) {
-      await putFile(file, message);
-    }
-  }
-  return { getFileSha, commitFiles };
-}
-
-// src/storage/git-backed.ts
-import { existsSync, readFileSync, readdirSync, statSync } from "fs";
-import { join, relative } from "path";
-function createGitBackedAdapter(opts) {
-  const projectRoot = opts.projectRoot ?? process.cwd();
-  const branch = opts.branch ?? "main";
-  const debounceMs = opts.debounceMs ?? 3e3;
-  const commitMessage = opts.commitMessage ?? "Cancia: content update";
-  const warn = opts.warn ?? ((m) => console.warn(m));
-  const onError = opts.onError ?? ((m, e) => console.error(m, e));
-  const kvPath = opts.contentPaths?.kvPath ?? join(projectRoot, "cancia-content.json");
-  const pagesPath = opts.contentPaths?.pagesPath ?? join(projectRoot, ".cancia", "pages.json");
-  const listsDir = opts.contentPaths?.listsDir ?? join(projectRoot, ".cancia", "lists");
-  const token = opts.token ?? process.env.CANCIA_GITHUB_TOKEN ?? "";
-  let client = null;
-  if (opts.client) {
-    client = opts.client;
-  } else if (token) {
-    client = createGitHubClient({
-      repo: opts.repo,
-      branch,
-      token,
-      committer: opts.committer,
-      fetch: opts.fetch,
-      apiBase: opts.apiBase
-    });
-  }
-  const gitEnabled = client !== null;
-  if (!gitEnabled) {
-    warn(
-      "[cancia] Git-backed storage: no GitHub token (CANCIA_GITHUB_TOKEN) \u2014 running local-only. Edits save to disk but are NOT committed/pushed."
-    );
-  }
-  const dirty = /* @__PURE__ */ new Set();
-  let timer = null;
-  let flushing = null;
-  let rerunRequested = false;
-  function toRepoPath(absPath) {
-    return relative(projectRoot, absPath).split("\\").join("/");
-  }
-  function markDirty(absPath) {
-    dirty.add(absPath);
-  }
-  function markListDirty(listName, site) {
-    const siteDir = join(listsDir, listName, site);
-    if (!existsSync(siteDir)) return;
-    const walk = (dir) => {
-      for (const entry of readdirSync(dir, { withFileTypes: true })) {
-        const full = join(dir, entry.name);
-        if (entry.isDirectory()) walk(full);
-        else if (entry.isFile()) markDirty(full);
-      }
-    };
-    walk(siteDir);
-  }
-  function scheduleFlush() {
-    if (!gitEnabled) return;
-    if (timer) clearTimeout(timer);
-    timer = setTimeout(() => {
-      timer = null;
-      void runFlush();
-    }, debounceMs);
-  }
-  async function runFlush() {
-    if (flushing) {
-      rerunRequested = true;
-      return flushing;
-    }
-    flushing = doFlush().finally(() => {
-      flushing = null;
-      if (rerunRequested) {
-        rerunRequested = false;
-        void runFlush();
-      }
-    });
-    return flushing;
-  }
-  async function doFlush() {
-    if (!client || dirty.size === 0) return;
-    const batch = [...dirty];
-    const files = [];
-    for (const abs of batch) {
-      if (!existsSync(abs) || !statSync(abs).isFile()) continue;
-      files.push({ path: toRepoPath(abs), content: readFileSync(abs, "utf-8") });
-    }
-    if (files.length === 0) {
-      for (const abs of batch) dirty.delete(abs);
-      return;
-    }
-    try {
-      await client.commitFiles(files, commitMessage);
-      for (const abs of batch) dirty.delete(abs);
-    } catch (err) {
-      onError(
-        "[cancia] Git-backed storage: commit failed \u2014 data saved locally, will retry on next flush.",
-        err
-      );
-      throw err;
-    }
-  }
-  async function flush() {
-    if (!gitEnabled) return;
-    if (timer) {
-      clearTimeout(timer);
-      timer = null;
-    }
-    await runFlush();
-  }
-  const kv = {
-    get: (site, key, lang) => opts.local.kv.get(site, key, lang),
-    getAll: (site) => opts.local.kv.getAll(site),
-    async set(site, key, lang, value) {
-      await opts.local.kv.set(site, key, lang, value);
-      markDirty(kvPath);
-      scheduleFlush();
-    },
-    async delete(site, key, lang) {
-      await opts.local.kv.delete(site, key, lang);
-      markDirty(kvPath);
-      scheduleFlush();
-    }
-  };
-  const pages = {
-    get: (site, route) => opts.local.pages.get(site, route),
-    list: (site) => opts.local.pages.list(site),
-    async set(site, route, meta, rev) {
-      const result = await opts.local.pages.set(site, route, meta, rev);
-      markDirty(pagesPath);
-      scheduleFlush();
-      return result;
-    },
-    async delete(site, route) {
-      await opts.local.pages.delete(site, route);
-      markDirty(pagesPath);
-      scheduleFlush();
-    }
-  };
-  const lists = {
-    list: (site, listName, locale) => opts.local.lists.list(site, listName, locale),
-    get: (site, listName, id, locale) => opts.local.lists.get(site, listName, id, locale),
-    translations: (site, listName) => opts.local.lists.translations(site, listName),
-    async create(site, listName, data, locale, id) {
-      const entry = await opts.local.lists.create(site, listName, data, locale, id);
-      markListDirty(listName, site);
-      scheduleFlush();
-      return entry;
-    },
-    async update(site, listName, id, locale, data, rev) {
-      const entry = await opts.local.lists.update(site, listName, id, locale, data, rev);
-      markListDirty(listName, site);
-      scheduleFlush();
-      return entry;
-    },
-    async delete(site, listName, id, locale) {
-      await opts.local.lists.delete(site, listName, id, locale);
-      markListDirty(listName, site);
-      scheduleFlush();
-    },
-    async reorder(site, listName, ids) {
-      await opts.local.lists.reorder(site, listName, ids);
-      markListDirty(listName, site);
-      scheduleFlush();
-    }
-  };
-  const git = {
-    flush,
-    get gitEnabled() {
-      return gitEnabled;
-    },
-    pendingPaths() {
-      return [...dirty].map(toRepoPath);
-    }
-  };
-  return { kv, pages, lists, git };
-}
-
-export {
-  createGitHubClient,
-  createGitBackedAdapter
-};