Remove source map

README.md

@@ -1078,8 +1078,8 @@ interface Category {
   subcategories: Category[];
 }
 
-// cast to z.ZodSchema<Category>
-const Category: z.ZodSchema<Category> = z.lazy(() =>
+// cast to z.ZodType<Category>
+const Category: z.ZodType<Category> = z.lazy(() =>
   z.object({
     name: z.string(),
     subcategories: z.array(Category),
@@ -1116,7 +1116,7 @@ interface Category extends z.infer<typeof BaseCategory> {
 
 // merge the base schema with
 // a new Zod schema containing relations
-const Category: z.ZodSchema<Category> = BaseCategory.merge(
+const Category: z.ZodType<Category> = BaseCategory.merge(
   z.object({
     subcategories: z.lazy(() => z.array(Category)),
   })
@@ -1131,7 +1131,7 @@ If you want to validate any JSON value, you can use the snippet below.
 type Literal = boolean | null | number | string;
 type Json = Literal | { [key: string]: Json } | Json[];
 const literalSchema = z.union([z.string(), z.number(), z.boolean(), z.null()]);
-const jsonSchema: z.ZodSchema<Json> = z.lazy(() =>
+const jsonSchema: z.ZodType<Json> = z.lazy(() =>
   z.union([literalSchema, z.array(jsonSchema), z.record(jsonSchema)])
 );
 

deno/lib/__tests__/recursive.test.ts

@@ -30,15 +30,15 @@ const testCategory: Category = {
 };
 
 test("recursion with z.late.object", () => {
-  const Category: z.Schema<Category> = z.late.object(() => ({
+  const Category: z.ZodType<Category> = z.late.object(() => ({
     name: z.string(),
     subcategories: z.array(Category),
   }));
   Category.parse(testCategory);
 });
 
 test("recursion with z.lazy", () => {
-  const Category: z.Schema<Category> = z.lazy(() =>
+  const Category: z.ZodType<Category> = z.lazy(() =>
     z.object({
       name: z.string(),
       subcategories: z.array(Category),
@@ -130,7 +130,7 @@ test("schema getter", () => {
 //     subcategories: Category[];
 //   }
 
-//   const Category: z.Schema<Category> = z.late.object(() => ({
+//   const Category: z.ZodType<Category> = z.late.object(() => ({
 //     name: z.string(),
 //     subcategories: z.array(Category),
 //   }));
@@ -151,7 +151,7 @@ test("schema getter", () => {
 
 //   type Category = BaseCategory & { subcategories: Category[] };
 
-//   const Category: z.Schema<Category> = z.late
+//   const Category: z.ZodType<Category> = z.late
 //     .object(() => ({
 //       subcategories: z.array(Category),
 //     }))

deno/lib/types.ts

@@ -1646,14 +1646,15 @@ export class ZodObject<
     merging: Incoming
   ): //ZodObject<T & Incoming["_shape"], UnknownKeys, Catchall> = (merging) => {
   ZodObject<extendShape<T, Incoming["_shape"]>, UnknownKeys, Catchall> {
-    const mergedShape = objectUtil.mergeShapes(
-      this._def.shape(),
-      merging._def.shape()
-    );
+    // const mergedShape = objectUtil.mergeShapes(
+    //   this._def.shape(),
+    //   merging._def.shape()
+    // );
     const merged: any = new ZodObject({
       unknownKeys: merging._def.unknownKeys,
       catchall: merging._def.catchall,
-      shape: () => mergedShape,
+      shape: () =>
+        objectUtil.mergeShapes(this._def.shape(), merging._def.shape()),
       typeName: ZodFirstPartyTypeKind.ZodObject,
     }) as any;
     return merged;

rollup.config.js

@@ -9,13 +9,13 @@ export default [
       {
         file: "lib/index.mjs",
         format: "es",
-        sourcemap: true,
+        sourcemap: false,
       },
     ],
     plugins: [
       typescript({
         tsconfig: "tsconfig.esm.json",
-        sourceMap: true,
+        sourceMap: false,
       }),
       uglify(),
     ],

src/__tests__/recursive.test.ts

@@ -29,15 +29,15 @@ const testCategory: Category = {
 };
 
 test("recursion with z.late.object", () => {
-  const Category: z.Schema<Category> = z.late.object(() => ({
+  const Category: z.ZodType<Category> = z.late.object(() => ({
     name: z.string(),
     subcategories: z.array(Category),
   }));
   Category.parse(testCategory);
 });
 
 test("recursion with z.lazy", () => {
-  const Category: z.Schema<Category> = z.lazy(() =>
+  const Category: z.ZodType<Category> = z.lazy(() =>
     z.object({
       name: z.string(),
       subcategories: z.array(Category),
@@ -129,7 +129,7 @@ test("schema getter", () => {
 //     subcategories: Category[];
 //   }
 
-//   const Category: z.Schema<Category> = z.late.object(() => ({
+//   const Category: z.ZodType<Category> = z.late.object(() => ({
 //     name: z.string(),
 //     subcategories: z.array(Category),
 //   }));
@@ -150,7 +150,7 @@ test("schema getter", () => {
 
 //   type Category = BaseCategory & { subcategories: Category[] };
 
-//   const Category: z.Schema<Category> = z.late
+//   const Category: z.ZodType<Category> = z.late
 //     .object(() => ({
 //       subcategories: z.array(Category),
 //     }))

src/types.ts

@@ -1646,14 +1646,15 @@ export class ZodObject<
     merging: Incoming
   ): //ZodObject<T & Incoming["_shape"], UnknownKeys, Catchall> = (merging) => {
   ZodObject<extendShape<T, Incoming["_shape"]>, UnknownKeys, Catchall> {
-    const mergedShape = objectUtil.mergeShapes(
-      this._def.shape(),
-      merging._def.shape()
-    );
+    // const mergedShape = objectUtil.mergeShapes(
+    //   this._def.shape(),
+    //   merging._def.shape()
+    // );
     const merged: any = new ZodObject({
       unknownKeys: merging._def.unknownKeys,
       catchall: merging._def.catchall,
-      shape: () => mergedShape,
+      shape: () =>
+        objectUtil.mergeShapes(this._def.shape(), merging._def.shape()),
       typeName: ZodFirstPartyTypeKind.ZodObject,
     }) as any;
     return merged;

tsconfig.cjs.json

@@ -4,11 +4,11 @@
     "module": "commonjs",
     "outDir": "lib",
     "declaration": true,
-    "declarationMap": true,
-    "sourceMap": true,
+    "declarationMap": false,
+    "sourceMap": false,
   },
   "exclude": [
     "./src/**/__tests__",
     "./src/playground.ts"
   ]
-}
+}

tsconfig.esm.json

@@ -5,10 +5,10 @@
     // "outDir": "./lib/esm",
     "declaration": false,
     "declarationMap": false,
-    "sourceMap": true,
+    "sourceMap": false,
   },
   "exclude": [
     "./src/**/__tests__",
     "./src/playground.ts"
   ]
-}
+}