@setzkasten-cms/astro-admin 1.4.0 → 1.4.1

package/dist/chunk-TJNJKPUL.js

@@ -0,0 +1,11 @@
+// src/api-routes/_license-tier.ts
+function resolveLicenseTier() {
+  const raw = process.env.SETZKASTEN_LICENSE_KEY?.trim() ?? "";
+  if (raw.startsWith("SK-PRO-")) return "pro";
+  if (raw.startsWith("SK-ENT-")) return "enterprise";
+  return "free";
+}
+
+export {
+  resolveLicenseTier
+};

package/dist/chunk-V6IMPVF3.js

@@ -0,0 +1,120 @@
+// src/api-routes/_website-resolver.ts
+import {
+  err,
+  notFoundError,
+  ok,
+  validationError
+} from "@setzkasten-cms/core";
+import { GitHubAppClient, GitHubWebsitesRegistry } from "@setzkasten-cms/github-adapter";
+var state = null;
+function __resetWebsiteResolverForTests(next) {
+  state = next;
+}
+function configureWebsiteResolver(next) {
+  state = next;
+}
+function isMultiKind(kind) {
+  return kind === "multi" || kind === "standalone";
+}
+function bootstrapResolverFromGlobals() {
+  if (state !== null) return;
+  const fullConfig = (typeof __SETZKASTEN_FULL_CONFIG__ !== "undefined" ? __SETZKASTEN_FULL_CONFIG__ : null) ?? globalThis.__SETZKASTEN_FULL_CONFIG__;
+  const buildStorage = (typeof __SETZKASTEN_STORAGE__ !== "undefined" ? __SETZKASTEN_STORAGE__ : null) ?? globalThis.__SETZKASTEN_STORAGE__;
+  const storageKind = fullConfig?.storage?.kind;
+  if (isMultiKind(storageKind)) {
+    const standalone = fullConfig?.storage;
+    const privateKey = process.env.GITHUB_APP_PRIVATE_KEY;
+    if (!privateKey) {
+      console.error(
+        "[setzkasten] Multi-mode resolver bootstrap failed: GITHUB_APP_PRIVATE_KEY is not set in env. Set it on the standalone-admin deployment so the registry can be loaded."
+      );
+      return;
+    }
+    const [owner, repo] = standalone.configRepo.split("/");
+    if (!owner || !repo) {
+      console.error(
+        `[setzkasten] Multi-mode resolver bootstrap failed: storage.configRepo "${standalone.configRepo}" is not in "owner/repo" form.`
+      );
+      return;
+    }
+    const client = new GitHubAppClient(
+      { appId: standalone.appId, installationId: standalone.installationId, privateKey },
+      { owner, repo, branch: standalone.configBranch ?? "main" }
+    );
+    const registry = new GitHubWebsitesRegistry({
+      reader: { read: (path) => client.getFileContent(path) },
+      path: "websites.json",
+      ttlMs: 6e4
+    });
+    state = { mode: "multi", registry };
+    return;
+  }
+  if (!buildStorage) return;
+  const appId = process.env.GITHUB_APP_ID ?? "";
+  const installationId = process.env.GITHUB_APP_INSTALLATION_ID ?? "";
+  const websiteUrlLiteral = typeof __SETZKASTEN_WEBSITE_URL__ !== "undefined" ? __SETZKASTEN_WEBSITE_URL__ : "";
+  const previewOrigin = websiteUrlLiteral || process.env.PUBLIC_SITE_URL || "http://localhost:4321";
+  state = {
+    mode: "single",
+    synthesized: {
+      id: "default",
+      name: buildStorage.repo,
+      repo: `${buildStorage.owner}/${buildStorage.repo}`,
+      branch: buildStorage.branch,
+      previewOrigin,
+      githubApp: { appId, installationId }
+    }
+  };
+}
+var HEADER = "x-sk-website";
+async function resolveCurrentWebsite(request) {
+  if (state === null) bootstrapResolverFromGlobals();
+  if (state === null) {
+    return err(
+      validationError(
+        ["websiteResolver"],
+        "not-configured",
+        "Website resolver not configured \u2014 call configureWebsiteResolver() at integration startup."
+      )
+    );
+  }
+  if (state.mode === "single") {
+    return ok(state.synthesized);
+  }
+  const requested = request.headers.get(HEADER)?.trim() ?? "";
+  if (!requested) {
+    const list = await state.registry.list();
+    if (!list.ok) return list;
+    const sole = list.value.length === 1 ? list.value[0] : void 0;
+    if (sole) return ok(sole);
+    return err(
+      validationError(
+        [HEADER],
+        "required",
+        "Standalone mode requires the X-SK-Website request header (registry has multiple entries)."
+      )
+    );
+  }
+  const found = await state.registry.get(requested);
+  if (!found.ok) return found;
+  if (!found.value) return err(notFoundError(`website:${requested}`));
+  return ok(found.value);
+}
+async function listAllWebsites() {
+  if (state === null) bootstrapResolverFromGlobals();
+  if (state === null) {
+    return err(
+      validationError(["websiteResolver"], "not-configured", "Website resolver not configured.")
+    );
+  }
+  if (state.mode === "single") return ok([state.synthesized]);
+  return state.registry.list();
+}
+
+export {
+  __resetWebsiteResolverForTests,
+  configureWebsiteResolver,
+  bootstrapResolverFromGlobals,
+  resolveCurrentWebsite,
+  listAllWebsites
+};

