drizzle-kit 0.20.17-a2979a1 → 0.20.17-b08243d

package/payload.mjs

@@ -40,7 +40,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/vendor/ansi-styles/index.js
+// node_modules/.pnpm/chalk@5.2.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)) {
@@ -157,7 +157,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.3.0/node_modules/chalk/source/vendor/ansi-styles/index.js"() {
+  "node_modules/.pnpm/chalk@5.2.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`;
@@ -231,7 +231,7 @@ var init_ansi_styles = __esm({
   }
 });
 
-// node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/vendor/supports-color/index.js
+// node_modules/.pnpm/chalk@5.2.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";
@@ -298,7 +298,7 @@ function _supportsColor(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
     return 1;
   }
   if ("CI" in env) {
-    if ("GITHUB_ACTIONS" in env || "GITEA_ACTIONS" in env) {
+    if ("GITHUB_ACTIONS" in env) {
       return 3;
     }
     if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI", "BUILDKITE", "DRONE"].some((sign) => sign in env) || env.CI_NAME === "codeship") {
@@ -346,7 +346,7 @@ function createSupportsColor(stream, options = {}) {
 }
 var env, flagForceColor, supportsColor, supports_color_default;
 var init_supports_color = __esm({
-  "node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/vendor/supports-color/index.js"() {
+  "node_modules/.pnpm/chalk@5.2.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;
@@ -361,7 +361,7 @@ var init_supports_color = __esm({
   }
 });
 
-// node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/utilities.js
+// node_modules/.pnpm/chalk@5.2.0/node_modules/chalk/source/utilities.js
 function stringReplaceAll(string, substring, replacer) {
   let index4 = string.indexOf(substring);
   if (index4 === -1) {
@@ -391,20 +391,21 @@ function stringEncaseCRLFWithFirstIndex(string, prefix, postfix, index4) {
   return returnValue;
 }
 var init_utilities = __esm({
-  "node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/utilities.js"() {
+  "node_modules/.pnpm/chalk@5.2.0/node_modules/chalk/source/utilities.js"() {
   }
 });
 
-// node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/index.js
+// node_modules/.pnpm/chalk@5.2.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, source_default;
 var init_source = __esm({
-  "node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/index.js"() {
+  "node_modules/.pnpm/chalk@5.2.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");
@@ -1115,12 +1116,11 @@ var init_global = __esm({
   }
 });
 
-// node_modules/.pnpm/zod@3.23.4/node_modules/zod/lib/index.mjs
+// node_modules/.pnpm/zod@3.20.2/node_modules/zod/lib/index.mjs
 function getErrorMap() {
   return overrideErrorMap;
 }
 function addIssueToContext(ctx, issueData) {
-  const overrideMap = getErrorMap();
   const issue = makeIssue({
     issueData,
     data: ctx.data,
@@ -1128,29 +1128,13 @@ function addIssueToContext(ctx, issueData) {
     errorMaps: [
       ctx.common.contextualErrorMap,
       ctx.schemaErrorMap,
-      overrideMap,
-      overrideMap === errorMap ? void 0 : errorMap
+      getErrorMap(),
+      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 {};
@@ -1161,50 +1145,15 @@ function processCreateParams(params) {
   if (errorMap2)
     return { errorMap: errorMap2, description };
   const customMap = (iss, ctx) => {
-    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: (_a = message !== null && message !== void 0 ? message : required_error) !== null && _a !== void 0 ? _a : 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 };
+    if (typeof ctx.data === "undefined") {
+      return { message: required_error !== null && required_error !== void 0 ? required_error : ctx.defaultError };
+    }
+    return { message: invalid_type_error !== null && invalid_type_error !== void 0 ? invalid_type_error : 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;
@@ -1225,10 +1174,7 @@ function deepPartialify(schema4) {
       shape: () => newShape
     });
   } else if (schema4 instanceof ZodArray) {
-    return new ZodArray({
-      ...schema4._def,
-      type: deepPartialify(schema4.element)
-    });
+    return ZodArray.create(deepPartialify(schema4.element));
   } else if (schema4 instanceof ZodOptional) {
     return ZodOptional.create(deepPartialify(schema4.unwrap()));
   } else if (schema4 instanceof ZodNullable) {
@@ -1284,9 +1230,9 @@ function createZodEnum(values, params) {
     ...processCreateParams(params)
   });
 }
-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, coerce;
+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, coerce;
 var init_lib = __esm({
-  "node_modules/.pnpm/zod@3.23.4/node_modules/zod/lib/index.mjs"() {
+  "node_modules/.pnpm/zod@3.20.2/node_modules/zod/lib/index.mjs"() {
     (function(util2) {
       util2.assertEqual = (val) => val;
       function assertIs(_arg) {
@@ -1344,15 +1290,6 @@ 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",
@@ -1434,7 +1371,7 @@ var init_lib = __esm({
       "not_multiple_of",
       "not_finite"
     ]);
-    ZodError = class _ZodError extends Error {
+    ZodError = class extends Error {
       constructor(issues) {
         super();
         this.issues = [];
@@ -1492,11 +1429,6 @@ 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;
       }
@@ -1563,12 +1495,7 @@ var init_lib = __esm({
           break;
         case ZodIssueCode.invalid_string:
           if (typeof issue.validation === "object") {
-            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) {
+            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}"`;
@@ -1589,7 +1516,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(Number(issue.minimum))}`;
+            message = `Date must be ${issue.exact ? `exactly equal to ` : issue.inclusive ? `greater than or equal to ` : `greater than `}${new Date(issue.minimum)}`;
           else
             message = "Invalid input";
           break;
@@ -1600,10 +1527,8 @@ 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(Number(issue.maximum))}`;
+            message = `Date must be ${issue.exact ? `exactly` : issue.inclusive ? `smaller than or equal to` : `smaller than`} ${new Date(issue.maximum)}`;
           else
             message = "Invalid input";
           break;
@@ -1633,13 +1558,6 @@ 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) {
@@ -1648,7 +1566,7 @@ var init_lib = __esm({
       return {
         ...issueData,
         path: fullPath,
-        message: errorMessage
+        message: issueData.message || errorMessage
       };
     };
     ParseStatus = class _ParseStatus {
@@ -1677,11 +1595,9 @@ 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,
-            value
+            key: await pair.key,
+            value: await pair.value
           });
         }
         return _ParseStatus.mergeObjectSync(status, syncPairs);
@@ -1698,7 +1614,7 @@ var init_lib = __esm({
             status.dirty();
           if (value.status === "dirty")
             status.dirty();
-          if (key.value !== "__proto__" && (typeof value.value !== "undefined" || pair.alwaysSet)) {
+          if (typeof value.value !== "undefined" || pair.alwaysSet) {
             finalObject[key.value] = value.value;
           }
         }
@@ -1713,28 +1629,20 @@ var init_lib = __esm({
     isAborted = (x) => x.status === "aborted";
     isDirty = (x) => x.status === "dirty";
     isValid = (x) => x.status === "valid";
-    isAsync = (x) => typeof Promise !== "undefined" && x instanceof Promise;
+    isAsync = (x) => typeof Promise !== void 0 && 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() {
-        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;
+        return this._path.concat(this._key);
       }
     };
     handleResult = (ctx, result) => {
@@ -1744,16 +1652,8 @@ var init_lib = __esm({
         if (!ctx.common.issues.length) {
           throw new Error("Validation failed but no issues detected.");
         }
-        return {
-          success: false,
-          get error() {
-            if (this._error)
-              return this._error;
-            const error2 = new ZodError(ctx.common.issues);
-            this._error = error2;
-            return this._error;
-          }
-        };
+        const error2 = new ZodError(ctx.common.issues);
+        return { success: false, error: error2 };
       }
     };
     ZodType = class {
@@ -1781,7 +1681,6 @@ 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);
       }
@@ -1926,29 +1825,28 @@ var init_lib = __esm({
         return this._refinement(refinement);
       }
       optional() {
-        return ZodOptional.create(this, this._def);
+        return ZodOptional.create(this);
       }
       nullable() {
-        return ZodNullable.create(this, this._def);
+        return ZodNullable.create(this);
       }
       nullish() {
-        return this.nullable().optional();
+        return this.optional().nullable();
       }
       array() {
-        return ZodArray.create(this, this._def);
+        return ZodArray.create(this);
       }
       promise() {
-        return ZodPromise.create(this, this._def);
+        return ZodPromise.create(this);
       }
       or(option) {
-        return ZodUnion.create([this, option], this._def);
+        return ZodUnion.create([this, option]);
       }
       and(incoming) {
-        return ZodIntersection.create(this, incoming, this._def);
+        return ZodIntersection.create(this, incoming);
       }
       transform(transform) {
         return new ZodEffects({
-          ...processCreateParams(this._def),
           schema: this,
           typeName: ZodFirstPartyTypeKind.ZodEffects,
           effect: { type: "transform", transform }
@@ -1957,7 +1855,6 @@ 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
@@ -1967,15 +1864,14 @@ var init_lib = __esm({
         return new ZodBranded({
           typeName: ZodFirstPartyTypeKind.ZodBranded,
           type: this,
-          ...processCreateParams(this._def)
+          ...processCreateParams(void 0)
         });
       }
       catch(def) {
-        const catchValueFunc = typeof def === "function" ? def : () => def;
+        const defaultValueFunc = typeof def === "function" ? def : () => def;
         return new ZodCatch({
-          ...processCreateParams(this._def),
           innerType: this,
-          catchValue: catchValueFunc,
+          defaultValue: defaultValueFunc,
           typeName: ZodFirstPartyTypeKind.ZodCatch
         });
       }
@@ -1989,9 +1885,6 @@ var init_lib = __esm({
       pipe(target) {
         return ZodPipeline.create(this, target);
       }
-      readonly() {
-        return ZodReadonly.create(this);
-      }
       isOptional() {
         return this.safeParse(void 0).success;
       }
@@ -2000,19 +1893,43 @@ var init_lib = __esm({
       }
     };
     cuidRegex = /^c[^\s-]{8,}$/i;
-    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}$`);
+    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$`);
+        }
+      }
+    };
     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);
@@ -2020,11 +1937,15 @@ 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();
@@ -2092,19 +2013,6 @@ 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);
@@ -2115,16 +2023,6 @@ 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);
@@ -2135,26 +2033,6 @@ 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);
@@ -2181,20 +2059,6 @@ 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);
@@ -2226,71 +2090,12 @@ 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,
@@ -2303,38 +2108,19 @@ 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, _b;
+        var _a;
         if (typeof options === "string") {
           return this._addCheck({
             kind: "datetime",
             precision: null,
             offset: false,
-            local: false,
             message: options
           });
         }
@@ -2342,30 +2128,9 @@ 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",
@@ -2373,14 +2138,6 @@ 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",
@@ -2416,73 +2173,21 @@ 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) {
@@ -2684,19 +2389,6 @@ 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) {
@@ -2718,22 +2410,7 @@ var init_lib = __esm({
         return max;
       }
       get isInt() {
-        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);
+        return !!this._def.checks.find((ch) => ch.kind === "int");
       }
     };
     ZodNumber.create = (params) => {
@@ -2744,167 +2421,27 @@ var init_lib = __esm({
         ...processCreateParams(params)
       });
     };
-    ZodBigInt = class _ZodBigInt extends ZodType {
-      constructor() {
-        super(...arguments);
-        this.min = this.gte;
-        this.max = this.lte;
-      }
+    ZodBigInt = class extends ZodType {
       _parse(input) {
         if (this._def.coerce) {
           input.data = BigInt(input.data);
         }
         const parsedType = this._getType(input);
         if (parsedType !== ZodParsedType.bigint) {
-          const ctx2 = this._getOrReturnCtx(input);
-          addIssueToContext(ctx2, {
+          const ctx = this._getOrReturnCtx(input);
+          addIssueToContext(ctx, {
             code: ZodIssueCode.invalid_type,
             expected: ZodParsedType.bigint,
-            received: ctx2.parsedType
+            received: ctx.parsedType
           });
           return INVALID;
         }
-        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;
+        return OK(input.data);
       }
     };
     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)
@@ -3230,13 +2767,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);
@@ -3276,12 +2813,31 @@ 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 = this.extend;
+        this.augment = AugmentFactory(this._def);
+        this.extend = AugmentFactory(this._def);
       }
       _getCached() {
         if (this._cached !== null)
@@ -3362,10 +2918,9 @@ 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,
+                value: await pair.value,
                 alwaysSet: pair.alwaysSet
               });
             }
@@ -3412,31 +2967,8 @@ var init_lib = __esm({
           unknownKeys: "passthrough"
         });
       }
-      // 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
-          })
-        });
+      setKey(key, schema4) {
+        return this.augment({ [key]: schema4 });
       }
       /**
        * Prior to zod@1.0.12 there was a bug in the
@@ -3447,73 +2979,11 @@ var init_lib = __esm({
         const merged = new _ZodObject({
           unknownKeys: merging._def.unknownKeys,
           catchall: merging._def.catchall,
-          shape: () => ({
-            ...this._def.shape(),
-            ...merging._def.shape()
-          }),
+          shape: () => objectUtil.mergeShapes(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, schema4) {
-        return this.augment({ [key]: schema4 });
-      }
-      // 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,
@@ -3522,10 +2992,9 @@ var init_lib = __esm({
       }
       pick(mask) {
         const shape = {};
-        util.objectKeys(mask).forEach((key) => {
-          if (mask[key] && this.shape[key]) {
+        util.objectKeys(mask).map((key) => {
+          if (this.shape[key])
             shape[key] = this.shape[key];
-          }
         });
         return new _ZodObject({
           ...this._def,
@@ -3534,8 +3003,8 @@ var init_lib = __esm({
       }
       omit(mask) {
         const shape = {};
-        util.objectKeys(this.shape).forEach((key) => {
-          if (!mask[key]) {
+        util.objectKeys(this.shape).map((key) => {
+          if (util.objectKeys(mask).indexOf(key) === -1) {
             shape[key] = this.shape[key];
           }
         });
@@ -3544,22 +3013,29 @@ var init_lib = __esm({
           shape: () => shape
         });
       }
-      /**
-       * @deprecated
-       */
       deepPartial() {
         return deepPartialify(this);
       }
       partial(mask) {
         const newShape = {};
-        util.objectKeys(this.shape).forEach((key) => {
-          const fieldSchema = this.shape[key];
-          if (mask && !mask[key]) {
-            newShape[key] = fieldSchema;
-          } else {
+        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];
             newShape[key] = fieldSchema.optional();
           }
-        });
+        }
         return new _ZodObject({
           ...this._def,
           shape: () => newShape
@@ -3567,10 +3043,21 @@ var init_lib = __esm({
       }
       required(mask) {
         const newShape = {};
-        util.objectKeys(this.shape).forEach((key) => {
-          if (mask && !mask[key]) {
-            newShape[key] = this.shape[key];
-          } else {
+        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) {
             const fieldSchema = this.shape[key];
             let newField = fieldSchema;
             while (newField instanceof ZodOptional) {
@@ -3578,7 +3065,7 @@ var init_lib = __esm({
             }
             newShape[key] = newField;
           }
-        });
+        }
         return new _ZodObject({
           ...this._def,
           shape: () => newShape
@@ -3716,25 +3203,15 @@ var init_lib = __esm({
       } else if (type instanceof ZodEnum) {
         return type.options;
       } else if (type instanceof ZodNativeEnum) {
-        return util.objectValues(type.enum);
+        return Object.keys(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 [];
+        return null;
       }
     };
     ZodDiscriminatedUnion = class _ZodDiscriminatedUnion extends ZodType {
@@ -3794,7 +3271,7 @@ var init_lib = __esm({
         const optionsMap = /* @__PURE__ */ new Map();
         for (const type of options) {
           const discriminatorValues = getDiscriminator(type.shape[discriminator]);
-          if (!discriminatorValues.length) {
+          if (!discriminatorValues) {
             throw new Error(`A discriminator value for key \`${discriminator}\` could not be extracted from all schema options`);
           }
           for (const value of discriminatorValues) {
@@ -3898,7 +3375,7 @@ var init_lib = __esm({
           });
           status.dirty();
         }
-        const items = [...ctx.data].map((item, itemIndex) => {
+        const items = ctx.data.map((item, itemIndex) => {
           const schema4 = this._def.items[itemIndex] || this._def.rest;
           if (!schema4)
             return null;
@@ -3956,8 +3433,7 @@ 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)),
-            alwaysSet: key in ctx.data
+            value: valueType._parse(new ParseInputLazyPath(ctx, ctx.data[key], ctx.path, key))
           });
         }
         if (ctx.common.async) {
@@ -3987,12 +3463,6 @@ 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) {
@@ -4187,29 +3657,27 @@ var init_lib = __esm({
         const params = { errorMap: ctx.common.contextualErrorMap };
         const fn = ctx.data;
         if (this._def.returns instanceof ZodPromise) {
-          const me = this;
-          return OK(async function(...args) {
+          return OK(async (...args) => {
             const error2 = new ZodError([]);
-            const parsedArgs = await me._def.args.parseAsync(args, params).catch((e) => {
+            const parsedArgs = await this._def.args.parseAsync(args, params).catch((e) => {
               error2.addIssue(makeArgsIssue(args, e));
               throw error2;
             });
-            const result = await Reflect.apply(fn, this, parsedArgs);
-            const parsedReturns = await me._def.returns._def.type.parseAsync(result, params).catch((e) => {
+            const result = await fn(...parsedArgs);
+            const parsedReturns = await this._def.returns._def.type.parseAsync(result, params).catch((e) => {
               error2.addIssue(makeReturnsIssue(result, e));
               throw error2;
             });
             return parsedReturns;
           });
         } else {
-          const me = this;
-          return OK(function(...args) {
-            const parsedArgs = me._def.args.safeParse(args, params);
+          return OK((...args) => {
+            const parsedArgs = this._def.args.safeParse(args, params);
             if (!parsedArgs.success) {
               throw new ZodError([makeArgsIssue(args, parsedArgs.error)]);
             }
-            const result = Reflect.apply(fn, this, parsedArgs.data);
-            const parsedReturns = me._def.returns.safeParse(result, params);
+            const result = fn(...parsedArgs.data);
+            const parsedReturns = this._def.returns.safeParse(result, params);
             if (!parsedReturns.success) {
               throw new ZodError([makeReturnsIssue(result, parsedReturns.error)]);
             }
@@ -4274,7 +3742,6 @@ 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
           });
@@ -4293,11 +3760,7 @@ var init_lib = __esm({
         ...processCreateParams(params)
       });
     };
-    ZodEnum = class _ZodEnum extends ZodType {
-      constructor() {
-        super(...arguments);
-        _ZodEnum_cache.set(this, void 0);
-      }
+    ZodEnum = class extends ZodType {
       _parse(input) {
         if (typeof input.data !== "string") {
           const ctx = this._getOrReturnCtx(input);
@@ -4309,10 +3772,7 @@ var init_lib = __esm({
           });
           return INVALID;
         }
-        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)) {
+        if (this._def.values.indexOf(input.data) === -1) {
           const ctx = this._getOrReturnCtx(input);
           const expectedValues = this._def.values;
           addIssueToContext(ctx, {
@@ -4348,26 +3808,9 @@ 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);
@@ -4380,10 +3823,7 @@ var init_lib = __esm({
           });
           return INVALID;
         }
-        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)) {
+        if (nativeEnumValues.indexOf(input.data) === -1) {
           const expectedValues = util.objectValues(nativeEnumValues);
           addIssueToContext(ctx, {
             received: ctx.data,
@@ -4398,7 +3838,6 @@ var init_lib = __esm({
         return this._def.values;
       }
     };
-    _ZodNativeEnum_cache = /* @__PURE__ */ new WeakMap();
     ZodNativeEnum.create = (values, params) => {
       return new ZodNativeEnum({
         values,
@@ -4407,9 +3846,6 @@ 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) {
@@ -4446,56 +3882,38 @@ var init_lib = __esm({
       _parse(input) {
         const { status, ctx } = this._processInputParams(input);
         const effect = this._def.effect || null;
-        const checkCtx = {
-          addIssue: (arg) => {
-            addIssueToContext(ctx, arg);
-            if (arg.fatal) {
-              status.abort();
-            } else {
-              status.dirty();
-            }
-          },
-          get path() {
-            return ctx.path;
-          }
-        };
-        checkCtx.addIssue = checkCtx.addIssue.bind(checkCtx);
         if (effect.type === "preprocess") {
-          const processed = effect.transform(ctx.data, checkCtx);
+          const processed = effect.transform(ctx.data);
           if (ctx.common.async) {
-            return Promise.resolve(processed).then(async (processed2) => {
-              if (status.value === "aborted")
-                return INVALID;
-              const result = await this._def.schema._parseAsync({
+            return Promise.resolve(processed).then((processed2) => {
+              return 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({
+            return 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;
           }
         }
+        const checkCtx = {
+          addIssue: (arg) => {
+            addIssueToContext(ctx, arg);
+            if (arg.fatal) {
+              status.abort();
+            } else {
+              status.dirty();
+            }
+          },
+          get path() {
+            return ctx.path;
+          }
+        };
+        checkCtx.addIssue = checkCtx.addIssue.bind(checkCtx);
         if (effect.type === "refinement") {
           const executeRefinement = (acc) => {
             const result = effect.refinement(acc, checkCtx);
@@ -4638,45 +4056,26 @@ 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: newCtx.data,
-          path: newCtx.path,
-          parent: {
-            ...newCtx
-          }
+          data: ctx.data,
+          path: ctx.path,
+          parent: ctx
         });
         if (isAsync(result)) {
           return result.then((result2) => {
             return {
               status: "valid",
-              value: result2.status === "valid" ? result2.value : this._def.catchValue({
-                get error() {
-                  return new ZodError(newCtx.common.issues);
-                },
-                input: newCtx.data
-              })
+              value: result2.status === "valid" ? result2.value : this._def.defaultValue()
             };
           });
         } else {
           return {
             status: "valid",
-            value: result.status === "valid" ? result.value : this._def.catchValue({
-              get error() {
-                return new ZodError(newCtx.common.issues);
-              },
-              input: newCtx.data
-            })
+            value: result.status === "valid" ? result.value : this._def.defaultValue()
           };
         }
       }
-      removeCatch() {
+      removeDefault() {
         return this._def.innerType;
       }
     };
@@ -4684,7 +4083,7 @@ var init_lib = __esm({
       return new ZodCatch({
         innerType: type,
         typeName: ZodFirstPartyTypeKind.ZodCatch,
-        catchValue: typeof params.catch === "function" ? params.catch : () => params.catch,
+        defaultValue: typeof params.default === "function" ? params.default : () => params.default,
         ...processCreateParams(params)
       });
     };
@@ -4779,25 +4178,6 @@ var init_lib = __esm({
         });
       }
     };
-    ZodReadonly = class extends ZodType {
-      _parse(input) {
-        const result = this._def.innerType._parse(input);
-        if (isValid(result)) {
-          result.value = Object.freeze(result.value);
-        }
-        return result;
-      }
-      unwrap() {
-        return this._def.innerType;
-      }
-    };
-    ZodReadonly.create = (type, params) => {
-      return new ZodReadonly({
-        innerType: type,
-        typeName: ZodFirstPartyTypeKind.ZodReadonly,
-        ...processCreateParams(params)
-      });
-    };
     late = {
       object: ZodObject.lazycreate
     };
@@ -4837,7 +4217,6 @@ var init_lib = __esm({
       ZodFirstPartyTypeKind2["ZodPromise"] = "ZodPromise";
       ZodFirstPartyTypeKind2["ZodBranded"] = "ZodBranded";
       ZodFirstPartyTypeKind2["ZodPipeline"] = "ZodPipeline";
-      ZodFirstPartyTypeKind2["ZodReadonly"] = "ZodReadonly";
     })(ZodFirstPartyTypeKind || (ZodFirstPartyTypeKind = {}));
     stringType = ZodString.create;
     numberType = ZodNumber.create;
@@ -4876,10 +4255,7 @@ var init_lib = __esm({
     coerce = {
       string: (arg) => ZodString.create({ ...arg, coerce: true }),
       number: (arg) => ZodNumber.create({ ...arg, coerce: true }),
-      boolean: (arg) => ZodBoolean.create({
-        ...arg,
-        coerce: true
-      }),
+      boolean: (arg) => ZodBoolean.create({ ...arg, coerce: true }),
       bigint: (arg) => ZodBigInt.create({ ...arg, coerce: true }),
       date: (arg) => ZodDate.create({ ...arg, coerce: true })
     };
@@ -5325,7 +4701,7 @@ var init_pgSchema = __esm({
     }).strict();
     pgSchemaInternal = objectType({
       version: literalType("6"),
-      dialect: literalType("pg"),
+      dialect: literalType("postgresql"),
       tables: recordType(stringType(), table2),
       enums: recordType(stringType(), enumSchema),
       schemas: recordType(stringType(), stringType()),
@@ -5354,14 +4730,14 @@ var init_pgSchema = __esm({
     }).strict();
     pgSchemaSquashedV4 = objectType({
       version: literalType("4"),
-      dialect: enumType(["pg"]),
+      dialect: literalType("pg"),
       tables: recordType(stringType(), tableSquashedV42),
       enums: recordType(stringType(), enumSchemaV1),
       schemas: recordType(stringType(), stringType())
     }).strict();
     pgSchemaSquashed = objectType({
       version: literalType("6"),
-      dialect: enumType(["pg"]),
+      dialect: literalType("postgresql"),
       tables: recordType(stringType(), tableSquashed2),
       enums: recordType(stringType(), enumSchema),
       schemas: recordType(stringType(), stringType())
@@ -5472,7 +4848,7 @@ var init_pgSchema = __esm({
     };
     dryPg = pgSchema.parse({
       version: snapshotVersion,
-      dialect: "pg",
+      dialect: "postgresql",
       id: originUUID,
       prevId: "",
       tables: {},
@@ -5701,6 +5077,7 @@ var init_utils = __esm({
     init_mysqlSchema();
     init_pgSchema();
     init_sqliteSchema();
+    init_source();
     init_global();
     copy = (it) => {
       return JSON.parse(JSON.stringify(it));
@@ -5905,6 +5282,7 @@ var sqlToStr;
 var init_serializer = __esm({
   "src/serializer/index.ts"() {
     "use strict";
+    init_source();
     init_views();
     sqlToStr = (sql2) => {
       return sql2.toQuery({
@@ -5933,7 +5311,8 @@ var init_outputs = __esm({
       warning: (str) => `${source_default.white.bgGray(" Warning ")} ${str}`,
       errorWarning: (str) => `${source_default.red(`${source_default.white.bgRed(" Warning ")} ${str}`)}`,
       fullWarning: (str) => `${source_default.black.bgYellow("[Warning]")} ${source_default.bold(str)}`,
-      suggestion: (str) => `${source_default.white.bgGray(" Suggestion ")} ${str}`
+      suggestion: (str) => `${source_default.white.bgGray(" Suggestion ")} ${str}`,
+      info: (str) => `${source_default.grey(str)}`
     };
   }
 });
@@ -6018,7 +5397,7 @@ var init_schemaValidator = __esm({
     init_mysqlSchema();
     init_pgSchema();
     init_sqliteSchema();
-    dialect3 = enumType(["pg", "mysql", "sqlite"]);
+    dialect3 = enumType(["postgresql", "mysql", "sqlite"]);
     commonSquashedSchema = unionType([
       pgSchemaSquashed,
       mysqlSchemaSquashed,
@@ -6138,8 +5517,8 @@ var init_cli = __esm({
       dialect: dialect3,
       schema: unionType([stringType(), stringType().array()]).optional(),
       tablesFilter: unionType([stringType(), stringType().array()]).optional(),
-      schemaFilters: unionType([stringType(), stringType().array()]).optional().default(["public"]),
-      driver: stringType(),
+      schemaFilter: unionType([stringType(), stringType().array()]).optional().default(["public"]),
+      driver: stringType().optional(),
       // pg
       connectionString: stringType().optional(),
       // mysql
@@ -6177,7 +5556,7 @@ var init_cli = __esm({
       authToken: stringType().optional(),
       introspectCasing: casing,
       breakpoints: booleanType().optional().default(true)
-    });
+    }).passthrough();
     configCheck = objectType({
       dialect: dialect3.optional(),
       out: stringType().optional()
@@ -6953,9 +6332,9 @@ var require_src2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/esbuild-register@3.5.0_esbuild@0.19.12/node_modules/esbuild-register/dist/node.js
+// node_modules/.pnpm/esbuild-register@3.5.0_esbuild@0.19.7/node_modules/esbuild-register/dist/node.js
 var require_node2 = __commonJS({
-  "node_modules/.pnpm/esbuild-register@3.5.0_esbuild@0.19.12/node_modules/esbuild-register/dist/node.js"(exports) {
+  "node_modules/.pnpm/esbuild-register@3.5.0_esbuild@0.19.7/node_modules/esbuild-register/dist/node.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     function _interopRequireDefault2(obj) {
@@ -11816,6 +11195,7 @@ var init_utils2 = __esm({
   "src/cli/commands/utils.ts"() {
     "use strict";
     init_serializer();
+    init_source();
     init_views();
     import_hanji2 = __toESM(require_hanji());
     init_global();
@@ -12136,7 +11516,7 @@ ${withStyle.errorWarning(
       );
       return {
         version: "6",
-        dialect: "pg",
+        dialect: "postgresql",
         tables: result,
         enums: enumsToReturn,
         schemas: schemasObject,
@@ -12343,7 +11723,7 @@ ${withStyle.errorWarning(
               const columnName = columnResponse.attname;
               const columnAdditionalDT = columnResponse.additional_dt;
               const columnDimensions = columnResponse.array_dimensions;
-              const enumType2 = columnResponse.enum_name;
+              const enumType3 = columnResponse.enum_name;
               let columnType = columnResponse.data_type;
               const primaryKey = tableConstraints.filter(
                 (mapRow) => columnName === mapRow.column_name && mapRow.constraint_type === "PRIMARY KEY"
@@ -12407,8 +11787,8 @@ ${withStyle.errorWarning(
               columnTypeMapped = trimChar(columnTypeMapped, '"');
               columnToReturn[columnName] = {
                 name: columnName,
-                type: columnAdditionalDT === "USER-DEFINED" ? enumType2 : columnTypeMapped,
-                typeSchema: enumsToReturn[`${tableSchema}.${enumType2}`] !== void 0 ? enumsToReturn[`${tableSchema}.${enumType2}`].schema : void 0,
+                type: columnAdditionalDT === "USER-DEFINED" ? enumType3 : columnTypeMapped,
+                typeSchema: enumsToReturn[`${tableSchema}.${enumType3}`] !== void 0 ? enumsToReturn[`${tableSchema}.${enumType3}`].schema : void 0,
                 primaryKey: primaryKey.length === 1 && cprimaryKey.length < 2,
                 // default: isSerial ? undefined : defaultValue,
                 notNull: columnResponse.is_nullable === "NO"
@@ -12491,7 +11871,7 @@ ${withStyle.errorWarning(
       const schemasObject = Object.fromEntries([...schemas].map((it) => [it, it]));
       return {
         version: "6",
-        dialect: "pg",
+        dialect: "postgresql",
         tables: result,
         enums: enumsToReturn,
         schemas: schemasObject,
@@ -12792,10 +12172,10 @@ var require_brace_expansion = __commonJS({
   }
 });
 
-// node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/brace-expressions.js
+// node_modules/.pnpm/minimatch@7.4.3/node_modules/minimatch/dist/mjs/brace-expressions.js
 var posixClasses, braceEscape, regexpEscape, rangesToString, parseClass;
 var init_brace_expressions = __esm({
-  "node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/brace-expressions.js"() {
+  "node_modules/.pnpm/minimatch@7.4.3/node_modules/minimatch/dist/mjs/brace-expressions.js"() {
     posixClasses = {
       "[:alnum:]": ["\\p{L}\\p{Nl}\\p{Nd}", true],
       "[:alpha:]": ["\\p{L}\\p{Nl}", true],
@@ -12907,30 +12287,30 @@ var init_brace_expressions = __esm({
   }
 });
 
-// node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/escape.js
+// node_modules/.pnpm/minimatch@7.4.3/node_modules/minimatch/dist/mjs/escape.js
 var escape;
 var init_escape = __esm({
-  "node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/escape.js"() {
+  "node_modules/.pnpm/minimatch@7.4.3/node_modules/minimatch/dist/mjs/escape.js"() {
     escape = (s, { windowsPathsNoEscape = false } = {}) => {
       return windowsPathsNoEscape ? s.replace(/[?*()[\]]/g, "[$&]") : s.replace(/[?*()[\]\\]/g, "\\$&");
     };
   }
 });
 
-// node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/unescape.js
+// node_modules/.pnpm/minimatch@7.4.3/node_modules/minimatch/dist/mjs/unescape.js
 var unescape;
 var init_unescape = __esm({
-  "node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/unescape.js"() {
+  "node_modules/.pnpm/minimatch@7.4.3/node_modules/minimatch/dist/mjs/unescape.js"() {
     unescape = (s, { windowsPathsNoEscape = false } = {}) => {
       return windowsPathsNoEscape ? s.replace(/\[([^\/\\])\]/g, "$1") : s.replace(/((?!\\).|^)\[([^\/\\])\]/g, "$1$2").replace(/\\([^\/])/g, "$1");
     };
   }
 });
 
-// node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/index.js
+// node_modules/.pnpm/minimatch@7.4.3/node_modules/minimatch/dist/mjs/index.js
 var import_brace_expansion, minimatch, starDotExtRE, starDotExtTest, starDotExtTestDot, starDotExtTestNocase, starDotExtTestNocaseDot, starDotStarRE, starDotStarTest, starDotStarTestDot, dotStarRE, dotStarTest, starRE, starTest, starTestDot, qmarksRE, qmarksTestNocase, qmarksTestNocaseDot, qmarksTestDot, qmarksTest, qmarksTestNoExt, qmarksTestNoExtDot, defaultPlatform, path, sep, GLOBSTAR, plTypes, qmark, star, twoStarDot, twoStarNoDot, charSet, reSpecials, addPatternStartSet, filter, ext, defaults, braceExpand, MAX_PATTERN_LENGTH, assertValidPattern, makeRe, match, globUnescape, globMagic, regExpEscape, Minimatch;
 var init_mjs = __esm({
-  "node_modules/.pnpm/minimatch@7.4.6/node_modules/minimatch/dist/mjs/index.js"() {
+  "node_modules/.pnpm/minimatch@7.4.3/node_modules/minimatch/dist/mjs/index.js"() {
     import_brace_expansion = __toESM(require_brace_expansion(), 1);
     init_brace_expressions();
     init_escape();
@@ -15722,7 +15102,7 @@ var init_snapshotsDiffer = __esm({
       const jsonTableAlternations = alteredTables.map((it) => {
         return preparePgAlterColumns(it.name, it.schema, it.altered, json2);
       }).flat();
-      const jsonCreateIndexesForAllAlteredTables = alteredTables.map((it) => {
+      const jsonCreateIndexesFoAlteredTables = alteredTables.map((it) => {
         return prepareCreateIndexesJson(
           it.name,
           it.schema,
@@ -15751,14 +15131,21 @@ var init_snapshotsDiffer = __esm({
           },
           {}
         );
-        jsonCreateIndexesForAllAlteredTables.push(
+        jsonCreateIndexesFoAlteredTables.push(
           ...prepareCreateIndexesJson(it.name, it.schema, createdIndexes || {})
         );
         jsonDropIndexesForAllAlteredTables.push(
           ...prepareDropIndexesJson(it.name, it.schema, droppedIndexes || {})
         );
       });
-      const jsonReferencesForAllAlteredTables = alteredTables.map((it) => {
+      const jsonCreateReferencesForCreatedTables = createdTables.map((it) => {
+        return prepareCreateReferencesJson(
+          it.name,
+          it.schema,
+          it.foreignKeys
+        );
+      }).flat();
+      const jsonReferencesForAlteredTables = alteredTables.map((it) => {
         const forAdded = prepareCreateReferencesJson(
           it.name,
           it.schema,
@@ -15776,10 +15163,10 @@ var init_snapshotsDiffer = __esm({
         );
         return [...forAdded, ...forAltered, ...alteredFKs];
       }).flat();
-      const jsonCreatedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
+      const jsonCreatedReferencesForAlteredTables = jsonReferencesForAlteredTables.filter(
         (t) => t.type === "create_reference"
       );
-      const jsonDroppedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
+      const jsonDroppedReferencesForAlteredTables = jsonReferencesForAlteredTables.filter(
         (t) => t.type === "delete_reference"
       );
       const createEnums = createdEnums.map((it) => {
@@ -15806,7 +15193,7 @@ var init_snapshotsDiffer = __esm({
       const dropSchemas = prepareDeleteSchemasJson(
         deletedSchemas.map((it) => it.name)
       );
-      const jsonPgCreateTables = createdTables.map((it) => {
+      const createTables = createdTables.map((it) => {
         return preparePgCreateTableJson(it, curFull);
       });
       jsonStatements.push(...createSchemas);
@@ -15815,7 +15202,7 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...moveEnums);
       jsonStatements.push(...renameEnums);
       jsonStatements.push(...jsonAlterEnumsWithAddedValues);
-      jsonStatements.push(...jsonPgCreateTables);
+      jsonStatements.push(...createTables);
       jsonStatements.push(...jsonDropTables);
       jsonStatements.push(...jsonSetTableSchemas);
       jsonStatements.push(...jsonRenameTables);
@@ -15826,15 +15213,16 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonTableAlternations);
       jsonStatements.push(...jsonAddedCompositePKs);
       jsonStatements.push(...jsonAddColumnsStatemets);
+      jsonStatements.push(...jsonCreateReferencesForCreatedTables);
       jsonStatements.push(...jsonCreateIndexesForCreatedTables);
-      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonCreatedReferencesForAlteredTables);
+      jsonStatements.push(...jsonCreateIndexesFoAlteredTables);
       jsonStatements.push(...jsonDropColumnsStatemets);
       jsonStatements.push(...jsonAlteredCompositePKs);
       jsonStatements.push(...jsonAlteredUniqueConstraints);
       jsonStatements.push(...dropEnums);
       jsonStatements.push(...dropSchemas);
-      const sqlStatements = fromJson(jsonStatements, "pg");
+      const sqlStatements = fromJson(jsonStatements, "postgresql");
       const uniqueSqlStatements = [];
       sqlStatements.forEach((ss) => {
         if (!uniqueSqlStatements.includes(ss)) {
@@ -15972,8 +15360,8 @@ var init_snapshotsDiffer = __esm({
       const jsonDeletedUniqueConstraints = [];
       const jsonAlteredUniqueConstraints = [];
       const jsonRenameColumnsStatements = columnRenames.map((it) => prepareRenameColumns(it.table, "", it.renames)).flat();
+      const jsonAddColumnsStatemets = columnCreates.map((it) => _prepareAddColumns(it.table, "", it.columns)).flat();
       const jsonDropColumnsStatemets = columnDeletes.map((it) => _prepareDropColumns(it.table, "", it.columns)).flat();
-      const jsonAddColumnsStatemets = columnDeletes.map((it) => _prepareAddColumns(it.table, "", it.columns)).flat();
       alteredTables.forEach((it) => {
         let addedColumns = [];
         for (const addedPkName of Object.keys(it.addedCompositePKs)) {
@@ -16087,6 +15475,13 @@ var init_snapshotsDiffer = __esm({
           ...prepareDropIndexesJson(it.name, it.schema, droppedIndexes || {})
         );
       });
+      const jsonCreateReferencesForCreatedTables = createdTables.map((it) => {
+        return prepareCreateReferencesJson(
+          it.name,
+          it.schema,
+          it.foreignKeys
+        );
+      }).flat();
       const jsonReferencesForAllAlteredTables = alteredTables.map((it) => {
         const forAdded = prepareCreateReferencesJson(
           it.name,
@@ -16127,9 +15522,10 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonAddedUniqueConstraints);
       jsonStatements.push(...jsonDeletedUniqueConstraints);
       jsonStatements.push(...jsonAddColumnsStatemets);
+      jsonStatements.push(...jsonCreateReferencesForCreatedTables);
       jsonStatements.push(...jsonCreateIndexesForCreatedTables);
-      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonCreatedReferencesForAlteredTables);
+      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonDropColumnsStatemets);
       jsonStatements.push(...jsonAlteredCompositePKs);
       jsonStatements.push(...jsonAddedUniqueConstraints);
@@ -16714,7 +16110,7 @@ var init_sqlgenerator = __esm({
     };
     PgCreateTableConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "create_table" && dialect7 === "pg";
+        return statement.type === "create_table" && dialect7 === "postgresql";
       }
       convert(st) {
         const { tableName, schema: schema4, columns, compositePKs, uniqueConstraints } = st;
@@ -16856,7 +16252,7 @@ var init_sqlgenerator = __esm({
     };
     PgAlterTableAddUniqueConstraintConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "create_unique_constraint" && dialect7 === "pg";
+        return statement.type === "create_unique_constraint" && dialect7 === "postgresql";
       }
       convert(statement) {
         const unsquashed = PgSquasher.unsquashUnique(statement.data);
@@ -16866,7 +16262,7 @@ var init_sqlgenerator = __esm({
     };
     PgAlterTableDropUniqueConstraintConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "delete_unique_constraint" && dialect7 === "pg";
+        return statement.type === "delete_unique_constraint" && dialect7 === "postgresql";
       }
       convert(statement) {
         const unsquashed = PgSquasher.unsquashUnique(statement.data);
@@ -16955,7 +16351,7 @@ var init_sqlgenerator = __esm({
     };
     PgDropTableConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "drop_table" && dialect7 === "pg";
+        return statement.type === "drop_table" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { tableName, schema: schema4 } = statement;
@@ -16983,7 +16379,7 @@ var init_sqlgenerator = __esm({
     };
     PgRenameTableConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "rename_table" && dialect7 === "pg";
+        return statement.type === "rename_table" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { tableNameFrom, tableNameTo, toSchema, fromSchema } = statement;
@@ -17014,7 +16410,7 @@ var init_sqlgenerator = __esm({
     };
     PgAlterTableRenameColumnConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "alter_table_rename_column" && dialect7 === "pg";
+        return statement.type === "alter_table_rename_column" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { tableName, oldColumnName, newColumnName, schema: schema4 } = statement;
@@ -17042,7 +16438,7 @@ var init_sqlgenerator = __esm({
     };
     PgAlterTableDropColumnConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "alter_table_drop_column" && dialect7 === "pg";
+        return statement.type === "alter_table_drop_column" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { tableName, columnName, schema: schema4 } = statement;
@@ -17070,7 +16466,7 @@ var init_sqlgenerator = __esm({
     };
     PgAlterTableAddColumnConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "alter_table_add_column" && dialect7 === "pg";
+        return statement.type === "alter_table_add_column" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { tableName, column: column4, schema: schema4 } = statement;
@@ -17115,7 +16511,7 @@ var init_sqlgenerator = __esm({
     };
     PgAlterTableAlterColumnSetTypeConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "alter_table_alter_column_set_type" && dialect7 === "pg";
+        return statement.type === "alter_table_alter_column_set_type" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { tableName, columnName, newDataType, schema: schema4 } = statement;
@@ -17140,7 +16536,7 @@ var init_sqlgenerator = __esm({
     };
     PgAlterTableAlterColumnSetDefaultConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "alter_table_alter_column_set_default" && dialect7 === "pg";
+        return statement.type === "alter_table_alter_column_set_default" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { tableName, columnName, schema: schema4 } = statement;
@@ -17165,7 +16561,7 @@ var init_sqlgenerator = __esm({
     };
     PgAlterTableAlterColumnDropDefaultConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "alter_table_alter_column_drop_default" && dialect7 === "pg";
+        return statement.type === "alter_table_alter_column_drop_default" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { tableName, columnName, schema: schema4 } = statement;
@@ -17277,7 +16673,7 @@ var init_sqlgenerator = __esm({
     };
     PgAlterTableCreateCompositePrimaryKeyConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "create_composite_pk" && dialect7 === "pg";
+        return statement.type === "create_composite_pk" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { name, columns } = PgSquasher.unsquashPK(statement.data);
@@ -17287,7 +16683,7 @@ var init_sqlgenerator = __esm({
     };
     PgAlterTableDeleteCompositePrimaryKeyConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "delete_composite_pk" && dialect7 === "pg";
+        return statement.type === "delete_composite_pk" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { name, columns } = PgSquasher.unsquashPK(statement.data);
@@ -17297,7 +16693,7 @@ var init_sqlgenerator = __esm({
     };
     PgAlterTableAlterCompositePrimaryKeyConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "alter_composite_pk" && dialect7 === "pg";
+        return statement.type === "alter_composite_pk" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { name, columns } = PgSquasher.unsquashPK(statement.old);
@@ -17420,7 +16816,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     PgAlterTableAlterColumnSetPrimaryKeyConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "alter_table_alter_column_set_pk" && dialect7 === "pg";
+        return statement.type === "alter_table_alter_column_set_pk" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { tableName, columnName } = statement;
@@ -17430,7 +16826,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     PgAlterTableAlterColumnDropPrimaryKeyConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "alter_table_alter_column_drop_pk" && dialect7 === "pg";
+        return statement.type === "alter_table_alter_column_drop_pk" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { tableName, columnName, schema: schema4 } = statement;
@@ -17454,7 +16850,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     PgAlterTableAlterColumnSetNotNullConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "alter_table_alter_column_set_notnull" && dialect7 === "pg";
+        return statement.type === "alter_table_alter_column_set_notnull" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { tableName, columnName } = statement;
@@ -17509,7 +16905,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     PgAlterTableAlterColumnDropNotNullConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "alter_table_alter_column_drop_notnull" && dialect7 === "pg";
+        return statement.type === "alter_table_alter_column_drop_notnull" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { tableName, columnName } = statement;
@@ -17534,7 +16930,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     PgCreateForeignKeyConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "create_reference" && dialect7 === "pg";
+        return statement.type === "create_reference" && dialect7 === "postgresql";
       }
       convert(statement) {
         const {
@@ -17599,7 +16995,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     PgAlterForeignKeyConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "alter_reference" && dialect7 === "pg";
+        return statement.type === "alter_reference" && dialect7 === "postgresql";
       }
       convert(statement) {
         const newFk = PgSquasher.unsquashFK(statement.data);
@@ -17638,7 +17034,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     PgDeleteForeignKeyConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "delete_reference" && dialect7 === "pg";
+        return statement.type === "delete_reference" && dialect7 === "postgresql";
       }
       convert(statement) {
         const tableFrom = statement.tableName;
@@ -17675,7 +17071,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     CreatePgIndexConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "create_index" && dialect7 === "pg";
+        return statement.type === "create_index" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { name, columns, isUnique } = PgSquasher.unsquashIdx(statement.data);
@@ -17714,7 +17110,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     PgDropIndexConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "drop_index" && dialect7 === "pg";
+        return statement.type === "drop_index" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { name } = PgSquasher.unsquashIdx(statement.data);
@@ -17723,7 +17119,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     PgCreateSchemaConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "create_schema" && dialect7 === "pg";
+        return statement.type === "create_schema" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { name } = statement;
@@ -17733,7 +17129,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     PgRenameSchemaConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "rename_schema" && dialect7 === "pg";
+        return statement.type === "rename_schema" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { from, to } = statement;
@@ -17743,7 +17139,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     PgDropSchemaConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "drop_schema" && dialect7 === "pg";
+        return statement.type === "drop_schema" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { name } = statement;
@@ -17753,7 +17149,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     PgAlterTableSetSchemaConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "alter_table_set_schema" && dialect7 === "pg";
+        return statement.type === "alter_table_set_schema" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { tableName, schemaFrom, schemaTo } = statement;
@@ -17763,7 +17159,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     PgAlterTableSetNewSchemaConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "alter_table_set_new_schema" && dialect7 === "pg";
+        return statement.type === "alter_table_set_new_schema" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { tableName, to, from } = statement;
@@ -17774,7 +17170,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
     };
     PgAlterTableRemoveFromSchemaConvertor = class extends Convertor {
       can(statement, dialect7) {
-        return statement.type === "alter_table_remove_from_schema" && dialect7 === "pg";
+        return statement.type === "alter_table_remove_from_schema" && dialect7 === "postgresql";
       }
       convert(statement) {
         const { tableName, schema: schema4 } = statement;
@@ -19549,7 +18945,7 @@ var pgSuggestions = async (db, statements) => {
         }
       }
     }
-    const stmnt = fromJson([statement], "pg")[0];
+    const stmnt = fromJson([statement], "postgresql")[0];
     if (typeof stmnt !== "undefined") {
       if (statement.type === "drop_table") {
         statementsToExecute.push(