supatool 0.6.0 → 0.6.1

package/README.md

@@ -89,9 +89,19 @@ Pull schema from remote DB into local files:
 ```bash
 supatool extract --all -o db/schemas
 # Options:
-# --schema public,agent   Specify schemas
+# --schema public,agent   Specify schemas (explicit list)
+# -e auth,storage         Exclude schemas — targets all others automatically
 # -t "user_*"             Filter tables by pattern
-# --force                 Clear output dir before writing
+# --force                 Delete .sql files for objects removed from DB
+```
+
+Unchanged `.sql` files are never overwritten (content is compared excluding the generated header line). Use `--force` to also clean up `.sql` files whose corresponding DB objects have been dropped.
+
+When you have many schemas and only want to exclude a few, use `-e` without `--schema`:
+
+```bash
+# Extract everything except auth and storage schemas
+supatool extract --all -e auth,storage -o db/schemas
 ```
 
 ### Deploy

package/dist/bin/supatool.js

@@ -76,7 +76,7 @@ program
     .option('--no-separate', 'Output all objects in same directory')
     .option('--schema <schemas>', 'Target schemas, comma-separated (default: public)')
     .option('--all-schemas', 'Target all schemas in the DB (use with -e to exclude some)')
-    .option('-e, --exclude-schema <schemas>', 'Schemas to exclude, comma-separated (use with --all-schemas)')
+    .option('-e, --exclude-schema <schemas>', 'Schemas to exclude, comma-separated. Without --schema, targets all schemas automatically.')
     .option('--config <path>', 'Configuration file path')
     .option('-f, --force', 'Force overwrite without confirmation')
     .action(async (options) => {
@@ -105,6 +105,7 @@ program
             schemas: schemas,
             allSchemas: options.allSchemas || false,
             excludeSchemas,
+            schemasExplicit: !!options.schema,
             version: package_json_1.version
         });
     }

package/dist/sync/definitionExtractor.js

@@ -1039,7 +1039,7 @@ async function generateCreateTableDDL(client, tableName, schemaName = 'public')
 /**
  * Save definitions to files (merge RLS/triggers into table/view; schema folders when multi-schema)
  */