package/dist/chunk-W3QHY5GW.js

@@ -0,0 +1,19 @@
+// src/api-routes/_webhook-status-store.ts
+var store = /* @__PURE__ */ new Map();
+function recordWebhookFire(id, status) {
+  store.set(id, { lastFiredAt: (/* @__PURE__ */ new Date()).toISOString(), lastStatus: status });
+}
+function getWebhookStatus() {
+  const out = {};
+  for (const [k, v] of store.entries()) out[k] = v;
+  return out;
+}
+function _resetWebhookStatusForTests() {
+  store.clear();
+}
+
+export {
+  recordWebhookFire,
+  getWebhookStatus,
+  _resetWebhookStatusForTests
+};

package/dist/chunk-ZQDGGWJP.js

@@ -0,0 +1,43 @@
+import {
+  readEditorsFileStatus
+} from "./chunk-INIWFKQ3.js";
+import {
+  resolveStorageConfig
+} from "./chunk-6UIKVKED.js";
+import {
+  resolveConfigRepoToken
+} from "./chunk-NKDATSPA.js";
+
+// src/api-routes/_role-resolver.ts
+import { resolveRoleForUser } from "@setzkasten-cms/core";
+function makeRoleResolver(provider, allowedEmails) {
+  return async (email) => {
+    const editors = await loadEditorsForResolution();
+    const result = resolveRoleForUser(email, provider, editors, allowedEmails);
+    return result.ok ? result.resolution.role : null;
+  };
+}
+async function loadEditorsForResolution() {
+  const storage = resolveStorageConfig();
+  if (!storage) return void 0;
+  const tokenResult = await resolveConfigRepoToken();
+  if (!tokenResult.ok) {
+    throw new Error(`role-resolver: token unavailable (${tokenResult.error.message})`);
+  }
+  const serverConfig = globalThis.__SETZKASTEN_CONFIG__;
+  const contentPath = serverConfig?.storage?.contentPath ?? "content";
+  const status = await readEditorsFileStatus(
+    storage.owner,
+    storage.repo,
+    storage.branch,
+    contentPath,
+    tokenResult.value
+  );
+  if (status.kind === "absent") return void 0;
+  if (status.kind === "present") return status.editors;
+  throw new Error(`role-resolver: ${status.message}`);
+}
+
+export {
+  makeRoleResolver
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@setzkasten-cms/astro-admin",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Setzkasten Admin-UI, Init-Wizard und Adoptions-Pipeline für Astro",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE",
@@ -21,65 +21,260 @@
     "headless-cms"
   ],
   "exports": {
-    "./auth-setzkasten-login": "./src/api-routes/auth-setzkasten-login.ts",
-    "./global-config": "./src/api-routes/global-config.ts",
-    "./auth-login": "./src/api-routes/auth-login.ts",
-    "./auth-callback": "./src/api-routes/auth-callback.ts",
-    "./auth-logout": "./src/api-routes/auth-logout.ts",
-    "./auth-session": "./src/api-routes/auth-session.ts",
-    "./github-proxy": "./src/api-routes/github-proxy.ts",
-    "./asset-proxy": "./src/api-routes/asset-proxy.ts",
-    "./config": "./src/api-routes/config.ts",
-    "./pages": "./src/api-routes/pages.ts",
-    "./init-scan": "./src/api-routes/init-scan.ts",
-    "./init-apply": "./src/api-routes/init-apply.ts",
-    "./init-scan-page": "./src/api-routes/init-scan-page.ts",
-    "./init-add-section": "./src/api-routes/init-add-section.ts",
-    "./init-migrate": "./src/api-routes/init-migrate.ts",
-    "./deploy-hook": "./src/api-routes/deploy-hook.ts",
-    "./icons-local": "./src/api-routes/icons-local.ts",
-    "./catalog": "./src/api-routes/catalog-list.ts",
-    "./catalog-add": "./src/api-routes/catalog-add.ts",
-    "./catalog-export": "./src/api-routes/catalog-export.ts",
-    "./history": "./src/api-routes/history.ts",
-    "./history-version": "./src/api-routes/history-version.ts",
-    "./history-rollback": "./src/api-routes/history-rollback.ts",
-    "./webhooks": "./src/api-routes/webhooks.ts",
-    "./webhooks-test": "./src/api-routes/webhooks-test.ts",
-    "./webhooks-status": "./src/api-routes/webhooks-status.ts",
-    "./section-add": "./src/api-routes/section-add.ts",
-    "./section-prepare": "./src/api-routes/section-prepare.ts",
-    "./section-prepare-copy": "./src/api-routes/section-prepare-copy.ts",
-    "./section-commit-pending": "./src/api-routes/section-commit-pending.ts",
-    "./section-delete": "./src/api-routes/section-delete.ts",
-    "./section-duplicate": "./src/api-routes/section-duplicate.ts",
-    "./updater-register": "./src/api-routes/updater-register.ts",
-    "./updater-check": "./src/api-routes/updater-check.ts",
-    "./updater-transfer": "./src/api-routes/updater-transfer.ts",
-    "./updater-unbind": "./src/api-routes/updater-unbind.ts",
-    "./editors": "./src/api-routes/editors.ts",
-    "./setup-github-app": "./src/api-routes/setup-github-app.ts",
-    "./setup-github-app-callback": "./src/api-routes/setup-github-app-callback.ts",
-    "./setup-github-app-installed": "./src/api-routes/setup-github-app-installed.ts",
-    "./setup-github-app-bounce": "./src/api-routes/setup-github-app-bounce.ts",
-    "./setup-github-app-repos": "./src/api-routes/setup-github-app-repos.ts",
-    "./setup-github-app-branches": "./src/api-routes/setup-github-app-branches.ts",
-    "./websites-list": "./src/api-routes/websites-list.ts",
-    "./websites-add": "./src/api-routes/websites-add.ts",
-    "./websites-remove": "./src/api-routes/websites-remove.ts",
-    "./migrate-to-multi": "./src/api-routes/migrate-to-multi.ts",
+    "./auth-setzkasten-login": {
+      "types": "./dist/api-routes/auth-setzkasten-login.d.ts",
+      "import": "./dist/api-routes/auth-setzkasten-login.js",
+      "default": "./dist/api-routes/auth-setzkasten-login.js"
+    },
+    "./global-config": {
+      "types": "./dist/api-routes/global-config.d.ts",
+      "import": "./dist/api-routes/global-config.js",
+      "default": "./dist/api-routes/global-config.js"
+    },
+    "./auth-login": {
+      "types": "./dist/api-routes/auth-login.d.ts",
+      "import": "./dist/api-routes/auth-login.js",
+      "default": "./dist/api-routes/auth-login.js"
+    },
+    "./auth-callback": {
+      "types": "./dist/api-routes/auth-callback.d.ts",
+      "import": "./dist/api-routes/auth-callback.js",
+      "default": "./dist/api-routes/auth-callback.js"
+    },
+    "./auth-logout": {
+      "types": "./dist/api-routes/auth-logout.d.ts",
+      "import": "./dist/api-routes/auth-logout.js",
+      "default": "./dist/api-routes/auth-logout.js"
+    },
+    "./auth-session": {
+      "types": "./dist/api-routes/auth-session.d.ts",
+      "import": "./dist/api-routes/auth-session.js",
+      "default": "./dist/api-routes/auth-session.js"
+    },
+    "./github-proxy": {
+      "types": "./dist/api-routes/github-proxy.d.ts",
+      "import": "./dist/api-routes/github-proxy.js",
+      "default": "./dist/api-routes/github-proxy.js"
+    },
+    "./asset-proxy": {
+      "types": "./dist/api-routes/asset-proxy.d.ts",
+      "import": "./dist/api-routes/asset-proxy.js",
+      "default": "./dist/api-routes/asset-proxy.js"
+    },
+    "./config": {
+      "types": "./dist/api-routes/config.d.ts",
+      "import": "./dist/api-routes/config.js",
+      "default": "./dist/api-routes/config.js"
+    },
+    "./pages": {
+      "types": "./dist/api-routes/pages.d.ts",
+      "import": "./dist/api-routes/pages.js",
+      "default": "./dist/api-routes/pages.js"
+    },
+    "./init-scan": {
+      "types": "./dist/api-routes/init-scan.d.ts",
+      "import": "./dist/api-routes/init-scan.js",
+      "default": "./dist/api-routes/init-scan.js"
+    },
+    "./init-apply": {
+      "types": "./dist/api-routes/init-apply.d.ts",
+      "import": "./dist/api-routes/init-apply.js",
+      "default": "./dist/api-routes/init-apply.js"
+    },
+    "./init-scan-page": {
+      "types": "./dist/api-routes/init-scan-page.d.ts",
+      "import": "./dist/api-routes/init-scan-page.js",
+      "default": "./dist/api-routes/init-scan-page.js"
+    },
+    "./init-add-section": {
+      "types": "./dist/api-routes/init-add-section.d.ts",
+      "import": "./dist/api-routes/init-add-section.js",
+      "default": "./dist/api-routes/init-add-section.js"
+    },
+    "./init-migrate": {
+      "types": "./dist/api-routes/init-migrate.d.ts",
+      "import": "./dist/api-routes/init-migrate.js",
+      "default": "./dist/api-routes/init-migrate.js"
+    },
+    "./deploy-hook": {
+      "types": "./dist/api-routes/deploy-hook.d.ts",
+      "import": "./dist/api-routes/deploy-hook.js",
+      "default": "./dist/api-routes/deploy-hook.js"
+    },
+    "./icons-local": {
+      "types": "./dist/api-routes/icons-local.d.ts",
+      "import": "./dist/api-routes/icons-local.js",
+      "default": "./dist/api-routes/icons-local.js"
+    },
+    "./catalog": {
+      "types": "./dist/api-routes/catalog-list.d.ts",
+      "import": "./dist/api-routes/catalog-list.js",
+      "default": "./dist/api-routes/catalog-list.js"
+    },
+    "./catalog-add": {
+      "types": "./dist/api-routes/catalog-add.d.ts",
+      "import": "./dist/api-routes/catalog-add.js",
+      "default": "./dist/api-routes/catalog-add.js"
+    },
+    "./catalog-export": {
+      "types": "./dist/api-routes/catalog-export.d.ts",
+      "import": "./dist/api-routes/catalog-export.js",
+      "default": "./dist/api-routes/catalog-export.js"
+    },
+    "./history": {
+      "types": "./dist/api-routes/history.d.ts",
+      "import": "./dist/api-routes/history.js",
+      "default": "./dist/api-routes/history.js"
+    },
+    "./history-version": {
+      "types": "./dist/api-routes/history-version.d.ts",
+      "import": "./dist/api-routes/history-version.js",
+      "default": "./dist/api-routes/history-version.js"
+    },
+    "./history-rollback": {
+      "types": "./dist/api-routes/history-rollback.d.ts",
+      "import": "./dist/api-routes/history-rollback.js",
+      "default": "./dist/api-routes/history-rollback.js"
+    },
+    "./webhooks": {
+      "types": "./dist/api-routes/webhooks.d.ts",
+      "import": "./dist/api-routes/webhooks.js",
+      "default": "./dist/api-routes/webhooks.js"
+    },
+    "./webhooks-test": {
+      "types": "./dist/api-routes/webhooks-test.d.ts",
+      "import": "./dist/api-routes/webhooks-test.js",
+      "default": "./dist/api-routes/webhooks-test.js"
+    },
+    "./webhooks-status": {
+      "types": "./dist/api-routes/webhooks-status.d.ts",
+      "import": "./dist/api-routes/webhooks-status.js",
+      "default": "./dist/api-routes/webhooks-status.js"
+    },
+    "./section-add": {
+      "types": "./dist/api-routes/section-add.d.ts",
+      "import": "./dist/api-routes/section-add.js",
+      "default": "./dist/api-routes/section-add.js"
+    },
+    "./section-prepare": {
+      "types": "./dist/api-routes/section-prepare.d.ts",
+      "import": "./dist/api-routes/section-prepare.js",
+      "default": "./dist/api-routes/section-prepare.js"
+    },
+    "./section-prepare-copy": {
+      "types": "./dist/api-routes/section-prepare-copy.d.ts",
+      "import": "./dist/api-routes/section-prepare-copy.js",
+      "default": "./dist/api-routes/section-prepare-copy.js"
+    },
+    "./section-commit-pending": {
+      "types": "./dist/api-routes/section-commit-pending.d.ts",
+      "import": "./dist/api-routes/section-commit-pending.js",
+      "default": "./dist/api-routes/section-commit-pending.js"
+    },
+    "./section-delete": {
+      "types": "./dist/api-routes/section-delete.d.ts",
+      "import": "./dist/api-routes/section-delete.js",
+      "default": "./dist/api-routes/section-delete.js"
+    },
+    "./section-duplicate": {
+      "types": "./dist/api-routes/section-duplicate.d.ts",
+      "import": "./dist/api-routes/section-duplicate.js",
+      "default": "./dist/api-routes/section-duplicate.js"
+    },
+    "./updater-register": {
+      "types": "./dist/api-routes/updater-register.d.ts",
+      "import": "./dist/api-routes/updater-register.js",
+      "default": "./dist/api-routes/updater-register.js"
+    },
+    "./updater-check": {
+      "types": "./dist/api-routes/updater-check.d.ts",
+      "import": "./dist/api-routes/updater-check.js",
+      "default": "./dist/api-routes/updater-check.js"
+    },
+    "./updater-transfer": {
+      "types": "./dist/api-routes/updater-transfer.d.ts",
+      "import": "./dist/api-routes/updater-transfer.js",
+      "default": "./dist/api-routes/updater-transfer.js"
+    },
+    "./updater-unbind": {
+      "types": "./dist/api-routes/updater-unbind.d.ts",
+      "import": "./dist/api-routes/updater-unbind.js",
+      "default": "./dist/api-routes/updater-unbind.js"
+    },
+    "./editors": {
+      "types": "./dist/api-routes/editors.d.ts",
+      "import": "./dist/api-routes/editors.js",
+      "default": "./dist/api-routes/editors.js"
+    },
+    "./setup-github-app": {
+      "types": "./dist/api-routes/setup-github-app.d.ts",
+      "import": "./dist/api-routes/setup-github-app.js",
+      "default": "./dist/api-routes/setup-github-app.js"
+    },
+    "./setup-github-app-callback": {
+      "types": "./dist/api-routes/setup-github-app-callback.d.ts",
+      "import": "./dist/api-routes/setup-github-app-callback.js",
+      "default": "./dist/api-routes/setup-github-app-callback.js"
+    },
+    "./setup-github-app-installed": {
+      "types": "./dist/api-routes/setup-github-app-installed.d.ts",
+      "import": "./dist/api-routes/setup-github-app-installed.js",
+      "default": "./dist/api-routes/setup-github-app-installed.js"
+    },
+    "./setup-github-app-bounce": {
+      "types": "./dist/api-routes/setup-github-app-bounce.d.ts",
+      "import": "./dist/api-routes/setup-github-app-bounce.js",
+      "default": "./dist/api-routes/setup-github-app-bounce.js"
+    },
+    "./setup-github-app-repos": {
+      "types": "./dist/api-routes/setup-github-app-repos.d.ts",
+      "import": "./dist/api-routes/setup-github-app-repos.js",
+      "default": "./dist/api-routes/setup-github-app-repos.js"
+    },
+    "./setup-github-app-branches": {
+      "types": "./dist/api-routes/setup-github-app-branches.d.ts",
+      "import": "./dist/api-routes/setup-github-app-branches.js",
+      "default": "./dist/api-routes/setup-github-app-branches.js"
+    },
+    "./websites-list": {
+      "types": "./dist/api-routes/websites-list.d.ts",
+      "import": "./dist/api-routes/websites-list.js",
+      "default": "./dist/api-routes/websites-list.js"
+    },
+    "./websites-add": {
+      "types": "./dist/api-routes/websites-add.d.ts",
+      "import": "./dist/api-routes/websites-add.js",
+      "default": "./dist/api-routes/websites-add.js"
+    },
+    "./websites-remove": {
+      "types": "./dist/api-routes/websites-remove.d.ts",
+      "import": "./dist/api-routes/websites-remove.js",
+      "default": "./dist/api-routes/websites-remove.js"
+    },
+    "./migrate-to-multi": {
+      "types": "./dist/api-routes/migrate-to-multi.d.ts",
+      "import": "./dist/api-routes/migrate-to-multi.js",
+      "default": "./dist/api-routes/migrate-to-multi.js"
+    },
     "./admin-page": "./src/admin-page.astro"
   },
