drizzle-kit 0.26.2-9f627ed → 0.26.2-a1e0ae9

package/api.js

@@ -22204,7 +22204,7 @@ function isConfig(data) {
   }
   if ("client" in data) {
     const type = typeof data["client"];
-    if (type !== "object" && type !== "undefined")
+    if (type !== "object" && type !== "function" && type !== "undefined")
       return false;
     return true;
   }

package/api.mjs

@@ -22209,7 +22209,7 @@ function isConfig(data) {
   }
   if ("client" in data) {
     const type = typeof data["client"];
-    if (type !== "object" && type !== "undefined")
+    if (type !== "object" && type !== "function" && type !== "undefined")
       return false;
     return true;
   }

package/bin.cjs

@@ -11498,10 +11498,10 @@ var init_outputs = __esm({
         )
       },
       common: {
-        ambiguousParams: (command2) => withStyle.error(
-          `You can't use both --config and other cli options for ${command2} command`
+        ambiguousParams: (command) => withStyle.error(
+          `You can't use both --config and other cli options for ${command} command`
         ),
-        schema: (command2) => withStyle.error(`"--schema" is a required field for ${command2} command`)
+        schema: (command) => withStyle.error(`"--schema" is a required field for ${command} command`)
       },
       postgres: {
         connection: {
@@ -11552,7 +11552,7 @@ var init_common = __esm({
     init_lib();
     init_schemaValidator();
     init_outputs();
-    assertCollisions = (command2, options, whitelist, remainingKeys) => {
+    assertCollisions = (command, options, whitelist, remainingKeys) => {
       const { config, ...rest } = options;
       let atLeastOneParam = false;
       for (const key of Object.keys(rest)) {
@@ -11566,7 +11566,7 @@ var init_common = __esm({
       if (!atLeastOneParam) {
         return "config";
       }
-      console.log(outputs.common.ambiguousParams(command2));
+      console.log(outputs.common.ambiguousParams(command));
       process.exit(1);
     };
     sqliteDriversLiterals = [
@@ -11751,7 +11751,7 @@ var init_libsql = __esm({
       url: stringType().min(1),
       authToken: stringType().min(1).optional()
     });
-    printConfigConnectionIssues = (options, command2) => {
+    printConfigConnectionIssues = (options, command) => {
       let text = `Please provide required params for 'turso' dialect:
 `;
       console.log(error(text));
@@ -11932,25 +11932,25 @@ var init_sqlite = __esm({
         return o;
       })
     ]);
-    printConfigConnectionIssues4 = (options, command2) => {
+    printConfigConnectionIssues4 = (options, command) => {
       const parsedDriver = sqliteDriver.safeParse(options.driver);
       const driver2 = parsedDriver.success ? parsedDriver.data : "";
       if (driver2 === "expo") {
-        if (command2 === "migrate") {
+        if (command === "migrate") {
           console.log(
             error(
               `You can't use 'migrate' command with Expo SQLite, please follow migration instructions in our docs - https://orm.drizzle.team/docs/get-started-sqlite#expo-sqlite`
             )
           );
-        } else if (command2 === "studio") {
+        } else if (command === "studio") {
           console.log(
             error(
               `You can't use 'studio' command with Expo SQLite, please use Expo Plugin https://www.npmjs.com/package/expo-drizzle-studio-plugin`
             )
           );
-        } else if (command2 === "pull") {
+        } else if (command === "pull") {
           console.log(error("You can't use 'pull' command with Expo SQLite"));
-        } else if (command2 === "push") {
+        } else if (command === "push") {
           console.log(error("You can't use 'push' command with Expo SQLite"));
         } else {
           console.log(error("Unexpected error with expo driver \u{1F914}"));
@@ -52409,12 +52409,12 @@ var require_dist_cjs32 = __commonJS({
         this.middlewareStack = (0, import_middleware_stack.constructStack)();
         this.config = config;
       }
-      send(command2, optionsOrCb, cb) {
+      send(command, optionsOrCb, cb) {
         const options = typeof optionsOrCb !== "function" ? optionsOrCb : void 0;
         const callback = typeof optionsOrCb === "function" ? optionsOrCb : cb;
-        const handler = command2.resolveMiddleware(this.middlewareStack, this.config, options);
+        const handler = command.resolveMiddleware(this.middlewareStack, this.config, options);
         if (callback) {
-          handler(command2).then(
+          handler(command).then(
             (result) => callback(null, result.output),
             (err2) => callback(err2)
           ).catch(
@@ -52424,7 +52424,7 @@ var require_dist_cjs32 = __commonJS({
             }
           );
         } else {
-          return handler(command2).then((result) => result.output);
+          return handler(command).then((result) => result.output);
         }
       }
       destroy() {
@@ -52624,8 +52624,8 @@ var require_dist_cjs32 = __commonJS({
     var ClassBuilder = _ClassBuilder;
     var SENSITIVE_STRING = "***SensitiveInformation***";
     var createAggregatedClient = /* @__PURE__ */ __name((commands, Client2) => {
-      for (const command2 of Object.keys(commands)) {
-        const CommandCtor = commands[command2];
+      for (const command of Object.keys(commands)) {
+        const CommandCtor = commands[command];
         const methodImpl = /* @__PURE__ */ __name(async function(args, optionsOrCb, cb) {
           const command22 = new CommandCtor(args);
           if (typeof optionsOrCb === "function") {
@@ -52638,7 +52638,7 @@ var require_dist_cjs32 = __commonJS({
             return this.send(command22, optionsOrCb);
           }
         }, "methodImpl");
-        const methodName = (command2[0].toLowerCase() + command2.slice(1)).replace(/Command$/, "");
+        const methodName = (command[0].toLowerCase() + command.slice(1)).replace(/Command$/, "");
         Client2.prototype[methodName] = methodImpl;
       }
     }, "createAggregatedClient");
@@ -85609,7 +85609,7 @@ ${fields.join("\n")}
   }
 });
 
-// ../node_modules/.pnpm/@drizzle-team+brocli@0.10.1/node_modules/@drizzle-team/brocli/index.js
+// ../node_modules/.pnpm/@drizzle-team+brocli@0.10.2/node_modules/@drizzle-team/brocli/index.js
 var __create2 = Object.create;
 var __defProp2 = Object.defineProperty;
 var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -86113,32 +86113,32 @@ var defaultEventHandler = async (event) => {
   var _a;
   switch (event.type) {
     case "command_help": {
-      const command2 = event.command;
-      const commandName = getCommandNameWithParents(command2);
+      const command3 = event.command;
+      const commandName = getCommandNameWithParents(command3);
       const cliName = event.name;
-      const desc = command2.desc ?? command2.shortDesc;
-      const subs = (_a = command2.subcommands) == null ? void 0 : _a.filter((s2) => !s2.hidden);
+      const desc = command3.desc ?? command3.shortDesc;
+      const subs = (_a = command3.subcommands) == null ? void 0 : _a.filter((s2) => !s2.hidden);
       const subcommands = subs && subs.length ? subs : void 0;
       if (desc !== void 0) {
         console.log(`
 ${desc}`);
       }
-      const opts = Object.values(command2.options ?? {}).filter(
+      const opts = Object.values(command3.options ?? {}).filter(
         (opt) => !opt.config.isHidden
       );
       const positionals = opts.filter((opt) => opt.config.type === "positional");
       const options = opts.filter((opt) => opt.config.type !== "positional");
       console.log("\nUsage:");
-      if (command2.handler) {
+      if (command3.handler) {
         console.log(
           `  ${cliName ? cliName + " " : ""}${commandName}${positionals.length ? " " + positionals.map(({ config: p2 }) => getOptionTypeText(p2)).join(" ") : ""} [flags]`
         );
       } else
         console.log(`  ${cliName ? cliName + " " : ""}${commandName} [command]`);
-      if (command2.aliases) {
+      if (command3.aliases) {
         console.log(`
 Aliases:`);
-        console.log(`  ${[command2.name, ...command2.aliases].join(", ")}`);
+        console.log(`  ${[command3.name, ...command3.aliases].join(", ")}`);
       }
       if (subcommands) {
         console.log("\nAvailable Commands:");
@@ -86218,8 +86218,8 @@ Use "${cliName ? cliName + " " : ""}${commandName} [command] --help" for more in
         const maxLength = commands.reduce((p2, e2) => e2.name.length > p2 ? e2.name.length : p2, 0);
         const paddedLength = maxLength + padding;
         const data = commands.map(
-          (\u0441) => `  ${\u0441.name.padEnd(paddedLength)}${(() => {
-            const desc2 = \u0441.shortDesc ?? \u0441.desc;
+          (c) => `  ${c.name.padEnd(paddedLength)}${(() => {
+            const desc2 = c.shortDesc ?? c.desc;
             if (!(desc2 == null ? void 0 : desc2.length))
               return "";
             const split = desc2.split("\n");
@@ -86311,8 +86311,8 @@ Type '${cName} --help' to get the help on command.`;
           return true;
         }
         case "missing_args_error": {
-          const missingOpts = event.missing;
-          msg = `Command '${command.name}' is missing following required options: ${missingOpts.map((opt) => {
+          const { missing: missingOpts, command: command3 } = event;
+          msg = `Command '${command3.name}' is missing following required options: ${missingOpts.map((opt) => {
             const name = opt.shift();
             const aliases = opt;
             if (aliases.length)
@@ -86322,8 +86322,8 @@ Type '${cName} --help' to get the help on command.`;
           break;
         }
         case "unrecognized_args_error": {
-          const { command: command2, unrecognized } = event;
-          msg = `Unrecognized options for command '${command2.name}': ${unrecognized.join(", ")}`;
+          const { command: command3, unrecognized } = event;
+          msg = `Unrecognized options for command '${command3.name}': ${unrecognized.join(", ")}`;
           break;
         }
         case "unknown_error": {
@@ -86420,21 +86420,21 @@ var assignParent = (parent, subcommands) => subcommands.forEach((e2) => {
   if (e2.subcommands)
     assignParent(e2, e2.subcommands);
 });
-var command = (command2) => {
+var command2 = (command3) => {
   var _a, _b, _c;
-  const allNames = command2.aliases ? [command2.name, ...command2.aliases] : [command2.name];
-  const cmd = (0, import_clone.default)(command2);
-  if (command2.subcommands && command2.options && Object.values(command2.options).find((opt) => opt._.config.type === "positional")) {
+  const allNames = command3.aliases ? [command3.name, ...command3.aliases] : [command3.name];
+  const cmd = (0, import_clone.default)(command3);
+  if (command3.subcommands && command3.options && Object.values(command3.options).find((opt) => opt._.config.type === "positional")) {
     throw new BroCliError(
       `Can't define command '${cmd.name}' - command can't have subcommands and positional args at the same time!`
     );
   }
-  if (!command2.handler && !command2.subcommands) {
+  if (!command3.handler && !command3.subcommands) {
     throw new BroCliError(
       `Can't define command '${cmd.name}' - command without subcommands must have a handler present!`
     );
   }
-  const processedOptions = command2.options ? validateOptions(command2.options) : void 0;
+  const processedOptions = command3.options ? validateOptions(command3.options) : void 0;
   cmd.options = processedOptions;
   cmd.name = cmd.name ?? ((_a = cmd.aliases) == null ? void 0 : _a.shift());
   if (!cmd.name)
@@ -86471,33 +86471,33 @@ var command = (command2) => {
 };
 var getCommandInner = (commands, candidates, args, cliName, cliDescription) => {
   const { data: arg, originalIndex: index4 } = candidates.shift();
-  const command2 = commands.find((c) => {
+  const command3 = commands.find((c) => {
     const names = c.aliases ? [c.name, ...c.aliases] : [c.name];
     const res = names.find((name) => name === arg);
     return res;
   });
-  if (!command2) {
+  if (!command3) {
     return {
-      command: command2,
+      command: command3,
       args
     };
   }
   const newArgs = removeByIndex(args, index4);
-  if (!candidates.length || !command2.subcommands) {
+  if (!candidates.length || !command3.subcommands) {
     return {
-      command: command2,
+      command: command3,
       args: newArgs
     };
   }
   const newCandidates = candidates.map((c) => ({ data: c.data, originalIndex: c.originalIndex - 1 }));
-  const subcommand = getCommandInner(command2.subcommands, newCandidates, newArgs, cliName, cliDescription);
+  const subcommand = getCommandInner(command3.subcommands, newCandidates, newArgs, cliName, cliDescription);
   if (!subcommand.command) {
     throw new BroCliError(void 0, {
       type: "error",
       violation: "unknown_subcommand_error",
       name: cliName,
       description: cliDescription,
-      command: command2,
+      command: command3,
       offender: candidates[0].data
     });
   }
@@ -86537,8 +86537,8 @@ var getCommand = (commands, args, cliName, cliDescription) => {
       args: removeByIndex(args, firstCandidate.originalIndex)
     };
   }
-  const { command: command2, args: argsRes } = getCommandInner(commands, candidates, args, cliName, cliDescription);
-  if (!command2) {
+  const { command: command3, args: argsRes } = getCommandInner(commands, candidates, args, cliName, cliDescription);
+  if (!command3) {
     throw new BroCliError(void 0, {
       type: "error",
       violation: "unknown_command_error",
@@ -86549,11 +86549,11 @@ var getCommand = (commands, args, cliName, cliDescription) => {
     });
   }
   return {
-    command: command2,
+    command: command3,
     args: argsRes
   };
 };
-var parseArg = (command2, options, positionals, arg, nextArg, cliName, cliDescription) => {
+var parseArg = (command3, options, positionals, arg, nextArg, cliName, cliDescription) => {
   let data = void 0;
   const argSplit = arg.split("=");
   const hasEq = arg.includes("=");
@@ -86580,7 +86580,7 @@ var parseArg = (command2, options, positionals, arg, nextArg, cliName, cliDescri
         name: cliName,
         description: cliDescription,
         violation: "enum_violation",
-        command: command2,
+        command: command3,
         option: pos[1],
         offender: {
           dataPart: arg
@@ -86626,7 +86626,7 @@ var parseArg = (command2, options, positionals, arg, nextArg, cliName, cliDescri
         description: cliDescription,
         violation: "invalid_boolean_syntax",
         option: opt,
-        command: command2,
+        command: command3,
         offender: {
           namePart,
           dataPart
@@ -86644,7 +86644,7 @@ var parseArg = (command2, options, positionals, arg, nextArg, cliName, cliDescri
             description: cliDescription,
             violation: "invalid_string_syntax",
             option: opt,
-            command: command2,
+            command: command3,
             offender: {
               namePart,
               dataPart
@@ -86658,7 +86658,7 @@ var parseArg = (command2, options, positionals, arg, nextArg, cliName, cliDescri
             description: cliDescription,
             violation: "enum_violation",
             option: opt,
-            command: command2,
+            command: command3,
             offender: {
               namePart,
               dataPart
@@ -86675,7 +86675,7 @@ var parseArg = (command2, options, positionals, arg, nextArg, cliName, cliDescri
           description: cliDescription,
           violation: "invalid_number_syntax",
           option: opt,
-          command: command2,
+          command: command3,
           offender: {
             namePart,
             dataPart
@@ -86690,7 +86690,7 @@ var parseArg = (command2, options, positionals, arg, nextArg, cliName, cliDescri
           description: cliDescription,
           violation: "invalid_number_value",
           option: opt,
-          command: command2,
+          command: command3,
           offender: {
             namePart,
             dataPart
@@ -86704,7 +86704,7 @@ var parseArg = (command2, options, positionals, arg, nextArg, cliName, cliDescri
           description: cliDescription,
           violation: "expected_int",
           option: opt,
-          command: command2,
+          command: command3,
           offender: {
             namePart,
             dataPart
@@ -86718,7 +86718,7 @@ var parseArg = (command2, options, positionals, arg, nextArg, cliName, cliDescri
           description: cliDescription,
           violation: "below_min",
           option: opt,
-          command: command2,
+          command: command3,
           offender: {
             namePart,
             dataPart
@@ -86732,7 +86732,7 @@ var parseArg = (command2, options, positionals, arg, nextArg, cliName, cliDescri
           description: cliDescription,
           violation: "above_max",
           option: opt,
-          command: command2,
+          command: command3,
           offender: {
             namePart,
             dataPart
@@ -86750,8 +86750,8 @@ var parseArg = (command2, options, positionals, arg, nextArg, cliName, cliDescri
     option: option == null ? void 0 : option[1]
   };
 };
-var parseOptions = (command2, args, cliName, cliDescription, omitKeysOfUndefinedOptions) => {
-  const options = command2.options;
+var parseOptions = (command3, args, cliName, cliDescription, omitKeysOfUndefinedOptions) => {
+  const options = command3.options;
   const optEntries = Object.entries(options ?? {}).map(
     (opt) => [opt[0], opt[1].config]
   );
@@ -86770,7 +86770,7 @@ var parseOptions = (command2, args, cliName, cliDescription, omitKeysOfUndefined
       skipNext,
       isHelp,
       isVersion
-    } = parseArg(command2, nonPositionalEntries, positionalEntries, arg, nextArg, cliName, cliDescription);
+    } = parseArg(command3, nonPositionalEntries, positionalEntries, arg, nextArg, cliName, cliDescription);
     if (!option)
       unrecognizedArgsArr.push(arg.split("=")[0]);
     if (skipNext)
@@ -86798,7 +86798,7 @@ var parseOptions = (command2, args, cliName, cliDescription, omitKeysOfUndefined
       violation: "missing_args_error",
       name: cliName,
       description: cliDescription,
-      command: command2,
+      command: command3,
       missing: missingRequiredArr
     });
   }
@@ -86808,13 +86808,13 @@ var parseOptions = (command2, args, cliName, cliDescription, omitKeysOfUndefined
       violation: "unrecognized_args_error",
       name: cliName,
       description: cliDescription,
-      command: command2,
+      command: command3,
       unrecognized: unrecognizedArgsArr
     });
   }
   return Object.keys(result).length ? result : void 0;
 };
-var getCommandNameWithParents = (command2) => command2.parent ? `${getCommandNameWithParents(command2.parent)} ${command2.name}` : command2.name;
+var getCommandNameWithParents = (command3) => command3.parent ? `${getCommandNameWithParents(command3.parent)} ${command3.name}` : command3.name;
 var validateCommands = (commands, parent) => {
   const storedNames = {};
   for (const cmd of commands) {
@@ -86868,13 +86868,13 @@ var run = async (commands, config) => {
     }
     const helpIndex = args.findIndex((arg) => arg === "--help" || arg === "-h");
     if (helpIndex !== -1 && (helpIndex > 0 ? ((_a = args[helpIndex - 1]) == null ? void 0 : _a.startsWith("-")) && !args[helpIndex - 1].includes("=") ? false : true : true)) {
-      const command3 = getCommand(processedCmds, args, cliName, cliDescription).command;
-      if (typeof command3 === "object") {
-        return command3.help !== void 0 ? await executeOrLog(command3.help) : await eventHandler({
+      const command4 = getCommand(processedCmds, args, cliName, cliDescription).command;
+      if (typeof command4 === "object") {
+        return command4.help !== void 0 ? await executeOrLog(command4.help) : await eventHandler({
           type: "command_help",
           description: cliDescription,
           name: cliName,
-          command: command3
+          command: command4
         });
       } else {
         return help !== void 0 ? await executeOrLog(help) : await eventHandler({
@@ -86893,8 +86893,8 @@ var run = async (commands, config) => {
         description: cliDescription
       });
     }
-    const { command: command2, args: newArgs } = getCommand(processedCmds, args, cliName, cliDescription);
-    if (!command2) {
+    const { command: command3, args: newArgs } = getCommand(processedCmds, args, cliName, cliDescription);
+    if (!command3) {
       return help !== void 0 ? await executeOrLog(help) : await eventHandler({
         type: "global_help",
         description: cliDescription,
@@ -86902,7 +86902,7 @@ var run = async (commands, config) => {
         commands: processedCmds
       });
     }
-    if (command2 === "help") {
+    if (command3 === "help") {
       let helpCommand;
       let newestArgs = newArgs;
       do {
@@ -86922,13 +86922,13 @@ var run = async (commands, config) => {
         commands: processedCmds
       });
     }
-    const optionResult = parseOptions(command2, newArgs, cliName, cliDescription, omitKeysOfUndefinedOptions);
+    const optionResult = parseOptions(command3, newArgs, cliName, cliDescription, omitKeysOfUndefinedOptions);
     if (optionResult === "help") {
-      return command2.help !== void 0 ? await executeOrLog(command2.help) : await eventHandler({
+      return command3.help !== void 0 ? await executeOrLog(command3.help) : await eventHandler({
         type: "command_help",
         description: cliDescription,
         name: cliName,
-        command: command2
+        command: command3
       });
     }
     if (optionResult === "version") {
@@ -86938,19 +86938,19 @@ var run = async (commands, config) => {
         description: cliDescription
       });
     }
-    if (command2.handler) {
+    if (command3.handler) {
       if (config == null ? void 0 : config.hook)
-        await config.hook("before", command2);
-      await command2.handler(command2.transform ? await command2.transform(optionResult) : optionResult);
+        await config.hook("before", command3);
+      await command3.handler(command3.transform ? await command3.transform(optionResult) : optionResult);
       if (config == null ? void 0 : config.hook)
-        await config.hook("after", command2);
+        await config.hook("after", command3);
       return;
     } else {
-      return command2.help !== void 0 ? await executeOrLog(command2.help) : await eventHandler({
+      return command3.help !== void 0 ? await executeOrLog(command3.help) : await eventHandler({
         type: "command_help",
         description: cliDescription,
         name: cliName,
-        command: command2
+        command: command3
       });
     }
   } catch (e2) {
@@ -88374,7 +88374,7 @@ var optionBreakpoints = boolean().desc(
 );
 var optionDriver = string().enum(...drivers).desc("Database driver");
 var optionCasing = string().enum("camelCase", "snake_case").desc("Casing for serialization");
-var generate = command({
+var generate = command2({
   name: "generate",
   options: {
     config: optionConfig,
@@ -88420,7 +88420,7 @@ var generate = command({
     }
   }
 });
-var migrate = command({
+var migrate = command2({
   name: "migrate",
   options: {
     config: optionConfig
@@ -88527,7 +88527,7 @@ var optionsDatabaseCredentials = {
   // specific cases
   driver: optionDriver
 };
-var push = command({
+var push = command2({
   name: "push",
   options: {
     config: optionConfig,
@@ -88658,7 +88658,7 @@ var push = command({
     process.exit(0);
   }
 });
-var check = command({
+var check = command2({
   name: "check",
   options: {
     config: optionConfig,
@@ -88676,7 +88676,7 @@ var check = command({
     console.log("Everything's fine \u{1F436}\u{1F525}");
   }
 });
-var up = command({
+var up = command2({
   name: "up",
   options: {
     config: optionConfig,
@@ -88702,7 +88702,7 @@ var up = command({
     }
   }
 });
-var pull = command({
+var pull = command2({
   name: "introspect",
   aliases: ["pull"],
   options: {
@@ -88833,7 +88833,7 @@ var pull = command({
     process.exit(0);
   }
 });
-var drop = command({
+var drop = command2({
   name: "drop",
   options: {
     config: optionConfig,
@@ -88850,7 +88850,7 @@ var drop = command({
     await dropMigration(config);
   }
 });
-var studio = command({
+var studio = command2({
   name: "studio",
   options: {
     config: optionConfig,
@@ -88963,14 +88963,14 @@ init_utils2();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.26.2-9f627ed";
+  const envVersion = "0.26.2-a1e0ae9";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;
   console.log(source_default.gray(versions), "\n");
 };
 var legacyCommand = (name, newName) => {
-  return command({
+  return command2({
     name,
     hidden: true,
     handler: () => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.26.2-9f627ed",
+	"version": "0.26.2-a1e0ae9",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",
@@ -42,7 +42,7 @@
 		"publish": "npm publish package.tgz"
 	},
 	"dependencies": {
-		"@drizzle-team/brocli": "^0.10.1",
+		"@drizzle-team/brocli": "^0.10.2",
 		"@esbuild-kit/esm-loader": "^2.5.5",
 		"esbuild": "^0.19.7",
 		"esbuild-register": "^3.5.0"