drizzle-kit 0.21.2 → 0.21.4

package/utils-studio.mjs

@@ -34,7 +34,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// node_modules/.pnpm/chalk@5.2.0/node_modules/chalk/source/vendor/ansi-styles/index.js
+// node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/vendor/ansi-styles/index.js
 function assembleStyles() {
   const codes = /* @__PURE__ */ new Map();
   for (const [groupName, group] of Object.entries(styles)) {
@@ -151,7 +151,7 @@ function assembleStyles() {
 }
 var ANSI_BACKGROUND_OFFSET, wrapAnsi16, wrapAnsi256, wrapAnsi16m, styles, modifierNames, foregroundColorNames, backgroundColorNames, colorNames, ansiStyles, ansi_styles_default;
 var init_ansi_styles = __esm({
-  "node_modules/.pnpm/chalk@5.2.0/node_modules/chalk/source/vendor/ansi-styles/index.js"() {
+  "node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/vendor/ansi-styles/index.js"() {
     ANSI_BACKGROUND_OFFSET = 10;
     wrapAnsi16 = (offset = 0) => (code) => `\x1B[${code + offset}m`;
     wrapAnsi256 = (offset = 0) => (code) => `\x1B[${38 + offset};5;${code}m`;
@@ -225,7 +225,7 @@ var init_ansi_styles = __esm({
   }
 });
 
-// node_modules/.pnpm/chalk@5.2.0/node_modules/chalk/source/vendor/supports-color/index.js
+// node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/vendor/supports-color/index.js
 import process2 from "node:process";
 import os from "node:os";
 import tty from "node:tty";
@@ -292,7 +292,7 @@ function _supportsColor(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
     return 1;
   }
   if ("CI" in env) {
-    if ("GITHUB_ACTIONS" in env) {
+    if ("GITHUB_ACTIONS" in env || "GITEA_ACTIONS" in env) {
       return 3;
     }
     if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI", "BUILDKITE", "DRONE"].some((sign) => sign in env) || env.CI_NAME === "codeship") {
@@ -340,7 +340,7 @@ function createSupportsColor(stream, options = {}) {
 }
 var env, flagForceColor, supportsColor, supports_color_default;
 var init_supports_color = __esm({
-  "node_modules/.pnpm/chalk@5.2.0/node_modules/chalk/source/vendor/supports-color/index.js"() {
+  "node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/vendor/supports-color/index.js"() {
     ({ env } = process2);
     if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false") || hasFlag("color=never")) {
       flagForceColor = 0;
@@ -355,7 +355,7 @@ var init_supports_color = __esm({
   }
 });
 
-// node_modules/.pnpm/chalk@5.2.0/node_modules/chalk/source/utilities.js
+// node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/utilities.js
 function stringReplaceAll(string, substring, replacer) {
   let index4 = string.indexOf(substring);
   if (index4 === -1) {
@@ -385,21 +385,20 @@ function stringEncaseCRLFWithFirstIndex(string, prefix, postfix, index4) {
   return returnValue;
 }
 var init_utilities = __esm({
-  "node_modules/.pnpm/chalk@5.2.0/node_modules/chalk/source/utilities.js"() {
+  "node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/utilities.js"() {
   }
 });
 
-// node_modules/.pnpm/chalk@5.2.0/node_modules/chalk/source/index.js
+// node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/index.js
 function createChalk(options) {
   return chalkFactory(options);
 }
-var stdoutColor, stderrColor, GENERATOR, STYLER, IS_EMPTY, levelMapping, styles2, applyOptions, chalkFactory, getModelAnsi, usedModels, proto, createStyler, createBuilder, applyStyle, chalk, chalkStderr;
+var stdoutColor, stderrColor, GENERATOR, STYLER, IS_EMPTY, levelMapping, styles2, applyOptions, chalkFactory, getModelAnsi, usedModels, proto, createStyler, createBuilder, applyStyle, chalk, chalkStderr, source_default;
 var init_source = __esm({
-  "node_modules/.pnpm/chalk@5.2.0/node_modules/chalk/source/index.js"() {
+  "node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/index.js"() {
     init_ansi_styles();
     init_supports_color();
     init_utilities();
-    init_ansi_styles();
     ({ stdout: stdoutColor, stderr: stderrColor } = supports_color_default);
     GENERATOR = Symbol("GENERATOR");
     STYLER = Symbol("STYLER");
@@ -541,6 +540,7 @@ var init_source = __esm({
     Object.defineProperties(createChalk.prototype, styles2);
     chalk = createChalk();
     chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
+    source_default = chalk;
   }
 });
 
@@ -1056,7 +1056,7 @@ var require_hanji = __commonJS({
       return;
     }
     exports.render = render2;
-    function renderWithTask2(view, task) {
+    function renderWithTask3(view, task) {
       return __awaiter(this, void 0, void 0, function* () {
         const terminal = new TaskTerminal(view, process.stdout);
         terminal.requestLayout();
@@ -1065,7 +1065,7 @@ var require_hanji = __commonJS({
         return result;
       });
     }
-    exports.renderWithTask = renderWithTask2;
+    exports.renderWithTask = renderWithTask3;
     var terminateHandler;
     function onTerminate(callback) {
       terminateHandler = callback;
@@ -1084,11 +1084,12 @@ var init_global = __esm({
   }
 });
 
-// node_modules/.pnpm/zod@3.20.2/node_modules/zod/lib/index.mjs
+// node_modules/.pnpm/zod@3.23.8/node_modules/zod/lib/index.mjs
 function getErrorMap() {
   return overrideErrorMap;
 }
 function addIssueToContext(ctx, issueData) {
+  const overrideMap = getErrorMap();
   const issue = makeIssue({
     issueData,
     data: ctx.data,
@@ -1096,13 +1097,29 @@ function addIssueToContext(ctx, issueData) {
     errorMaps: [
       ctx.common.contextualErrorMap,
       ctx.schemaErrorMap,
-      getErrorMap(),
-      errorMap
+      overrideMap,
+      overrideMap === errorMap ? void 0 : errorMap
       // then global default map
     ].filter((x) => !!x)
   });
   ctx.common.issues.push(issue);
 }
+function __classPrivateFieldGet(receiver, state, kind, f) {
+  if (kind === "a" && !f)
+    throw new TypeError("Private accessor was defined without a getter");
+  if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver))
+    throw new TypeError("Cannot read private member from an object whose class did not declare it");
+  return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+}
+function __classPrivateFieldSet(receiver, state, value, kind, f) {
+  if (kind === "m")
+    throw new TypeError("Private method is not writable");
+  if (kind === "a" && !f)
+    throw new TypeError("Private accessor was defined without a setter");
+  if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver))
+    throw new TypeError("Cannot write private member to an object whose class did not declare it");
+  return kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value), value;
+}
 function processCreateParams(params) {
   if (!params)
     return {};
@@ -1113,15 +1130,50 @@ function processCreateParams(params) {
   if (errorMap2)
     return { errorMap: errorMap2, description };
   const customMap = (iss, ctx) => {
-    if (iss.code !== "invalid_type")
-      return { message: ctx.defaultError };
+    var _a, _b;
+    const { message } = params;
+    if (iss.code === "invalid_enum_value") {
+      return { message: message !== null && message !== void 0 ? message : ctx.defaultError };
+    }
     if (typeof ctx.data === "undefined") {
-      return { message: required_error !== null && required_error !== void 0 ? required_error : ctx.defaultError };
+      return { message: (_a = message !== null && message !== void 0 ? message : required_error) !== null && _a !== void 0 ? _a : ctx.defaultError };
     }
-    return { message: invalid_type_error !== null && invalid_type_error !== void 0 ? invalid_type_error : ctx.defaultError };
+    if (iss.code !== "invalid_type")
+      return { message: ctx.defaultError };
+    return { message: (_b = message !== null && message !== void 0 ? message : invalid_type_error) !== null && _b !== void 0 ? _b : ctx.defaultError };
   };
   return { errorMap: customMap, description };
 }
+function timeRegexSource(args) {
+  let regex = `([01]\\d|2[0-3]):[0-5]\\d:[0-5]\\d`;
+  if (args.precision) {
+    regex = `${regex}\\.\\d{${args.precision}}`;
+  } else if (args.precision == null) {
+    regex = `${regex}(\\.\\d+)?`;
+  }
+  return regex;
+}
+function timeRegex(args) {
+  return new RegExp(`^${timeRegexSource(args)}$`);
+}
+function datetimeRegex(args) {
+  let regex = `${dateRegexSource}T${timeRegexSource(args)}`;
+  const opts = [];
+  opts.push(args.local ? `Z?` : `Z`);
+  if (args.offset)
+    opts.push(`([+-]\\d{2}:?\\d{2})`);
+  regex = `${regex}(${opts.join("|")})`;
+  return new RegExp(`^${regex}$`);
+}
+function isValidIP(ip, version) {
+  if ((version === "v4" || !version) && ipv4Regex.test(ip)) {
+    return true;
+  }
+  if ((version === "v6" || !version) && ipv6Regex.test(ip)) {
+    return true;
+  }
+  return false;
+}
 function floatSafeRemainder(val, step) {
   const valDecCount = (val.toString().split(".")[1] || "").length;
   const stepDecCount = (step.toString().split(".")[1] || "").length;
@@ -1142,7 +1194,10 @@ function deepPartialify(schema3) {
       shape: () => newShape
     });
   } else if (schema3 instanceof ZodArray) {
-    return ZodArray.create(deepPartialify(schema3.element));
+    return new ZodArray({
+      ...schema3._def,
+      type: deepPartialify(schema3.element)
+    });
   } else if (schema3 instanceof ZodOptional) {
     return ZodOptional.create(deepPartialify(schema3.unwrap()));
   } else if (schema3 instanceof ZodNullable) {
@@ -1198,9 +1253,9 @@ function createZodEnum(values, params) {
     ...processCreateParams(params)
   });
 }
-var util, ZodParsedType, getParsedType, ZodIssueCode, ZodError, errorMap, overrideErrorMap, makeIssue, ParseStatus, INVALID, DIRTY, OK, isAborted, isDirty, isValid, isAsync, errorUtil, ParseInputLazyPath, handleResult, ZodType, cuidRegex, uuidRegex, emailRegex, datetimeRegex, ZodString, ZodNumber, ZodBigInt, ZodBoolean, ZodDate, ZodSymbol, ZodUndefined, ZodNull, ZodAny, ZodUnknown, ZodNever, ZodVoid, ZodArray, objectUtil, AugmentFactory, ZodObject, ZodUnion, getDiscriminator, ZodDiscriminatedUnion, ZodIntersection, ZodTuple, ZodRecord, ZodMap, ZodSet, ZodFunction, ZodLazy, ZodLiteral, ZodEnum, ZodNativeEnum, ZodPromise, ZodEffects, ZodOptional, ZodNullable, ZodDefault, ZodCatch, ZodNaN, BRAND, ZodBranded, ZodPipeline, late, ZodFirstPartyTypeKind, stringType, numberType, nanType, bigIntType, booleanType, dateType, symbolType, undefinedType, nullType, anyType, unknownType, neverType, voidType, arrayType, objectType, strictObjectType, unionType, discriminatedUnionType, intersectionType, tupleType, recordType, mapType, setType, functionType, lazyType, literalType, enumType, nativeEnumType, promiseType, effectsType, optionalType, nullableType, preprocessType, pipelineType;
+var util, objectUtil, ZodParsedType, getParsedType, ZodIssueCode, ZodError, errorMap, overrideErrorMap, makeIssue, ParseStatus, INVALID, DIRTY, OK, isAborted, isDirty, isValid, isAsync, errorUtil, _ZodEnum_cache, _ZodNativeEnum_cache, ParseInputLazyPath, handleResult, ZodType, cuidRegex, cuid2Regex, ulidRegex, uuidRegex, nanoidRegex, durationRegex, emailRegex, _emojiRegex, emojiRegex, ipv4Regex, ipv6Regex, base64Regex, dateRegexSource, dateRegex, ZodString, ZodNumber, ZodBigInt, ZodBoolean, ZodDate, ZodSymbol, ZodUndefined, ZodNull, ZodAny, ZodUnknown, ZodNever, ZodVoid, ZodArray, ZodObject, ZodUnion, getDiscriminator, ZodDiscriminatedUnion, ZodIntersection, ZodTuple, ZodRecord, ZodMap, ZodSet, ZodFunction, ZodLazy, ZodLiteral, ZodEnum, ZodNativeEnum, ZodPromise, ZodEffects, ZodOptional, ZodNullable, ZodDefault, ZodCatch, ZodNaN, BRAND, ZodBranded, ZodPipeline, ZodReadonly, late, ZodFirstPartyTypeKind, stringType, numberType, nanType, bigIntType, booleanType, dateType, symbolType, undefinedType, nullType, anyType, unknownType, neverType, voidType, arrayType, objectType, strictObjectType, unionType, discriminatedUnionType, intersectionType, tupleType, recordType, mapType, setType, functionType, lazyType, literalType, enumType, nativeEnumType, promiseType, effectsType, optionalType, nullableType, preprocessType, pipelineType;
 var init_lib = __esm({
-  "node_modules/.pnpm/zod@3.20.2/node_modules/zod/lib/index.mjs"() {
+  "node_modules/.pnpm/zod@3.23.8/node_modules/zod/lib/index.mjs"() {
     (function(util2) {
       util2.assertEqual = (val) => val;
       function assertIs(_arg) {
@@ -1258,6 +1313,15 @@ var init_lib = __esm({
         return value;
       };
     })(util || (util = {}));
+    (function(objectUtil2) {
+      objectUtil2.mergeShapes = (first, second) => {
+        return {
+          ...first,
+          ...second
+          // second overwrites first
+        };
+      };
+    })(objectUtil || (objectUtil = {}));
     ZodParsedType = util.arrayToEnum([
       "string",
       "nan",
@@ -1339,7 +1403,7 @@ var init_lib = __esm({
       "not_multiple_of",
       "not_finite"
     ]);
-    ZodError = class extends Error {
+    ZodError = class _ZodError extends Error {
       constructor(issues) {
         super();
         this.issues = [];
@@ -1397,6 +1461,11 @@ var init_lib = __esm({
         processError(this);
         return fieldErrors;
       }
+      static assert(value) {
+        if (!(value instanceof _ZodError)) {
+          throw new Error(`Not a ZodError: ${value}`);
+        }
+      }
       toString() {
         return this.message;
       }
@@ -1463,7 +1532,12 @@ var init_lib = __esm({
           break;
         case ZodIssueCode.invalid_string:
           if (typeof issue.validation === "object") {
-            if ("startsWith" in issue.validation) {
+            if ("includes" in issue.validation) {
+              message = `Invalid input: must include "${issue.validation.includes}"`;
+              if (typeof issue.validation.position === "number") {
+                message = `${message} at one or more positions greater than or equal to ${issue.validation.position}`;
+              }
+            } else if ("startsWith" in issue.validation) {
               message = `Invalid input: must start with "${issue.validation.startsWith}"`;
             } else if ("endsWith" in issue.validation) {
               message = `Invalid input: must end with "${issue.validation.endsWith}"`;
@@ -1484,7 +1558,7 @@ var init_lib = __esm({
           else if (issue.type === "number")
             message = `Number must be ${issue.exact ? `exactly equal to ` : issue.inclusive ? `greater than or equal to ` : `greater than `}${issue.minimum}`;
           else if (issue.type === "date")
-            message = `Date must be ${issue.exact ? `exactly equal to ` : issue.inclusive ? `greater than or equal to ` : `greater than `}${new Date(issue.minimum)}`;
+            message = `Date must be ${issue.exact ? `exactly equal to ` : issue.inclusive ? `greater than or equal to ` : `greater than `}${new Date(Number(issue.minimum))}`;
           else
             message = "Invalid input";
           break;
@@ -1495,8 +1569,10 @@ var init_lib = __esm({
             message = `String must contain ${issue.exact ? `exactly` : issue.inclusive ? `at most` : `under`} ${issue.maximum} character(s)`;
           else if (issue.type === "number")
             message = `Number must be ${issue.exact ? `exactly` : issue.inclusive ? `less than or equal to` : `less than`} ${issue.maximum}`;
+          else if (issue.type === "bigint")
+            message = `BigInt must be ${issue.exact ? `exactly` : issue.inclusive ? `less than or equal to` : `less than`} ${issue.maximum}`;
           else if (issue.type === "date")
-            message = `Date must be ${issue.exact ? `exactly` : issue.inclusive ? `smaller than or equal to` : `smaller than`} ${new Date(issue.maximum)}`;
+            message = `Date must be ${issue.exact ? `exactly` : issue.inclusive ? `smaller than or equal to` : `smaller than`} ${new Date(Number(issue.maximum))}`;
           else
             message = "Invalid input";
           break;
@@ -1526,6 +1602,13 @@ var init_lib = __esm({
         ...issueData,
         path: fullPath
       };
+      if (issueData.message !== void 0) {
+        return {
+          ...issueData,
+          path: fullPath,
+          message: issueData.message
+        };
+      }
       let errorMessage = "";
       const maps = errorMaps.filter((m) => !!m).slice().reverse();
       for (const map of maps) {
@@ -1534,7 +1617,7 @@ var init_lib = __esm({
       return {
         ...issueData,
         path: fullPath,
-        message: issueData.message || errorMessage
+        message: errorMessage
       };
     };
     ParseStatus = class _ParseStatus {
@@ -1563,9 +1646,11 @@ var init_lib = __esm({
       static async mergeObjectAsync(status, pairs) {
         const syncPairs = [];
         for (const pair of pairs) {
+          const key = await pair.key;
+          const value = await pair.value;
           syncPairs.push({
-            key: await pair.key,
-            value: await pair.value
+            key,
+            value
           });
         }
         return _ParseStatus.mergeObjectSync(status, syncPairs);
@@ -1582,7 +1667,7 @@ var init_lib = __esm({
             status.dirty();
           if (value.status === "dirty")
             status.dirty();
-          if (typeof value.value !== "undefined" || pair.alwaysSet) {
+          if (key.value !== "__proto__" && (typeof value.value !== "undefined" || pair.alwaysSet)) {
             finalObject[key.value] = value.value;
           }
         }
@@ -1597,20 +1682,28 @@ var init_lib = __esm({
     isAborted = (x) => x.status === "aborted";
     isDirty = (x) => x.status === "dirty";
     isValid = (x) => x.status === "valid";
-    isAsync = (x) => typeof Promise !== void 0 && x instanceof Promise;
+    isAsync = (x) => typeof Promise !== "undefined" && x instanceof Promise;
     (function(errorUtil2) {
       errorUtil2.errToObj = (message) => typeof message === "string" ? { message } : message || {};
       errorUtil2.toString = (message) => typeof message === "string" ? message : message === null || message === void 0 ? void 0 : message.message;
     })(errorUtil || (errorUtil = {}));
     ParseInputLazyPath = class {
       constructor(parent, value, path2, key) {
+        this._cachedPath = [];
         this.parent = parent;
         this.data = value;
         this._path = path2;
         this._key = key;
       }
       get path() {
-        return this._path.concat(this._key);
+        if (!this._cachedPath.length) {
+          if (this._key instanceof Array) {
+            this._cachedPath.push(...this._path, ...this._key);
+          } else {
+            this._cachedPath.push(...this._path, this._key);
+          }
+        }
+        return this._cachedPath;
       }
     };
     handleResult = (ctx, result) => {
@@ -1620,8 +1713,16 @@ var init_lib = __esm({
         if (!ctx.common.issues.length) {
           throw new Error("Validation failed but no issues detected.");
         }
-        const error2 = new ZodError(ctx.common.issues);
-        return { success: false, error: error2 };
+        return {
+          success: false,
+          get error() {
+            if (this._error)
+              return this._error;
+            const error2 = new ZodError(ctx.common.issues);
+            this._error = error2;
+            return this._error;
+          }
+        };
       }
     };
     ZodType = class {
@@ -1649,6 +1750,7 @@ var init_lib = __esm({
         this.catch = this.catch.bind(this);
         this.describe = this.describe.bind(this);
         this.pipe = this.pipe.bind(this);
+        this.readonly = this.readonly.bind(this);
         this.isNullable = this.isNullable.bind(this);
         this.isOptional = this.isOptional.bind(this);
       }
@@ -1793,28 +1895,29 @@ var init_lib = __esm({
         return this._refinement(refinement);
       }
       optional() {
-        return ZodOptional.create(this);
+        return ZodOptional.create(this, this._def);
       }
       nullable() {
-        return ZodNullable.create(this);
+        return ZodNullable.create(this, this._def);
       }
       nullish() {
-        return this.optional().nullable();
+        return this.nullable().optional();
       }
       array() {
-        return ZodArray.create(this);
+        return ZodArray.create(this, this._def);
       }
       promise() {
-        return ZodPromise.create(this);
+        return ZodPromise.create(this, this._def);
       }
       or(option) {
-        return ZodUnion.create([this, option]);
+        return ZodUnion.create([this, option], this._def);
       }
       and(incoming) {
-        return ZodIntersection.create(this, incoming);
+        return ZodIntersection.create(this, incoming, this._def);
       }
       transform(transform) {
         return new ZodEffects({
+          ...processCreateParams(this._def),
           schema: this,
           typeName: ZodFirstPartyTypeKind.ZodEffects,
           effect: { type: "transform", transform }
@@ -1823,6 +1926,7 @@ var init_lib = __esm({
       default(def) {
         const defaultValueFunc = typeof def === "function" ? def : () => def;
         return new ZodDefault({
+          ...processCreateParams(this._def),
           innerType: this,
           defaultValue: defaultValueFunc,
           typeName: ZodFirstPartyTypeKind.ZodDefault
@@ -1832,14 +1936,15 @@ var init_lib = __esm({
         return new ZodBranded({
           typeName: ZodFirstPartyTypeKind.ZodBranded,
           type: this,
-          ...processCreateParams(void 0)
+          ...processCreateParams(this._def)
         });
       }
       catch(def) {
-        const defaultValueFunc = typeof def === "function" ? def : () => def;
+        const catchValueFunc = typeof def === "function" ? def : () => def;
         return new ZodCatch({
+          ...processCreateParams(this._def),
           innerType: this,
-          defaultValue: defaultValueFunc,
+          catchValue: catchValueFunc,
           typeName: ZodFirstPartyTypeKind.ZodCatch
         });
       }
@@ -1853,6 +1958,9 @@ var init_lib = __esm({
       pipe(target) {
         return ZodPipeline.create(this, target);
       }
+      readonly() {
+        return ZodReadonly.create(this);
+      }
       isOptional() {
         return this.safeParse(void 0).success;
       }
@@ -1861,43 +1969,19 @@ var init_lib = __esm({
       }
     };
     cuidRegex = /^c[^\s-]{8,}$/i;
-    uuidRegex = /^([a-f0-9]{8}-[a-f0-9]{4}-[1-5][a-f0-9]{3}-[a-f0-9]{4}-[a-f0-9]{12}|00000000-0000-0000-0000-000000000000)$/i;
-    emailRegex = /^(([^<>()[\]\.,;:\s@\"]+(\.[^<>()[\]\.,;:\s@\"]+)*)|(\".+\"))@(([^<>()[\]\.,;:\s@\"]+\.)+[^<>()[\]\.,;:\s@\"]{2,})$/i;
-    datetimeRegex = (args) => {
-      if (args.precision) {
-        if (args.offset) {
-          return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{${args.precision}}(([+-]\\d{2}:\\d{2})|Z)$`);
-        } else {
-          return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{${args.precision}}Z$`);
-        }
-      } else if (args.precision === 0) {
-        if (args.offset) {
-          return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(([+-]\\d{2}:\\d{2})|Z)$`);
-        } else {
-          return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z$`);
-        }
-      } else {
-        if (args.offset) {
-          return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?(([+-]\\d{2}:\\d{2})|Z)$`);
-        } else {
-          return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?Z$`);
-        }
-      }
-    };
+    cuid2Regex = /^[0-9a-z]+$/;
+    ulidRegex = /^[0-9A-HJKMNP-TV-Z]{26}$/;
+    uuidRegex = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/i;
+    nanoidRegex = /^[a-z0-9_-]{21}$/i;
+    durationRegex = /^[-+]?P(?!$)(?:(?:[-+]?\d+Y)|(?:[-+]?\d+[.,]\d+Y$))?(?:(?:[-+]?\d+M)|(?:[-+]?\d+[.,]\d+M$))?(?:(?:[-+]?\d+W)|(?:[-+]?\d+[.,]\d+W$))?(?:(?:[-+]?\d+D)|(?:[-+]?\d+[.,]\d+D$))?(?:T(?=[\d+-])(?:(?:[-+]?\d+H)|(?:[-+]?\d+[.,]\d+H$))?(?:(?:[-+]?\d+M)|(?:[-+]?\d+[.,]\d+M$))?(?:[-+]?\d+(?:[.,]\d+)?S)?)??$/;
+    emailRegex = /^(?!\.)(?!.*\.\.)([A-Z0-9_'+\-\.]*)[A-Z0-9_+-]@([A-Z0-9][A-Z0-9\-]*\.)+[A-Z]{2,}$/i;
+    _emojiRegex = `^(\\p{Extended_Pictographic}|\\p{Emoji_Component})+$`;
+    ipv4Regex = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$/;
+    ipv6Regex = /^(([a-f0-9]{1,4}:){7}|::([a-f0-9]{1,4}:){0,6}|([a-f0-9]{1,4}:){1}:([a-f0-9]{1,4}:){0,5}|([a-f0-9]{1,4}:){2}:([a-f0-9]{1,4}:){0,4}|([a-f0-9]{1,4}:){3}:([a-f0-9]{1,4}:){0,3}|([a-f0-9]{1,4}:){4}:([a-f0-9]{1,4}:){0,2}|([a-f0-9]{1,4}:){5}:([a-f0-9]{1,4}:){0,1})([a-f0-9]{1,4}|(((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2}))\.){3}((25[0-5])|(2[0-4][0-9])|(1[0-9]{2})|([0-9]{1,2})))$/;
+    base64Regex = /^([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}=))?$/;
+    dateRegexSource = `((\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-((0[13578]|1[02])-(0[1-9]|[12]\\d|3[01])|(0[469]|11)-(0[1-9]|[12]\\d|30)|(02)-(0[1-9]|1\\d|2[0-8])))`;
+    dateRegex = new RegExp(`^${dateRegexSource}$`);
     ZodString = class _ZodString extends ZodType {
-      constructor() {
-        super(...arguments);
-        this._regex = (regex, validation, message) => this.refinement((data) => regex.test(data), {
-          validation,
-          code: ZodIssueCode.invalid_string,
-          ...errorUtil.errToObj(message)
-        });
-        this.nonempty = (message) => this.min(1, errorUtil.errToObj(message));
-        this.trim = () => new _ZodString({
-          ...this._def,
-          checks: [...this._def.checks, { kind: "trim" }]
-        });
-      }
       _parse(input) {
         if (this._def.coerce) {
           input.data = String(input.data);
@@ -1905,15 +1989,11 @@ var init_lib = __esm({
         const parsedType = this._getType(input);
         if (parsedType !== ZodParsedType.string) {
           const ctx2 = this._getOrReturnCtx(input);
-          addIssueToContext(
-            ctx2,
-            {
-              code: ZodIssueCode.invalid_type,
-              expected: ZodParsedType.string,
-              received: ctx2.parsedType
-            }
-            //
-          );
+          addIssueToContext(ctx2, {
+            code: ZodIssueCode.invalid_type,
+            expected: ZodParsedType.string,
+            received: ctx2.parsedType
+          });
           return INVALID;
         }
         const status = new ParseStatus();
@@ -1981,6 +2061,19 @@ var init_lib = __esm({
               });
               status.dirty();
             }
+          } else if (check.kind === "emoji") {
+            if (!emojiRegex) {
+              emojiRegex = new RegExp(_emojiRegex, "u");
+            }
+            if (!emojiRegex.test(input.data)) {
+              ctx = this._getOrReturnCtx(input, ctx);
+              addIssueToContext(ctx, {
+                validation: "emoji",
+                code: ZodIssueCode.invalid_string,
+                message: check.message
+              });
+              status.dirty();
+            }
           } else if (check.kind === "uuid") {
             if (!uuidRegex.test(input.data)) {
               ctx = this._getOrReturnCtx(input, ctx);
@@ -1991,6 +2084,16 @@ var init_lib = __esm({
               });
               status.dirty();
             }
+          } else if (check.kind === "nanoid") {
+            if (!nanoidRegex.test(input.data)) {
+              ctx = this._getOrReturnCtx(input, ctx);
+              addIssueToContext(ctx, {
+                validation: "nanoid",
+                code: ZodIssueCode.invalid_string,
+                message: check.message
+              });
+              status.dirty();
+            }
           } else if (check.kind === "cuid") {
             if (!cuidRegex.test(input.data)) {
               ctx = this._getOrReturnCtx(input, ctx);
@@ -2001,6 +2104,26 @@ var init_lib = __esm({
               });
               status.dirty();
             }
+          } else if (check.kind === "cuid2") {
+            if (!cuid2Regex.test(input.data)) {
+              ctx = this._getOrReturnCtx(input, ctx);
+              addIssueToContext(ctx, {
+                validation: "cuid2",
+                code: ZodIssueCode.invalid_string,
+                message: check.message
+              });
+              status.dirty();
+            }
+          } else if (check.kind === "ulid") {
+            if (!ulidRegex.test(input.data)) {
+              ctx = this._getOrReturnCtx(input, ctx);
+              addIssueToContext(ctx, {
+                validation: "ulid",
+                code: ZodIssueCode.invalid_string,
+                message: check.message
+              });
+              status.dirty();
+            }
           } else if (check.kind === "url") {
             try {
               new URL(input.data);
@@ -2027,6 +2150,20 @@ var init_lib = __esm({
             }
           } else if (check.kind === "trim") {
             input.data = input.data.trim();
+          } else if (check.kind === "includes") {
+            if (!input.data.includes(check.value, check.position)) {
+              ctx = this._getOrReturnCtx(input, ctx);
+              addIssueToContext(ctx, {
+                code: ZodIssueCode.invalid_string,
+                validation: { includes: check.value, position: check.position },
+                message: check.message
+              });
+              status.dirty();
+            }
+          } else if (check.kind === "toLowerCase") {
+            input.data = input.data.toLowerCase();
+          } else if (check.kind === "toUpperCase") {
+            input.data = input.data.toUpperCase();
           } else if (check.kind === "startsWith") {
             if (!input.data.startsWith(check.value)) {
               ctx = this._getOrReturnCtx(input, ctx);
@@ -2058,12 +2195,71 @@ var init_lib = __esm({
               });
               status.dirty();
             }
+          } else if (check.kind === "date") {
+            const regex = dateRegex;
+            if (!regex.test(input.data)) {
+              ctx = this._getOrReturnCtx(input, ctx);
+              addIssueToContext(ctx, {
+                code: ZodIssueCode.invalid_string,
+                validation: "date",
+                message: check.message
+              });
+              status.dirty();
+            }
+          } else if (check.kind === "time") {
+            const regex = timeRegex(check);
+            if (!regex.test(input.data)) {
+              ctx = this._getOrReturnCtx(input, ctx);
+              addIssueToContext(ctx, {
+                code: ZodIssueCode.invalid_string,
+                validation: "time",
+                message: check.message
+              });
+              status.dirty();
+            }
+          } else if (check.kind === "duration") {
+            if (!durationRegex.test(input.data)) {
+              ctx = this._getOrReturnCtx(input, ctx);
+              addIssueToContext(ctx, {
+                validation: "duration",
+                code: ZodIssueCode.invalid_string,
+                message: check.message
+              });
+              status.dirty();
+            }
+          } else if (check.kind === "ip") {
+            if (!isValidIP(input.data, check.version)) {
+              ctx = this._getOrReturnCtx(input, ctx);
+              addIssueToContext(ctx, {
+                validation: "ip",
+                code: ZodIssueCode.invalid_string,
+                message: check.message
+              });
+              status.dirty();
+            }
+          } else if (check.kind === "base64") {
+            if (!base64Regex.test(input.data)) {
+              ctx = this._getOrReturnCtx(input, ctx);
+              addIssueToContext(ctx, {
+                validation: "base64",
+                code: ZodIssueCode.invalid_string,
+                message: check.message
+              });
+              status.dirty();
+            }
           } else {
             util.assertNever(check);
           }
         }
         return { status: status.value, value: input.data };
       }
+      _regex(regex, validation, message) {
+        return this.refinement((data) => regex.test(data), {
+          validation,
+          code: ZodIssueCode.invalid_string,
+          ...errorUtil.errToObj(message)
+        });
+      }
       _addCheck(check) {
         return new _ZodString({
           ...this._def,
@@ -2076,19 +2272,38 @@ var init_lib = __esm({
       url(message) {
         return this._addCheck({ kind: "url", ...errorUtil.errToObj(message) });
       }
+      emoji(message) {
+        return this._addCheck({ kind: "emoji", ...errorUtil.errToObj(message) });
+      }
       uuid(message) {
         return this._addCheck({ kind: "uuid", ...errorUtil.errToObj(message) });
       }
+      nanoid(message) {
+        return this._addCheck({ kind: "nanoid", ...errorUtil.errToObj(message) });
+      }
       cuid(message) {
         return this._addCheck({ kind: "cuid", ...errorUtil.errToObj(message) });
       }
+      cuid2(message) {
+        return this._addCheck({ kind: "cuid2", ...errorUtil.errToObj(message) });
+      }
+      ulid(message) {
+        return this._addCheck({ kind: "ulid", ...errorUtil.errToObj(message) });
+      }
+      base64(message) {
+        return this._addCheck({ kind: "base64", ...errorUtil.errToObj(message) });
+      }
+      ip(options) {
+        return this._addCheck({ kind: "ip", ...errorUtil.errToObj(options) });
+      }
       datetime(options) {
-        var _a;
+        var _a, _b;
         if (typeof options === "string") {
           return this._addCheck({
             kind: "datetime",
             precision: null,
             offset: false,
+            local: false,
             message: options
           });
         }
@@ -2096,9 +2311,30 @@ var init_lib = __esm({
           kind: "datetime",
           precision: typeof (options === null || options === void 0 ? void 0 : options.precision) === "undefined" ? null : options === null || options === void 0 ? void 0 : options.precision,
           offset: (_a = options === null || options === void 0 ? void 0 : options.offset) !== null && _a !== void 0 ? _a : false,
+          local: (_b = options === null || options === void 0 ? void 0 : options.local) !== null && _b !== void 0 ? _b : false,
+          ...errorUtil.errToObj(options === null || options === void 0 ? void 0 : options.message)
+        });
+      }
+      date(message) {
+        return this._addCheck({ kind: "date", message });
+      }
+      time(options) {
+        if (typeof options === "string") {
+          return this._addCheck({
+            kind: "time",
+            precision: null,
+            message: options
+          });
+        }
+        return this._addCheck({
+          kind: "time",
+          precision: typeof (options === null || options === void 0 ? void 0 : options.precision) === "undefined" ? null : options === null || options === void 0 ? void 0 : options.precision,
           ...errorUtil.errToObj(options === null || options === void 0 ? void 0 : options.message)
         });
       }
+      duration(message) {
+        return this._addCheck({ kind: "duration", ...errorUtil.errToObj(message) });
+      }
       regex(regex, message) {
         return this._addCheck({
           kind: "regex",
@@ -2106,6 +2342,14 @@ var init_lib = __esm({
           ...errorUtil.errToObj(message)
         });
       }
+      includes(value, options) {
+        return this._addCheck({
+          kind: "includes",
+          value,
+          position: options === null || options === void 0 ? void 0 : options.position,
+          ...errorUtil.errToObj(options === null || options === void 0 ? void 0 : options.message)
+        });
+      }
       startsWith(value, message) {
         return this._addCheck({
           kind: "startsWith",
@@ -2141,21 +2385,73 @@ var init_lib = __esm({
           ...errorUtil.errToObj(message)
         });
       }
+      /**
+       * @deprecated Use z.string().min(1) instead.
+       * @see {@link ZodString.min}
+       */
+      nonempty(message) {
+        return this.min(1, errorUtil.errToObj(message));
+      }
+      trim() {
+        return new _ZodString({
+          ...this._def,
+          checks: [...this._def.checks, { kind: "trim" }]
+        });
+      }
+      toLowerCase() {
+        return new _ZodString({
+          ...this._def,
+          checks: [...this._def.checks, { kind: "toLowerCase" }]
+        });
+      }
+      toUpperCase() {
+        return new _ZodString({
+          ...this._def,
+          checks: [...this._def.checks, { kind: "toUpperCase" }]
+        });
+      }
       get isDatetime() {
         return !!this._def.checks.find((ch) => ch.kind === "datetime");
       }
+      get isDate() {
+        return !!this._def.checks.find((ch) => ch.kind === "date");
+      }
+      get isTime() {
+        return !!this._def.checks.find((ch) => ch.kind === "time");
+      }
+      get isDuration() {
+        return !!this._def.checks.find((ch) => ch.kind === "duration");
+      }
       get isEmail() {
         return !!this._def.checks.find((ch) => ch.kind === "email");
       }
       get isURL() {
         return !!this._def.checks.find((ch) => ch.kind === "url");
       }
+      get isEmoji() {
+        return !!this._def.checks.find((ch) => ch.kind === "emoji");
+      }
       get isUUID() {
         return !!this._def.checks.find((ch) => ch.kind === "uuid");
       }
+      get isNANOID() {
+        return !!this._def.checks.find((ch) => ch.kind === "nanoid");
+      }
       get isCUID() {
         return !!this._def.checks.find((ch) => ch.kind === "cuid");
       }
+      get isCUID2() {
+        return !!this._def.checks.find((ch) => ch.kind === "cuid2");
+      }
+      get isULID() {
+        return !!this._def.checks.find((ch) => ch.kind === "ulid");
+      }
+      get isIP() {
+        return !!this._def.checks.find((ch) => ch.kind === "ip");
+      }
+      get isBase64() {
+        return !!this._def.checks.find((ch) => ch.kind === "base64");
+      }
       get minLength() {
         let min = null;
         for (const ch of this._def.checks) {
@@ -2357,6 +2653,19 @@ var init_lib = __esm({
           message: errorUtil.toString(message)
         });
       }
+      safe(message) {
+        return this._addCheck({
+          kind: "min",
+          inclusive: true,
+          value: Number.MIN_SAFE_INTEGER,
+          message: errorUtil.toString(message)
+        })._addCheck({
+          kind: "max",
+          inclusive: true,
+          value: Number.MAX_SAFE_INTEGER,
+          message: errorUtil.toString(message)
+        });
+      }
       get minValue() {
         let min = null;
         for (const ch of this._def.checks) {
@@ -2378,7 +2687,22 @@ var init_lib = __esm({
         return max;
       }
       get isInt() {
-        return !!this._def.checks.find((ch) => ch.kind === "int");
+        return !!this._def.checks.find((ch) => ch.kind === "int" || ch.kind === "multipleOf" && util.isInteger(ch.value));
+      }
+      get isFinite() {
+        let max = null, min = null;
+        for (const ch of this._def.checks) {
+          if (ch.kind === "finite" || ch.kind === "int" || ch.kind === "multipleOf") {
+            return true;
+          } else if (ch.kind === "min") {
+            if (min === null || ch.value > min)
+              min = ch.value;
+          } else if (ch.kind === "max") {
+            if (max === null || ch.value < max)
+              max = ch.value;
+          }
+        }
+        return Number.isFinite(min) && Number.isFinite(max);
       }
     };
     ZodNumber.create = (params) => {
@@ -2389,27 +2713,167 @@ var init_lib = __esm({
         ...processCreateParams(params)
       });
     };
-    ZodBigInt = class extends ZodType {
+    ZodBigInt = class _ZodBigInt extends ZodType {
+      constructor() {
+        super(...arguments);
+        this.min = this.gte;
+        this.max = this.lte;
+      }
       _parse(input) {
         if (this._def.coerce) {
           input.data = BigInt(input.data);
         }
         const parsedType = this._getType(input);
         if (parsedType !== ZodParsedType.bigint) {
-          const ctx = this._getOrReturnCtx(input);
-          addIssueToContext(ctx, {
+          const ctx2 = this._getOrReturnCtx(input);
+          addIssueToContext(ctx2, {
             code: ZodIssueCode.invalid_type,
             expected: ZodParsedType.bigint,
-            received: ctx.parsedType
+            received: ctx2.parsedType
           });
           return INVALID;
         }
-        return OK(input.data);
+        let ctx = void 0;
+        const status = new ParseStatus();
+        for (const check of this._def.checks) {
+          if (check.kind === "min") {
+            const tooSmall = check.inclusive ? input.data < check.value : input.data <= check.value;
+            if (tooSmall) {
+              ctx = this._getOrReturnCtx(input, ctx);
+              addIssueToContext(ctx, {
+                code: ZodIssueCode.too_small,
+                type: "bigint",
+                minimum: check.value,
+                inclusive: check.inclusive,
+                message: check.message
+              });
+              status.dirty();
+            }
+          } else if (check.kind === "max") {
+            const tooBig = check.inclusive ? input.data > check.value : input.data >= check.value;
+            if (tooBig) {
+              ctx = this._getOrReturnCtx(input, ctx);
+              addIssueToContext(ctx, {
+                code: ZodIssueCode.too_big,
+                type: "bigint",
+                maximum: check.value,
+                inclusive: check.inclusive,
+                message: check.message
+              });
+              status.dirty();
+            }
+          } else if (check.kind === "multipleOf") {
+            if (input.data % check.value !== BigInt(0)) {
+              ctx = this._getOrReturnCtx(input, ctx);
+              addIssueToContext(ctx, {
+                code: ZodIssueCode.not_multiple_of,
+                multipleOf: check.value,
+                message: check.message
+              });
+              status.dirty();
+            }
+          } else {
+            util.assertNever(check);
+          }
+        }
+        return { status: status.value, value: input.data };
+      }
+      gte(value, message) {
+        return this.setLimit("min", value, true, errorUtil.toString(message));
+      }
+      gt(value, message) {
+        return this.setLimit("min", value, false, errorUtil.toString(message));
+      }
+      lte(value, message) {
+        return this.setLimit("max", value, true, errorUtil.toString(message));
+      }
+      lt(value, message) {
+        return this.setLimit("max", value, false, errorUtil.toString(message));
+      }
+      setLimit(kind, value, inclusive, message) {
+        return new _ZodBigInt({
+          ...this._def,
+          checks: [
+            ...this._def.checks,
+            {
+              kind,
+              value,
+              inclusive,
+              message: errorUtil.toString(message)
+            }
+          ]
+        });
+      }
+      _addCheck(check) {
+        return new _ZodBigInt({
+          ...this._def,
+          checks: [...this._def.checks, check]
+        });
+      }
+      positive(message) {
+        return this._addCheck({
+          kind: "min",
+          value: BigInt(0),
+          inclusive: false,
+          message: errorUtil.toString(message)
+        });
+      }
+      negative(message) {
+        return this._addCheck({
+          kind: "max",
+          value: BigInt(0),
+          inclusive: false,
+          message: errorUtil.toString(message)
+        });
+      }
+      nonpositive(message) {
+        return this._addCheck({
+          kind: "max",
+          value: BigInt(0),
+          inclusive: true,
+          message: errorUtil.toString(message)
+        });
+      }
+      nonnegative(message) {
+        return this._addCheck({
+          kind: "min",
+          value: BigInt(0),
+          inclusive: true,
+          message: errorUtil.toString(message)
+        });
+      }
+      multipleOf(value, message) {
+        return this._addCheck({
+          kind: "multipleOf",
+          value,
+          message: errorUtil.toString(message)
+        });
+      }
+      get minValue() {
+        let min = null;
+        for (const ch of this._def.checks) {
+          if (ch.kind === "min") {
+            if (min === null || ch.value > min)
+              min = ch.value;
+          }
+        }
+        return min;
+      }
+      get maxValue() {
+        let max = null;
+        for (const ch of this._def.checks) {
+          if (ch.kind === "max") {
+            if (max === null || ch.value < max)
+              max = ch.value;
+          }
+        }
+        return max;
       }
     };
     ZodBigInt.create = (params) => {
       var _a;
       return new ZodBigInt({
+        checks: [],
         typeName: ZodFirstPartyTypeKind.ZodBigInt,
         coerce: (_a = params === null || params === void 0 ? void 0 : params.coerce) !== null && _a !== void 0 ? _a : false,
         ...processCreateParams(params)
@@ -2735,13 +3199,13 @@ var init_lib = __esm({
           }
         }
         if (ctx.common.async) {
-          return Promise.all(ctx.data.map((item, i) => {
+          return Promise.all([...ctx.data].map((item, i) => {
             return def.type._parseAsync(new ParseInputLazyPath(ctx, item, ctx.path, i));
           })).then((result2) => {
             return ParseStatus.mergeArray(status, result2);
           });
         }
-        const result = ctx.data.map((item, i) => {
+        const result = [...ctx.data].map((item, i) => {
           return def.type._parseSync(new ParseInputLazyPath(ctx, item, ctx.path, i));
         });
         return ParseStatus.mergeArray(status, result);
@@ -2781,31 +3245,12 @@ var init_lib = __esm({
         ...processCreateParams(params)
       });
     };
-    (function(objectUtil2) {
-      objectUtil2.mergeShapes = (first, second) => {
-        return {
-          ...first,
-          ...second
-          // second overwrites first
-        };
-      };
-    })(objectUtil || (objectUtil = {}));
-    AugmentFactory = (def) => (augmentation) => {
-      return new ZodObject({
-        ...def,
-        shape: () => ({
-          ...def.shape(),
-          ...augmentation
-        })
-      });
-    };
     ZodObject = class _ZodObject extends ZodType {
       constructor() {
         super(...arguments);
         this._cached = null;
         this.nonstrict = this.passthrough;
-        this.augment = AugmentFactory(this._def);
-        this.extend = AugmentFactory(this._def);
+        this.augment = this.extend;
       }
       _getCached() {
         if (this._cached !== null)
@@ -2886,9 +3331,10 @@ var init_lib = __esm({
             const syncPairs = [];
             for (const pair of pairs) {
               const key = await pair.key;
+              const value = await pair.value;
               syncPairs.push({
                 key,
-                value: await pair.value,
+                value,
                 alwaysSet: pair.alwaysSet
               });
             }
@@ -2935,8 +3381,31 @@ var init_lib = __esm({
           unknownKeys: "passthrough"
         });
       }
-      setKey(key, schema3) {
-        return this.augment({ [key]: schema3 });
+      // const AugmentFactory =
+      //   <Def extends ZodObjectDef>(def: Def) =>
+      //   <Augmentation extends ZodRawShape>(
+      //     augmentation: Augmentation
+      //   ): ZodObject<
+      //     extendShape<ReturnType<Def["shape"]>, Augmentation>,
+      //     Def["unknownKeys"],
+      //     Def["catchall"]
+      //   > => {
+      //     return new ZodObject({
+      //       ...def,
+      //       shape: () => ({
+      //         ...def.shape(),
+      //         ...augmentation,
+      //       }),
+      //     }) as any;
+      //   };
+      extend(augmentation) {
+        return new _ZodObject({
+          ...this._def,
+          shape: () => ({
+            ...this._def.shape(),
+            ...augmentation
+          })
+        });
       }
       /**
        * Prior to zod@1.0.12 there was a bug in the
@@ -2947,11 +3416,73 @@ var init_lib = __esm({
         const merged = new _ZodObject({
           unknownKeys: merging._def.unknownKeys,
           catchall: merging._def.catchall,
-          shape: () => objectUtil.mergeShapes(this._def.shape(), merging._def.shape()),
+          shape: () => ({
+            ...this._def.shape(),
+            ...merging._def.shape()
+          }),
           typeName: ZodFirstPartyTypeKind.ZodObject
         });
         return merged;
       }
+      // merge<
+      //   Incoming extends AnyZodObject,
+      //   Augmentation extends Incoming["shape"],
+      //   NewOutput extends {
+      //     [k in keyof Augmentation | keyof Output]: k extends keyof Augmentation
+      //       ? Augmentation[k]["_output"]
+      //       : k extends keyof Output
+      //       ? Output[k]
+      //       : never;
+      //   },
+      //   NewInput extends {
+      //     [k in keyof Augmentation | keyof Input]: k extends keyof Augmentation
+      //       ? Augmentation[k]["_input"]
+      //       : k extends keyof Input
+      //       ? Input[k]
+      //       : never;
+      //   }
+      // >(
+      //   merging: Incoming
+      // ): ZodObject<
+      //   extendShape<T, ReturnType<Incoming["_def"]["shape"]>>,
+      //   Incoming["_def"]["unknownKeys"],
+      //   Incoming["_def"]["catchall"],
+      //   NewOutput,
+      //   NewInput
+      // > {
+      //   const merged: any = new ZodObject({
+      //     unknownKeys: merging._def.unknownKeys,
+      //     catchall: merging._def.catchall,
+      //     shape: () =>
+      //       objectUtil.mergeShapes(this._def.shape(), merging._def.shape()),
+      //     typeName: ZodFirstPartyTypeKind.ZodObject,
+      //   }) as any;
+      //   return merged;
+      // }
+      setKey(key, schema3) {
+        return this.augment({ [key]: schema3 });
+      }
+      // merge<Incoming extends AnyZodObject>(
+      //   merging: Incoming
+      // ): //ZodObject<T & Incoming["_shape"], UnknownKeys, Catchall> = (merging) => {
+      // ZodObject<
+      //   extendShape<T, ReturnType<Incoming["_def"]["shape"]>>,
+      //   Incoming["_def"]["unknownKeys"],
+      //   Incoming["_def"]["catchall"]
+      // > {
+      //   // const mergedShape = objectUtil.mergeShapes(
+      //   //   this._def.shape(),
+      //   //   merging._def.shape()
+      //   // );
+      //   const merged: any = new ZodObject({
+      //     unknownKeys: merging._def.unknownKeys,
+      //     catchall: merging._def.catchall,
+      //     shape: () =>
+      //       objectUtil.mergeShapes(this._def.shape(), merging._def.shape()),
+      //     typeName: ZodFirstPartyTypeKind.ZodObject,
+      //   }) as any;
+      //   return merged;
+      // }
       catchall(index4) {
         return new _ZodObject({
           ...this._def,
@@ -2960,9 +3491,10 @@ var init_lib = __esm({
       }
       pick(mask) {
         const shape = {};
-        util.objectKeys(mask).map((key) => {
-          if (this.shape[key])
+        util.objectKeys(mask).forEach((key) => {
+          if (mask[key] && this.shape[key]) {
             shape[key] = this.shape[key];
+          }
         });
         return new _ZodObject({
           ...this._def,
@@ -2971,8 +3503,8 @@ var init_lib = __esm({
       }
       omit(mask) {
         const shape = {};
-        util.objectKeys(this.shape).map((key) => {
-          if (util.objectKeys(mask).indexOf(key) === -1) {
+        util.objectKeys(this.shape).forEach((key) => {
+          if (!mask[key]) {
             shape[key] = this.shape[key];
           }
         });
@@ -2981,29 +3513,22 @@ var init_lib = __esm({
           shape: () => shape
         });
       }
+      /**
+       * @deprecated
+       */
       deepPartial() {
         return deepPartialify(this);
       }
       partial(mask) {
         const newShape = {};
-        if (mask) {
-          util.objectKeys(this.shape).map((key) => {
-            if (util.objectKeys(mask).indexOf(key) === -1) {
-              newShape[key] = this.shape[key];
-            } else {
-              newShape[key] = this.shape[key].optional();
-            }
-          });
-          return new _ZodObject({
-            ...this._def,
-            shape: () => newShape
-          });
-        } else {
-          for (const key in this.shape) {
-            const fieldSchema = this.shape[key];
+        util.objectKeys(this.shape).forEach((key) => {
+          const fieldSchema = this.shape[key];
+          if (mask && !mask[key]) {
+            newShape[key] = fieldSchema;
+          } else {
             newShape[key] = fieldSchema.optional();
           }
-        }
+        });
         return new _ZodObject({
           ...this._def,
           shape: () => newShape
@@ -3011,21 +3536,10 @@ var init_lib = __esm({
       }
       required(mask) {
         const newShape = {};
-        if (mask) {
-          util.objectKeys(this.shape).map((key) => {
-            if (util.objectKeys(mask).indexOf(key) === -1) {
-              newShape[key] = this.shape[key];
-            } else {
-              const fieldSchema = this.shape[key];
-              let newField = fieldSchema;
-              while (newField instanceof ZodOptional) {
-                newField = newField._def.innerType;
-              }
-              newShape[key] = newField;
-            }
-          });
-        } else {
-          for (const key in this.shape) {
+        util.objectKeys(this.shape).forEach((key) => {
+          if (mask && !mask[key]) {
+            newShape[key] = this.shape[key];
+          } else {
             const fieldSchema = this.shape[key];
             let newField = fieldSchema;
             while (newField instanceof ZodOptional) {
@@ -3033,7 +3547,7 @@ var init_lib = __esm({
             }
             newShape[key] = newField;
           }
-        }
+        });
         return new _ZodObject({
           ...this._def,
           shape: () => newShape
@@ -3171,15 +3685,25 @@ var init_lib = __esm({
       } else if (type instanceof ZodEnum) {
         return type.options;
       } else if (type instanceof ZodNativeEnum) {
-        return Object.keys(type.enum);
+        return util.objectValues(type.enum);
       } else if (type instanceof ZodDefault) {
         return getDiscriminator(type._def.innerType);
       } else if (type instanceof ZodUndefined) {
         return [void 0];
       } else if (type instanceof ZodNull) {
         return [null];
+      } else if (type instanceof ZodOptional) {
+        return [void 0, ...getDiscriminator(type.unwrap())];
+      } else if (type instanceof ZodNullable) {
+        return [null, ...getDiscriminator(type.unwrap())];
+      } else if (type instanceof ZodBranded) {
+        return getDiscriminator(type.unwrap());
+      } else if (type instanceof ZodReadonly) {
+        return getDiscriminator(type.unwrap());
+      } else if (type instanceof ZodCatch) {
+        return getDiscriminator(type._def.innerType);
       } else {
-        return null;
+        return [];
       }
     };
     ZodDiscriminatedUnion = class _ZodDiscriminatedUnion extends ZodType {
@@ -3239,7 +3763,7 @@ var init_lib = __esm({
         const optionsMap = /* @__PURE__ */ new Map();
         for (const type of options) {
           const discriminatorValues = getDiscriminator(type.shape[discriminator]);
-          if (!discriminatorValues) {
+          if (!discriminatorValues.length) {
             throw new Error(`A discriminator value for key \`${discriminator}\` could not be extracted from all schema options`);
           }
           for (const value of discriminatorValues) {
@@ -3343,7 +3867,7 @@ var init_lib = __esm({
           });
           status.dirty();
         }
-        const items = ctx.data.map((item, itemIndex) => {
+        const items = [...ctx.data].map((item, itemIndex) => {
           const schema3 = this._def.items[itemIndex] || this._def.rest;
           if (!schema3)
             return null;
@@ -3401,7 +3925,8 @@ var init_lib = __esm({
         for (const key in ctx.data) {
           pairs.push({
             key: keyType._parse(new ParseInputLazyPath(ctx, key, ctx.path, key)),
-            value: valueType._parse(new ParseInputLazyPath(ctx, ctx.data[key], ctx.path, key))
+            value: valueType._parse(new ParseInputLazyPath(ctx, ctx.data[key], ctx.path, key)),
+            alwaysSet: key in ctx.data
           });
         }
         if (ctx.common.async) {
@@ -3431,6 +3956,12 @@ var init_lib = __esm({
       }
     };
     ZodMap = class extends ZodType {
+      get keySchema() {
+        return this._def.keyType;
+      }
+      get valueSchema() {
+        return this._def.valueType;
+      }
       _parse(input) {
         const { status, ctx } = this._processInputParams(input);
         if (ctx.parsedType !== ZodParsedType.map) {
@@ -3625,27 +4156,29 @@ var init_lib = __esm({
         const params = { errorMap: ctx.common.contextualErrorMap };
         const fn = ctx.data;
         if (this._def.returns instanceof ZodPromise) {
-          return OK(async (...args) => {
+          const me = this;
+          return OK(async function(...args) {
             const error2 = new ZodError([]);
-            const parsedArgs = await this._def.args.parseAsync(args, params).catch((e) => {
+            const parsedArgs = await me._def.args.parseAsync(args, params).catch((e) => {
               error2.addIssue(makeArgsIssue(args, e));
               throw error2;
             });
-            const result = await fn(...parsedArgs);
-            const parsedReturns = await this._def.returns._def.type.parseAsync(result, params).catch((e) => {
+            const result = await Reflect.apply(fn, this, parsedArgs);
+            const parsedReturns = await me._def.returns._def.type.parseAsync(result, params).catch((e) => {
               error2.addIssue(makeReturnsIssue(result, e));
               throw error2;
             });
             return parsedReturns;
           });
         } else {
-          return OK((...args) => {
-            const parsedArgs = this._def.args.safeParse(args, params);
+          const me = this;
+          return OK(function(...args) {
+            const parsedArgs = me._def.args.safeParse(args, params);
             if (!parsedArgs.success) {
               throw new ZodError([makeArgsIssue(args, parsedArgs.error)]);
             }
-            const result = fn(...parsedArgs.data);
-            const parsedReturns = this._def.returns.safeParse(result, params);
+            const result = Reflect.apply(fn, this, parsedArgs.data);
+            const parsedReturns = me._def.returns.safeParse(result, params);
             if (!parsedReturns.success) {
               throw new ZodError([makeReturnsIssue(result, parsedReturns.error)]);
             }
@@ -3710,6 +4243,7 @@ var init_lib = __esm({
         if (input.data !== this._def.value) {
           const ctx = this._getOrReturnCtx(input);
           addIssueToContext(ctx, {
+            received: ctx.data,
             code: ZodIssueCode.invalid_literal,
             expected: this._def.value
           });
@@ -3728,7 +4262,11 @@ var init_lib = __esm({
         ...processCreateParams(params)
       });
     };
-    ZodEnum = class extends ZodType {
+    ZodEnum = class _ZodEnum extends ZodType {
+      constructor() {
+        super(...arguments);
+        _ZodEnum_cache.set(this, void 0);
+      }
       _parse(input) {
         if (typeof input.data !== "string") {
           const ctx = this._getOrReturnCtx(input);
@@ -3740,7 +4278,10 @@ var init_lib = __esm({
           });
           return INVALID;
         }
-        if (this._def.values.indexOf(input.data) === -1) {
+        if (!__classPrivateFieldGet(this, _ZodEnum_cache, "f")) {
+          __classPrivateFieldSet(this, _ZodEnum_cache, new Set(this._def.values), "f");
+        }
+        if (!__classPrivateFieldGet(this, _ZodEnum_cache, "f").has(input.data)) {
           const ctx = this._getOrReturnCtx(input);
           const expectedValues = this._def.values;
           addIssueToContext(ctx, {
@@ -3776,9 +4317,26 @@ var init_lib = __esm({
         }
         return enumValues;
       }
+      extract(values, newDef = this._def) {
+        return _ZodEnum.create(values, {
+          ...this._def,
+          ...newDef
+        });
+      }
+      exclude(values, newDef = this._def) {
+        return _ZodEnum.create(this.options.filter((opt) => !values.includes(opt)), {
+          ...this._def,
+          ...newDef
+        });
+      }
     };
+    _ZodEnum_cache = /* @__PURE__ */ new WeakMap();
     ZodEnum.create = createZodEnum;
     ZodNativeEnum = class extends ZodType {
+      constructor() {
+        super(...arguments);
+        _ZodNativeEnum_cache.set(this, void 0);
+      }
       _parse(input) {
         const nativeEnumValues = util.getValidEnumValues(this._def.values);
         const ctx = this._getOrReturnCtx(input);
@@ -3791,7 +4349,10 @@ var init_lib = __esm({
           });
           return INVALID;
         }
-        if (nativeEnumValues.indexOf(input.data) === -1) {
+        if (!__classPrivateFieldGet(this, _ZodNativeEnum_cache, "f")) {
+          __classPrivateFieldSet(this, _ZodNativeEnum_cache, new Set(util.getValidEnumValues(this._def.values)), "f");
+        }
+        if (!__classPrivateFieldGet(this, _ZodNativeEnum_cache, "f").has(input.data)) {
           const expectedValues = util.objectValues(nativeEnumValues);
           addIssueToContext(ctx, {
             received: ctx.data,
@@ -3806,6 +4367,7 @@ var init_lib = __esm({
         return this._def.values;
       }
     };
+    _ZodNativeEnum_cache = /* @__PURE__ */ new WeakMap();
     ZodNativeEnum.create = (values, params) => {
       return new ZodNativeEnum({
         values,
@@ -3814,6 +4376,9 @@ var init_lib = __esm({
       });
     };
     ZodPromise = class extends ZodType {
+      unwrap() {
+        return this._def.type;
+      }
       _parse(input) {
         const { ctx } = this._processInputParams(input);
         if (ctx.parsedType !== ZodParsedType.promise && ctx.common.async === false) {
@@ -3850,24 +4415,6 @@ var init_lib = __esm({
       _parse(input) {
         const { status, ctx } = this._processInputParams(input);
         const effect = this._def.effect || null;
-        if (effect.type === "preprocess") {
-          const processed = effect.transform(ctx.data);
-          if (ctx.common.async) {
-            return Promise.resolve(processed).then((processed2) => {
-              return this._def.schema._parseAsync({
-                data: processed2,
-                path: ctx.path,
-                parent: ctx
-              });
-            });
-          } else {
-            return this._def.schema._parseSync({
-              data: processed,
-              path: ctx.path,
-              parent: ctx
-            });
-          }
-        }
         const checkCtx = {
           addIssue: (arg) => {
             addIssueToContext(ctx, arg);
@@ -3882,6 +4429,42 @@ var init_lib = __esm({
           }
         };
         checkCtx.addIssue = checkCtx.addIssue.bind(checkCtx);
+        if (effect.type === "preprocess") {
+          const processed = effect.transform(ctx.data, checkCtx);
+          if (ctx.common.async) {
+            return Promise.resolve(processed).then(async (processed2) => {
+              if (status.value === "aborted")
+                return INVALID;
+              const result = await this._def.schema._parseAsync({
+                data: processed2,
+                path: ctx.path,
+                parent: ctx
+              });
+              if (result.status === "aborted")
+                return INVALID;
+              if (result.status === "dirty")
+                return DIRTY(result.value);
+              if (status.value === "dirty")
+                return DIRTY(result.value);
+              return result;
+            });
+          } else {
+            if (status.value === "aborted")
+              return INVALID;
+            const result = this._def.schema._parseSync({
+              data: processed,
+              path: ctx.path,
+              parent: ctx
+            });
+            if (result.status === "aborted")
+              return INVALID;
+            if (result.status === "dirty")
+              return DIRTY(result.value);
+            if (status.value === "dirty")
+              return DIRTY(result.value);
+            return result;
+          }
+        }
         if (effect.type === "refinement") {
           const executeRefinement = (acc) => {
             const result = effect.refinement(acc, checkCtx);
@@ -4024,26 +4607,45 @@ var init_lib = __esm({
     ZodCatch = class extends ZodType {
       _parse(input) {
         const { ctx } = this._processInputParams(input);
+        const newCtx = {
+          ...ctx,
+          common: {
+            ...ctx.common,
+            issues: []
+          }
+        };
         const result = this._def.innerType._parse({
-          data: ctx.data,
-          path: ctx.path,
-          parent: ctx
+          data: newCtx.data,
+          path: newCtx.path,
+          parent: {
+            ...newCtx
+          }
         });
         if (isAsync(result)) {
           return result.then((result2) => {
             return {
               status: "valid",
-              value: result2.status === "valid" ? result2.value : this._def.defaultValue()
+              value: result2.status === "valid" ? result2.value : this._def.catchValue({
+                get error() {
+                  return new ZodError(newCtx.common.issues);
+                },
+                input: newCtx.data
+              })
             };
           });
         } else {
           return {
             status: "valid",
-            value: result.status === "valid" ? result.value : this._def.defaultValue()
+            value: result.status === "valid" ? result.value : this._def.catchValue({
+              get error() {
+                return new ZodError(newCtx.common.issues);
+              },
+              input: newCtx.data
+            })
           };
         }
       }
-      removeDefault() {
+      removeCatch() {
         return this._def.innerType;
       }
     };
@@ -4051,7 +4653,7 @@ var init_lib = __esm({
       return new ZodCatch({
         innerType: type,
         typeName: ZodFirstPartyTypeKind.ZodCatch,
-        defaultValue: typeof params.default === "function" ? params.default : () => params.default,
+        catchValue: typeof params.catch === "function" ? params.catch : () => params.catch,
         ...processCreateParams(params)
       });
     };
@@ -4146,6 +4748,28 @@ var init_lib = __esm({
         });
       }
     };
+    ZodReadonly = class extends ZodType {
+      _parse(input) {
+        const result = this._def.innerType._parse(input);
+        const freeze = (data) => {
+          if (isValid(data)) {
+            data.value = Object.freeze(data.value);
+          }
+          return data;
+        };
+        return isAsync(result) ? result.then((data) => freeze(data)) : freeze(result);
+      }
+      unwrap() {
+        return this._def.innerType;
+      }
+    };
+    ZodReadonly.create = (type, params) => {
+      return new ZodReadonly({
+        innerType: type,
+        typeName: ZodFirstPartyTypeKind.ZodReadonly,
+        ...processCreateParams(params)
+      });
+    };
     late = {
       object: ZodObject.lazycreate
     };
@@ -4185,6 +4809,7 @@ var init_lib = __esm({
       ZodFirstPartyTypeKind2["ZodPromise"] = "ZodPromise";
       ZodFirstPartyTypeKind2["ZodBranded"] = "ZodBranded";
       ZodFirstPartyTypeKind2["ZodPipeline"] = "ZodPipeline";
+      ZodFirstPartyTypeKind2["ZodReadonly"] = "ZodReadonly";
     })(ZodFirstPartyTypeKind || (ZodFirstPartyTypeKind = {}));
     stringType = ZodString.create;
     numberType = ZodNumber.create;
@@ -4764,19 +5389,54 @@ var init_utils = __esm({
     init_mysqlSchema();
     init_pgSchema();
     init_sqliteSchema();
-    init_source();
     init_global();
   }
 });
 
 // src/cli/views.ts
-var import_hanji;
+var import_hanji, Spinner, ProgressView;
 var init_views = __esm({
   "src/cli/views.ts"() {
     "use strict";
     init_source();
     import_hanji = __toESM(require_hanji());
     init_utils();
+    Spinner = class {
+      constructor(frames) {
+        this.frames = frames;
+        this.offset = 0;
+        this.tick = () => {
+          this.iterator();
+        };
+        this.value = () => {
+          return this.frames[this.offset];
+        };
+        this.iterator = () => {
+          this.offset += 1;
+          this.offset %= frames.length - 1;
+        };
+      }
+    };
+    ProgressView = class extends import_hanji.TaskView {
+      constructor(progressText, successText) {
+        super();
+        this.progressText = progressText;
+        this.successText = successText;
+        this.spinner = new Spinner("\u28F7\u28EF\u28DF\u287F\u28BF\u28FB\u28FD\u28FE".split(""));
+        this.timeout = setInterval(() => {
+          this.spinner.tick();
+          this.requestLayout();
+        }, 128);
+        this.on("detach", () => clearInterval(this.timeout));
+      }
+      render(status) {
+        if (status === "pending") {
+          const spin = this.spinner.value();
+          return `[${spin}] ${this.progressText}`;
+        }
+        return `[${source_default.green("\u2713")}] ${this.successText}`;
+      }
+    };
   }
 });
 
@@ -4785,7 +5445,6 @@ import * as glob from "glob";
 var init_serializer = __esm({
   "src/serializer/index.ts"() {
     "use strict";
-    init_source();
     init_views();
   }
 });
@@ -4794,7 +5453,6 @@ var init_serializer = __esm({
 var init_outputs = __esm({
   "src/cli/validations/outputs.ts"() {
     "use strict";
-    init_source();
   }
 });
 
@@ -4853,7 +5511,6 @@ var init_sqliteSerializer = __esm({
     "use strict";
     init_serializer();
     init_outputs();
-    init_source();
     dialect3 = new SQLiteSyncDialect();
     fromDatabase = async (db, tablesFilter = (table4) => true, progressCallback) => {
       const result = {};
@@ -4861,12 +5518,24 @@ var init_sqliteSerializer = __esm({
         `SELECT 
     m.name as "tableName", p.name as "columnName", p.type as "columnType", p."notnull" as "notNull", p.dflt_value as "defaultValue", p.pk as pk
     FROM sqlite_master AS m JOIN pragma_table_info(m.name) AS p
-    WHERE m.type = 'table' and m.tbl_name != 'sqlite_sequence' and m.tbl_name != 'sqlite_stat1' and m.tbl_name != '_litestream_seq' and m.tbl_name != '_litestream_lock' and m.tbl_name != 'libsql_wasm_func_table' and m.tbl_name != '__drizzle_migrations';
+    WHERE m.type = 'table' 
+    and m.tbl_name != 'sqlite_sequence' 
+    and m.tbl_name != 'sqlite_stat1' 
+    and m.tbl_name != '_litestream_seq' 
+    and m.tbl_name != '_litestream_lock' 
+    and m.tbl_name != 'libsql_wasm_func_table' 
+    and m.tbl_name != '__drizzle_migrations' 
+    and m.tbl_name != '_cf_KV';
     `
       );
       const tablesWithSeq = [];
       const seq = await db.query(
-        `SELECT * FROM sqlite_master WHERE name != 'sqlite_sequence' and name != 'sqlite_stat1' and name != '_litestream_seq' and name != '_litestream_lock' and sql GLOB '*[ *' || CHAR(9) || CHAR(10) || CHAR(13) || ']AUTOINCREMENT[^'']*';`
+        `SELECT * FROM sqlite_master WHERE name != 'sqlite_sequence' 
+    and name != 'sqlite_stat1' 
+    and name != '_litestream_seq' 
+    and name != '_litestream_lock' 
+    and tbl_name != '_cf_KV' 
+    and sql GLOB '*[ *' || CHAR(9) || CHAR(10) || CHAR(13) || ']AUTOINCREMENT[^'']*';`
       );
       for (const s of seq) {
         tablesWithSeq.push(s.name);
@@ -4951,7 +5620,8 @@ var init_sqliteSerializer = __esm({
       try {
         const fks = await db.query(
           `SELECT m.name as "tableFrom", f.id as "id", f."table" as "tableTo", f."from", f."to", f."on_update" as "onUpdate", f."on_delete" as "onDelete", f.seq as "seq"
-      FROM sqlite_master m, pragma_foreign_key_list(m.name) as f;`
+      FROM sqlite_master m, pragma_foreign_key_list(m.name) as f 
+      where m.tbl_name != '_cf_KV';`
         );
         const fkByTableName = {};
         for (const fkRow of fks) {
@@ -5010,7 +5680,9 @@ FROM sqlite_master AS m,
     pragma_index_list(m.name) AS il,
     pragma_index_info(il.name) AS ii
 WHERE 
-    m.type = 'table' and il.name NOT LIKE 'sqlite_autoindex_%';`
+    m.type = 'table' 
+    and il.name NOT LIKE 'sqlite_autoindex_%'
+    and m.tbl_name != '_cf_KV';`
       );
       for (const idxRow of idxs) {
         const tableName = idxRow.tableName;
@@ -5276,7 +5948,6 @@ var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
     "use strict";
     init_serializer();
-    init_source();
     init_outputs();
     dialect4 = new PgDialect();
     trimChar = (str, char) => {
@@ -5644,6 +6315,7 @@ var init_pgSerializer = __esm({
       "time without time zone": "::time without 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",
       // interval: "::interval",
       // character: "::bpchar",
@@ -5656,15 +6328,15 @@ var init_pgSerializer = __esm({
       "character(": "::bpchar"
     };
     defaultForColumn = (column4) => {
+      if (column4.column_default === null) {
+        return void 0;
+      }
       if (column4.data_type === "serial" || column4.data_type === "smallserial" || column4.data_type === "bigserial") {
         return void 0;
       }
       const hasDifferentDefaultCast = Object.keys(columnToDefault).find(
         (it) => column4.data_type.startsWith(it)
       );
-      if (column4.column_default === null) {
-        return void 0;
-      }
       const columnDefaultAsString = column4.column_default.toString();
       if (columnDefaultAsString.endsWith(
         hasDifferentDefaultCast ? columnToDefault[hasDifferentDefaultCast] : column4.data_type
@@ -5994,10 +6666,10 @@ Array.prototype.random = function() {
   return this[~~(Math.random() * this.length)];
 };
 
-// node_modules/.pnpm/minimatch@7.4.3/node_modules/minimatch/dist/mjs/index.js
+// node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/index.js
 var import_brace_expansion = __toESM(require_brace_expansion(), 1);
 
-// node_modules/.pnpm/minimatch@7.4.3/node_modules/minimatch/dist/mjs/brace-expressions.js
+// node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/brace-expressions.js
 var posixClasses = {
   "[:alnum:]": ["\\p{L}\\p{Nl}\\p{Nd}", true],
   "[:alpha:]": ["\\p{L}\\p{Nl}", true],
@@ -6107,17 +6779,17 @@ var parseClass = (glob2, position) => {
   return [comb, uflag, endPos - pos, true];
 };
 
-// node_modules/.pnpm/minimatch@7.4.3/node_modules/minimatch/dist/mjs/escape.js
+// node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/escape.js
 var escape = (s, { windowsPathsNoEscape = false } = {}) => {
   return windowsPathsNoEscape ? s.replace(/[?*()[\]]/g, "[$&]") : s.replace(/[?*()[\]\\]/g, "\\$&");
 };
 
-// node_modules/.pnpm/minimatch@7.4.3/node_modules/minimatch/dist/mjs/unescape.js
+// node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/unescape.js
 var unescape = (s, { windowsPathsNoEscape = false } = {}) => {
   return windowsPathsNoEscape ? s.replace(/\[([^\/\\])\]/g, "$1") : s.replace(/((?!\\).|^)\[([^\/\\])\]/g, "$1$2").replace(/\\([^\/])/g, "$1");
 };
 
-// node_modules/.pnpm/minimatch@7.4.3/node_modules/minimatch/dist/mjs/index.js
+// node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/index.js
 var minimatch = (p, pattern, options = {}) => {
   assertValidPattern(pattern);
   if (!options.nocomment && pattern.charAt(0) === "#") {
@@ -7056,7 +7728,14 @@ var sqlitePushIntrospect = async (db, filters) => {
     }
     return false;
   };
-  const res = await fromDatabase(db, filter2);
+  const progress = new ProgressView(
+    "Pulling schema from database...",
+    "Pulling schema from database..."
+  );
+  const res = await (0, import_hanji2.renderWithTask)(
+    progress,
+    fromDatabase(db, filter2)
+  );
   const schema3 = { id: originUUID, prevId: "", ...res };
   return { schema: schema3 };
 };
@@ -7064,6 +7743,8 @@ var sqlitePushIntrospect = async (db, filters) => {
 // src/cli/commands/pgIntrospect.ts
 init_pgSerializer();
 init_global();
+init_views();
+var import_hanji3 = __toESM(require_hanji());
 var pgPushIntrospect = async (db, filters, schemaFilters) => {
   const matchers = filters.map((it) => {
     return new Minimatch(it);
@@ -7078,7 +7759,14 @@ var pgPushIntrospect = async (db, filters, schemaFilters) => {
     }
     return false;
   };
-  const res = await fromDatabase2(db, filter2, schemaFilters);
+  const progress = new ProgressView(
+    "Pulling schema from database...",
+    "Pulling schema from database..."
+  );
+  const res = await (0, import_hanji3.renderWithTask)(
+    progress,
+    fromDatabase2(db, filter2, schemaFilters)
+  );
   const schema3 = { id: originUUID, prevId: "", ...res };
   const { internal, ...schemaWithoutInternals } = schema3;
   return { schema: schemaWithoutInternals };