Skip to content

Commit b3b59e5

Browse files
capajcapaj
committed
experiment with adding .js extenstion to all imports
1 parent b59e9f9 commit b3b59e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+229
-191
lines changed

‎examples/basic-express-server/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ApolloServer } from 'apollo-server-express'
22
import { ApolloServerPluginDrainHttpServer } from 'apollo-server-core'
33
import express from 'express'
44
import http from 'http'
5-
import { schema } from './schema'
5+
import { schema } from './schema.js'
66

77
async function startApolloServer() {
88
const app = express()

‎examples/basic-express-server/schema.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { SchemaRoot, Query, compileSchema } from 'decapi'
2-
import { MySchemaCustomDecorators } from './schemaWithCustomDecorators'
2+
import { MySchemaCustomDecorators } from './schemaWithCustomDecorators.js'
33

44
@SchemaRoot()
55
class MySchema {

‎examples/nested-mutation-or-query/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { schema } from './schema'
1+
import { schema } from './schema.js'
22

33
import Fastify from 'fastify'
44
import mercurius from 'mercurius'

‎examples/typeorm-basic-integration/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
ObjectType,
77
Field,
88
compileSchema
9-
} from '../../src/index'
9+
} from '../../src/index.js'
1010
import graphqlHTTP from 'express-graphql'
1111

