fix(msw): generate correctly multi files with non specification file

taisei-13046 · Sep 23, 2022 · 968fb99 · 968fb99
1 parent 65fcc68
commit 968fb99
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 42 deletions.
diff --git a/src/core/generators/api.ts b/src/core/generators/api.ts
@@ -1,10 +1,6 @@
 import { PathItemObject } from 'openapi3-ts';
 import { ContextSpecs, NormalizedOutputOptions } from '../../types';
-import {
- GeneratorApiResponse,
- GeneratorSchema,
- GeneratorVerbsOptions,
-} from '../../types/generator';
+import { GeneratorApiResponse, GeneratorSchema } from '../../types/generator';
 import { asyncReduce } from '../../utils/async-reduce';
 import { isReference } from '../../utils/is';
 import { getRoute } from '../getters/route';

diff --git a/src/core/getters/schema.ts b/src/core/getters/schema.ts
diff --git a/src/core/resolvers/value.mock.ts b/src/core/resolvers/value.mock.ts
@@ -1,11 +1,11 @@
+import get from 'lodash.get';
 import { SchemaObject } from 'openapi3-ts';
 import { ContextSpecs, MockOptions } from '../../types';
 import { GeneratorImport } from '../../types/generator';
 import { MockDefinition, MockSchemaObject } from '../../types/mocks';
 import { isReference } from '../../utils/is';
 import { getRefInfo } from '../getters/ref';
 import { getMockScalar } from '../getters/scalar.mock';
-import { getSchema } from '../getters/schema';
 
 const isRegex = (key: string) => key[0] === '/' && key[key.length - 1] === '/';
 
@@ -64,13 +64,16 @@ export const resolveMockValue = ({
  imports: GeneratorImport[];
 }): MockDefinition & { type?: string } => {
  if (isReference(schema)) {
- const { name, specKey = context.specKey } = getRefInfo(
- schema.$ref,
- context,
- );
+ const {
+ name,
+ specKey = context.specKey,
+ refPaths,
+ } = getRefInfo(schema.$ref, context);
+
+ const schemaRef = get(context.specs[specKey], refPaths);
 
  const newSchema = {
- ...getSchema(name, context, specKey),
+ ...schemaRef,
  name,
  path: schema.path,
  isRef: true,