drizzle-kit 0.24.0-6386ea9 → 0.24.0-8d86512

package/bin.cjs

@@ -5687,11 +5687,30 @@ var init_mysqlSchema = __esm({
   }
 });
 
+// src/extensions/vector.ts
+var vectorOps;
+var init_vector = __esm({
+  "src/extensions/vector.ts"() {
+    "use strict";
+    vectorOps = [
+      "vector_l2_ops",
+      "vector_ip_ops",
+      "vector_cosine_ops",
+      "vector_l1_ops",
+      "bit_hamming_ops",
+      "bit_jaccard_ops",
+      "halfvec_l2_ops",
+      "sparsevec_l2_ops"
+    ];
+  }
+});
+
 // src/serializer/pgSchema.ts
 var indexV2, columnV2, tableV2, enumSchemaV1, enumSchema, pgSchemaV2, references, columnV1, tableV1, pgSchemaV1, indexColumn, index2, indexV4, indexV5, indexV6, fk2, sequenceSchema, sequenceSquashed, columnV7, column2, columnSquashed, tableV32, compositePK2, uniqueConstraint2, tableV42, tableV5, tableV6, tableV7, table2, schemaHash2, kitInternals2, pgSchemaInternalV3, pgSchemaInternalV4, pgSchemaInternalV5, pgSchemaInternalV6, pgSchemaExternal, pgSchemaInternalV7, pgSchemaInternal, tableSquashed2, tableSquashedV42, pgSchemaSquashedV4, pgSchemaSquashedV6, pgSchemaSquashed, pgSchemaV3, pgSchemaV4, pgSchemaV5, pgSchemaV6, pgSchemaV7, pgSchema, backwardCompatiblePgSchema, PgSquasher, squashPgScheme, dryPg;
 var init_pgSchema = __esm({
   "src/serializer/pgSchema.ts"() {
     "use strict";
+    init_vector();
     init_global();
     init_lib();
     indexV2 = objectType({
@@ -5938,7 +5957,8 @@ var init_pgSchema = __esm({
             objectType({
               isArray: booleanType().optional(),
               dimensions: numberType().optional(),
-              rawType: stringType().optional()
+              rawType: stringType().optional(),
+              isDefaultAnExpression: booleanType().optional()
             }).optional()
           )
         }).optional()
@@ -6076,7 +6096,7 @@ var init_pgSchema = __esm({
       squashIdx: (idx) => {
         index2.parse(idx);
         return `${idx.name};${idx.columns.map(
-          (c) => `${c.expression}--${c.isExpression}--${c.asc}--${c.nulls}--${c.opclass}`
+          (c) => `${c.expression}--${c.isExpression}--${c.asc}--${c.nulls}--${c.opclass && vectorOps.includes(c.opclass) ? c.opclass : ""}`
         ).join(",,")};${idx.isUnique};${idx.concurrently};${idx.method};${idx.where};${JSON.stringify(idx.with)}`;
       },
       unsquashIdx: (input) => {
@@ -11372,7 +11392,7 @@ var init_cli = __esm({
       extensionsFilters: literalType("postgis").array().optional(),
       introspectCasing: casing,
       breakpoints: booleanType().optional().default(true),
-      database: objectType({
+      migrations: objectType({
         prefix: prefix.optional().default("index")
       }).optional()
     }).passthrough();
@@ -17510,7 +17530,7 @@ var init_utils4 = __esm({
           credentials: parsed2.data,
           tablesFilter,
           schemasFilter,
-          prefix: ((_a = config.database) == null ? void 0 : _a.prefix) || "index"
+          prefix: ((_a = config.migrations) == null ? void 0 : _a.prefix) || "index"
         };
       }
       if (dialect7 === "mysql") {
@@ -17527,7 +17547,7 @@ var init_utils4 = __esm({
           credentials: parsed2.data,
           tablesFilter,
           schemasFilter,
-          prefix: ((_b = config.database) == null ? void 0 : _b.prefix) || "index"
+          prefix: ((_b = config.migrations) == null ? void 0 : _b.prefix) || "index"
         };
       }
       if (dialect7 === "sqlite") {
@@ -17544,7 +17564,7 @@ var init_utils4 = __esm({
           credentials: parsed2.data,
           tablesFilter,
           schemasFilter,
-          prefix: ((_c = config.database) == null ? void 0 : _c.prefix) || "index"
+          prefix: ((_c = config.migrations) == null ? void 0 : _c.prefix) || "index"
         };
       }
       assertUnreachable(dialect7);
@@ -18372,24 +18392,6 @@ var init_pgImports = __esm({
   }
 });
 
-// src/extensions/vector.ts
-var vectorOps;
-var init_vector = __esm({
-  "src/extensions/vector.ts"() {
-    "use strict";
-    vectorOps = [
-      "vector_l2_ops",
-      "vector_ip_ops",
-      "vector_cosine_ops",
-      "vector_l1_ops",
-      "bit_hamming_ops",
-      "bit_jaccard_ops",
-      "halfvec_l2_ops",
-      "sparsevec_l2_ops"
-    ];
-  }
-});
-
 // src/serializer/pgSerializer.ts
 var pgSerializer_exports = {};
 __export(pgSerializer_exports, {
@@ -18433,7 +18435,7 @@ function buildArrayString(array, sqlType) {
   }).join(",");
   return `{${values}}`;
 }
-var import_drizzle_orm5, import_pg_core2, import_pg_core3, dialect5, indexName2, generatePgSnapshot, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
+var import_drizzle_orm5, import_pg_core2, import_pg_core3, dialect5, indexName2, generatePgSnapshot, trimChar, fromDatabase2, columnToDefault, columnEnumNameToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
     "use strict";
@@ -18908,7 +18910,7 @@ ${withStyle.errorWarning(
                    WHEN 'int2'::regtype THEN 'smallserial'
                 END
            ELSE format_type(a.atttypid, a.atttypmod)
-           END AS data_type, INFORMATION_SCHEMA.COLUMNS.table_name, 
+           END AS data_type, INFORMATION_SCHEMA.COLUMNS.table_name, ns.nspname as type_schema,
            pg_get_serial_sequence('"${tableSchema}"."${tableName}"', a.attname)::regclass as seq_name, INFORMATION_SCHEMA.COLUMNS.column_name, 
            INFORMATION_SCHEMA.COLUMNS.column_default, INFORMATION_SCHEMA.COLUMNS.data_type as additional_dt, 
            INFORMATION_SCHEMA.COLUMNS.udt_name as enum_name,
@@ -18919,6 +18921,7 @@ ${withStyle.errorWarning(
            INFORMATION_SCHEMA.COLUMNS.identity_cycle
    FROM  pg_attribute  a
    JOIN INFORMATION_SCHEMA.COLUMNS ON INFORMATION_SCHEMA.COLUMNS.column_name = a.attname
+   JOIN pg_type t ON t.oid = a.atttypid LEFT JOIN pg_namespace ns ON ns.oid = t.typnamespace
    WHERE  a.attrelid = '"${tableSchema}"."${tableName}"'::regclass and INFORMATION_SCHEMA.COLUMNS.table_name = '${tableName}' and INFORMATION_SCHEMA.COLUMNS.table_schema = '${tableSchema}'
    AND    a.attnum > 0
    AND    NOT a.attisdropped
@@ -18938,30 +18941,42 @@ ${withStyle.errorWarning(
             }
             const tableForeignKeys = await db.query(
               `SELECT
-          tc.table_schema,
-          tc.constraint_name,
-          tc.table_name,
-          kcu.column_name,
-          (
-              SELECT ccu.table_schema
-              FROM information_schema.constraint_column_usage ccu
-              WHERE ccu.constraint_name = tc.constraint_name
-              LIMIT 1
-          ) AS foreign_table_schema,
-          ccu.table_name AS foreign_table_name,
-          ccu.column_name AS foreign_column_name,
-          rc.delete_rule, 
-          rc.update_rule
-      FROM
-          information_schema.table_constraints AS tc
-          JOIN information_schema.key_column_usage AS kcu
-            ON tc.constraint_name = kcu.constraint_name
-            AND tc.table_schema = kcu.table_schema
-          JOIN information_schema.constraint_column_usage AS ccu
-            ON ccu.constraint_name = tc.constraint_name
-          JOIN information_schema.referential_constraints AS rc
-            ON ccu.constraint_name = rc.constraint_name
-    WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name='${tableName}' and tc.table_schema='${tableSchema}';`
+            con.contype AS constraint_type,
+            nsp.nspname AS constraint_schema,
+            con.conname AS constraint_name,
+            rel.relname AS table_name,
+            att.attname AS column_name,
+            fnsp.nspname AS foreign_table_schema,
+            frel.relname AS foreign_table_name,
+            fatt.attname AS foreign_column_name,
+            CASE con.confupdtype
+              WHEN 'a' THEN 'NO ACTION'
+              WHEN 'r' THEN 'RESTRICT'
+              WHEN 'n' THEN 'SET NULL'
+              WHEN 'c' THEN 'CASCADE'
+              WHEN 'd' THEN 'SET DEFAULT'
+            END AS update_rule,
+            CASE con.confdeltype
+              WHEN 'a' THEN 'NO ACTION'
+              WHEN 'r' THEN 'RESTRICT'
+              WHEN 'n' THEN 'SET NULL'
+              WHEN 'c' THEN 'CASCADE'
+              WHEN 'd' THEN 'SET DEFAULT'
+            END AS delete_rule
+          FROM
+            pg_catalog.pg_constraint con
+            JOIN pg_catalog.pg_class rel ON rel.oid = con.conrelid
+            JOIN pg_catalog.pg_namespace nsp ON nsp.oid = con.connamespace
+            LEFT JOIN pg_catalog.pg_attribute att ON att.attnum = ANY (con.conkey)
+              AND att.attrelid = con.conrelid
+            LEFT JOIN pg_catalog.pg_class frel ON frel.oid = con.confrelid
+            LEFT JOIN pg_catalog.pg_namespace fnsp ON fnsp.oid = frel.relnamespace
+            LEFT JOIN pg_catalog.pg_attribute fatt ON fatt.attnum = ANY (con.confkey)
+              AND fatt.attrelid = con.confrelid
+          WHERE
+            nsp.nspname = '${tableSchema}'
+            AND rel.relname = '${tableName}'
+            AND con.contype IN ('f');`
             );
             foreignKeysCount += tableForeignKeys.length;
             if (progressCallback) {
@@ -19019,6 +19034,7 @@ ${withStyle.errorWarning(
               const columnDimensions = columnResponse.array_dimensions;
               const enumType2 = columnResponse.enum_name;
               let columnType = columnResponse.data_type;
+              const typeSchema = columnResponse.type_schema;
               const isGenerated = columnResponse.is_generated === "ALWAYS";
               const generationExpression = columnResponse.generation_expression;
               const isIdentity = columnResponse.is_identity === "YES";
@@ -19050,6 +19066,25 @@ ${withStyle.errorWarning(
                 };
               }
               const defaultValue = defaultForColumn(columnResponse);
+              if (defaultValue === "NULL") {
+                if (typeof internals.tables[tableName] === "undefined") {
+                  internals.tables[tableName] = {
+                    columns: {
+                      [columnName]: {
+                        isDefaultAnExpression: true
+                      }
+                    }
+                  };
+                } else {
+                  if (typeof internals.tables[tableName].columns[columnName] === "undefined") {
+                    internals.tables[tableName].columns[columnName] = {
+                      isDefaultAnExpression: true
+                    };
+                  } else {
+                    internals.tables[tableName].columns[columnName].isDefaultAnExpression = true;
+                  }
+                }
+              }
               const isSerial = columnType === "serial";
               let columnTypeMapped = columnType;
               if (columnTypeMapped.startsWith("numeric(")) {
@@ -19095,7 +19130,7 @@ ${withStyle.errorWarning(
                   // filter vectors, but in future we should filter any extension that was installed by user
                   columnAdditionalDT === "USER-DEFINED" && !["vector", "geometry"].includes(enumType2) ? enumType2 : columnTypeMapped
                 ),
-                typeSchema: enumsToReturn[`${tableSchema}.${enumType2}`] !== void 0 ? enumsToReturn[`${tableSchema}.${enumType2}`].schema : void 0,
+                typeSchema: enumsToReturn[`${typeSchema}.${enumType2}`] !== void 0 ? enumsToReturn[`${typeSchema}.${enumType2}`].schema : void 0,
                 primaryKey: primaryKey.length === 1 && cprimaryKey.length < 2,
                 // default: isSerial ? undefined : defaultValue,
                 notNull: columnResponse.is_nullable === "NO",
@@ -19270,11 +19305,11 @@ ${withStyle.errorWarning(
     columnToDefault = {
       "numeric(": "::numeric",
       // text: "::text",
-      // "character varying": "::character varying",
+      "character varying": "::character varying",
       // "double precision": "::double precision",
       // "time with time zone": "::time with time zone",
       "time without time zone": "::time without time zone",
-      // "timestamp with time zone": "::timestamp with time zone",
+      // 'timestamp with time zone': '::timestamp with time zone',
       "timestamp without time zone": "::timestamp without time zone",
       "timestamp(": "::timestamp without time zone",
       // date: "::date",
@@ -19288,6 +19323,12 @@ ${withStyle.errorWarning(
       // json: "::json",
       "character(": "::bpchar"
     };
+    columnEnumNameToDefault = {
+      timestamptz: "::timestamp with time zone",
+      timestmap: "::time without time zone",
+      time: "::time without time zone",
+      timetz: "::time with time zone"
+    };
     defaultForColumn = (column7) => {
       if (column7.column_default === null) {
         return void 0;
@@ -19296,19 +19337,33 @@ ${withStyle.errorWarning(
         return void 0;
       }
       const hasDifferentDefaultCast = Object.keys(columnToDefault).find((it) => column7.data_type.startsWith(it));
+      const hasDifferentDefaultCastForEnum = Object.keys(columnEnumNameToDefault).find(
+        (it) => column7.enum_name.startsWith(it)
+      );
       const columnDefaultAsString = column7.column_default.toString();
-      if (columnDefaultAsString.endsWith(
+      const endsWithEnumName = columnDefaultAsString.endsWith(
+        hasDifferentDefaultCastForEnum ? columnEnumNameToDefault[hasDifferentDefaultCastForEnum] : column7.data_type
+      );
+      const endsWithTypeName = columnDefaultAsString.endsWith(
         hasDifferentDefaultCast ? columnToDefault[hasDifferentDefaultCast] : column7.data_type
-      )) {
+      );
+      if (endsWithTypeName || endsWithEnumName) {
         const nonPrefixPart = column7.column_default.length - (hasDifferentDefaultCast ? columnToDefault[hasDifferentDefaultCast] : `::${column7.data_type}`).length - 1;
-        const rt = column7.column_default.toString().substring(1, nonPrefixPart);
+        let rt = column7.column_default.toString().substring(0, nonPrefixPart + 1);
         if (/^-?[\d.]+(?:e-?\d+)?$/.test(rt) && !column7.data_type.startsWith("numeric")) {
           return Number(rt);
         } else if (column7.data_type === "json" || column7.data_type === "jsonb") {
+          if (rt.startsWith("'")) {
+            rt = rt.slice(1, -1);
+          }
           const jsonWithoutSpaces = JSON.stringify(JSON.parse(rt));
           return `'${jsonWithoutSpaces}'${hasDifferentDefaultCast ? columnToDefault[hasDifferentDefaultCast] : `::${column7.data_type}`}`;
         } else if (column7.data_type === "boolean") {
           return column7.column_default === "true";
+        } else if (rt === "NULL") {
+          return `NULL`;
+        } else if (rt.startsWith("'") && rt.endsWith("'")) {
+          return rt;
         } else {
           return `'${rt}'`;
         }
@@ -19317,8 +19372,10 @@ ${withStyle.errorWarning(
           return Number(columnDefaultAsString);
         } else if (column7.data_type === "boolean") {
           return column7.column_default === "true";
+        } else if (columnDefaultAsString === "NULL") {
+          return `NULL`;
         } else {
-          return `${columnDefaultAsString}`;
+          return `${columnDefaultAsString.replace(/\\/g, "`\\")}`;
         }
       }
     };
@@ -74154,7 +74211,7 @@ var init_pgIntrospect = __esm({
 });
 
 // src/introspect-sqlite.ts
-var sqliteImportsList, indexName3, objToStatement2, relations, withCasing, schemaToTypeScript, isCyclic, isSelf, mapColumnDefault, column4, createTableColumns, createTableIndexes, createTableUniques, createTablePKs, createTableFKs;
+var sqliteImportsList, indexName3, objToStatement2, relations, escapeColumnKey, withCasing, schemaToTypeScript, isCyclic, isSelf, mapColumnDefault, column4, createTableColumns, createTableIndexes, createTableUniques, createTablePKs, createTableFKs;
 var init_introspect_sqlite = __esm({
   "src/introspect-sqlite.ts"() {
     "use strict";
@@ -74181,12 +74238,18 @@ var init_introspect_sqlite = __esm({
       return statement;
     };
     relations = /* @__PURE__ */ new Set();
+    escapeColumnKey = (value) => {
+      if (/^(?![a-zA-Z_$][a-zA-Z0-9_$]*$).+$/.test(value)) {
+        return `"${value}"`;
+      }
+      return value;
+    };
     withCasing = (value, casing2) => {
-      if (typeof casing2 === "undefined") {
-        return value;
+      if (casing2 === "preserve") {
+        return escapeColumnKey(value);
       }
       if (casing2 === "camel") {
-        return value.camelCase();
+        return escapeColumnKey(value.camelCase());
       }
       return value;
     };
@@ -75184,7 +75247,7 @@ var require_pluralize = __commonJS({
 });
 
 // src/introspect-mysql.ts
-var mysqlImportsList, objToStatement22, timeConfig, binaryConfig, importsPatch, relations2, prepareCasing, schemaToTypeScript2, isCyclic2, isSelf2, mapColumnDefault2, mapColumnDefaultForJson, column5, createTableColumns2, createTableIndexes2, createTableUniques2, createTablePKs2, createTableFKs2;
+var mysqlImportsList, objToStatement22, timeConfig, binaryConfig, importsPatch, relations2, escapeColumnKey2, prepareCasing, schemaToTypeScript2, isCyclic2, isSelf2, mapColumnDefault2, mapColumnDefaultForJson, column5, createTableColumns2, createTableIndexes2, createTableUniques2, createTablePKs2, createTableFKs2;
 var init_introspect_mysql = __esm({
   "src/introspect-mysql.ts"() {
     "use strict";
@@ -75255,14 +75318,20 @@ var init_introspect_mysql = __esm({
       "timestamp without time zone": "timestamp"
     };
     relations2 = /* @__PURE__ */ new Set();
+    escapeColumnKey2 = (value) => {
+      if (/^(?![a-zA-Z_$][a-zA-Z0-9_$]*$).+$/.test(value)) {
+        return `"${value}"`;
+      }
+      return value;
+    };
     prepareCasing = (casing2) => (value) => {
-      if (typeof casing2 === "undefined") {
-        return value;
+      if (casing2 === "preserve") {
+        return escapeColumnKey2(value);
       }
       if (casing2 === "camel") {
-        return value.camelCase();
+        return escapeColumnKey2(value.camelCase());
       }
-      return value;
+      return escapeColumnKey2(value);
     };
     schemaToTypeScript2 = (schema5, casing2) => {
       const withCasing4 = prepareCasing(casing2);
@@ -75728,7 +75797,7 @@ import { sql } from "drizzle-orm"
 });
 
 // src/introspect-pg.ts
-var import_drizzle_orm8, import_relations, pgImportsList, objToStatement23, timeConfig2, possibleIntervals, intervalStrToObj, intervalConfig, importsPatch2, relations3, withCasing2, paramNameFor, schemaToTypeScript3, isCyclic3, isSelf3, column6, dimensionsInArray, createTableColumns3, createTableIndexes3, createTablePKs3, createTableUniques3, createTableFKs3;
+var import_drizzle_orm8, import_relations, pgImportsList, timeConfig2, possibleIntervals, intervalStrToObj, intervalConfig, mapColumnDefault3, importsPatch2, relations3, escapeColumnKey3, withCasing2, paramNameFor, schemaToTypeScript3, isCyclic3, isSelf3, column6, dimensionsInArray, createTableColumns3, createTableIndexes3, createTablePKs3, createTableUniques3, createTableFKs3;
 var init_introspect_pg = __esm({
   "src/introspect-pg.ts"() {
     "use strict";
@@ -75772,16 +75841,6 @@ var init_introspect_pg = __esm({
       "line",
       "geometry"
     ]);
-    objToStatement23 = (json) => {
-      json = Object.fromEntries(Object.entries(json).filter((it) => it[1]));
-      const keys = Object.keys(json);
-      if (keys.length === 0)
-        return;
-      let statement = "{ ";
-      statement += keys.map((it) => `${it}: "${json[it]}"`).join(", ");
-      statement += " }";
-      return statement;
-    };
     timeConfig2 = (json) => {
       json = Object.fromEntries(Object.entries(json).filter((it) => it[1]));
       const keys = Object.keys(json);
@@ -75841,6 +75900,12 @@ var init_introspect_pg = __esm({
       statement += " }";
       return statement;
     };
+    mapColumnDefault3 = (defaultValue, isExpression) => {
+      if (isExpression) {
+        return `sql\`${defaultValue}\``;
+      }
+      return defaultValue;
+    };
     importsPatch2 = {
       "double precision": "doublePrecision",
       "timestamp without time zone": "timestamp",
@@ -75849,12 +75914,18 @@ var init_introspect_pg = __esm({
       "time with time zone": "time"
     };
     relations3 = /* @__PURE__ */ new Set();
+    escapeColumnKey3 = (value) => {
+      if (/^(?![a-zA-Z_$][a-zA-Z0-9_$]*$).+$/.test(value)) {
+        return `"${value}"`;
+      }
+      return value;
+    };
     withCasing2 = (value, casing2) => {
       if (casing2 === "preserve") {
-        return value;
+        return escapeColumnKey3(value);
       }
       if (casing2 === "camel") {
-        return value.camelCase();
+        return escapeColumnKey3(value.camelCase());
       }
       assertUnreachable(casing2);
     };
@@ -75874,7 +75945,13 @@ var init_introspect_pg = __esm({
           return [it[0], withCasing2(it[1], casing2)];
         })
       );
-      const enumTypes = new Set(Object.values(schema5.enums).map((it) => it.name));
+      const enumTypes = Object.values(schema5.enums).reduce(
+        (acc, cur) => {
+          acc.add(`${cur.schema}.${cur.name}`);
+          return acc;
+        },
+        /* @__PURE__ */ new Set()
+      );
       const imports = Object.values(schema5.tables).reduce(
         (res, it) => {
           const idxImports = Object.values(it.indexes).map((idx) => idx.isUnique ? "uniqueIndex" : "index");
@@ -75895,9 +75972,6 @@ var init_introspect_pg = __esm({
           res.pg.push(...fkImpots);
           res.pg.push(...pkImports);
           res.pg.push(...uniqueImports);
-          if (enumTypes.size > 0) {
-            res.pg.push("pgEnum");
-          }
           const columnImports = Object.values(it.columns).map((col) => {
             let patched = importsPatch2[col.type] || col.type;
             patched = patched.startsWith("varchar(") ? "varchar" : patched;
@@ -75916,6 +75990,13 @@ var init_introspect_pg = __esm({
         },
         { pg: [] }
       );
+      Object.values(schema5.enums).forEach((it) => {
+        if (it.schema && it.schema !== "public" && it.schema !== "") {
+          imports.pg.push("pgSchema");
+        } else if (it.schema === "public") {
+          imports.pg.push("pgEnum");
+        }
+      });
       const enumStatements = Object.values(schema5.enums).map((it) => {
         const enumSchema3 = schemas[it.schema];
         const paramName = paramNameFor(it.name, enumSchema3);
@@ -75944,10 +76025,7 @@ var init_introspect_pg = __esm({
           schema5.internal
         );
         statement += "}";
-        const filteredFKs = Object.values(table4.foreignKeys).filter((it) => {
-          return it.columnsFrom.length > 1 || isSelf3(it);
-        });
-        if (Object.keys(table4.indexes).length > 0 || filteredFKs.length > 0 || Object.keys(table4.compositePrimaryKeys).length > 0 || Object.keys(table4.uniqueConstraints).length > 0) {
+        if (Object.keys(table4.indexes).length > 0 || Object.values(table4.foreignKeys).length > 0 || Object.keys(table4.compositePrimaryKeys).length > 0 || Object.keys(table4.uniqueConstraints).length > 0) {
           statement += ",\n";
           statement += "(table) => {\n";
           statement += "	return {\n";
@@ -75956,7 +76034,7 @@ var init_introspect_pg = __esm({
             Object.values(table4.indexes),
             casing2
           );
-          statement += createTableFKs3(Object.values(filteredFKs), schemas, casing2);
+          statement += createTableFKs3(Object.values(table4.foreignKeys), schemas, casing2);
           statement += createTablePKs3(
             Object.values(table4.compositePrimaryKeys),
             casing2
@@ -75998,9 +76076,18 @@ var init_introspect_pg = __esm({
     isSelf3 = (fk4) => {
       return fk4.tableFrom === fk4.tableTo;
     };
-    column6 = (tableName, type, name, enumTypes, casing2, defaultValue, internals) => {
-      var _a;
+    column6 = (tableName, type, name, enumTypes, typeSchema, casing2, defaultValue, internals) => {
+      var _a, _b, _c;
+      const isExpression = ((_b = (_a = internals == null ? void 0 : internals.tables[tableName]) == null ? void 0 : _a.columns[name]) == null ? void 0 : _b.isDefaultAnExpression) ?? false;
       const lowered = type.toLowerCase();
+      if (enumTypes.has(`${typeSchema}.${type}`)) {
+        let out = `${withCasing2(name, casing2)}: ${withCasing2(
+          paramNameFor(type, typeSchema),
+          casing2
+        )}("${name}")`;
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
+        return out;
+      }
       if (lowered.startsWith("serial")) {
         return `${withCasing2(name, casing2)}: serial("${name}")`;
       }
@@ -76015,34 +76102,34 @@ var init_introspect_pg = __esm({
       }
       if (lowered.startsWith("integer")) {
         let out = `${withCasing2(name, casing2)}: integer("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("smallint")) {
         let out = `${withCasing2(name, casing2)}: smallint("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("bigint")) {
         let out = `// You can use { mode: "bigint" } if numbers are exceeding js number limitations
 	`;
         out += `${withCasing2(name, casing2)}: bigint("${name}", { mode: "number" })`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("boolean")) {
         let out = `${withCasing2(name, casing2)}: boolean("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("double precision")) {
         let out = `${withCasing2(name, casing2)}: doublePrecision("${name}")`;
-        out += defaultValue ? `.default(${defaultValue})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("real")) {
         let out = `${withCasing2(name, casing2)}: real("${name}")`;
-        out += defaultValue ? `.default(${defaultValue})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("uuid")) {
@@ -76058,7 +76145,7 @@ var init_introspect_pg = __esm({
         }
         let out = params ? `${withCasing2(name, casing2)}: numeric("${name}", ${timeConfig2(params)})` : `${withCasing2(name, casing2)}: numeric("${name}")`;
         defaultValue = defaultValue ? defaultValue.startsWith(`'`) && defaultValue.endsWith(`'`) ? defaultValue.substring(1, defaultValue.length - 1) : defaultValue : void 0;
-        out += defaultValue ? `.default('${defaultValue}')` : "";
+        out += defaultValue ? `.default('${mapColumnDefault3(defaultValue, isExpression)}')` : "";
         return out;
       }
       if (lowered.startsWith("timestamp")) {
@@ -76073,7 +76160,7 @@ var init_introspect_pg = __esm({
           mode: "'string'"
         });
         let out = params ? `${withCasing2(name, casing2)}: timestamp("${name}", ${params})` : `${withCasing2(name, casing2)}: timestamp("${name}")`;
-        defaultValue = defaultValue === "now()" || defaultValue === "CURRENT_TIMESTAMP" ? ".defaultNow()" : defaultValue ? `.default(${defaultValue})` : "";
+        defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue === "CURRENT_TIMESTAMP" ? ".default(sql`CURRENT_TIMESTAMP`)" : defaultValue ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
       }
@@ -76085,14 +76172,14 @@ var init_introspect_pg = __esm({
         precision = precision ? precision : null;
         const params = timeConfig2({ precision, withTimezone });
         let out = params ? `${withCasing2(name, casing2)}: time("${name}", ${params})` : `${withCasing2(name, casing2)}: time("${name}")`;
-        defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${defaultValue})` : "";
+        defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
       }
       if (lowered.startsWith("interval")) {
         const params = intervalConfig(lowered);
         let out = params ? `${withCasing2(name, casing2)}: interval("${name}", ${params})` : `${withCasing2(name, casing2)}: interval("${name}")`;
-        out += defaultValue ? `.default(${defaultValue})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "date") {
@@ -76122,22 +76209,22 @@ var init_introspect_pg = __esm({
       }
       if (lowered.startsWith("inet")) {
         let out = `${withCasing2(name, casing2)}: inet("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("cidr")) {
         let out = `${withCasing2(name, casing2)}: cidr("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("macaddr")) {
         let out = `${withCasing2(name, casing2)}: macaddr("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("macaddr8")) {
         let out = `${withCasing2(name, casing2)}: macaddr8("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("varchar")) {
@@ -76154,17 +76241,17 @@ var init_introspect_pg = __esm({
         } else {
           out = `${withCasing2(name, casing2)}: varchar("${name}")`;
         }
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("point")) {
         let out = `${withCasing2(name, casing2)}: point("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("line")) {
         let out = `${withCasing2(name, casing2)}: point("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("geometry")) {
@@ -76182,7 +76269,7 @@ var init_introspect_pg = __esm({
         } else {
           out = `${withCasing2(name, casing2)}: geometry("${name}")`;
         }
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         if (isGeoUnknown) {
           let unknown2 = `// TODO: failed to parse geometry type because found more than 2 options inside geometry function '${type}'
 // Introspect is currently supporting only type and srid options
@@ -76206,7 +76293,7 @@ var init_introspect_pg = __esm({
         } else {
           out = `${withCasing2(name, casing2)}: vector("${name}")`;
         }
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("char")) {
@@ -76222,28 +76309,20 @@ var init_introspect_pg = __esm({
         } else {
           out = `${withCasing2(name, casing2)}: char("${name}")`;
         }
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
         return out;
       }
-      const columnInternals = (_a = internals == null ? void 0 : internals.tables[tableName]) == null ? void 0 : _a.columns[name];
+      const columnInternals = (_c = internals == null ? void 0 : internals.tables[tableName]) == null ? void 0 : _c.columns[name];
       if (typeof columnInternals !== "undefined") {
         if (columnInternals.isArray && columnInternals.rawType && enumTypes.has(columnInternals.rawType)) {
           let out = `${withCasing2(columnInternals.rawType, casing2)}: ${withCasing2(
             columnInternals.rawType,
             casing2
           )}("${name}")`;
-          out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
+          out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault3(defaultValue, isExpression)})` : "";
           return out;
         }
       }
-      if (enumTypes.has(type)) {
-        let out = `${withCasing2(name, casing2)}: ${withCasing2(
-          type,
-          casing2
-        )}("${name}")`;
-        out += typeof defaultValue !== "undefined" ? `.default(${defaultValue})` : "";
-        return out;
-      }
       let unknown = `// TODO: failed to parse database type '${type}'
 `;
       unknown += `	${withCasing2(name, casing2)}: unknown("${name}")`;
@@ -76276,6 +76355,7 @@ var init_introspect_pg = __esm({
           it.type,
           it.name,
           enumTypes,
+          it.typeSchema ?? "public",
           casing2,
           it.default,
           internals
@@ -76317,29 +76397,6 @@ var init_introspect_pg = __esm({
         }
         statement += it.identity ? generateIdentityParams(it.identity) : "";
         statement += it.generated ? `.generatedAlwaysAs(sql\`${it.generated.as}\`)` : "";
-        const fks2 = fkByColumnName[it.name];
-        if (fks2) {
-          const fksStatement = fks2.map((it2) => {
-            const onDelete = it2.onDelete && it2.onDelete !== "no action" ? it2.onDelete : null;
-            const onUpdate = it2.onUpdate && it2.onUpdate !== "no action" ? it2.onUpdate : null;
-            const params = { onDelete, onUpdate };
-            const typeSuffix = isCyclic3(it2) ? ": AnyPgColumn" : "";
-            const paramsStr = objToStatement23(params);
-            const tableSchema = schemas[it2.schemaTo || ""];
-            const paramName = paramNameFor(it2.tableTo, tableSchema);
-            if (paramsStr) {
-              return `.references(()${typeSuffix} => ${withCasing2(
-                paramName,
-                casing2
-              )}.${withCasing2(it2.columnsTo[0], casing2)}, ${paramsStr} )`;
-            }
-            return `.references(()${typeSuffix} => ${withCasing2(
-              paramName,
-              casing2
-            )}.${withCasing2(it2.columnsTo[0], casing2)})`;
-          }).join("");
-          statement += fksStatement;
-        }
         statement += ",\n";
       });
       return statement;
@@ -76363,7 +76420,7 @@ var init_introspect_pg = __esm({
           if (it2.isExpression) {
             return `sql\`${it2.expression}\``;
           } else {
-            return `table.${withCasing2(it2.expression, casing2)}${it2.opclass && vectorOps.includes(it2.opclass) ? `.op("${it2.opclass}")` : ""}`;
+            return `table.${withCasing2(it2.expression, casing2)}${it2.asc ? ".asc()" : ".desc()"}${it2.nulls === "first" ? ".nullsFirst()" : ".nullsLast()"}${it2.opclass && vectorOps.includes(it2.opclass) ? `.op("${it2.opclass}")` : ""}`;
           }
         }).join(", ")})`;
         statement += it.where ? `.where(sql\`${it.where}\`)` : "";
@@ -80519,7 +80576,7 @@ var init_studio2 = __esm({
   }
 });
 
-// ../node_modules/.pnpm/@drizzle-team+brocli@0.10.1/node_modules/@drizzle-team/brocli/index.js
+// ../node_modules/.pnpm/@drizzle-team+brocli@0.8.2/node_modules/@drizzle-team/brocli/index.js
 var __create2 = Object.create;
 var __defProp2 = Object.defineProperty;
 var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -80966,299 +81023,130 @@ var require_shell_quote = __commonJS2({
   }
 });
 var BroCliError = class extends Error {
-  constructor(message, event) {
+  constructor(message) {
     const errPrefix = "BroCli error: ";
     super(message === void 0 ? message : `${errPrefix}${message}`);
-    this.event = event;
   }
 };
 var import_clone = __toESM2(require_clone(), 1);
-var getOptionTypeText = (option) => {
-  let result = "";
-  switch (option.type) {
-    case "boolean":
-      result = "";
-      break;
-    case "number": {
-      if ((option.minVal ?? option.maxVal) !== void 0) {
-        let text = "";
-        if (option.isInt)
-          text = text + `integer `;
-        if (option.minVal !== void 0)
-          text = text + `[${option.minVal};`;
-        else
-          text = text + `(\u221E;`;
-        if (option.maxVal !== void 0)
-          text = text + `${option.maxVal}]`;
-        else
-          text = text + `\u221E)`;
-        result = text;
-        break;
-      }
-      if (option.isInt) {
-        result = "integer";
-        break;
-      }
-      result = "number";
-      break;
-    }
-    case "string": {
-      if (option.enumVals) {
-        result = "[ " + option.enumVals.join(" | ") + " ]";
-        break;
-      }
-      result = "string";
-      break;
-    }
-    case "positional": {
-      result = `${option.isRequired ? "<" : "["}${option.enumVals ? option.enumVals.join("|") : option.name}${option.isRequired ? ">" : "]"}`;
-      break;
-    }
-  }
-  if (option.isRequired && option.type !== "positional")
-    result = "!" + result.length ? " " : "" + result;
-  return result;
-};
-var defaultEventHandler = async (event) => {
-  var _a;
-  switch (event.type) {
-    case "command_help": {
-      const command2 = event.command;
-      const commandName = getCommandNameWithParents(command2);
-      const cliName = event.name;
-      const desc = command2.desc ?? command2.shortDesc;
-      const subs = (_a = command2.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(
-        (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) {
-        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) {
-        console.log(`
-Aliases:`);
-        console.log(`  ${[command2.name, ...command2.aliases].join(", ")}`);
-      }
-      if (subcommands) {
-        console.log("\nAvailable Commands:");
-        const padding = 3;
-        const maxLength = subcommands.reduce((p2, e2) => e2.name.length > p2 ? e2.name.length : p2, 0);
-        const paddedLength = maxLength + padding;
-        const preDescPad = 2 + paddedLength;
-        const data = subcommands.map(
-          (s2) => `  ${s2.name.padEnd(paddedLength)}${(() => {
-            const description = s2.shortDesc ?? s2.desc;
-            if (!(description == null ? void 0 : description.length))
-              return "";
-            const split = description.split("\n");
-            const first = split.shift();
-            const final = [first, ...split.map((s22) => "".padEnd(preDescPad) + s22)].join("\n");
-            return final;
-          })()}`
-        ).join("\n");
-        console.log(data);
-      }
-      if (options.length) {
-        const aliasLength = options.reduce((p2, e2) => {
-          const currentLength = e2.config.aliases.reduce((pa, a) => pa + a.length, 0) + (e2.config.aliases.length - 1) * 2 + 1;
-          return currentLength > p2 ? currentLength : p2;
-        }, 0);
-        const paddedAliasLength = aliasLength > 0 ? aliasLength + 1 : 0;
-        const nameLength = options.reduce((p2, e2) => {
-          const typeLen = getOptionTypeText(e2.config).length;
-          const length = typeLen > 0 ? e2.config.name.length + 1 + typeLen : e2.config.name.length;
-          return length > p2 ? length : p2;
-        }, 0) + 3;
-        const preDescPad = paddedAliasLength + nameLength + 2;
-        const data = options.map(
-          ({ config: opt }) => `  ${`${opt.aliases.length ? opt.aliases.join(", ") + "," : ""}`.padEnd(paddedAliasLength)}${`${opt.name}${(() => {
-            const typeText = getOptionTypeText(opt);
-            return typeText.length ? " " + typeText : "";
-          })()}`.padEnd(nameLength)}${(() => {
-            var _a2;
-            if (!((_a2 = opt.description) == null ? void 0 : _a2.length)) {
-              return opt.default !== void 0 ? `default: ${JSON.stringify(opt.default)}` : "";
-            }
-            const split = opt.description.split("\n");
-            const first = split.shift();
-            const def = opt.default !== void 0 ? ` (default: ${JSON.stringify(opt.default)})` : "";
-            const final = [first, ...split.map((s2) => "".padEnd(preDescPad) + s2)].join("\n") + def;
-            return final;
-          })()}`
-        ).join("\n");
-        console.log("\nFlags:");
-        console.log(data);
-      }
-      console.log("\nGlobal flags:");
-      console.log(`  -h, --help      help for ${commandName}`);
-      console.log(`  -v, --version   version${cliName ? ` for ${cliName}` : ""}`);
-      if (subcommands) {
-        console.log(
-          `
-Use "${cliName ? cliName + " " : ""}${commandName} [command] --help" for more information about a command.
-`
-        );
-      }
-      return true;
-    }
-    case "global_help": {
-      const cliName = event.name;
-      const desc = event.description;
-      const commands = event.commands.filter((c) => !c.hidden);
-      if (desc !== void 0) {
-        console.log(`${desc}
-`);
-      }
-      console.log("Usage:");
-      console.log(`  ${cliName ? cliName + " " : ""}[command]`);
-      if (commands.length) {
-        console.log("\nAvailable Commands:");
-        const padding = 3;
-        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;
-            if (!(desc2 == null ? void 0 : desc2.length))
-              return "";
-            const split = desc2.split("\n");
-            const first = split.shift();
-            const final = [first, ...split.map((s2) => "".padEnd(paddedLength + 2) + s2)].join("\n");
-            return final;
-          })()}`
-        ).join("\n");
-        console.log(data);
-      } else {
-        console.log("\nNo available commands.");
-      }
-      console.log("\nFlags:");
-      console.log(`  -h, --help      help${cliName ? ` for ${cliName}` : ""}`);
-      console.log(`  -v, --version   version${cliName ? ` for ${cliName}` : ""}`);
-      console.log("\n");
-      return true;
-    }
-    case "version": {
-      return true;
-    }
-    case "error": {
-      let msg;
-      switch (event.violation) {
-        case "above_max": {
-          const matchedName = event.offender.namePart;
-          const data = event.offender.dataPart;
-          const option = event.option;
-          const max = option.maxVal;
-          msg = `Invalid value: number type argument '${matchedName}' expects maximal value of ${max} as an input, got: ${data}`;
-          break;
-        }
-        case "below_min": {
-          const matchedName = event.offender.namePart;
-          const data = event.offender.dataPart;
-          const option = event.option;
-          const min = option.minVal;
-          msg = `Invalid value: number type argument '${matchedName}' expects minimal value of ${min} as an input, got: ${data}`;
-          break;
-        }
-        case "expected_int": {
-          const matchedName = event.offender.namePart;
-          const data = event.offender.dataPart;
-          msg = `Invalid value: number type argument '${matchedName}' expects an integer as an input, got: ${data}`;
-          break;
-        }
-        case "invalid_boolean_syntax": {
-          const matchedName = event.offender.namePart;
-          const data = event.offender.dataPart;
-          msg = `Invalid syntax: boolean type argument '${matchedName}' must have it's value passed in the following formats: ${matchedName}=<value> | ${matchedName} <value> | ${matchedName}.
-Allowed values: true, false, 0, 1`;
-          break;
-        }
-        case "invalid_string_syntax": {
-          const matchedName = event.offender.namePart;
-          msg = `Invalid syntax: string type argument '${matchedName}' must have it's value passed in the following formats: ${matchedName}=<value> | ${matchedName} <value>`;
-          break;
-        }
-        case "invalid_number_syntax": {
-          const matchedName = event.offender.namePart;
-          msg = `Invalid syntax: number type argument '${matchedName}' must have it's value passed in the following formats: ${matchedName}=<value> | ${matchedName} <value>`;
-          break;
-        }
-        case "invalid_number_value": {
-          const matchedName = event.offender.namePart;
-          const data = event.offender.dataPart;
-          msg = `Invalid value: number type argument '${matchedName}' expects a number as an input, got: ${data}`;
-          break;
-        }
-        case "enum_violation": {
-          const matchedName = event.offender.namePart;
-          const data = event.offender.dataPart;
-          const option = event.option;
-          const values = option.enumVals;
-          msg = option.type === "positional" ? `Invalid value: value for the positional argument '${option.name}' must be either one of the following: ${values.join(", ")}; Received: ${data}` : `Invalid value: value for the argument '${matchedName}' must be either one of the following: ${values.join(", ")}; Received: ${data}`;
-          break;
-        }
-        case "unknown_command_error": {
-          const msg2 = `Unknown command: '${event.offender}'.
-Type '--help' to get help on the cli.`;
-          console.error(msg2);
-          return true;
-        }
-        case "unknown_subcommand_error": {
-          const cName = getCommandNameWithParents(event.command);
-          const msg2 = `Unknown command: ${cName} ${event.offender}.
-Type '${cName} --help' to get the help on command.`;
-          console.error(msg2);
-          return true;
-        }
-        case "missing_args_error": {
-          const missingOpts = event.missing;
-          msg = `Command '${command.name}' is missing following required options: ${missingOpts.map((opt) => {
-            const name = opt.shift();
-            const aliases = opt;
-            if (aliases.length)
-              return `${name} [${aliases.join(", ")}]`;
-            return name;
-          }).join(", ")}`;
-          break;
-        }
-        case "unrecognized_args_error": {
-          const { command: command2, unrecognized } = event;
-          msg = `Unrecognized options for command '${command2.name}': ${unrecognized.join(", ")}`;
-          break;
-        }
-        case "unknown_error": {
-          const e2 = event.error;
-          console.error(typeof e2 === "object" && e2 !== null && "message" in e2 ? e2.message : e2);
-          return true;
-        }
-      }
-      console.error(msg);
-      return true;
-    }
+var import_shell_quote = __toESM2(require_shell_quote(), 1);
+var defaultTheme = (calledFor) => {
+  if (Array.isArray(calledFor)) {
+    const cmds = calledFor.filter((cmd) => !cmd.hidden);
+    const tableCmds = cmds.map((cmd) => ({
+      name: cmd.name,
+      aliases: cmd.aliases ? cmd.aliases.join(", ") : "-",
+      description: cmd.description ?? "-"
+    }));
+    console.log(`Here's the list of all available commands:`);
+    console.table(tableCmds);
+    console.log(
+      "To read the details about any particular command type: [commandName] --help"
+    );
+  } else {
+    const options = calledFor.options ? Object.values(calledFor.options).filter((opt) => {
+      var _a;
+      return !((_a = opt.config) == null ? void 0 : _a.isHidden);
+    }).map(
+      ({ config: opt }) => ({
+        name: opt.name,
+        aliases: opt.aliases.length ? `${opt.aliases.join(", ")}` : "-",
+        description: opt.description ?? "-",
+        type: opt.type,
+        required: opt.isRequired ? "\u2713" : "\u2717"
+      })
+    ) : void 0;
+    console.log(
+      `Command: ${calledFor.name}${calledFor.aliases ? ` [${calledFor.aliases.join(", ")}]` : ""}${calledFor.description ? ` - ${calledFor.description}` : ""}`
+    );
+    if (!(options == null ? void 0 : options.length))
+      return;
+    console.log("\nOptions:");
+    console.table(options);
   }
-  return false;
 };
-var eventHandlerWrapper = (customEventHandler) => async (event) => await customEventHandler(event) ? true : await defaultEventHandler(event);
-var import_shell_quote = __toESM2(require_shell_quote(), 1);
 function isInt(value) {
   return value === Math.floor(value);
 }
-var executeOrLog = async (target) => typeof target === "string" ? console.log(target) : target ? await target() : void 0;
+var unknownCommand = (caller) => {
+  const msg = `Unknown command: '${caller}'.
+Type '--help' to get help on the cli.`;
+  return new Error(msg);
+};
+var unknownSubcommand = (command2, caller) => {
+  const name = getCommandNameRecursive(command2);
+  const msg = `Unknown command: ${name} ${caller}.
+Type '${name} --help' to get the help on command.`;
+  new Error(
+    msg
+  );
+  return new Error(msg);
+};
+var missingRequired = (command2, missingOpts) => {
+  const msg = `Command '${command2.name}' is missing following required options: ${missingOpts.map((opt) => {
+    const name = opt.shift();
+    const aliases = opt;
+    if (aliases.length)
+      return `${name} [${aliases.join(", ")}]`;
+    return name;
+  }).join(", ")}`;
+  return new Error(msg);
+};
+var unrecognizedOptions = (command2, unrecognizedArgs) => {
+  const msg = `Unrecognized options for command '${command2.name}': ${unrecognizedArgs.join(", ")}`;
+  return new Error(msg);
+};
+var invalidBooleanSyntax = (matchedName) => {
+  return new Error(
+    `Invalid syntax: boolean type argument '${matchedName}' must have it's value passed in the following formats: ${matchedName}=<value> | ${matchedName} <value> | ${matchedName}.
+Allowed values: true, false, 0, 1`
+  );
+};
+var invalidStringSyntax = (matchedName) => {
+  return new Error(
+    `Invalid syntax: string type argument '${matchedName}' must have it's value passed in the following formats: ${matchedName}=<value> | ${matchedName} <value>`
+  );
+};
+var enumViolation = (matchedName, data, values) => {
+  return new Error(
+    `Invalid value: value for the argument '${matchedName}' must be either one of the following: ${values.join(", ")}; Received: ${data}`
+  );
+};
+var enumViolationPos = (matchedName, data, values) => {
+  return new Error(
+    `Invalid value: value for the argument '${matchedName}' must be either one of the following: ${values.join(", ")}; Received: ${data}`
+  );
+};
+var invalidNumberSyntax = (matchedName) => {
+  return new Error(
+    `Invalid syntax: number type argument '${matchedName}' must have it's value passed in the following formats: ${matchedName}=<value> | ${matchedName} <value>`
+  );
+};
+var invalidNumberValue = (matchedName, data) => {
+  return new Error(
+    `Invalid value: number type argument '${matchedName}' expects a number as an input, got: ${data}`
+  );
+};
+var invalidInteger = (matchedName, data) => {
+  return new Error(
+    `Invalid value: number type argument '${matchedName}' expects an integer as an input, got: ${data}`
+  );
+};
+var belowMin = (matchedName, data, min) => {
+  return new Error(
+    `Invalid value: number type argument '${matchedName}' expects minimal value of ${min} as an input, got: ${data}`
+  );
+};
+var aboveMax = (matchedName, data, max) => {
+  return new Error(
+    `Invalid value: number type argument '${matchedName}' expects maximal value of ${max} as an input, got: ${data}`
+  );
+};
 var generatePrefix = (name) => name.startsWith("-") ? name : name.length > 1 ? `--${name}` : `-${name}`;
 var validateOptions = (config) => {
   const cloned = (0, import_clone.default)(config);
   const entries = [];
-  const storedNames = [];
+  const storedNames = {};
   const cfgEntries = Object.entries(cloned);
   for (const [key, value] of cfgEntries) {
     const cfg = value._.config;
@@ -81268,13 +81156,13 @@ var validateOptions = (config) => {
       continue;
     if (cfg.name.includes("=")) {
       throw new BroCliError(
-        `Can't define option '${generatePrefix(cfg.name)}' - option names and aliases cannot contain '='!`
+        `Can't define option ${cfg.name} - option names and aliases cannot contain '='!`
       );
     }
     for (const alias of cfg.aliases) {
       if (alias.includes("=")) {
         throw new BroCliError(
-          `Can't define option '${generatePrefix(cfg.name)}' - option names and aliases cannot contain '='!`
+          `Can't define option ${cfg.name} - option names and aliases cannot contain '='!`
         );
       }
     }
@@ -81292,33 +81180,33 @@ var validateOptions = (config) => {
     for (const name of allNames) {
       const match2 = reservedNames.find((n) => n === name);
       if (match2)
-        throw new BroCliError(`Can't define option '${cfg.name}' - name '${match2}' is reserved!`);
+        throw new BroCliError(`Can't define option ${cfg.name} - name '${match2}' is reserved!`);
     }
-    for (const storage2 of storedNames) {
+    const storageVals = Object.values(storedNames);
+    for (const storage2 of storageVals) {
       const nameOccupier = storage2.find((e2) => e2 === cfg.name);
       if (!nameOccupier)
         continue;
       throw new BroCliError(
-        `Can't define option '${cfg.name}' - name is already in use by option '${storage2[0]}'!`
+        `Can't define option '${cfg.name}': name is already in use by option '${storage2[0]}'!`
       );
     }
     for (const alias of cfg.aliases) {
-      for (const storage2 of storedNames) {
+      for (const storage2 of storageVals) {
         const nameOccupier = storage2.find((e2) => e2 === alias);
         if (!nameOccupier)
           continue;
         throw new BroCliError(
-          `Can't define option '${cfg.name}' - alias '${alias}' is already in use by option '${storage2[0]}'!`
+          `Can't define option '${cfg.name}': alias '${alias}' is already in use by option '${storage2[0]}'!`
         );
       }
     }
-    const currentNames = [cfg.name, ...cfg.aliases];
-    storedNames.push(currentNames);
-    currentNames.forEach((name, idx) => {
-      if (currentNames.findIndex((e2) => e2 === name) === idx)
+    storedNames[cfg.name] = [cfg.name, ...cfg.aliases];
+    storedNames[cfg.name].forEach((name, idx) => {
+      if (storedNames[cfg.name].findIndex((e2) => e2 === name) === idx)
         return;
       throw new BroCliError(
-        `Can't define option '${cfg.name}' - duplicate alias '${name}'!`
+        `Can't define option '${cfg.name}': duplicate aliases '${name}'!`
       );
     });
     entries.push([key, { config: cfg, $output: void 0 }]);
@@ -81339,17 +81227,14 @@ var command = (command2) => {
       `Can't define command '${cmd.name}' - command can't have subcommands and positional args at the same time!`
     );
   }
-  if (!command2.handler && !command2.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;
   cmd.options = processedOptions;
   cmd.name = cmd.name ?? ((_a = cmd.aliases) == null ? void 0 : _a.shift());
   if (!cmd.name)
     throw new BroCliError(`Can't define command without name!`);
   cmd.aliases = ((_b = cmd.aliases) == null ? void 0 : _b.length) ? cmd.aliases : void 0;
+  if (!cmd.handler)
+    throw new BroCliError(`Can't define command '${cmd.name}' - command must have a handler!`);
   if (cmd.name.startsWith("-")) {
     throw new BroCliError(`Can't define command '${cmd.name}' - command name can't start with '-'!`);
   }
@@ -81379,7 +81264,7 @@ var command = (command2) => {
   }
   return cmd;
 };
-var getCommandInner = (commands, candidates, args, cliName, cliDescription) => {
+var getCommandInner = (commands, candidates, args) => {
   const { data: arg, originalIndex: index4 } = candidates.shift();
   const command2 = commands.find((c) => {
     const names = c.aliases ? [c.name, ...c.aliases] : [c.name];
@@ -81400,20 +81285,12 @@ var getCommandInner = (commands, candidates, args, cliName, cliDescription) => {
     };
   }
   const newCandidates = candidates.map((c) => ({ data: c.data, originalIndex: c.originalIndex - 1 }));
-  const subcommand = getCommandInner(command2.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,
-      offender: candidates[0].data
-    });
-  }
+  const subcommand = getCommandInner(command2.subcommands, newCandidates, newArgs);
+  if (!subcommand.command)
+    throw unknownSubcommand(command2, candidates[0].data);
   return subcommand;
 };
-var getCommand = (commands, args, cliName, cliDescription) => {
+var getCommand = (commands, args) => {
   var _a;
   const candidates = [];
   for (let i2 = 0; i2 < args.length; ++i2) {
@@ -81447,23 +81324,15 @@ var getCommand = (commands, args, cliName, cliDescription) => {
       args: removeByIndex(args, firstCandidate.originalIndex)
     };
   }
-  const { command: command2, args: argsRes } = getCommandInner(commands, candidates, args, cliName, cliDescription);
-  if (!command2) {
-    throw new BroCliError(void 0, {
-      type: "error",
-      violation: "unknown_command_error",
-      commands,
-      name: cliName,
-      description: cliDescription,
-      offender: firstCandidate.data
-    });
-  }
+  const { command: command2, args: argsRes } = getCommandInner(commands, candidates, args);
+  if (!command2)
+    throw unknownCommand(firstCandidate.data);
   return {
     command: command2,
     args: argsRes
   };
 };
-var parseArg = (command2, options, positionals, arg, nextArg, cliName, cliDescription) => {
+var parseArg = (options, positionals, arg, nextArg) => {
   let data = void 0;
   const argSplit = arg.split("=");
   const hasEq = arg.includes("=");
@@ -81484,18 +81353,8 @@ var parseArg = (command2, options, positionals, arg, nextArg, cliName, cliDescri
     if (!positionals.length)
       return {};
     const pos = positionals.shift();
-    if (pos[1].enumVals && !pos[1].enumVals.find((val2) => val2 === arg)) {
-      throw new BroCliError(void 0, {
-        type: "error",
-        name: cliName,
-        description: cliDescription,
-        violation: "enum_violation",
-        command: command2,
-        option: pos[1],
-        offender: {
-          dataPart: arg
-        }
-      });
+    if (pos[1].enumVals && !pos[1].enumVals.find((val2) => val2 === dataPart)) {
+      throw enumViolationPos(pos[1].name, arg, pos[1].enumVals);
     }
     data = arg;
     return {
@@ -81530,126 +81389,32 @@ var parseArg = (command2, options, positionals, arg, nextArg, cliName, cliDescri
         skipNext = false;
         return true;
       }
-      throw new BroCliError(void 0, {
-        type: "error",
-        name: cliName,
-        description: cliDescription,
-        violation: "invalid_boolean_syntax",
-        option: opt,
-        command: command2,
-        offender: {
-          namePart,
-          dataPart
-        }
-      });
+      throw invalidBooleanSyntax(match2);
     } else {
       const match2 = names.find((name) => name === namePart);
       if (!match2)
         return false;
       if (opt.type === "string") {
-        if (!hasEq && nextArg === void 0) {
-          throw new BroCliError(void 0, {
-            type: "error",
-            name: cliName,
-            description: cliDescription,
-            violation: "invalid_string_syntax",
-            option: opt,
-            command: command2,
-            offender: {
-              namePart,
-              dataPart
-            }
-          });
-        }
+        if (!hasEq && nextArg === void 0)
+          throw invalidStringSyntax(match2);
         if (opt.enumVals && !opt.enumVals.find((val2) => val2 === dataPart)) {
-          throw new BroCliError(void 0, {
-            type: "error",
-            name: cliName,
-            description: cliDescription,
-            violation: "enum_violation",
-            option: opt,
-            command: command2,
-            offender: {
-              namePart,
-              dataPart
-            }
-          });
+          throw enumViolation(match2, dataPart, opt.enumVals);
         }
         data = dataPart;
         return true;
       }
-      if (!hasEq && nextArg === void 0) {
-        throw new BroCliError(void 0, {
-          type: "error",
-          name: cliName,
-          description: cliDescription,
-          violation: "invalid_number_syntax",
-          option: opt,
-          command: command2,
-          offender: {
-            namePart,
-            dataPart
-          }
-        });
-      }
+      if (!hasEq && nextArg === void 0)
+        throw invalidNumberSyntax(match2);
       const numData = Number(dataPart);
-      if (isNaN(numData)) {
-        throw new BroCliError(void 0, {
-          type: "error",
-          name: cliName,
-          description: cliDescription,
-          violation: "invalid_number_value",
-          option: opt,
-          command: command2,
-          offender: {
-            namePart,
-            dataPart
-          }
-        });
-      }
-      if (opt.isInt && !isInt(numData)) {
-        throw new BroCliError(void 0, {
-          type: "error",
-          name: cliName,
-          description: cliDescription,
-          violation: "expected_int",
-          option: opt,
-          command: command2,
-          offender: {
-            namePart,
-            dataPart
-          }
-        });
-      }
-      if (opt.minVal !== void 0 && numData < opt.minVal) {
-        throw new BroCliError(void 0, {
-          type: "error",
-          name: cliName,
-          description: cliDescription,
-          violation: "below_min",
-          option: opt,
-          command: command2,
-          offender: {
-            namePart,
-            dataPart
-          }
-        });
-      }
-      if (opt.maxVal !== void 0 && numData > opt.maxVal) {
-        throw new BroCliError(void 0, {
-          type: "error",
-          name: cliName,
-          description: cliDescription,
-          violation: "above_max",
-          option: opt,
-          command: command2,
-          offender: {
-            namePart,
-            dataPart
-          }
-        });
-      }
-      data = numData;
+      if (isNaN(numData))
+        throw invalidNumberValue(match2, dataPart);
+      if (opt.isInt && !isInt(numData))
+        throw invalidInteger(match2, dataPart);
+      if (opt.minVal !== void 0 && numData < opt.minVal)
+        throw belowMin(match2, dataPart, opt.minVal);
+      if (opt.maxVal !== void 0 && numData > opt.maxVal)
+        throw aboveMax(match2, dataPart, opt.maxVal);
+      data = dataPart;
       return true;
     }
   });
@@ -81660,7 +81425,7 @@ var parseArg = (command2, options, positionals, arg, nextArg, cliName, cliDescri
     option: option == null ? void 0 : option[1]
   };
 };
-var parseOptions = (command2, args, cliName, cliDescription, omitKeysOfUndefinedOptions) => {
+var parseOptions = (command2, args, omitKeysOfUndefinedOptions) => {
   const options = command2.options;
   const optEntries = Object.entries(options ?? {}).map(
     (opt) => [opt[0], opt[1].config]
@@ -81680,16 +81445,16 @@ var parseOptions = (command2, args, cliName, cliDescription, omitKeysOfUndefined
       skipNext,
       isHelp,
       isVersion
-    } = parseArg(command2, nonPositionalEntries, positionalEntries, arg, nextArg, cliName, cliDescription);
+    } = parseArg(nonPositionalEntries, positionalEntries, arg, nextArg);
     if (!option)
       unrecognizedArgsArr.push(arg.split("=")[0]);
     if (skipNext)
       ++i2;
+    result[name] = data;
     if (isHelp)
       return "help";
     if (isVersion)
       return "version";
-    result[name] = data;
   }
   for (const [optKey, option] of optEntries) {
     const data = result[optKey] ?? option.default;
@@ -81702,29 +81467,19 @@ var parseOptions = (command2, args, cliName, cliDescription, omitKeysOfUndefined
     if (option.isRequired && result[optKey] === void 0)
       missingRequiredArr.push([option.name, ...option.aliases]);
   }
-  if (missingRequiredArr.length) {
-    throw new BroCliError(void 0, {
-      type: "error",
-      violation: "missing_args_error",
-      name: cliName,
-      description: cliDescription,
-      command: command2,
-      missing: missingRequiredArr
-    });
-  }
-  if (unrecognizedArgsArr.length) {
-    throw new BroCliError(void 0, {
-      type: "error",
-      violation: "unrecognized_args_error",
-      name: cliName,
-      description: cliDescription,
-      command: command2,
-      unrecognized: unrecognizedArgsArr
-    });
-  }
-  return Object.keys(result).length ? result : void 0;
+  if (missingRequiredArr.length)
+    throw missingRequired(command2, missingRequiredArr);
+  if (unrecognizedArgsArr.length)
+    throw unrecognizedOptions(command2, unrecognizedArgsArr);
+  return result;
 };
-var getCommandNameWithParents = (command2) => command2.parent ? `${getCommandNameWithParents(command2.parent)} ${command2.name}` : command2.name;
+var executeOrLog = async (target) => {
+  if (!target || typeof target === "string")
+    console.log(target);
+  else
+    await target();
+};
+var getCommandNameRecursive = (command2) => command2.parent ? `${getCommandNameRecursive(command2.parent)} ${command2.name}` : command2.name;
 var validateCommands = (commands, parent) => {
   const storedNames = {};
   for (const cmd of commands) {
@@ -81733,8 +81488,8 @@ var validateCommands = (commands, parent) => {
       const nameOccupier = storage2.find((e2) => e2 === cmd.name);
       if (!nameOccupier)
         continue;
-      throw new BroCliError(
-        `Can't define command '${getCommandNameWithParents(cmd)}': name is already in use by command '${parent ? `${getCommandNameWithParents(parent)} ` : ""}${storage2[0]}'!`
+      throw new Error(
+        `Can't define command '${getCommandNameRecursive(cmd)}': name is already in use by command '${parent ? `${getCommandNameRecursive(parent)} ` : ""}${storage2[0]}'!`
       );
     }
     if (cmd.aliases) {
@@ -81743,8 +81498,8 @@ var validateCommands = (commands, parent) => {
           const nameOccupier = storage2.find((e2) => e2 === alias);
           if (!nameOccupier)
             continue;
-          throw new BroCliError(
-            `Can't define command '${getCommandNameWithParents(cmd)}': alias '${alias}' is already in use by command '${parent ? `${getCommandNameWithParents(parent)} ` : ""}${storage2[0]}'!`
+          throw new Error(
+            `Can't define command '${getCommandNameRecursive(cmd)}': alias '${alias}' is already in use by command '${parent ? `${getCommandNameRecursive(parent)} ` : ""}${storage2[0]}'!`
           );
         }
       }
@@ -81756,135 +81511,53 @@ var validateCommands = (commands, parent) => {
   return commands;
 };
 var removeByIndex = (arr, idx) => [...arr.slice(0, idx), ...arr.slice(idx + 1, arr.length)];
-var run = async (commands, config) => {
+var help = async (command2, commands, helpHandler) => typeof command2 === "object" ? command2.help !== void 0 ? await executeOrLog(command2.help) : await helpHandler(command2) : await helpHandler(commands);
+var rawCli = async (commands, config) => {
   var _a, _b;
-  const eventHandler = (config == null ? void 0 : config.theme) ? eventHandlerWrapper(config.theme) : defaultEventHandler;
+  const processedCmds = validateCommands(commands);
   const argSource = (config == null ? void 0 : config.argSource) ?? process.argv;
   const version3 = config == null ? void 0 : config.version;
-  const help = config == null ? void 0 : config.help;
+  const helpHandler = (config == null ? void 0 : config.help) ?? defaultTheme;
   const omitKeysOfUndefinedOptions = (config == null ? void 0 : config.omitKeysOfUndefinedOptions) ?? false;
-  const cliName = config == null ? void 0 : config.name;
-  const cliDescription = config == null ? void 0 : config.description;
+  let args = argSource.slice(2, argSource.length);
+  if (!args.length)
+    return await helpHandler(processedCmds);
+  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).command;
+    return help(command3, processedCmds, helpHandler);
+  }
+  const versionIndex = args.findIndex((arg) => arg === "--version" || arg === "-v");
+  if (versionIndex !== -1 && (versionIndex > 0 ? ((_b = args[versionIndex - 1]) == null ? void 0 : _b.startsWith("-")) ? false : true : true)) {
+    return await executeOrLog(version3);
+  }
+  const { command: command2, args: newArgs } = getCommand(processedCmds, args);
+  if (!command2)
+    return helpHandler(processedCmds);
+  if (command2 === "help") {
+    const { command: helpCommand } = getCommand(processedCmds, newArgs);
+    return help(helpCommand, processedCmds, helpHandler);
+  }
+  const optionResult = parseOptions(command2, newArgs, omitKeysOfUndefinedOptions);
+  if (optionResult === "help")
+    return await help(command2, commands, helpHandler);
+  if (optionResult === "version")
+    return await executeOrLog(version3);
+  if (optionResult) {
+    if (config == null ? void 0 : config.hook)
+      await config.hook("pre", command2);
+    await command2.handler(command2.transform ? await command2.transform(optionResult) : optionResult);
+    if (config == null ? void 0 : config.hook)
+      await config.hook("post", command2);
+  }
+  return void 0;
+};
+var run = async (commands, config) => {
   try {
-    const processedCmds = validateCommands(commands);
-    let args = argSource.slice(2, argSource.length);
-    if (!args.length) {
-      return help !== void 0 ? await executeOrLog(help) : await eventHandler({
-        type: "global_help",
-        description: cliDescription,
-        name: cliName,
-        commands: processedCmds
-      });
-    }
-    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({
-          type: "command_help",
-          description: cliDescription,
-          name: cliName,
-          command: command3
-        });
-      } else {
-        return help !== void 0 ? await executeOrLog(help) : await eventHandler({
-          type: "global_help",
-          description: cliDescription,
-          name: cliName,
-          commands: processedCmds
-        });
-      }
-    }
-    const versionIndex = args.findIndex((arg) => arg === "--version" || arg === "-v");
-    if (versionIndex !== -1 && (versionIndex > 0 ? ((_b = args[versionIndex - 1]) == null ? void 0 : _b.startsWith("-")) ? false : true : true)) {
-      return version3 !== void 0 ? await executeOrLog(version3) : await eventHandler({
-        type: "version",
-        name: cliName,
-        description: cliDescription
-      });
-    }
-    const { command: command2, args: newArgs } = getCommand(processedCmds, args, cliName, cliDescription);
-    if (!command2) {
-      return help !== void 0 ? await executeOrLog(help) : await eventHandler({
-        type: "global_help",
-        description: cliDescription,
-        name: cliName,
-        commands: processedCmds
-      });
-    }
-    if (command2 === "help") {
-      let helpCommand;
-      let newestArgs = newArgs;
-      do {
-        const res = getCommand(processedCmds, newestArgs, cliName, cliDescription);
-        helpCommand = res.command;
-        newestArgs = res.args;
-      } while (helpCommand === "help");
-      return helpCommand ? helpCommand.help !== void 0 ? await executeOrLog(helpCommand.help) : await eventHandler({
-        type: "command_help",
-        description: cliDescription,
-        name: cliName,
-        command: helpCommand
-      }) : help !== void 0 ? await executeOrLog(help) : await eventHandler({
-        type: "global_help",
-        description: cliDescription,
-        name: cliName,
-        commands: processedCmds
-      });
-    }
-    const optionResult = parseOptions(command2, newArgs, cliName, cliDescription, omitKeysOfUndefinedOptions);
-    if (optionResult === "help") {
-      return command2.help !== void 0 ? await executeOrLog(command2.help) : await eventHandler({
-        type: "command_help",
-        description: cliDescription,
-        name: cliName,
-        command: command2
-      });
-    }
-    if (optionResult === "version") {
-      return version3 !== void 0 ? await executeOrLog(version3) : await eventHandler({
-        type: "version",
-        name: cliName,
-        description: cliDescription
-      });
-    }
-    if (command2.handler) {
-      if (config == null ? void 0 : config.hook)
-        await config.hook("before", command2);
-      await command2.handler(command2.transform ? await command2.transform(optionResult) : optionResult);
-      if (config == null ? void 0 : config.hook)
-        await config.hook("after", command2);
-      return;
-    } else {
-      return command2.help !== void 0 ? await executeOrLog(command2.help) : await eventHandler({
-        type: "command_help",
-        description: cliDescription,
-        name: cliName,
-        command: command2
-      });
-    }
+    await rawCli(commands, config);
   } catch (e2) {
-    if (e2 instanceof BroCliError) {
-      if (e2.event)
-        await eventHandler(e2.event);
-      else {
-        if (!(config == null ? void 0 : config.noExit))
-          console.error(e2.message);
-        else
-          return e2.message;
-      }
-    } else {
-      await eventHandler({
-        type: "error",
-        violation: "unknown_error",
-        name: cliName,
-        description: cliDescription,
-        error: e2
-      });
-    }
-    if (!(config == null ? void 0 : config.noExit))
-      process.exit(1);
-    return;
+    console.error(typeof e2 === "object" && e2 !== null && "message" in e2 ? e2.message : e2);
+    process.exit(1);
   }
 };
 var OptionBuilderBase = class _OptionBuilderBase {
@@ -81962,7 +81635,7 @@ var OptionBuilderBase = class _OptionBuilderBase {
   max(value) {
     const config = this.config();
     const minVal = config.minVal;
-    if (minVal !== void 0 && minVal > value) {
+    if (minVal !== void 0 && minVal < value) {
       throw new BroCliError("Unable to define option's max value to be lower than min value!");
     }
     return new _OptionBuilderBase({ ...config, maxVal: value });
@@ -83786,7 +83459,7 @@ init_utils2();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.24.0-6386ea9";
+  const envVersion = "0.24.0-8d86512";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;
@@ -83821,7 +83494,6 @@ var legacy = [
   legacyCommand("check:sqlite", "check")
 ];
 run([generate, migrate, pull, push, studio, up, check, drop, ...legacy], {
-  name: "drizzle-kit",
   version: version2
 });
 /*! Bundled license information: