zod-openapi 2.6.3 → 2.7.1

package/lib-commonjs/create/schema/record.js

@@ -1,10 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRecordSchema = void 0;
+const openapi_1 = require("../../openapi");
 const _1 = require(".");
-const createRecordSchema = (zodRecord, state) => ({
-    type: 'object',
-    additionalProperties: (0, _1.createSchemaOrRef)(zodRecord.valueSchema, state, ['record value']),
-});
+const createRecordSchema = (zodRecord, state) => {
+    const additionalProperties = (0, _1.createSchemaOrRef)(zodRecord.valueSchema, state, ['record value']);
+    const keySchema = (0, _1.createSchemaOrRef)(zodRecord.keySchema, state, [
+        'record key',
+    ]);
+    const maybeComponent = '$ref' in keySchema &&
+        state.components.schemas.get(zodRecord.keySchema);
+    const maybeSchema = maybeComponent &&
+        maybeComponent.type === 'complete' &&
+        maybeComponent.schemaObject;
+    const renderedKeySchema = maybeSchema || keySchema;
+    if ('enum' in renderedKeySchema && renderedKeySchema.enum) {
+        return {
+            type: 'object',
+            properties: renderedKeySchema.enum.reduce((acc, key) => {
+                acc[key] = additionalProperties;
+                return acc;
+            }, {}),
+            additionalProperties: false,
+        };
+    }
+    if ((0, openapi_1.satisfiesVersion)(state.components.openapi, '3.1.0') &&
+        'type' in renderedKeySchema &&
+        renderedKeySchema.type === 'string' &&
+        Object.keys(renderedKeySchema).length > 1) {
+        return {
+            type: 'object',
+            // @ts-expect-error FIXME: https://github.com/metadevpro/openapi3-ts/pull/120
+            propertyNames: keySchema,
+            additionalProperties,
+        };
+    }
+    return {
+        type: 'object',
+        additionalProperties,
+    };
+};
 exports.createRecordSchema = createRecordSchema;
 //# sourceMappingURL=record.js.map

package/lib-commonjs/create/schema/record.js.map

@@ -1 +1 @@
-{"version":3,"file":"record.js","sourceRoot":"","sources":["../../../src/create/schema/record.ts"],"names":[],"mappings":";;;AAIA,wBAAwD;AAEjD,MAAM,kBAAkB,GAAG,CAChC,SAA8B,EAC9B,KAAkB,EACE,EAAE,CAAC,CAAC;IACxB,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,IAAA,oBAAiB,EACrC,SAAS,CAAC,WAAyB,EACnC,KAAK,EACL,CAAC,cAAc,CAAC,CACjB;CACF,CAAC,CAAC;AAVU,QAAA,kBAAkB,sBAU5B"}
+{"version":3,"file":"record.js","sourceRoot":"","sources":["../../../src/create/schema/record.ts"],"names":[],"mappings":";;;AAEA,2CAAiD;AAGjD,wBAAwD;AAEjD,MAAM,kBAAkB,GAAG,CAChC,SAA8B,EAC9B,KAAkB,EACE,EAAE;IACtB,MAAM,oBAAoB,GAAG,IAAA,oBAAiB,EAC5C,SAAS,CAAC,WAAyB,EACnC,KAAK,EACL,CAAC,cAAc,CAAC,CACjB,CAAC;IAEF,MAAM,SAAS,GAAG,IAAA,oBAAiB,EAAC,SAAS,CAAC,SAAoB,EAAE,KAAK,EAAE;QACzE,YAAY;KACb,CAAC,CAAC;IAEH,MAAM,cAAc,GAClB,MAAM,IAAI,SAAS;QACnB,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,SAAoB,CAAC,CAAC;IAC/D,MAAM,WAAW,GACf,cAAc;QACd,cAAc,CAAC,IAAI,KAAK,UAAU;QAClC,cAAc,CAAC,YAAY,CAAC;IAE9B,MAAM,iBAAiB,GAAG,WAAW,IAAI,SAAS,CAAC;IAEnD,IAAI,MAAM,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,IAAI,EAAE;QACzD,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,UAAU,EAAG,iBAAiB,CAAC,IAAiB,CAAC,MAAM,CAErD,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBACb,GAAG,CAAC,GAAG,CAAC,GAAG,oBAAoB,CAAC;gBAChC,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC;YACN,oBAAoB,EAAE,KAAK;SAC5B,CAAC;KACH;IAED,IACE,IAAA,0BAAgB,EAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC;QACnD,MAAM,IAAI,iBAAiB;QAC3B,iBAAiB,CAAC,IAAI,KAAK,QAAQ;QACnC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,GAAG,CAAC,EACzC;QACA,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,6EAA6E;YAC7E,aAAa,EAAE,SAAS;YACxB,oBAAoB;SACrB,CAAC;KACH;IAED,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,oBAAoB;KACrB,CAAC;AACJ,CAAC,CAAC;AAvDW,QAAA,kBAAkB,sBAuD7B"}

