openapi-typesafe 1.0.0-rc.3 → 1.0.0-rc.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1972 -0
- package/dist/adapters/node-file-system/file-claims.cjs +105 -0
- package/dist/adapters/node-file-system/file-claims.cjs.map +1 -0
- package/dist/adapters/node-file-system/file-claims.mjs +95 -0
- package/dist/adapters/node-file-system/file-claims.mjs.map +1 -0
- package/dist/adapters/node-file-system/file-identity.cjs +82 -0
- package/dist/adapters/node-file-system/file-identity.cjs.map +1 -0
- package/dist/adapters/node-file-system/file-identity.mjs +74 -0
- package/dist/adapters/node-file-system/file-identity.mjs.map +1 -0
- package/dist/adapters/node-file-system/node-file-system.cjs +97 -14
- package/dist/adapters/node-file-system/node-file-system.cjs.map +1 -1
- package/dist/adapters/node-file-system/node-file-system.mjs +97 -14
- package/dist/adapters/node-file-system/node-file-system.mjs.map +1 -1
- package/dist/adapters/pipe-safe-writer/pipe-safe-writer.cjs +19 -0
- package/dist/adapters/pipe-safe-writer/pipe-safe-writer.cjs.map +1 -0
- package/dist/adapters/pipe-safe-writer/pipe-safe-writer.mjs +17 -0
- package/dist/adapters/pipe-safe-writer/pipe-safe-writer.mjs.map +1 -0
- package/dist/adapters/redocly-loader/bundled-mapping-copies.cjs +48 -0
- package/dist/adapters/redocly-loader/bundled-mapping-copies.cjs.map +1 -0
- package/dist/adapters/redocly-loader/bundled-mapping-copies.mjs +45 -0
- package/dist/adapters/redocly-loader/bundled-mapping-copies.mjs.map +1 -0
- package/dist/adapters/redocly-loader/bundled-ref-repair.cjs +1 -1
- package/dist/adapters/redocly-loader/bundled-ref-repair.cjs.map +1 -1
- package/dist/adapters/redocly-loader/bundled-ref-repair.mjs +2 -2
- package/dist/adapters/redocly-loader/bundled-ref-repair.mjs.map +1 -1
- package/dist/adapters/redocly-loader/component-schemas.cjs +17 -0
- package/dist/adapters/redocly-loader/component-schemas.cjs.map +1 -0
- package/dist/adapters/redocly-loader/component-schemas.mjs +14 -0
- package/dist/adapters/redocly-loader/component-schemas.mjs.map +1 -0
- package/dist/adapters/redocly-loader/loaded-documents.cjs +28 -0
- package/dist/adapters/redocly-loader/loaded-documents.cjs.map +1 -0
- package/dist/adapters/redocly-loader/loaded-documents.mjs +21 -0
- package/dist/adapters/redocly-loader/loaded-documents.mjs.map +1 -0
- package/dist/adapters/redocly-loader/mapping-schema-names.cjs +22 -0
- package/dist/adapters/redocly-loader/mapping-schema-names.cjs.map +1 -0
- package/dist/adapters/redocly-loader/mapping-schema-names.mjs +20 -0
- package/dist/adapters/redocly-loader/mapping-schema-names.mjs.map +1 -0
- package/dist/adapters/redocly-loader/query-named-components.cjs +137 -0
- package/dist/adapters/redocly-loader/query-named-components.cjs.map +1 -0
- package/dist/adapters/redocly-loader/query-named-components.mjs +134 -0
- package/dist/adapters/redocly-loader/query-named-components.mjs.map +1 -0
- package/dist/adapters/redocly-loader/redocly-schema-loader.cjs +40 -29
- package/dist/adapters/redocly-loader/redocly-schema-loader.cjs.map +1 -1
- package/dist/adapters/redocly-loader/redocly-schema-loader.mjs +38 -27
- package/dist/adapters/redocly-loader/redocly-schema-loader.mjs.map +1 -1
- package/dist/adapters/redocly-loader/ref-access.cjs +45 -4
- package/dist/adapters/redocly-loader/ref-access.cjs.map +1 -1
- package/dist/adapters/redocly-loader/ref-access.mjs +45 -4
- package/dist/adapters/redocly-loader/ref-access.mjs.map +1 -1
- package/dist/adapters/redocly-loader/ref-holders.cjs +52 -10
- package/dist/adapters/redocly-loader/ref-holders.cjs.map +1 -1
- package/dist/adapters/redocly-loader/ref-holders.mjs +53 -12
- package/dist/adapters/redocly-loader/ref-holders.mjs.map +1 -1
- package/dist/adapters/redocly-loader/remote-body-limit.cjs +50 -0
- package/dist/adapters/redocly-loader/remote-body-limit.cjs.map +1 -0
- package/dist/adapters/redocly-loader/remote-body-limit.mjs +48 -0
- package/dist/adapters/redocly-loader/remote-body-limit.mjs.map +1 -0
- package/dist/adapters/redocly-loader/remote-fetch.cjs +40 -9
- package/dist/adapters/redocly-loader/remote-fetch.cjs.map +1 -1
- package/dist/adapters/redocly-loader/remote-fetch.mjs +40 -9
- package/dist/adapters/redocly-loader/remote-fetch.mjs.map +1 -1
- package/dist/adapters/redocly-loader/remote-node-limit.cjs +61 -0
- package/dist/adapters/redocly-loader/remote-node-limit.cjs.map +1 -0
- package/dist/adapters/redocly-loader/remote-node-limit.mjs +58 -0
- package/dist/adapters/redocly-loader/remote-node-limit.mjs.map +1 -0
- package/dist/adapters/redocly-loader/schema-load-errors.cjs +32 -8
- package/dist/adapters/redocly-loader/schema-load-errors.cjs.map +1 -1
- package/dist/adapters/redocly-loader/schema-load-errors.mjs +32 -9
- package/dist/adapters/redocly-loader/schema-load-errors.mjs.map +1 -1
- package/dist/adapters/redocly-loader/schema-source.cjs +18 -9
- package/dist/adapters/redocly-loader/schema-source.cjs.map +1 -1
- package/dist/adapters/redocly-loader/schema-source.mjs +20 -11
- package/dist/adapters/redocly-loader/schema-source.mjs.map +1 -1
- package/dist/adapters/redocly-loader/unsupported-keys.cjs +3 -5
- package/dist/adapters/redocly-loader/unsupported-keys.cjs.map +1 -1
- package/dist/adapters/redocly-loader/unsupported-keys.mjs +3 -5
- package/dist/adapters/redocly-loader/unsupported-keys.mjs.map +1 -1
- package/dist/adapters/terminal-logger/terminal-logger.cjs +10 -4
- package/dist/adapters/terminal-logger/terminal-logger.cjs.map +1 -1
- package/dist/adapters/terminal-logger/terminal-logger.mjs +10 -4
- package/dist/adapters/terminal-logger/terminal-logger.mjs.map +1 -1
- package/dist/api/default-ports.cjs +14 -2
- package/dist/api/default-ports.cjs.map +1 -1
- package/dist/api/default-ports.mjs +14 -2
- package/dist/api/default-ports.mjs.map +1 -1
- package/dist/api/discriminator-enum-parent.cjs +2 -2
- package/dist/api/discriminator-enum-parent.cjs.map +1 -1
- package/dist/api/discriminator-enum-parent.mjs +3 -3
- package/dist/api/discriminator-enum-parent.mjs.map +1 -1
- package/dist/api/discriminator-other-owners.cjs +5 -3
- package/dist/api/discriminator-other-owners.cjs.map +1 -1
- package/dist/api/discriminator-other-owners.mjs +5 -3
- package/dist/api/discriminator-other-owners.mjs.map +1 -1
- package/dist/api/discriminator-patch.cjs +5 -1
- package/dist/api/discriminator-patch.cjs.map +1 -1
- package/dist/api/discriminator-patch.mjs +5 -1
- package/dist/api/discriminator-patch.mjs.map +1 -1
- package/dist/api/discriminator-scan.cjs +15 -8
- package/dist/api/discriminator-scan.cjs.map +1 -1
- package/dist/api/discriminator-scan.mjs +15 -8
- package/dist/api/discriminator-scan.mjs.map +1 -1
- package/dist/api/document-refs.cjs +16 -1
- package/dist/api/document-refs.cjs.map +1 -1
- package/dist/api/document-refs.mjs +16 -1
- package/dist/api/document-refs.mjs.map +1 -1
- package/dist/api/document-run.cjs +6 -12
- package/dist/api/document-run.cjs.map +1 -1
- package/dist/api/document-run.mjs +6 -12
- package/dist/api/document-run.mjs.map +1 -1
- package/dist/api/legacy-utils.cjs.map +1 -1
- package/dist/api/legacy-utils.mjs.map +1 -1
- package/dist/api/openapi-ts.cjs +9 -6
- package/dist/api/openapi-ts.cjs.map +1 -1
- package/dist/api/openapi-ts.mjs +10 -8
- package/dist/api/openapi-ts.mjs.map +1 -1
- package/dist/api/ref-limit-options.cjs +63 -0
- package/dist/api/ref-limit-options.cjs.map +1 -0
- package/dist/api/ref-limit-options.mjs +57 -0
- package/dist/api/ref-limit-options.mjs.map +1 -0
- package/dist/api/schema-callbacks.cjs +36 -12
- package/dist/api/schema-callbacks.cjs.map +1 -1
- package/dist/api/schema-callbacks.mjs +36 -12
- package/dist/api/schema-callbacks.mjs.map +1 -1
- package/dist/api/transform-context.cjs +7 -3
- package/dist/api/transform-context.cjs.map +1 -1
- package/dist/api/transform-context.mjs +7 -3
- package/dist/api/transform-context.mjs.map +1 -1
- package/dist/api/transform-schema.cjs +47 -10
- package/dist/api/transform-schema.cjs.map +1 -1
- package/dist/api/transform-schema.mjs +48 -11
- package/dist/api/transform-schema.mjs.map +1 -1
- package/dist/application/print/text-writer.cjs +10 -3
- package/dist/application/print/text-writer.cjs.map +1 -1
- package/dist/application/print/text-writer.mjs +10 -3
- package/dist/application/print/text-writer.mjs.map +1 -1
- package/dist/application/stack-overflow.cjs +2 -1
- package/dist/application/stack-overflow.cjs.map +1 -1
- package/dist/application/stack-overflow.mjs +2 -1
- package/dist/application/stack-overflow.mjs.map +1 -1
- package/dist/application/transform/declared-value-types.cjs +36 -0
- package/dist/application/transform/declared-value-types.cjs.map +1 -0
- package/dist/application/transform/declared-value-types.mjs +34 -0
- package/dist/application/transform/declared-value-types.mjs.map +1 -0
- package/dist/application/transform/document/components.cjs +1 -1
- package/dist/application/transform/document/components.cjs.map +1 -1
- package/dist/application/transform/document/components.mjs +2 -2
- package/dist/application/transform/document/components.mjs.map +1 -1
- package/dist/application/transform/document/declared-type-names.cjs +23 -0
- package/dist/application/transform/document/declared-type-names.cjs.map +1 -0
- package/dist/application/transform/document/declared-type-names.mjs +20 -0
- package/dist/application/transform/document/declared-type-names.mjs.map +1 -0
- package/dist/application/transform/document/defs-root.cjs +1 -1
- package/dist/application/transform/document/defs-root.cjs.map +1 -1
- package/dist/application/transform/document/defs-root.mjs +2 -2
- package/dist/application/transform/document/defs-root.mjs.map +1 -1
- package/dist/application/transform/document/document.cjs +7 -2
- package/dist/application/transform/document/document.cjs.map +1 -1
- package/dist/application/transform/document/document.mjs +6 -3
- package/dist/application/transform/document/document.mjs.map +1 -1
- package/dist/application/transform/document/enum-names-given-back.cjs +62 -0
- package/dist/application/transform/document/enum-names-given-back.cjs.map +1 -0
- package/dist/application/transform/document/enum-names-given-back.mjs +58 -0
- package/dist/application/transform/document/enum-names-given-back.mjs.map +1 -0
- package/dist/application/transform/document/exploded-query-values.cjs +63 -0
- package/dist/application/transform/document/exploded-query-values.cjs.map +1 -0
- package/dist/application/transform/document/exploded-query-values.mjs +59 -0
- package/dist/application/transform/document/exploded-query-values.mjs.map +1 -0
- package/dist/application/transform/document/global-type-references.cjs +1 -0
- package/dist/application/transform/document/global-type-references.cjs.map +1 -1
- package/dist/application/transform/document/global-type-references.mjs +1 -1
- package/dist/application/transform/document/global-type-references.mjs.map +1 -1
- package/dist/application/transform/document/header.cjs +11 -3
- package/dist/application/transform/document/header.cjs.map +1 -1
- package/dist/application/transform/document/header.mjs +10 -2
- package/dist/application/transform/document/header.mjs.map +1 -1
- package/dist/application/transform/document/media-type.cjs +2 -2
- package/dist/application/transform/document/media-type.cjs.map +1 -1
- package/dist/application/transform/document/media-type.mjs +3 -3
- package/dist/application/transform/document/media-type.mjs.map +1 -1
- package/dist/application/transform/document/operation-keys-written.cjs +26 -0
- package/dist/application/transform/document/operation-keys-written.cjs.map +1 -0
- package/dist/application/transform/document/operation-keys-written.mjs +24 -0
- package/dist/application/transform/document/operation-keys-written.mjs.map +1 -0
- package/dist/application/transform/document/operation.cjs +1 -1
- package/dist/application/transform/document/operation.cjs.map +1 -1
- package/dist/application/transform/document/operation.mjs +2 -2
- package/dist/application/transform/document/operation.mjs.map +1 -1
- package/dist/application/transform/document/parameter-entries.cjs +34 -0
- package/dist/application/transform/document/parameter-entries.cjs.map +1 -0
- package/dist/application/transform/document/parameter-entries.mjs +30 -0
- package/dist/application/transform/document/parameter-entries.mjs.map +1 -0
- package/dist/application/transform/document/parameter.cjs +12 -4
- package/dist/application/transform/document/parameter.cjs.map +1 -1
- package/dist/application/transform/document/parameter.mjs +13 -5
- package/dist/application/transform/document/parameter.mjs.map +1 -1
- package/dist/application/transform/document/parameters.cjs +29 -34
- package/dist/application/transform/document/parameters.cjs.map +1 -1
- package/dist/application/transform/document/parameters.mjs +29 -34
- package/dist/application/transform/document/parameters.mjs.map +1 -1
- package/dist/application/transform/document/path-item.cjs +15 -17
- package/dist/application/transform/document/path-item.cjs.map +1 -1
- package/dist/application/transform/document/path-item.mjs +15 -19
- package/dist/application/transform/document/path-item.mjs.map +1 -1
- package/dist/application/transform/document/path-template-key.cjs +84 -0
- package/dist/application/transform/document/path-template-key.cjs.map +1 -0
- package/dist/application/transform/document/path-template-key.mjs +79 -0
- package/dist/application/transform/document/path-template-key.mjs.map +1 -0
- package/dist/application/transform/document/path-template-refs.cjs +70 -0
- package/dist/application/transform/document/path-template-refs.cjs.map +1 -0
- package/dist/application/transform/document/path-template-refs.mjs +67 -0
- package/dist/application/transform/document/path-template-refs.mjs.map +1 -0
- package/dist/application/transform/document/paths-enum.cjs +8 -6
- package/dist/application/transform/document/paths-enum.cjs.map +1 -1
- package/dist/application/transform/document/paths-enum.mjs +8 -7
- package/dist/application/transform/document/paths-enum.mjs.map +1 -1
- package/dist/application/transform/document/paths.cjs +43 -67
- package/dist/application/transform/document/paths.cjs.map +1 -1
- package/dist/application/transform/document/paths.mjs +42 -68
- package/dist/application/transform/document/paths.mjs.map +1 -1
- package/dist/application/transform/document/referenced-parameter.cjs +80 -0
- package/dist/application/transform/document/referenced-parameter.cjs.map +1 -0
- package/dist/application/transform/document/referenced-parameter.mjs +78 -0
- package/dist/application/transform/document/referenced-parameter.mjs.map +1 -0
- package/dist/application/transform/document/request-body.cjs +1 -1
- package/dist/application/transform/document/request-body.cjs.map +1 -1
- package/dist/application/transform/document/request-body.mjs +2 -2
- package/dist/application/transform/document/request-body.mjs.map +1 -1
- package/dist/application/transform/document/response.cjs +2 -2
- package/dist/application/transform/document/response.cjs.map +1 -1
- package/dist/application/transform/document/response.mjs +3 -3
- package/dist/application/transform/document/response.mjs.map +1 -1
- package/dist/application/transform/document/responses.cjs +1 -1
- package/dist/application/transform/document/responses.cjs.map +1 -1
- package/dist/application/transform/document/responses.mjs +2 -2
- package/dist/application/transform/document/responses.mjs.map +1 -1
- package/dist/application/transform/document/root-type-aliases.cjs +8 -23
- package/dist/application/transform/document/root-type-aliases.cjs.map +1 -1
- package/dist/application/transform/document/root-type-aliases.mjs +8 -24
- package/dist/application/transform/document/root-type-aliases.mjs.map +1 -1
- package/dist/application/transform/document/type-resolution.cjs +3 -1
- package/dist/application/transform/document/type-resolution.cjs.map +1 -1
- package/dist/application/transform/document/type-resolution.mjs +3 -1
- package/dist/application/transform/document/type-resolution.mjs.map +1 -1
- package/dist/application/transform/document/webhooks.cjs +10 -3
- package/dist/application/transform/document/webhooks.cjs.map +1 -1
- package/dist/application/transform/document/webhooks.mjs +10 -3
- package/dist/application/transform/document/webhooks.mjs.map +1 -1
- package/dist/application/transform/footer/document-footer.cjs +16 -5
- package/dist/application/transform/footer/document-footer.cjs.map +1 -1
- package/dist/application/transform/footer/document-footer.mjs +16 -5
- package/dist/application/transform/footer/document-footer.mjs.map +1 -1
- package/dist/application/transform/footer/enum-name-claims.cjs +48 -0
- package/dist/application/transform/footer/enum-name-claims.cjs.map +1 -0
- package/dist/application/transform/footer/enum-name-claims.mjs +46 -0
- package/dist/application/transform/footer/enum-name-claims.mjs.map +1 -0
- package/dist/application/transform/footer/operation-keys.cjs +23 -0
- package/dist/application/transform/footer/operation-keys.cjs.map +1 -0
- package/dist/application/transform/footer/operation-keys.mjs +21 -0
- package/dist/application/transform/footer/operation-keys.mjs.map +1 -0
- package/dist/application/transform/footer/type-evaluation.cjs +4 -4
- package/dist/application/transform/footer/type-evaluation.cjs.map +1 -1
- package/dist/application/transform/footer/type-evaluation.mjs +4 -4
- package/dist/application/transform/footer/type-evaluation.mjs.map +1 -1
- package/dist/application/transform/helper-types.cjs +3 -3
- package/dist/application/transform/helper-types.cjs.map +1 -1
- package/dist/application/transform/helper-types.mjs +3 -3
- package/dist/application/transform/helper-types.mjs.map +1 -1
- package/dist/application/transform/numbered-names.cjs +9 -0
- package/dist/application/transform/numbered-names.cjs.map +1 -1
- package/dist/application/transform/numbered-names.mjs +9 -1
- package/dist/application/transform/numbered-names.mjs.map +1 -1
- package/dist/application/transform/ref-pointer/generated-location.cjs +5 -5
- package/dist/application/transform/ref-pointer/generated-location.cjs.map +1 -1
- package/dist/application/transform/ref-pointer/generated-location.mjs +3 -3
- package/dist/application/transform/ref-pointer/generated-location.mjs.map +1 -1
- package/dist/application/transform/ref-pointer/generated-shape.cjs +47 -66
- package/dist/application/transform/ref-pointer/generated-shape.cjs.map +1 -1
- package/dist/application/transform/ref-pointer/generated-shape.mjs +36 -50
- package/dist/application/transform/ref-pointer/generated-shape.mjs.map +1 -1
- package/dist/application/transform/ref-pointer/inline-cycles.cjs +2 -2
- package/dist/application/transform/ref-pointer/inline-cycles.cjs.map +1 -1
- package/dist/application/transform/ref-pointer/inline-cycles.mjs +1 -1
- package/dist/application/transform/ref-pointer/inline-cycles.mjs.map +1 -1
- package/dist/application/transform/ref-pointer/located-node.cjs +23 -0
- package/dist/application/transform/ref-pointer/located-node.cjs.map +1 -0
- package/dist/application/transform/ref-pointer/located-node.mjs +18 -0
- package/dist/application/transform/ref-pointer/located-node.mjs.map +1 -0
- package/dist/application/transform/ref-pointer/original-index.cjs +68 -13
- package/dist/application/transform/ref-pointer/original-index.cjs.map +1 -1
- package/dist/application/transform/ref-pointer/original-index.mjs +70 -15
- package/dist/application/transform/ref-pointer/original-index.mjs.map +1 -1
- package/dist/application/transform/ref-pointer/pointer-type.cjs +2 -2
- package/dist/application/transform/ref-pointer/pointer-type.cjs.map +1 -1
- package/dist/application/transform/ref-pointer/pointer-type.mjs +1 -1
- package/dist/application/transform/ref-pointer/pointer-type.mjs.map +1 -1
- package/dist/application/transform/ref-pointer/pointer-walk.cjs +54 -13
- package/dist/application/transform/ref-pointer/pointer-walk.cjs.map +1 -1
- package/dist/application/transform/ref-pointer/pointer-walk.mjs +46 -7
- package/dist/application/transform/ref-pointer/pointer-walk.mjs.map +1 -1
- package/dist/application/transform/ref-pointer/property-shape.cjs +52 -0
- package/dist/application/transform/ref-pointer/property-shape.cjs.map +1 -0
- package/dist/application/transform/ref-pointer/property-shape.mjs +45 -0
- package/dist/application/transform/ref-pointer/property-shape.mjs.map +1 -0
- package/dist/application/transform/ref-pointer/typed-walk.cjs +79 -21
- package/dist/application/transform/ref-pointer/typed-walk.cjs.map +1 -1
- package/dist/application/transform/ref-pointer/typed-walk.mjs +76 -18
- package/dist/application/transform/ref-pointer/typed-walk.mjs.map +1 -1
- package/dist/application/transform/ref-type.cjs +2 -1
- package/dist/application/transform/ref-type.cjs.map +1 -1
- package/dist/application/transform/ref-type.mjs +2 -1
- package/dist/application/transform/ref-type.mjs.map +1 -1
- package/dist/application/transform/schema/access-flags.cjs.map +1 -1
- package/dist/application/transform/schema/access-flags.mjs.map +1 -1
- package/dist/application/transform/schema/composition-type.cjs +1 -1
- package/dist/application/transform/schema/composition-type.cjs.map +1 -1
- package/dist/application/transform/schema/composition-type.mjs +2 -2
- package/dist/application/transform/schema/composition-type.mjs.map +1 -1
- package/dist/application/transform/schema/enum-rule.cjs +1 -1
- package/dist/application/transform/schema/enum-rule.cjs.map +1 -1
- package/dist/application/transform/schema/enum-rule.mjs +2 -2
- package/dist/application/transform/schema/enum-rule.mjs.map +1 -1
- package/dist/application/transform/schema/index-signature-type.cjs +21 -0
- package/dist/application/transform/schema/index-signature-type.cjs.map +1 -0
- package/dist/application/transform/schema/index-signature-type.mjs +19 -0
- package/dist/application/transform/schema/index-signature-type.mjs.map +1 -0
- package/dist/application/transform/schema/input-location.cjs +23 -0
- package/dist/application/transform/schema/input-location.cjs.map +1 -0
- package/dist/application/transform/schema/input-location.mjs +21 -0
- package/dist/application/transform/schema/input-location.mjs.map +1 -0
- package/dist/application/transform/schema/object-type.cjs +18 -8
- package/dist/application/transform/schema/object-type.cjs.map +1 -1
- package/dist/application/transform/schema/object-type.mjs +19 -9
- package/dist/application/transform/schema/object-type.mjs.map +1 -1
- package/dist/application/transform/schema/ref-siblings.cjs +47 -0
- package/dist/application/transform/schema/ref-siblings.cjs.map +1 -0
- package/dist/application/transform/schema/ref-siblings.mjs +45 -0
- package/dist/application/transform/schema/ref-siblings.mjs.map +1 -0
- package/dist/application/transform/schema/schema-transform.cjs +6 -3
- package/dist/application/transform/schema/schema-transform.cjs.map +1 -1
- package/dist/application/transform/schema/schema-transform.mjs +6 -3
- package/dist/application/transform/schema/schema-transform.mjs.map +1 -1
- package/dist/application/transform/schema/unevaluated-properties.cjs +2 -30
- package/dist/application/transform/schema/unevaluated-properties.cjs.map +1 -1
- package/dist/application/transform/schema/unevaluated-properties.mjs +3 -31
- package/dist/application/transform/schema/unevaluated-properties.mjs.map +1 -1
- package/dist/application/transform/schema-comment.cjs +5 -1
- package/dist/application/transform/schema-comment.cjs.map +1 -1
- package/dist/application/transform/schema-comment.mjs +5 -1
- package/dist/application/transform/schema-comment.mjs.map +1 -1
- package/dist/cli/api-logger.cjs +13 -0
- package/dist/cli/api-logger.cjs.map +1 -0
- package/dist/cli/api-logger.mjs +11 -0
- package/dist/cli/api-logger.mjs.map +1 -0
- package/dist/cli/api-settings.cjs +57 -9
- package/dist/cli/api-settings.cjs.map +1 -1
- package/dist/cli/api-settings.mjs +56 -11
- package/dist/cli/api-settings.mjs.map +1 -1
- package/dist/cli/api-writes.cjs +72 -0
- package/dist/cli/api-writes.cjs.map +1 -0
- package/dist/cli/api-writes.mjs +69 -0
- package/dist/cli/api-writes.mjs.map +1 -0
- package/dist/cli/cli-arguments.cjs +51 -11
- package/dist/cli/cli-arguments.cjs.map +1 -1
- package/dist/cli/cli-arguments.mjs +51 -11
- package/dist/cli/cli-arguments.mjs.map +1 -1
- package/dist/cli/cli-errors.cjs +29 -1
- package/dist/cli/cli-errors.cjs.map +1 -1
- package/dist/cli/cli-errors.mjs +29 -2
- package/dist/cli/cli-errors.mjs.map +1 -1
- package/dist/cli/cli-output.cjs +111 -4
- package/dist/cli/cli-output.cjs.map +1 -1
- package/dist/cli/cli-output.mjs +104 -5
- package/dist/cli/cli-output.mjs.map +1 -1
- package/dist/cli/main.cjs +13 -3
- package/dist/cli/main.cjs.map +1 -1
- package/dist/cli/main.mjs +14 -4
- package/dist/cli/main.mjs.map +1 -1
- package/dist/cli/redocly-apis.cjs +94 -37
- package/dist/cli/redocly-apis.cjs.map +1 -1
- package/dist/cli/redocly-apis.mjs +99 -42
- package/dist/cli/redocly-apis.mjs.map +1 -1
- package/dist/cli/ref-limits.cjs +15 -1
- package/dist/cli/ref-limits.cjs.map +1 -1
- package/dist/cli/ref-limits.mjs +15 -2
- package/dist/cli/ref-limits.mjs.map +1 -1
- package/dist/cli/run-cli.cjs +37 -14
- package/dist/cli/run-cli.cjs.map +1 -1
- package/dist/cli/run-cli.mjs +39 -16
- package/dist/cli/run-cli.mjs.map +1 -1
- package/dist/domain/append-all.cjs +10 -0
- package/dist/domain/append-all.cjs.map +1 -0
- package/dist/domain/append-all.mjs +8 -0
- package/dist/domain/append-all.mjs.map +1 -0
- package/dist/domain/cause-secrets.cjs +52 -0
- package/dist/domain/cause-secrets.cjs.map +1 -0
- package/dist/domain/cause-secrets.mjs +50 -0
- package/dist/domain/cause-secrets.mjs.map +1 -0
- package/dist/domain/errors.cjs +11 -3
- package/dist/domain/errors.cjs.map +1 -1
- package/dist/domain/errors.mjs +11 -3
- package/dist/domain/errors.mjs.map +1 -1
- package/dist/domain/ir/identifier-text.cjs.map +1 -1
- package/dist/domain/ir/identifier-text.mjs +1 -1
- package/dist/domain/ir/identifier-text.mjs.map +1 -1
- package/dist/domain/ir/ir-shape.cjs +187 -0
- package/dist/domain/ir/ir-shape.cjs.map +1 -0
- package/dist/domain/ir/ir-shape.mjs +184 -0
- package/dist/domain/ir/ir-shape.mjs.map +1 -0
- package/dist/domain/ir/newer-identifier-ranges.cjs +182 -29
- package/dist/domain/ir/newer-identifier-ranges.cjs.map +1 -1
- package/dist/domain/ir/newer-identifier-ranges.mjs +182 -29
- package/dist/domain/ir/newer-identifier-ranges.mjs.map +1 -1
- package/dist/domain/location-text.cjs +9 -0
- package/dist/domain/location-text.cjs.map +1 -0
- package/dist/domain/location-text.mjs +7 -0
- package/dist/domain/location-text.mjs.map +1 -0
- package/dist/domain/openapi/alias-expansion.cjs +3 -1
- package/dist/domain/openapi/alias-expansion.cjs.map +1 -1
- package/dist/domain/openapi/alias-expansion.mjs +3 -1
- package/dist/domain/openapi/alias-expansion.mjs.map +1 -1
- package/dist/domain/openapi/discriminated-union.cjs +3 -3
- package/dist/domain/openapi/discriminated-union.cjs.map +1 -1
- package/dist/domain/openapi/discriminated-union.mjs +4 -4
- package/dist/domain/openapi/discriminated-union.mjs.map +1 -1
- package/dist/domain/openapi/discriminator-conflicts.cjs +10 -6
- package/dist/domain/openapi/discriminator-conflicts.cjs.map +1 -1
- package/dist/domain/openapi/discriminator-conflicts.mjs +11 -7
- package/dist/domain/openapi/discriminator-conflicts.mjs.map +1 -1
- package/dist/domain/openapi/document-places.cjs +55 -0
- package/dist/domain/openapi/document-places.cjs.map +1 -0
- package/dist/domain/openapi/document-places.mjs +53 -0
- package/dist/domain/openapi/document-places.mjs.map +1 -0
- package/dist/domain/openapi/json-pointer.cjs +43 -1
- package/dist/domain/openapi/json-pointer.cjs.map +1 -1
- package/dist/domain/openapi/json-pointer.mjs +40 -2
- package/dist/domain/openapi/json-pointer.mjs.map +1 -1
- package/dist/domain/openapi/schema-dialect.cjs +15 -0
- package/dist/domain/openapi/schema-dialect.cjs.map +1 -0
- package/dist/domain/openapi/schema-dialect.mjs +12 -0
- package/dist/domain/openapi/schema-dialect.mjs.map +1 -0
- package/dist/domain/openapi/unsupported-features.cjs +1 -1
- package/dist/domain/openapi/unsupported-features.cjs.map +1 -1
- package/dist/domain/openapi/unsupported-features.mjs +2 -2
- package/dist/domain/openapi/unsupported-features.mjs.map +1 -1
- package/dist/domain/output-fixes.cjs +20 -0
- package/dist/domain/output-fixes.cjs.map +1 -1
- package/dist/domain/output-fixes.mjs +20 -0
- package/dist/domain/output-fixes.mjs.map +1 -1
- package/dist/domain/terminal-text.cjs +31 -0
- package/dist/domain/terminal-text.cjs.map +1 -0
- package/dist/domain/terminal-text.mjs +29 -0
- package/dist/domain/terminal-text.mjs.map +1 -0
- package/dist/domain/url-secrets.cjs +48 -0
- package/dist/domain/url-secrets.cjs.map +1 -0
- package/dist/domain/url-secrets.mjs +45 -0
- package/dist/domain/url-secrets.mjs.map +1 -0
- package/dist/domain/warnings.cjs +1 -0
- package/dist/domain/warnings.cjs.map +1 -1
- package/dist/domain/warnings.mjs +1 -0
- package/dist/domain/warnings.mjs.map +1 -1
- package/dist/index.d.cts +46 -20
- package/dist/index.d.mts +46 -20
- package/dist/index.d.ts +46 -20
- package/package.json +4 -5
- package/src/adapters/node-file-system/file-claims.ts +138 -0
- package/src/adapters/node-file-system/file-identity.ts +137 -0
- package/src/adapters/node-file-system/node-file-system.ts +158 -18
- package/src/adapters/pipe-safe-writer/pipe-safe-writer.ts +29 -0
- package/src/adapters/redocly-loader/bundled-mapping-copies.ts +60 -0
- package/src/adapters/redocly-loader/bundled-ref-repair.ts +2 -2
- package/src/adapters/redocly-loader/component-schemas.ts +19 -0
- package/src/adapters/redocly-loader/loaded-documents.ts +46 -0
- package/src/adapters/redocly-loader/mapping-schema-names.ts +25 -0
- package/src/adapters/redocly-loader/query-named-components.ts +201 -0
- package/src/adapters/redocly-loader/redocly-schema-loader.ts +64 -38
- package/src/adapters/redocly-loader/ref-access.ts +51 -4
- package/src/adapters/redocly-loader/ref-holders.ts +76 -15
- package/src/adapters/redocly-loader/remote-body-limit.ts +66 -0
- package/src/adapters/redocly-loader/remote-fetch.ts +85 -13
- package/src/adapters/redocly-loader/remote-node-limit.ts +102 -0
- package/src/adapters/redocly-loader/schema-load-errors.ts +52 -13
- package/src/adapters/redocly-loader/schema-source.ts +35 -11
- package/src/adapters/redocly-loader/unsupported-keys.ts +3 -7
- package/src/adapters/terminal-logger/terminal-logger.ts +17 -6
- package/src/api/default-ports.ts +33 -4
- package/src/api/discriminator-enum-parent.ts +3 -3
- package/src/api/discriminator-other-owners.ts +5 -3
- package/src/api/discriminator-patch.ts +5 -1
- package/src/api/discriminator-scan.ts +16 -8
- package/src/api/document-refs.ts +29 -1
- package/src/api/document-run.ts +10 -19
- package/src/api/legacy-utils.ts +5 -1
- package/src/api/openapi-ts.ts +26 -8
- package/src/api/ref-limit-options.ts +76 -0
- package/src/api/run-context.ts +3 -0
- package/src/api/schema-callbacks.ts +60 -17
- package/src/api/transform-context.ts +7 -3
- package/src/api/transform-schema.ts +79 -12
- package/src/application/ports/file-system.ts +47 -0
- package/src/application/ports/schema-loader.ts +11 -1
- package/src/application/print/text-writer.ts +10 -3
- package/src/application/stack-overflow.ts +9 -5
- package/src/application/transform/declared-value-types.ts +42 -0
- package/src/application/transform/document/components.ts +2 -2
- package/src/application/transform/document/declared-type-names.ts +36 -0
- package/src/application/transform/document/defs-root.ts +2 -2
- package/src/application/transform/document/document.ts +8 -5
- package/src/application/transform/document/enum-names-given-back.ts +91 -0
- package/src/application/transform/document/exploded-query-values.ts +88 -0
- package/src/application/transform/document/global-type-references.ts +1 -1
- package/src/application/transform/document/header.ts +25 -5
- package/src/application/transform/document/media-type.ts +4 -3
- package/src/application/transform/document/operation-keys-written.ts +27 -0
- package/src/application/transform/document/operation.ts +2 -2
- package/src/application/transform/document/parameter-entries.ts +70 -0
- package/src/application/transform/document/parameter.ts +21 -9
- package/src/application/transform/document/parameters.ts +56 -66
- package/src/application/transform/document/path-item.ts +16 -34
- package/src/application/transform/document/path-template-key.ts +152 -0
- package/src/application/transform/document/path-template-refs.ts +106 -0
- package/src/application/transform/document/paths-enum.ts +24 -10
- package/src/application/transform/document/paths.ts +59 -125
- package/src/application/transform/document/referenced-parameter.ts +146 -0
- package/src/application/transform/document/request-body.ts +2 -2
- package/src/application/transform/document/response.ts +3 -3
- package/src/application/transform/document/responses.ts +2 -2
- package/src/application/transform/document/root-type-aliases.ts +17 -38
- package/src/application/transform/document/type-resolution.ts +2 -1
- package/src/application/transform/document/webhooks.ts +19 -6
- package/src/application/transform/footer/document-footer.ts +36 -9
- package/src/application/transform/footer/enum-name-claims.ts +62 -0
- package/src/application/transform/footer/operation-keys.ts +28 -0
- package/src/application/transform/footer/type-evaluation.ts +4 -4
- package/src/application/transform/helper-types.ts +8 -7
- package/src/application/transform/numbered-names.ts +15 -0
- package/src/application/transform/ref-pointer/generated-location.ts +3 -3
- package/src/application/transform/ref-pointer/generated-shape.ts +67 -78
- package/src/application/transform/ref-pointer/inline-cycles.ts +1 -1
- package/src/application/transform/ref-pointer/located-node.ts +38 -0
- package/src/application/transform/ref-pointer/original-index.ts +100 -17
- package/src/application/transform/ref-pointer/pointer-type.ts +1 -1
- package/src/application/transform/ref-pointer/pointer-walk.ts +82 -8
- package/src/application/transform/ref-pointer/property-shape.ts +97 -0
- package/src/application/transform/ref-pointer/typed-walk.ts +117 -25
- package/src/application/transform/ref-type.ts +2 -1
- package/src/application/transform/schema/access-flags.ts +5 -2
- package/src/application/transform/schema/composition-type.ts +2 -2
- package/src/application/transform/schema/enum-rule.ts +6 -2
- package/src/application/transform/schema/index-signature-type.ts +31 -0
- package/src/application/transform/schema/input-location.ts +35 -0
- package/src/application/transform/schema/object-type.ts +22 -12
- package/src/application/transform/schema/ref-siblings.ts +76 -0
- package/src/application/transform/schema/schema-context.ts +3 -0
- package/src/application/transform/schema/schema-transform.ts +6 -3
- package/src/application/transform/schema/unevaluated-properties.ts +4 -44
- package/src/application/transform/schema-comment.ts +5 -1
- package/src/application/transform/transform-context.ts +5 -0
- package/src/cli/api-logger.ts +17 -0
- package/src/cli/api-settings.ts +80 -13
- package/src/cli/api-writes.ts +117 -0
- package/src/cli/cli-arguments.ts +90 -14
- package/src/cli/cli-dependencies.ts +26 -4
- package/src/cli/cli-errors.ts +42 -1
- package/src/cli/cli-output.ts +195 -15
- package/src/cli/main.ts +14 -5
- package/src/cli/redocly-apis.ts +177 -52
- package/src/cli/ref-limits.ts +21 -2
- package/src/cli/run-cli.ts +76 -15
- package/src/domain/append-all.ts +10 -0
- package/src/domain/cause-secrets.ts +86 -0
- package/src/domain/errors.ts +16 -5
- package/src/domain/ir/identifier-text.ts +6 -5
- package/src/domain/ir/ir-shape.ts +299 -0
- package/src/domain/ir/newer-identifier-ranges.ts +183 -30
- package/src/domain/location-text.ts +12 -0
- package/src/domain/openapi/alias-expansion.ts +4 -1
- package/src/domain/openapi/discriminated-union.ts +6 -4
- package/src/domain/openapi/discriminator-conflicts.ts +21 -7
- package/src/domain/openapi/document-object.ts +2 -0
- package/src/domain/openapi/document-places.ts +78 -0
- package/src/domain/openapi/json-pointer.ts +96 -7
- package/src/domain/openapi/schema-dialect.ts +22 -0
- package/src/domain/openapi/unsupported-features.ts +2 -2
- package/src/domain/output-fixes.ts +28 -2
- package/src/domain/terminal-text.ts +44 -0
- package/src/domain/url-secrets.ts +72 -0
- package/src/domain/warnings.ts +1 -0
- package/src/types/generator-options.ts +1 -1
- package/dist/cli/main.d.cts +0 -2
- package/dist/cli/main.d.mts +0 -2
- package/dist/cli/main.d.ts +0 -2
- package/dist/domain/url-credentials.cjs +0 -10
- package/dist/domain/url-credentials.cjs.map +0 -1
- package/dist/domain/url-credentials.mjs +0 -8
- package/dist/domain/url-credentials.mjs.map +0 -1
- package/src/domain/url-credentials.ts +0 -18
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { irProperty, irKeyword } from '../../../domain/ir/constructors.mjs';
|
|
2
2
|
import { toPropertyName } from '../../../domain/ir/property-name.mjs';
|
|
3
|
-
import {
|
|
3
|
+
import { appendPointer } from '../../../domain/openapi/json-pointer.mjs';
|
|
4
4
|
import { refType } from '../ref-type.mjs';
|
|
5
5
|
import { documentMember } from './document-member.mjs';
|
|
6
6
|
import { parametersMember } from './parameters.mjs';
|
|
@@ -19,7 +19,7 @@ function requestBodyMember(operation, location, context) {
|
|
|
19
19
|
const isReference = "$ref" in body;
|
|
20
20
|
const type = isReference ? refType(body.$ref) : requestBodyType(
|
|
21
21
|
body,
|
|
22
|
-
{ ...location, path:
|
|
22
|
+
{ ...location, path: appendPointer(location.path, ["requestBody"]) },
|
|
23
23
|
context
|
|
24
24
|
);
|
|
25
25
|
const resolved = isReference ? context.refs.resolve(body.$ref) : body;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation.mjs","sources":["../../../../src/application/transform/document/operation.ts"],"sourcesContent":["import { irKeyword, irProperty } from \"../../../domain/ir/constructors.js\";\nimport type { IrPropertySignature } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport {
|
|
1
|
+
{"version":3,"file":"operation.mjs","sources":["../../../../src/application/transform/document/operation.ts"],"sourcesContent":["import { irKeyword, irProperty } from \"../../../domain/ir/constructors.js\";\nimport type { IrPropertySignature } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { appendPointer } from \"../../../domain/openapi/json-pointer.js\";\nimport type { OperationObject } from \"../../../domain/openapi/operation-object.js\";\nimport type { RequestBodyObject } from \"../../../domain/openapi/request-body-object.js\";\nimport { refType } from \"../ref-type.js\";\nimport type { SchemaLocation } from \"../schema/schema-context.js\";\nimport type { TransformContext } from \"../transform-context.js\";\nimport { documentMember } from \"./document-member.js\";\nimport { parametersMember } from \"./parameters.js\";\nimport { requestBodyType } from \"./request-body.js\";\nimport { responsesType } from \"./responses.js\";\n\n/** `requestBody`, optional unless the resolved body is required; `requestBody?: never` if none. */\nfunction requestBodyMember(\n operation: OperationObject,\n location: SchemaLocation,\n context: TransformContext,\n): IrPropertySignature {\n const isReadonly = context.options.immutable;\n const body = operation.requestBody;\n if (!body) {\n return irProperty(toPropertyName(\"requestBody\"), irKeyword(\"never\"), {\n isOptional: true,\n isReadonly,\n });\n }\n const isReference = \"$ref\" in body;\n const type = isReference\n ? refType(body.$ref)\n : requestBodyType(\n body,\n { ...location, path: appendPointer(location.path, [\"requestBody\"]) },\n context,\n );\n const resolved = isReference\n ? (context.refs.resolve(body.$ref) as RequestBodyObject | undefined)\n : body;\n return documentMember(\"requestBody\", type, body, {\n isReadonly,\n isOptional: !resolved?.required,\n });\n}\n\n/**\n * The members of an operation (OpenAPI 3.1 §4.8.10): `parameters`, `requestBody` and `responses`.\n * `location.path` is the operation's pointer.\n */\nexport function operationMembers(\n operation: OperationObject,\n location: SchemaLocation,\n context: TransformContext,\n): IrPropertySignature[] {\n // Built in document order: each part may add footer declarations (enums), in this order.\n const parameters = parametersMember(operation.parameters ?? [], location, context);\n const requestBody = requestBodyMember(operation, location, context);\n const responses = responsesType(operation.responses ?? {}, location, context);\n return [\n parameters,\n requestBody,\n irProperty(toPropertyName(\"responses\"), responses, { isReadonly: context.options.immutable }),\n ];\n}\n"],"names":[],"mappings":";;;;;;;;;AAeA,SAAS,iBAAA,CACP,SAAA,EACA,QAAA,EACA,OAAA,EACqB;AACrB,EAAA,MAAM,UAAA,GAAa,QAAQ,OAAA,CAAQ,SAAA;AACnC,EAAA,MAAM,OAAO,SAAA,CAAU,WAAA;AACvB,EAAA,IAAI,CAAC,IAAA,EAAM;AACT,IAAA,OAAO,WAAW,cAAA,CAAe,aAAa,CAAA,EAAG,SAAA,CAAU,OAAO,CAAA,EAAG;AAAA,MACnE,UAAA,EAAY,IAAA;AAAA,MACZ;AAAA,KACD,CAAA;AAAA,EACH;AACA,EAAA,MAAM,cAAc,MAAA,IAAU,IAAA;AAC9B,EAAA,MAAM,IAAA,GAAO,WAAA,GACT,OAAA,CAAQ,IAAA,CAAK,IAAI,CAAA,GACjB,eAAA;AAAA,IACE,IAAA;AAAA,IACA,EAAE,GAAG,QAAA,EAAU,IAAA,EAAM,aAAA,CAAc,SAAS,IAAA,EAAM,CAAC,aAAa,CAAC,CAAA,EAAE;AAAA,IACnE;AAAA,GACF;AACJ,EAAA,MAAM,WAAW,WAAA,GACZ,OAAA,CAAQ,KAAK,OAAA,CAAQ,IAAA,CAAK,IAAI,CAAA,GAC/B,IAAA;AACJ,EAAA,OAAO,cAAA,CAAe,aAAA,EAAe,IAAA,EAAM,IAAA,EAAM;AAAA,IAC/C,UAAA;AAAA,IACA,UAAA,EAAY,CAAC,QAAA,EAAU;AAAA,GACxB,CAAA;AACH;AAMO,SAAS,gBAAA,CACd,SAAA,EACA,QAAA,EACA,OAAA,EACuB;AAEvB,EAAA,MAAM,aAAa,gBAAA,CAAiB,SAAA,CAAU,cAAc,EAAC,EAAG,UAAU,OAAO,CAAA;AACjF,EAAA,MAAM,WAAA,GAAc,iBAAA,CAAkB,SAAA,EAAW,QAAA,EAAU,OAAO,CAAA;AAClE,EAAA,MAAM,YAAY,aAAA,CAAc,SAAA,CAAU,aAAa,EAAC,EAAG,UAAU,OAAO,CAAA;AAC5E,EAAA,OAAO;AAAA,IACL,UAAA;AAAA,IACA,WAAA;AAAA,IACA,UAAA,CAAW,cAAA,CAAe,WAAW,CAAA,EAAG,SAAA,EAAW,EAAE,UAAA,EAAY,OAAA,CAAQ,OAAA,CAAQ,SAAA,EAAW;AAAA,GAC9F;AACF;;"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
function resolveParameter(parameter, refs) {
|
|
4
|
+
return "$ref" in parameter ? refs.resolve(parameter.$ref) : parameter;
|
|
5
|
+
}
|
|
6
|
+
function isDeprecatedParameter(parameter) {
|
|
7
|
+
const schema = parameter?.schema;
|
|
8
|
+
return Boolean(parameter?.deprecated || schema?.deprecated);
|
|
9
|
+
}
|
|
10
|
+
function parameterEntries(parameters, context) {
|
|
11
|
+
const entries = parameters.map((original) => ({
|
|
12
|
+
original,
|
|
13
|
+
resolved: resolveParameter(original, context.refs)
|
|
14
|
+
}));
|
|
15
|
+
if (context.options.alphabetize) {
|
|
16
|
+
entries.sort(
|
|
17
|
+
(left, right) => (left.resolved?.name ?? "").localeCompare(right.resolved?.name ?? "")
|
|
18
|
+
);
|
|
19
|
+
}
|
|
20
|
+
return context.options.excludeDeprecated ? entries.filter(({ resolved }) => !isDeprecatedParameter(resolved)) : entries;
|
|
21
|
+
}
|
|
22
|
+
function mergedParameters(pathItem, operation, refs) {
|
|
23
|
+
const byKey = /* @__PURE__ */ new Map();
|
|
24
|
+
for (const parameter of [...pathItem.parameters ?? [], ...operation.parameters ?? []]) {
|
|
25
|
+
const resolved = resolveParameter(parameter, refs);
|
|
26
|
+
byKey.set(`${resolved?.in}-${resolved?.name}`, parameter);
|
|
27
|
+
}
|
|
28
|
+
return [...byKey.values()];
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
exports.mergedParameters = mergedParameters;
|
|
32
|
+
exports.parameterEntries = parameterEntries;
|
|
33
|
+
exports.resolveParameter = resolveParameter;
|
|
34
|
+
//# sourceMappingURL=parameter-entries.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parameter-entries.cjs","sources":["../../../../src/application/transform/document/parameter-entries.ts"],"sourcesContent":["import type { OperationObject } from \"../../../domain/openapi/operation-object.js\";\nimport type {\n ParameterObject,\n ParameterOrReference,\n} from \"../../../domain/openapi/parameter-object.js\";\nimport type { PathItemObject } from \"../../../domain/openapi/path-item-object.js\";\nimport type { SchemaObject } from \"../../../domain/openapi/schema-object.js\";\nimport type { RefResolver } from \"../schema/schema-context.js\";\nimport type { TransformContext } from \"../transform-context.js\";\n\n/** A parameter as written in the document, and the object its `$ref` points to. */\nexport interface ParameterEntry {\n readonly original: ParameterOrReference;\n readonly resolved: ParameterObject | undefined;\n}\n\n/** An entry whose `$ref` resolved, so its location and name are known. */\nexport type ResolvedEntry = ParameterEntry & { readonly resolved: ParameterObject };\n\n/** The parameter object itself, or the one its `$ref` points to. */\nexport function resolveParameter(\n parameter: ParameterOrReference,\n refs: RefResolver,\n): ParameterObject | undefined {\n return \"$ref\" in parameter\n ? (refs.resolve(parameter.$ref) as ParameterObject | undefined)\n : parameter;\n}\n\nfunction isDeprecatedParameter(parameter: ParameterObject | undefined): boolean {\n const schema = parameter?.schema as SchemaObject | undefined;\n return Boolean(parameter?.deprecated || schema?.deprecated);\n}\n\n/** Resolved parameters, sorted for `--alphabetize`, without deprecated ones if excluded. */\nexport function parameterEntries(\n parameters: readonly ParameterOrReference[],\n context: TransformContext,\n): ParameterEntry[] {\n const entries = parameters.map((original) => ({\n original,\n resolved: resolveParameter(original, context.refs),\n }));\n if (context.options.alphabetize) {\n // Unlike map keys, the original sorts parameters with the default locale's `localeCompare`.\n entries.sort((left, right) =>\n (left.resolved?.name ?? \"\").localeCompare(right.resolved?.name ?? \"\"),\n );\n }\n return context.options.excludeDeprecated\n ? entries.filter(({ resolved }) => !isDeprecatedParameter(resolved))\n : entries;\n}\n\n/**\n * Path item parameters followed by the operation's, keyed by location and name, so an operation\n * parameter replaces the path item parameter it redefines (upstream issue #1798).\n */\nexport function mergedParameters(\n pathItem: PathItemObject,\n operation: OperationObject,\n refs: RefResolver,\n): ParameterOrReference[] {\n const byKey = new Map<string, ParameterOrReference>();\n for (const parameter of [...(pathItem.parameters ?? []), ...(operation.parameters ?? [])]) {\n const resolved = resolveParameter(parameter, refs);\n byKey.set(`${resolved?.in}-${resolved?.name}`, parameter);\n }\n return [...byKey.values()];\n}\n"],"names":[],"mappings":";;AAoBO,SAAS,gBAAA,CACd,WACA,IAAA,EAC6B;AAC7B,EAAA,OAAO,UAAU,SAAA,GACZ,IAAA,CAAK,OAAA,CAAQ,SAAA,CAAU,IAAI,CAAA,GAC5B,SAAA;AACN;AAEA,SAAS,sBAAsB,SAAA,EAAiD;AAC9E,EAAA,MAAM,SAAS,SAAA,EAAW,MAAA;AAC1B,EAAA,OAAO,OAAA,CAAQ,SAAA,EAAW,UAAA,IAAc,MAAA,EAAQ,UAAU,CAAA;AAC5D;AAGO,SAAS,gBAAA,CACd,YACA,OAAA,EACkB;AAClB,EAAA,MAAM,OAAA,GAAU,UAAA,CAAW,GAAA,CAAI,CAAC,QAAA,MAAc;AAAA,IAC5C,QAAA;AAAA,IACA,QAAA,EAAU,gBAAA,CAAiB,QAAA,EAAU,OAAA,CAAQ,IAAI;AAAA,GACnD,CAAE,CAAA;AACF,EAAA,IAAI,OAAA,CAAQ,QAAQ,WAAA,EAAa;AAE/B,IAAA,OAAA,CAAQ,IAAA;AAAA,MAAK,CAAC,IAAA,EAAM,KAAA,KAAA,CACjB,IAAA,CAAK,QAAA,EAAU,IAAA,IAAQ,EAAA,EAAI,aAAA,CAAc,KAAA,CAAM,QAAA,EAAU,IAAA,IAAQ,EAAE;AAAA,KACtE;AAAA,EACF;AACA,EAAA,OAAO,OAAA,CAAQ,OAAA,CAAQ,iBAAA,GACnB,OAAA,CAAQ,MAAA,CAAO,CAAC,EAAE,QAAA,EAAS,KAAM,CAAC,qBAAA,CAAsB,QAAQ,CAAC,CAAA,GACjE,OAAA;AACN;AAMO,SAAS,gBAAA,CACd,QAAA,EACA,SAAA,EACA,IAAA,EACwB;AACxB,EAAA,MAAM,KAAA,uBAAY,GAAA,EAAkC;AACpD,EAAA,KAAA,MAAW,SAAA,IAAa,CAAC,GAAI,QAAA,CAAS,UAAA,IAAc,EAAC,EAAI,GAAI,SAAA,CAAU,UAAA,IAAc,EAAG,CAAA,EAAG;AACzF,IAAA,MAAM,QAAA,GAAW,gBAAA,CAAiB,SAAA,EAAW,IAAI,CAAA;AACjD,IAAA,KAAA,CAAM,GAAA,CAAI,GAAG,QAAA,EAAU,EAAE,IAAI,QAAA,EAAU,IAAI,IAAI,SAAS,CAAA;AAAA,EAC1D;AACA,EAAA,OAAO,CAAC,GAAG,KAAA,CAAM,MAAA,EAAQ,CAAA;AAC3B;;;;"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
function resolveParameter(parameter, refs) {
|
|
2
|
+
return "$ref" in parameter ? refs.resolve(parameter.$ref) : parameter;
|
|
3
|
+
}
|
|
4
|
+
function isDeprecatedParameter(parameter) {
|
|
5
|
+
const schema = parameter?.schema;
|
|
6
|
+
return Boolean(parameter?.deprecated || schema?.deprecated);
|
|
7
|
+
}
|
|
8
|
+
function parameterEntries(parameters, context) {
|
|
9
|
+
const entries = parameters.map((original) => ({
|
|
10
|
+
original,
|
|
11
|
+
resolved: resolveParameter(original, context.refs)
|
|
12
|
+
}));
|
|
13
|
+
if (context.options.alphabetize) {
|
|
14
|
+
entries.sort(
|
|
15
|
+
(left, right) => (left.resolved?.name ?? "").localeCompare(right.resolved?.name ?? "")
|
|
16
|
+
);
|
|
17
|
+
}
|
|
18
|
+
return context.options.excludeDeprecated ? entries.filter(({ resolved }) => !isDeprecatedParameter(resolved)) : entries;
|
|
19
|
+
}
|
|
20
|
+
function mergedParameters(pathItem, operation, refs) {
|
|
21
|
+
const byKey = /* @__PURE__ */ new Map();
|
|
22
|
+
for (const parameter of [...pathItem.parameters ?? [], ...operation.parameters ?? []]) {
|
|
23
|
+
const resolved = resolveParameter(parameter, refs);
|
|
24
|
+
byKey.set(`${resolved?.in}-${resolved?.name}`, parameter);
|
|
25
|
+
}
|
|
26
|
+
return [...byKey.values()];
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export { mergedParameters, parameterEntries, resolveParameter };
|
|
30
|
+
//# sourceMappingURL=parameter-entries.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parameter-entries.mjs","sources":["../../../../src/application/transform/document/parameter-entries.ts"],"sourcesContent":["import type { OperationObject } from \"../../../domain/openapi/operation-object.js\";\nimport type {\n ParameterObject,\n ParameterOrReference,\n} from \"../../../domain/openapi/parameter-object.js\";\nimport type { PathItemObject } from \"../../../domain/openapi/path-item-object.js\";\nimport type { SchemaObject } from \"../../../domain/openapi/schema-object.js\";\nimport type { RefResolver } from \"../schema/schema-context.js\";\nimport type { TransformContext } from \"../transform-context.js\";\n\n/** A parameter as written in the document, and the object its `$ref` points to. */\nexport interface ParameterEntry {\n readonly original: ParameterOrReference;\n readonly resolved: ParameterObject | undefined;\n}\n\n/** An entry whose `$ref` resolved, so its location and name are known. */\nexport type ResolvedEntry = ParameterEntry & { readonly resolved: ParameterObject };\n\n/** The parameter object itself, or the one its `$ref` points to. */\nexport function resolveParameter(\n parameter: ParameterOrReference,\n refs: RefResolver,\n): ParameterObject | undefined {\n return \"$ref\" in parameter\n ? (refs.resolve(parameter.$ref) as ParameterObject | undefined)\n : parameter;\n}\n\nfunction isDeprecatedParameter(parameter: ParameterObject | undefined): boolean {\n const schema = parameter?.schema as SchemaObject | undefined;\n return Boolean(parameter?.deprecated || schema?.deprecated);\n}\n\n/** Resolved parameters, sorted for `--alphabetize`, without deprecated ones if excluded. */\nexport function parameterEntries(\n parameters: readonly ParameterOrReference[],\n context: TransformContext,\n): ParameterEntry[] {\n const entries = parameters.map((original) => ({\n original,\n resolved: resolveParameter(original, context.refs),\n }));\n if (context.options.alphabetize) {\n // Unlike map keys, the original sorts parameters with the default locale's `localeCompare`.\n entries.sort((left, right) =>\n (left.resolved?.name ?? \"\").localeCompare(right.resolved?.name ?? \"\"),\n );\n }\n return context.options.excludeDeprecated\n ? entries.filter(({ resolved }) => !isDeprecatedParameter(resolved))\n : entries;\n}\n\n/**\n * Path item parameters followed by the operation's, keyed by location and name, so an operation\n * parameter replaces the path item parameter it redefines (upstream issue #1798).\n */\nexport function mergedParameters(\n pathItem: PathItemObject,\n operation: OperationObject,\n refs: RefResolver,\n): ParameterOrReference[] {\n const byKey = new Map<string, ParameterOrReference>();\n for (const parameter of [...(pathItem.parameters ?? []), ...(operation.parameters ?? [])]) {\n const resolved = resolveParameter(parameter, refs);\n byKey.set(`${resolved?.in}-${resolved?.name}`, parameter);\n }\n return [...byKey.values()];\n}\n"],"names":[],"mappings":"AAoBO,SAAS,gBAAA,CACd,WACA,IAAA,EAC6B;AAC7B,EAAA,OAAO,UAAU,SAAA,GACZ,IAAA,CAAK,OAAA,CAAQ,SAAA,CAAU,IAAI,CAAA,GAC5B,SAAA;AACN;AAEA,SAAS,sBAAsB,SAAA,EAAiD;AAC9E,EAAA,MAAM,SAAS,SAAA,EAAW,MAAA;AAC1B,EAAA,OAAO,OAAA,CAAQ,SAAA,EAAW,UAAA,IAAc,MAAA,EAAQ,UAAU,CAAA;AAC5D;AAGO,SAAS,gBAAA,CACd,YACA,OAAA,EACkB;AAClB,EAAA,MAAM,OAAA,GAAU,UAAA,CAAW,GAAA,CAAI,CAAC,QAAA,MAAc;AAAA,IAC5C,QAAA;AAAA,IACA,QAAA,EAAU,gBAAA,CAAiB,QAAA,EAAU,OAAA,CAAQ,IAAI;AAAA,GACnD,CAAE,CAAA;AACF,EAAA,IAAI,OAAA,CAAQ,QAAQ,WAAA,EAAa;AAE/B,IAAA,OAAA,CAAQ,IAAA;AAAA,MAAK,CAAC,IAAA,EAAM,KAAA,KAAA,CACjB,IAAA,CAAK,QAAA,EAAU,IAAA,IAAQ,EAAA,EAAI,aAAA,CAAc,KAAA,CAAM,QAAA,EAAU,IAAA,IAAQ,EAAE;AAAA,KACtE;AAAA,EACF;AACA,EAAA,OAAO,OAAA,CAAQ,OAAA,CAAQ,iBAAA,GACnB,OAAA,CAAQ,MAAA,CAAO,CAAC,EAAE,QAAA,EAAS,KAAM,CAAC,qBAAA,CAAsB,QAAQ,CAAC,CAAA,GACjE,OAAA;AACN;AAMO,SAAS,gBAAA,CACd,QAAA,EACA,SAAA,EACA,IAAA,EACwB;AACxB,EAAA,MAAM,KAAA,uBAAY,GAAA,EAAkC;AACpD,EAAA,KAAA,MAAW,SAAA,IAAa,CAAC,GAAI,QAAA,CAAS,UAAA,IAAc,EAAC,EAAI,GAAI,SAAA,CAAU,UAAA,IAAc,EAAG,CAAA,EAAG;AACzF,IAAA,MAAM,QAAA,GAAW,gBAAA,CAAiB,SAAA,EAAW,IAAI,CAAA;AACjD,IAAA,KAAA,CAAM,GAAA,CAAI,GAAG,QAAA,EAAU,EAAE,IAAI,QAAA,EAAU,IAAI,IAAI,SAAS,CAAA;AAAA,EAC1D;AACA,EAAA,OAAO,CAAC,GAAG,KAAA,CAAM,MAAA,EAAQ,CAAA;AAC3B;;"}
|
|
@@ -3,20 +3,28 @@
|
|
|
3
3
|
const constructors = require('../../../domain/ir/constructors.cjs');
|
|
4
4
|
const jsonPointer = require('../../../domain/openapi/json-pointer.cjs');
|
|
5
5
|
const parameterObject = require('../../../domain/openapi/parameter-object.cjs');
|
|
6
|
+
const outputFixes = require('../../../domain/output-fixes.cjs');
|
|
6
7
|
const schemaTransform = require('../schema/schema-transform.cjs');
|
|
7
8
|
const mediaType = require('./media-type.cjs');
|
|
8
9
|
|
|
9
|
-
function
|
|
10
|
+
function contentParameterType(parameter, location, context) {
|
|
10
11
|
const [mediaType$1, entry] = Object.entries(parameter.content ?? {})[0] ?? [];
|
|
11
12
|
if (mediaType$1 === void 0 || entry === void 0) {
|
|
12
13
|
return constructors.irKeyword("string");
|
|
13
14
|
}
|
|
14
|
-
const path = jsonPointer.
|
|
15
|
+
const path = jsonPointer.appendPointer(location.path, ["content", mediaType$1]);
|
|
15
16
|
return mediaType.contentEntryType(entry, { ...location, path }, context);
|
|
16
17
|
}
|
|
17
|
-
function
|
|
18
|
+
function isTypedByContent(parameter, context) {
|
|
18
19
|
if (parameter.in === parameterObject.QUERYSTRING_LOCATION) {
|
|
19
|
-
return
|
|
20
|
+
return true;
|
|
21
|
+
}
|
|
22
|
+
const hasContent = parameter.schema === void 0 && parameter.content !== void 0;
|
|
23
|
+
return hasContent && context.options.fixes.has(outputFixes.FIX.PARAMETER_HEADER_CONTENT);
|
|
24
|
+
}
|
|
25
|
+
function parameterType(parameter, location, context) {
|
|
26
|
+
if (isTypedByContent(parameter, context)) {
|
|
27
|
+
return contentParameterType(parameter, location, context);
|
|
20
28
|
}
|
|
21
29
|
return parameter.schema ? schemaTransform.transformSchema(parameter.schema, location, context) : constructors.irKeyword("string");
|
|
22
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameter.cjs","sources":["../../../../src/application/transform/document/parameter.ts"],"sourcesContent":["import { irKeyword } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport {
|
|
1
|
+
{"version":3,"file":"parameter.cjs","sources":["../../../../src/application/transform/document/parameter.ts"],"sourcesContent":["import { irKeyword } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { appendPointer } from \"../../../domain/openapi/json-pointer.js\";\nimport {\n type ParameterObject,\n QUERYSTRING_LOCATION,\n} from \"../../../domain/openapi/parameter-object.js\";\nimport { FIX } from \"../../../domain/output-fixes.js\";\nimport type { SchemaContext, SchemaLocation } from \"../schema/schema-context.js\";\nimport { transformSchema } from \"../schema/schema-transform.js\";\nimport { contentEntryType } from \"./media-type.js\";\n\n/**\n * A parameter typed by the schema of its one `content` media type. An `in: querystring` parameter\n * (OpenAPI 3.2) is the whole query string (ADR-020); without a media type it is `string`, the\n * query string as text. With the `parameter-header-content` fix, any other parameter with `content`\n * (OpenAPI 3.0 and later, for a JSON value in a query parameter) is typed the same way.\n */\nfunction contentParameterType(\n parameter: ParameterObject,\n location: SchemaLocation,\n context: SchemaContext,\n): IrType {\n const [mediaType, entry] = Object.entries(parameter.content ?? {})[0] ?? [];\n if (mediaType === undefined || entry === undefined) {\n return irKeyword(\"string\");\n }\n const path = appendPointer(location.path, [\"content\", mediaType]);\n return contentEntryType(entry, { ...location, path }, context);\n}\n\nfunction isTypedByContent(parameter: ParameterObject, context: SchemaContext): boolean {\n if (parameter.in === QUERYSTRING_LOCATION) {\n return true;\n }\n const hasContent = parameter.schema === undefined && parameter.content !== undefined;\n return hasContent && context.options.fixes.has(FIX.PARAMETER_HEADER_CONTENT);\n}\n\n/**\n * A parameter's type (OpenAPI 3.2 §4.8.12). Without a schema it is `string`, not `unknown`:\n * query, path, header and cookie values all arrive as text. `content` is read for\n * `in: querystring`, and with the `parameter-header-content` fix for every parameter; without\n * the fix other parameters with `content` keep the original's `string`.\n */\nexport function parameterType(\n parameter: ParameterObject,\n location: SchemaLocation,\n context: SchemaContext,\n): IrType {\n if (isTypedByContent(parameter, context)) {\n return contentParameterType(parameter, location, context);\n }\n return parameter.schema\n ? transformSchema(parameter.schema, location, context)\n : irKeyword(\"string\");\n}\n"],"names":["mediaType","irKeyword","appendPointer","contentEntryType","QUERYSTRING_LOCATION","FIX","transformSchema"],"mappings":";;;;;;;;;AAkBA,SAAS,oBAAA,CACP,SAAA,EACA,QAAA,EACA,OAAA,EACQ;AACR,EAAA,MAAM,CAACA,WAAA,EAAW,KAAK,CAAA,GAAI,MAAA,CAAO,OAAA,CAAQ,SAAA,CAAU,OAAA,IAAW,EAAE,CAAA,CAAE,CAAC,KAAK,EAAC;AAC1E,EAAA,IAAIA,WAAA,KAAc,MAAA,IAAa,KAAA,KAAU,MAAA,EAAW;AAClD,IAAA,OAAOC,uBAAU,QAAQ,CAAA;AAAA,EAC3B;AACA,EAAA,MAAM,OAAOC,yBAAA,CAAc,QAAA,CAAS,MAAM,CAAC,SAAA,EAAWF,WAAS,CAAC,CAAA;AAChE,EAAA,OAAOG,2BAAiB,KAAA,EAAO,EAAE,GAAG,QAAA,EAAU,IAAA,IAAQ,OAAO,CAAA;AAC/D;AAEA,SAAS,gBAAA,CAAiB,WAA4B,OAAA,EAAiC;AACrF,EAAA,IAAI,SAAA,CAAU,OAAOC,oCAAA,EAAsB;AACzC,IAAA,OAAO,IAAA;AAAA,EACT;AACA,EAAA,MAAM,UAAA,GAAa,SAAA,CAAU,MAAA,KAAW,MAAA,IAAa,UAAU,OAAA,KAAY,MAAA;AAC3E,EAAA,OAAO,cAAc,OAAA,CAAQ,OAAA,CAAQ,KAAA,CAAM,GAAA,CAAIC,gBAAI,wBAAwB,CAAA;AAC7E;AAQO,SAAS,aAAA,CACd,SAAA,EACA,QAAA,EACA,OAAA,EACQ;AACR,EAAA,IAAI,gBAAA,CAAiB,SAAA,EAAW,OAAO,CAAA,EAAG;AACxC,IAAA,OAAO,oBAAA,CAAqB,SAAA,EAAW,QAAA,EAAU,OAAO,CAAA;AAAA,EAC1D;AACA,EAAA,OAAO,SAAA,CAAU,SACbC,+BAAA,CAAgB,SAAA,CAAU,QAAQ,QAAA,EAAU,OAAO,CAAA,GACnDL,sBAAA,CAAU,QAAQ,CAAA;AACxB;;"}
|
|
@@ -1,20 +1,28 @@
|
|
|
1
1
|
import { irKeyword } from '../../../domain/ir/constructors.mjs';
|
|
2
|
-
import {
|
|
2
|
+
import { appendPointer } from '../../../domain/openapi/json-pointer.mjs';
|
|
3
3
|
import { QUERYSTRING_LOCATION } from '../../../domain/openapi/parameter-object.mjs';
|
|
4
|
+
import { FIX } from '../../../domain/output-fixes.mjs';
|
|
4
5
|
import { transformSchema } from '../schema/schema-transform.mjs';
|
|
5
6
|
import { contentEntryType } from './media-type.mjs';
|
|
6
7
|
|
|
7
|
-
function
|
|
8
|
+
function contentParameterType(parameter, location, context) {
|
|
8
9
|
const [mediaType, entry] = Object.entries(parameter.content ?? {})[0] ?? [];
|
|
9
10
|
if (mediaType === void 0 || entry === void 0) {
|
|
10
11
|
return irKeyword("string");
|
|
11
12
|
}
|
|
12
|
-
const path =
|
|
13
|
+
const path = appendPointer(location.path, ["content", mediaType]);
|
|
13
14
|
return contentEntryType(entry, { ...location, path }, context);
|
|
14
15
|
}
|
|
15
|
-
function
|
|
16
|
+
function isTypedByContent(parameter, context) {
|
|
16
17
|
if (parameter.in === QUERYSTRING_LOCATION) {
|
|
17
|
-
return
|
|
18
|
+
return true;
|
|
19
|
+
}
|
|
20
|
+
const hasContent = parameter.schema === void 0 && parameter.content !== void 0;
|
|
21
|
+
return hasContent && context.options.fixes.has(FIX.PARAMETER_HEADER_CONTENT);
|
|
22
|
+
}
|
|
23
|
+
function parameterType(parameter, location, context) {
|
|
24
|
+
if (isTypedByContent(parameter, context)) {
|
|
25
|
+
return contentParameterType(parameter, location, context);
|
|
18
26
|
}
|
|
19
27
|
return parameter.schema ? transformSchema(parameter.schema, location, context) : irKeyword("string");
|
|
20
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameter.mjs","sources":["../../../../src/application/transform/document/parameter.ts"],"sourcesContent":["import { irKeyword } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport {
|
|
1
|
+
{"version":3,"file":"parameter.mjs","sources":["../../../../src/application/transform/document/parameter.ts"],"sourcesContent":["import { irKeyword } from \"../../../domain/ir/constructors.js\";\nimport type { IrType } from \"../../../domain/ir/nodes.js\";\nimport { appendPointer } from \"../../../domain/openapi/json-pointer.js\";\nimport {\n type ParameterObject,\n QUERYSTRING_LOCATION,\n} from \"../../../domain/openapi/parameter-object.js\";\nimport { FIX } from \"../../../domain/output-fixes.js\";\nimport type { SchemaContext, SchemaLocation } from \"../schema/schema-context.js\";\nimport { transformSchema } from \"../schema/schema-transform.js\";\nimport { contentEntryType } from \"./media-type.js\";\n\n/**\n * A parameter typed by the schema of its one `content` media type. An `in: querystring` parameter\n * (OpenAPI 3.2) is the whole query string (ADR-020); without a media type it is `string`, the\n * query string as text. With the `parameter-header-content` fix, any other parameter with `content`\n * (OpenAPI 3.0 and later, for a JSON value in a query parameter) is typed the same way.\n */\nfunction contentParameterType(\n parameter: ParameterObject,\n location: SchemaLocation,\n context: SchemaContext,\n): IrType {\n const [mediaType, entry] = Object.entries(parameter.content ?? {})[0] ?? [];\n if (mediaType === undefined || entry === undefined) {\n return irKeyword(\"string\");\n }\n const path = appendPointer(location.path, [\"content\", mediaType]);\n return contentEntryType(entry, { ...location, path }, context);\n}\n\nfunction isTypedByContent(parameter: ParameterObject, context: SchemaContext): boolean {\n if (parameter.in === QUERYSTRING_LOCATION) {\n return true;\n }\n const hasContent = parameter.schema === undefined && parameter.content !== undefined;\n return hasContent && context.options.fixes.has(FIX.PARAMETER_HEADER_CONTENT);\n}\n\n/**\n * A parameter's type (OpenAPI 3.2 §4.8.12). Without a schema it is `string`, not `unknown`:\n * query, path, header and cookie values all arrive as text. `content` is read for\n * `in: querystring`, and with the `parameter-header-content` fix for every parameter; without\n * the fix other parameters with `content` keep the original's `string`.\n */\nexport function parameterType(\n parameter: ParameterObject,\n location: SchemaLocation,\n context: SchemaContext,\n): IrType {\n if (isTypedByContent(parameter, context)) {\n return contentParameterType(parameter, location, context);\n }\n return parameter.schema\n ? transformSchema(parameter.schema, location, context)\n : irKeyword(\"string\");\n}\n"],"names":[],"mappings":";;;;;;;AAkBA,SAAS,oBAAA,CACP,SAAA,EACA,QAAA,EACA,OAAA,EACQ;AACR,EAAA,MAAM,CAAC,SAAA,EAAW,KAAK,CAAA,GAAI,MAAA,CAAO,OAAA,CAAQ,SAAA,CAAU,OAAA,IAAW,EAAE,CAAA,CAAE,CAAC,KAAK,EAAC;AAC1E,EAAA,IAAI,SAAA,KAAc,MAAA,IAAa,KAAA,KAAU,MAAA,EAAW;AAClD,IAAA,OAAO,UAAU,QAAQ,CAAA;AAAA,EAC3B;AACA,EAAA,MAAM,OAAO,aAAA,CAAc,QAAA,CAAS,MAAM,CAAC,SAAA,EAAW,SAAS,CAAC,CAAA;AAChE,EAAA,OAAO,iBAAiB,KAAA,EAAO,EAAE,GAAG,QAAA,EAAU,IAAA,IAAQ,OAAO,CAAA;AAC/D;AAEA,SAAS,gBAAA,CAAiB,WAA4B,OAAA,EAAiC;AACrF,EAAA,IAAI,SAAA,CAAU,OAAO,oBAAA,EAAsB;AACzC,IAAA,OAAO,IAAA;AAAA,EACT;AACA,EAAA,MAAM,UAAA,GAAa,SAAA,CAAU,MAAA,KAAW,MAAA,IAAa,UAAU,OAAA,KAAY,MAAA;AAC3E,EAAA,OAAO,cAAc,OAAA,CAAQ,OAAA,CAAQ,KAAA,CAAM,GAAA,CAAI,IAAI,wBAAwB,CAAA;AAC7E;AAQO,SAAS,aAAA,CACd,SAAA,EACA,QAAA,EACA,OAAA,EACQ;AACR,EAAA,IAAI,gBAAA,CAAiB,SAAA,EAAW,OAAO,CAAA,EAAG;AACxC,IAAA,OAAO,oBAAA,CAAqB,SAAA,EAAW,QAAA,EAAU,OAAO,CAAA;AAAA,EAC1D;AACA,EAAA,OAAO,SAAA,CAAU,SACb,eAAA,CAAgB,SAAA,CAAU,QAAQ,QAAA,EAAU,OAAO,CAAA,GACnD,SAAA,CAAU,QAAQ,CAAA;AACxB;;"}
|
|
@@ -5,15 +5,15 @@ const propertyName = require('../../../domain/ir/property-name.cjs');
|
|
|
5
5
|
const jsonPointer = require('../../../domain/openapi/json-pointer.cjs');
|
|
6
6
|
const parameterObject = require('../../../domain/openapi/parameter-object.cjs');
|
|
7
7
|
const outputFixes = require('../../../domain/output-fixes.cjs');
|
|
8
|
-
const
|
|
8
|
+
const declaredValueTypes = require('../declared-value-types.cjs');
|
|
9
9
|
const schemaComment = require('../schema-comment.cjs');
|
|
10
10
|
const explodedQuery = require('./exploded-query.cjs');
|
|
11
|
+
const explodedQueryValues = require('./exploded-query-values.cjs');
|
|
11
12
|
const parameter = require('./parameter.cjs');
|
|
13
|
+
const parameterEntries = require('./parameter-entries.cjs');
|
|
14
|
+
const referencedParameter = require('./referenced-parameter.cjs');
|
|
12
15
|
|
|
13
16
|
const PATH_TEMPLATE_RE = /\{([^{}]+)\}/g;
|
|
14
|
-
function resolveParameter(parameter, context) {
|
|
15
|
-
return "$ref" in parameter ? context.refs.resolve(parameter.$ref) : parameter;
|
|
16
|
-
}
|
|
17
17
|
function pathTemplateParameters(path) {
|
|
18
18
|
return (path.match(PATH_TEMPLATE_RE) ?? []).map((match) => ({
|
|
19
19
|
name: match.slice(1, -1),
|
|
@@ -29,7 +29,7 @@ function withPathTemplateParameters(parameters, location, context) {
|
|
|
29
29
|
}
|
|
30
30
|
for (const parameter of pathTemplateParameters(location.path)) {
|
|
31
31
|
const isDefined = result.some((candidate) => {
|
|
32
|
-
const resolved = resolveParameter(candidate, context);
|
|
32
|
+
const resolved = parameterEntries.resolveParameter(candidate, context.refs);
|
|
33
33
|
return resolved?.in === "path" && resolved.name === parameter.name;
|
|
34
34
|
});
|
|
35
35
|
if (!isDefined) {
|
|
@@ -38,33 +38,12 @@ function withPathTemplateParameters(parameters, location, context) {
|
|
|
38
38
|
}
|
|
39
39
|
return result;
|
|
40
40
|
}
|
|
41
|
-
function isDeprecatedParameter(parameter) {
|
|
42
|
-
const schema = parameter?.schema;
|
|
43
|
-
return Boolean(parameter?.deprecated || schema?.deprecated);
|
|
44
|
-
}
|
|
45
|
-
function parameterEntries(parameters, context) {
|
|
46
|
-
const entries = parameters.map((original) => ({
|
|
47
|
-
original,
|
|
48
|
-
resolved: resolveParameter(original, context)
|
|
49
|
-
}));
|
|
50
|
-
if (context.options.alphabetize) {
|
|
51
|
-
entries.sort(
|
|
52
|
-
(left, right) => (left.resolved?.name ?? "").localeCompare(right.resolved?.name ?? "")
|
|
53
|
-
);
|
|
54
|
-
}
|
|
55
|
-
return context.options.excludeDeprecated ? entries.filter(({ resolved }) => !isDeprecatedParameter(resolved)) : entries;
|
|
56
|
-
}
|
|
57
41
|
function parameterName(name) {
|
|
58
42
|
return typeof name === "string" || typeof name === "number" ? propertyName.toPropertyName(name) : { kind: "string", value: String(name) };
|
|
59
43
|
}
|
|
60
|
-
function referencedParameterType(ref, resolved) {
|
|
61
|
-
const isParameter = !resolved.$ref;
|
|
62
|
-
const parameter = isParameter ? { in: resolved.in, name: resolved.name } : null;
|
|
63
|
-
return refType.refType(ref, { parameter });
|
|
64
|
-
}
|
|
65
44
|
function entryType({ original, resolved }, location, context) {
|
|
66
|
-
const path = jsonPointer.
|
|
67
|
-
return "$ref" in original ? referencedParameterType(original.$ref, resolved) : parameter.parameterType(resolved, { ...location, path }, context);
|
|
45
|
+
const path = jsonPointer.appendPointer(location.path, ["parameters", resolved.in, resolved.name]);
|
|
46
|
+
return "$ref" in original ? referencedParameter.referencedParameterType(original.$ref, resolved, context) : parameter.parameterType(resolved, { ...location, path }, context);
|
|
68
47
|
}
|
|
69
48
|
function parameterMember(entry, location, context) {
|
|
70
49
|
const { resolved } = entry;
|
|
@@ -90,9 +69,25 @@ function querystringMember(entries, location, context) {
|
|
|
90
69
|
function isExplodedEntry(entry, context) {
|
|
91
70
|
return context.options.fixes.has(outputFixes.FIX.EXPLODED_QUERY_OBJECTS) && explodedQuery.isExplodedQueryObject(entry.resolved, context.refs);
|
|
92
71
|
}
|
|
93
|
-
function
|
|
94
|
-
|
|
95
|
-
|
|
72
|
+
function explodedObjectType({ entry, type }, hasOtherKeys, context) {
|
|
73
|
+
if (!hasOtherKeys) {
|
|
74
|
+
return type;
|
|
75
|
+
}
|
|
76
|
+
const declared = explodedQueryValues.declaredObjectType(entry, context);
|
|
77
|
+
return declared !== null && explodedQueryValues.hasIndexSignature(declared) ? declared : type;
|
|
78
|
+
}
|
|
79
|
+
function explodedParts(exploded, members, context) {
|
|
80
|
+
const hasOtherKeys = members.length > 0 || exploded.length > 1;
|
|
81
|
+
const types = exploded.map((part) => explodedObjectType(part, hasOtherKeys, context));
|
|
82
|
+
const others = (index) => [
|
|
83
|
+
...members.length > 0 ? [constructors.irObject(members)] : [],
|
|
84
|
+
...types.filter((_type, other) => other !== index)
|
|
85
|
+
];
|
|
86
|
+
return types.map((type, index) => {
|
|
87
|
+
const values = others(index).flatMap((other) => declaredValueTypes.declaredValueTypes(other, context.footer));
|
|
88
|
+
const widened = explodedQueryValues.withIndexValues(type, values);
|
|
89
|
+
return exploded[index]?.entry.resolved.required ? widened : constructors.irReference("Partial", [widened]);
|
|
90
|
+
});
|
|
96
91
|
}
|
|
97
92
|
function locationParts(entries, location, context) {
|
|
98
93
|
const members = [];
|
|
@@ -100,7 +95,7 @@ function locationParts(entries, location, context) {
|
|
|
100
95
|
let isOptional = true;
|
|
101
96
|
for (const entry of entries) {
|
|
102
97
|
if (isExplodedEntry(entry, context)) {
|
|
103
|
-
exploded.push(
|
|
98
|
+
exploded.push({ entry, type: entryType(entry, location, context) });
|
|
104
99
|
isOptional &&= !entry.resolved.required;
|
|
105
100
|
continue;
|
|
106
101
|
}
|
|
@@ -108,7 +103,7 @@ function locationParts(entries, location, context) {
|
|
|
108
103
|
members.push(member);
|
|
109
104
|
isOptional &&= member.isOptional;
|
|
110
105
|
}
|
|
111
|
-
return { members, exploded, isOptional };
|
|
106
|
+
return { members, exploded: explodedParts(exploded, members, context), isOptional };
|
|
112
107
|
}
|
|
113
108
|
function locationType({ members, exploded }) {
|
|
114
109
|
const types = [...members.length > 0 ? [constructors.irObject(members)] : [], ...exploded];
|
|
@@ -129,7 +124,7 @@ function locationMember(parameterIn, entries, location, context) {
|
|
|
129
124
|
});
|
|
130
125
|
}
|
|
131
126
|
function parametersMember(parameters, location, context) {
|
|
132
|
-
const entries = parameterEntries(
|
|
127
|
+
const entries = parameterEntries.parameterEntries(
|
|
133
128
|
withPathTemplateParameters(parameters, location, context),
|
|
134
129
|
context
|
|
135
130
|
);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameters.cjs","sources":["../../../../src/application/transform/document/parameters.ts"],"sourcesContent":["import {\n irIntersection,\n irKeyword,\n irObject,\n irProperty,\n irReference,\n} from \"../../../domain/ir/constructors.js\";\nimport type { IrPropertyName, IrPropertySignature, IrType } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { createRef } from \"../../../domain/openapi/json-pointer.js\";\nimport {\n PARAMETER_LOCATIONS,\n type ParameterLocation,\n type ParameterObject,\n type ParameterOrReference,\n QUERYSTRING_LOCATION,\n} from \"../../../domain/openapi/parameter-object.js\";\nimport type { SchemaObject } from \"../../../domain/openapi/schema-object.js\";\nimport { FIX } from \"../../../domain/output-fixes.js\";\nimport { refType } from \"../ref-type.js\";\nimport type { SchemaLocation } from \"../schema/schema-context.js\";\nimport { withSchemaComment } from \"../schema-comment.js\";\nimport type { TransformContext } from \"../transform-context.js\";\nimport { isExplodedQueryObject } from \"./exploded-query.js\";\nimport { parameterType } from \"./parameter.js\";\n\n/** `[^{}]` keeps the scan linear: `[^}]` retried from every `{` of a long run of them. */\nconst PATH_TEMPLATE_RE = /\\{([^{}]+)\\}/g;\n\n/** A parameter as written in the document, and the object its `$ref` points to. */\ninterface ParameterEntry {\n readonly original: ParameterOrReference;\n readonly resolved: ParameterObject | undefined;\n}\n\n/** An entry whose `$ref` resolved, so its location and name are known. */\ntype ResolvedEntry = ParameterEntry & { readonly resolved: ParameterObject };\n\nfunction resolveParameter(\n parameter: ParameterOrReference,\n context: TransformContext,\n): ParameterObject | undefined {\n return \"$ref\" in parameter\n ? (context.refs.resolve(parameter.$ref) as ParameterObject | undefined)\n : parameter;\n}\n\n/** Required string parameters for every `{name}` in a path template. */\nfunction pathTemplateParameters(path: string): ParameterObject[] {\n return (path.match(PATH_TEMPLATE_RE) ?? []).map((match) => ({\n name: match.slice(1, -1),\n in: \"path\",\n required: true,\n schema: { type: \"string\" },\n }));\n}\n\n/** `--generate-path-params`: add the path template parameters the list does not define. */\nfunction withPathTemplateParameters(\n parameters: readonly ParameterOrReference[],\n location: SchemaLocation,\n context: TransformContext,\n): ParameterOrReference[] {\n const result = [...parameters];\n if (!context.options.generatePathParams || !location.path) {\n return result;\n }\n for (const parameter of pathTemplateParameters(location.path)) {\n const isDefined = result.some((candidate) => {\n const resolved = resolveParameter(candidate, context);\n return resolved?.in === \"path\" && resolved.name === parameter.name;\n });\n if (!isDefined) {\n result.push(parameter);\n }\n }\n return result;\n}\n\nfunction isDeprecatedParameter(parameter: ParameterObject | undefined): boolean {\n const schema = parameter?.schema as SchemaObject | undefined;\n return Boolean(parameter?.deprecated || schema?.deprecated);\n}\n\n/** Resolved parameters, sorted for `--alphabetize`, without deprecated ones if excluded. */\nfunction parameterEntries(\n parameters: readonly ParameterOrReference[],\n context: TransformContext,\n): ParameterEntry[] {\n const entries = parameters.map((original) => ({\n original,\n resolved: resolveParameter(original, context),\n }));\n if (context.options.alphabetize) {\n // Unlike map keys, the original sorts parameters with the default locale's `localeCompare`.\n entries.sort((left, right) =>\n (left.resolved?.name ?? \"\").localeCompare(right.resolved?.name ?? \"\"),\n );\n }\n return context.options.excludeDeprecated\n ? entries.filter(({ resolved }) => !isDeprecatedParameter(resolved))\n : entries;\n}\n\n/** The original quotes a name that is not text (a missing name prints as `\"undefined\"`). */\nfunction parameterName(name: unknown): IrPropertyName {\n return typeof name === \"string\" || typeof name === \"number\"\n ? toPropertyName(name)\n : { kind: \"string\", value: String(name) };\n}\n\nfunction referencedParameterType(ref: string, resolved: ParameterObject): IrType {\n // A `$ref` that resolves to another `$ref` is not a parameter object yet: index it as a path.\n const isParameter = !(resolved as { $ref?: unknown }).$ref;\n const parameter = isParameter ? { in: resolved.in, name: resolved.name } : null;\n return refType(ref, { parameter });\n}\n\nfunction entryType(\n { original, resolved }: ResolvedEntry,\n location: SchemaLocation,\n context: TransformContext,\n): IrType {\n const path = createRef([location.path, \"parameters\", resolved.in, resolved.name]);\n return \"$ref\" in original\n ? referencedParameterType(original.$ref, resolved)\n : parameterType(resolved, { ...location, path }, context);\n}\n\nfunction parameterMember(\n entry: ResolvedEntry,\n location: SchemaLocation,\n context: TransformContext,\n): IrPropertySignature {\n const { resolved } = entry;\n const property = irProperty(parameterName(resolved.name), entryType(entry, location, context), {\n isOptional: resolved.in !== \"path\" && !resolved.required,\n isReadonly: context.options.immutable,\n });\n return withSchemaComment(property, resolved);\n}\n\n/**\n * The `query` member typed by an `in: querystring` parameter (OpenAPI 3.2, ADR-020): the parameter\n * is the whole query string. Null when there is none, or when `in: query` parameters sit next to\n * it, which 3.2 does not allow; those keep their types, and a warning names the parameter.\n */\nfunction querystringMember(\n entries: readonly ParameterEntry[],\n location: SchemaLocation,\n context: TransformContext,\n): IrPropertySignature | null {\n const querystring = entries.find(\n (entry): entry is ResolvedEntry => entry.resolved?.in === QUERYSTRING_LOCATION,\n );\n if (!querystring || entries.some((entry) => entry.resolved?.in === \"query\")) {\n return null;\n }\n const property = irProperty(toPropertyName(\"query\"), entryType(querystring, location, context), {\n isOptional: !querystring.resolved.required,\n isReadonly: context.options.immutable,\n });\n return withSchemaComment(property, querystring.resolved);\n}\n\n/** With `exploded-query-objects`, whether the parameter's object keys are keys of `query`. */\nfunction isExplodedEntry(entry: ResolvedEntry, context: TransformContext): boolean {\n return (\n context.options.fixes.has(FIX.EXPLODED_QUERY_OBJECTS) &&\n isExplodedQueryObject(entry.resolved, context.refs)\n );\n}\n\n/**\n * An exploded object parameter's part of `query`: its object type. A parameter that may be left\n * out sends none of its keys then, so they are optional: `Partial<…>`.\n */\nfunction explodedPart(\n entry: ResolvedEntry,\n location: SchemaLocation,\n context: TransformContext,\n): IrType {\n const type = entryType(entry, location, context);\n return entry.resolved.required ? type : irReference(\"Partial\", [type]);\n}\n\n/** A location's parameters as members, and the object types of its exploded parameters. */\ninterface LocationParts {\n readonly members: readonly IrPropertySignature[];\n readonly exploded: readonly IrType[];\n readonly isOptional: boolean;\n}\n\n/** Each parameter in document order, so the declarations they add keep their order. */\nfunction locationParts(\n entries: readonly ResolvedEntry[],\n location: SchemaLocation,\n context: TransformContext,\n): LocationParts {\n const members: IrPropertySignature[] = [];\n const exploded: IrType[] = [];\n let isOptional = true;\n for (const entry of entries) {\n if (isExplodedEntry(entry, context)) {\n exploded.push(explodedPart(entry, location, context));\n isOptional &&= !entry.resolved.required;\n continue;\n }\n const member = parameterMember(entry, location, context);\n members.push(member);\n isOptional &&= member.isOptional;\n }\n return { members, exploded, isOptional };\n}\n\n/** The members' object, intersected with the exploded parameters' types; `never` for none. */\nfunction locationType({ members, exploded }: LocationParts): IrType {\n const types = [...(members.length > 0 ? [irObject(members)] : []), ...exploded];\n const [first] = types;\n if (first === undefined) {\n return irKeyword(\"never\");\n }\n return types.length === 1 ? first : irIntersection(types);\n}\n\n/** One location's parameters; optional when all of them are, and `never` when there are none. */\nfunction locationMember(\n parameterIn: ParameterLocation,\n entries: readonly ParameterEntry[],\n location: SchemaLocation,\n context: TransformContext,\n): IrPropertySignature {\n const located = entries.filter(\n (entry): entry is ResolvedEntry => entry.resolved?.in === parameterIn,\n );\n const parts = locationParts(located, location, context);\n return irProperty(toPropertyName(parameterIn), locationType(parts), {\n isOptional: parts.isOptional,\n isReadonly: context.options.immutable,\n });\n}\n\n/**\n * The `parameters` property of an operation or path item: one member per location, each an object\n * of that location's parameters. `location.path` is the path template for\n * `--generate-path-params`.\n */\nexport function parametersMember(\n parameters: readonly ParameterOrReference[],\n location: SchemaLocation,\n context: TransformContext,\n): IrPropertySignature {\n const entries = parameterEntries(\n withPathTemplateParameters(parameters, location, context),\n context,\n );\n const querystring = querystringMember(entries, location, context);\n const members = PARAMETER_LOCATIONS.map((parameterIn) =>\n parameterIn === \"query\" && querystring\n ? querystring\n : locationMember(parameterIn, entries, location, context),\n );\n return irProperty(toPropertyName(\"parameters\"), irObject(members), {\n isReadonly: context.options.immutable,\n });\n}\n"],"names":["toPropertyName","refType","createRef","parameterType","irProperty","withSchemaComment","QUERYSTRING_LOCATION","FIX","isExplodedQueryObject","irReference","irObject","irKeyword","irIntersection","PARAMETER_LOCATIONS"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parameters.cjs","sources":["../../../../src/application/transform/document/parameters.ts"],"sourcesContent":["import {\n irIntersection,\n irKeyword,\n irObject,\n irProperty,\n irReference,\n} from \"../../../domain/ir/constructors.js\";\nimport type { IrPropertyName, IrPropertySignature, IrType } from \"../../../domain/ir/nodes.js\";\nimport { toPropertyName } from \"../../../domain/ir/property-name.js\";\nimport { appendPointer } from \"../../../domain/openapi/json-pointer.js\";\nimport {\n PARAMETER_LOCATIONS,\n type ParameterLocation,\n type ParameterObject,\n type ParameterOrReference,\n QUERYSTRING_LOCATION,\n} from \"../../../domain/openapi/parameter-object.js\";\nimport { FIX } from \"../../../domain/output-fixes.js\";\nimport { declaredValueTypes } from \"../declared-value-types.js\";\nimport type { SchemaLocation } from \"../schema/schema-context.js\";\nimport { withSchemaComment } from \"../schema-comment.js\";\nimport type { TransformContext } from \"../transform-context.js\";\nimport { isExplodedQueryObject } from \"./exploded-query.js\";\nimport { declaredObjectType, hasIndexSignature, withIndexValues } from \"./exploded-query-values.js\";\nimport { parameterType } from \"./parameter.js\";\nimport {\n type ParameterEntry,\n parameterEntries,\n type ResolvedEntry,\n resolveParameter,\n} from \"./parameter-entries.js\";\nimport { referencedParameterType } from \"./referenced-parameter.js\";\n\n/** `[^{}]` keeps the scan linear: `[^}]` retried from every `{` of a long run of them. */\nconst PATH_TEMPLATE_RE = /\\{([^{}]+)\\}/g;\n\n/** Required string parameters for every `{name}` in a path template. */\nfunction pathTemplateParameters(path: string): ParameterObject[] {\n return (path.match(PATH_TEMPLATE_RE) ?? []).map((match) => ({\n name: match.slice(1, -1),\n in: \"path\",\n required: true,\n schema: { type: \"string\" },\n }));\n}\n\n/** `--generate-path-params`: add the path template parameters the list does not define. */\nfunction withPathTemplateParameters(\n parameters: readonly ParameterOrReference[],\n location: SchemaLocation,\n context: TransformContext,\n): ParameterOrReference[] {\n const result = [...parameters];\n if (!context.options.generatePathParams || !location.path) {\n return result;\n }\n for (const parameter of pathTemplateParameters(location.path)) {\n const isDefined = result.some((candidate) => {\n const resolved = resolveParameter(candidate, context.refs);\n return resolved?.in === \"path\" && resolved.name === parameter.name;\n });\n if (!isDefined) {\n result.push(parameter);\n }\n }\n return result;\n}\n\n/** The original quotes a name that is not text (a missing name prints as `\"undefined\"`). */\nfunction parameterName(name: unknown): IrPropertyName {\n return typeof name === \"string\" || typeof name === \"number\"\n ? toPropertyName(name)\n : { kind: \"string\", value: String(name) };\n}\n\nfunction entryType(\n { original, resolved }: ResolvedEntry,\n location: SchemaLocation,\n context: TransformContext,\n): IrType {\n const path = appendPointer(location.path, [\"parameters\", resolved.in, resolved.name]);\n return \"$ref\" in original\n ? referencedParameterType(original.$ref, resolved, context)\n : parameterType(resolved, { ...location, path }, context);\n}\n\nfunction parameterMember(\n entry: ResolvedEntry,\n location: SchemaLocation,\n context: TransformContext,\n): IrPropertySignature {\n const { resolved } = entry;\n const property = irProperty(parameterName(resolved.name), entryType(entry, location, context), {\n isOptional: resolved.in !== \"path\" && !resolved.required,\n isReadonly: context.options.immutable,\n });\n return withSchemaComment(property, resolved);\n}\n\n/**\n * The `query` member typed by an `in: querystring` parameter (OpenAPI 3.2, ADR-020): the parameter\n * is the whole query string. Null when there is none, or when `in: query` parameters sit next to\n * it, which 3.2 does not allow; those keep their types, and a warning names the parameter.\n */\nfunction querystringMember(\n entries: readonly ParameterEntry[],\n location: SchemaLocation,\n context: TransformContext,\n): IrPropertySignature | null {\n const querystring = entries.find(\n (entry): entry is ResolvedEntry => entry.resolved?.in === QUERYSTRING_LOCATION,\n );\n if (!querystring || entries.some((entry) => entry.resolved?.in === \"query\")) {\n return null;\n }\n const property = irProperty(toPropertyName(\"query\"), entryType(querystring, location, context), {\n isOptional: !querystring.resolved.required,\n isReadonly: context.options.immutable,\n });\n return withSchemaComment(property, querystring.resolved);\n}\n\n/** With `exploded-query-objects`, whether the parameter's object keys are keys of `query`. */\nfunction isExplodedEntry(entry: ResolvedEntry, context: TransformContext): boolean {\n return (\n context.options.fixes.has(FIX.EXPLODED_QUERY_OBJECTS) &&\n isExplodedQueryObject(entry.resolved, context.refs)\n );\n}\n\n/** An exploded object parameter with its type, typed in document order. */\ninterface ExplodedEntry {\n readonly entry: ResolvedEntry;\n readonly type: IrType;\n}\n\n/**\n * The object type of an exploded parameter, written out when it is a reference to a type with an\n * index signature and `query` has other keys, which that signature must then admit. Without\n * other keys the reference is kept.\n */\nfunction explodedObjectType(\n { entry, type }: ExplodedEntry,\n hasOtherKeys: boolean,\n context: TransformContext,\n): IrType {\n if (!hasOtherKeys) {\n return type;\n }\n const declared = declaredObjectType(entry, context);\n return declared !== null && hasIndexSignature(declared) ? declared : type;\n}\n\n/**\n * The exploded object parameters' parts of `query`: their object types, each index signature\n * widened by the value types of the other keys (see `exploded-query-values.ts`). A parameter that\n * may be left out sends none of its keys then, so they are optional: `Partial<…>`.\n */\nfunction explodedParts(\n exploded: readonly ExplodedEntry[],\n members: readonly IrPropertySignature[],\n context: TransformContext,\n): IrType[] {\n const hasOtherKeys = members.length > 0 || exploded.length > 1;\n const types = exploded.map((part) => explodedObjectType(part, hasOtherKeys, context));\n const others = (index: number) => [\n ...(members.length > 0 ? [irObject(members)] : []),\n ...types.filter((_type, other) => other !== index),\n ];\n return types.map((type, index) => {\n const values = others(index).flatMap((other) => declaredValueTypes(other, context.footer));\n const widened = withIndexValues(type, values);\n return exploded[index]?.entry.resolved.required ? widened : irReference(\"Partial\", [widened]);\n });\n}\n\n/** A location's parameters as members, and the object types of its exploded parameters. */\ninterface LocationParts {\n readonly members: readonly IrPropertySignature[];\n readonly exploded: readonly IrType[];\n readonly isOptional: boolean;\n}\n\n/** Each parameter in document order, so the declarations they add keep their order. */\nfunction locationParts(\n entries: readonly ResolvedEntry[],\n location: SchemaLocation,\n context: TransformContext,\n): LocationParts {\n const members: IrPropertySignature[] = [];\n const exploded: ExplodedEntry[] = [];\n let isOptional = true;\n for (const entry of entries) {\n if (isExplodedEntry(entry, context)) {\n exploded.push({ entry, type: entryType(entry, location, context) });\n isOptional &&= !entry.resolved.required;\n continue;\n }\n const member = parameterMember(entry, location, context);\n members.push(member);\n isOptional &&= member.isOptional;\n }\n return { members, exploded: explodedParts(exploded, members, context), isOptional };\n}\n\n/** The members' object, intersected with the exploded parameters' types; `never` for none. */\nfunction locationType({ members, exploded }: LocationParts): IrType {\n const types = [...(members.length > 0 ? [irObject(members)] : []), ...exploded];\n const [first] = types;\n if (first === undefined) {\n return irKeyword(\"never\");\n }\n return types.length === 1 ? first : irIntersection(types);\n}\n\n/** One location's parameters; optional when all of them are, and `never` when there are none. */\nfunction locationMember(\n parameterIn: ParameterLocation,\n entries: readonly ParameterEntry[],\n location: SchemaLocation,\n context: TransformContext,\n): IrPropertySignature {\n const located = entries.filter(\n (entry): entry is ResolvedEntry => entry.resolved?.in === parameterIn,\n );\n const parts = locationParts(located, location, context);\n return irProperty(toPropertyName(parameterIn), locationType(parts), {\n isOptional: parts.isOptional,\n isReadonly: context.options.immutable,\n });\n}\n\n/**\n * The `parameters` property of an operation or path item: one member per location, each an object\n * of that location's parameters. `location.path` is the path template for\n * `--generate-path-params`.\n */\nexport function parametersMember(\n parameters: readonly ParameterOrReference[],\n location: SchemaLocation,\n context: TransformContext,\n): IrPropertySignature {\n const entries = parameterEntries(\n withPathTemplateParameters(parameters, location, context),\n context,\n );\n const querystring = querystringMember(entries, location, context);\n const members = PARAMETER_LOCATIONS.map((parameterIn) =>\n parameterIn === \"query\" && querystring\n ? querystring\n : locationMember(parameterIn, entries, location, context),\n );\n return irProperty(toPropertyName(\"parameters\"), irObject(members), {\n isReadonly: context.options.immutable,\n });\n}\n"],"names":["resolveParameter","toPropertyName","appendPointer","referencedParameterType","parameterType","irProperty","withSchemaComment","QUERYSTRING_LOCATION","FIX","isExplodedQueryObject","declaredObjectType","hasIndexSignature","irObject","declaredValueTypes","withIndexValues","irReference","irKeyword","irIntersection","parameterEntries","PARAMETER_LOCATIONS"],"mappings":"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"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { irProperty, irObject, irKeyword, irIntersection, irReference } from '../../../domain/ir/constructors.mjs';
|
|
2
2
|
import { toPropertyName } from '../../../domain/ir/property-name.mjs';
|
|
3
|
-
import {
|
|
3
|
+
import { appendPointer } from '../../../domain/openapi/json-pointer.mjs';
|
|
4
4
|
import { PARAMETER_LOCATIONS, QUERYSTRING_LOCATION } from '../../../domain/openapi/parameter-object.mjs';
|
|
5
5
|
import { FIX } from '../../../domain/output-fixes.mjs';
|
|
6
|
-
import {
|
|
6
|
+
import { declaredValueTypes } from '../declared-value-types.mjs';
|
|
7
7
|
import { withSchemaComment } from '../schema-comment.mjs';
|
|
8
8
|
import { isExplodedQueryObject } from './exploded-query.mjs';
|
|
9
|
+
import { withIndexValues, declaredObjectType, hasIndexSignature } from './exploded-query-values.mjs';
|
|
9
10
|
import { parameterType } from './parameter.mjs';
|
|
11
|
+
import { parameterEntries, resolveParameter } from './parameter-entries.mjs';
|
|
12
|
+
import { referencedParameterType } from './referenced-parameter.mjs';
|
|
10
13
|
|
|
11
14
|
const PATH_TEMPLATE_RE = /\{([^{}]+)\}/g;
|
|
12
|
-
function resolveParameter(parameter, context) {
|
|
13
|
-
return "$ref" in parameter ? context.refs.resolve(parameter.$ref) : parameter;
|
|
14
|
-
}
|
|
15
15
|
function pathTemplateParameters(path) {
|
|
16
16
|
return (path.match(PATH_TEMPLATE_RE) ?? []).map((match) => ({
|
|
17
17
|
name: match.slice(1, -1),
|
|
@@ -27,7 +27,7 @@ function withPathTemplateParameters(parameters, location, context) {
|
|
|
27
27
|
}
|
|
28
28
|
for (const parameter of pathTemplateParameters(location.path)) {
|
|
29
29
|
const isDefined = result.some((candidate) => {
|
|
30
|
-
const resolved = resolveParameter(candidate, context);
|
|
30
|
+
const resolved = resolveParameter(candidate, context.refs);
|
|
31
31
|
return resolved?.in === "path" && resolved.name === parameter.name;
|
|
32
32
|
});
|
|
33
33
|
if (!isDefined) {
|
|
@@ -36,33 +36,12 @@ function withPathTemplateParameters(parameters, location, context) {
|
|
|
36
36
|
}
|
|
37
37
|
return result;
|
|
38
38
|
}
|
|
39
|
-
function isDeprecatedParameter(parameter) {
|
|
40
|
-
const schema = parameter?.schema;
|
|
41
|
-
return Boolean(parameter?.deprecated || schema?.deprecated);
|
|
42
|
-
}
|
|
43
|
-
function parameterEntries(parameters, context) {
|
|
44
|
-
const entries = parameters.map((original) => ({
|
|
45
|
-
original,
|
|
46
|
-
resolved: resolveParameter(original, context)
|
|
47
|
-
}));
|
|
48
|
-
if (context.options.alphabetize) {
|
|
49
|
-
entries.sort(
|
|
50
|
-
(left, right) => (left.resolved?.name ?? "").localeCompare(right.resolved?.name ?? "")
|
|
51
|
-
);
|
|
52
|
-
}
|
|
53
|
-
return context.options.excludeDeprecated ? entries.filter(({ resolved }) => !isDeprecatedParameter(resolved)) : entries;
|
|
54
|
-
}
|
|
55
39
|
function parameterName(name) {
|
|
56
40
|
return typeof name === "string" || typeof name === "number" ? toPropertyName(name) : { kind: "string", value: String(name) };
|
|
57
41
|
}
|
|
58
|
-
function referencedParameterType(ref, resolved) {
|
|
59
|
-
const isParameter = !resolved.$ref;
|
|
60
|
-
const parameter = isParameter ? { in: resolved.in, name: resolved.name } : null;
|
|
61
|
-
return refType(ref, { parameter });
|
|
62
|
-
}
|
|
63
42
|
function entryType({ original, resolved }, location, context) {
|
|
64
|
-
const path =
|
|
65
|
-
return "$ref" in original ? referencedParameterType(original.$ref, resolved) : parameterType(resolved, { ...location, path }, context);
|
|
43
|
+
const path = appendPointer(location.path, ["parameters", resolved.in, resolved.name]);
|
|
44
|
+
return "$ref" in original ? referencedParameterType(original.$ref, resolved, context) : parameterType(resolved, { ...location, path }, context);
|
|
66
45
|
}
|
|
67
46
|
function parameterMember(entry, location, context) {
|
|
68
47
|
const { resolved } = entry;
|
|
@@ -88,9 +67,25 @@ function querystringMember(entries, location, context) {
|
|
|
88
67
|
function isExplodedEntry(entry, context) {
|
|
89
68
|
return context.options.fixes.has(FIX.EXPLODED_QUERY_OBJECTS) && isExplodedQueryObject(entry.resolved, context.refs);
|
|
90
69
|
}
|
|
91
|
-
function
|
|
92
|
-
|
|
93
|
-
|
|
70
|
+
function explodedObjectType({ entry, type }, hasOtherKeys, context) {
|
|
71
|
+
if (!hasOtherKeys) {
|
|
72
|
+
return type;
|
|
73
|
+
}
|
|
74
|
+
const declared = declaredObjectType(entry, context);
|
|
75
|
+
return declared !== null && hasIndexSignature(declared) ? declared : type;
|
|
76
|
+
}
|
|
77
|
+
function explodedParts(exploded, members, context) {
|
|
78
|
+
const hasOtherKeys = members.length > 0 || exploded.length > 1;
|
|
79
|
+
const types = exploded.map((part) => explodedObjectType(part, hasOtherKeys, context));
|
|
80
|
+
const others = (index) => [
|
|
81
|
+
...members.length > 0 ? [irObject(members)] : [],
|
|
82
|
+
...types.filter((_type, other) => other !== index)
|
|
83
|
+
];
|
|
84
|
+
return types.map((type, index) => {
|
|
85
|
+
const values = others(index).flatMap((other) => declaredValueTypes(other, context.footer));
|
|
86
|
+
const widened = withIndexValues(type, values);
|
|
87
|
+
return exploded[index]?.entry.resolved.required ? widened : irReference("Partial", [widened]);
|
|
88
|
+
});
|
|
94
89
|
}
|
|
95
90
|
function locationParts(entries, location, context) {
|
|
96
91
|
const members = [];
|
|
@@ -98,7 +93,7 @@ function locationParts(entries, location, context) {
|
|
|
98
93
|
let isOptional = true;
|
|
99
94
|
for (const entry of entries) {
|
|
100
95
|
if (isExplodedEntry(entry, context)) {
|
|
101
|
-
exploded.push(
|
|
96
|
+
exploded.push({ entry, type: entryType(entry, location, context) });
|
|
102
97
|
isOptional &&= !entry.resolved.required;
|
|
103
98
|
continue;
|
|
104
99
|
}
|
|
@@ -106,7 +101,7 @@ function locationParts(entries, location, context) {
|
|
|
106
101
|
members.push(member);
|
|
107
102
|
isOptional &&= member.isOptional;
|
|
108
103
|
}
|
|
109
|
-
return { members, exploded, isOptional };
|
|
104
|
+
return { members, exploded: explodedParts(exploded, members, context), isOptional };
|
|
110
105
|
}
|
|
111
106
|
function locationType({ members, exploded }) {
|
|
112
107
|
const types = [...members.length > 0 ? [irObject(members)] : [], ...exploded];
|