-async function saveDefinitionsByType(definitions, outputDir, separateDirectories = true, schemas = ['public'], relations = [], rpcTables = [], allSchemas = [], version, tableRlsStatus = []) {
+async function saveDefinitionsByType(definitions, outputDir, separateDirectories = true, schemas = ['public'], relations = [], rpcTables = [], allSchemas = [], version, tableRlsStatus = [], force = false) {
     const fs = await Promise.resolve().then(() => __importStar(require('fs')));
     const path = await Promise.resolve().then(() => __importStar(require('path')));
     const outputDate = new Date().toLocaleDateString('en-CA', { year: 'numeric', month: '2-digit', day: '2-digit' });
@@ -1128,6 +1128,7 @@ async function saveDefinitionsByType(definitions, outputDir, separateDirectories
         fs.mkdirSync(outputDir, { recursive: true });
     }
     const fsPromises = await Promise.resolve().then(() => __importStar(require('fs/promises')));
+    const writtenPaths = new Set();
     for (const def of toWrite) {
         const typeDir = typeDirNames[def.type];
         const baseTypeDir = separateDirectories ? typeDir : '.';
@@ -1140,7 +1141,32 @@ async function saveDefinitionsByType(definitions, outputDir, separateDirectories
         const fileName = `${def.name}.sql`;
         const filePath = path.join(targetDir, fileName);
         const ddlWithNewline = def.ddl.endsWith('\n') ? def.ddl : def.ddl + '\n';
-        await fsPromises.writeFile(filePath, headerComment + ddlWithNewline);
+        const newContent = headerComment + ddlWithNewline;
+        writtenPaths.add(filePath);
+        // Skip write if content unchanged (ignore header line which contains the date)
+        if (fs.existsSync(filePath)) {
+            const existingContent = await fsPromises.readFile(filePath, 'utf8');
+            const stripHeader = (c) => c.split('\n').slice(1).join('\n');
+            if (stripHeader(existingContent) === stripHeader(newContent)) {
+                continue;
+            }
+        }
+        await fsPromises.writeFile(filePath, newContent);
+    }
+    // When force: delete SQL files that no longer correspond to any extracted object
+    if (force && fs.existsSync(outputDir)) {
+        const deleteStaleSqlFiles = (dir) => {
+            for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+                const fullPath = path.join(dir, entry.name);
+                if (entry.isDirectory()) {
+                    deleteStaleSqlFiles(fullPath);
+                }
+                else if (entry.name.endsWith('.sql') && !writtenPaths.has(fullPath)) {
+                    fs.unlinkSync(fullPath);
+                }
+            }
+        };
+        deleteStaleSqlFiles(outputDir);
     }
     await generateIndexFile(toWrite, outputDir, separateDirectories, multiSchema, relations, rpcTables, allSchemas, schemas, version, tableRlsStatus);
 }
@@ -1344,7 +1370,7 @@ async function generateIndexFile(definitions, outputDir, separateDirectories = t
  * Classify and output definitions
  */
 async function extractDefinitions(options) {
-    const { connectionString, outputDir, separateDirectories = true, tablesOnly = false, viewsOnly = false, all = false, tablePattern = '*', force = false, schemas: schemasOption = ['public'], excludeSchemas = [], allSchemas: useAllSchemas = false, version } = options;
+    const { connectionString, outputDir, separateDirectories = true, tablesOnly = false, viewsOnly = false, all = false, tablePattern = '*', force = false, schemas: schemasOption = ['public'], excludeSchemas = [], allSchemas: useAllSchemas = false, schemasExplicit = false, version } = options;
     // schemas will be resolved after DB connect when useAllSchemas is true
     let schemas = schemasOption;
     // Disable Node.js SSL certificate verification
@@ -1465,8 +1491,9 @@ async function extractDefinitions(options) {
         console.log(`   Connection string length: ${encodedConnectionString.length}`);
         await client.connect();
         spinner.text = 'Connected to database';
-        // Resolve schemas: when --all-schemas, fetch all from DB and subtract excludeSchemas
-        if (useAllSchemas) {
+        // Resolve schemas: --all-schemas or -e alone (without explicit --schema) → fetch all from DB and subtract excludeSchemas
+        const useAllSchemasEffective = useAllSchemas || (excludeSchemas.length > 0 && !schemasExplicit);
+        if (useAllSchemasEffective) {
             const SYSTEM_SCHEMAS = ['information_schema', 'pg_catalog', 'pg_toast', 'pg_temp_1', 'pg_toast_temp_1'];
             const discovered = await fetchAllSchemas(client);
             schemas = discovered.filter(s => !SYSTEM_SCHEMAS.includes(s) && !excludeSchemas.includes(s));
@@ -1624,13 +1651,9 @@ async function extractDefinitions(options) {
                 console.warn('RLS status fetch skipped:', err);
             }
         }
-        // When force: remove output dir then write (so removed tables don't leave files)
-        if (force && fs.existsSync(outputDir)) {
-            fs.rmSync(outputDir, { recursive: true });
-        }
         // Save definitions (table+RLS+triggers merged, schema folders)
         spinner.text = 'Saving definitions to files...';
-        await saveDefinitionsByType(allDefinitions, outputDir, separateDirectories, schemas, relations, rpcTables, allSchemas, version, tableRlsStatus);
+        await saveDefinitionsByType(allDefinitions, outputDir, separateDirectories, schemas, relations, rpcTables, allSchemas, version, tableRlsStatus, force);
         // Warn at extract time when any table has RLS disabled
         const rlsNotEnabled = tableRlsStatus.filter(s => !s.rlsEnabled);
         if (rlsNotEnabled.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supatool",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "CLI for PostgreSQL (Cloud SQL / Supabase): extract schema to files, deploy schema diffs, apply migrations, seed export.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,6 +27,14 @@
     "database",
     "migration"
   ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/idea-garage/supatool"
+  },
+  "homepage": "https://github.com/idea-garage/supatool#readme",
+  "bugs": {
+    "url": "https://github.com/idea-garage/supatool/issues"
+  },
   "author": "IdeaGarage",
   "license": "MIT",
   "dependencies": {