@brightsideoy/kama 0.1.0-alpha.22 → 0.1.0-alpha.23

package/bin/cli.js

@@ -36,7 +36,9 @@ async function createFullWorkspace() {
     const siteDomain = (await rl.question('First Website Domain (e.g., www.example.com): ')) || 'www.example.com';
 
     const rootDir = join(process.cwd(), projName);
-    const dbName = `${projName}-db`.replace(/[^a-zA-Z0-9_-]/g, '_'); // safe DB name
+
+    // Changed to 'let' so we can rename it if it already exists
+    let dbName = `${projName}-db`.replace(/[^a-zA-Z0-9_-]/g, '_');
 
     console.log(`\n📁 Creating workspace folder at ./${projName}...`);
     mkdirSync(rootDir, { recursive: true });
@@ -63,21 +65,49 @@ async function createFullWorkspace() {
     }
 
     if (isAuthenticated) {
-        console.log(`\n🗄️ Attempting to auto-create Cloudflare D1 Database '${dbName}'...`);
         try {
-            const d1Output = execSync(`npx wrangler d1 create ${dbName}`, { encoding: 'utf-8', stdio: 'pipe' });
+            console.log(`\n🗄️ Checking existing Cloudflare D1 databases...`);
+            const listOutput = execSync(`npx wrangler d1 list --json`, { encoding: 'utf-8', stdio: 'pipe' });
+
+            // Safely parse JSON in case Wrangler prints update warnings before the JSON array
+            const jsonStart = listOutput.indexOf('[');
+            const jsonEnd = listOutput.lastIndexOf(']') + 1;
+            let databases = [];
 
-            const uuidRegex = /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/;
-            const match = d1Output.match(uuidRegex);
+            if (jsonStart !== -1 && jsonEnd !== -1) {
+                databases = JSON.parse(listOutput.substring(jsonStart, jsonEnd));
+            }
 
-            if (match) {
-                d1DatabaseId = match[0];
-                console.log(`✅ Success! Database ID bound: ${d1DatabaseId}`);
+            const existingDb = databases.find(db => db.name === dbName);
+
+            if (existingDb) {
+                console.log(`⚠️ Database '${dbName}' already exists on your account.`);
+                const useExisting = await rl.question(`Do you want to link this existing database? (y/n) [y]: `);
+
+                if (useExisting.toLowerCase() !== 'n') {
+                    d1DatabaseId = existingDb.uuid;
+                    console.log(`✅ Linked existing database ID: ${d1DatabaseId}`);
+                } else {
+                    dbName = (await rl.question(`Enter a new database name: `)).trim();
+                    console.log(`\n🗄️ Creating new database '${dbName}'...`);
+                    const d1Output = execSync(`npx wrangler d1 create ${dbName}`, { encoding: 'utf-8', stdio: 'pipe' });
+                    const match = d1Output.match(/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/);
+                    if (match) {
+                        d1DatabaseId = match[0];
+                        console.log(`✅ Success! Database ID bound: ${d1DatabaseId}`);
+                    }
+                }
             } else {
-                console.log(`⚠️ Could not parse the database ID from Wrangler. You may need to update wrangler.json manually.`);
+                console.log(`\n🗄️ Attempting to auto-create Cloudflare D1 Database '${dbName}'...`);
+                const d1Output = execSync(`npx wrangler d1 create ${dbName}`, { encoding: 'utf-8', stdio: 'pipe' });
+                const match = d1Output.match(/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/);
+                if (match) {
+                    d1DatabaseId = match[0];
+                    console.log(`✅ Success! Database ID bound: ${d1DatabaseId}`);
+                }
             }
         } catch (error) {
-            console.log(`⚠️ Auto-creation failed. We'll leave a placeholder.`);
+            console.log(`⚠️ Database operation failed. We'll leave a placeholder.`);
         }
     } else {
         console.log(`⚠️ Skipping database creation. We'll leave a placeholder in wrangler.json.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brightsideoy/kama",
-  "version": "0.1.0-alpha.22",
+  "version": "0.1.0-alpha.23",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -16,15 +16,16 @@
   },
   "files": [
     "dist",
-    "bin"
+    "bin",
+    "schema.sql"
   ],
   "scripts": {
     "dev": "concurrently \"vite\" \"tsx watch server/index.ts\"",
     "build": "vite build",
     "build:cms": "vite build",
-    "build:seed-sql": "tsx src/db/generate-sql.ts",
-    "db:seed": "npm run build:seed-sql && tsx -e \"import Database from 'better-sqlite3'; import fs from 'node:fs'; const db = new Database('data/cms.db'); db.exec(fs.readFileSync('seed.sql', 'utf8')); console.log('✅ Database seeded successfully!');\"",
-    "d1:seed:remote": "npm run build:seed-sql && npx wrangler d1 execute YOUR_D1_NAME --remote --file=./seed.sql",
+    "build:schema": "tsx src/db/generate-schema.ts",
+    "db:seed": "npm run build:schema && tsx -e \"import Database from 'better-sqlite3'; import fs from 'node:fs'; const db = new Database('data/cms.db'); db.exec(fs.readFileSync('schema.sql', 'utf8')); console.log('✅ Database schema applied successfully!');\"",
+    "d1:schema:remote": "npm run build:schema && npx wrangler d1 execute YOUR_D1_NAME --remote --file=./schema.sql",
     "serve": "tsx server/index.ts"
   },
   "publishConfig": {

package/schema.sql

@@ -0,0 +1,193 @@
+-- Kama Core System Schema 
+-- Auto-generated from server/db/dynamic-sync.ts
+
+CREATE TABLE IF NOT EXISTS "users" (
+    id TEXT PRIMARY KEY,
+    email TEXT UNIQUE NOT NULL,
+    name TEXT NOT NULL,
+    globalRole TEXT DEFAULT 'editor',
+    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,
+    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP
+  );
+
+CREATE TABLE IF NOT EXISTS "user_accounts" (
+    id TEXT PRIMARY KEY,
+    userId TEXT NOT NULL,
+    provider TEXT NOT NULL,
+    providerAccountId TEXT NOT NULL,
+    passwordHash TEXT NOT NULL,
+    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (userId) REFERENCES users(id) ON DELETE CASCADE,
+    UNIQUE(provider, providerAccountId)
+  );
+
+CREATE TABLE IF NOT EXISTS "sessions" (
+    id TEXT PRIMARY KEY,
+    userId TEXT NOT NULL,
+    expiresAt TEXT NOT NULL,
+    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (userId) REFERENCES users(id) ON DELETE CASCADE
+  );
+
+CREATE TABLE IF NOT EXISTS "channels" (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    key TEXT UNIQUE NOT NULL,
+    label TEXT NOT NULL,
+    channelType TEXT,
+    domain TEXT,
+    baseUrl TEXT,
+    defaultLanguage TEXT DEFAULT 'en',
+    isHidden INTEGER NOT NULL DEFAULT 0,
+    dataJson TEXT,
+    createdById TEXT,
+    updatedById TEXT,
+    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,
+    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL,
+    FOREIGN KEY (updatedById) REFERENCES users(id) ON DELETE SET NULL
+  );
+
+CREATE TABLE IF NOT EXISTS "trees" (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    key TEXT UNIQUE NOT NULL,
+    label TEXT NOT NULL,
+    treeType TEXT,
+    channelId INTEGER,
+    isHidden INTEGER NOT NULL DEFAULT 0,
+    dataJson TEXT,
+    createdById TEXT,
+    updatedById TEXT,
+    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,
+    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (channelId) REFERENCES channels(id) ON DELETE SET NULL,
+    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL,
+    FOREIGN KEY (updatedById) REFERENCES users(id) ON DELETE SET NULL
+  );
+
+CREATE TABLE IF NOT EXISTS "channel_trees" (
+    channelId INTEGER NOT NULL,
+    treeId INTEGER NOT NULL,
+    key TEXT NOT NULL DEFAULT 'main',
+    metaJson TEXT,
+    PRIMARY KEY (channelId, treeId, key),
+    FOREIGN KEY (channelId) REFERENCES channels(id) ON DELETE CASCADE,
+    FOREIGN KEY (treeId) REFERENCES trees(id) ON DELETE CASCADE
+  );
+
+CREATE TABLE IF NOT EXISTS "content_nodes" (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    contentType TEXT NOT NULL,
+    title TEXT NOT NULL,
+    slug TEXT,
+    language TEXT DEFAULT 'en',
+    isHidden INTEGER NOT NULL DEFAULT 0,
+    status TEXT DEFAULT 'draft',
+    disabledRegionsJson TEXT DEFAULT '{}',
+    dataJson TEXT,
+    draftDataJson TEXT,
+    publishedDataJson TEXT,
+    publishedAt TEXT,
+    createdById TEXT,
+    updatedById TEXT,
+    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,
+    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,
+    deletedAt TEXT,
+    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL,
+    FOREIGN KEY (updatedById) REFERENCES users(id) ON DELETE SET NULL
+  );
+
+CREATE TABLE IF NOT EXISTS "node_channels" (
+    nodeId INTEGER NOT NULL,
+    channelId INTEGER NOT NULL,
+    PRIMARY KEY (nodeId, channelId),
+    FOREIGN KEY (nodeId) REFERENCES content_nodes(id) ON DELETE CASCADE,
+    FOREIGN KEY (channelId) REFERENCES channels(id) ON DELETE CASCADE
+  );
+
+CREATE TABLE IF NOT EXISTS "tree_nodes" (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    treeId INTEGER NOT NULL,
+    contentId INTEGER NOT NULL,
+    parentId INTEGER,
+    sortOrder INTEGER DEFAULT 0,
+    FOREIGN KEY (treeId) REFERENCES trees(id) ON DELETE CASCADE,
+    FOREIGN KEY (contentId) REFERENCES content_nodes(id) ON DELETE CASCADE,
+    FOREIGN KEY (parentId) REFERENCES tree_nodes(id) ON DELETE CASCADE
+  );
+
+CREATE TABLE IF NOT EXISTS "content_blocks" (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    contentId INTEGER NOT NULL,
+    region TEXT DEFAULT 'main',
+    elementType TEXT NOT NULL,
+    dataJson TEXT,
+    sortOrder INTEGER DEFAULT 0,
+    isDraft INTEGER NOT NULL DEFAULT 1,
+    FOREIGN KEY (contentId) REFERENCES content_nodes(id) ON DELETE CASCADE
+  );
+
+CREATE TABLE IF NOT EXISTS "node_revisions" (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    nodeId INTEGER NOT NULL,
+    version INTEGER NOT NULL DEFAULT 1,
+    snapshotJson TEXT NOT NULL,
+    createdById TEXT,
+    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,
+    FOREIGN KEY (nodeId) REFERENCES content_nodes(id) ON DELETE CASCADE,
+    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL
+  );
+
+CREATE TABLE IF NOT EXISTS "assets" (
+    id TEXT PRIMARY KEY,
+    filename TEXT NOT NULL,
+    mimeType TEXT NOT NULL,
+    sizeBytes INTEGER NOT NULL,
+    storageKeyPrivate TEXT,
+    cdnUrl TEXT,
+    parentAssetId TEXT,
+    cropCoordinatesJson TEXT,
+    isSystemVariant INTEGER DEFAULT 0,
+    dataJson TEXT DEFAULT '{}',
+    createdById TEXT,
+    createdAt TEXT DEFAULT CURRENT_TIMESTAMP,
+    updatedAt TEXT DEFAULT CURRENT_TIMESTAMP,
+    deletedAt TEXT,
+    FOREIGN KEY (parentAssetId) REFERENCES assets(id) ON DELETE SET NULL,
+    FOREIGN KEY (createdById) REFERENCES users(id) ON DELETE SET NULL
+  );
+
+CREATE TABLE IF NOT EXISTS "node_assets" (
+    nodeId INTEGER NOT NULL,
+    assetId TEXT NOT NULL,
+    fieldKey TEXT NOT NULL,
+    sortOrder INTEGER DEFAULT 0,
+    PRIMARY KEY (nodeId, assetId, fieldKey),
+    FOREIGN KEY (nodeId) REFERENCES content_nodes(id) ON DELETE CASCADE,
+    FOREIGN KEY (assetId) REFERENCES assets(id) ON DELETE CASCADE
+  );
+
+CREATE INDEX IF NOT EXISTS idx_sessions_user ON sessions(userId);
+CREATE INDEX IF NOT EXISTS idx_sessions_expires ON sessions(expiresAt);
+CREATE INDEX IF NOT EXISTS idx_channels_visibility ON channels(isHidden);
+CREATE INDEX IF NOT EXISTS idx_trees_visibility ON trees(isHidden);
+CREATE INDEX IF NOT EXISTS idx_content_nodes_visibility ON content_nodes(isHidden, status);
+CREATE INDEX IF NOT EXISTS idx_content_nodes_slug ON content_nodes(slug);
+CREATE INDEX IF NOT EXISTS idx_content_nodes_type ON content_nodes(contentType);
+CREATE INDEX IF NOT EXISTS idx_content_nodes_deleted_updated ON content_nodes(deletedAt, updatedAt DESC);
+CREATE INDEX IF NOT EXISTS idx_tree_nodes_hierarchy ON tree_nodes(treeId, parentId, sortOrder);
+CREATE INDEX IF NOT EXISTS idx_tree_nodes_content ON tree_nodes(contentId, treeId);
+CREATE INDEX IF NOT EXISTS idx_content_blocks_content ON content_blocks(contentId, isDraft, region, sortOrder);
+CREATE INDEX IF NOT EXISTS idx_node_channels_channel ON node_channels(channelId, nodeId);
+CREATE INDEX IF NOT EXISTS idx_node_channels_node ON node_channels(nodeId, channelId);
+CREATE INDEX IF NOT EXISTS idx_node_assets_node_asset ON node_assets(nodeId, assetId);
+CREATE INDEX IF NOT EXISTS idx_node_assets_asset_node ON node_assets(assetId, nodeId);
+CREATE INDEX IF NOT EXISTS idx_node_revisions_node ON node_revisions(nodeId, version);
+CREATE INDEX IF NOT EXISTS idx_assets_system_created ON assets(isSystemVariant, createdAt DESC);
+CREATE INDEX IF NOT EXISTS idx_assets_system_mime ON assets(isSystemVariant, mimeType);
+CREATE INDEX IF NOT EXISTS idx_assets_deleted ON assets(deletedAt);
+CREATE INDEX IF NOT EXISTS idx_assets_parent ON assets(parentAssetId);
+
+-- System Defaults
+INSERT OR IGNORE INTO channels (id, key, label, channelType, defaultLanguage, isHidden, dataJson) VALUES (1, 'default-channel', 'Default Channel', 'website', 'en', 0, '{}');
+INSERT OR IGNORE INTO trees (id, key, label, treeType, channelId, isHidden, dataJson) VALUES (1, 'default-tree', 'Default Navigation', 'navigation', 1, 0, '{}');
+INSERT OR IGNORE INTO channel_trees (channelId, treeId, key) VALUES (1, 1, 'main');