Fix tests and cleanup

ardatan · ardatan · commit d3e3a112edc1 · 2021-07-04T20:00:57.000+03:00
diff --git a/packages/node-require/src/index.ts b/packages/node-require/src/index.ts
@@ -11,8 +11,7 @@ import { isSome } from '@graphql-tools/utils';
 
 const VALID_EXTENSIONS = ['graphql', 'graphqls', 'gql', 'gqls'];
 
-function handleModule(m: NodeModule, filename: string) {
-  console.log(m, filename);
+export function handleModule(m: NodeModule, filename: string) {
   const sources = loadTypedefsSync(filename, {
     loaders: [new GraphQLFileLoader()],
   });
@@ -22,9 +21,9 @@ function handleModule(m: NodeModule, filename: string) {
   m.exports = mergedDoc;
 }
 
-export function registerGraphQLExtensions(require: NodeRequire) {
+export function registerGraphQLExtensions(nodeRequire: NodeRequire) {
   for (const ext of VALID_EXTENSIONS) {
-    require.extensions[`.${ext}`] = handleModule;
+    nodeRequire.extensions[`.${ext}`] = handleModule;
   }
 }
 
diff --git a/packages/node-require/test/node-require.spec.ts b/packages/node-require/test/node-require.spec.ts
@@ -1,12 +1,14 @@
-import '../src';
+import { handleModule } from '../src';
 import { print } from 'graphql';
 import { readFileSync } from 'fs';
+import { join } from 'path';
 
 describe('GraphQL Node Import', () => {
-  it.skip('should import correct definitions', () => {
-    console.log(require.main);
+  it('should import correct definitions', () => {
     const filePath = './fixtures/test.graphql';
-    const typeDefs = require(filePath);
+    const m: any = {};
+    handleModule(m, join(__dirname, filePath));
+    const typeDefs = m.exports;
     expect(print(typeDefs).replace(/\s\s+/g, ' ')).toBe(
       readFileSync(require.resolve(filePath), 'utf8').replace(/\s\s+/g, ' ')
     );
diff --git a/packages/resolvers-composition/yarn.lock b/packages/resolvers-composition/yarn.lock
diff --git a/yarn.lock b/yarn.lock
@@ -2715,7 +2715,7 @@
   dependencies:
     "@types/unist" "*"
 
-"@types/micromatch@latest":
+"@types/micromatch@^4.0.1", "@types/micromatch@latest":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/micromatch/-/micromatch-4.0.1.tgz#9381449dd659fc3823fd2a4190ceacc985083bc7"
   integrity sha1-k4FEndZZ/Dgj/SpBkM6syYUIO8c=

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,7 @@ import { isSome } from '@graphql-tools/utils';`
`11`	`11`
`12`	`12`	`const VALID_EXTENSIONS = ['graphql', 'graphqls', 'gql', 'gqls'];`
`13`	`13`
`14`		`-function handleModule(m: NodeModule, filename: string) {`
`15`		`- console.log(m, filename);`
	`14`	`+export function handleModule(m: NodeModule, filename: string) {`
`16`	`15`	`const sources = loadTypedefsSync(filename, {`
`17`	`16`	`loaders: [new GraphQLFileLoader()],`
`18`	`17`	`});`
`@@ -22,9 +21,9 @@ function handleModule(m: NodeModule, filename: string) {`
`22`	`21`	`m.exports = mergedDoc;`
`23`	`22`	`}`
`24`	`23`
`25`		`-export function registerGraphQLExtensions(require: NodeRequire) {`
	`24`	`+export function registerGraphQLExtensions(nodeRequire: NodeRequire) {`
`26`	`25`	`for (const ext of VALID_EXTENSIONS) {`
`27`		- require.extensions[`.${ext}`] = handleModule;
	`26`	+ nodeRequire.extensions[`.${ext}`] = handleModule;
`28`	`27`	`}`
`29`	`28`	`}`
`30`	`29`