@brightsideoy/kama 0.1.0-alpha.142 → 0.1.0-alpha.143

package/bin/cli.js

@@ -291,19 +291,13 @@ import customSchemas from './workspace-schemas.js';
 
 export default {
   async fetch(request, env, ctx) {
-    // 🎯 FIX 1: Safely unwrap the ESM default export so the Engine sees local schemas
     const resolvedSchemas = customSchemas.default || customSchemas;
-    
-    // 🎯 FIX 2: Mutate the Cloudflare env directly instead of spreading it!
-    // Spreading {...env} breaks Cloudflare D1/R2 proxy bindings.
     env.BUNDLED_DEFINITIONS = resolvedSchemas;
 
-    // Execute the Hono app fetch handler
     if (kamaWorker && typeof kamaWorker.fetch === 'function') {
       return kamaWorker.fetch(request, env, ctx);
     }
     
-    // Fallback just in case the export structure changes
     if (kamaWorker && kamaWorker.app && typeof kamaWorker.app.fetch === 'function') {
       return kamaWorker.app.fetch(request, env, ctx);
     }
@@ -315,7 +309,6 @@ export default {
 
     writeFileSync(join(cmsDir, 'index.js'), cmsWorkerIndexContent);
 
-    // 🎯 THE FINAL FIX: Automatically run `npx kama bundle` before Dev or Deploy inside the worker!
     writeFileSync(
         join(cmsDir, 'package.json'),
         JSON.stringify({
@@ -437,7 +430,6 @@ async function createNewSiteOnly() {
     const envChoice = await rl.question('\nChoice [1/2]: ');
     const isCloudflare = envChoice.trim() === '2';
 
-    // 🎯 FIX: Default to 'kama-starter'
     const siteFolder = (await rl.question('Astro package/folder name (e.g., my-new-site) [kama-starter]: ')).trim() || 'kama-starter';
 
     let siteDomain = 'localhost:4321';
@@ -461,7 +453,13 @@ async function createNewSiteOnly() {
  * Reads YAML from workspace and builds a static module for the worker
  */
 async function bundleWorkspaceSchemas(targetRootDir) {
-    const rootDir = targetRootDir || process.cwd();
+    let rootDir = targetRootDir || process.cwd();
+
+    // Fix directory target if executed directly inside the worker package
+    if (basename(rootDir) === 'kama-worker') {
+        rootDir = resolve(rootDir, '..');
+    }
+
     const defsDir = join(rootDir, 'content', 'definitions');
     const workerDir = join(rootDir, 'kama-worker');
 
@@ -636,14 +634,12 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
         writeFileSync(wranglerPath, wranglerStr);
     }
 
-    // 🎯 FIX: Smart capitalization for dynamic site labels
     const siteLabel = siteFolder.split(/[-_]/).map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(' ');
     const safeSiteLabel = siteLabel.replace(/'/g, "''");
 
     const channelKey = siteFolder.replace(/[^a-z0-9_-]/gi, '-').toLowerCase();
     const treeKey = `${channelKey}-nav`;
 
-    // 🎯 FIX: Inject `safeSiteLabel` into the logoText, titleSuffix, and titles!
     const seedSql = `
 -- Seed data for site: ${safeSiteLabel}
 INSERT OR IGNORE INTO channels (key, label, channelType, defaultLanguage, isHidden, dataJson)
@@ -680,7 +676,6 @@ VALUES (
         appendFileSync(seedPath, seedSql);
     }
 
-    // 🎯 FIX: Expose the title-cased name to Astro ENV vars as well
     const envContent = [
         `PUBLIC_CMS_URL="${cmsFullUrl}"`,
         `PUBLIC_API_URL="${cmsFullUrl}"`,