[typescript-fetch] Support fileNaming option (#18283) (#18284)

* [typescript-fetch] Support fileNaming option (#18283)

* [typescript-fetch] Support fileNaming option - add tests (#18283)

* [typescript-fetch] introduce constants
This commit is contained in:
En0s0und 2024-05-03 15:07:54 +02:00 committed by GitHub
parent 67a504a2f3
commit 0e809d4800
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 341 additions and 67 deletions

View File

@ -25,6 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
|enumPropertyNamingReplaceSpecialChar|Set to true to replace '-' and '+' symbols with 'minus_' and 'plus_' in enum of type string| |false|
|enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|
|fileNaming|Naming convention for the output files: 'PascalCase', 'camelCase', 'kebab-case'.| |PascalCase|
|importFileExtension|File extension to use with relative imports. Set it to '.js' or '.mjs' when using [ESM](https://nodejs.org/api/esm.html).| ||
|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
|modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|

View File

@ -26,7 +26,6 @@ import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.servers.Server;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import java.util.stream.Collectors;
import org.openapitools.codegen.*;
import org.openapitools.codegen.meta.features.DocumentationFeature;
import org.openapitools.codegen.meta.features.SecurityFeature;
@ -38,6 +37,10 @@ import org.openapitools.codegen.utils.ModelUtils;
import java.io.File;
import java.util.*;
import java.util.stream.Collectors;
import static org.openapitools.codegen.utils.CamelizeOption.LOWERCASE_FIRST_LETTER;
import static org.openapitools.codegen.utils.StringUtils.*;
public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodegen {
public static final String NPM_REPOSITORY = "npmRepository";
@ -49,6 +52,10 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
public static final String STRING_ENUMS_DESC = "Generate string enums instead of objects for enum values.";
public static final String IMPORT_FILE_EXTENSION_SWITCH = "importFileExtension";
public static final String IMPORT_FILE_EXTENSION_SWITCH_DESC = "File extension to use with relative imports. Set it to '.js' or '.mjs' when using [ESM](https://nodejs.org/api/esm.html).";
public static final String FILE_NAMING = "fileNaming";
public static final String KEBAB_CASE = "kebab-case";
public static final String CAMEL_CASE = "camelCase";
public static final String PASCAL_CASE = "PascalCase";
protected String npmRepository = null;
protected String importFileExtension = "";
@ -58,6 +65,7 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
protected boolean addedModelIndex = false;
protected boolean withoutRuntimeChecks = false;
protected boolean stringEnums = false;
protected String fileNaming = PASCAL_CASE;
// "Saga and Record" mode.
public static final String SAGAS_AND_RECORDS = "sagasAndRecords";
@ -105,6 +113,33 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
this.cliOptions.add(new CliOption(SAGAS_AND_RECORDS, "Setting this property to true will generate additional files for use with redux-saga and immutablejs.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString()));
this.cliOptions.add(new CliOption(STRING_ENUMS, STRING_ENUMS_DESC, SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString()));
this.cliOptions.add(new CliOption(IMPORT_FILE_EXTENSION_SWITCH, IMPORT_FILE_EXTENSION_SWITCH_DESC).defaultValue(""));
this.cliOptions.add(new CliOption(FILE_NAMING, "Naming convention for the output files: 'PascalCase', 'camelCase', 'kebab-case'.").defaultValue(this.fileNaming));
}
@Override
public String toApiFilename(String name) {
return convertUsingFileNamingConvention(super.toApiFilename(name));
}
@Override
public String toModelFilename(String name) {
return convertUsingFileNamingConvention(super.toModelFilename(name));
}
/**
* Converts the original name according to the current <code>fileNaming</code> strategy.
*
* @param originalName the original name to transform
* @return the transformed name
*/
private String convertUsingFileNamingConvention(String originalName) {
String name = originalName;
if (KEBAB_CASE.equals(fileNaming)) {
name = dashize(underscore(name));
} else if (CAMEL_CASE.equals(fileNaming)) {
name = camelize(name, LOWERCASE_FIRST_LETTER);
}
return name;
}
@Override
@ -148,6 +183,20 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
this.stringEnums = stringEnums;
}
/**
* Set the file naming type.
*
* @param fileNaming the file naming to use
*/
public void setFileNaming(String fileNaming) {
if (PASCAL_CASE.equals(fileNaming) || CAMEL_CASE.equals(fileNaming) || KEBAB_CASE.equals(fileNaming)) {
this.fileNaming = fileNaming;
} else {
throw new IllegalArgumentException("Invalid file naming '" +
fileNaming + "'. Must be 'PascalCase', 'camelCase' or 'kebab-case'");
}
}
public Boolean getSagasAndRecords() {
return sagasAndRecords;
}
@ -250,6 +299,10 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
this.setStringEnums(convertPropertyToBoolean(STRING_ENUMS));
}
if (additionalProperties.containsKey(FILE_NAMING)) {
this.setFileNaming(additionalProperties.get(FILE_NAMING).toString());
}
if (!withoutRuntimeChecks) {
this.modelTemplateFiles.put("models.mustache", ".ts");
typeMapping.put("date", "Date");
@ -367,7 +420,7 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
for (ModelMap model : entry.getModels()) {
ExtendedCodegenModel codegenModel = (ExtendedCodegenModel) model.getModel();
model.put("hasImports", codegenModel.imports.size() > 0);
model.put("tsImports", toTsImports(codegenModel, parseImports(codegenModel)));
allModels.add(codegenModel);
if (codegenModel.isEntity) {
entityModelClassnames.add(codegenModel.classname);
@ -401,6 +454,38 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
return result;
}
/**
* Parse imports
*/
private Set<String> parseImports(CodegenModel cm) {
Set<String> newImports = new HashSet<>();
if (cm.imports.size() > 0) {
for (String name : cm.imports) {
if (name.indexOf(" | ") >= 0) {
String[] parts = name.split(" \\| ");
Collections.addAll(newImports, parts);
} else {
newImports.add(name);
}
}
}
return newImports;
}
private List<Map<String, String>> toTsImports(CodegenModel cm, Set<String> imports) {
List<Map<String, String>> tsImports = new ArrayList<>();
for (String im : imports) {
if (!im.equals(cm.classname)) {
HashMap<String, String> tsImport = new HashMap<>();
// TVG: This is used as class name in the import statements of the model file
tsImport.put("classname", im);
tsImport.put("filename", toModelFilename(im));
tsImports.add(tsImport);
}
}
return tsImports;
}
private void autoSetDefaultValueForProperty(ExtendedCodegenProperty var) {
if (var.isArray || var.isModel) {
var.defaultValue = var.dataTypeAlternate + "()";

View File

@ -1,13 +1,13 @@
import { mapValues } from '../runtime{{importFileExtension}}';
{{#hasImports}}
{{#imports}}
import type { {{{.}}} } from './{{.}}{{importFileExtension}}';
{{#tsImports}}
import type { {{{classname}}} } from './{{filename}}{{importFileExtension}}';
import {
{{.}}FromJSON,
{{.}}FromJSONTyped,
{{.}}ToJSON,
} from './{{.}}{{importFileExtension}}';
{{/imports}}
{{classname}}FromJSON,
{{classname}}FromJSONTyped,
{{classname}}ToJSON,
} from './{{filename}}{{importFileExtension}}';
{{/tsImports}}
{{/hasImports}}
{{#discriminator}}

View File

@ -24,6 +24,9 @@ import org.openapitools.codegen.languages.AbstractTypeScriptClientCodegen;
import java.util.Map;
import static org.openapitools.codegen.languages.TypeScriptFetchClientCodegen.CAMEL_CASE;
import static org.openapitools.codegen.languages.TypeScriptFetchClientCodegen.PASCAL_CASE;
public class TypeScriptFetchClientOptionsProvider implements OptionsProvider {
public static final String SORT_PARAMS_VALUE = "false";
public static final String SORT_MODEL_PROPERTIES_VALUE = "false";
@ -32,9 +35,9 @@ public class TypeScriptFetchClientOptionsProvider implements OptionsProvider {
public static final String IMPORT_FILE_EXTENSION_VALUE = "";
public static final Boolean NULL_SAFE_ADDITIONAL_PROPS_VALUE = false;
public static final String ENUM_NAME_SUFFIX = "Enum";
public static final String MODEL_PROPERTY_NAMING_VALUE = "camelCase";
public static final String PARAM_NAMING_VALUE = "camelCase";
public static final String ENUM_PROPERTY_NAMING_VALUE = "PascalCase";
public static final String MODEL_PROPERTY_NAMING_VALUE = CAMEL_CASE;
public static final String PARAM_NAMING_VALUE = CAMEL_CASE;
public static final String ENUM_PROPERTY_NAMING_VALUE = PASCAL_CASE;
private static final String NMP_NAME = "npmName";
private static final String NMP_VERSION = "1.0.0";
private static final String NPM_REPOSITORY = "https://registry.npmjs.org";
@ -44,6 +47,7 @@ public class TypeScriptFetchClientOptionsProvider implements OptionsProvider {
public static final String SAGAS_AND_RECORDS = "false";
public static final String ENUM_UNKNOWN_DEFAULT_CASE_VALUE = "false";
public static final String STRING_ENUMS = "false";
public static final String FILE_NAMING_VALUE = PASCAL_CASE;
public static final String ENUM_PROPERTY_NAMING_REPLACE_SPECIAL_CHAR_VALUE = "false";
@Override
@ -74,6 +78,7 @@ public class TypeScriptFetchClientOptionsProvider implements OptionsProvider {
.put(TypeScriptFetchClientCodegen.WITHOUT_RUNTIME_CHECKS, WITHOUT_RUNTIME_CHECKS)
.put(TypeScriptFetchClientCodegen.SAGAS_AND_RECORDS, SAGAS_AND_RECORDS)
.put(TypeScriptFetchClientCodegen.IMPORT_FILE_EXTENSION_SWITCH, IMPORT_FILE_EXTENSION_VALUE)
.put(TypeScriptFetchClientCodegen.FILE_NAMING, FILE_NAMING_VALUE)
.put(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, ALLOW_UNICODE_IDENTIFIERS_VALUE)
.put(CodegenConstants.PREPEND_FORM_OR_BODY_PARAMETERS, PREPEND_FORM_OR_BODY_PARAMETERS_VALUE)
.put(CodegenConstants.LEGACY_DISCRIMINATOR_BEHAVIOR, "true")

View File

@ -6,6 +6,8 @@ import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.MapSchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.*;
import org.openapitools.codegen.config.CodegenConfigurator;
import org.openapitools.codegen.ClientOptInput;
import org.openapitools.codegen.CodegenConstants;
@ -24,11 +26,11 @@ import org.testng.annotations.Test;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
@Test(groups = {TypeScriptGroups.TYPESCRIPT, TypeScriptGroups.TYPESCRIPT_FETCH})
@ -221,4 +223,99 @@ public class TypeScriptFetchClientCodegenTest {
assertThat(codegen.supportingFiles()).contains(new SupportingFile("tsconfig.mustache", "", "tsconfig.json"));
assertThat(codegen.supportingFiles()).doesNotContain(new SupportingFile("tsconfig.esm.mustache", "", "tsconfig.esm.json"));
}
@Test(description = "Verify file name formatting from model name in PascalCase")
public void testModelFileNameInPascalCase() {
final TypeScriptFetchClientCodegen codegen = new TypeScriptFetchClientCodegen();
codegen.setFileNaming(TypeScriptFetchClientCodegen.PASCAL_CASE);
Assert.assertEquals("FirstSimpleModel", codegen.toModelFilename("FirstSimpleModel"));
codegen.setModelNameSuffix("suffix");
Assert.assertEquals("FirstSimpleModelSuffix", codegen.toModelFilename("FirstSimpleModel"));
codegen.setModelNamePrefix("prefix");
Assert.assertEquals("PrefixFirstSimpleModelSuffix", codegen.toModelFilename("FirstSimpleModel"));
}
@Test(description = "Verify file name formatting from model name in camelCase")
public void testModelFileNameInCamelCase() {
final TypeScriptFetchClientCodegen codegen = new TypeScriptFetchClientCodegen();
codegen.setFileNaming(TypeScriptFetchClientCodegen.CAMEL_CASE);
Assert.assertEquals("firstSimpleModel", codegen.toModelFilename("FirstSimpleModel"));
codegen.setModelNameSuffix("suffix");
Assert.assertEquals("firstSimpleModelSuffix", codegen.toModelFilename("FirstSimpleModel"));
codegen.setModelNamePrefix("prefix");
Assert.assertEquals("prefixFirstSimpleModelSuffix", codegen.toModelFilename("FirstSimpleModel"));
}
@Test(description = "Verify file name formatting from model name in kebab-case")
public void testModelFileNameInKebabCase() {
final TypeScriptFetchClientCodegen codegen = new TypeScriptFetchClientCodegen();
codegen.setFileNaming("kebab-case");
Assert.assertEquals("first-simple-model", codegen.toModelFilename("FirstSimpleModel"));
codegen.setModelNameSuffix("suffix");
Assert.assertEquals("first-simple-model-suffix", codegen.toModelFilename("FirstSimpleModel"));
codegen.setModelNamePrefix("prefix");
Assert.assertEquals("prefix-first-simple-model-suffix", codegen.toModelFilename("FirstSimpleModel"));
}
@Test(description = "Verify file name formatting from api name in PascalCase, camelCase and kebab-case")
public void testApiFileNameInVariousFormat() {
final TypeScriptFetchClientCodegen codegen = new TypeScriptFetchClientCodegen();
codegen.setFileNaming(TypeScriptFetchClientCodegen.PASCAL_CASE);
String prefix = codegen.getApiNamePrefix() != null ? codegen.getApiNamePrefix() : "";
String suffix = codegen.getApiNameSuffix() != null ? codegen.getApiNameSuffix() : "";
Assert.assertEquals(StringUtils.capitalize(prefix + "FirstSimpleController") + StringUtils.capitalize(suffix),
codegen.toApiFilename("FirstSimpleController"));
codegen.setFileNaming(TypeScriptFetchClientCodegen.CAMEL_CASE);
Assert.assertEquals(StringUtils.uncapitalize(prefix + "FirstSimpleController") + StringUtils.capitalize(suffix),
codegen.toApiFilename("FirstSimpleController"));
codegen.setFileNaming(TypeScriptFetchClientCodegen.KEBAB_CASE);
Assert.assertEquals((prefix.isBlank() ? "" : (StringUtils.lowerCase(suffix) + "-")) + "first-simple-controller" + (suffix.isBlank() ? "" : ("-" + StringUtils.lowerCase(suffix))),
codegen.toApiFilename("FirstSimpleController"));
}
@Test(description = "Verify names of files generated in kebab-case and imports")
public void testGeneratedFilenamesInKebabCase() throws IOException {
Map<String, Object> properties = new HashMap<>();
properties.put("fileNaming", TypeScriptFetchClientCodegen.KEBAB_CASE);
File output = generate(properties);
Path pet = Paths.get(output + "/models/pet.ts");
TestUtils.assertFileExists(pet);
TestUtils.assertFileContains(pet, "} from './pet-category';");
TestUtils.assertFileExists(Paths.get(output + "/models/pet-category.ts"));
TestUtils.assertFileExists(Paths.get(output + "/apis/pet-controller-api.ts"));
}
@Test(description = "Verify names of files generated in camelCase and imports")
public void testGeneratedFilenamesInCamelCase() throws IOException {
Map<String, Object> properties = new HashMap<>();
properties.put("fileNaming", TypeScriptFetchClientCodegen.CAMEL_CASE);
File output = generate(properties);
Path pet = Paths.get(output + "/models/pet.ts");
TestUtils.assertFileExists(pet);
TestUtils.assertFileContains(pet, "} from './petCategory';");
TestUtils.assertFileExists(Paths.get(output + "/models/petCategory.ts"));
TestUtils.assertFileExists(Paths.get(output + "/apis/petControllerApi.ts"));
}
private static File generate(Map<String, Object> properties) throws IOException {
File output = Files.createTempDirectory("test").toFile();
output.deleteOnExit();
final CodegenConfigurator configurator = new CodegenConfigurator()
.setGeneratorName("typescript-fetch")
.setInputSpec("src/test/resources/3_0/typescript-fetch/example-for-file-naming-option.yaml")
.setAdditionalProperties(properties)
.setOutputDir(output.getAbsolutePath().replace("\\", "/"));
Generator generator = new DefaultGenerator();
List<File> files = generator.opts(configurator.toClientOptInput()).generate();
files.forEach(File::deleteOnExit);
return output;
}
}

View File

@ -22,6 +22,7 @@ import org.openapitools.codegen.CodegenConfig;
import org.openapitools.codegen.languages.TypeScriptFetchClientCodegen;
import org.openapitools.codegen.options.TypeScriptFetchClientOptionsProvider;
import org.openapitools.codegen.typescript.TypeScriptGroups;
import org.testng.Assert;
import org.testng.annotations.Test;
import static org.mockito.Mockito.mock;
@ -53,5 +54,21 @@ public class TypeScriptFetchClientOptionsTest extends AbstractOptionsTest {
verify(clientCodegen).setSagasAndRecords(Boolean.valueOf(TypeScriptFetchClientOptionsProvider.SAGAS_AND_RECORDS));
verify(clientCodegen).setEnumUnknownDefaultCase(Boolean.parseBoolean(TypeScriptFetchClientOptionsProvider.ENUM_UNKNOWN_DEFAULT_CASE_VALUE));
verify(clientCodegen).setStringEnums(Boolean.parseBoolean(TypeScriptFetchClientOptionsProvider.STRING_ENUMS));
verify(clientCodegen).setFileNaming(TypeScriptFetchClientOptionsProvider.FILE_NAMING_VALUE);
}
@Test(description = "Verify if an exception is thrown when invalid values are used with fileNaming option")
public void testFileNamingInvalidValues() {
final TypeScriptFetchClientCodegen codegen = new TypeScriptFetchClientCodegen();
Assert.assertThrows(IllegalArgumentException.class, () ->
codegen.setFileNaming(null)
);
Assert.assertThrows(IllegalArgumentException.class, () ->
codegen.setFileNaming("")
);
Assert.assertThrows(IllegalArgumentException.class, () ->
codegen.setFileNaming("invalid-format")
);
}
}

View File

@ -21,6 +21,7 @@ import com.google.common.collect.Sets;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
@ -35,12 +36,7 @@ import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.*;
/*
import static io.swagger.codegen.CodegenConstants.IS_ENUM_EXT_NAME;
@ -480,4 +476,5 @@ public class TypeScriptFetchModelTest {
final Map<String, Schema> schemaBefore = openAPI.getComponents().getSchemas();
Assert.assertEquals(schemaBefore.keySet(), Sets.newHashSet("club", "owner"));
}
}

View File

@ -0,0 +1,72 @@
openapi: 3.0.0
info:
version: 1.0.0
title: Example for fileNaming option
paths:
/pet:
get:
tags:
- pet-controller
summary: Get a pet
description: ''
operationId: addPet
responses:
'200':
description: successful operation
content:
application/xml:
schema:
$ref: '#/components/schemas/Pet'
application/json:
schema:
$ref: '#/components/schemas/Pet'
'405':
description: Invalid input
components:
schemas:
PetCategory:
title: Pet category
description: A category for a pet
type: object
properties:
id:
type: integer
format: int64
name:
type: string
pattern: '^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$'
xml:
name: Category
Pet:
title: a Pet
description: A pet for sale in the pet store
type: object
required:
- name
- photoUrls
properties:
id:
type: integer
format: int64
category:
$ref: '#/components/schemas/PetCategory'
name:
type: string
example: doggie
photoUrls:
type: array
xml:
name: photoUrl
wrapped: true
items:
type: string
status:
type: string
description: pet status in the store
deprecated: true
enum:
- available
- pending
- sold
xml:
name: Pet

View File

@ -19,24 +19,24 @@ import {
OuterEnumFromJSONTyped,
OuterEnumToJSON,
} from './OuterEnum';
import type { OuterEnumDefaultValue } from './OuterEnumDefaultValue';
import {
OuterEnumDefaultValueFromJSON,
OuterEnumDefaultValueFromJSONTyped,
OuterEnumDefaultValueToJSON,
} from './OuterEnumDefaultValue';
import type { OuterEnumInteger } from './OuterEnumInteger';
import {
OuterEnumIntegerFromJSON,
OuterEnumIntegerFromJSONTyped,
OuterEnumIntegerToJSON,
} from './OuterEnumInteger';
import type { OuterEnumIntegerDefaultValue } from './OuterEnumIntegerDefaultValue';
import {
OuterEnumIntegerDefaultValueFromJSON,
OuterEnumIntegerDefaultValueFromJSONTyped,
OuterEnumIntegerDefaultValueToJSON,
} from './OuterEnumIntegerDefaultValue';
import type { OuterEnumInteger } from './OuterEnumInteger';
import {
OuterEnumIntegerFromJSON,
OuterEnumIntegerFromJSONTyped,
OuterEnumIntegerToJSON,
} from './OuterEnumInteger';
import type { OuterEnumDefaultValue } from './OuterEnumDefaultValue';
import {
OuterEnumDefaultValueFromJSON,
OuterEnumDefaultValueFromJSONTyped,
OuterEnumDefaultValueToJSON,
} from './OuterEnumDefaultValue';
/**
*

View File

@ -13,18 +13,18 @@
*/
import { mapValues } from '../runtime';
import type { Pet } from './Pet';
import {
PetFromJSON,
PetFromJSONTyped,
PetToJSON,
} from './Pet';
import type { ResponseMeta } from './ResponseMeta';
import {
ResponseMetaFromJSON,
ResponseMetaFromJSONTyped,
ResponseMetaToJSON,
} from './ResponseMeta';
import type { Pet } from './Pet';
import {
PetFromJSON,
PetFromJSONTyped,
PetToJSON,
} from './Pet';
/**
*

View File

@ -13,18 +13,18 @@
*/
import { mapValues } from '../runtime';
import type { ResponseMeta } from './ResponseMeta';
import {
ResponseMetaFromJSON,
ResponseMetaFromJSONTyped,
ResponseMetaToJSON,
} from './ResponseMeta';
import type { User } from './User';
import {
UserFromJSON,
UserFromJSONTyped,
UserToJSON,
} from './User';
import type { ResponseMeta } from './ResponseMeta';
import {
ResponseMetaFromJSON,
ResponseMetaFromJSONTyped,
ResponseMetaToJSON,
} from './ResponseMeta';
/**
*

View File

@ -13,18 +13,18 @@
*/
import { mapValues } from '../runtime';
import type { MatchingParts } from './MatchingParts';
import {
MatchingPartsFromJSON,
MatchingPartsFromJSONTyped,
MatchingPartsToJSON,
} from './MatchingParts';
import type { ResponseMeta } from './ResponseMeta';
import {
ResponseMetaFromJSON,
ResponseMetaFromJSONTyped,
ResponseMetaToJSON,
} from './ResponseMeta';
import type { MatchingParts } from './MatchingParts';
import {
MatchingPartsFromJSON,
MatchingPartsFromJSONTyped,
MatchingPartsToJSON,
} from './MatchingParts';
/**
*

View File

@ -13,18 +13,18 @@
*/
import { mapValues } from '../runtime';
import type { PetPartType } from './PetPartType';
import {
PetPartTypeFromJSON,
PetPartTypeFromJSONTyped,
PetPartTypeToJSON,
} from './PetPartType';
import type { ResponseMeta } from './ResponseMeta';
import {
ResponseMetaFromJSON,
ResponseMetaFromJSONTyped,
ResponseMetaToJSON,
} from './ResponseMeta';
import type { PetPartType } from './PetPartType';
import {
PetPartTypeFromJSON,
PetPartTypeFromJSONTyped,
PetPartTypeToJSON,
} from './PetPartType';
/**
*

View File

@ -19,24 +19,24 @@ import {
OuterEnumFromJSONTyped,
OuterEnumToJSON,
} from './OuterEnum';
import type { OuterEnumDefaultValue } from './OuterEnumDefaultValue';
import {
OuterEnumDefaultValueFromJSON,
OuterEnumDefaultValueFromJSONTyped,
OuterEnumDefaultValueToJSON,
} from './OuterEnumDefaultValue';
import type { OuterEnumInteger } from './OuterEnumInteger';
import {
OuterEnumIntegerFromJSON,
OuterEnumIntegerFromJSONTyped,
OuterEnumIntegerToJSON,
} from './OuterEnumInteger';
import type { OuterEnumIntegerDefaultValue } from './OuterEnumIntegerDefaultValue';
import {
OuterEnumIntegerDefaultValueFromJSON,
OuterEnumIntegerDefaultValueFromJSONTyped,
OuterEnumIntegerDefaultValueToJSON,
} from './OuterEnumIntegerDefaultValue';
import type { OuterEnumInteger } from './OuterEnumInteger';
import {
OuterEnumIntegerFromJSON,
OuterEnumIntegerFromJSONTyped,
OuterEnumIntegerToJSON,
} from './OuterEnumInteger';
import type { OuterEnumDefaultValue } from './OuterEnumDefaultValue';
import {
OuterEnumDefaultValueFromJSON,
OuterEnumDefaultValueFromJSONTyped,
OuterEnumDefaultValueToJSON,
} from './OuterEnumDefaultValue';
/**
*