astro-consent 1.0.16 → 2.0.0

package/dist/cli.cjs

@@ -37,9 +37,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const process = __importStar(require("node:process"));
+const cssTemplate_js_1 = require("./templates/cssTemplate.cjs");
 const CWD = process.cwd();
 const args = process.argv.slice(2);
-const command = args[0] ?? "install";
+const command = args[0] ?? "init";
+const flags = new Set(args.slice(1));
+const isDryRun = flags.has("--dry-run");
+const isJson = flags.has("--json");
 const ASTRO_CONFIG_FILES = [
     "astro.config.mjs",
     "astro.config.ts",
@@ -57,289 +61,249 @@ function exitWith(message, code = 1) {
     console.error(`\n❌ ${message}\n`);
     process.exit(code);
 }
+function printHelp() {
+    console.log(`
+astro-consent
+
+Usage:
+  npx astro-consent init
+  npx astro-consent remove
+  npx astro-consent doctor
+  npx astro-consent status
+
+Backwards compatible alias:
+  npx astro-consent
+
+Flags:
+  --dry-run   Show what would change without writing files
+  --json      Output machine-readable doctor/status data
+`);
+    process.exit(0);
+}
+function readConfig() {
+    const configPath = findAstroConfig();
+    if (!configPath) {
+        exitWith("No astro.config.(mjs|ts|js) found. Run this in the root of an Astro project.");
+    }
+    return {
+        configPath,
+        source: fs.readFileSync(configPath, "utf8")
+    };
+}
+function ensureCssFile(dryRun = false) {
+    const cssDir = path.join(CWD, "src", "cookiebanner");
+    const cssFile = path.join(cssDir, "styles.css");
+    if (!fs.existsSync(cssDir)) {
+        if (!dryRun)
+            fs.mkdirSync(cssDir, { recursive: true });
+    }
+    if (!fs.existsSync(cssFile)) {
+        if (!dryRun) {
+            fs.writeFileSync(cssFile, cssTemplate_js_1.DEFAULT_CSS.trimStart(), "utf8");
+            console.log("🎨 Created src/cookiebanner/styles.css");
+        }
+    }
+    return cssFile;
+}
+function buildIntegrationBlock() {
+    return `    // astro-consent:start
+    astroConsent({
+      siteName: "My Website",
+      headline: "Manage cookie preferences for My Website",
+      description: "We use cookies to improve site performance, measure traffic, and support marketing.",
+      acceptLabel: "Accept all",
+      rejectLabel: "Reject all",
+      manageLabel: "Manage preferences",
+      cookiePolicyUrl: "/cookie-policy",
+      privacyPolicyUrl: "/privacy",
+      displayUntilIdle: true,
+      displayIdleDelayMs: 1000,
+      consent: {
+        days: 30,
+        storageKey: "astro-consent"
+      }
+    }),
+    // astro-consent:end
+`;
+}
+function removeIntegrationBlock(source) {
+    return source.replace(/\n\s*\/\/ astro-consent:start[\s\S]*?\/\/ astro-consent:end\s*,?/m, "\n");
+}
 /* ─────────────────────────────────────
    Locate astro.config
    
 ───────────────────────────────────── */
-const configPath = findAstroConfig();
-if (!configPath) {
-    exitWith("No astro.config.(mjs|ts|js) found. Run this in the root of an Astro project.");
+if (command === "--help" || command === "-h" || command === "help") {
+    printHelp();
 }
-let source = fs.readFileSync(configPath, "utf8");
 /* ─────────────────────────────────────
    REMOVE MODE
 ───────────────────────────────────── */
 if (command === "remove") {
-    source = source
-        .replace(/\s*astroConsent\s*\([\s\S]*?\),?/gm, "")
-        .replace(/import\s+astroConsent\s+from\s+["']astro-consent["'];?\n?/, "");
-    fs.writeFileSync(configPath, source.trim() + "\n", "utf8");
-    const cssFile = path.join(CWD, "src", "cookiebanner.css");
-    if (fs.existsSync(cssFile))
+    const { configPath, source: original } = readConfig();
+    let source = removeIntegrationBlock(original);
+    source = source.replace(/import\s+astroConsent\s+from\s+["']astro-consent["'];?\n?/, "");
+    if (!isDryRun) {
+        fs.writeFileSync(configPath, source.trim() + "\n", "utf8");
+    }
+    const cssFile = path.join(CWD, "src", "cookiebanner", "styles.css");
+    if (!isDryRun && fs.existsSync(cssFile))
         fs.unlinkSync(cssFile);
-    console.log("\n🧹 astro-consent fully removed\n");
+    console.log(isDryRun ? "\n🧪 Dry run: astro-consent would be removed\n" : "\n🧹 astro-consent fully removed\n");
     process.exit(0);
 }
-/* ─────────────────────────────────────
-   INSTALL MODE
-───────────────────────────────────── */
-const cssDir = path.join(CWD, "src");
-const cssFile = path.join(cssDir, "cookiebanner.css");
-if (!fs.existsSync(cssDir)) {
-    fs.mkdirSync(cssDir, { recursive: true });
-}
-/* ─────────────────────────────────────
-   Create CSS file ONCE (theme + structure)
-───────────────────────────────────── */
-if (!fs.existsSync(cssFile)) {
-    fs.writeFileSync(cssFile, `/* =========================================================
-   astro-consent — FULL THEME + STRUCTURE
-   This file is NEVER overwritten.
-   ========================================================= */
-
-:root {
-  --cb-font: system-ui, -apple-system, BlinkMacSystemFont, sans-serif;
-
-  --cb-bg: var(--color-surface, #0c1220);
-  --cb-border: var(--color-border, rgba(255,255,255,0.08));
-  --cb-shadow: 0 20px 40px rgba(15, 23, 42, 0.08);
-
-  --cb-text: var(--color-text, #ffffff);
-  --cb-muted: var(--color-muted, #9ca3af);
-  --cb-link: var(--color-primary, #60a5fa);
-
-  --cb-radius: 16px;
-  --cb-btn-radius: 999px;
-  --cb-btn-padding: 10px 18px;
-
-  --cb-accept-bg: var(--color-cta, #22c55e);
-  --cb-accept-text: #ffffff;
-
-  --cb-reject-bg: var(--cb-border);
-  --cb-reject-text: var(--cb-text);
-
-  --cb-manage-bg: transparent;
-  --cb-manage-text: var(--cb-text);
-  --cb-manage-border: var(--cb-border);
-
-  --cb-modal-bg: var(--cb-bg);
-  --cb-modal-backdrop: rgba(15, 23, 42, 0.45);
-  --cb-modal-radius: 18px;
-  --cb-modal-width: 480px;
-
-  --cb-toggle-off-bg: var(--cb-border);
-  --cb-toggle-on-bg: var(--color-accent, #22c55e);
-  --cb-toggle-knob: #ffffff;
-}
-
-/* ===============================
-   Banner
-   =============================== */
-
-#astro-consent-banner {
-  position: fixed;
-  left: 16px;
-  right: 16px;
-  bottom: 16px;
-  z-index: 9999;
-  font-family: var(--cb-font);
-}
-
-.cb-container {
-  max-width: 1200px;
-  margin: 0 auto;
-  padding: 20px 24px;
-  display: flex;
-  gap: 24px;
-  justify-content: space-between;
-  align-items: center;
-
-  background: var(--cb-bg);
-  border-radius: var(--cb-radius);
-  border: 1px solid var(--cb-border);
-  box-shadow: var(--cb-shadow);
-  color: var(--cb-text);
-}
-
-.cb-title {
-  font-size: 16px;
-  font-weight: 600;
-}
-
-.cb-desc {
-  margin-top: 4px;
-  font-size: 14px;
-  color: var(--cb-muted);
-}
-
-.cb-desc a {
-  color: var(--cb-link);
-  text-decoration: none;
-}
-
-.cb-desc a:hover {
-  text-decoration: underline;
-}
-
-/* ===============================
-   Buttons
-   =============================== */
-
-.cb-actions {
-  display: flex;
-  gap: 10px;
-}
-
-.cb-actions button {
-  padding: var(--cb-btn-padding);
-  border-radius: var(--cb-btn-radius);
-  border: 1px solid transparent;
-  font-size: 14px;
-  font-weight: 600;
-  cursor: pointer;
-}
-
-.cb-accept {
-  background: var(--cb-accept-bg);
-  color: var(--cb-accept-text);
-}
-
-.cb-reject {
-  background: var(--cb-reject-bg);
-  color: var(--cb-reject-text);
-}
-
-.cb-manage {
-  background: var(--cb-manage-bg);
-  color: var(--cb-manage-text);
-  border: 1px solid var(--cb-manage-border);
-}
-
-/* ===============================
-   Modal
-   =============================== */
-
-#astro-consent-modal {
-  position: fixed;
-  inset: 0;
-  background: var(--cb-modal-backdrop);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  z-index: 10000;
-}
-
-.cb-modal {
-  width: 100%;
-  max-width: var(--cb-modal-width);
-  background: var(--cb-modal-bg);
-  border-radius: var(--cb-modal-radius);
-  padding: 28px;
-  color: var(--cb-text);
-  border: 1px solid var(--cb-border);
-}
-
-/* ===============================
-   Modal rows (SPACING FIXED)
-   =============================== */
-
-.cb-row {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  gap: 16px;
-  padding: 18px 0;
-  border-bottom: 1px solid var(--cb-border);
-}
-
-.cb-row:last-of-type {
-  border-bottom: 0;
-  padding-bottom: 32px;
-}
-
-/* ===============================
-   Modal actions
-   =============================== */
-
-.cb-modal .cb-actions {
-  margin-top: 24px;
-  padding-top: 20px;
-  border-top: 1px solid var(--cb-border);
-  display: flex;
-  justify-content: flex-end;
-}
-
-/* ===============================
-   Toggles
-   =============================== */
-
-.cb-toggle {
-  width: 44px;
-  height: 24px;
-  background: var(--cb-toggle-off-bg);
-  border-radius: 999px;
-  position: relative;
-  cursor: pointer;
-  flex-shrink: 0;
-}
-
-.cb-toggle span {
-  position: absolute;
-  width: 18px;
-  height: 18px;
-  background: var(--cb-toggle-knob);
-  border-radius: 50%;
-  top: 3px;
-  left: 3px;
-  transition: transform 0.2s ease;
-}
-
-.cb-toggle.active {
-  background: var(--cb-toggle-on-bg);
-}
-
-.cb-toggle.active span {
-  transform: translateX(20px);
+if (command === "doctor") {
+    const { configPath, source } = readConfig();
+    const cssFile = path.join(CWD, "src", "cookiebanner", "styles.css");
+    const layoutPath = path.join(CWD, "src", "layouts", "BaseLayout.astro");
+    const findings = [];
+    const checks = [];
+    const hasImport = source.includes(`from "astro-consent"`) ||
+        source.includes(`from 'astro-consent'`);
+    checks.push({
+        label: "Config import",
+        ok: hasImport,
+        detail: hasImport
+            ? "astro.config includes astro-consent import"
+            : "astro.config is missing the astro-consent import"
+    });
+    if (!hasImport) {
+        findings.push({
+            issue: "astro.config.* does not import astro-consent",
+            fix: "Run `npx astro-consent init` or add `import astroConsent from \"astro-consent\";` manually."
+        });
+    }
+    const hasIntegration = source.includes("astroConsent(");
+    checks.push({
+        label: "Integration",
+        ok: hasIntegration,
+        detail: hasIntegration
+            ? "astroConsent(...) is present in integrations"
+            : "astroConsent(...) is missing from integrations"
+    });
+    if (!hasIntegration) {
+        findings.push({
+            issue: "astro.config.* does not include astroConsent(...) in integrations",
+            fix: "Add `astroConsent(...)` inside the `integrations` array."
+        });
+    }
+    const hasCss = fs.existsSync(cssFile);
+    checks.push({
+        label: "Stylesheet",
+        ok: hasCss,
+        detail: hasCss
+            ? "src/cookiebanner/styles.css exists"
+            : "src/cookiebanner/styles.css is missing"
+    });
+    if (!hasCss) {
+        findings.push({
+            issue: "src/cookiebanner/styles.css is missing",
+            fix: "Run `npx astro-consent init` to recreate the stylesheet."
+        });
+    }
+    let hasLayoutImport = false;
+    if (fs.existsSync(layoutPath)) {
+        const layoutSource = fs.readFileSync(layoutPath, "utf8");
+        hasLayoutImport = layoutSource.includes(`../cookiebanner/styles.css`);
+        checks.push({
+            label: "Layout import",
+            ok: hasLayoutImport,
+            detail: hasLayoutImport
+                ? "BaseLayout imports ../cookiebanner/styles.css"
+                : "BaseLayout is missing the stylesheet import"
+        });
+        if (!hasLayoutImport) {
+            findings.push({
+                issue: "BaseLayout.astro does not import ../cookiebanner/styles.css",
+                fix: "Add `import \"../cookiebanner/styles.css\";` near the top of `src/layouts/BaseLayout.astro`."
+            });
+        }
+    }
+    else {
+        checks.push({
+            label: "Layout import",
+            ok: false,
+            detail: "src/layouts/BaseLayout.astro is missing"
+        });
+        findings.push({
+            issue: "src/layouts/BaseLayout.astro is missing",
+            fix: "Create or update a shared layout to import `../cookiebanner/styles.css`."
+        });
+    }
+    const summary = {
+        ok: findings.length === 0,
+        checks,
+        findings
+    };
+    if (isJson) {
+        console.log(JSON.stringify(summary, null, 2));
+        process.exit(summary.ok ? 0 : 1);
+    }
+    console.log("\nastro-consent doctor");
+    for (const check of checks) {
+        console.log(`${check.ok ? "✅" : "❌"} ${check.label}: ${check.detail}`);
+    }
+    if (findings.length === 0) {
+        console.log("\nAll required wiring is present.\n");
+        process.exit(0);
+    }
+    console.log("\nNext fixes:");
+    for (const finding of findings) {
+        console.log(`- ${finding.issue}`);
+        console.log(`  Fix: ${finding.fix}`);
+    }
+    console.log("");
+    process.exit(1);
 }
-
-/* ===============================
-   Mobile
-   =============================== */
-
-@media (max-width: 640px) {
-  .cb-container {
-    flex-direction: column;
-    align-items: stretch;
-    gap: 16px;
-  }
-
-  .cb-actions {
-    justify-content: flex-end;
-    flex-wrap: wrap;
-  }
+if (command === "status") {
+    const { source } = readConfig();
+    const cssFile = path.join(CWD, "src", "cookiebanner", "styles.css");
+    const layoutPath = path.join(CWD, "src", "layouts", "BaseLayout.astro");
+    const linked = fs.existsSync(path.join(CWD, "node_modules", "astro-consent"));
+    const consentKeyMatch = source.match(/storageKey:\s*["']([^"']+)["']/);
+    const consentKey = consentKeyMatch?.[1] ?? "astro-consent";
+    const report = {
+        configWired: source.includes(`from "astro-consent"`) &&
+            source.includes("astroConsent("),
+        cssExists: fs.existsSync(cssFile),
+        linkedInstall: linked,
+        consentStorageKey: consentKey,
+        consentStored: "browser-only; inspect via window.astroConsent.get()"
+    };
+    if (isJson) {
+        console.log(JSON.stringify(report, null, 2));
+        process.exit(0);
+    }
+    console.log("\nastro-consent status");
+    console.log(`${report.configWired ? "✅" : "❌"} Config wiring`);
+    console.log(`${report.cssExists ? "✅" : "❌"} CSS file exists`);
+    console.log(`${report.linkedInstall ? "✅" : "❌"} Linked install present`);
+    console.log(`ℹ️  Consent storage key: ${report.consentStorageKey}`);
+    console.log(`ℹ️  Consent state: ${report.consentStored}`);
+    console.log(`ℹ️  Check in browser: window.astroConsent.get()`);
+    console.log("");
+    process.exit(0);
 }
-`, "utf8");
-    console.log("🎨 Created src/cookiebanner.css");
+if (command !== "init" && command !== "install") {
+    printHelp();
 }
 /* ─────────────────────────────────────
    Inject Astro integration
 ───────────────────────────────────── */
+const { configPath, source: original } = readConfig();
+let source = original;
+ensureCssFile(isDryRun);
 if (!source.includes(`from "astro-consent"`)) {
     source = `import astroConsent from "astro-consent";\n${source}`;
 }
-if (!source.includes("astroConsent(")) {
-    source = source.replace(/integrations\s*:\s*\[/, match => `${match}
-    astroConsent({
-      siteName: "My Website",
-      policyUrl: "/privacy",
-      consent: {
-        days: 30,
-        storageKey: "astro-consent"
-      }
-    }),
-`);
+if (!source.includes("astro-consent:start")) {
+    source = source.replace(/integrations\s*:\s*\[/, match => `${match}\n${buildIntegrationBlock()}`);
+}
+if (!isDryRun) {
+    fs.writeFileSync(configPath, source, "utf8");
 }
-fs.writeFileSync(configPath, source, "utf8");
-console.log("\n🎉 astro-consent installed successfully");
-console.log("👉 Style everything via src/cookiebanner.css");
+console.log(isDryRun
+    ? "\n🧪 Dry run: astro-consent would be installed successfully"
+    : "\n🎉 astro-consent installed successfully");
+console.log("👉 Edit src/cookiebanner/styles.css to theme the banner and modal.");
 console.log("👉 Run `astro-consent remove` to uninstall\n");

package/dist/index.d.ts

@@ -1,7 +1,17 @@
 import type { AstroIntegration } from "astro";
 export interface AstroConsentOptions {
     siteName?: string;
+    headline?: string;
+    description?: string;
+    acceptLabel?: string;
+    rejectLabel?: string;
+    manageLabel?: string;
+    cookiePolicyUrl?: string;
+    privacyPolicyUrl?: string;
     policyUrl?: string;
+    presentation?: "banner" | "overlay";
+    displayUntilIdle?: boolean;
+    displayIdleDelayMs?: number;
     consent?: {
         days?: number;
         storageKey?: string;