+  "files": [
+    "dist",
+    "src"
+  ],
   "devDependencies": {
+    "@types/node": "^22.0.0",
+    "tsup": "^8.5.1",
+    "typescript": "^5.7.0",
     "vitest": "^3.2.0"
   },
   "dependencies": {
     "@astrojs/compiler": "^3.0.0",
-    "@setzkasten-cms/auth": "1.4.0",
-    "@setzkasten-cms/catalog": "1.4.0",
-    "@setzkasten-cms/core": "1.4.0",
-    "@setzkasten-cms/ui": "1.4.0",
-    "@setzkasten-cms/github-adapter": "1.4.0"
+    "@setzkasten-cms/auth": "1.4.1",
+    "@setzkasten-cms/core": "1.4.1",
+    "@setzkasten-cms/github-adapter": "1.4.1",
+    "@setzkasten-cms/catalog": "1.4.1",
+    "@setzkasten-cms/ui": "1.4.1"
   },
   "peerDependencies": {
     "astro": "^5.0.0",
@@ -87,6 +282,7 @@
     "react-dom": "^19.0.0"
   },
   "scripts": {
+    "build": "tsup",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
     "test:watch": "vitest"

package/src/api-routes/__tests__/route-registry.test.ts

@@ -103,8 +103,14 @@ describe('Route-Registry-Konsistenz', () => {
 
   describe('Keine verwaisten Exports', () => {
     it('alle package.json-Exports (astro-admin routes) haben eine entsprechende Datei', () => {
+      // Exports were strings (./src/api-routes/foo.ts), now they're conditional
+      // objects ({ import: ./dist/api-routes/foo.js, types: ./dist/api-routes/foo.d.ts }).
+      // Match anything that resolves a route file under api-routes/.
       const routeExports = Object.entries(packageJson.exports)
-        .filter(([, v]) => v.startsWith('./src/api-routes/'))
+        .filter(([, v]) => {
+          const target = typeof v === 'string' ? v : (v as { import?: string }).import
+          return typeof target === 'string' && target.includes('/api-routes/')
+        })
         .map(([k]) => k)
 
       const knownKeys = new Set(publicRoutes.map(exportKey))

package/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "dist",
-    "jsx": "react-jsx"
-  },
-  "include": ["src"]
-}