package/lib-es2015/create/schema/record.js

@@ -1,6 +1,40 @@
+import { satisfiesVersion } from '../../openapi';
 import { createSchemaOrRef } from '.';
-export const createRecordSchema = (zodRecord, state) => ({
-    type: 'object',
-    additionalProperties: createSchemaOrRef(zodRecord.valueSchema, state, ['record value']),
-});
+export const createRecordSchema = (zodRecord, state) => {
+    const additionalProperties = createSchemaOrRef(zodRecord.valueSchema, state, ['record value']);
+    const keySchema = createSchemaOrRef(zodRecord.keySchema, state, [
+        'record key',
+    ]);
+    const maybeComponent = '$ref' in keySchema &&
+        state.components.schemas.get(zodRecord.keySchema);
+    const maybeSchema = maybeComponent &&
+        maybeComponent.type === 'complete' &&
+        maybeComponent.schemaObject;
+    const renderedKeySchema = maybeSchema || keySchema;
+    if ('enum' in renderedKeySchema && renderedKeySchema.enum) {
+        return {
+            type: 'object',
+            properties: renderedKeySchema.enum.reduce((acc, key) => {
+                acc[key] = additionalProperties;
+                return acc;
+            }, {}),
+            additionalProperties: false,
+        };
+    }
+    if (satisfiesVersion(state.components.openapi, '3.1.0') &&
+        'type' in renderedKeySchema &&
+        renderedKeySchema.type === 'string' &&
+        Object.keys(renderedKeySchema).length > 1) {
+        return {
+            type: 'object',
+            // @ts-expect-error FIXME: https://github.com/metadevpro/openapi3-ts/pull/120
+            propertyNames: keySchema,
+            additionalProperties,
+        };
+    }
+    return {
+        type: 'object',
+        additionalProperties,
+    };
+};
 //# sourceMappingURL=record.js.map

package/lib-es2015/create/schema/record.js.map

@@ -1 +1 @@
-{"version":3,"file":"record.js","sourceRoot":"","sources":["../../../src/create/schema/record.ts"],"names":[],"mappings":"AAIA,OAAO,EAAoB,iBAAiB,EAAE,MAAM,GAAG,CAAC;AAExD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,SAA8B,EAC9B,KAAkB,EACE,EAAE,CAAC,CAAC;IACxB,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAE,iBAAiB,CACrC,SAAS,CAAC,WAAyB,EACnC,KAAK,EACL,CAAC,cAAc,CAAC,CACjB;CACF,CAAC,CAAC"}
+{"version":3,"file":"record.js","sourceRoot":"","sources":["../../../src/create/schema/record.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,OAAO,EAAoB,iBAAiB,EAAE,MAAM,GAAG,CAAC;AAExD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,SAA8B,EAC9B,KAAkB,EACE,EAAE;IACtB,MAAM,oBAAoB,GAAG,iBAAiB,CAC5C,SAAS,CAAC,WAAyB,EACnC,KAAK,EACL,CAAC,cAAc,CAAC,CACjB,CAAC;IAEF,MAAM,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC,SAAoB,EAAE,KAAK,EAAE;QACzE,YAAY;KACb,CAAC,CAAC;IAEH,MAAM,cAAc,GAClB,MAAM,IAAI,SAAS;QACnB,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,SAAoB,CAAC,CAAC;IAC/D,MAAM,WAAW,GACf,cAAc;QACd,cAAc,CAAC,IAAI,KAAK,UAAU;QAClC,cAAc,CAAC,YAAY,CAAC;IAE9B,MAAM,iBAAiB,GAAG,WAAW,IAAI,SAAS,CAAC;IAEnD,IAAI,MAAM,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,IAAI,EAAE;QACzD,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,UAAU,EAAG,iBAAiB,CAAC,IAAiB,CAAC,MAAM,CAErD,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBACb,GAAG,CAAC,GAAG,CAAC,GAAG,oBAAoB,CAAC;gBAChC,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC;YACN,oBAAoB,EAAE,KAAK;SAC5B,CAAC;KACH;IAED,IACE,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC;QACnD,MAAM,IAAI,iBAAiB;QAC3B,iBAAiB,CAAC,IAAI,KAAK,QAAQ;QACnC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,GAAG,CAAC,EACzC;QACA,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,6EAA6E;YAC7E,aAAa,EAAE,SAAS;YACxB,oBAAoB;SACrB,CAAC;KACH;IAED,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,oBAAoB;KACrB,CAAC;AACJ,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zod-openapi",
-  "version": "2.6.3",
+  "version": "2.7.1",
   "description": "Convert Zod Schemas to OpenAPI v3.x documentation",
   "keywords": [
     "typescript",
@@ -43,7 +43,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@redocly/cli": "1.0.0-beta.129",
+    "@redocly/cli": "1.0.0-beta.131",
     "@types/node": "^20.3.0",
     "eslint-plugin-zod-openapi": "^0.1.0",
     "openapi3-ts": "4.1.2",