Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move check for graphql string in source files to language plugin #2811

Closed
wants to merge 8 commits into from
Closed

Move check for graphql string in source files to language plugin #2811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
156c02d
Do not force source files to contain the string 'graphql' in order to…
zth Jul 31, 2019
a49d0a9
Reading the entire file is no longer needed to check if it exists as …
zth Jul 31, 2019
71cce81
Add back check for 'graphql' string in source files, but do it in the…
zth Jul 31, 2019
61dd1ab
Expose getFileFilter through language plugin, and allow passing it to…
zth Aug 8, 2019
926cfef
Revert back to old behavior of checking for 'graphql' string in the d…
zth Aug 8, 2019
e904e3d
Merge branch 'master' of github.com:facebook/relay into remove-graphq…
zth Oct 23, 2019
152b8a1
Merge branch 'master' of github.com:facebook/relay into remove-graphq…
zth Feb 12, 2020
08e7f71
Remove accidental new line.
zth Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/relay-compiler/bin/RelayCompilerMain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ function getCodegenRunner(config: Config): CodegenRunner {
const sourceWriterName = outputExtension;
const sourceModuleParser = RelaySourceModuleParser(
languagePlugin.findGraphQLTags,
languagePlugin.getFileFilter,
);
const providedArtifactDirectory = config.artifactDirectory;
const artifactDirectory =
Expand Down
13 changes: 9 additions & 4 deletions packages/relay-compiler/core/RelaySourceModuleParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ import type {FileFilter} from '../codegen/CodegenWatcher';
import type {GraphQLTagFinder} from '../language/RelayLanguagePluginInterface';
import type {DocumentNode} from 'graphql';

export type GetFileFilter = (baseDir: string) => FileFilter;

export type SourceModuleParser = {|
getFileFilter: (baseDir: string) => FileFilter,
getFileFilter: GetFileFilter,
getParser: (baseDir: string) => ASTCache,
parseFile: (baseDir: string, file: File) => ?DocumentNode,
parseFileWithSources: (
Expand All @@ -42,7 +44,10 @@ export type SourceModuleParser = {|

const parseGraphQL = Profiler.instrument(GraphQL.parse, 'GraphQL.parse');

module.exports = (tagFinder: GraphQLTagFinder): SourceModuleParser => {
module.exports = (
tagFinder: GraphQLTagFinder,
getFileFilter?: GetFileFilter,
): SourceModuleParser => {
const memoizedTagFinder = memoizedFind.bind(null, tagFinder);

function parseFile(baseDir: string, file: File): ?DocumentNode {
Expand Down Expand Up @@ -104,7 +109,7 @@ module.exports = (tagFinder: GraphQLTagFinder): SourceModuleParser => {
});
}

function getFileFilter(baseDir: string): FileFilter {
function defaultGetFileFilter(baseDir: string): FileFilter {
return (file: File) => {
const filePath = path.join(baseDir, file.relPath);
let text = '';
Expand All @@ -123,7 +128,7 @@ module.exports = (tagFinder: GraphQLTagFinder): SourceModuleParser => {

return {
getParser,
getFileFilter,
getFileFilter: getFileFilter || defaultGetFileFilter,
parseFile,
parseFileWithSources,
};
Expand Down
2 changes: 2 additions & 0 deletions packages/relay-compiler/language/RelayLanguagePluginInterface.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import type {
} from '../codegen/CodegenRunner';
import type {IRTransform} from '../core/CompilerContext';
import type {GeneratedDefinition, Root, Fragment} from '../core/IR';
import type {GetFileFilter} from '../core/RelaySourceModuleParser';
import type {Schema} from '../core/Schema';
import type {ScalarTypeMapping} from './javascript/RelayFlowTypeTransformers';
import type {GeneratedNode} from 'relay-runtime';
Expand All @@ -46,6 +47,7 @@ export type PluginInterface = {
keepExtraFile?: KeepExtraFileFn,
schemaExtensions?: $ReadOnlyArray<string>,
getModuleName?: (operationName: string) => string,
getFileFilter?: GetFileFilter,
...
};

Expand Down