ts-openapi-codegen 2.0.0 → 2.1.0-beta.2
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/README.md +95 -2
- package/README.rus.md +95 -2
- package/dist/cli/analyzeDiff/__tests__/analyzeDiff.cli.test.d.ts +2 -0
- package/dist/cli/analyzeDiff/__tests__/analyzeDiff.cli.test.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/__tests__/analyzeDiff.cli.test.js +365 -0
- package/dist/cli/analyzeDiff/__tests__/analyzeDiffRenameAndInvalidRegex.test.d.ts +2 -0
- package/dist/cli/analyzeDiff/__tests__/analyzeDiffRenameAndInvalidRegex.test.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/__tests__/analyzeDiffRenameAndInvalidRegex.test.js +142 -0
- package/dist/cli/analyzeDiff/__tests__/analyzeDiffTypeCoercion.test.d.ts +2 -0
- package/dist/cli/analyzeDiff/__tests__/analyzeDiffTypeCoercion.test.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/__tests__/analyzeDiffTypeCoercion.test.js +137 -0
- package/dist/cli/analyzeDiff/analyzeDiff.d.ts +17 -0
- package/dist/cli/analyzeDiff/analyzeDiff.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/analyzeDiff.js +105 -0
- package/dist/cli/analyzeDiff/buildLegacyReport.d.ts +17 -0
- package/dist/cli/analyzeDiff/buildLegacyReport.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/buildLegacyReport.js +54 -0
- package/dist/cli/analyzeDiff/ciSummary.d.ts +6 -0
- package/dist/cli/analyzeDiff/ciSummary.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/ciSummary.js +20 -0
- package/dist/cli/analyzeDiff/diffEngine.d.ts +54 -0
- package/dist/cli/analyzeDiff/diffEngine.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/diffEngine.js +209 -0
- package/dist/cli/analyzeDiff/ignoreRules.d.ts +33 -0
- package/dist/cli/analyzeDiff/ignoreRules.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/ignoreRules.js +93 -0
- package/dist/cli/analyzeDiff/ignoreSemanticChanges.d.ts +10 -0
- package/dist/cli/analyzeDiff/ignoreSemanticChanges.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/ignoreSemanticChanges.js +84 -0
- package/dist/cli/analyzeDiff/logLegacyReport.d.ts +6 -0
- package/dist/cli/analyzeDiff/logLegacyReport.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/logLegacyReport.js +29 -0
- package/dist/cli/analyzeDiff/miracles.d.ts +89 -0
- package/dist/cli/analyzeDiff/miracles.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/miracles.js +325 -0
- package/dist/cli/analyzeDiff/pluginPaths.d.ts +5 -0
- package/dist/cli/analyzeDiff/pluginPaths.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/pluginPaths.js +13 -0
- package/dist/cli/analyzeDiff/report.d.ts +3 -0
- package/dist/cli/analyzeDiff/report.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/report.js +7 -0
- package/dist/cli/analyzeDiff/semanticDiffContext.d.ts +6 -0
- package/dist/cli/analyzeDiff/semanticDiffContext.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/semanticDiffContext.js +16 -0
- package/dist/cli/analyzeDiff/specParser.d.ts +22 -0
- package/dist/cli/analyzeDiff/specParser.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/specParser.js +80 -0
- package/dist/cli/analyzeDiff/types.d.ts +61 -0
- package/dist/cli/analyzeDiff/types.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/types.js +2 -0
- package/dist/cli/analyzeDiff/writeLegacyReport.d.ts +6 -0
- package/dist/cli/analyzeDiff/writeLegacyReport.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/writeLegacyReport.js +21 -0
- package/dist/cli/checkAndUpdateConfig/checkConfig.d.ts.map +1 -1
- package/dist/cli/checkAndUpdateConfig/checkConfig.js +13 -8
- package/dist/cli/checkAndUpdateConfig/constants.d.ts +0 -9
- package/dist/cli/checkAndUpdateConfig/constants.d.ts.map +1 -1
- package/dist/cli/checkAndUpdateConfig/constants.js +1 -10
- package/dist/cli/checkAndUpdateConfig/updateConfig.d.ts.map +1 -1
- package/dist/cli/checkAndUpdateConfig/updateConfig.js +11 -7
- package/dist/cli/checkAndUpdateConfig/utils/selectConfigAction.d.ts.map +1 -1
- package/dist/cli/checkAndUpdateConfig/utils/selectConfigAction.js +6 -3
- package/dist/cli/checkAndUpdateConfig/utils/updateExistingConfigFile.d.ts.map +1 -1
- package/dist/cli/checkAndUpdateConfig/utils/updateExistingConfigFile.js +3 -2
- package/dist/cli/checkAndUpdateConfig/utils/writeExampleConfigFile.d.ts.map +1 -1
- package/dist/cli/checkAndUpdateConfig/utils/writeExampleConfigFile.js +2 -2
- package/dist/cli/generateOpenApiClient/__tests__/generateOpenApiClient.strict.test.d.ts +2 -0
- package/dist/cli/generateOpenApiClient/__tests__/generateOpenApiClient.strict.test.d.ts.map +1 -0
- package/dist/cli/generateOpenApiClient/__tests__/generateOpenApiClient.strict.test.js +152 -0
- package/dist/cli/generateOpenApiClient/generateOpenApiClient.d.ts +6 -2
- package/dist/cli/generateOpenApiClient/generateOpenApiClient.d.ts.map +1 -1
- package/dist/cli/generateOpenApiClient/generateOpenApiClient.js +54 -18
- package/dist/cli/index.js +57 -2
- package/dist/cli/initOpenApiConfig/init.d.ts.map +1 -1
- package/dist/cli/initOpenApiConfig/init.js +19 -6
- package/dist/cli/initOpenApiConfig/initConfig.d.ts +1 -0
- package/dist/cli/initOpenApiConfig/initConfig.d.ts.map +1 -1
- package/dist/cli/initOpenApiConfig/initConfig.js +47 -24
- package/dist/cli/initOpenApiConfig/initCustomRequest.d.ts +8 -1
- package/dist/cli/initOpenApiConfig/initCustomRequest.d.ts.map +1 -1
- package/dist/cli/initOpenApiConfig/initCustomRequest.js +40 -8
- package/dist/cli/initOpenApiConfig/utils/buildConfig.d.ts.map +1 -1
- package/dist/cli/initOpenApiConfig/utils/buildConfig.js +60 -0
- package/dist/cli/initOpenApiConfig/utils/validateSpecFile.d.ts.map +1 -1
- package/dist/cli/initOpenApiConfig/utils/validateSpecFile.js +2 -1
- package/dist/cli/initOpenApiConfig/utils/writeConfigFile.d.ts.map +1 -1
- package/dist/cli/initOpenApiConfig/utils/writeConfigFile.js +2 -1
- package/dist/cli/interactive/confirmDialog.d.ts.map +1 -1
- package/dist/cli/interactive/confirmDialog.js +3 -2
- package/dist/cli/interactive/constants.d.ts +2 -2
- package/dist/cli/interactive/constants.js +8 -8
- package/dist/cli/interactive/selectDialog.d.ts.map +1 -1
- package/dist/cli/interactive/selectDialog.js +11 -6
- package/dist/cli/previewChanges/previewChanges.d.ts.map +1 -1
- package/dist/cli/previewChanges/previewChanges.js +45 -17
- package/dist/cli/schemas/analyzeDiff.d.ts +14 -0
- package/dist/cli/schemas/analyzeDiff.d.ts.map +1 -0
- package/dist/cli/schemas/analyzeDiff.js +28 -0
- package/dist/cli/schemas/generate.d.ts +9 -0
- package/dist/cli/schemas/generate.d.ts.map +1 -1
- package/dist/cli/schemas/generate.js +9 -0
- package/dist/cli/schemas/index.d.ts +3 -1
- package/dist/cli/schemas/index.d.ts.map +1 -1
- package/dist/cli/schemas/index.js +2 -0
- package/dist/common/Consts.d.ts +1 -0
- package/dist/common/Consts.d.ts.map +1 -1
- package/dist/common/Consts.js +15 -1
- package/dist/common/Logger.d.ts +20 -1
- package/dist/common/Logger.d.ts.map +1 -1
- package/dist/common/Logger.js +70 -9
- package/dist/common/LoggerMessages.d.ts +135 -33
- package/dist/common/LoggerMessages.d.ts.map +1 -1
- package/dist/common/LoggerMessages.js +118 -45
- package/dist/common/VersionedSchema/AllVersionedSchemas/AllMigrationPlans.d.ts.map +1 -1
- package/dist/common/VersionedSchema/AllVersionedSchemas/AllMigrationPlans.js +7 -1
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedBase.d.ts +4 -0
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedBase.d.ts.map +1 -1
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV1.d.ts +8 -0
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV1.d.ts.map +1 -1
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV2.d.ts +8 -0
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV2.d.ts.map +1 -1
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV3.d.ts +8 -0
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV3.d.ts.map +1 -1
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV4.d.ts +35 -0
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV4.d.ts.map +1 -1
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV4.js +4 -1
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV5.d.ts +79 -0
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV5.d.ts.map +1 -0
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedOptionsSchemaV5.js +19 -0
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedVersionedSchemas.d.ts +171 -0
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedVersionedSchemas.d.ts.map +1 -1
- package/dist/common/VersionedSchema/AllVersionedSchemas/UnifiedVersionedSchemas.js +2 -0
- package/dist/common/VersionedSchema/CommonSchemas.d.ts +40 -0
- package/dist/common/VersionedSchema/CommonSchemas.d.ts.map +1 -1
- package/dist/common/VersionedSchema/CommonSchemas.js +34 -1
- package/dist/common/VersionedSchema/MultiOptionsVersioned/MultiOptionsSchemaV1.d.ts +4 -0
- package/dist/common/VersionedSchema/MultiOptionsVersioned/MultiOptionsSchemaV1.d.ts.map +1 -1
- package/dist/common/VersionedSchema/MultiOptionsVersioned/MultiOptionsSchemaV2.d.ts +4 -0
- package/dist/common/VersionedSchema/MultiOptionsVersioned/MultiOptionsSchemaV2.d.ts.map +1 -1
- package/dist/common/VersionedSchema/MultiOptionsVersioned/MultiOptionsSchemaV3.d.ts +4 -0
- package/dist/common/VersionedSchema/MultiOptionsVersioned/MultiOptionsSchemaV3.d.ts.map +1 -1
- package/dist/common/VersionedSchema/MultiOptionsVersioned/MultiOptionsSchemaV4.d.ts +4 -0
- package/dist/common/VersionedSchema/MultiOptionsVersioned/MultiOptionsSchemaV4.d.ts.map +1 -1
- package/dist/common/VersionedSchema/MultiOptionsVersioned/MultiOptionsSchemaV5.d.ts +4 -0
- package/dist/common/VersionedSchema/MultiOptionsVersioned/MultiOptionsSchemaV5.d.ts.map +1 -1
- package/dist/common/VersionedSchema/OptionsVersioned/OptionsSchemaV1.d.ts +4 -0
- package/dist/common/VersionedSchema/OptionsVersioned/OptionsSchemaV1.d.ts.map +1 -1
- package/dist/common/VersionedSchema/OptionsVersioned/OptionsSchemaV2.d.ts +4 -0
- package/dist/common/VersionedSchema/OptionsVersioned/OptionsSchemaV2.d.ts.map +1 -1
- package/dist/common/VersionedSchema/OptionsVersioned/OptionsSchemaV3.d.ts +4 -0
- package/dist/common/VersionedSchema/OptionsVersioned/OptionsSchemaV3.d.ts.map +1 -1
- package/dist/common/VersionedSchema/OptionsVersioned/OptionsSchemaV4.d.ts +4 -0
- package/dist/common/VersionedSchema/OptionsVersioned/OptionsSchemaV4.d.ts.map +1 -1
- package/dist/common/VersionedSchema/Utils/__mocks__/compatibilityCases.d.ts.map +1 -1
- package/dist/common/VersionedSchema/Utils/__mocks__/compatibilityCases.js +23 -3
- package/dist/common/VersionedSchema/Utils/__tests__/migrateDataToLatestSchemaVersion.test.js +2 -2
- package/dist/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.d.ts.map +1 -1
- package/dist/common/VersionedSchema/Utils/migrateDataToLatestSchemaVersion.js +2 -1
- package/dist/common/__tests__/Logger.test.d.ts +2 -0
- package/dist/common/__tests__/Logger.test.d.ts.map +1 -0
- package/dist/common/__tests__/Logger.test.js +100 -0
- package/dist/common/utils/__tests__/convertArrayToObject.test.js +3 -0
- package/dist/common/utils/__tests__/eslintFix.test.d.ts +2 -0
- package/dist/common/utils/__tests__/eslintFix.test.d.ts.map +1 -0
- package/dist/common/utils/__tests__/eslintFix.test.js +134 -0
- package/dist/common/utils/__tests__/format.test.d.ts +2 -0
- package/dist/common/utils/__tests__/format.test.d.ts.map +1 -0
- package/dist/common/utils/__tests__/format.test.js +90 -0
- package/dist/common/utils/convertArrayToObject.d.ts.map +1 -1
- package/dist/common/utils/convertArrayToObject.js +3 -0
- package/dist/common/utils/eslintFix.d.ts +7 -0
- package/dist/common/utils/eslintFix.d.ts.map +1 -0
- package/dist/common/utils/eslintFix.js +78 -0
- package/dist/common/utils/format.d.ts +1 -1
- package/dist/common/utils/format.d.ts.map +1 -1
- package/dist/common/utils/format.js +39 -15
- package/dist/common/utils/jsonPath.d.ts +5 -0
- package/dist/common/utils/jsonPath.d.ts.map +1 -0
- package/dist/common/utils/jsonPath.js +27 -0
- package/dist/common/utils/normalizeObject.d.ts +2 -0
- package/dist/common/utils/normalizeObject.d.ts.map +1 -0
- package/dist/common/utils/normalizeObject.js +63 -0
- package/dist/core/Context.d.ts +8 -1
- package/dist/core/Context.d.ts.map +1 -1
- package/dist/core/Context.js +23 -4
- package/dist/core/OpenApiClient.d.ts +2 -0
- package/dist/core/OpenApiClient.d.ts.map +1 -1
- package/dist/core/OpenApiClient.js +116 -6
- package/dist/core/WriteClient.d.ts +4 -0
- package/dist/core/WriteClient.d.ts.map +1 -1
- package/dist/core/WriteClient.js +38 -4
- package/dist/core/__tests__/WriteClient.test.js +4 -1
- package/dist/core/api/v2/parser/__tests__/getModel.test.d.ts +2 -0
- package/dist/core/api/v2/parser/__tests__/getModel.test.d.ts.map +1 -0
- package/dist/core/api/v2/parser/__tests__/getModel.test.js +34 -0
- package/dist/core/api/v2/parser/getModel.d.ts.map +1 -1
- package/dist/core/api/v2/parser/getModel.js +6 -1
- package/dist/core/api/v2/parser/getOperation.d.ts.map +1 -1
- package/dist/core/api/v2/parser/getOperation.js +2 -0
- package/dist/core/api/v2/parser/getOperationResponses.d.ts.map +1 -1
- package/dist/core/api/v2/parser/getOperationResponses.js +9 -1
- package/dist/core/api/v2/types/OpenApiSchema.model.d.ts +2 -0
- package/dist/core/api/v2/types/OpenApiSchema.model.d.ts.map +1 -1
- package/dist/core/api/v3/parser/__tests__/getContent.test.d.ts +2 -0
- package/dist/core/api/v3/parser/__tests__/getContent.test.d.ts.map +1 -0
- package/dist/core/api/v3/parser/__tests__/getContent.test.js +65 -0
- package/dist/core/api/v3/parser/__tests__/getModel.test.d.ts +2 -0
- package/dist/core/api/v3/parser/__tests__/getModel.test.d.ts.map +1 -0
- package/dist/core/api/v3/parser/__tests__/getModel.test.js +34 -0
- package/dist/core/api/v3/parser/getContent.d.ts.map +1 -1
- package/dist/core/api/v3/parser/getContent.js +21 -11
- package/dist/core/api/v3/parser/getModel.d.ts.map +1 -1
- package/dist/core/api/v3/parser/getModel.js +6 -1
- package/dist/core/api/v3/parser/getOperation.d.ts.map +1 -1
- package/dist/core/api/v3/parser/getOperation.js +2 -0
- package/dist/core/api/v3/parser/getOperationResponses.d.ts.map +1 -1
- package/dist/core/api/v3/parser/getOperationResponses.js +9 -1
- package/dist/core/api/v3/types/OpenApiSchema.model.d.ts +2 -0
- package/dist/core/api/v3/types/OpenApiSchema.model.d.ts.map +1 -1
- package/dist/core/governance/__tests__/evaluateGovernanceRules.test.d.ts +2 -0
- package/dist/core/governance/__tests__/evaluateGovernanceRules.test.d.ts.map +1 -0
- package/dist/core/governance/__tests__/evaluateGovernanceRules.test.js +100 -0
- package/dist/core/governance/__tests__/loadGovernanceConfig.test.d.ts +2 -0
- package/dist/core/governance/__tests__/loadGovernanceConfig.test.d.ts.map +1 -0
- package/dist/core/governance/__tests__/loadGovernanceConfig.test.js +71 -0
- package/dist/core/governance/evaluateGovernanceRules.d.ts +42 -0
- package/dist/core/governance/evaluateGovernanceRules.d.ts.map +1 -0
- package/dist/core/governance/evaluateGovernanceRules.js +134 -0
- package/dist/core/governance/governanceConfigSchema.d.ts +4 -0
- package/dist/core/governance/governanceConfigSchema.d.ts.map +1 -0
- package/dist/core/governance/governanceConfigSchema.js +39 -0
- package/dist/core/governance/loadGovernanceConfig.d.ts +7 -0
- package/dist/core/governance/loadGovernanceConfig.d.ts.map +1 -0
- package/dist/core/governance/loadGovernanceConfig.js +60 -0
- package/dist/core/index.d.ts +3 -0
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/index.js +4 -2
- package/dist/core/plugins/GeneratorPlugin.model.d.ts +42 -0
- package/dist/core/plugins/GeneratorPlugin.model.d.ts.map +1 -0
- package/dist/core/plugins/GeneratorPlugin.model.js +2 -0
- package/dist/core/plugins/__tests__/applySemanticDiffPluginHooks.test.d.ts +2 -0
- package/dist/core/plugins/__tests__/applySemanticDiffPluginHooks.test.d.ts.map +1 -0
- package/dist/core/plugins/__tests__/applySemanticDiffPluginHooks.test.js +115 -0
- package/dist/core/plugins/__tests__/loadGeneratorPlugins.test.d.ts +2 -0
- package/dist/core/plugins/__tests__/loadGeneratorPlugins.test.d.ts.map +1 -0
- package/dist/core/plugins/__tests__/loadGeneratorPlugins.test.js +62 -0
- package/dist/core/plugins/applySemanticDiffPluginHooks.d.ts +28 -0
- package/dist/core/plugins/applySemanticDiffPluginHooks.d.ts.map +1 -0
- package/dist/core/plugins/applySemanticDiffPluginHooks.js +160 -0
- package/dist/core/plugins/builtins/xTypescriptTypePlugin.d.ts +6 -0
- package/dist/core/plugins/builtins/xTypescriptTypePlugin.d.ts.map +1 -0
- package/dist/core/plugins/builtins/xTypescriptTypePlugin.js +13 -0
- package/dist/core/plugins/getBuiltinPlugins.d.ts +6 -0
- package/dist/core/plugins/getBuiltinPlugins.d.ts.map +1 -0
- package/dist/core/plugins/getBuiltinPlugins.js +10 -0
- package/dist/core/plugins/index.d.ts +4 -0
- package/dist/core/plugins/index.d.ts.map +1 -0
- package/dist/core/plugins/index.js +5 -0
- package/dist/core/plugins/loadGeneratorPlugins.d.ts +6 -0
- package/dist/core/plugins/loadGeneratorPlugins.d.ts.map +1 -0
- package/dist/core/plugins/loadGeneratorPlugins.js +94 -0
- package/dist/core/semanticDiff/__tests__/analyzeOpenApiDiff.test.d.ts +2 -0
- package/dist/core/semanticDiff/__tests__/analyzeOpenApiDiff.test.d.ts.map +1 -0
- package/dist/core/semanticDiff/__tests__/analyzeOpenApiDiff.test.js +537 -0
- package/dist/core/semanticDiff/__tests__/semanticDiffReportSchema.test.d.ts +2 -0
- package/dist/core/semanticDiff/__tests__/semanticDiffReportSchema.test.d.ts.map +1 -0
- package/dist/core/semanticDiff/__tests__/semanticDiffReportSchema.test.js +66 -0
- package/dist/core/semanticDiff/analyzeOpenApiDiff.d.ts +45 -0
- package/dist/core/semanticDiff/analyzeOpenApiDiff.d.ts.map +1 -0
- package/dist/core/semanticDiff/analyzeOpenApiDiff.js +640 -0
- package/dist/core/semanticDiff/semanticDiffReportSchema.d.ts +11 -0
- package/dist/core/semanticDiff/semanticDiffReportSchema.d.ts.map +1 -0
- package/dist/core/semanticDiff/semanticDiffReportSchema.js +132 -0
- package/dist/core/strict/__tests__/validateOpenApiStrict.test.d.ts +2 -0
- package/dist/core/strict/__tests__/validateOpenApiStrict.test.d.ts.map +1 -0
- package/dist/core/strict/__tests__/validateOpenApiStrict.test.js +156 -0
- package/dist/core/strict/validateOpenApiStrict.d.ts +43 -0
- package/dist/core/strict/validateOpenApiStrict.d.ts.map +1 -0
- package/dist/core/strict/validateOpenApiStrict.js +253 -0
- package/dist/core/types/base/ClientArtifacts.model.d.ts +2 -0
- package/dist/core/types/base/ClientArtifacts.model.d.ts.map +1 -1
- package/dist/core/types/base/Templates.model.d.ts +3 -0
- package/dist/core/types/base/Templates.model.d.ts.map +1 -1
- package/dist/core/types/enums/ModelsMode.enum.d.ts +5 -0
- package/dist/core/types/enums/ModelsMode.enum.d.ts.map +1 -0
- package/dist/core/types/enums/ModelsMode.enum.js +8 -0
- package/dist/core/types/shared/Client.model.d.ts +2 -0
- package/dist/core/types/shared/Client.model.d.ts.map +1 -1
- package/dist/core/types/shared/DiffInfo.model.d.ts +13 -0
- package/dist/core/types/shared/DiffInfo.model.d.ts.map +1 -0
- package/dist/core/types/shared/DiffInfo.model.js +2 -0
- package/dist/core/types/shared/Miracle.model.d.ts +13 -0
- package/dist/core/types/shared/Miracle.model.d.ts.map +1 -0
- package/dist/core/types/shared/Miracle.model.js +2 -0
- package/dist/core/types/shared/Model.model.d.ts +23 -0
- package/dist/core/types/shared/Model.model.d.ts.map +1 -1
- package/dist/core/types/shared/Operation.model.d.ts +5 -0
- package/dist/core/types/shared/Operation.model.d.ts.map +1 -1
- package/dist/core/utils/__mocks__/templates.d.ts.map +1 -1
- package/dist/core/utils/__mocks__/templates.js +9 -0
- package/dist/core/utils/__tests__/applyDiffReportToClient.test.d.ts +2 -0
- package/dist/core/utils/__tests__/applyDiffReportToClient.test.d.ts.map +1 -0
- package/dist/core/utils/__tests__/applyDiffReportToClient.test.js +108 -0
- package/dist/core/utils/__tests__/getMappedType.test.js +2 -0
- package/dist/core/utils/__tests__/getOperationResponseCode.test.js +7 -2
- package/dist/core/utils/__tests__/getOperationResults.test.d.ts +2 -0
- package/dist/core/utils/__tests__/getOperationResults.test.d.ts.map +1 -0
- package/dist/core/utils/__tests__/getOperationResults.test.js +43 -0
- package/dist/core/utils/__tests__/prepareDtoModels.test.d.ts +2 -0
- package/dist/core/utils/__tests__/prepareDtoModels.test.d.ts.map +1 -0
- package/dist/core/utils/__tests__/prepareDtoModels.test.js +116 -0
- package/dist/core/utils/__tests__/serviceHelpers.test.js +1 -0
- package/dist/core/utils/__tests__/writeClientModels.test.js +50 -0
- package/dist/core/utils/applyDiffReportToClient.d.ts +14 -0
- package/dist/core/utils/applyDiffReportToClient.d.ts.map +1 -0
- package/dist/core/utils/applyDiffReportToClient.js +367 -0
- package/dist/core/utils/getMappedType.d.ts.map +1 -1
- package/dist/core/utils/getMappedType.js +2 -0
- package/dist/core/utils/getOpenApiSpec.d.ts.map +1 -1
- package/dist/core/utils/getOpenApiSpec.js +1 -14
- package/dist/core/utils/getOperationResponseCode.d.ts.map +1 -1
- package/dist/core/utils/getOperationResponseCode.js +10 -8
- package/dist/core/utils/loadDiffReport.d.ts +39 -0
- package/dist/core/utils/loadDiffReport.d.ts.map +1 -0
- package/dist/core/utils/loadDiffReport.js +51 -0
- package/dist/core/utils/prepareDtoModels.d.ts +3 -0
- package/dist/core/utils/prepareDtoModels.d.ts.map +1 -0
- package/dist/core/utils/prepareDtoModels.js +189 -0
- package/dist/core/utils/registerHandlebarHelpers.d.ts.map +1 -1
- package/dist/core/utils/registerHandlebarHelpers.js +4 -1
- package/dist/core/utils/registerHandlebarTemplates.d.ts.map +1 -1
- package/dist/core/utils/registerHandlebarTemplates.js +6 -0
- package/dist/core/utils/validateRawOptions.d.ts +1 -1
- package/dist/core/utils/validateRawOptions.d.ts.map +1 -1
- package/dist/core/utils/validateRawOptions.js +4 -2
- package/dist/core/utils/writeClientCore.d.ts +2 -0
- package/dist/core/utils/writeClientCore.d.ts.map +1 -1
- package/dist/core/utils/writeClientCore.js +6 -1
- package/dist/core/utils/writeClientCoreIndex.d.ts +1 -0
- package/dist/core/utils/writeClientCoreIndex.d.ts.map +1 -1
- package/dist/core/utils/writeClientCoreIndex.js +2 -2
- package/dist/core/utils/writeClientExecutor.d.ts +2 -0
- package/dist/core/utils/writeClientExecutor.d.ts.map +1 -1
- package/dist/core/utils/writeClientExecutor.js +6 -2
- package/dist/core/utils/writeClientFullIndex.d.ts.map +1 -1
- package/dist/core/utils/writeClientFullIndex.js +3 -1
- package/dist/core/utils/writeClientModels.d.ts +6 -0
- package/dist/core/utils/writeClientModels.d.ts.map +1 -1
- package/dist/core/utils/writeClientModels.js +24 -3
- package/dist/core/utils/writeClientModelsIndex.d.ts +2 -0
- package/dist/core/utils/writeClientModelsIndex.d.ts.map +1 -1
- package/dist/core/utils/writeClientModelsIndex.js +2 -2
- package/dist/core/utils/writeClientSchemas.d.ts +2 -0
- package/dist/core/utils/writeClientSchemas.d.ts.map +1 -1
- package/dist/core/utils/writeClientSchemas.js +6 -2
- package/dist/core/utils/writeClientServices.d.ts +2 -0
- package/dist/core/utils/writeClientServices.d.ts.map +1 -1
- package/dist/core/utils/writeClientServices.js +6 -2
- package/dist/templatesCompiled/cli/openApiConfig.d.ts +4 -1
- package/dist/templatesCompiled/cli/openApiConfig.d.ts.map +1 -1
- package/dist/templatesCompiled/cli/openApiConfig.js +88 -37
- package/dist/templatesCompiled/client/core/ApiRequestOptions.js +1 -1
- package/dist/templatesCompiled/client/core/BaseDto.d.ts +8 -0
- package/dist/templatesCompiled/client/core/BaseDto.d.ts.map +1 -0
- package/dist/templatesCompiled/client/core/BaseDto.js +18 -0
- package/dist/templatesCompiled/client/core/axios/getResponseBody.js +1 -1
- package/dist/templatesCompiled/client/core/axios/request.js +2 -2
- package/dist/templatesCompiled/client/core/axios/sendRequest.js +4 -4
- package/dist/templatesCompiled/client/core/dtoUtils.d.ts +8 -0
- package/dist/templatesCompiled/client/core/dtoUtils.d.ts.map +1 -0
- package/dist/templatesCompiled/client/core/dtoUtils.js +18 -0
- package/dist/templatesCompiled/client/core/executor/createExecutorAdapter.js +2 -2
- package/dist/templatesCompiled/client/core/executor/requestExecutor.js +1 -1
- package/dist/templatesCompiled/client/core/fetch/getResponseBody.js +1 -1
- package/dist/templatesCompiled/client/core/fetch/request.js +2 -2
- package/dist/templatesCompiled/client/core/functions/isBinary.js +1 -1
- package/dist/templatesCompiled/client/core/node/getResponseBody.js +1 -1
- package/dist/templatesCompiled/client/core/node/request.js +2 -2
- package/dist/templatesCompiled/client/core/xhr/getResponseBody.js +1 -1
- package/dist/templatesCompiled/client/core/xhr/request.js +2 -2
- package/dist/templatesCompiled/client/core/xhr/sendRequest.js +4 -4
- package/dist/templatesCompiled/client/exportModels.d.ts +34 -0
- package/dist/templatesCompiled/client/exportModels.d.ts.map +1 -0
- package/dist/templatesCompiled/client/exportModels.js +280 -0
- package/dist/templatesCompiled/client/exportService.d.ts +7 -4
- package/dist/templatesCompiled/client/exportService.d.ts.map +1 -1
- package/dist/templatesCompiled/client/exportService.js +52 -33
- package/dist/templatesCompiled/client/indexCore.d.ts +3 -1
- package/dist/templatesCompiled/client/indexCore.d.ts.map +1 -1
- package/dist/templatesCompiled/client/indexCore.js +13 -2
- package/dist/templatesCompiled/client/indexFull.d.ts +9 -7
- package/dist/templatesCompiled/client/indexFull.d.ts.map +1 -1
- package/dist/templatesCompiled/client/indexFull.js +52 -34
- package/dist/templatesCompiled/client/indexModels.d.ts +7 -5
- package/dist/templatesCompiled/client/indexModels.d.ts.map +1 -1
- package/dist/templatesCompiled/client/indexModels.js +27 -18
- package/dist/templatesCompiled/client/joi/partials/joiSchemaGeneric.d.ts +27 -19
- package/dist/templatesCompiled/client/joi/partials/joiSchemaGeneric.d.ts.map +1 -1
- package/dist/templatesCompiled/client/joi/partials/joiSchemaGeneric.js +144 -63
- package/dist/templatesCompiled/client/jsonschema/exportSchema.d.ts +1 -0
- package/dist/templatesCompiled/client/jsonschema/exportSchema.d.ts.map +1 -1
- package/dist/templatesCompiled/client/jsonschema/exportSchema.js +17 -13
- package/dist/templatesCompiled/client/partials/exportInterface.d.ts +13 -5
- package/dist/templatesCompiled/client/partials/exportInterface.d.ts.map +1 -1
- package/dist/templatesCompiled/client/partials/exportInterface.js +91 -21
- package/dist/templatesCompiled/client/partials/result.d.ts +6 -4
- package/dist/templatesCompiled/client/partials/result.d.ts.map +1 -1
- package/dist/templatesCompiled/client/partials/result.js +16 -6
- package/dist/templatesCompiled/client/partials/serviceOption.d.ts +1 -0
- package/dist/templatesCompiled/client/partials/serviceOption.d.ts.map +1 -1
- package/dist/templatesCompiled/client/partials/serviceOption.js +11 -4
- package/dist/templatesCompiled/client/yup/partials/yupSchemaGeneric.d.ts +22 -16
- package/dist/templatesCompiled/client/yup/partials/yupSchemaGeneric.d.ts.map +1 -1
- package/dist/templatesCompiled/client/yup/partials/yupSchemaGeneric.js +72 -60
- package/dist/templatesCompiled/client/zod/partials/zodSchemaGeneric.d.ts +27 -19
- package/dist/templatesCompiled/client/zod/partials/zodSchemaGeneric.d.ts.map +1 -1
- package/dist/templatesCompiled/client/zod/partials/zodSchemaGeneric.js +77 -61
- package/package.json +7 -5
|
@@ -9,12 +9,19 @@ const pathHelpers_1 = require("../common/utils/pathHelpers");
|
|
|
9
9
|
const Parser_1 = require("./api/v2/Parser");
|
|
10
10
|
const Parser_2 = require("./api/v3/Parser");
|
|
11
11
|
const Context_1 = require("./Context");
|
|
12
|
+
const loadGovernanceConfig_1 = require("./governance/loadGovernanceConfig");
|
|
13
|
+
const loadGeneratorPlugins_1 = require("./plugins/loadGeneratorPlugins");
|
|
14
|
+
const validateOpenApiStrict_1 = require("./strict/validateOpenApiStrict");
|
|
12
15
|
const EmptySchemaStrategy_enum_1 = require("./types/enums/EmptySchemaStrategy.enum");
|
|
16
|
+
const ModelsMode_enum_1 = require("./types/enums/ModelsMode.enum");
|
|
13
17
|
const ValidationLibrary_enum_1 = require("./types/enums/ValidationLibrary.enum");
|
|
18
|
+
const applyDiffReportToClient_1 = require("./utils/applyDiffReportToClient");
|
|
14
19
|
const getOpenApiSpec_1 = require("./utils/getOpenApiSpec");
|
|
15
20
|
const getOpenApiVersion_1 = require("./utils/getOpenApiVersion");
|
|
16
21
|
const getOutputPaths_1 = require("./utils/getOutputPaths");
|
|
22
|
+
const loadDiffReport_1 = require("./utils/loadDiffReport");
|
|
17
23
|
const postProcessClient_1 = require("./utils/postProcessClient");
|
|
24
|
+
const prepareDtoModels_1 = require("./utils/prepareDtoModels");
|
|
18
25
|
const registerHandlebarTemplates_1 = require("./utils/registerHandlebarTemplates");
|
|
19
26
|
const WriteClient_1 = require("./WriteClient");
|
|
20
27
|
class OpenApiClient {
|
|
@@ -26,12 +33,16 @@ class OpenApiClient {
|
|
|
26
33
|
return this._writeClient;
|
|
27
34
|
}
|
|
28
35
|
normalizeOptions(rawOptions) {
|
|
36
|
+
const modelsMode = rawOptions.modelsMode ?? rawOptions.models?.mode;
|
|
37
|
+
const useHistory = rawOptions.useHistory ?? rawOptions.analyze?.useHistory;
|
|
38
|
+
const diffReport = rawOptions.diffReport ?? rawOptions.analyze?.reportPath;
|
|
29
39
|
if (rawOptions.items && rawOptions.items.length > 0) {
|
|
30
40
|
// Для items: Наследуем глобальный request, если не переопределён
|
|
31
41
|
return rawOptions.items.map(item => ({
|
|
32
42
|
...item,
|
|
33
43
|
httpClient: rawOptions.httpClient,
|
|
34
44
|
request: item.request ?? rawOptions.request, // ?? для fallback на глобальный
|
|
45
|
+
plugins: item.plugins ?? rawOptions.plugins,
|
|
35
46
|
customExecutorPath: rawOptions.customExecutorPath,
|
|
36
47
|
useOptions: rawOptions.useOptions,
|
|
37
48
|
useUnionTypes: rawOptions.useUnionTypes,
|
|
@@ -47,6 +58,12 @@ class OpenApiClient {
|
|
|
47
58
|
useSeparatedIndexes: rawOptions.useSeparatedIndexes,
|
|
48
59
|
validationLibrary: rawOptions.validationLibrary,
|
|
49
60
|
emptySchemaStrategy: rawOptions.emptySchemaStrategy,
|
|
61
|
+
useHistory: item.useHistory ?? useHistory,
|
|
62
|
+
diffReport: item.diffReport ?? diffReport,
|
|
63
|
+
modelsMode: item.modelsMode ?? modelsMode,
|
|
64
|
+
strictOpenapi: rawOptions.strictOpenapi,
|
|
65
|
+
reportFile: rawOptions.reportFile,
|
|
66
|
+
governanceConfig: rawOptions.governanceConfig,
|
|
50
67
|
}));
|
|
51
68
|
}
|
|
52
69
|
else {
|
|
@@ -65,6 +82,7 @@ class OpenApiClient {
|
|
|
65
82
|
includeSchemasFiles: rawOptions.includeSchemasFiles,
|
|
66
83
|
excludeCoreServiceFiles: rawOptions.excludeCoreServiceFiles,
|
|
67
84
|
request: rawOptions.request,
|
|
85
|
+
plugins: rawOptions.plugins,
|
|
68
86
|
customExecutorPath: rawOptions.customExecutorPath,
|
|
69
87
|
interfacePrefix: rawOptions.interfacePrefix,
|
|
70
88
|
enumPrefix: rawOptions.enumPrefix,
|
|
@@ -76,6 +94,12 @@ class OpenApiClient {
|
|
|
76
94
|
useSeparatedIndexes: rawOptions.useSeparatedIndexes,
|
|
77
95
|
validationLibrary: rawOptions.validationLibrary,
|
|
78
96
|
emptySchemaStrategy: rawOptions.emptySchemaStrategy,
|
|
97
|
+
useHistory,
|
|
98
|
+
diffReport,
|
|
99
|
+
modelsMode,
|
|
100
|
+
strictOpenapi: rawOptions.strictOpenapi,
|
|
101
|
+
reportFile: rawOptions.reportFile,
|
|
102
|
+
governanceConfig: rawOptions.governanceConfig,
|
|
79
103
|
},
|
|
80
104
|
];
|
|
81
105
|
}
|
|
@@ -94,6 +118,7 @@ class OpenApiClient {
|
|
|
94
118
|
includeSchemasFiles: item.includeSchemasFiles ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.includeSchemasFiles,
|
|
95
119
|
excludeCoreServiceFiles: item.excludeCoreServiceFiles ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.excludeCoreServiceFiles,
|
|
96
120
|
request: item.request || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.request,
|
|
121
|
+
plugins: item.plugins || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.plugins,
|
|
97
122
|
customExecutorPath: item.customExecutorPath || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.customExecutorPath,
|
|
98
123
|
interfacePrefix: item.interfacePrefix || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.interfacePrefix,
|
|
99
124
|
enumPrefix: item.enumPrefix || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.enumPrefix,
|
|
@@ -105,6 +130,17 @@ class OpenApiClient {
|
|
|
105
130
|
useSeparatedIndexes: item.useSeparatedIndexes ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useSeparatedIndexes,
|
|
106
131
|
validationLibrary: item.validationLibrary ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.validationLibrary,
|
|
107
132
|
emptySchemaStrategy: item.emptySchemaStrategy ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.emptySchemaStrategy,
|
|
133
|
+
useHistory: item.useHistory ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useHistory,
|
|
134
|
+
diffReport: item.diffReport || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.diffReport,
|
|
135
|
+
modelsMode: item.modelsMode ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.modelsMode,
|
|
136
|
+
models: item.models || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.models,
|
|
137
|
+
analyze: item.analyze || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.analyze,
|
|
138
|
+
miracles: item.miracles || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.miracles,
|
|
139
|
+
strictOpenapi: item.strictOpenapi ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.strictOpenapi,
|
|
140
|
+
reportFile: item.reportFile || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.reportFile,
|
|
141
|
+
useProjectPrettier: item.useProjectPrettier ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useProjectPrettier,
|
|
142
|
+
useEslintFix: item.useEslintFix ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.useEslintFix,
|
|
143
|
+
governanceConfig: item.governanceConfig || Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.governanceConfig,
|
|
108
144
|
};
|
|
109
145
|
}
|
|
110
146
|
async cleanOutputDirectories(option) {
|
|
@@ -145,11 +181,12 @@ class OpenApiClient {
|
|
|
145
181
|
}
|
|
146
182
|
catch (error) {
|
|
147
183
|
this.writeClient.logger.error(LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(error.message));
|
|
184
|
+
throw error;
|
|
148
185
|
}
|
|
149
186
|
this.writeClient.logger.shutdownLogger();
|
|
150
187
|
}
|
|
151
188
|
async generateSingle(item) {
|
|
152
|
-
const { input, output, outputCore, outputServices, outputModels, outputSchemas, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles, request, customExecutorPath, interfacePrefix, enumPrefix, typePrefix, useCancelableRequest, sortByRequired, useSeparatedIndexes, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, emptySchemaStrategy = EmptySchemaStrategy_enum_1.EmptySchemaStrategy.KEEP, } = item;
|
|
189
|
+
const { input, output, outputCore, outputServices, outputModels, outputSchemas, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles, request, plugins, customExecutorPath, interfacePrefix, enumPrefix, typePrefix, useCancelableRequest, sortByRequired, useSeparatedIndexes, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, emptySchemaStrategy = EmptySchemaStrategy_enum_1.EmptySchemaStrategy.KEEP, useHistory, diffReport, modelsMode = ModelsMode_enum_1.ModelsMode.INTERFACES, strictOpenapi, reportFile, useProjectPrettier = false, useEslintFix = false, governanceConfig, } = item;
|
|
153
190
|
const outputPaths = (0, getOutputPaths_1.getOutputPaths)({
|
|
154
191
|
output,
|
|
155
192
|
outputCore,
|
|
@@ -158,8 +195,30 @@ class OpenApiClient {
|
|
|
158
195
|
outputSchemas,
|
|
159
196
|
});
|
|
160
197
|
const absoluteInput = (0, pathHelpers_1.resolveHelper)(process.cwd(), input);
|
|
161
|
-
const
|
|
198
|
+
const generatorPlugins = await (0, loadGeneratorPlugins_1.loadGeneratorPlugins)(plugins);
|
|
199
|
+
const context = new Context_1.Context({
|
|
200
|
+
input: absoluteInput,
|
|
201
|
+
output: outputPaths,
|
|
202
|
+
prefix: { interface: interfacePrefix, enum: enumPrefix, type: typePrefix },
|
|
203
|
+
sortByRequired,
|
|
204
|
+
plugins: generatorPlugins,
|
|
205
|
+
});
|
|
162
206
|
const openApi = await (0, getOpenApiSpec_1.getOpenApiSpec)(context, absoluteInput);
|
|
207
|
+
if (strictOpenapi) {
|
|
208
|
+
const parserValidationIssues = await (0, validateOpenApiStrict_1.validateWithSwaggerParser)(absoluteInput);
|
|
209
|
+
const governancePolicy = await (0, loadGovernanceConfig_1.loadGovernanceConfig)(governanceConfig);
|
|
210
|
+
const strictReport = (0, validateOpenApiStrict_1.validateOpenApiStrict)({
|
|
211
|
+
openApi,
|
|
212
|
+
context,
|
|
213
|
+
preIssues: parserValidationIssues,
|
|
214
|
+
governanceConfig: governancePolicy,
|
|
215
|
+
});
|
|
216
|
+
const reportPath = await (0, validateOpenApiStrict_1.writeOpenApiStrictReport)(strictReport, reportFile);
|
|
217
|
+
this.writeClient.logger.forceInfo(`Strict OpenAPI report created: ${reportPath}`);
|
|
218
|
+
if (strictReport.summary.errors > 0) {
|
|
219
|
+
throw new Error(`Strict OpenAPI validation failed with ${strictReport.summary.errors} error(s). Report: ${reportPath}`);
|
|
220
|
+
}
|
|
221
|
+
}
|
|
163
222
|
const openApiVersion = (0, getOpenApiVersion_1.getOpenApiVersion)(openApi);
|
|
164
223
|
const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)({
|
|
165
224
|
httpClient,
|
|
@@ -167,14 +226,29 @@ class OpenApiClient {
|
|
|
167
226
|
useOptions,
|
|
168
227
|
validationLibrary,
|
|
169
228
|
});
|
|
229
|
+
const diffReportData = await this.loadDiffReportIfNeeded({
|
|
230
|
+
useHistory,
|
|
231
|
+
diffReport,
|
|
232
|
+
inputPath: absoluteInput,
|
|
233
|
+
});
|
|
170
234
|
this.writeClient.logger.info(LoggerMessages_1.LOGGER_MESSAGES.OPENAPI.DEFINING_VERSION);
|
|
171
235
|
switch (openApiVersion) {
|
|
172
236
|
case getOpenApiVersion_1.OpenApiVersion.V2: {
|
|
173
237
|
const client = new Parser_1.Parser(context).parse(openApi);
|
|
174
|
-
const
|
|
238
|
+
const clientWithDiff = this.applyDiffReportIfNeeded({
|
|
239
|
+
client,
|
|
240
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
241
|
+
// @ts-ignore
|
|
242
|
+
openApi,
|
|
243
|
+
openApiVersion,
|
|
244
|
+
diffReport: diffReportData,
|
|
245
|
+
context,
|
|
246
|
+
});
|
|
247
|
+
const clientFinal = (0, postProcessClient_1.postProcessClient)(clientWithDiff);
|
|
248
|
+
const clientPrepared = modelsMode === ModelsMode_enum_1.ModelsMode.CLASSES ? (0, prepareDtoModels_1.prepareDtoModels)(clientFinal) : clientFinal;
|
|
175
249
|
this.writeClient.logger.info(LoggerMessages_1.LOGGER_MESSAGES.OPENAPI.WRITING_V2);
|
|
176
250
|
await this.writeClient.writeClient({
|
|
177
|
-
client:
|
|
251
|
+
client: clientPrepared,
|
|
178
252
|
templates,
|
|
179
253
|
outputPaths,
|
|
180
254
|
httpClient,
|
|
@@ -187,15 +261,28 @@ class OpenApiClient {
|
|
|
187
261
|
useSeparatedIndexes,
|
|
188
262
|
validationLibrary,
|
|
189
263
|
emptySchemaStrategy,
|
|
264
|
+
modelsMode,
|
|
265
|
+
useProjectPrettier,
|
|
266
|
+
useEslintFix,
|
|
190
267
|
});
|
|
191
268
|
break;
|
|
192
269
|
}
|
|
193
270
|
case getOpenApiVersion_1.OpenApiVersion.V3: {
|
|
194
271
|
const client = new Parser_2.Parser(context).parse(openApi);
|
|
195
|
-
const
|
|
272
|
+
const clientWithDiff = this.applyDiffReportIfNeeded({
|
|
273
|
+
client,
|
|
274
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
275
|
+
// @ts-ignore
|
|
276
|
+
openApi,
|
|
277
|
+
openApiVersion,
|
|
278
|
+
diffReport: diffReportData,
|
|
279
|
+
context,
|
|
280
|
+
});
|
|
281
|
+
const clientFinal = (0, postProcessClient_1.postProcessClient)(clientWithDiff);
|
|
282
|
+
const clientPrepared = modelsMode === ModelsMode_enum_1.ModelsMode.CLASSES ? (0, prepareDtoModels_1.prepareDtoModels)(clientFinal) : clientFinal;
|
|
196
283
|
this.writeClient.logger.info(LoggerMessages_1.LOGGER_MESSAGES.OPENAPI.WRITING_V3);
|
|
197
284
|
await this.writeClient.writeClient({
|
|
198
|
-
client:
|
|
285
|
+
client: clientPrepared,
|
|
199
286
|
templates,
|
|
200
287
|
outputPaths,
|
|
201
288
|
httpClient,
|
|
@@ -208,11 +295,34 @@ class OpenApiClient {
|
|
|
208
295
|
useSeparatedIndexes,
|
|
209
296
|
validationLibrary,
|
|
210
297
|
emptySchemaStrategy,
|
|
298
|
+
modelsMode,
|
|
299
|
+
useProjectPrettier,
|
|
300
|
+
useEslintFix,
|
|
211
301
|
});
|
|
212
302
|
break;
|
|
213
303
|
}
|
|
214
304
|
}
|
|
215
305
|
}
|
|
306
|
+
async loadDiffReportIfNeeded(params) {
|
|
307
|
+
return (0, loadDiffReport_1.loadDiffReport)({
|
|
308
|
+
useHistory: params.useHistory,
|
|
309
|
+
diffReport: params.diffReport,
|
|
310
|
+
inputPath: params.inputPath,
|
|
311
|
+
logger: this.writeClient.logger,
|
|
312
|
+
});
|
|
313
|
+
}
|
|
314
|
+
applyDiffReportIfNeeded(params) {
|
|
315
|
+
if (!params.diffReport) {
|
|
316
|
+
return params.client;
|
|
317
|
+
}
|
|
318
|
+
return (0, applyDiffReportToClient_1.applyDiffReportToClient)({
|
|
319
|
+
client: params.client,
|
|
320
|
+
openApi: params.openApi,
|
|
321
|
+
openApiVersion: params.openApiVersion,
|
|
322
|
+
diffReport: params.diffReport,
|
|
323
|
+
prefix: params.context.prefix,
|
|
324
|
+
});
|
|
325
|
+
}
|
|
216
326
|
async generate(rawOptions) {
|
|
217
327
|
const logger = new Logger_1.Logger({
|
|
218
328
|
level: rawOptions.logLevel ?? Consts_1.COMMON_DEFAULT_OPTIONS_VALUES.logLevel,
|
|
@@ -3,6 +3,7 @@ import { OutputPaths } from './types/base/OutputPaths.model';
|
|
|
3
3
|
import { Templates } from './types/base/Templates.model';
|
|
4
4
|
import { EmptySchemaStrategy } from './types/enums/EmptySchemaStrategy.enum';
|
|
5
5
|
import { HttpClient } from './types/enums/HttpClient.enum';
|
|
6
|
+
import { ModelsMode } from './types/enums/ModelsMode.enum';
|
|
6
7
|
import { ValidationLibrary } from './types/enums/ValidationLibrary.enum';
|
|
7
8
|
import type { Client } from './types/shared/Client.model';
|
|
8
9
|
import type { Model } from './types/shared/Model.model';
|
|
@@ -44,6 +45,9 @@ type TWriteClientProps = {
|
|
|
44
45
|
useSeparatedIndexes?: boolean;
|
|
45
46
|
validationLibrary?: ValidationLibrary;
|
|
46
47
|
emptySchemaStrategy: EmptySchemaStrategy;
|
|
48
|
+
modelsMode?: ModelsMode;
|
|
49
|
+
useProjectPrettier?: boolean;
|
|
50
|
+
useEslintFix?: boolean;
|
|
47
51
|
};
|
|
48
52
|
type TAPIClientGeneratorConfig = Omit<TWriteClientProps, 'httpClient' | 'useOptions' | 'request' | 'useCancelableRequest' | 'useSeparatedIndexes'> & {
|
|
49
53
|
schemaModels: Model[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WriteClient.d.ts","sourceRoot":"","sources":["../../src/core/WriteClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAM1C,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAIxD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE;;;;;;;;;;;;GAYG;AACH,KAAK,iBAAiB,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,uBAAuB,EAAE,OAAO,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,mBAAmB,EAAE,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"WriteClient.d.ts","sourceRoot":"","sources":["../../src/core/WriteClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAM1C,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAIxD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE;;;;;;;;;;;;GAYG;AACH,KAAK,iBAAiB,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,uBAAuB,EAAE,OAAO,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,KAAK,yBAAyB,GAAG,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,sBAAsB,GAAG,qBAAqB,CAAC,GAAG;IACjJ,YAAY,EAAE,KAAK,EAAE,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,qBAAa,WAAW;IACpB,OAAO,CAAC,MAAM,CAAuD;IACrE,OAAO,CAAC,OAAO,CAAS;gBAEZ,MAAM,CAAC,EAAE,MAAM;IAU3B;;OAEG;IACG,WAAW,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;YAuI9C,sBAAsB;IA0DpC;;;OAGG;IACH,6BAA6B,CAAC,MAAM,EAAE,yBAAyB;IAUzD,eAAe;IAKf,sBAAsB;IAK5B,IAAW,MAAM,WAEhB;IAED,OAAO,CAAC,yBAAyB;IAyCjC,OAAO,CAAC,mBAAmB;YAkEb,gBAAgB;YAUhB,uBAAuB;IAMrC,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,iBAAiB;IAiBzB,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,aAAa;IAId,eAAe,yBAAmB;IAClC,oBAAoB,8BAAwB;IAC5C,oBAAoB,8BAAwB;IAC5C,iBAAiB,2BAAqB;IACtC,sBAAsB,gCAA0B;IAChD,kBAAkB,4BAAsB;IACxC,uBAAuB,iCAA2B;IAClD,mBAAmB,6BAAuB;IAC1C,wBAAwB,kCAA4B;IACpD,sBAAsB,gCAA0B;IAChD,mBAAmB,6BAAuB;CACpD"}
|
package/dist/core/WriteClient.js
CHANGED
|
@@ -5,6 +5,7 @@ const Enums_1 = require("../common/Enums");
|
|
|
5
5
|
const Logger_1 = require("../common/Logger");
|
|
6
6
|
const fileSystemHelpers_1 = require("../common/utils/fileSystemHelpers");
|
|
7
7
|
const pathHelpers_1 = require("../common/utils/pathHelpers");
|
|
8
|
+
const ModelsMode_enum_1 = require("./types/enums/ModelsMode.enum");
|
|
8
9
|
const ValidationLibrary_enum_1 = require("./types/enums/ValidationLibrary.enum");
|
|
9
10
|
const prepareAlias_1 = require("./utils/prepareAlias");
|
|
10
11
|
const sortModelByName_1 = require("./utils/sortModelByName");
|
|
@@ -39,19 +40,20 @@ class WriteClient {
|
|
|
39
40
|
* Write our OpenAPI client, using the given templates at the given output
|
|
40
41
|
*/
|
|
41
42
|
async writeClient(options) {
|
|
42
|
-
const { client, templates, outputPaths, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles = false, request, customExecutorPath, useCancelableRequest = false, useSeparatedIndexes = false, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, emptySchemaStrategy, } = options;
|
|
43
|
+
const { client, templates, outputPaths, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles = false, request, customExecutorPath, useCancelableRequest = false, useSeparatedIndexes = false, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, emptySchemaStrategy, modelsMode, useProjectPrettier = false, useEslintFix = false, } = options;
|
|
43
44
|
if (!excludeCoreServiceFiles) {
|
|
44
45
|
const executorPath = (0, pathHelpers_1.resolveHelper)(outputPaths.outputCore, 'executor');
|
|
45
46
|
const interceptorsPath = (0, pathHelpers_1.resolveHelper)(outputPaths.outputCore, 'interceptors');
|
|
46
47
|
await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.outputCore);
|
|
47
48
|
await fileSystemHelpers_1.fileSystemHelpers.mkdir(executorPath);
|
|
48
49
|
await fileSystemHelpers_1.fileSystemHelpers.mkdir(interceptorsPath);
|
|
49
|
-
await this.writeClientCore({ client, templates, outputCorePath: outputPaths.outputCore, httpClient, request, useCancelableRequest });
|
|
50
|
+
await this.writeClientCore({ client, templates, outputCorePath: outputPaths.outputCore, httpClient, request, useCancelableRequest, modelsMode });
|
|
50
51
|
await this.writeClientCoreIndex({
|
|
51
52
|
templates,
|
|
52
53
|
outputCorePath: outputPaths.outputCore,
|
|
53
54
|
useCancelableRequest,
|
|
54
55
|
useSeparatedIndexes,
|
|
56
|
+
modelsMode,
|
|
55
57
|
});
|
|
56
58
|
const { outputCore, outputServices, outputModels } = outputPaths;
|
|
57
59
|
await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.outputServices);
|
|
@@ -67,6 +69,8 @@ class WriteClient {
|
|
|
67
69
|
useUnionTypes,
|
|
68
70
|
useOptions,
|
|
69
71
|
useCancelableRequest,
|
|
72
|
+
useProjectPrettier,
|
|
73
|
+
useEslintFix,
|
|
70
74
|
});
|
|
71
75
|
await this.writeClientServicesIndex({
|
|
72
76
|
services: client.services,
|
|
@@ -81,6 +85,8 @@ class WriteClient {
|
|
|
81
85
|
templates,
|
|
82
86
|
request,
|
|
83
87
|
customExecutorPath,
|
|
88
|
+
useProjectPrettier,
|
|
89
|
+
useEslintFix,
|
|
84
90
|
});
|
|
85
91
|
}
|
|
86
92
|
/**
|
|
@@ -97,6 +103,8 @@ class WriteClient {
|
|
|
97
103
|
useUnionTypes,
|
|
98
104
|
validationLibrary,
|
|
99
105
|
emptySchemaStrategy,
|
|
106
|
+
useProjectPrettier,
|
|
107
|
+
useEslintFix,
|
|
100
108
|
});
|
|
101
109
|
await this.writeClientSchemasIndex({
|
|
102
110
|
models: schemaModels,
|
|
@@ -118,7 +126,10 @@ class WriteClient {
|
|
|
118
126
|
useSeparatedIndexes,
|
|
119
127
|
validationLibrary,
|
|
120
128
|
emptySchemaStrategy,
|
|
129
|
+
modelsMode,
|
|
121
130
|
schemaModels,
|
|
131
|
+
useProjectPrettier,
|
|
132
|
+
useEslintFix,
|
|
122
133
|
});
|
|
123
134
|
return;
|
|
124
135
|
}
|
|
@@ -136,24 +147,38 @@ class WriteClient {
|
|
|
136
147
|
useSeparatedIndexes,
|
|
137
148
|
validationLibrary,
|
|
138
149
|
emptySchemaStrategy,
|
|
150
|
+
modelsMode,
|
|
139
151
|
schemaModels: [],
|
|
152
|
+
useProjectPrettier,
|
|
153
|
+
useEslintFix,
|
|
140
154
|
});
|
|
141
155
|
}
|
|
142
156
|
async writeModelsAndFinalize(config) {
|
|
143
|
-
const { client, templates, outputPaths, httpClient, useUnionTypes, useSeparatedIndexes, excludeCoreServiceFiles, validationLibrary, emptySchemaStrategy, schemaModels } = config;
|
|
157
|
+
const { client, templates, outputPaths, httpClient, useUnionTypes, useOptions, useSeparatedIndexes, excludeCoreServiceFiles, validationLibrary, emptySchemaStrategy, modelsMode, schemaModels, useProjectPrettier, useEslintFix, } = config;
|
|
144
158
|
await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.outputModels);
|
|
159
|
+
const shouldInlineDtoCore = modelsMode === ModelsMode_enum_1.ModelsMode.CLASSES && excludeCoreServiceFiles;
|
|
160
|
+
if (shouldInlineDtoCore) {
|
|
161
|
+
await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputPaths.outputModels, 'BaseDto.ts'), templates.core.baseDto({}));
|
|
162
|
+
await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputPaths.outputModels, 'dtoUtils.ts'), templates.core.dtoUtils({}));
|
|
163
|
+
}
|
|
145
164
|
await this.writeClientModels({
|
|
146
165
|
models: client.models,
|
|
147
166
|
templates,
|
|
148
167
|
outputModelsPath: outputPaths.outputModels,
|
|
149
168
|
httpClient,
|
|
150
169
|
useUnionTypes,
|
|
170
|
+
useOptions,
|
|
171
|
+
modelsMode,
|
|
172
|
+
outputCorePath: shouldInlineDtoCore ? './' : (0, pathHelpers_1.relativeHelper)(outputPaths.outputModels, outputPaths.outputCore),
|
|
173
|
+
useProjectPrettier,
|
|
174
|
+
useEslintFix,
|
|
151
175
|
});
|
|
152
176
|
await this.writeClientModelsIndex({
|
|
153
177
|
models: client.models,
|
|
154
178
|
templates,
|
|
155
179
|
outputModelsPath: outputPaths.outputModels,
|
|
156
180
|
useSeparatedIndexes,
|
|
181
|
+
modelsMode,
|
|
157
182
|
});
|
|
158
183
|
await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.output);
|
|
159
184
|
this.buildClientGeneratorConfigMap({
|
|
@@ -165,6 +190,7 @@ class WriteClient {
|
|
|
165
190
|
validationLibrary,
|
|
166
191
|
emptySchemaStrategy,
|
|
167
192
|
schemaModels,
|
|
193
|
+
modelsMode,
|
|
168
194
|
});
|
|
169
195
|
}
|
|
170
196
|
/**
|
|
@@ -230,12 +256,15 @@ class WriteClient {
|
|
|
230
256
|
const result = new Map();
|
|
231
257
|
for (const [key, value] of this.config.entries()) {
|
|
232
258
|
for (const item of value) {
|
|
233
|
-
const { outputPaths, client, templates, useUnionTypes, excludeCoreServiceFiles, validationLibrary, schemaModels } = item;
|
|
259
|
+
const { outputPaths, client, templates, useUnionTypes, excludeCoreServiceFiles, validationLibrary, schemaModels, modelsMode } = item;
|
|
234
260
|
const outputCore = this.getOutputPath(outputPaths?.outputCore, key, 'core');
|
|
235
261
|
const outputModels = this.getOutputPath(outputPaths?.outputModels, key, 'models');
|
|
236
262
|
const outputSchemas = this.getOutputPath(outputPaths?.outputSchemas, key, 'schemas');
|
|
237
263
|
const outputServices = this.getOutputPath(outputPaths?.outputServices, key, 'services');
|
|
238
264
|
const clientIndex = this.ensureClientIndex(result, key, templates);
|
|
265
|
+
if (!clientIndex.modelsMode) {
|
|
266
|
+
clientIndex.modelsMode = modelsMode;
|
|
267
|
+
}
|
|
239
268
|
if (!excludeCoreServiceFiles) {
|
|
240
269
|
const rel = (0, pathHelpers_1.relativeHelper)(key, outputCore);
|
|
241
270
|
if (!clientIndex.core.includes(rel)) {
|
|
@@ -252,6 +281,9 @@ class WriteClient {
|
|
|
252
281
|
}
|
|
253
282
|
}
|
|
254
283
|
const relativePathModel = `${(0, pathHelpers_1.relativeHelper)(key, outputModels)}`;
|
|
284
|
+
if (!clientIndex.modelsPackage) {
|
|
285
|
+
clientIndex.modelsPackage = relativePathModel;
|
|
286
|
+
}
|
|
255
287
|
const relativePathSchema = `${(0, pathHelpers_1.relativeHelper)(key, outputSchemas)}`;
|
|
256
288
|
for (const model of client.models) {
|
|
257
289
|
const modelFinal = {
|
|
@@ -303,6 +335,8 @@ class WriteClient {
|
|
|
303
335
|
models: [],
|
|
304
336
|
schemas: [],
|
|
305
337
|
services: [],
|
|
338
|
+
modelsMode: undefined,
|
|
339
|
+
modelsPackage: undefined,
|
|
306
340
|
});
|
|
307
341
|
}
|
|
308
342
|
return map.get(key);
|
|
@@ -45,6 +45,7 @@ const WriteClient_1 = require("../WriteClient");
|
|
|
45
45
|
model: () => 'model',
|
|
46
46
|
schema: () => 'schema',
|
|
47
47
|
service: () => 'service',
|
|
48
|
+
models: () => 'models',
|
|
48
49
|
},
|
|
49
50
|
core: {
|
|
50
51
|
settings: () => 'settings',
|
|
@@ -58,7 +59,9 @@ const WriteClient_1 = require("../WriteClient");
|
|
|
58
59
|
requestExecutor: () => 'requestExecutor',
|
|
59
60
|
apiErrorInterceptor: () => 'apiErrorInterceptor',
|
|
60
61
|
interceptors: () => 'interceptors',
|
|
61
|
-
withInterceptors: () => 'withInterceptors'
|
|
62
|
+
withInterceptors: () => 'withInterceptors',
|
|
63
|
+
baseDto: () => 'baseDto',
|
|
64
|
+
dtoUtils: () => 'dtoUtils'
|
|
62
65
|
},
|
|
63
66
|
};
|
|
64
67
|
const outputPaths = (0, getOutputPaths_1.getOutputPaths)({ output: './dist' });
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getModel.test.d.ts","sourceRoot":"","sources":["../../../../../../src/core/api/v2/parser/__tests__/getModel.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
7
|
+
const node_test_1 = require("node:test");
|
|
8
|
+
const Context_1 = require("../../../../Context");
|
|
9
|
+
const xTypescriptTypePlugin_1 = require("../../../../plugins/builtins/xTypescriptTypePlugin");
|
|
10
|
+
const getOutputPaths_1 = require("../../../../utils/getOutputPaths");
|
|
11
|
+
const Parser_1 = require("../../Parser");
|
|
12
|
+
(0, node_test_1.describe)('@unit: getModel (v2)', () => {
|
|
13
|
+
(0, node_test_1.test)('should prioritize x-typescript-type over format binary', () => {
|
|
14
|
+
const context = new Context_1.Context({
|
|
15
|
+
input: 'test/spec/v2.json',
|
|
16
|
+
output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }),
|
|
17
|
+
plugins: [xTypescriptTypePlugin_1.xTypescriptTypePlugin],
|
|
18
|
+
});
|
|
19
|
+
const parser = new Parser_1.Parser(context);
|
|
20
|
+
const model = parser.getModel({
|
|
21
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
22
|
+
openApi: {},
|
|
23
|
+
definition: {
|
|
24
|
+
type: 'string',
|
|
25
|
+
format: 'binary',
|
|
26
|
+
'x-typescript-type': 'File',
|
|
27
|
+
},
|
|
28
|
+
parentRef: '',
|
|
29
|
+
});
|
|
30
|
+
node_assert_1.default.strictEqual(model.export, 'generic');
|
|
31
|
+
node_assert_1.default.strictEqual(model.base, 'File');
|
|
32
|
+
node_assert_1.default.strictEqual(model.type, 'File');
|
|
33
|
+
});
|
|
34
|
+
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getModel.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAM/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,
|
|
1
|
+
{"version":3,"file":"getModel.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAM/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,CA8JjE"}
|
|
@@ -142,7 +142,12 @@ function getModel(config) {
|
|
|
142
142
|
}
|
|
143
143
|
// If the schema has a type than it can be a basic or generic type.
|
|
144
144
|
if (definition.type) {
|
|
145
|
-
const
|
|
145
|
+
const pluginType = this.context.resolveSchemaTypeOverride(definition, {
|
|
146
|
+
openApiVersion: 'v2',
|
|
147
|
+
parentRef,
|
|
148
|
+
});
|
|
149
|
+
const primitiveType = pluginType || (definition.format === 'binary' ? 'Blob' : definition.type);
|
|
150
|
+
const definitionType = this.getType(primitiveType, parentRef);
|
|
146
151
|
model.export = 'generic';
|
|
147
152
|
model.type = definitionType.type;
|
|
148
153
|
model.base = definitionType.base;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getOperation.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAQ3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,gBAAgB,EAAE,UAAU,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"getOperation.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAQ3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,gBAAgB,EAAE,UAAU,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,CA0D7K"}
|
|
@@ -34,6 +34,7 @@ function getOperation(openApi, url, method, op, pathParams, parentRef) {
|
|
|
34
34
|
errors: [],
|
|
35
35
|
results: [],
|
|
36
36
|
responseHeader: null,
|
|
37
|
+
responseType: null,
|
|
37
38
|
};
|
|
38
39
|
// Parse the operation parameters (path, query, body, etc).
|
|
39
40
|
if (op.parameters) {
|
|
@@ -53,6 +54,7 @@ function getOperation(openApi, url, method, op, pathParams, parentRef) {
|
|
|
53
54
|
const operationResults = (0, getOperationResults_1.getOperationResults)(operationResponses);
|
|
54
55
|
operation.errors = (0, getOperationErrors_1.getOperationErrors)(operationResponses);
|
|
55
56
|
operation.responseHeader = (0, getOperationResponseHeader_1.getOperationResponseHeader)(operationResults);
|
|
57
|
+
operation.responseType = operationResults.some(operationResult => operationResult.base === 'Blob' || operationResult.base === 'File') ? 'blob' : null;
|
|
56
58
|
operationResults.forEach(operationResult => {
|
|
57
59
|
operation.results.push(operationResult);
|
|
58
60
|
operation.imports.push(...operationResult.imports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getOperationResponses.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationResponses.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getOperationResponses.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationResponses.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAIvF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,EAAE,CA0BzI"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getOperationResponses = getOperationResponses;
|
|
4
|
+
const path_1 = require("path");
|
|
5
|
+
const pathHelpers_1 = require("../../../../common/utils/pathHelpers");
|
|
4
6
|
const safeHasOwn_1 = require("../../../../common/utils/safeHasOwn");
|
|
5
7
|
const getOperationResponseCode_1 = require("../../../utils/getOperationResponseCode");
|
|
8
|
+
const normalizeRef_1 = require("../../../utils/normalizeRef");
|
|
9
|
+
const parseRef_1 = require("../../../utils/parseRef");
|
|
6
10
|
function getOperationResponses(openApi, responses, parentRef) {
|
|
7
11
|
const operationResponses = [];
|
|
8
12
|
// Iterate over each response code and get the
|
|
@@ -12,8 +16,12 @@ function getOperationResponses(openApi, responses, parentRef) {
|
|
|
12
16
|
const responseOrReference = responses[code];
|
|
13
17
|
const response = (responseOrReference.$ref ? this.context.get(responseOrReference.$ref, parentRef) : responseOrReference);
|
|
14
18
|
const responseCode = (0, getOperationResponseCode_1.getOperationResponseCode)(code);
|
|
19
|
+
const normalizedParentRef = (0, path_1.isAbsolute)(parentRef) ? parentRef : (0, pathHelpers_1.resolveHelper)(this.context.root?.dirName || process.cwd(), parentRef);
|
|
20
|
+
const responseParentRef = responseOrReference.$ref
|
|
21
|
+
? (0, parseRef_1.parseRef)((0, normalizeRef_1.normalizeRef)(responseOrReference.$ref, normalizedParentRef)).filePath || normalizedParentRef
|
|
22
|
+
: parentRef;
|
|
15
23
|
if (responseCode) {
|
|
16
|
-
const operationResponse = this.getOperationResponse(openApi, response, responseCode,
|
|
24
|
+
const operationResponse = this.getOperationResponse(openApi, response, responseCode, responseParentRef);
|
|
17
25
|
operationResponses.push(operationResponse);
|
|
18
26
|
}
|
|
19
27
|
}
|
|
@@ -37,5 +37,7 @@ export interface OpenApiSchema extends OpenApiReference, WithEnumExtension, With
|
|
|
37
37
|
xml?: OpenApiXml;
|
|
38
38
|
externalDocs?: OpenApiExternalDocs;
|
|
39
39
|
example?: any;
|
|
40
|
+
/** Other vendor extensions (`x-*`) on the schema object. */
|
|
41
|
+
[extension: `x-${string}`]: unknown;
|
|
40
42
|
}
|
|
41
43
|
//# sourceMappingURL=OpenApiSchema.model.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenApiSchema.model.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/types/OpenApiSchema.model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0DAA0D,CAAC;AAClG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACtF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,gBAAgB,EAAE,iBAAiB,EAAE,qBAAqB;IAC7F,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,UAAU,CAAC;IAC/H,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC;IACvC,oBAAoB,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;IAC/C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,UAAU,CAAC;IACjB,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,OAAO,CAAC,EAAE,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"OpenApiSchema.model.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/types/OpenApiSchema.model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0DAA0D,CAAC;AAClG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACtF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,gBAAgB,EAAE,iBAAiB,EAAE,qBAAqB;IAC7F,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,WAAW,GAAG,UAAU,CAAC;IAC/H,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC;IACvC,oBAAoB,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;IAC/C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,UAAU,CAAC;IACjB,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,4DAA4D;IAC5D,CAAC,SAAS,EAAE,KAAK,MAAM,EAAE,GAAG,OAAO,CAAC;CACvC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getContent.test.d.ts","sourceRoot":"","sources":["../../../../../../src/core/api/v3/parser/__tests__/getContent.test.ts"],"names":[],"mappings":""}
|