drizzle-kit 0.17.1 → 0.17.2-5f6da95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.17.1",
+  "version": "0.17.2-5f6da95",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",

package/readme.md

@@ -1,12 +1,12 @@
 ## Drizzle Kit
 
-DrizzleKit - is a CLI migrator tool for DrizzleORM. It is probably one and only tool that lets you completely automatically generate SQL migrations and covers ~95% of the common cases like delitions and renames by prompting user input.\
+DrizzleKit - is a CLI migrator tool for DrizzleORM. It is probably one and only tool that lets you completely automatically generate SQL migrations and covers ~95% of the common cases like deletions and renames by prompting user input.
 <https://github.com/drizzle-team/drizzle-kit-mirror> - is a mirror repository for issues.
 
 ### How it works
 
-`drizzle-kit` will traverse `schema folder` or `schema file`, generate schema snapshot and compare it to the previous version(if there's one).\
- Based on the difference it will generate all needed SQL migrations and if there're any `automatically unresolvable` cases like `renames` it will prompt user for input.
+`drizzle-kit` will traverse `schema folder` or `schema file`, generate schema snapshot and compare it to the previous version, if there's one.
+ Based on the difference it will generate all needed SQL migrations and if there are any `automatically unresolvable` cases like `renames` it will prompt user for input.
 
 For schema file:
 
@@ -78,7 +78,7 @@ Or put your file to `drizzle.config.json` configuration file:
 
 ## Upgrading to 0.17.0
 
-Before running any new migrations `drizzle-kit` will ask you to upgrade in a first place
+Before running any new migrations `drizzle-kit` will ask you to upgrade first
 
 Migration file structure < 0.17.0
 
@@ -106,24 +106,24 @@ Migration file structure >= 0.17.0
     └ 📜 0001_strange_avengers.sql
 ```
 
-To easily migrate from previous folder structure to new you need to run `up` command in drizzle kit. It's a great helper to upgrade your migrations to new format on each drizzle kit major update
+To easily migrate from previous folder structure to new you need to run `up` command in drizzle-kit. It's a great helper to upgrade your migrations to new format on each drizzle kit major update
 
 ![](media/up_mysql.gif)
 ---
 
 ## List of commands
 
-### Generate SQL migrations based on current .ts schema\
+### Generate SQL migrations based on current .ts schema
 
 ---
 
 **`$ drizzle-kit generate:pg`** \
 **`$ drizzle-kit generate:mysql`** \
-**`$ drizzle-kit generate:sqlite`** \
+**`$ drizzle-kit generate:sqlite`**
 
-`--config` [optional defalut=drizzle.config.json] config file path\
+`--config` [optional default=drizzle.config.json] config file path\
 `--schema` path to typescript schema file or folder with multiple schema files\
-`--out` [optional default=drizzle/] migrations folder
+`--out` [optional default=drizzle/] migrations folder\
 
 ```shell
 $ drizzle-kit generate:pg 
@@ -137,13 +137,20 @@ $ drizzle-kit generate:pg --schema=./src/schema.ts
 
 $ drizzle-kit generate:pg --schema=./src/schema.ts --out=./migrations/
 ## runs generate command and outputs results to ./migration
+```
+
+**Generate an empty SQL migration with `--custom`**
+
+```shell
+$ drizzle-kit generate:pg --custom
+## runs generate command and outputs an empty migration for custom SQL 
 ```  
 
 ### Introspect existing database and generate typescript schema
 
 ---
 
-**`$ drizzle-kit introspect:pg`** \
+**`$ drizzle-kit introspect:pg`**
 **`$ drizzle-kit introspect:mysql`**
 
 ```shell
@@ -163,7 +170,7 @@ drizzle-kit introspect:pg --out=migrations/ --host=0.0.0.0 --port=5432 --user=po
 **`$ drizzle-kit up:sqlite`**
 
 `--out` [optional] migrations folder\
-`--config` [optional defalut=drizzle.config.json] config file path
+`--config` [optional default=drizzle.config.json] config file path
 
 ```shell
 ## migrations folder is taken from drizzle.config.json
@@ -181,7 +188,7 @@ drizzle-kit up:mysql --out=migrations/
 **`$ drizzle-kit drop`** \
 
 `--out` [optional] migrations folder\
-`--config` [optional defalut=drizzle.config.json] config file path
+`--config` [optional default=drizzle.config.json] config file path
 
 ![](media/drop.gif)
 
@@ -194,7 +201,7 @@ drizzle-kit up:mysql --out=migrations/
 **`$ drizzle-kit check:sqlite`**
 
 `--out` [optional] migration folder\
-`--config` [optional defalut=drizzle.config.json] config file path
+`--config` [optional default=drizzle.config.json] config file path
 
 ```shell
 ## migrations folder is taken from drizzle.config.json

package/utils.js

@@ -7169,7 +7169,7 @@ var info = (msg, greyMsg = "") => {
 var originUUID = "00000000-0000-0000-0000-000000000000";
 var snapshotVersion = "5";
 
-// node_modules/.pnpm/zod@3.20.6/node_modules/zod/lib/index.mjs
+// node_modules/.pnpm/zod@3.20.2/node_modules/zod/lib/index.mjs
 var util;
 (function(util2) {
   util2.assertEqual = (val) => val;
@@ -7584,7 +7584,7 @@ var OK = (value) => ({ status: "valid", value });
 var isAborted = (x) => x.status === "aborted";
 var isDirty = (x) => x.status === "dirty";
 var isValid = (x) => x.status === "valid";
-var isAsync = (x) => typeof Promise !== "undefined" && x instanceof Promise;
+var isAsync = (x) => typeof Promise !== void 0 && x instanceof Promise;
 var errorUtil;
 (function(errorUtil2) {
   errorUtil2.errToObj = (message) => typeof message === "string" ? { message } : message || {};
@@ -7800,29 +7800,28 @@ var ZodType = class {
     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 }
@@ -7831,7 +7830,6 @@ var ZodType = class {
   default(def) {
     const defaultValueFunc = typeof def === "function" ? def : () => def;
     return new ZodDefault({
-      ...processCreateParams(this._def),
       innerType: this,
       defaultValue: defaultValueFunc,
       typeName: ZodFirstPartyTypeKind.ZodDefault
@@ -7841,15 +7839,14 @@ var ZodType = class {
     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
     });
   }
@@ -7871,25 +7868,24 @@ var ZodType = class {
   }
 };
 var cuidRegex = /^c[^\s-]{8,}$/i;
-var cuid2Regex = /^[a-z][a-z0-9]*$/;
 var 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;
-var emailRegex = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|([^-]([a-zA-Z0-9-]*\.)+[a-zA-Z]{2,}))$/;
+var emailRegex = /^(([^<>()[\]\.,;:\s@\"]+(\.[^<>()[\]\.,;:\s@\"]+)*)|(\".+\"))@(([^<>()[\]\.,;:\s@\"]+\.)+[^<>()[\]\.,;:\s@\"]{2,})$/i;
 var 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)$`);
+      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)$`);
+      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)$`);
+      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$`);
     }
@@ -8011,16 +8007,6 @@ var ZodString = class extends ZodType {
           });
           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 === "url") {
         try {
           new URL(input.data);
@@ -8102,9 +8088,6 @@ var ZodString = class extends ZodType {
   cuid(message) {
     return this._addCheck({ kind: "cuid", ...errorUtil.errToObj(message) });
   }
-  cuid2(message) {
-    return this._addCheck({ kind: "cuid2", ...errorUtil.errToObj(message) });
-  }
   datetime(options) {
     var _a;
     if (typeof options === "string") {
@@ -8179,9 +8162,6 @@ var ZodString = class extends ZodType {
   get isCUID() {
     return !!this._def.checks.find((ch) => ch.kind === "cuid");
   }
-  get isCUID2() {
-    return !!this._def.checks.find((ch) => ch.kind === "cuid2");
-  }
   get minLength() {
     let min = null;
     for (const ch of this._def.checks) {
@@ -8412,22 +8392,7 @@ var ZodNumber = class extends ZodType {
     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) => {
@@ -8784,13 +8749,13 @@ var ZodArray = class extends ZodType {
       }
     }
     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);
@@ -8839,6 +8804,15 @@ var objectUtil;
     };
   };
 })(objectUtil || (objectUtil = {}));
+var AugmentFactory = (def) => (augmentation) => {
+  return new ZodObject({
+    ...def,
+    shape: () => ({
+      ...def.shape(),
+      ...augmentation
+    })
+  });
+};
 function deepPartialify(schema3) {
   if (schema3 instanceof ZodObject) {
     const newShape = {};
@@ -8867,7 +8841,8 @@ var ZodObject = class extends ZodType {
     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)
@@ -8996,14 +8971,8 @@ var ZodObject = class extends ZodType {
       unknownKeys: "passthrough"
     });
   }
-  extend(augmentation) {
-    return new ZodObject({
-      ...this._def,
-      shape: () => ({
-        ...this._def.shape(),
-        ...augmentation
-      })
-    });
+  setKey(key, schema3) {
+    return this.augment({ [key]: schema3 });
   }
   merge(merging) {
     const merged = new ZodObject({
@@ -9014,9 +8983,6 @@ var ZodObject = class extends ZodType {
     });
     return merged;
   }
-  setKey(key, schema3) {
-    return this.augment({ [key]: schema3 });
-  }
   catchall(index4) {
     return new ZodObject({
       ...this._def,
@@ -9025,10 +8991,9 @@ var ZodObject = class extends ZodType {
   }
   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,
@@ -9037,8 +9002,8 @@ var ZodObject = class extends ZodType {
   }
   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];
       }
     });
@@ -9052,14 +9017,24 @@ var ZodObject = class extends ZodType {
   }
   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
@@ -9067,10 +9042,21 @@ var ZodObject = class extends ZodType {
   }
   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) {
@@ -9078,7 +9064,7 @@ var ZodObject = class extends ZodType {
         }
         newShape[key] = newField;
       }
-    });
+    }
     return new ZodObject({
       ...this._def,
       shape: () => newShape
@@ -9418,7 +9404,7 @@ var ZodTuple = class extends ZodType {
       });
       status.dirty();
     }
-    const items = [...ctx.data].map((item, itemIndex) => {
+    const items = ctx.data.map((item, itemIndex) => {
       const schema3 = this._def.items[itemIndex] || this._def.rest;
       if (!schema3)
         return null;
@@ -9785,7 +9771,6 @@ var ZodLiteral = class extends ZodType {
     if (input.data !== this._def.value) {
       const ctx = this._getOrReturnCtx(input);
       addIssueToContext(ctx, {
-        received: ctx.data,
         code: ZodIssueCode.invalid_literal,
         expected: this._def.value
       });
@@ -9859,12 +9844,6 @@ var ZodEnum = class extends ZodType {
     }
     return enumValues;
   }
-  extract(values) {
-    return ZodEnum.create(values);
-  }
-  exclude(values) {
-    return ZodEnum.create(this.options.filter((opt) => !values.includes(opt)));
-  }
 };
 ZodEnum.create = createZodEnum;
 var ZodNativeEnum = class extends ZodType {
@@ -9903,9 +9882,6 @@ ZodNativeEnum.create = (values, params) => {
   });
 };
 var 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) {
@@ -10119,29 +10095,23 @@ var ZodCatch = class extends ZodType {
     const result = this._def.innerType._parse({
       data: ctx.data,
       path: ctx.path,
-      parent: {
-        ...ctx,
-        common: {
-          ...ctx.common,
-          issues: []
-        }
-      }
+      parent: ctx
     });
     if (isAsync(result)) {
       return result.then((result2) => {
         return {
           status: "valid",
-          value: result2.status === "valid" ? result2.value : this._def.catchValue()
+          value: result2.status === "valid" ? result2.value : this._def.defaultValue()
         };
       });
     } else {
       return {
         status: "valid",
-        value: result.status === "valid" ? result.value : this._def.catchValue()
+        value: result.status === "valid" ? result.value : this._def.defaultValue()
       };
     }
   }
-  removeCatch() {
+  removeDefault() {
     return this._def.innerType;
   }
 };
@@ -10149,7 +10119,7 @@ ZodCatch.create = (type, params) => {
   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)
   });
 };