refactor: simplify discriminators directory structure

nodkz · nodkz · commit bdee04ab5555 · 2018-07-17T12:43:16.000+06:00
diff --git a/src/__tests__/composeWithMongooseDiscriminators-test.js b/src/__tests__/composeWithMongooseDiscriminators-test.js
@@ -1,8 +1,8 @@
 /* @flow */
 
 import { InputTypeComposer, schemaComposer, TypeComposer } from 'graphql-compose';
-import { getCharacterModels } from '../__mocks__/characterModels';
-import { MovieModel } from '../__mocks__/movieModel';
+import { getCharacterModels } from '../discriminators/__mocks__/characterModels';
+import { MovieModel } from '../discriminators/__mocks__/movieModel';
 import { composeWithMongooseDiscriminators } from '../composeWithMongooseDiscriminators';
 import { DiscriminatorTypeComposer } from '../discriminators';
 
diff --git a/src/__tests__/integration-discriminators-test.js b/src/__tests__/integration-discriminators-test.js
@@ -2,7 +2,7 @@
 
 import { graphql, schemaComposer } from 'graphql-compose/lib/index';
 import { mongoose } from '../__mocks__/mongooseCommon';
-import { getCharacterModels } from '../__mocks__/characterModels';
+import { getCharacterModels } from '../discriminators/__mocks__/characterModels';
 import { composeWithMongooseDiscriminators } from '../composeWithMongooseDiscriminators';
 
 const { CharacterModel, PersonModel, DroidModel } = getCharacterModels('type');
diff --git a/src/discriminators/DiscriminatorTypeComposer.js b/src/discriminators/DiscriminatorTypeComposer.js
@@ -15,9 +15,9 @@ import type { ComposePartialFieldConfigAsObject } from 'graphql-compose/lib/Type
 import type { Model } from 'mongoose';
 import { composeWithMongoose, type TypeConverterOpts } from '../composeWithMongoose';
 import { composeChildTC } from './composeChildTC';
