fix(generators): sanitize schema name

src/core/generators/componentDefinition.ts

@@ -9,6 +9,7 @@ import { ContextSpecs } from '../../types';
 import { GeneratorSchema } from '../../types/generator';
 import { pascal } from '../../utils/case';
 import { jsDoc } from '../../utils/doc';
+import { sanitize } from '../../utils/string';
 import { getResReqTypes } from '../getters/resReqTypes';
 
 export const generateComponentDefinition = (
@@ -42,7 +43,13 @@ export const generateComponentDefinition = (
 
  const type = allResponseTypes.map(({ value }) => value).join(' | ');
 
- const modelName = `${pascal(name)}${suffix}`;
+ const modelName = sanitize(`${pascal(name)}${suffix}`, {
+ underscore: '_',
+ whitespace: '_',
+ dash: true,
+ es5keyword: true,
+ es5IdentifierName: true,
+ });
  const doc = jsDoc(response as ResponseObject | RequestBodyObject);
  const model = `${doc}export type ${modelName} = ${type || 'unknown'};\n`;
 

src/core/generators/parameterDefinition.ts

@@ -3,6 +3,7 @@ import { ContextSpecs } from '../../types';
 import { GeneratorSchema } from '../../types/generator';
 import { pascal } from '../../utils/case';
 import { jsDoc } from '../../utils/doc';
+import { sanitize } from '../../utils/string';
 import { resolveObject } from '../resolvers/object';
 import { resolveRef } from '../resolvers/ref';
 
@@ -13,7 +14,13 @@ export const generateParameterDefinition = (
 ): GeneratorSchema[] => {
  return Object.entries(parameters).reduce(
  (acc, [parameterName, parameter]) => {
- const modelName = `${pascal(parameterName)}${suffix}`;
+ const modelName = sanitize(`${pascal(parameterName)}${suffix}`, {
+ underscore: '_',
+ whitespace: '_',
+ dash: true,
+ es5keyword: true,
+ es5IdentifierName: true,
+ });
  const { schema, imports } = resolveRef<ParameterObject>(
  parameter,
  context,

src/core/generators/schemaDefinition.ts

@@ -6,6 +6,7 @@ import { pascal } from '../../utils/case';
 import { jsDoc } from '../../utils/doc';
 import { isReference } from '../../utils/is';
 import { getSpecName } from '../../utils/path';
+import { sanitize } from '../../utils/string';
 import { resolveDiscriminators } from '../getters/discriminators';
 import { getEnum } from '../getters/enum';
 import { resolveValue } from '../resolvers/value';
@@ -29,7 +30,13 @@ export const generateSchemasDefinition = (
 
  const models = Object.entries(transformedSchemas).reduce(
  (acc, [name, schema]) => {
- const schemaName = pascal(name) + suffix;
+ const schemaName = sanitize(`${pascal(name)}${suffix}`, {
+ underscore: '_',
+ whitespace: '_',
+ dash: true,
+ es5keyword: true,
+ es5IdentifierName: true,
+ });
  if (
  (!schema.type || schema.type === 'object') &&
  !schema.allOf &&

src/core/getters/array.ts

@@ -24,7 +24,9 @@ export const getArray = ({
  context,
  });
  return {
- value: `(${resolvedObject.value})[]`,
+ value: resolvedObject.value.includes('|')
+ ? `(${resolvedObject.value})[]`
+ : `${resolvedObject.value}[]`,
  imports: resolvedObject.imports,
  schemas: resolvedObject.schemas,
  isEnum: false,

src/core/getters/queryParams.ts

@@ -3,6 +3,7 @@ import { ContextSpecs } from '../../types';
 import { GeneratorImport, GeneratorSchema } from '../../types/generator';
 import { GetterParameters, GetterQueryParam } from '../../types/getters';
 import { pascal } from '../../utils/case';
+import { sanitize } from '../../utils/string';
 import { resolveValue } from '../resolvers/value';
 import { getEnum } from './enum';
 import { getKey } from './keys';
@@ -26,10 +27,18 @@ const getQueryParamsTypes = (
  content: ContentObject;
  };
 
+ const queryName = sanitize(`${pascal(operationName)}${pascal(name)}`, {
+ underscore: '_',
+ whitespace: '_',
+ dash: true,
+ es5keyword: true,
+ es5IdentifierName: true,
+ });
+
  const { value, imports, isEnum, type, schemas, isRef } = resolveValue({
  schema: (schema || content['application/json'].schema)!,
  context,
- name: pascal(operationName) + pascal(name),
+ name: queryName,
  });
 
  const key = getKey(name);
@@ -45,7 +54,7 @@ const getQueryParamsTypes = (
  }
 
  if (isEnum && !isRef) {
- const enumName = pascal(operationName) + pascal(name);
+ const enumName = queryName;
  const enumValue = getEnum(value, type, enumName);
 
  return {

src/core/resolvers/object.ts

@@ -1,4 +1,4 @@
-import { SchemaObject } from 'openapi3-ts';
+import { ReferenceObject, SchemaObject } from 'openapi3-ts';
 import { ContextSpecs } from '../../types';
 import { ResolverValue } from '../../types/resolvers';
 import { jsDoc } from '../../utils/doc';
@@ -11,7 +11,7 @@ export const resolveObject = ({
  combined = false,
  context,
 }: {
- schema: SchemaObject;
+ schema: SchemaObject | ReferenceObject;
  propName?: string;
  combined?: boolean;
  context: ContextSpecs;

src/core/resolvers/ref.ts

@@ -1,6 +1,7 @@
 import get from 'lodash.get';
 import {
  ParameterObject,
+ ReferenceObject,
  RequestBodyObject,
  ResponseObject,
  SchemaObject,
@@ -14,7 +15,8 @@ type ComponentObject =
  | SchemaObject
  | ResponseObject
  | ParameterObject
- | RequestBodyObject;
+ | RequestBodyObject
+ | ReferenceObject;
 export const resolveRef = <Schema extends ComponentObject = ComponentObject>(
  schema: ComponentObject,
  context: ContextSpecs,
@@ -24,8 +26,12 @@ export const resolveRef = <Schema extends ComponentObject = ComponentObject>(
  imports: GeneratorImport[];
 } => {
  // the schema is refering to another object
- if (schema?.schema?.$ref) {
- const resolvedRef = resolveRef<Schema>(schema?.schema, context, imports);
+ if ((schema as any)?.schema?.$ref) {
+ const resolvedRef = resolveRef<Schema>(
+ (schema as any)?.schema,
+ context,
+ imports,
+ );
  return {
  schema: {
  ...schema,

src/core/resolvers/value.ts

@@ -1,4 +1,4 @@
-import { SchemaObject } from 'openapi3-ts';
+import { ReferenceObject, SchemaObject } from 'openapi3-ts';
 import { ContextSpecs } from '../../types';
 import { ResolverValue } from '../../types/resolvers';
 import { isReference } from '../../utils/is';
@@ -10,7 +10,7 @@ export const resolveValue = ({
  name,
  context,
 }: {
- schema: SchemaObject;
+ schema: SchemaObject | ReferenceObject;
  name?: string;
  context: ContextSpecs;
 }): ResolverValue => {

src/utils/string.ts

@@ -54,6 +54,7 @@ export const sanitize = (
  dot?: string | true;
  dash?: string | true;
  es5keyword?: boolean;
+ es5IdentifierName?: boolean;
  special?: boolean;
  },
 ) => {
@@ -63,6 +64,7 @@ export const sanitize = (
  dot = '',
  dash = '',
  es5keyword = false,
+ es5IdentifierName = false,
  special = false,
  } = options ?? {};
  let newValue = value;
@@ -94,6 +96,16 @@ export const sanitize = (
  newValue = keyword.isKeywordES5(newValue, true) ? `_${newValue}` : newValue;
  }
 
+ if (es5IdentifierName) {
+ if (newValue.match(/^[0-9]/)) {
+ newValue = `N${newValue}`;
+ } else {
+ newValue = keyword.isIdentifierNameES5(newValue)
+ ? newValue
+ : `_${newValue}`;
+ }
+ }
+
  return newValue;
 };