cosmolo 0.3.9 → 0.5.0

package/dist/cli/migrate.js

@@ -0,0 +1,54 @@
+import * as readline from 'readline';
+import * as fs from 'fs';
+import * as path from 'path';
+import { DEFAULT_CONFIG } from '../config.js';
+async function loadConfig() {
+    const root = process.cwd();
+    for (const name of ['cosmolo.config.ts', 'cosmolo.config.js']) {
+        const p = path.join(root, name);
+        if (fs.existsSync(p)) {
+            try {
+                const mod = await import(p);
+                return mod.default;
+            }
+            catch {
+                // fall through to defaults
+            }
+        }
+    }
+    return DEFAULT_CONFIG;
+}
+function ask(rl, question) {
+    return new Promise((resolve) => rl.question(question, (ans) => resolve(ans.trim())));
+}
+export async function main() {
+    const config = await loadConfig();
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    console.log('\ncosmolo migrate:db\n');
+    console.log('Select migration type:');
+    console.log('  1. Export as SQL files');
+    console.log('  2. Execute SQL directly');
+    console.log('  3. Full setup with Drizzle ORM + Cloudflare D1');
+    const choice = await ask(rl, '\n> ');
+    rl.close();
+    switch (choice) {
+        case '1': {
+            const { exportSqlFiles } = await import('./migrate/sql-export.js');
+            await exportSqlFiles(config);
+            break;
+        }
+        case '2': {
+            const { executeSqlDirect } = await import('./migrate/sql-execute.js');
+            await executeSqlDirect(config);
+            break;
+        }
+        case '3': {
+            const { drizzleSetup } = await import('./migrate/drizzle-setup.js');
+            await drizzleSetup(config);
+            break;
+        }
+        default:
+            console.error(`\nInvalid choice: "${choice}". Enter 1, 2, or 3.`);
+            process.exit(1);
+    }
+}

package/dist/cli/setup/r2.d.ts

@@ -0,0 +1 @@
+export declare function main(): Promise<void>;

package/dist/cli/setup/r2.js

@@ -0,0 +1,90 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import * as readline from 'readline';
+function ask(rl, question, fallback = '') {
+    const hint = fallback ? ` [${fallback}]` : '';
+    return new Promise((resolve) => rl.question(`  ${question}${hint}: `, (ans) => resolve(ans.trim() || fallback)));
+}
+function r2HelperContent() {
+    return (`// Helper for serving assets stored in Cloudflare R2.\n` +
+        `// Usage: import in a +server.ts route and call getR2Asset.\n\n` +
+        `export async function getR2Asset(bucket: R2Bucket, key: string): Promise<Response> {\n` +
+        `  const obj = await bucket.get(key);\n` +
+        `  if (!obj) return new Response('Not found', { status: 404 });\n` +
+        `  const headers = new Headers();\n` +
+        `  obj.writeHttpMetadata(headers);\n` +
+        `  headers.set('etag', obj.httpEtag);\n` +
+        `  headers.set('cache-control', 'public, max-age=31536000, immutable');\n` +
+        `  return new Response(obj.body as ReadableStream, { headers });\n` +
+        `}\n`);
+}
+function r2RouteContent(binding) {
+    return (`import type { RequestHandler } from './$types';\n` +
+        `import { getR2Asset } from '$lib/r2';\n\n` +
+        `export const GET: RequestHandler = async ({ params, platform }) => {\n` +
+        `  return getR2Asset(platform!.env.${binding}, params.key);\n` +
+        `};\n`);
+}
+function appendR2Binding(wranglerPath, binding, bucketName) {
+    const existing = fs.readFileSync(wranglerPath, 'utf-8');
+    const section = `\n[[r2_buckets]]\n` +
+        `binding = "${binding}"\n` +
+        `bucket_name = "${bucketName}"\n`;
+    fs.writeFileSync(wranglerPath, existing + section);
+}
+export async function main() {
+    const root = process.cwd();
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    console.log('\ncosmolo setup:r2\n');
+    // wrangler.toml check
+    const wranglerPath = path.join(root, 'wrangler.toml');
+    if (!fs.existsSync(wranglerPath)) {
+        console.error('  wrangler.toml not found.\n' +
+            '  Run `cosmolo init` with the Cloudflare adapter first.\n');
+        rl.close();
+        process.exit(1);
+    }
+    const bucketName = await ask(rl, 'R2 bucket name', 'assets');
+    const binding = await ask(rl, 'Binding name (used in platform.env.*)', 'ASSETS');
+    // Conflict checks
+    const helperPath = path.join(root, 'src', 'lib', 'r2.ts');
+    const routePath = path.join(root, 'src', 'routes', 'assets', '[...key]', '+server.ts');
+    const conflicts = [];
+    if (fs.existsSync(helperPath))
+        conflicts.push('src/lib/r2.ts');
+    if (fs.existsSync(routePath))
+        conflicts.push('src/routes/assets/[...key]/+server.ts');
+    if (conflicts.length > 0) {
+        console.log('\n  The following files already exist:');
+        for (const f of conflicts)
+            console.log(`    ${f}`);
+        const ans = await new Promise((resolve) => rl.question('\n  Overwrite? [y/N]: ', (a) => resolve(a.trim().toLowerCase() || 'n')));
+        if (ans !== 'y') {
+            console.log('\n  Aborted. No files were written.\n');
+            rl.close();
+            process.exit(0);
+        }
+    }
+    rl.close();
+    // Write helper
+    fs.mkdirSync(path.dirname(helperPath), { recursive: true });
+    fs.writeFileSync(helperPath, r2HelperContent());
+    // Write route
+    fs.mkdirSync(path.dirname(routePath), { recursive: true });
+    fs.writeFileSync(routePath, r2RouteContent(binding));
+    // Update wrangler.toml
+    appendR2Binding(wranglerPath, binding, bucketName);
+    console.log('\n✓ Files generated:');
+    console.log('  src/lib/r2.ts');
+    console.log('  src/routes/assets/[...key]/+server.ts');
+    console.log('  wrangler.toml  (r2_buckets appended)');
+    console.log('\nNext steps:\n');
+    console.log(`  1. Create the R2 bucket (if not done yet):`);
+    console.log(`       bunx wrangler r2 bucket create ${bucketName}\n`);
+    console.log(`  2. Add the binding to src/app.d.ts:`);
+    console.log(`       interface Platform { env: { ${binding}: R2Bucket } }\n`);
+    console.log(`  3. Upload assets (e.g. from static/images/):`);
+    console.log(`       bunx wrangler r2 object put ${bucketName}/<key> --file <path>\n`);
+    console.log(`  4. Reference assets via /assets/<key> in your templates.\n`);
+    console.log(`  See https://developers.cloudflare.com/r2/ for full R2 docs.`);
+}