-import { mergeCustomizationOptions } from './merge-customization-options';
-import { prepareBaseResolvers } from './prepare-resolvers/prepareBaseResolvers';
-import { reorderFields } from './utils';
+import { mergeCustomizationOptions } from './utils/mergeCustomizationOptions';
+import { prepareBaseResolvers } from './prepareBaseResolvers';
+import { reorderFields } from './utils/reorderFields';
 
 export type DiscriminatorOptions = {
   reorderFields?: boolean | string[], // true order: _id, DKey, DInterfaceFields, DiscriminatorFields
diff --git a/src/discriminators/__mocks__/characterModels.js b/src/discriminators/__mocks__/characterModels.js
@@ -1,6 +1,6 @@
 /* @flow */
 
-import { mongoose, Schema, Types } from './mongooseCommon';
+import { mongoose, Schema, Types } from '../../__mocks__/mongooseCommon';
 import { DroidSchema } from './droidSchema';
 import { PersonSchema } from './personSchema';
 
diff --git a/src/discriminators/__mocks__/droidSchema.js b/src/discriminators/__mocks__/droidSchema.js
@@ -1,6 +1,6 @@
 /* @flow */
 
-import { Schema } from './mongooseCommon';
+import { Schema } from '../../__mocks__/mongooseCommon';
 
 export const DroidSchema = new Schema({
   makeDate: Date,
diff --git a/src/discriminators/__mocks__/movieModel.js b/src/discriminators/__mocks__/movieModel.js
@@ -1,6 +1,6 @@
 /* @flow */
 
-import { mongoose, Schema } from './mongooseCommon';
+import { mongoose, Schema } from '../../__mocks__/mongooseCommon';
 
 const MovieSchema = new Schema({
   _id: String,
diff --git a/src/discriminators/__mocks__/personSchema.js b/src/discriminators/__mocks__/personSchema.js
@@ -1,6 +1,6 @@
 /* @flow */
 
-import { Schema } from './mongooseCommon';
+import { Schema } from '../../__mocks__/mongooseCommon';
 
 export const PersonSchema = new Schema({
   dob: Number,
diff --git a/src/discriminators/__tests__/DiscriminatorTypeComposer-test.js b/src/discriminators/__tests__/DiscriminatorTypeComposer-test.js
@@ -1,8 +1,8 @@
 /* @flow */
 
 import { schemaComposer, graphql, TypeComposer, InterfaceTypeComposer } from 'graphql-compose';
-import { getCharacterModels } from '../../__mocks__/characterModels';
-import { MovieModel } from '../../__mocks__/movieModel';
+import { getCharacterModels } from '../__mocks__/characterModels';
+import { MovieModel } from '../__mocks__/movieModel';
 import { composeWithMongoose } from '../../composeWithMongoose';
 import { composeWithMongooseDiscriminators } from '../../composeWithMongooseDiscriminators';
 
diff --git a/src/discriminators/__tests__/composeChildTC-test.js b/src/discriminators/__tests__/composeChildTC-test.js
@@ -1,7 +1,7 @@
 /* @flow */
 
 import { schemaComposer } from 'graphql-compose';
-import { getCharacterModels } from '../../__mocks__/characterModels';
+import { getCharacterModels } from '../__mocks__/characterModels';
 import { composeWithMongooseDiscriminators } from '../../composeWithMongooseDiscriminators';
 
 const { CharacterModel, PersonModel, DroidModel } = getCharacterModels('type');
diff --git a/src/discriminators/__tests__/prepareBaseResolvers-test.js b/src/discriminators/__tests__/prepareBaseResolvers-test.js
@@ -1,14 +1,14 @@
 /* @flow */
 
 import { graphql } from 'graphql-compose';
-import { getCharacterModels } from '../../../__mocks__/characterModels';
-import { composeWithMongooseDiscriminators } from '../../../composeWithMongooseDiscriminators';
+import { getCharacterModels } from '../__mocks__/characterModels';
+import { composeWithMongooseDiscriminators } from '../../composeWithMongooseDiscriminators';
 
 const { CharacterModel } = getCharacterModels('type');
 
 const CharacterDTC = composeWithMongooseDiscriminators(CharacterModel);
 
-describe('recomposeBaseResolvers()', () => {
+describe('prepareBaseResolvers()', () => {
   describe('setDKeyEnumOnITCArgs()', () => {
     const resolversWithFilterAndRecordArgs = [];
     const resolversWithFilterArgsOnly = [];
diff --git a/src/discriminators/composeChildTC.js b/src/discriminators/composeChildTC.js
@@ -2,8 +2,8 @@
 
 import { TypeComposer } from 'graphql-compose';
 import type { DiscriminatorTypeComposer, DiscriminatorOptions } from './DiscriminatorTypeComposer';
-import { prepareChildResolvers } from './prepare-resolvers/prepareChildResolvers';
-import { reorderFields } from './utils';
+import { prepareChildResolvers } from './prepareChildResolvers';
+import { reorderFields } from './utils/reorderFields';
 
 // copy all baseTypeComposer fields to childTC
 // these are the fields before calling discriminator
diff --git a/src/discriminators/index.js b/src/discriminators/index.js
@@ -1,4 +1,4 @@
 /* @flow */
 
 export { DiscriminatorTypeComposer, DiscriminatorOptions } from './DiscriminatorTypeComposer';
-export { mergeCustomizationOptions } from './merge-customization-options';
+export { mergeCustomizationOptions } from './utils/mergeCustomizationOptions';
diff --git a/src/discriminators/prepareBaseResolvers.js b/src/discriminators/prepareBaseResolvers.js
@@ -1,8 +1,8 @@
 /* @flow */
 
 import { graphql } from 'graphql-compose';
-import { DiscriminatorTypeComposer } from '../DiscriminatorTypeComposer';
-import { EMCResolvers } from '../../resolvers';
+import { DiscriminatorTypeComposer } from './DiscriminatorTypeComposer';
+import { EMCResolvers } from '../resolvers';
 
 const { GraphQLList, GraphQLNonNull } = graphql;
 
diff --git a/src/discriminators/prepareChildResolvers.js b/src/discriminators/prepareChildResolvers.js
@@ -2,8 +2,8 @@
 
 import type { ResolveParams } from 'graphql-compose';
 import { ResolverClass, TypeComposerClass } from 'graphql-compose';
-import { type DiscriminatorOptions, DiscriminatorTypeComposer } from '../DiscriminatorTypeComposer';
-import { EMCResolvers } from '../../resolvers';
+import { type DiscriminatorOptions, DiscriminatorTypeComposer } from './DiscriminatorTypeComposer';
+import { EMCResolvers } from '../resolvers';
 
 // set the DKey as a query on filter, also project it
 // Also look at it like setting for filters, makes sure to limit
diff --git a/src/discriminators/utils/__test__/mergeCustomizationOptions-test.js b/src/discriminators/utils/__test__/mergeCustomizationOptions-test.js
@@ -6,7 +6,7 @@ import {
   mergeCustomizationOptions,
   mergeFieldMaps,
   mergeStringAndStringArraysFields,
-} from '../index';
+} from '../mergeCustomizationOptions';
 
 const baseFields = {
   remove: ['id', 'friends', 'health', 'appearsIn'],
diff --git a/src/discriminators/utils/__test__/mergeTypeConverterResolverOpts-test.js b/src/discriminators/utils/__test__/mergeTypeConverterResolverOpts-test.js
@@ -1,6 +1,6 @@
 /* @flow */
 
-import type { TypeConverterResolversOpts } from '../../../../composeWithMongoose';
+import type { TypeConverterResolversOpts } from '../../../composeWithMongoose';
 import {
   mergeTypeConverterResolverOpts,
   mergePrimitiveTypeFields,
diff --git a/src/discriminators/utils/index.js b/src/discriminators/utils/index.js
diff --git a/src/discriminators/utils/mergeCustomizationOptions.js b/src/discriminators/utils/mergeCustomizationOptions.js
@@ -1,7 +1,7 @@
 /* @flow */
 
 import type { TypeConverterOpts } from '../../composeWithMongoose';
-import { mergeTypeConverterResolverOpts } from './utils/mergeTypeConverterResolversOpts';
+import { mergeTypeConverterResolverOpts } from './mergeTypeConverterResolversOpts';
 
 type FieldMap = {
   [fieldName: string]: string[] | typeof undefined,
diff --git a/src/discriminators/utils/mergeTypeConverterResolversOpts.js b/src/discriminators/utils/mergeTypeConverterResolversOpts.js
@@ -1,8 +1,8 @@
 /* @flow */
 
-import type { TypeConverterResolversOpts } from '../../../composeWithMongoose';
-import { MergeAbleHelperArgsOpts } from '../../../resolvers/helpers';
-import { mergeStringAndStringArraysFields } from '../index';
+import type { TypeConverterResolversOpts } from '../../composeWithMongoose';
+import { MergeAbleHelperArgsOpts } from '../../resolvers/helpers';
+import { mergeStringAndStringArraysFields } from './mergeCustomizationOptions';
 
 type TypeFieldMap = {
   [fieldName: string]: any,
