Add hybrid module test setup for ESM, CommonJS tests #65

Author: ivome

fix-hybrid-module.test.sh

@@ -0,0 +1,11 @@
+cat >dist/test/cjs/package.json <<!EOF
+{
+    "type": "commonjs"
+}
+!EOF
+
+cat >dist/test/esm/package.json <<!EOF
+{
+    "type": "module"
+}
+!EOF

package.json

@@ -12,8 +12,11 @@
     "build": "npm run build:esm && npm run build:cjs && ./fix-hybrid-module.sh",
     "build:esm": "tsc -p ./tsconfig.esm.json",
     "build:cjs": "tsc -p ./tsconfig.cjs.json",
-    "test": "npm run lint && npm run testonly",
-    "testonly": "mocha --check-leaks --exit --full-trace --require ts-node/register/transpile-only 'src/**/__tests__/**/*-test.{ts,tsx}'",
+    "build:test:cjs": "tsc -p ./tsconfig.test.cjs.json && ./fix-hybrid-module.test.sh",
+    "build:test:esm": "tsc -p ./tsconfig.test.esm.json && ./fix-hybrid-module.test.sh",
+    "test": "npm run lint && npm run build:test:cjs && npm run testonly:cjs && npm run build:test:esm && npm run testonly:esm",
+    "testonly:cjs": "mocha --check-leaks --exit --full-trace 'dist/test/cjs/**/__tests__/**/*-test.js'",
+    "testonly:esm": "mocha --check-leaks --exit --full-trace 'dist/test/esm/**/__tests__/**/*-test.js'",
     "dist": "npm run clean && npm run build",
     "prepare": "npm run clean && npm run dist"
   },
@@ -61,7 +64,6 @@
     "mocha": "^9.1.3",
     "prettier": "^2.4.1",
     "rimraf": "^3.0.2",
-    "ts-node": "^10.3.0",
     "typescript": "^4.4.4"
   }
 }

src/QueryComplexity.ts

@@ -8,7 +8,7 @@ import {
   getArgumentValues,
   getDirectiveValues,
   getVariableValues,
-} from 'graphql/execution/values';
+} from 'graphql/execution/values.js';
 
 import {
   ValidationContext,

src/__tests__/QueryComplexity-test.ts

@@ -13,19 +13,19 @@ import {
 
 import { expect } from 'chai';
 
-import schema from './fixtures/schema';
+import schema from './fixtures/schema.js';
 
 import ComplexityVisitor, {
   getComplexity,
   ComplexityEstimator,
-} from '../QueryComplexity';
+} from '../QueryComplexity.js';
 import defaultExport, {
   createComplexityRule,
   simpleEstimator,
   directiveEstimator,
   fieldExtensionsEstimator,
-} from '../index';
-import { CompatibleValidationContext } from './fixtures/CompatibleValidationContext';
+} from '../index.js';
+import { CompatibleValidationContext } from './fixtures/CompatibleValidationContext.js';
 
 describe('QueryComplexity analysis', () => {
   const typeInfo = new TypeInfo(schema);

src/__tests__/fixtures/CompatibleValidationContext.ts

@@ -1,6 +1,10 @@
-import { GraphQLError, TypeInfo, ValidationContext } from 'graphql';
-import { GraphQLSchema } from 'graphql/type/schema';
-import { DocumentNode } from 'graphql/language/ast';
+import {
+  GraphQLError,
+  TypeInfo,
+  ValidationContext,
+  GraphQLSchema,
+  DocumentNode,
+} from 'graphql';
 
 /**
  * This class is used to test that validation errors are raised correctly

src/__tests__/fixtures/schema.ts

@@ -14,7 +14,7 @@ import {
   GraphQLInterfaceType,
 } from 'graphql';
 
-import { ComplexityEstimatorArgs } from '../../QueryComplexity';
+import { ComplexityEstimatorArgs } from '../../QueryComplexity.js';
 
 const Item: GraphQLObjectType = new GraphQLObjectType({
   name: 'Item',

src/estimators/directive/__tests__/directiveEstimator-test.ts

@@ -15,11 +15,11 @@ import {
 
 import { expect } from 'chai';
 
-import schema from './fixtures/schema';
+import schema from './fixtures/schema.js';
 
-import ComplexityVisitor from '../../../QueryComplexity';
-import directiveEstimator, { createComplexityDirective } from '../index';
-import { CompatibleValidationContext } from '../../../__tests__/fixtures/CompatibleValidationContext';
+import ComplexityVisitor from '../../../QueryComplexity.js';
+import directiveEstimator, { createComplexityDirective } from '../index.js';
+import { CompatibleValidationContext } from '../../../__tests__/fixtures/CompatibleValidationContext.js';
 
 describe('directiveEstimator analysis', () => {
   const typeInfo = new TypeInfo(schema);

src/estimators/directive/index.ts

@@ -1,16 +1,16 @@
 import {
   ComplexityEstimator,
   ComplexityEstimatorArgs,
-} from '../../QueryComplexity';
+} from '../../QueryComplexity.js';
 import {
   getDirectiveValues,
   GraphQLInt,
   GraphQLList,
   GraphQLNonNull,
   GraphQLString,
+  GraphQLDirective,
+  DirectiveLocation,
 } from 'graphql';
-import { GraphQLDirective } from 'graphql/type/directives';
-import { DirectiveLocation } from 'graphql/language/directiveLocation';
 import get from 'lodash.get';
 
 export type ComplexityDirectiveOptions = {

src/estimators/fieldExtensions/__tests__/fieldExtensionsEstimator-test.ts

@@ -6,12 +6,12 @@ import { parse, TypeInfo, visit, visitWithTypeInfo } from 'graphql';
 
 import { expect } from 'chai';
 
-import schema from './fixtures/schema';
+import schema from './fixtures/schema.js';
 
-import ComplexityVisitor from '../../../QueryComplexity';
-import simpleEstimator from '../../simple';
-import fieldExtensionsEstimator from '../index';
-import { CompatibleValidationContext } from '../../../__tests__/fixtures/CompatibleValidationContext';
+import ComplexityVisitor from '../../../QueryComplexity.js';
+import simpleEstimator from '../../simple/index.js';
+import fieldExtensionsEstimator from '../index.js';
+import { CompatibleValidationContext } from '../../../__tests__/fixtures/CompatibleValidationContext.js';
 
 describe('fieldExtensions estimator', () => {
   const typeInfo = new TypeInfo(schema);

src/estimators/fieldExtensions/__tests__/fixtures/schema.ts

@@ -15,7 +15,7 @@ import {
   GraphQLInterfaceType,
 } from 'graphql';
 
-import { ComplexityEstimatorArgs } from '../../../../QueryComplexity';
+import { ComplexityEstimatorArgs } from '../../../../QueryComplexity.js';
 
 const Item: GraphQLObjectType = new GraphQLObjectType({
   name: 'Item',