1212
import {

‎jest.config.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
module.exports = {
1+
export default {
22
preset: 'ts-jest',
33
modulePaths: ['<rootDir>/src/'],
44
moduleFileExtensions: ['ts', 'tsx', 'js'],
55
collectCoverage: false,
6+
resolver: 'jest-ts-webcompat-resolver',
67
testMatch: ['**/*.spec.(ts|tsx|js)'],
78
setupFiles: ['<rootDir>/src/specs/setup.ts'],
89
testPathIgnorePatterns: ['/lib/'],

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "decapi",
3-
"version": "2.0.0-beta.6",
3+
"version": "2.0.0-beta.7",
44
"type": "module",
55
"main": "dist/cjs/index.js",
66
"module": "dist/esm/index.js",
@@ -55,6 +55,7 @@
5555
"graphql": "^16.3.0",
5656
"husky": "^7.0.4",
5757
"jest": "^27.5.1",
58+
"jest-ts-webcompat-resolver": "^1.0.0",
5859
"lint-staged": "^12.4.0",
5960
"prettier": "^2.6.2",
6061
"pretty-quick": "^3.1.3",

‎src/benchmark/decapi.ts

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
import { compileSchema, Field, ObjectType, Query, SchemaRoot } from '../index'
2-
import { runBenchmark } from './run'
1+
import {
2+
compileSchema,
3+
Field,
4+
ObjectType,
5+
Query,
6+
SchemaRoot
7+
} from '../index.js'
8+
import { runBenchmark } from './run.js'
39

410
@ObjectType()
511
class SampleObject {

‎src/benchmark/type-graphql.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'reflect-metadata'
22
import { buildSchema, Field, ObjectType, Resolver, Query } from 'type-graphql'
33

4-
import { runBenchmark } from './run'
4+
import { runBenchmark } from './run.js'
55

66
@ObjectType()
77
class SampleObject {

‎src/domains/arg/ArgDecorators.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { argRegistry } from './registry'
2-
export { compileFieldArgs } from './compiler'
3-
import { IArgOptions } from './options'
1+
import { argRegistry } from './registry.js'
2+
export { compileFieldArgs } from './compiler.js'
3+
import { IArgOptions } from './options.js'
44

55
export function Arg(options: IArgOptions = {}): ParameterDecorator {
66
return (target: Object, fieldName: string, argIndex: number) => {

‎src/domains/arg/compiler.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ import {
55
GraphQLNonNull
66
} from 'graphql'
77

8-
import { IArgsIndex, argRegistry } from './registry'
8+
import { IArgsIndex, argRegistry } from './registry.js'
99

1010
import 'reflect-metadata'
1111

12-
import { injectorRegistry } from '../inject/Inject'
12+
import { injectorRegistry } from '../inject/Inject.js'
1313

1414
import { Constructor, reflect } from 'typescript-rtti'
1515
import {
1616
inferTypeFromRtti,
1717
isParsableScalar,
1818
mapNativeScalarToGraphQL,
1919
mapNativeTypeToGraphQL
20-
} from '../../services/utils/gql/types/inferTypeByTarget'
21-
import { resolveType } from '../../services/utils/gql/types/typeResolvers'
22-
import { inputObjectTypeRegistry } from '../inputObjectType/registry'
23-
// import { ArgError } from './error'
20+
} from '../../services/utils/gql/types/inferTypeByTarget.js'
21+
import { resolveType } from '../../services/utils/gql/types/typeResolvers.js'
22+
import { inputObjectTypeRegistry } from '../inputObjectType/registry.js'
23+
// import { ArgError } from './error.js'
2424

2525
export interface ITargetAndField {
2626
target: Constructor<Function>

‎src/domains/arg/error.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { reflect } from 'typescript-rtti'
2-
import { BaseError } from '../../services/error'
2+
import { BaseError } from '../../services/error.js'
33

4-
import { ITargetAndField } from './compiler'
4+
import { ITargetAndField } from './compiler.js'
55
// TODO use again when typescript rtti is fixed
66
export class ArgError extends BaseError {
77
constructor(msg: string, ctx: ITargetAndField, argIndex: number) {

‎src/domains/arg/registry.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DeepWeakMap } from '../../services/utils/deepWeakMap/DeepWeakMap'
1+
import { DeepWeakMap } from '../../services/utils/deepWeakMap/DeepWeakMap.js'
22

33
export interface IArgInnerConfig {
44
description?: string

‎src/domains/duplexField/DuplexField.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { IFieldOptions } from '../field/Field'
2-
import { fieldsRegistry, IFieldInnerConfig } from '../field/registry'
1+
import { IFieldOptions } from '../field/Field.js'
2+
import { fieldsRegistry, IFieldInnerConfig } from '../field/registry.js'
33
import {
44
inputFieldsRegistry,
55
IFieldInputInnerConfig
6-
} from '../inputField/registry'
6+
} from '../inputField/registry.js'
77

8-
export { FieldError } from './error'
8+
export { FieldError } from './error.js'
99

1010
interface IDuplexFieldOptions extends IFieldOptions {
1111
inputNullable?: boolean

‎src/domains/duplexField/error.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BaseError } from '../../services/error'
1+
import { BaseError } from '../../services/error.js'
22

33
export class FieldError extends BaseError {
44
constructor(target: Function, fieldName: string, msg: string) {

‎src/domains/duplexObjectType/DuplexObjectType.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { objectTypeRegistry } from '../objectType/registry'
2-
import { compileObjectTypeWithConfig } from '../objectType/compiler/objectType'
1+
import { objectTypeRegistry } from '../objectType/registry.js'
2+
import { compileObjectTypeWithConfig } from '../objectType/compiler/objectType.js'
33

4-
import { inputObjectTypeRegistry } from '../inputObjectType/registry'
5-
import { compileInputObjectTypeWithConfig } from '../inputObjectType/objectTypeCompiler'
6-
import { IObjectTypeOptions } from '../objectType/ObjectType'
4+
import { inputObjectTypeRegistry } from '../inputObjectType/registry.js'
5+
import { compileInputObjectTypeWithConfig } from '../inputObjectType/objectTypeCompiler.js'
6+
import { IObjectTypeOptions } from '../objectType/ObjectType.js'
77
import { Constructor } from 'typescript-rtti'
8-
export { ObjectTypeError } from './error'
8+
export { ObjectTypeError } from './error.js'
99

1010
export function DuplexObjectType(options?: IObjectTypeOptions): ClassDecorator {
1111
// @ts-expect-error

‎src/domains/duplexObjectType/error.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BaseError } from '../../services/error'
1+
import { BaseError } from '../../services/error.js'
22

33
export class ObjectTypeError extends BaseError {
44
constructor(target: Function, msg: string) {

‎src/domains/enum/convertNativeEnumToGraphQLEnumValues.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { GraphQLEnumValueConfigMap } from 'graphql'
2-
import { EnumFieldsConfig } from './registerEnum'
2+
import { EnumFieldsConfig } from './registerEnum.js'
33

44
function validateForGraphqlJs(val: string) {
55
if (!val.match(/^[_a-zA-Z][_a-zA-Z0-9]*$/)) {

‎src/domains/enum/enum.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { resolveType } from '../../services/utils/gql/types/typeResolvers'
1+
import { resolveType } from '../../services/utils/gql/types/typeResolvers.js'
22
import { registerEnum } from '../..'
3-
import { SchemaRoot, compileSchema } from '../schema/SchemaRoot'
4-
import { Query } from '../schema/rootFields'
3+
import { SchemaRoot, compileSchema } from '../schema/SchemaRoot.js'
4+
import { Query } from '../schema/rootFields.js'
55
import { printSchema, graphql } from 'graphql'
6-
import { Arg } from '../arg/ArgDecorators'
6+
import { Arg } from '../arg/ArgDecorators.js'
77

88
describe('Enums', () => {
99
it('throws when the enum key cannot be used with GQL', () => {

‎src/domains/enum/error.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BaseError } from '../../services/error'
1+
import { BaseError } from '../../services/error.js'
22

33
export class EnumError extends BaseError {
44
constructor(name: string, msg: string) {

‎src/domains/enum/registerEnum.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { GraphQLEnumType } from 'graphql'
2-
import { EnumError } from './error'
2+
import { EnumError } from './error.js'
33

4-
import { enumsRegistry } from './registry'
5-
export { enumsRegistry } from './registry'
6-
import { convertNativeEnumToGraphQLEnumValues } from './convertNativeEnumToGraphQLEnumValues'
4+
import { enumsRegistry } from './registry.js'
5+
export { enumsRegistry } from './registry.js'
6+
import { convertNativeEnumToGraphQLEnumValues } from './convertNativeEnumToGraphQLEnumValues.js'
77

88
export interface DescriptionOptions {
99
description?: string

‎src/domains/field/Field.ts

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
import { fieldsRegistry, IFieldInnerConfig } from './registry'
2-
import { rootFieldTypes } from '../schema/rootFields'
1+
import { fieldsRegistry, IFieldInnerConfig } from './registry.js'
2+
import { rootFieldTypes } from '../schema/rootFields.js'
33

44
export {
55
IFieldInnerConfig,
66
fieldsRegistry,
77
queryFieldsRegistry
8-
} from './registry'
9-
export { compileAllFields, compileFieldConfig } from './compiler/fieldCompiler'
10-
export { FieldError } from './error'
8+
} from './registry.js'
9+
export {
10+
compileAllFields,
11+
compileFieldConfig
12+
} from './compiler/fieldCompiler.js'
13+
export { FieldError } from './error.js'
1114

1215
export interface IFieldOptionsBase {
1316
description?: string

‎src/domains/field/compiler/fieldCompiler.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import { GraphQLFieldConfig, GraphQLFieldConfigMap } from 'graphql'
2-
import { FieldError, fieldsRegistry } from '../Field'
2+
import { FieldError, fieldsRegistry } from '../Field.js'
33

4-
import { compileFieldResolver } from './resolver'
5-
import { isRootFieldOnNonRootBase, validateResolvedType } from './services'
4+
import { compileFieldResolver } from './resolver.js'
5+
import { isRootFieldOnNonRootBase, validateResolvedType } from './services.js'
66

77
import {
88
resolveTypeOrThrow,
99
throwIfNotInferableType,
1010
validateNotInferableField
11-
} from './fieldType'
12-
import { compileFieldArgs } from '../../arg/ArgDecorators'
11+
} from './fieldType.js'
12+
import { compileFieldArgs } from '../../arg/ArgDecorators.js'
1313
import { Constructor } from 'typescript-rtti'
14-
import { resolveType } from '../../../services/utils/gql/types/typeResolvers'
15-
import { inferTypeByTarget } from '../../../services/utils/gql/types/inferTypeByTarget'
14+
import { resolveType } from '../../../services/utils/gql/types/typeResolvers.js'
15+
import { inferTypeByTarget } from '../../../services/utils/gql/types/inferTypeByTarget.js'
1616

1717
export function compileFieldConfig(
1818
target: Constructor<Function>,

‎src/domains/field/compiler/fieldType.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { GraphQLType } from 'graphql'
22

3-
import { FieldError } from '../Field'
3+
import { FieldError } from '../Field.js'
44
import {
55
IResolveTypeParams,
66
resolveType
7-
} from '../../../services/utils/gql/types/typeResolvers'
8-
import { inferTypeByTarget } from '../../../services/utils/gql/types/inferTypeByTarget'
7+
} from '../../../services/utils/gql/types/typeResolvers.js'
8+
import { inferTypeByTarget } from '../../../services/utils/gql/types/inferTypeByTarget.js'
99

1010
export function resolveTypeOrThrow(
1111
fieldConfig: IResolveTypeParams,

‎src/domains/field/compiler/resolver.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ import {
44
HookExecutor,
55
fieldBeforeHooksRegistry,
66
fieldAfterHooksRegistry
7-
} from '../../hooks/hooks'
8-
import { isSchemaRoot, getSchemaRootInstance } from '../../schema/SchemaRoot'
7+
} from '../../hooks/hooks.js'
8+
import { isSchemaRoot, getSchemaRootInstance } from '../../schema/SchemaRoot.js'
99

1010
import {
1111
injectorRegistry,
1212
InjectorResolver,
1313
InjectorsIndex
14-
} from '../../inject/Inject'
15-
import { argRegistry, IArgInnerConfig } from '../../arg/registry'
14+
} from '../../inject/Inject.js'
15+
import { argRegistry, IArgInnerConfig } from '../../arg/registry.js'
1616

1717
import { plainToInstance } from 'class-transformer'
1818
import {
1919
isParsableScalar,
2020
ParsableScalar
21-
} from '../../../services/utils/gql/types/inferTypeByTarget'
22-
import { IInjectorResolverData } from '../../../domains/inject/registry'
23-
import { AfterHookExecutor } from '../../../domains/hooks/registry'
24-
import isPromiseLike from '../../../isPromiseLike'
21+
} from '../../../services/utils/gql/types/inferTypeByTarget.js'
22+
import { IInjectorResolverData } from '../../../domains/inject/registry.js'
23+
import { AfterHookExecutor } from '../../../domains/hooks/registry.js'
24+
import isPromiseLike from '../../../isPromiseLike.js'
2525
import { Constructor, reflect } from 'typescript-rtti'
26-
import { interfaceTypeRegistry } from '../../../domains/interfaceType/interfaceTypeRegistry'
26+
import { interfaceTypeRegistry } from '../../../domains/interfaceType/interfaceTypeRegistry.js'
2727

2828
interface IArgsMap {
2929
[argName: string]: any

‎src/domains/field/compiler/services.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import {
44
GraphQLOutputType,
55
GraphQLNonNull
66
} from 'graphql'
7-
import { FieldError } from '../Field'
7+
import { FieldError } from '../Field.js'
88

99
import {
1010
mutationFieldsRegistry,
1111
isSchemaRoot,
1212
queryFieldsRegistry
13-
} from '../../schema/SchemaRoot'
13+
} from '../../schema/SchemaRoot.js'
1414

1515
export function validateResolvedType(
1616
target: Function,

‎src/domains/field/error.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BaseError } from '../../services/error'
1+
import { BaseError } from '../../services/error.js'
22

33
export class FieldError extends BaseError {
44
constructor(target: Function, fieldName: string, msg: string) {

‎src/domains/field/registry.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { rootFieldTypes } from '../schema/rootFields'
2-
import { DeepWeakMap } from '../../services/utils/deepWeakMap/DeepWeakMap'
1+
import { rootFieldTypes } from '../schema/rootFields.js'
2+
import { DeepWeakMap } from '../../services/utils/deepWeakMap/DeepWeakMap.js'
33

44
export interface IAllRegisteredFields {
55
[fieldName: string]: IFieldInnerConfig

‎src/domains/hooks/error.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BaseError } from '../../services/error'
1+
import { BaseError } from '../../services/error.js'
22

33
export class HookError extends BaseError {
44
constructor(target: Function, fieldName: string, msg: string) {

0 commit comments

Comments
 (0)