diff --git a/package-lock.json b/package-lock.json index 4c1997a..9076cd9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,6 @@ "@graphql-tools/utils": "^10.0.1", "axios": "^1.4.0", "randexp": "^0.5.3", - "ts-deepmerge": "^6.1.0", "tslib": "^2.6.0" }, "devDependencies": { @@ -8326,6 +8325,11 @@ "node": ">=8" } }, + "node_modules/defu": { + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz", + "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==" + }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -16709,14 +16713,6 @@ "node": ">=8" } }, - "node_modules/ts-deepmerge": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ts-deepmerge/-/ts-deepmerge-6.1.0.tgz", - "integrity": "sha512-YVJBhdIwYAZv6QoYz/mihpgbv+r0+QfQazTcSS6WXhQkbCxjTRoV+IOLtyArtz3au7xb+fPQVp1d7o5Qw1f1fg==", - "engines": { - "node": ">=14.13.1" - } - }, "node_modules/ts-jest": { "version": "29.1.1", "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.1.tgz", @@ -17995,7 +17991,7 @@ }, "packages/zod-nestjs": { "name": "@anatine/zod-nestjs", - "version": "2.0.3", + "version": "2.0.5", "license": "MIT", "peerDependencies": { "@anatine/zod-openapi": "^2.0.1", @@ -18007,10 +18003,10 @@ }, "packages/zod-openapi": { "name": "@anatine/zod-openapi", - "version": "2.2.2", + "version": "2.2.3", "license": "MIT", "dependencies": { - "ts-deepmerge": "^6.0.3" + "defu": "^6.1.4" }, "peerDependencies": { "openapi3-ts": "^4.1.2", @@ -18204,7 +18200,7 @@ "@anatine/zod-openapi": { "version": "file:packages/zod-openapi", "requires": { - "ts-deepmerge": "^6.0.3" + "defu": "^6.1.4" } }, "@angular-devkit/core": { @@ -24415,6 +24411,11 @@ "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", "dev": true }, + "defu": { + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz", + "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==" + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -30702,11 +30703,6 @@ "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", "dev": true }, - "ts-deepmerge": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ts-deepmerge/-/ts-deepmerge-6.1.0.tgz", - "integrity": "sha512-YVJBhdIwYAZv6QoYz/mihpgbv+r0+QfQazTcSS6WXhQkbCxjTRoV+IOLtyArtz3au7xb+fPQVp1d7o5Qw1f1fg==" - }, "ts-jest": { "version": "29.1.1", "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.1.tgz", diff --git a/package.json b/package.json index d2e5ea6..0665990 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "@graphql-tools/utils": "^10.0.1", "axios": "^1.4.0", "randexp": "^0.5.3", - "ts-deepmerge": "^6.1.0", "tslib": "^2.6.0" }, "devDependencies": { @@ -83,4 +82,3 @@ "packages/**" ] } - diff --git a/packages/zod-openapi/package.json b/packages/zod-openapi/package.json index ca11e85..4d6a097 100644 --- a/packages/zod-openapi/package.json +++ b/packages/zod-openapi/package.json @@ -21,7 +21,7 @@ "swagger" ], "dependencies": { - "ts-deepmerge": "^6.0.3" + "defu": "^6.1.4" }, "peerDependencies": { "zod": "^3.20.0", diff --git a/packages/zod-openapi/src/lib/zod-openapi.ts b/packages/zod-openapi/src/lib/zod-openapi.ts index d17cefb..2d52a42 100644 --- a/packages/zod-openapi/src/lib/zod-openapi.ts +++ b/packages/zod-openapi/src/lib/zod-openapi.ts @@ -1,5 +1,5 @@ import type { SchemaObject, SchemaObjectType } from 'openapi3-ts/oas31'; -import merge from 'ts-deepmerge'; +import { defu as merge } from 'defu'; import { AnyZodObject, z, ZodTypeAny } from 'zod'; type AnatineSchemaObject = SchemaObject & { hideDefinitions?: string[] };