@stacksjs/database 0.70.205 → 0.70.206

package/dist/migrations.js

@@ -493,9 +493,11 @@ export async function previewPendingMigrations(options = {}) {
     return [];
   }
 }
+function snapshotDirLabel() {
+  return qbConfig?.snapshotDir || QB_SNAPSHOT_DIR;
+}
 function resolveSnapshotDir() {
-  const configured = qbConfig?.snapshotDir;
-  return join(process.cwd(), configured || QB_SNAPSHOT_DIR);
+  return join(process.cwd(), snapshotDirLabel());
 }
 function detectSnapshotDialectMismatch(dialect) {
   const qbDir = resolveSnapshotDir();
@@ -520,8 +522,10 @@ export async function generateMigrations(options = {}) {
     log.debug("Generating migrations...");
     configureQueryBuilder();
     const dialect = getDialect(), mismatch = detectSnapshotDialectMismatch(dialect);
-    if (mismatch)
-      return err(Error(`Refusing to generate migrations: resolved dialect "${dialect}" has no snapshot in .qb/, but "${mismatch}" does. DB_CONNECTION is likely unset or wrong (missing .env?) \u2014 ` + `generating now would write a full duplicate migration set in the wrong dialect. Set DB_CONNECTION=${mismatch} (or your intended dialect) and retry. To intentionally start a new dialect from scratch, remove .qb/model-snapshot.${mismatch}.json first.`));
+    if (mismatch) {
+      const snapshotDir = snapshotDirLabel();
+      return err(Error(`Refusing to generate migrations: resolved dialect "${dialect}" has no snapshot in ${snapshotDir}/, but "${mismatch}" does. DB_CONNECTION is likely unset or wrong ` + "(missing .env?) \u2014 generating now would write a full duplicate migration set in the " + `wrong dialect. Set DB_CONNECTION=${mismatch} (or your intended dialect) and retry. To intentionally start a new dialect from scratch, remove ${snapshotDir}/model-snapshot.${mismatch}.json first.`));
+    }
     const { modelsDir, skip } = prepareMigrationModelsDir();
     if (skip) {
       log.debug("No app/Models directory found; using committed framework migrations");
@@ -563,13 +567,14 @@ export function findDanglingTypeReferences(statements) {
 }
 export async function regenerateMigrationCorpus(options = {}) {
   try {
+    configureQueryBuilder();
     const dialect = options.dialect ?? getQbDialect(), dir = options.dir ?? join(process.cwd(), "database", "migrations"), sources = resolveModelSources();
     if (!sources)
       return err(Error("No models found. Define models in app/Models, or ensure the framework defaults at storage/framework/defaults/app/Models are present."));
     try {
       writeFileSync(join(sources.dir, `.qb-migrations.${dialect}.json`), JSON.stringify({ plan: { dialect, tables: [] } }));
     } catch {}
-    const snapshotPath = join(process.cwd(), ".qb", `model-snapshot.${dialect}.json`), parkedSnapshot = `${snapshotPath}.regenerating`;
+    const snapshotPath = join(resolveSnapshotDir(), `model-snapshot.${dialect}.json`), parkedSnapshot = `${snapshotPath}.regenerating`;
     let snapshotParked = !1;
     if (existsSync(snapshotPath))
       try {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/database",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.205",
+  "version": "0.70.206",
   "description": "The Stacks database integration.",
   "author": "Chris Breuer",
   "contributors": [
@@ -56,19 +56,19 @@
   },
   "dependencies": {
     "@stacksjs/ts-validation": "^0.5.0",
-    "bun-query-builder": "^0.1.59",
+    "bun-query-builder": "^0.1.63",
     "dynamodb-tooling": "^0.3.2"
   },
   "devDependencies": {
-    "@stacksjs/cli": "0.70.205",
-    "@stacksjs/config": "0.70.205",
-    "@stacksjs/logging": "0.70.205",
-    "@stacksjs/router": "0.70.205",
+    "@stacksjs/cli": "0.70.206",
+    "@stacksjs/config": "0.70.206",
+    "@stacksjs/logging": "0.70.206",
+    "@stacksjs/router": "0.70.206",
     "better-dx": "^0.2.17",
-    "@stacksjs/path": "0.70.205",
-    "@stacksjs/query-builder": "0.70.205",
-    "@stacksjs/storage": "0.70.205",
-    "@stacksjs/strings": "0.70.205",
-    "@stacksjs/utils": "0.70.205"
+    "@stacksjs/path": "0.70.206",
+    "@stacksjs/query-builder": "0.70.206",
+    "@stacksjs/storage": "0.70.206",
+    "@stacksjs/strings": "0.70.206",
+    "@stacksjs/utils": "0.70.206"
   }
 }