package/dist/markdown.js

@@ -7,6 +7,9 @@ function slugifyHeading(text) {
         .trim()
         .replace(/\s+/g, '-');
 }
+function escapeAttr(val) {
+    return val.replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
 marked.use({
     extensions: [
         {
@@ -22,7 +25,8 @@ marked.use({
             },
             renderer(token) {
                 const { videoId } = token;
-                return `<div class="youtube-embed"><iframe src="https://www.youtube.com/embed/${videoId}" title="YouTube video" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div>\n`;
+                const safeId = videoId.replace(/[^a-zA-Z0-9_-]/g, '');
+                return `<div class="youtube-embed"><iframe src="https://www.youtube.com/embed/${safeId}" title="YouTube video" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div>\n`;
             },
         },
     ],
@@ -32,8 +36,8 @@ marked.use({
         link({ href, title, text }) {
             const isExternal = /^https?:\/\//.test(href ?? '');
             const rel = isExternal ? ' target="_blank" rel="noopener noreferrer"' : '';
-            const titleAttr = title ? ` title="${title}"` : '';
-            return `<a href="${href}"${titleAttr}${rel}>${text}</a>`;
+            const titleAttr = title ? ` title="${escapeAttr(title)}"` : '';
+            return `<a href="${escapeAttr(href ?? '')}"${titleAttr}${rel}>${text}</a>`;
         },
         heading({ text, depth }) {
             const id = slugifyHeading(text);

package/dist/types.d.ts

@@ -49,7 +49,4 @@ export interface SiteConfig {
     twitterHandle: string;
     fallbackCategoryLabel: string;
     articlesPerPage: number;
-    ogImage: {
-        mode: 'static' | 'generated';
-    };
 }

package/package.json

@@ -1,9 +1,9 @@
 {
 	"name": "cosmolo",
-	"version": "0.3.9",
+	"version": "0.5.0",
 	"type": "module",
 	"bin": {
-		"cosmolo": "./dist/cli/index.js"
+		"cosmolo": "dist/cli/index.js"
 	},
 	"exports": {
 		".": {

package/templates/shared/config/site.json

@@ -4,6 +4,5 @@
 	"description": "A content site built with Cosmolo.",
 	"twitterHandle": "@yourhandle",
 	"fallbackCategoryLabel": "Other",
-	"articlesPerPage": 10,
-	"ogImage": { "mode": "static" }
+	"articlesPerPage": 10
 }