@panoptic-it-solutions/coolify-setup 1.1.9 → 1.1.11

package/dist/generator.js

@@ -48,43 +48,64 @@ function addEsbuildToPackageJson(packageManager) {
     }
 }
 function moveMigrationsToLibDb() {
-    const result = { movedMigrations: false, movedMigrateTs: false };
+    const result = {
+        migrations: false,
+        helpers: false,
+        migrateTs: false,
+        queriesTs: false,
+        schemaTs: false,
+    };
     const cwd = process.cwd();
-    // Check if db/migrations exists at root level (sibling to lib)
-    const dbMigrationsPath = join(cwd, 'db/migrations');
-    const libDbMigrationsPath = join(cwd, 'lib/db/migrations');
-    if (existsSync(dbMigrationsPath) && !existsSync(libDbMigrationsPath)) {
-        // Ensure lib/db directory exists
-        ensureDir(join(libDbMigrationsPath, 'dummy'));
-        // Move the entire migrations folder
-        renameSync(dbMigrationsPath, libDbMigrationsPath);
-        result.movedMigrations = true;
-        console.log('Moved db/migrations → lib/db/migrations');
-    }
-    // Check if db/migrate.ts exists at root level
-    const dbMigrateTsPath = join(cwd, 'db/migrate.ts');
-    const libDbMigrateTsPath = join(cwd, 'lib/db/migrate.ts');
-    if (existsSync(dbMigrateTsPath) && !existsSync(libDbMigrateTsPath)) {
-        // Ensure lib/db directory exists
-        ensureDir(libDbMigrateTsPath);
-        // Move migrate.ts
-        renameSync(dbMigrateTsPath, libDbMigrateTsPath);
-        result.movedMigrateTs = true;
-        console.log('Moved db/migrate.ts → lib/db/migrate.ts');
-    }
-    // Clean up empty db directory if it exists and is empty
-    const dbPath = join(cwd, 'db');
-    if (existsSync(dbPath)) {
-        try {
-            const contents = readdirSync(dbPath);
-            if (contents.length === 0) {
-                // Remove empty directory
-                execSync(`rmdir "${dbPath}"`, { stdio: 'pipe' });
-                console.log('Removed empty db/ directory');
+    // Items to move to lib/db/
+    const itemsToMove = [
+        { name: 'migrations', resultKey: 'migrations', isDir: true },
+        { name: 'helpers', resultKey: 'helpers', isDir: true },
+        { name: 'migrate.ts', resultKey: 'migrateTs', isDir: false },
+        { name: 'queries.ts', resultKey: 'queriesTs', isDir: false },
+        { name: 'schema.ts', resultKey: 'schemaTs', isDir: false },
+    ];
+    // Source directories to check (in order of priority)
+    const sourceRoots = ['db', 'src/db'];
+    for (const item of itemsToMove) {
+        const destPath = join(cwd, 'lib/db', item.name);
+        // Skip if destination already exists
+        if (existsSync(destPath)) {
+            continue;
+        }
+        // Try each source root
+        for (const sourceRoot of sourceRoots) {
+            const sourcePath = join(cwd, sourceRoot, item.name);
+            if (existsSync(sourcePath)) {
+                // Ensure lib/db directory exists
+                if (item.isDir) {
+                    ensureDir(join(destPath, 'dummy'));
+                }
+                else {
+                    ensureDir(destPath);
+                }
+                // Move the item
+                renameSync(sourcePath, destPath);
+                result[item.resultKey] = true;
+                console.log(`Moved ${sourceRoot}/${item.name} → lib/db/${item.name}`);
+                break; // Found and moved, no need to check other source roots
             }
         }
-        catch {
-            // Ignore errors when cleaning up
+    }
+    // Clean up empty db directories
+    for (const sourceRoot of sourceRoots) {
+        const dbPath = join(cwd, sourceRoot);
+        if (existsSync(dbPath)) {
+            try {
+                const contents = readdirSync(dbPath);
+                if (contents.length === 0) {
+                    // Remove empty directory
+                    execSync(`rmdir "${dbPath}"`, { stdio: 'pipe' });
+                    console.log(`Removed empty ${sourceRoot}/ directory`);
+                }
+            }
+            catch {
+                // Ignore errors when cleaning up
+            }
         }
     }
     return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoptic-it-solutions/coolify-setup",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "description": "CLI tool for setting up Coolify deployment on Panoptic projects",
   "type": "module",
   "main": "dist/index.js",