bun-query-builder 0.1.61 → 0.1.63

package/dist/bin/cli.js

@@ -11662,26 +11662,23 @@ function getPlaceholders(count, startIndex = 1) {
   return count === 1 ? "?" : `?${", ?".repeat(count - 1)}`;
 }
 async function getConfig() {
-  if (!_config) {
-    _config = await loadConfig6({
+  if (!configState.fileLoaded) {
+    configState.fileLoaded = true;
+    const loaded = await loadConfig6({
       name: "query-builder",
       alias: "qb",
       defaultConfig: defaultConfig4
     });
-    setConfig(_config);
+    const applicable = {};
+    for (const [key, value] of Object.entries(loaded ?? {})) {
+      if (!configState.explicit.has(key))
+        applicable[key] = value;
+    }
+    applyConfig(applicable);
   }
   return config5;
 }
-function setConfig(userConfig) {
-  if (userConfig.dialect && _lastConfiguredDialect && userConfig.dialect !== _lastConfiguredDialect) {
-    const key = `${_lastConfiguredDialect}->${userConfig.dialect}`;
-    if (!_warnedDialectConflicts.has(key)) {
-      _warnedDialectConflicts.add(key);
-      console.warn(`[query-builder] setConfig({ dialect: '${userConfig.dialect}' }) overrides a previous ` + `setConfig({ dialect: '${_lastConfiguredDialect}' }). ` + `Config is process-wide; in-flight queries from the previous configuration may break. ` + `Run conflicting connections in separate processes \u2014 see stacksjs/stacks#1862 #18.`);
-    }
-  }
-  if (userConfig.dialect)
-    _lastConfiguredDialect = userConfig.dialect;
+function applyConfig(userConfig) {
   Object.assign(config5, userConfig);
   if (userConfig.database) {
     config5.database = { ...config5.database, ...userConfig.database };
@@ -11695,11 +11692,22 @@ function setConfig(userConfig) {
   if (userConfig.softDeletes) {
     config5.softDeletes = { ...config5.softDeletes, ...userConfig.softDeletes };
   }
-  if (_config) {
-    Object.assign(_config, config5);
+}
+function setConfig(userConfig) {
+  if (userConfig.dialect && _lastConfiguredDialect && userConfig.dialect !== _lastConfiguredDialect) {
+    const key = `${_lastConfiguredDialect}->${userConfig.dialect}`;
+    if (!_warnedDialectConflicts.has(key)) {
+      _warnedDialectConflicts.add(key);
+      console.warn(`[query-builder] setConfig({ dialect: '${userConfig.dialect}' }) overrides a previous ` + `setConfig({ dialect: '${_lastConfiguredDialect}' }). ` + `Config is process-wide; in-flight queries from the previous configuration may break. ` + `Run conflicting connections in separate processes \u2014 see stacksjs/stacks#1862 #18.`);
+    }
   }
+  if (userConfig.dialect)
+    _lastConfiguredDialect = userConfig.dialect;
+  for (const key of Object.keys(userConfig))
+    configState.explicit.add(key);
+  applyConfig(userConfig);
 }
-var defaultConfig4, CONFIG_SINGLETON_KEY, config5, _config = null, _lastConfiguredDialect = null, _warnedDialectConflicts;
+var defaultConfig4, CONFIG_SINGLETON_KEY, config5, CONFIG_STATE_KEY, configState, _lastConfiguredDialect = null, _warnedDialectConflicts;
 var init_config = __esm(() => {
   init_dist();
   defaultConfig4 = {
@@ -11762,6 +11770,8 @@ var init_config = __esm(() => {
   };
   CONFIG_SINGLETON_KEY = Symbol.for("bun-query-builder.config");
   config5 = globalThis[CONFIG_SINGLETON_KEY] ??= { ...defaultConfig4 };
+  CONFIG_STATE_KEY = Symbol.for("bun-query-builder.config-state");
+  configState = globalThis[CONFIG_STATE_KEY] ??= { explicit: new Set, fileLoaded: false };
   _warnedDialectConflicts = new Set;
 });
 
@@ -18668,6 +18678,7 @@ function ensureSqlDirectory(workspaceRoot) {
   return sqlDir;
 }
 async function generateMigration(dir, opts = {}) {
+  await getConfig();
   if (!dir) {
     dir = join9(process25.cwd(), "app/Models");
   }
@@ -18739,6 +18750,7 @@ async function generateMigration(dir, opts = {}) {
   return { sql, sqlStatements, hasChanges, plan, operations };
 }
 async function executeMigration(dir) {
+  await getConfig();
   if (!dir) {
     dir = join9(process25.cwd(), "app/Models");
   }
@@ -18804,6 +18816,7 @@ async function executeMigration(dir) {
   return true;
 }
 async function resetDatabase(dir, opts = {}) {
+  await getConfig();
   if (!dir) {
     dir = join9(process25.cwd(), "app/Models");
   }
@@ -27375,7 +27388,7 @@ function resolveKeyPattern(keyPatterns, data) {
   }
   return resolved;
 }
-async function parseStacksModels(_config2) {
+async function parseStacksModels(_config) {
   return { models: new Map };
 }
 function toDynamoDBItem(item) {
@@ -31150,7 +31163,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.1.61";
+var version2 = "0.1.63";
 
 // bin/cli.ts
 init_actions();

package/dist/config.d.ts

@@ -35,9 +35,23 @@ export declare function getPlaceholders(count: number, startIndex?: number): str
  * It is intentionally explicit/async: the builder otherwise runs purely off the
  * synchronous `config` singleton (defaults + any `setConfig`), which keeps
  * `bun --compile` and test behavior deterministic — auto-loading a file in the
- * background would make early queries race the load. Previously this wrote the
- * loaded config to a private `_config` variable that nothing else read, so a
- * config file silently never took effect; it now routes through `setConfig`.
+ * background would make early queries race the load.
+ *
+ * Precedence is `defaults < config file < setConfig()`. bunfig returns a fully
+ * populated object (defaults merged with the file and env), which is fine for
+ * every key the caller has not spoken for — re-applying a default on top of the
+ * singleton that already holds that default is a no-op. It is NOT fine for keys
+ * an embedder set through `setConfig()`: those came back as library defaults and
+ * silently overwrote the embedder's choice. `setConfig({ snapshotDir })`
+ * followed by a `generateMigration()` (which calls this) reverted the snapshot
+ * to `.qb` and wrote generated state into the project root.
+ *
+ * So the loaded object is applied with those keys filtered out — an explicit API
+ * call is a stronger signal than a file that may not know the embedder exists.
+ *
+ * Note the load MUST pass `defaultConfig`: bunfig derives the environment
+ * variable names it recognises (`QUERY_BUILDER_*`) from the shape of the
+ * defaults, so passing an empty object silently drops env-var support.
  */
 export declare function getConfig(): Promise<QueryBuilderConfig>;
 export declare function setConfig(userConfig: Partial<QueryBuilderConfig>): void;

package/dist/db.d.ts

@@ -38,6 +38,12 @@ export declare function getOrCreateBunSql(forceNew?: boolean): SQL;
 export declare function resetConnection(): void;
 /**
  * Inject a custom SQL instance. Useful for tests or custom connection setups.
+ *
+ * The signature is stamped alongside it so `getOrCreateBunSql()` treats the
+ * injected instance as current: leaving it null would read as "config changed"
+ * on the very next call and the injection would be discarded before it was ever
+ * used. It also means a later `setConfig()` that changes the connection still
+ * invalidates the injected instance, which is the point of the signature.
  */
 export declare function setSqlInstance(sql: SQL): void;
 // Wrapper that catches "Connection closed" errors and retries with a fresh connection

package/dist/src/index.js

@@ -11661,26 +11661,23 @@ function getPlaceholders(count, startIndex = 1) {
   return count === 1 ? "?" : `?${", ?".repeat(count - 1)}`;
 }
 async function getConfig() {
-  if (!_config) {
-    _config = await loadConfig6({
+  if (!configState.fileLoaded) {
+    configState.fileLoaded = true;
+    const loaded = await loadConfig6({
       name: "query-builder",
       alias: "qb",
       defaultConfig: defaultConfig4
     });
-    setConfig(_config);
+    const applicable = {};
+    for (const [key, value] of Object.entries(loaded ?? {})) {
+      if (!configState.explicit.has(key))
+        applicable[key] = value;
+    }
+    applyConfig(applicable);
   }
   return config5;
 }
-function setConfig(userConfig) {
-  if (userConfig.dialect && _lastConfiguredDialect && userConfig.dialect !== _lastConfiguredDialect) {
-    const key = `${_lastConfiguredDialect}->${userConfig.dialect}`;
-    if (!_warnedDialectConflicts.has(key)) {
-      _warnedDialectConflicts.add(key);
-      console.warn(`[query-builder] setConfig({ dialect: '${userConfig.dialect}' }) overrides a previous ` + `setConfig({ dialect: '${_lastConfiguredDialect}' }). ` + `Config is process-wide; in-flight queries from the previous configuration may break. ` + `Run conflicting connections in separate processes \u2014 see stacksjs/stacks#1862 #18.`);
-    }
-  }
-  if (userConfig.dialect)
-    _lastConfiguredDialect = userConfig.dialect;
+function applyConfig(userConfig) {
   Object.assign(config5, userConfig);
   if (userConfig.database) {
     config5.database = { ...config5.database, ...userConfig.database };
@@ -11694,11 +11691,22 @@ function setConfig(userConfig) {
   if (userConfig.softDeletes) {
     config5.softDeletes = { ...config5.softDeletes, ...userConfig.softDeletes };
   }
-  if (_config) {
-    Object.assign(_config, config5);
+}
+function setConfig(userConfig) {
+  if (userConfig.dialect && _lastConfiguredDialect && userConfig.dialect !== _lastConfiguredDialect) {
+    const key = `${_lastConfiguredDialect}->${userConfig.dialect}`;
+    if (!_warnedDialectConflicts.has(key)) {
+      _warnedDialectConflicts.add(key);
+      console.warn(`[query-builder] setConfig({ dialect: '${userConfig.dialect}' }) overrides a previous ` + `setConfig({ dialect: '${_lastConfiguredDialect}' }). ` + `Config is process-wide; in-flight queries from the previous configuration may break. ` + `Run conflicting connections in separate processes \u2014 see stacksjs/stacks#1862 #18.`);
+    }
   }
+  if (userConfig.dialect)
+    _lastConfiguredDialect = userConfig.dialect;
+  for (const key of Object.keys(userConfig))
+    configState.explicit.add(key);
+  applyConfig(userConfig);
 }
-var defaultConfig4, CONFIG_SINGLETON_KEY, config5, _config = null, _lastConfiguredDialect = null, _warnedDialectConflicts;
+var defaultConfig4, CONFIG_SINGLETON_KEY, config5, CONFIG_STATE_KEY, configState, _lastConfiguredDialect = null, _warnedDialectConflicts;
 var init_config = __esm(() => {
   init_dist();
   defaultConfig4 = {
@@ -11761,6 +11769,8 @@ var init_config = __esm(() => {
   };
   CONFIG_SINGLETON_KEY = Symbol.for("bun-query-builder.config");
   config5 = globalThis[CONFIG_SINGLETON_KEY] ??= { ...defaultConfig4 };
+  CONFIG_STATE_KEY = Symbol.for("bun-query-builder.config-state");
+  configState = globalThis[CONFIG_STATE_KEY] ??= { explicit: new Set, fileLoaded: false };
   _warnedDialectConflicts = new Set;
 });
 
@@ -18667,6 +18677,7 @@ function ensureSqlDirectory(workspaceRoot) {
   return sqlDir;
 }
 async function generateMigration(dir, opts = {}) {
+  await getConfig();
   if (!dir) {
     dir = join9(process25.cwd(), "app/Models");
   }
@@ -18738,6 +18749,7 @@ async function generateMigration(dir, opts = {}) {
   return { sql, sqlStatements, hasChanges, plan, operations };
 }
 async function executeMigration(dir) {
+  await getConfig();
   if (!dir) {
     dir = join9(process25.cwd(), "app/Models");
   }
@@ -18803,6 +18815,7 @@ async function executeMigration(dir) {
   return true;
 }
 async function resetDatabase(dir, opts = {}) {
+  await getConfig();
   if (!dir) {
     dir = join9(process25.cwd(), "app/Models");
   }
@@ -27374,7 +27387,7 @@ function resolveKeyPattern(keyPatterns, data) {
   }
   return resolved;
 }
-async function parseStacksModels(_config2) {
+async function parseStacksModels(_config) {
   return { models: new Map };
 }
 function toDynamoDBItem(item) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-query-builder",
   "type": "module",
-  "version": "0.1.61",
+  "version": "0.1.63",
   "description": "A simple yet performant query builder for TypeScript. Built with Bun.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",