From d76a299cf9ccc3e8b3bc6f36bcb1c32bb61d39f1 Mon Sep 17 00:00:00 2001 From: Laurin Quast Date: Mon, 27 Jun 2022 12:02:25 +0200 Subject: [PATCH] feat: support TypeScript esm + esm and cjs import tests on CI (#4539) * feat: support TypeScript esm + esm and cjs import tests on CI * chore: workaround broken apollo-client import mess * chore: adjust webpack path * chore: add changeset * chore: upgrade bob * chore: upgrade bob version * chore: change wording --- .changeset/nine-carrots-serve.md | 36 ++ .github/workflows/tests.yml | 4 +- .prettierignore | 1 + jest.config.js | 3 +- package.json | 21 +- packages/batch-delegate/package.json | 46 ++- .../src/batchDelegateToSchema.ts | 4 +- .../src/createBatchDelegateFn.ts | 4 +- packages/batch-delegate/src/getLoader.ts | 2 +- packages/batch-delegate/src/index.ts | 6 +- packages/batch-execute/package.json | 46 ++- .../src/createBatchingExecutor.ts | 4 +- .../batch-execute/src/getBatchingExecutor.ts | 2 +- packages/batch-execute/src/index.ts | 4 +- packages/batch-execute/src/mergeRequests.ts | 2 +- packages/batch-execute/src/splitResult.ts | 2 +- packages/delegate/package.json | 46 ++- packages/delegate/src/Subschema.ts | 4 +- packages/delegate/src/Transformer.ts | 8 +- .../delegate/src/applySchemaTransforms.ts | 2 +- .../src/checkResultAndHandleErrors.ts | 4 +- packages/delegate/src/createRequest.ts | 2 +- .../delegate/src/defaultMergedResolver.ts | 6 +- packages/delegate/src/delegateToSchema.ts | 10 +- .../delegate/src/finalizeGatewayRequest.ts | 4 +- packages/delegate/src/index.ts | 20 +- packages/delegate/src/mergeFields.ts | 6 +- .../delegate/src/prepareGatewayDocument.ts | 4 +- packages/delegate/src/resolveExternalValue.ts | 6 +- packages/delegate/src/subschemaConfig.ts | 2 +- packages/delegate/src/types.ts | 4 +- .../delegate/tests/batchExecution.test.ts | 2 +- packages/delegate/tests/createRequest.test.ts | 4 +- .../delegate/tests/delegateToSchema.test.ts | 2 +- packages/delegate/tests/errors.test.ts | 8 +- .../tests/finalizeGatewayRequest.test.ts | 4 +- packages/graphql-tag-pluck/package.json | 46 ++- packages/graphql-tag-pluck/src/config.ts | 4 +- packages/graphql-tag-pluck/src/index.ts | 8 +- packages/graphql-tag-pluck/src/visitor.ts | 4 +- .../tests/graphql-tag-pluck.test.ts | 8 +- packages/graphql-tools/package.json | 46 ++- packages/import/package.json | 46 ++- .../tests/documents/import-documents.spec.ts | 2 +- .../import/tests/schema/import-schema.spec.ts | 2 +- packages/jest-transform/package.json | 46 ++- packages/links/package.json | 46 ++- packages/links/src/AwaitVariablesLink.ts | 14 +- packages/links/src/createServerHttpLink.ts | 8 +- packages/links/src/index.ts | 8 +- packages/links/src/linkToExecutor.ts | 14 +- packages/links/tests/upload.test.ts | 2 +- packages/load-files/package.json | 46 ++- packages/load/package.json | 46 ++- packages/load/src/documents.ts | 2 +- packages/load/src/index.ts | 8 +- packages/load/src/load-typedefs.ts | 10 +- .../load/src/load-typedefs/collect-sources.ts | 10 +- packages/load/src/load-typedefs/load-file.ts | 2 +- packages/load/src/load-typedefs/options.ts | 2 +- packages/load/src/load-typedefs/parse.ts | 2 +- packages/load/src/schema.ts | 4 +- packages/load/src/utils/pointers.ts | 2 +- .../documents/documents-from-glob.spec.ts | 2 +- .../tests/loaders/schema/integration.spec.ts | 2 +- .../loaders/schema/schema-from-export.spec.ts | 2 +- .../loaders/schema/schema-from-json.spec.ts | 2 +- .../loaders/schema/schema-from-string.spec.ts | 2 +- .../schema/schema-from-typedefs.spec.ts | 2 +- packages/load/tests/use-custom-loader.spec.ts | 2 +- packages/loaders/apollo-engine/package.json | 46 ++- packages/loaders/code-file/package.json | 46 ++- packages/loaders/code-file/src/exports.ts | 2 +- packages/loaders/code-file/src/index.ts | 2 +- .../loaders/code-file/src/load-from-module.ts | 2 +- .../tests/load-from-code-file.spec.ts | 2 +- .../tests/schema-from-export.spec.ts | 2 +- packages/loaders/git/package.json | 46 ++- packages/loaders/git/src/index.ts | 4 +- packages/loaders/git/tests/loader.spec.ts | 4 +- packages/loaders/github/package.json | 46 ++- .../github/tests/schema-from-github.spec.ts | 2 +- packages/loaders/graphql-file/package.json | 46 ++- .../loaders/graphql-file/tests/loader.spec.ts | 4 +- packages/loaders/json-file/package.json | 46 ++- .../loaders/json-file/tests/loader.spec.ts | 4 +- packages/loaders/module/package.json | 46 ++- packages/loaders/module/tests/loader.spec.ts | 4 +- packages/loaders/prisma/package.json | 46 ++- packages/loaders/prisma/src/index.ts | 2 +- .../prisma/src/prisma-yml/Cluster.test.ts | 2 +- .../loaders/prisma/src/prisma-yml/Cluster.ts | 6 +- .../prisma/src/prisma-yml/Environment.test.ts | 8 +- .../prisma/src/prisma-yml/Environment.ts | 18 +- .../src/prisma-yml/PrismaDefinition.test.ts | 8 +- .../prisma/src/prisma-yml/PrismaDefinition.ts | 18 +- .../prisma/src/prisma-yml/Variables.ts | 4 +- .../loaders/prisma/src/prisma-yml/index.ts | 24 +- .../prisma-yml/utils/parseEndpoint.test.ts | 2 +- .../src/prisma-yml/utils/parseEndpoint.ts | 2 +- .../src/prisma-yml/utils/yamlComment.test.ts | 2 +- .../loaders/prisma/src/prisma-yml/yaml.ts | 8 +- packages/loaders/url/package.json | 46 ++- .../event-stream/handleEventStreamResponse.ts | 4 +- packages/loaders/url/src/index.ts | 12 +- .../tests/handleEventStreamResponse.test.ts | 2 +- .../url/tests/url-loader-browser.spec.ts | 4 +- packages/loaders/url/tests/url-loader.spec.ts | 4 +- packages/merge/package.json | 46 ++- packages/merge/src/index.ts | 6 +- .../merge/src/typedefs-mergers/arguments.ts | 2 +- .../merge/src/typedefs-mergers/directives.ts | 2 +- .../merge/src/typedefs-mergers/enum-values.ts | 4 +- packages/merge/src/typedefs-mergers/enum.ts | 6 +- packages/merge/src/typedefs-mergers/fields.ts | 8 +- packages/merge/src/typedefs-mergers/index.ts | 28 +- .../merge/src/typedefs-mergers/input-type.ts | 6 +- .../merge/src/typedefs-mergers/interface.ts | 8 +- .../merge-named-type-array.ts | 2 +- .../merge/src/typedefs-mergers/merge-nodes.ts | 18 +- .../src/typedefs-mergers/merge-typedefs.ts | 6 +- packages/merge/src/typedefs-mergers/scalar.ts | 4 +- .../merge/src/typedefs-mergers/schema-def.ts | 4 +- packages/merge/src/typedefs-mergers/type.ts | 8 +- packages/merge/src/typedefs-mergers/union.ts | 6 +- .../extract-extensions-from-schema.spec.ts | 4 +- packages/merge/tests/merge-nodes.spec.ts | 4 +- packages/merge/tests/merge-resolvers.spec.ts | 2 +- packages/merge/tests/merge-typedefs.spec.ts | 4 +- packages/mock/package.json | 46 ++- packages/mock/src/MockStore.ts | 6 +- packages/mock/src/addMocksToSchema.ts | 6 +- packages/mock/src/index.ts | 12 +- packages/mock/src/mockServer.ts | 4 +- packages/mock/src/pagination.ts | 4 +- packages/mock/src/utils.ts | 2 +- packages/mock/tests/addMocksToSchema.spec.ts | 2 +- .../mock/tests/mocking-compatibility.spec.ts | 2 +- packages/mock/tests/pagination.spec.ts | 2 +- packages/mock/tests/store.spec.ts | 6 +- packages/node-require/package.json | 46 ++- .../node-require/test/node-require.spec.ts | 2 +- packages/optimize/package.json | 46 ++- packages/optimize/src/index.ts | 10 +- packages/optimize/src/optimize.ts | 8 +- .../src/optimizers/remove-description.ts | 2 +- .../src/optimizers/remove-empty-nodes.ts | 2 +- .../optimize/src/optimizers/remove-loc.ts | 2 +- .../optimize/tests/remove-description.spec.ts | 2 +- .../optimize/tests/remove-empty-nodes.spec.ts | 2 +- packages/optimize/tests/remove-loc.spec.ts | 2 +- .../relay-operation-optimizer/package.json | 46 ++- packages/resolvers-composition/package.json | 46 ++- packages/resolvers-composition/src/index.ts | 2 +- .../src/resolvers-composition.ts | 2 +- .../tests/resolvers-composition.spec.ts | 2 +- packages/schema/package.json | 46 ++- packages/schema/src/addResolversToSchema.ts | 4 +- packages/schema/src/index.ts | 16 +- packages/schema/src/makeExecutableSchema.ts | 6 +- packages/schema/src/merge-schemas.ts | 4 +- .../schema/tests/fixtures/circularSchemaA.ts | 2 +- .../schema/tests/fixtures/circularSchemaB.ts | 2 +- packages/schema/tests/merge-schemas.spec.ts | 4 +- packages/schema/tests/schemaGenerator.test.ts | 2 +- packages/stitch/package.json | 46 ++- .../stitch/src/createDelegationPlanBuilder.ts | 2 +- packages/stitch/src/index.ts | 12 +- packages/stitch/src/mergeCandidates.ts | 4 +- packages/stitch/src/mergeValidations.ts | 2 +- packages/stitch/src/stitchSchemas.ts | 8 +- packages/stitch/src/stitchingInfo.ts | 6 +- .../computedDirectiveTransformer.ts | 2 +- .../src/subschemaConfigTransforms/index.ts | 10 +- packages/stitch/src/typeCandidates.ts | 8 +- .../tests/alternateStitchSchemas.test.ts | 4 +- packages/stitch/tests/dataloader.test.ts | 2 +- .../stitch/tests/extendedInterface.test.ts | 2 +- .../stitch/tests/mergeDefinitions.test.ts | 2 +- packages/stitch/tests/mergeInterfaces.test.ts | 2 +- .../tests/mergeMultipleEntryPoints.test.ts | 2 +- .../stitch/tests/mergeValidations.test.ts | 2 +- packages/stitch/tests/relay.spec.ts | 2 +- .../stitch/tests/selectionSetArgs.test.ts | 2 +- packages/stitch/tests/selectionSets.test.ts | 4 +- packages/stitch/tests/stitchSchemas.test.ts | 4 +- packages/stitch/tests/transforms.test.ts | 4 +- packages/stitch/tests/typeMerging.test.ts | 2 +- .../tests/typeMergingWithDirectives.test.ts | 2 +- .../tests/typeMergingWithExtensions.test.ts | 2 +- .../tests/typeMergingWithInterfaces.test.ts | 2 +- packages/stitch/tests/unknownType.test.ts | 2 +- packages/stitching-directives/package.json | 46 ++- .../src/defaultStitchingDirectiveOptions.ts | 2 +- .../src/federationToStitchingSDL.ts | 2 +- .../src/getSourcePaths.ts | 4 +- packages/stitching-directives/src/index.ts | 6 +- .../src/parseMergeArgsExpr.ts | 10 +- .../stitching-directives/src/properties.ts | 2 +- .../src/stitchingDirectives.ts | 8 +- .../src/stitchingDirectivesTransformer.ts | 10 +- .../src/stitchingDirectivesValidator.ts | 6 +- .../tests/extractVariables.test.ts | 2 +- .../tests/federationToStitchingSDL.test.ts | 4 +- .../tests/parseMergeArgsExpr.test.ts | 2 +- .../tests/pathsFromSelectionSets.ts | 2 +- .../tests/preparseMergeArgsExpr.test.ts | 2 +- .../tests/properties.test.ts | 2 +- .../stitchingDirectivesTransformer.test.ts | 2 +- .../stitchingDirectivesValidator.test.ts | 2 +- packages/testing/to-be-similar-string.ts | 2 +- packages/utils/package.json | 46 ++- packages/utils/src/addTypes.ts | 4 +- packages/utils/src/astFromType.ts | 2 +- .../utils/src/build-operation-for-field.ts | 4 +- packages/utils/src/collectFields.ts | 2 +- packages/utils/src/comments.ts | 2 +- packages/utils/src/errors.ts | 2 +- packages/utils/src/executor.ts | 2 +- packages/utils/src/fields.ts | 6 +- packages/utils/src/filterSchema.ts | 6 +- packages/utils/src/fixSchemaAst.ts | 4 +- packages/utils/src/forEachDefaultValue.ts | 2 +- packages/utils/src/forEachField.ts | 2 +- packages/utils/src/get-directives.ts | 2 +- packages/utils/src/getArgumentValues.ts | 4 +- .../utils/src/getObjectTypeFromTypeMap.ts | 2 +- .../utils/src/getOperationASTFromRequest.ts | 4 +- packages/utils/src/getResolversFromSchema.ts | 2 +- packages/utils/src/implementsAbstractType.ts | 2 +- packages/utils/src/index.ts | 100 +++--- packages/utils/src/inspect.ts | 2 +- packages/utils/src/loaders.ts | 2 +- packages/utils/src/mapSchema.ts | 8 +- packages/utils/src/mergeDeep.ts | 2 +- packages/utils/src/parse-graphql-json.ts | 4 +- packages/utils/src/parse-graphql-sdl.ts | 4 +- .../utils/src/print-schema-with-directives.ts | 12 +- packages/utils/src/prune.ts | 10 +- packages/utils/src/rewire.ts | 2 +- packages/utils/src/rootTypes.ts | 2 +- packages/utils/src/selectionSets.ts | 2 +- packages/utils/src/transformInputValue.ts | 2 +- packages/utils/src/updateArgument.ts | 2 +- packages/utils/src/validate-documents.ts | 4 +- packages/utils/src/visitResult.ts | 8 +- packages/utils/src/withCancel.ts | 2 +- .../build-operation-node-for-field.spec.ts | 2 +- packages/utils/tests/get-directives.spec.ts | 4 +- .../tests/get-fields-with-directives.spec.ts | 2 +- packages/utils/tests/mapSchema.test.ts | 2 +- .../utils/tests/parse-graphql-sdl.spec.ts | 2 +- .../print-schema-with-directives.spec.ts | 2 +- packages/utils/tests/prune.test.ts | 4 +- packages/utils/tests/relocatedError.test.ts | 2 +- .../utils/tests/validate-documents.spec.ts | 2 +- .../utils/tests/valueMatchedCriteria.test.ts | 2 +- packages/utils/tests/visitResult.test.ts | 4 +- packages/webpack-loader-runtime/package.json | 46 ++- packages/webpack-loader/package.json | 46 ++- packages/webpack-loader/src/index.ts | 2 +- packages/webpack-loader/tests/loader.test.ts | 2 +- packages/webpack-loader/tests/parser.test.ts | 2 +- packages/wrap/package.json | 46 ++- packages/wrap/src/index.ts | 10 +- .../src/transforms/FilterInputObjectFields.ts | 4 +- .../src/transforms/FilterInterfaceFields.ts | 2 +- .../transforms/FilterObjectFieldDirectives.ts | 2 +- .../wrap/src/transforms/FilterObjectFields.ts | 2 +- .../wrap/src/transforms/FilterRootFields.ts | 2 +- packages/wrap/src/transforms/HoistField.ts | 4 +- packages/wrap/src/transforms/MapFields.ts | 4 +- packages/wrap/src/transforms/MapLeafValues.ts | 2 +- .../RemoveObjectFieldDeprecations.ts | 4 +- .../transforms/RemoveObjectFieldDirectives.ts | 2 +- .../RemoveObjectFieldsWithDeprecation.ts | 2 +- .../RemoveObjectFieldsWithDirective.ts | 2 +- .../src/transforms/RenameInputObjectFields.ts | 2 +- .../src/transforms/RenameInterfaceFields.ts | 2 +- .../transforms/RenameObjectFieldArguments.ts | 2 +- .../wrap/src/transforms/RenameObjectFields.ts | 2 +- .../wrap/src/transforms/RenameRootFields.ts | 2 +- .../transforms/TransformCompositeFields.ts | 2 +- .../src/transforms/TransformEnumValues.ts | 4 +- .../transforms/TransformInputObjectFields.ts | 2 +- .../transforms/TransformInterfaceFields.ts | 4 +- .../src/transforms/TransformObjectFields.ts | 4 +- .../src/transforms/TransformRootFields.ts | 4 +- packages/wrap/src/transforms/WrapFields.ts | 4 +- packages/wrap/src/transforms/WrapType.ts | 2 +- packages/wrap/src/transforms/index.ts | 64 ++-- packages/wrap/src/wrapSchema.ts | 2 +- .../tests/fragmentsAreNotDuplicated.test.ts | 2 +- packages/wrap/tests/gatsbyTransforms.test.ts | 2 +- .../tests/makeRemoteExecutableSchema.test.ts | 4 +- .../wrap/tests/transformFilterTypes.test.ts | 2 +- ...sformRemoveObjectFieldDeprecations.test.ts | 2 +- ...ansformRemoveObjectFieldDirectives.test.ts | 2 +- ...mRemoveObjectFieldsWithDeprecation.test.ts | 2 +- ...ormRemoveObjectFieldsWithDirective.test.ts | 2 +- ...ransformRenameObjectFieldArguments.test.ts | 2 +- .../wrap/tests/transformRenameTypes.test.ts | 2 +- tsconfig.build.json | 8 - tsconfig.json | 1 - yarn.lock | 320 +++++++++--------- 305 files changed, 1932 insertions(+), 1202 deletions(-) create mode 100644 .changeset/nine-carrots-serve.md delete mode 100644 tsconfig.build.json diff --git a/.changeset/nine-carrots-serve.md b/.changeset/nine-carrots-serve.md new file mode 100644 index 00000000000..06d81bca6db --- /dev/null +++ b/.changeset/nine-carrots-serve.md @@ -0,0 +1,36 @@ +--- +'@graphql-tools/batch-delegate': minor +'@graphql-tools/batch-execute': minor +'@graphql-tools/delegate': minor +'@graphql-tools/graphql-tag-pluck': minor +'graphql-tools': minor +'@graphql-tools/import': minor +'@graphql-tools/jest-transform': minor +'@graphql-tools/links': minor +'@graphql-tools/load': minor +'@graphql-tools/load-files': minor +'@graphql-tools/apollo-engine-loader': minor +'@graphql-tools/code-file-loader': minor +'@graphql-tools/git-loader': minor +'@graphql-tools/github-loader': minor +'@graphql-tools/graphql-file-loader': minor +'@graphql-tools/json-file-loader': minor +'@graphql-tools/module-loader': minor +'@graphql-tools/prisma-loader': minor +'@graphql-tools/url-loader': minor +'@graphql-tools/merge': minor +'@graphql-tools/mock': minor +'@graphql-tools/node-require': minor +'@graphql-tools/optimize': minor +'@graphql-tools/relay-operation-optimizer': minor +'@graphql-tools/resolvers-composition': minor +'@graphql-tools/schema': minor +'@graphql-tools/stitch': minor +'@graphql-tools/stitching-directives': minor +'@graphql-tools/utils': minor +'@graphql-tools/webpack-loader': minor +'@graphql-tools/webpack-loader-runtime': minor +'@graphql-tools/wrap': minor +--- + +Support TypeScript module resolution. diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 005c03fe540..3805ec97d97 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -185,8 +185,8 @@ jobs: run: yarn install --ignore-engines && git checkout yarn.lock - name: Build Packages run: yarn build - - name: Test ESM - run: node scripts/test-esm.mjs + - name: Test ESM and CJS integrity + run: yarn bob check test_browser: name: Browser Test runs-on: ubuntu-latest diff --git a/.prettierignore b/.prettierignore index 2141c2010d5..8b024502178 100644 --- a/.prettierignore +++ b/.prettierignore @@ -21,6 +21,7 @@ packages/loaders/git/tests/test-files/type-defs-invalid.graphql packages/loaders/json-file/tests/test-files/failing/malformed.json website/.next website/out +.bob CHANGELOG.md # temporarly ignore follow files because prettier-ignore comments don't work in mdx2 diff --git a/jest.config.js b/jest.config.js index bfa9306f0f7..52a96dc22a6 100644 --- a/jest.config.js +++ b/jest.config.js @@ -11,9 +11,10 @@ module.exports = { rootDir: ROOT_DIR, restoreMocks: true, reporters: ['default'], - modulePathIgnorePatterns: ['dist', 'test-assets', 'test-files', 'fixtures'], + modulePathIgnorePatterns: ['dist', 'test-assets', 'test-files', 'fixtures', '.bob'], moduleNameMapper: pathsToModuleNameMapper(tsconfig.compilerOptions.paths, { prefix: `${ROOT_DIR}/` }), collectCoverage: false, cacheDirectory: resolve(ROOT_DIR, `${CI ? '' : 'node_modules/'}.cache/jest`), transformIgnorePatterns: ['node_modules/(?!graphql)'], + resolver: 'bob-the-bundler/jest-resolver.js', }; diff --git a/package.json b/package.json index 5ef5fc53c4e..badcaa27bcf 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,8 @@ "predeploy:website": "yarn build:api-docs", "deploy:website": "cd website && yarn deploy", "ts:check": "tsc --noEmit", - "ts:transpile": "tsc --project tsconfig.build.json", "clean-dist": "rimraf \"packages/**/dist\" && rimraf \".bob\"", - "build": "yarn ts:transpile && bob build", + "build": "bob build", "build:api-docs": "ts-node --compiler-options='{\"module\":\"commonjs\"}' scripts/build-api-docs", "lint": "eslint --ext .ts .", "prettier": "prettier --ignore-path .prettierignore --write --list-different .", @@ -50,7 +49,7 @@ "@typescript-eslint/eslint-plugin": "5.29.0", "@typescript-eslint/parser": "5.29.0", "babel-jest": "28.1.1", - "bob-the-bundler": "1.7.3", + "bob-the-bundler": "2.0.0", "chalk": "4.1.2", "concurrently": "7.2.2", "eslint": "8.18.0", @@ -79,18 +78,16 @@ "packages/**/src/**/*.{ts,tsx}": [ "eslint --fix" ], - "**/*.{ts,tsx,graphql,yml,md,mdx}": [ + "**/*.{ts,tsx,graphql,yml,md,mdx,json}": [ "prettier --write" ] }, - "workspaces": { - "packages": [ - "./packages/*", - "./packages/loaders/*", - "./website", - "./benchmark/*" - ] - }, + "workspaces": [ + "./packages/*", + "./packages/loaders/*", + "./website", + "./benchmark/*" + ], "resolutions": { "graphql": "16.5.0", "esbuild": "^0.14.0", diff --git a/packages/batch-delegate/package.json b/packages/batch-delegate/package.json index 840abe85efd..719dc9300d4 100644 --- a/packages/batch-delegate/package.json +++ b/packages/batch-delegate/package.json @@ -9,21 +9,42 @@ }, "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -42,7 +63,8 @@ "@graphql-tools/stitch": "8.6.14" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/batch-delegate/src/batchDelegateToSchema.ts b/packages/batch-delegate/src/batchDelegateToSchema.ts index ba12dd310fb..93b0fc6fe76 100644 --- a/packages/batch-delegate/src/batchDelegateToSchema.ts +++ b/packages/batch-delegate/src/batchDelegateToSchema.ts @@ -1,6 +1,6 @@ -import { BatchDelegateOptions } from './types'; +import { BatchDelegateOptions } from './types.js'; -import { getLoader } from './getLoader'; +import { getLoader } from './getLoader.js'; export function batchDelegateToSchema(options: BatchDelegateOptions): any { const key = options.key; diff --git a/packages/batch-delegate/src/createBatchDelegateFn.ts b/packages/batch-delegate/src/createBatchDelegateFn.ts index 5b335063023..8dc87a97d98 100644 --- a/packages/batch-delegate/src/createBatchDelegateFn.ts +++ b/packages/batch-delegate/src/createBatchDelegateFn.ts @@ -1,8 +1,8 @@ import DataLoader from 'dataloader'; -import { CreateBatchDelegateFnOptions, BatchDelegateOptionsFn, BatchDelegateFn } from './types'; +import { CreateBatchDelegateFnOptions, BatchDelegateOptionsFn, BatchDelegateFn } from './types.js'; -import { getLoader } from './getLoader'; +import { getLoader } from './getLoader.js'; export function createBatchDelegateFn( optionsOrArgsFromKeys: CreateBatchDelegateFnOptions | ((keys: ReadonlyArray) => Record), diff --git a/packages/batch-delegate/src/getLoader.ts b/packages/batch-delegate/src/getLoader.ts index d0ba711562c..714e8c7dfde 100644 --- a/packages/batch-delegate/src/getLoader.ts +++ b/packages/batch-delegate/src/getLoader.ts @@ -5,7 +5,7 @@ import DataLoader from 'dataloader'; import { delegateToSchema, SubschemaConfig } from '@graphql-tools/delegate'; import { memoize3, relocatedError } from '@graphql-tools/utils'; -import { BatchDelegateOptions } from './types'; +import { BatchDelegateOptions } from './types.js'; function createBatchFn(options: BatchDelegateOptions) { const argsFromKeys = options.argsFromKeys ?? ((keys: ReadonlyArray) => ({ ids: keys })); diff --git a/packages/batch-delegate/src/index.ts b/packages/batch-delegate/src/index.ts index 2b26b57b77b..bd326f807fb 100644 --- a/packages/batch-delegate/src/index.ts +++ b/packages/batch-delegate/src/index.ts @@ -1,4 +1,4 @@ -export * from './batchDelegateToSchema'; -export * from './createBatchDelegateFn'; +export * from './batchDelegateToSchema.js'; +export * from './createBatchDelegateFn.js'; -export * from './types'; +export * from './types.js'; diff --git a/packages/batch-execute/package.json b/packages/batch-execute/package.json index 456d7738a2b..02a26ba7768 100644 --- a/packages/batch-execute/package.json +++ b/packages/batch-execute/package.json @@ -9,21 +9,42 @@ }, "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -38,7 +59,8 @@ "value-or-promise": "1.0.11" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/batch-execute/src/createBatchingExecutor.ts b/packages/batch-execute/src/createBatchingExecutor.ts index 519024d799e..67017e68f0c 100644 --- a/packages/batch-execute/src/createBatchingExecutor.ts +++ b/packages/batch-execute/src/createBatchingExecutor.ts @@ -2,8 +2,8 @@ import DataLoader from 'dataloader'; import { Executor, ExecutionRequest, ExecutionResult, getOperationASTFromRequest } from '@graphql-tools/utils'; -import { mergeRequests } from './mergeRequests'; -import { splitResult } from './splitResult'; +import { mergeRequests } from './mergeRequests.js'; +import { splitResult } from './splitResult.js'; export function createBatchingExecutor( executor: Executor, diff --git a/packages/batch-execute/src/getBatchingExecutor.ts b/packages/batch-execute/src/getBatchingExecutor.ts index a2f079e1d24..b9c2efe2cb7 100644 --- a/packages/batch-execute/src/getBatchingExecutor.ts +++ b/packages/batch-execute/src/getBatchingExecutor.ts @@ -1,7 +1,7 @@ import DataLoader from 'dataloader'; import { ExecutionRequest, Executor, memoize2of4 } from '@graphql-tools/utils'; -import { createBatchingExecutor } from './createBatchingExecutor'; +import { createBatchingExecutor } from './createBatchingExecutor.js'; export const getBatchingExecutor = memoize2of4(function getBatchingExecutor( _context: Record, diff --git a/packages/batch-execute/src/index.ts b/packages/batch-execute/src/index.ts index 1a951db92c1..c253aebef9a 100644 --- a/packages/batch-execute/src/index.ts +++ b/packages/batch-execute/src/index.ts @@ -1,2 +1,2 @@ -export * from './createBatchingExecutor'; -export * from './getBatchingExecutor'; +export * from './createBatchingExecutor.js'; +export * from './getBatchingExecutor.js'; diff --git a/packages/batch-execute/src/mergeRequests.ts b/packages/batch-execute/src/mergeRequests.ts index 1db02aaa2b9..f09530c64a9 100644 --- a/packages/batch-execute/src/mergeRequests.ts +++ b/packages/batch-execute/src/mergeRequests.ts @@ -17,7 +17,7 @@ import { import { ExecutionRequest, getOperationASTFromRequest } from '@graphql-tools/utils'; -import { createPrefix } from './prefix'; +import { createPrefix } from './prefix.js'; /** * Merge multiple queries into a single query in such a way that query results diff --git a/packages/batch-execute/src/splitResult.ts b/packages/batch-execute/src/splitResult.ts index ba1dac9cbf3..04a6f726a62 100644 --- a/packages/batch-execute/src/splitResult.ts +++ b/packages/batch-execute/src/splitResult.ts @@ -4,7 +4,7 @@ import { ExecutionResult, GraphQLError } from 'graphql'; import { relocatedError } from '@graphql-tools/utils'; -import { parseKey } from './prefix'; +import { parseKey } from './prefix.js'; /** * Split and transform result of the query produced by the `merge` function diff --git a/packages/delegate/package.json b/packages/delegate/package.json index 989bc3589af..c6f169aa6df 100644 --- a/packages/delegate/package.json +++ b/packages/delegate/package.json @@ -9,21 +9,42 @@ }, "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -40,7 +61,8 @@ "value-or-promise": "1.0.11" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/delegate/src/Subschema.ts b/packages/delegate/src/Subschema.ts index 668d68f82e6..9d13633e8de 100644 --- a/packages/delegate/src/Subschema.ts +++ b/packages/delegate/src/Subschema.ts @@ -1,8 +1,8 @@ import { GraphQLSchema } from 'graphql'; -import { SubschemaConfig, Transform, MergedTypeConfig, CreateProxyingResolverFn, BatchingOptions } from './types'; +import { SubschemaConfig, Transform, MergedTypeConfig, CreateProxyingResolverFn, BatchingOptions } from './types.js'; -import { applySchemaTransforms } from './applySchemaTransforms'; +import { applySchemaTransforms } from './applySchemaTransforms.js'; import { Executor } from '@graphql-tools/utils'; export function isSubschema(value: any): value is Subschema { diff --git a/packages/delegate/src/Transformer.ts b/packages/delegate/src/Transformer.ts index 9da8bba803a..caf49869da1 100644 --- a/packages/delegate/src/Transformer.ts +++ b/packages/delegate/src/Transformer.ts @@ -1,10 +1,10 @@ import { ExecutionRequest, ExecutionResult } from '@graphql-tools/utils'; -import { DelegationContext, Transform } from './types'; +import { DelegationContext, Transform } from './types.js'; -import { prepareGatewayDocument } from './prepareGatewayDocument'; -import { finalizeGatewayRequest } from './finalizeGatewayRequest'; -import { checkResultAndHandleErrors } from './checkResultAndHandleErrors'; +import { prepareGatewayDocument } from './prepareGatewayDocument.js'; +import { finalizeGatewayRequest } from './finalizeGatewayRequest.js'; +import { checkResultAndHandleErrors } from './checkResultAndHandleErrors.js'; interface Transformation { transform: Transform; diff --git a/packages/delegate/src/applySchemaTransforms.ts b/packages/delegate/src/applySchemaTransforms.ts index 6a14f48c968..32db3d1b6b5 100644 --- a/packages/delegate/src/applySchemaTransforms.ts +++ b/packages/delegate/src/applySchemaTransforms.ts @@ -1,6 +1,6 @@ import { GraphQLSchema } from 'graphql'; -import { SubschemaConfig } from './types'; +import { SubschemaConfig } from './types.js'; export function applySchemaTransforms( originalWrappingSchema: GraphQLSchema, diff --git a/packages/delegate/src/checkResultAndHandleErrors.ts b/packages/delegate/src/checkResultAndHandleErrors.ts index 38d8af82753..fa99a836e70 100644 --- a/packages/delegate/src/checkResultAndHandleErrors.ts +++ b/packages/delegate/src/checkResultAndHandleErrors.ts @@ -2,8 +2,8 @@ import { GraphQLResolveInfo, GraphQLOutputType, GraphQLError, responsePathAsArra import { AggregateError, getResponseKeyFromInfo, ExecutionResult, relocatedError } from '@graphql-tools/utils'; -import { DelegationContext } from './types'; -import { resolveExternalValue } from './resolveExternalValue'; +import { DelegationContext } from './types.js'; +import { resolveExternalValue } from './resolveExternalValue.js'; export function checkResultAndHandleErrors>( result: ExecutionResult, diff --git a/packages/delegate/src/createRequest.ts b/packages/delegate/src/createRequest.ts index c8375ebcb71..d8618b87fb4 100644 --- a/packages/delegate/src/createRequest.ts +++ b/packages/delegate/src/createRequest.ts @@ -23,7 +23,7 @@ import { serializeInputValue, updateArgument, } from '@graphql-tools/utils'; -import { ICreateRequest } from './types'; +import { ICreateRequest } from './types.js'; export function getDelegatingOperation(parentType: GraphQLObjectType, schema: GraphQLSchema): OperationTypeNode { if (parentType === schema.getMutationType()) { diff --git a/packages/delegate/src/defaultMergedResolver.ts b/packages/delegate/src/defaultMergedResolver.ts index d80998d7ead..f707950db00 100644 --- a/packages/delegate/src/defaultMergedResolver.ts +++ b/packages/delegate/src/defaultMergedResolver.ts @@ -2,9 +2,9 @@ import { defaultFieldResolver, GraphQLResolveInfo } from 'graphql'; import { getResponseKeyFromInfo } from '@graphql-tools/utils'; -import { resolveExternalValue } from './resolveExternalValue'; -import { getSubschema, getUnpathedErrors, isExternalObject } from './mergeFields'; -import { ExternalObject } from './types'; +import { resolveExternalValue } from './resolveExternalValue.js'; +import { getSubschema, getUnpathedErrors, isExternalObject } from './mergeFields.js'; +import { ExternalObject } from './types.js'; /** * Resolver that knows how to: diff --git a/packages/delegate/src/delegateToSchema.ts b/packages/delegate/src/delegateToSchema.ts index e8abae36448..5890ae1ff28 100644 --- a/packages/delegate/src/delegateToSchema.ts +++ b/packages/delegate/src/delegateToSchema.ts @@ -32,12 +32,12 @@ import { StitchingInfo, DelegationContext, SubschemaConfig, -} from './types'; +} from './types.js'; -import { isSubschemaConfig } from './subschemaConfig'; -import { Subschema } from './Subschema'; -import { createRequest, getDelegatingOperation } from './createRequest'; -import { Transformer } from './Transformer'; +import { isSubschemaConfig } from './subschemaConfig.js'; +import { Subschema } from './Subschema.js'; +import { createRequest, getDelegatingOperation } from './createRequest.js'; +import { Transformer } from './Transformer.js'; export function delegateToSchema< TContext extends Record = Record, diff --git a/packages/delegate/src/finalizeGatewayRequest.ts b/packages/delegate/src/finalizeGatewayRequest.ts index 2a024ca7002..188bfd343f0 100644 --- a/packages/delegate/src/finalizeGatewayRequest.ts +++ b/packages/delegate/src/finalizeGatewayRequest.ts @@ -33,8 +33,8 @@ import { ASTVisitorKeyMap, } from '@graphql-tools/utils'; -import { DelegationContext } from './types'; -import { getDocumentMetadata } from './getDocumentMetadata'; +import { DelegationContext } from './types.js'; +import { getDocumentMetadata } from './getDocumentMetadata.js'; function finalizeGatewayDocument( targetSchema: GraphQLSchema, diff --git a/packages/delegate/src/index.ts b/packages/delegate/src/index.ts index e8f39de2bbc..d7f981b5126 100644 --- a/packages/delegate/src/index.ts +++ b/packages/delegate/src/index.ts @@ -1,10 +1,10 @@ -export * from './Subschema'; -export * from './Transformer'; -export * from './applySchemaTransforms'; -export * from './createRequest'; -export * from './defaultMergedResolver'; -export * from './delegateToSchema'; -export * from './mergeFields'; -export * from './resolveExternalValue'; -export * from './subschemaConfig'; -export * from './types'; +export * from './Subschema.js'; +export * from './Transformer.js'; +export * from './applySchemaTransforms.js'; +export * from './createRequest.js'; +export * from './defaultMergedResolver.js'; +export * from './delegateToSchema.js'; +export * from './mergeFields.js'; +export * from './resolveExternalValue.js'; +export * from './subschemaConfig.js'; +export * from './types.js'; diff --git a/packages/delegate/src/mergeFields.ts b/packages/delegate/src/mergeFields.ts index 5b32cb8b211..7735cac7be0 100644 --- a/packages/delegate/src/mergeFields.ts +++ b/packages/delegate/src/mergeFields.ts @@ -11,9 +11,9 @@ import { import { collectFields, relocatedError } from '@graphql-tools/utils'; -import { ExternalObject, MergedTypeInfo, SubschemaConfig } from './types'; -import { FIELD_SUBSCHEMA_MAP_SYMBOL, OBJECT_SUBSCHEMA_SYMBOL, UNPATHED_ERRORS_SYMBOL } from './symbols'; -import { Subschema } from './Subschema'; +import { ExternalObject, MergedTypeInfo, SubschemaConfig } from './types.js'; +import { FIELD_SUBSCHEMA_MAP_SYMBOL, OBJECT_SUBSCHEMA_SYMBOL, UNPATHED_ERRORS_SYMBOL } from './symbols.js'; +import { Subschema } from './Subschema.js'; export function isExternalObject(data: any): data is ExternalObject { return data[UNPATHED_ERRORS_SYMBOL] !== undefined; diff --git a/packages/delegate/src/prepareGatewayDocument.ts b/packages/delegate/src/prepareGatewayDocument.ts index 34c5f03672b..91a6040b136 100644 --- a/packages/delegate/src/prepareGatewayDocument.ts +++ b/packages/delegate/src/prepareGatewayDocument.ts @@ -20,8 +20,8 @@ import { import { implementsAbstractType, getRootTypeNames, memoize2, ASTVisitorKeyMap } from '@graphql-tools/utils'; -import { getDocumentMetadata } from './getDocumentMetadata'; -import { StitchingInfo } from './types'; +import { getDocumentMetadata } from './getDocumentMetadata.js'; +import { StitchingInfo } from './types.js'; export function prepareGatewayDocument( originalDocument: DocumentNode, diff --git a/packages/delegate/src/resolveExternalValue.ts b/packages/delegate/src/resolveExternalValue.ts index f7dd21b3810..68830754665 100644 --- a/packages/delegate/src/resolveExternalValue.ts +++ b/packages/delegate/src/resolveExternalValue.ts @@ -15,9 +15,9 @@ import { import { AggregateError, Maybe } from '@graphql-tools/utils'; -import { StitchingInfo, SubschemaConfig } from './types'; -import { annotateExternalObject, isExternalObject, mergeFields } from './mergeFields'; -import { Subschema } from './Subschema'; +import { StitchingInfo, SubschemaConfig } from './types.js'; +import { annotateExternalObject, isExternalObject, mergeFields } from './mergeFields.js'; +import { Subschema } from './Subschema.js'; export function resolveExternalValue>( result: any, diff --git a/packages/delegate/src/subschemaConfig.ts b/packages/delegate/src/subschemaConfig.ts index 55c85c9d407..944d3efa467 100644 --- a/packages/delegate/src/subschemaConfig.ts +++ b/packages/delegate/src/subschemaConfig.ts @@ -1,4 +1,4 @@ -import { SubschemaConfig } from './types'; +import { SubschemaConfig } from './types.js'; export function isSubschemaConfig(value: any): value is SubschemaConfig { return Boolean(value?.schema); diff --git a/packages/delegate/src/types.ts b/packages/delegate/src/types.ts index dc659515113..1c821e97ab7 100644 --- a/packages/delegate/src/types.ts +++ b/packages/delegate/src/types.ts @@ -17,8 +17,8 @@ import DataLoader from 'dataloader'; import { ExecutionRequest, ExecutionResult, Executor } from '@graphql-tools/utils'; -import { Subschema } from './Subschema'; -import { OBJECT_SUBSCHEMA_SYMBOL, FIELD_SUBSCHEMA_MAP_SYMBOL, UNPATHED_ERRORS_SYMBOL } from './symbols'; +import { Subschema } from './Subschema.js'; +import { OBJECT_SUBSCHEMA_SYMBOL, FIELD_SUBSCHEMA_MAP_SYMBOL, UNPATHED_ERRORS_SYMBOL } from './symbols.js'; export type SchemaTransform> = ( originalWrappingSchema: GraphQLSchema, diff --git a/packages/delegate/tests/batchExecution.test.ts b/packages/delegate/tests/batchExecution.test.ts index 468fc2259a5..9d3da0d6334 100644 --- a/packages/delegate/tests/batchExecution.test.ts +++ b/packages/delegate/tests/batchExecution.test.ts @@ -1,7 +1,7 @@ import { graphql } from 'graphql'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { createDefaultExecutor, delegateToSchema, SubschemaConfig } from '../src'; +import { createDefaultExecutor, delegateToSchema, SubschemaConfig } from '../src/index.js'; import { stitchSchemas } from '@graphql-tools/stitch'; import { FilterObjectFields } from '@graphql-tools/wrap'; import { Executor } from '@graphql-tools/utils'; diff --git a/packages/delegate/tests/createRequest.test.ts b/packages/delegate/tests/createRequest.test.ts index 091cee21f03..e59ac39dcfd 100644 --- a/packages/delegate/tests/createRequest.test.ts +++ b/packages/delegate/tests/createRequest.test.ts @@ -1,8 +1,8 @@ import { graphql, Kind, GraphQLError, OperationTypeNode } from 'graphql'; -import { createRequest } from '../src/createRequest'; +import { createRequest } from '../src/createRequest.js'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { delegateRequest } from '../src/delegateToSchema'; +import { delegateRequest } from '../src/delegateToSchema.js'; describe('bare requests', () => { test('should work', async () => { diff --git a/packages/delegate/tests/delegateToSchema.test.ts b/packages/delegate/tests/delegateToSchema.test.ts index cb19385ee4f..cd631a39108 100644 --- a/packages/delegate/tests/delegateToSchema.test.ts +++ b/packages/delegate/tests/delegateToSchema.test.ts @@ -1,6 +1,6 @@ import { graphql, OperationTypeNode } from 'graphql'; -import { delegateToSchema } from '../src/delegateToSchema'; +import { delegateToSchema } from '../src/delegateToSchema.js'; import { makeExecutableSchema } from '@graphql-tools/schema'; import { wrapSchema } from '@graphql-tools/wrap'; import { stitchSchemas } from '@graphql-tools/stitch'; diff --git a/packages/delegate/tests/errors.test.ts b/packages/delegate/tests/errors.test.ts index 8bcf0cb8df7..ca9c257c95e 100644 --- a/packages/delegate/tests/errors.test.ts +++ b/packages/delegate/tests/errors.test.ts @@ -4,10 +4,10 @@ import { makeExecutableSchema } from '@graphql-tools/schema'; import { createGraphQLError, ExecutionResult } from '@graphql-tools/utils'; import { stitchSchemas } from '@graphql-tools/stitch'; -import { checkResultAndHandleErrors } from '../src/checkResultAndHandleErrors'; -import { UNPATHED_ERRORS_SYMBOL } from '../src/symbols'; -import { getUnpathedErrors } from '../src/mergeFields'; -import { delegateToSchema, defaultMergedResolver, DelegationContext } from '../src'; +import { checkResultAndHandleErrors } from '../src/checkResultAndHandleErrors.js'; +import { UNPATHED_ERRORS_SYMBOL } from '../src/symbols.js'; +import { getUnpathedErrors } from '../src/mergeFields.js'; +import { delegateToSchema, defaultMergedResolver, DelegationContext } from '../src/index.js'; describe('Errors', () => { describe('getUnpathedErrors', () => { diff --git a/packages/delegate/tests/finalizeGatewayRequest.test.ts b/packages/delegate/tests/finalizeGatewayRequest.test.ts index 32a0363e0fe..391380c1b17 100644 --- a/packages/delegate/tests/finalizeGatewayRequest.test.ts +++ b/packages/delegate/tests/finalizeGatewayRequest.test.ts @@ -1,7 +1,7 @@ import { print, parse } from 'graphql'; import { DelegationContext } from '@graphql-tools/delegate'; -import { bookingSchema, propertySchema } from '../../testing/fixtures/schemas'; -import { finalizeGatewayRequest } from '../src/finalizeGatewayRequest'; +import { bookingSchema, propertySchema } from '../../testing/fixtures/schemas.js'; +import { finalizeGatewayRequest } from '../src/finalizeGatewayRequest.js'; describe('finalizeGatewayRequest', () => { test('should remove empty selection sets on objects', () => { diff --git a/packages/graphql-tag-pluck/package.json b/packages/graphql-tag-pluck/package.json index 43cfb3aee82..71235c26b86 100644 --- a/packages/graphql-tag-pluck/package.json +++ b/packages/graphql-tag-pluck/package.json @@ -9,21 +9,42 @@ "directory": "packages/graphql-tag-pluck" }, "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -51,7 +72,8 @@ ] }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/graphql-tag-pluck/src/config.ts b/packages/graphql-tag-pluck/src/config.ts index 8acaf270218..6ed285dc310 100644 --- a/packages/graphql-tag-pluck/src/config.ts +++ b/packages/graphql-tag-pluck/src/config.ts @@ -1,6 +1,6 @@ -import { GraphQLTagPluckOptions } from '.'; +import { GraphQLTagPluckOptions } from './index.js'; import { ParserOptions } from '@babel/parser'; -import { getExtNameFromFilePath } from './libs/extname'; +import { getExtNameFromFilePath } from './libs/extname.js'; export default function generateConfig( filePath: string, diff --git a/packages/graphql-tag-pluck/src/index.ts b/packages/graphql-tag-pluck/src/index.ts index 274e83c357c..e485770d098 100644 --- a/packages/graphql-tag-pluck/src/index.ts +++ b/packages/graphql-tag-pluck/src/index.ts @@ -1,9 +1,9 @@ -import generateConfig from './config'; +import generateConfig from './config.js'; import { parse } from '@babel/parser'; -import { getExtNameFromFilePath } from './libs/extname'; -import createVisitor, { PluckedContent } from './visitor'; +import { getExtNameFromFilePath } from './libs/extname.js'; +import createVisitor, { PluckedContent } from './visitor.js'; import traversePkg from '@babel/traverse'; -import { freeText } from './utils'; +import { freeText } from './utils.js'; import { Source } from 'graphql'; function getDefault(module: T & { default?: T }): T { diff --git a/packages/graphql-tag-pluck/src/visitor.ts b/packages/graphql-tag-pluck/src/visitor.ts index 72b51183443..3e124e5de55 100644 --- a/packages/graphql-tag-pluck/src/visitor.ts +++ b/packages/graphql-tag-pluck/src/visitor.ts @@ -1,5 +1,5 @@ -import { freeText } from './utils'; -import { GraphQLTagPluckOptions } from '.'; +import { freeText } from './utils.js'; +import { GraphQLTagPluckOptions } from './index.js'; import { isVariableDeclarator, isIdentifier, diff --git a/packages/graphql-tag-pluck/tests/graphql-tag-pluck.test.ts b/packages/graphql-tag-pluck/tests/graphql-tag-pluck.test.ts index 1a8cd0bb0ba..cd3bf474482 100644 --- a/packages/graphql-tag-pluck/tests/graphql-tag-pluck.test.ts +++ b/packages/graphql-tag-pluck/tests/graphql-tag-pluck.test.ts @@ -1,6 +1,6 @@ -import { gqlPluckFromCodeString, gqlPluckFromCodeStringSync } from '../src'; -import { freeText } from '../src/utils'; -import { runTests } from '../../testing/utils'; +import { gqlPluckFromCodeString, gqlPluckFromCodeStringSync } from '../src/index.js'; +import { freeText } from '../src/utils.js'; +import { runTests } from '../../testing/utils.js'; describe('graphql-tag-pluck', () => { runTests({ @@ -1089,7 +1089,7 @@ describe('graphql-tag-pluck', () => { freeText(` import * as React from 'react'; import gql from 'graphql-tag'; - import Generic from './Generic' + import Generic from './Generic.js' export default class extends React.Component<{}, {}> { public render() { diff --git a/packages/graphql-tools/package.json b/packages/graphql-tools/package.json index b964829e236..5c489e976fe 100644 --- a/packages/graphql-tools/package.json +++ b/packages/graphql-tools/package.json @@ -9,21 +9,42 @@ }, "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -32,11 +53,12 @@ "@apollo/client": "~3.2.5 || ~3.3.0 || ~3.4.0 || ~3.5.0 || ~3.6.0" }, "publishConfig": { - "access": "public", - "directory": "dist" + "directory": "dist", + "access": "public" }, "dependencies": { "@graphql-tools/schema": "8.4.0", "tslib": "^2.4.0" - } + }, + "type": "module" } diff --git a/packages/import/package.json b/packages/import/package.json index 506259f389c..77a0d064cca 100644 --- a/packages/import/package.json +++ b/packages/import/package.json @@ -10,32 +10,54 @@ "author": "Dotan Simha ", "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" }, "publishConfig": { - "access": "public", - "directory": "dist" + "directory": "dist", + "access": "public" }, "dependencies": { "@graphql-tools/utils": "8.7.0", "resolve-from": "5.0.0", "tslib": "^2.4.0" - } + }, + "type": "module" } diff --git a/packages/import/tests/documents/import-documents.spec.ts b/packages/import/tests/documents/import-documents.spec.ts index 6e66836e8db..9276df35df0 100644 --- a/packages/import/tests/documents/import-documents.spec.ts +++ b/packages/import/tests/documents/import-documents.spec.ts @@ -1,5 +1,5 @@ import '../../../testing/to-be-similar-gql-doc'; -import { processImport, VisitedFilesMap } from '../../src'; +import { processImport, VisitedFilesMap } from '../../src/index.js'; import { print } from 'graphql'; import { relative } from 'path'; diff --git a/packages/import/tests/schema/import-schema.spec.ts b/packages/import/tests/schema/import-schema.spec.ts index d183e8e7336..d872bcb2b17 100644 --- a/packages/import/tests/schema/import-schema.spec.ts +++ b/packages/import/tests/schema/import-schema.spec.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import '../../../testing/to-be-similar-gql-doc'; -import { parseImportLine, processImport } from '../../src'; +import { parseImportLine, processImport } from '../../src/index.js'; import { mergeTypeDefs } from '@graphql-tools/merge'; import { Kind, print } from 'graphql'; diff --git a/packages/jest-transform/package.json b/packages/jest-transform/package.json index 386d5c9a2b4..653a7a42a0a 100644 --- a/packages/jest-transform/package.json +++ b/packages/jest-transform/package.json @@ -9,21 +9,42 @@ }, "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -38,7 +59,8 @@ "tslib": "^2.4.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/links/package.json b/packages/links/package.json index f08674d8ea2..6cf3762090f 100644 --- a/packages/links/package.json +++ b/packages/links/package.json @@ -9,21 +9,42 @@ }, "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0", @@ -52,7 +73,8 @@ "tslib": "^2.4.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/links/src/AwaitVariablesLink.ts b/packages/links/src/AwaitVariablesLink.ts index ee9595e9eda..f95445c2c23 100644 --- a/packages/links/src/AwaitVariablesLink.ts +++ b/packages/links/src/AwaitVariablesLink.ts @@ -1,5 +1,6 @@ -import { ApolloLink, FetchResult, NextLink, Operation } from '@apollo/client/link/core'; -import { Observable } from '@apollo/client/utilities'; +import * as apolloImport from '@apollo/client'; + +const apollo: typeof apolloImport = (apolloImport as any)?.default ?? apolloImport; function getFinalPromise(object: any): Promise { return Promise.resolve(object).then(resolvedObject => { @@ -23,9 +24,12 @@ function getFinalPromise(object: any): Promise { }); } -export class AwaitVariablesLink extends ApolloLink { - request(operation: Operation, forward: NextLink): Observable { - return new Observable(observer => { +export class AwaitVariablesLink extends apollo.ApolloLink { + request( + operation: apolloImport.Operation, + forward: apolloImport.NextLink + ): apolloImport.Observable { + return new apollo.Observable(observer => { let subscription: any; getFinalPromise(operation.variables) .then(resolvedVariables => { diff --git a/packages/links/src/createServerHttpLink.ts b/packages/links/src/createServerHttpLink.ts index 83b471b529b..afaf079fe9f 100644 --- a/packages/links/src/createServerHttpLink.ts +++ b/packages/links/src/createServerHttpLink.ts @@ -1,12 +1,14 @@ -import { concat } from '@apollo/client/link/core'; +import * as apolloImport from '@apollo/client'; import { createUploadLink, formDataAppendFile, isExtractableFile } from 'apollo-upload-client'; import FormData from 'form-data'; import fetch from 'node-fetch'; -import { AwaitVariablesLink } from './AwaitVariablesLink'; +import { AwaitVariablesLink } from './AwaitVariablesLink.js'; + +const apollo: typeof apolloImport = (apolloImport as any)?.default ?? apolloImport; export const createServerHttpLink = (options: any) => - concat( + apollo.concat( new AwaitVariablesLink(), createUploadLink({ ...options, diff --git a/packages/links/src/index.ts b/packages/links/src/index.ts index 2b2a329a4d9..defbb9f9bad 100644 --- a/packages/links/src/index.ts +++ b/packages/links/src/index.ts @@ -1,4 +1,4 @@ -export { createServerHttpLink } from './createServerHttpLink'; -export { AwaitVariablesLink } from './AwaitVariablesLink'; -export { linkToExecutor } from './linkToExecutor'; -export { GraphQLUpload } from './GraphQLUpload'; +export { createServerHttpLink } from './createServerHttpLink.js'; +export { AwaitVariablesLink } from './AwaitVariablesLink.js'; +export { linkToExecutor } from './linkToExecutor.js'; +export { GraphQLUpload } from './GraphQLUpload.js'; diff --git a/packages/links/src/linkToExecutor.ts b/packages/links/src/linkToExecutor.ts index 4aedcd27ff9..6ebc2a21d58 100644 --- a/packages/links/src/linkToExecutor.ts +++ b/packages/links/src/linkToExecutor.ts @@ -1,6 +1,4 @@ -import { toPromise } from '@apollo/client/core'; -import { ApolloLink, execute } from '@apollo/client/link/core'; -import { Observable } from '@apollo/client/utilities'; +import * as apolloImport from '@apollo/client'; import { Executor, @@ -10,11 +8,13 @@ import { getOperationASTFromRequest, } from '@graphql-tools/utils'; -export function linkToExecutor(link: ApolloLink): Executor { +const apollo: typeof apolloImport = (apolloImport as any)?.default ?? apolloImport; + +export function linkToExecutor(link: apolloImport.ApolloLink): Executor { return function executorFromLink, TContext>( request: ExecutionRequest ) { - const observable = execute(link, { + const observable = apollo.execute(link, { query: request.document, operationName: request.operationName, variables: request.variables, @@ -24,11 +24,11 @@ export function linkToExecutor(link: ApolloLink): Executor { clientAwareness: {}, }, extensions: request.extensions, - }) as Observable>; + }) as apolloImport.Observable>; const operationAst = getOperationASTFromRequest(request); if (operationAst.operation === 'subscription') { return observableToAsyncIterable>(observable); } - return toPromise(observable); + return apollo.toPromise(observable); }; } diff --git a/packages/links/tests/upload.test.ts b/packages/links/tests/upload.test.ts index f0b2c5b50eb..86126ce7f07 100644 --- a/packages/links/tests/upload.test.ts +++ b/packages/links/tests/upload.test.ts @@ -13,7 +13,7 @@ import { buildSchema } from 'graphql'; import { makeExecutableSchema } from '@graphql-tools/schema'; import { stitchSchemas } from '@graphql-tools/stitch'; import { SubschemaConfig } from '@graphql-tools/delegate'; -import { createServerHttpLink, GraphQLUpload as ServerGraphQLUpload, linkToExecutor } from '../src'; +import { createServerHttpLink, GraphQLUpload as ServerGraphQLUpload, linkToExecutor } from '../src/index.js'; function streamToString(stream: Readable) { const chunks: Array = []; diff --git a/packages/load-files/package.json b/packages/load-files/package.json index e75a03277a0..4d50508306c 100644 --- a/packages/load-files/package.json +++ b/packages/load-files/package.json @@ -10,21 +10,42 @@ "author": "Dotan Simha ", "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -35,7 +56,8 @@ "tslib": "^2.4.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/load/package.json b/packages/load/package.json index 03eb4842a10..3c46eb491c4 100644 --- a/packages/load/package.json +++ b/packages/load/package.json @@ -10,21 +10,42 @@ "author": "Dotan Simha ", "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -40,7 +61,8 @@ "tslib": "^2.4.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/load/src/documents.ts b/packages/load/src/documents.ts index ac438270797..edc6ff7a1b2 100644 --- a/packages/load/src/documents.ts +++ b/packages/load/src/documents.ts @@ -1,6 +1,6 @@ import { Source } from '@graphql-tools/utils'; import { Kind } from 'graphql'; -import { LoadTypedefsOptions, loadTypedefs, loadTypedefsSync, UnnormalizedTypeDefPointer } from './load-typedefs'; +import { LoadTypedefsOptions, loadTypedefs, loadTypedefsSync, UnnormalizedTypeDefPointer } from './load-typedefs.js'; type KindList = Array; diff --git a/packages/load/src/index.ts b/packages/load/src/index.ts index 7ffc8ca9e00..970c1c85a63 100644 --- a/packages/load/src/index.ts +++ b/packages/load/src/index.ts @@ -1,4 +1,4 @@ -export * from './load-typedefs'; -export * from './schema'; -export * from './documents'; -export * from './filter-document-kind'; +export * from './load-typedefs.js'; +export * from './schema.js'; +export * from './documents.js'; +export * from './filter-document-kind.js'; diff --git a/packages/load/src/load-typedefs.ts b/packages/load/src/load-typedefs.ts index 821acaf7e18..23a7f976dd5 100644 --- a/packages/load/src/load-typedefs.ts +++ b/packages/load/src/load-typedefs.ts @@ -1,9 +1,9 @@ import { Source, BaseLoaderOptions, Loader, compareStrings, asArray } from '@graphql-tools/utils'; -import { normalizePointers } from './utils/pointers'; -import { applyDefaultOptions } from './load-typedefs/options'; -import { collectSources, collectSourcesSync } from './load-typedefs/collect-sources'; -import { parseSource } from './load-typedefs/parse'; -import { useLimit } from './utils/helpers'; +import { normalizePointers } from './utils/pointers.js'; +import { applyDefaultOptions } from './load-typedefs/options.js'; +import { collectSources, collectSourcesSync } from './load-typedefs/collect-sources.js'; +import { parseSource } from './load-typedefs/parse.js'; +import { useLimit } from './utils/helpers.js'; const CONCURRENCY_LIMIT = 100; diff --git a/packages/load/src/load-typedefs/collect-sources.ts b/packages/load/src/load-typedefs/collect-sources.ts index 8e46dcf6804..985c062e30b 100644 --- a/packages/load/src/load-typedefs/collect-sources.ts +++ b/packages/load/src/load-typedefs/collect-sources.ts @@ -1,10 +1,10 @@ import { Source, isDocumentString, parseGraphQLSDL, getDocumentNodeFromSchema, asArray } from '@graphql-tools/utils'; import { isSchema, Kind } from 'graphql'; -import { LoadTypedefsOptions } from '../load-typedefs'; -import { loadFile, loadFileSync } from './load-file'; -import { stringToHash, useStack, StackNext, StackFn } from '../utils/helpers'; -import { useCustomLoader, useCustomLoaderSync } from '../utils/custom-loader'; -import { useQueue, useSyncQueue } from '../utils/queue'; +import { LoadTypedefsOptions } from '../load-typedefs.js'; +import { loadFile, loadFileSync } from './load-file.js'; +import { stringToHash, useStack, StackNext, StackFn } from '../utils/helpers.js'; +import { useCustomLoader, useCustomLoaderSync } from '../utils/custom-loader.js'; +import { useQueue, useSyncQueue } from '../utils/queue.js'; import { createRequire } from 'module'; import { cwd } from 'process'; diff --git a/packages/load/src/load-typedefs/load-file.ts b/packages/load/src/load-typedefs/load-file.ts index 6dd96eef110..435e02f6445 100644 --- a/packages/load/src/load-typedefs/load-file.ts +++ b/packages/load/src/load-typedefs/load-file.ts @@ -1,6 +1,6 @@ import { Source, AggregateError } from '@graphql-tools/utils'; import { env } from 'process'; -import { LoadTypedefsOptions } from '../load-typedefs'; +import { LoadTypedefsOptions } from '../load-typedefs.js'; export async function loadFile(pointer: string, options: LoadTypedefsOptions): Promise { let results = options.cache?.[pointer]; diff --git a/packages/load/src/load-typedefs/options.ts b/packages/load/src/load-typedefs/options.ts index f572a87877b..23482993883 100644 --- a/packages/load/src/load-typedefs/options.ts +++ b/packages/load/src/load-typedefs/options.ts @@ -1,4 +1,4 @@ -import { LoadTypedefsOptions } from './../load-typedefs'; +import { LoadTypedefsOptions } from './../load-typedefs.js'; import { cwd } from 'process'; export function applyDefaultOptions(options: LoadTypedefsOptions>) { diff --git a/packages/load/src/load-typedefs/parse.ts b/packages/load/src/load-typedefs/parse.ts index d1a201cefba..9f5a1cf497a 100644 --- a/packages/load/src/load-typedefs/parse.ts +++ b/packages/load/src/load-typedefs/parse.ts @@ -5,7 +5,7 @@ import { printWithComments, resetComments, } from '@graphql-tools/utils'; -import { filterKind } from '../filter-document-kind'; +import { filterKind } from '../filter-document-kind.js'; type Options = any; type Input = { diff --git a/packages/load/src/schema.ts b/packages/load/src/schema.ts index ec968b4a93c..d16f84049d5 100644 --- a/packages/load/src/schema.ts +++ b/packages/load/src/schema.ts @@ -1,4 +1,4 @@ -import { loadTypedefs, LoadTypedefsOptions, UnnormalizedTypeDefPointer, loadTypedefsSync } from './load-typedefs'; +import { loadTypedefs, LoadTypedefsOptions, UnnormalizedTypeDefPointer, loadTypedefsSync } from './load-typedefs.js'; import { GraphQLSchema, BuildSchemaOptions, @@ -7,7 +7,7 @@ import { print, lexicographicSortSchema, } from 'graphql'; -import { OPERATION_KINDS } from './documents'; +import { OPERATION_KINDS } from './documents.js'; import { mergeSchemas, MergeSchemasConfig } from '@graphql-tools/schema'; import { Source } from '@graphql-tools/utils'; diff --git a/packages/load/src/utils/pointers.ts b/packages/load/src/utils/pointers.ts index cc70d6718d4..ed21d2f10bd 100644 --- a/packages/load/src/utils/pointers.ts +++ b/packages/load/src/utils/pointers.ts @@ -1,5 +1,5 @@ import { asArray } from '@graphql-tools/utils'; -import { UnnormalizedTypeDefPointer } from './../load-typedefs'; +import { UnnormalizedTypeDefPointer } from './../load-typedefs.js'; export function normalizePointers( unnormalizedPointerOrPointers: UnnormalizedTypeDefPointer | UnnormalizedTypeDefPointer[] diff --git a/packages/load/tests/loaders/documents/documents-from-glob.spec.ts b/packages/load/tests/loaders/documents/documents-from-glob.spec.ts index 7e86660d5e7..634b1bcf094 100644 --- a/packages/load/tests/loaders/documents/documents-from-glob.spec.ts +++ b/packages/load/tests/loaders/documents/documents-from-glob.spec.ts @@ -3,7 +3,7 @@ import { join } from 'path'; import { parse, separateOperations } from 'graphql'; import { GraphQLFileLoader } from '@graphql-tools/graphql-file-loader'; import { CodeFileLoader } from '@graphql-tools/code-file-loader'; -import { runTests } from '../../../../testing/utils'; +import { runTests } from '../../../../testing/utils.js'; import '../../../../testing/to-be-similar-string'; import globby from 'globby'; import { readFileSync } from 'fs'; diff --git a/packages/load/tests/loaders/schema/integration.spec.ts b/packages/load/tests/loaders/schema/integration.spec.ts index 6991f7c9d79..08dd2c2a9fc 100644 --- a/packages/load/tests/loaders/schema/integration.spec.ts +++ b/packages/load/tests/loaders/schema/integration.spec.ts @@ -2,7 +2,7 @@ import { loadSchema, loadSchemaSync } from '@graphql-tools/load'; import { CodeFileLoader } from '@graphql-tools/code-file-loader'; import { GraphQLFileLoader } from '@graphql-tools/graphql-file-loader'; import { printSchema, buildSchema, GraphQLSchema } from 'graphql'; -import { runTests, useMonorepo } from '../../../../testing/utils'; +import { runTests, useMonorepo } from '../../../../testing/utils.js'; import '../../../../testing/to-be-similar-gql-doc'; import { join } from 'path'; diff --git a/packages/load/tests/loaders/schema/schema-from-export.spec.ts b/packages/load/tests/loaders/schema/schema-from-export.spec.ts index 750d553e88f..17c788310d6 100644 --- a/packages/load/tests/loaders/schema/schema-from-export.spec.ts +++ b/packages/load/tests/loaders/schema/schema-from-export.spec.ts @@ -1,7 +1,7 @@ import { isSchema } from 'graphql'; import { loadSchema, loadSchemaSync } from '@graphql-tools/load'; import { CodeFileLoader } from '@graphql-tools/code-file-loader'; -import { runTests, useMonorepo } from '../../../../testing/utils'; +import { runTests, useMonorepo } from '../../../../testing/utils.js'; const monorepo = useMonorepo({ dirname: __dirname, diff --git a/packages/load/tests/loaders/schema/schema-from-json.spec.ts b/packages/load/tests/loaders/schema/schema-from-json.spec.ts index 5380b06b6df..34c771d36a2 100644 --- a/packages/load/tests/loaders/schema/schema-from-json.spec.ts +++ b/packages/load/tests/loaders/schema/schema-from-json.spec.ts @@ -1,7 +1,7 @@ import { loadSchema, loadSchemaSync } from '@graphql-tools/load'; import { JsonFileLoader } from '@graphql-tools/json-file-loader'; import { isSchema } from 'graphql'; -import { runTests, useMonorepo } from '../../../../testing/utils'; +import { runTests, useMonorepo } from '../../../../testing/utils.js'; const monorepo = useMonorepo({ dirname: __dirname, diff --git a/packages/load/tests/loaders/schema/schema-from-string.spec.ts b/packages/load/tests/loaders/schema/schema-from-string.spec.ts index d2166bbecc5..47e82b9f2e9 100644 --- a/packages/load/tests/loaders/schema/schema-from-string.spec.ts +++ b/packages/load/tests/loaders/schema/schema-from-string.spec.ts @@ -2,7 +2,7 @@ import '../../../../testing/to-be-similar-string'; import '../../../../testing/to-be-similar-gql-doc'; import { loadSchema, loadSchemaSync } from '@graphql-tools/load'; import { printSchemaWithDirectives } from '@graphql-tools/utils'; -import { runTests, useMonorepo } from '../../../../testing/utils'; +import { runTests, useMonorepo } from '../../../../testing/utils.js'; import { printSchema } from 'graphql'; const monorepo = useMonorepo({ diff --git a/packages/load/tests/loaders/schema/schema-from-typedefs.spec.ts b/packages/load/tests/loaders/schema/schema-from-typedefs.spec.ts index 0f118666f20..322affacdc2 100644 --- a/packages/load/tests/loaders/schema/schema-from-typedefs.spec.ts +++ b/packages/load/tests/loaders/schema/schema-from-typedefs.spec.ts @@ -1,7 +1,7 @@ import { loadSchema, loadSchemaSync } from '@graphql-tools/load'; import { GraphQLFileLoader } from '@graphql-tools/graphql-file-loader'; import { CodeFileLoader } from '@graphql-tools/code-file-loader'; -import { runTests, useMonorepo } from '../../../../testing/utils'; +import { runTests, useMonorepo } from '../../../../testing/utils.js'; import path from 'path'; import { inspect } from '@graphql-tools/utils'; diff --git a/packages/load/tests/use-custom-loader.spec.ts b/packages/load/tests/use-custom-loader.spec.ts index eb883ee2dff..7fd902f0647 100644 --- a/packages/load/tests/use-custom-loader.spec.ts +++ b/packages/load/tests/use-custom-loader.spec.ts @@ -1,4 +1,4 @@ -import { getCustomLoaderByPath } from '../src/utils/custom-loader'; +import { getCustomLoaderByPath } from '../src/utils/custom-loader.js'; describe('getCustomLoaderByPath', () => { it('can load a custom loader from a file path', async () => { diff --git a/packages/loaders/apollo-engine/package.json b/packages/loaders/apollo-engine/package.json index bed152d4e44..905848d2457 100644 --- a/packages/loaders/apollo-engine/package.json +++ b/packages/loaders/apollo-engine/package.json @@ -10,21 +10,42 @@ "author": "Dotan Simha ", "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -36,7 +57,8 @@ "tslib": "^2.4.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/loaders/code-file/package.json b/packages/loaders/code-file/package.json index 33aa631befd..45705f93a74 100644 --- a/packages/loaders/code-file/package.json +++ b/packages/loaders/code-file/package.json @@ -10,21 +10,42 @@ "author": "Dotan Simha ", "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -37,7 +58,8 @@ "unixify": "^1.0.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/loaders/code-file/src/exports.ts b/packages/loaders/code-file/src/exports.ts index 0217f16dd4b..8a40cb51389 100644 --- a/packages/loaders/code-file/src/exports.ts +++ b/packages/loaders/code-file/src/exports.ts @@ -1,5 +1,5 @@ import { DocumentNode, GraphQLSchema, parse, IntrospectionQuery, buildClientSchema, isSchema } from 'graphql'; -import { isSchemaAst, isSchemaJson, isSchemaText, isWrappedSchemaJson, pick } from './helpers'; +import { isSchemaAst, isSchemaJson, isSchemaText, isWrappedSchemaJson, pick } from './helpers.js'; const identifiersToLookFor = ['default', 'schema', 'typeDefs', 'data']; diff --git a/packages/loaders/code-file/src/index.ts b/packages/loaders/code-file/src/index.ts index 411ea4630c6..1bb59a3f16d 100644 --- a/packages/loaders/code-file/src/index.ts +++ b/packages/loaders/code-file/src/index.ts @@ -18,7 +18,7 @@ import { } from '@graphql-tools/graphql-tag-pluck'; import globby from 'globby'; import unixify from 'unixify'; -import { tryToLoadFromExport, tryToLoadFromExportSync } from './load-from-module'; +import { tryToLoadFromExport, tryToLoadFromExportSync } from './load-from-module.js'; import { isAbsolute, resolve } from 'path'; import { cwd, env } from 'process'; import { readFileSync, promises as fsPromises, existsSync } from 'fs'; diff --git a/packages/loaders/code-file/src/load-from-module.ts b/packages/loaders/code-file/src/load-from-module.ts index f1693e58a8b..8dc672e3238 100644 --- a/packages/loaders/code-file/src/load-from-module.ts +++ b/packages/loaders/code-file/src/load-from-module.ts @@ -1,5 +1,5 @@ import { DocumentNode, GraphQLSchema } from 'graphql'; -import { pickExportFromModule, pickExportFromModuleSync } from './exports'; +import { pickExportFromModule, pickExportFromModuleSync } from './exports.js'; /** * @internal diff --git a/packages/loaders/code-file/tests/load-from-code-file.spec.ts b/packages/loaders/code-file/tests/load-from-code-file.spec.ts index 3484ec1e63a..6616808aec7 100644 --- a/packages/loaders/code-file/tests/load-from-code-file.spec.ts +++ b/packages/loaders/code-file/tests/load-from-code-file.spec.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-non-null-asserted-optional-chain */ import * as path from 'path'; -import { CodeFileLoader } from '../src'; +import { CodeFileLoader } from '../src/index.js'; import { parse } from 'graphql'; describe('loadFromCodeFile', () => { diff --git a/packages/loaders/code-file/tests/schema-from-export.spec.ts b/packages/loaders/code-file/tests/schema-from-export.spec.ts index f4f407a2a31..cc26b61cf35 100644 --- a/packages/loaders/code-file/tests/schema-from-export.spec.ts +++ b/packages/loaders/code-file/tests/schema-from-export.spec.ts @@ -1,4 +1,4 @@ -import { CodeFileLoader } from '../src'; +import { CodeFileLoader } from '../src/index.js'; describe('Schema From Export', () => { const loader = new CodeFileLoader(); diff --git a/packages/loaders/git/package.json b/packages/loaders/git/package.json index 730df4a4df2..88a5fbf38f7 100644 --- a/packages/loaders/git/package.json +++ b/packages/loaders/git/package.json @@ -10,21 +10,42 @@ "author": "Dotan Simha ", "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -42,7 +63,8 @@ "@types/micromatch": "4.0.2" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/loaders/git/src/index.ts b/packages/loaders/git/src/index.ts index 4e0ddb9c38b..2fc49b9f051 100644 --- a/packages/loaders/git/src/index.ts +++ b/packages/loaders/git/src/index.ts @@ -6,8 +6,8 @@ import { import micromatch from 'micromatch'; import unixify from 'unixify'; -import { loadFromGit, loadFromGitSync, readTreeAtRef, readTreeAtRefSync } from './load-git'; -import { parse as handleStuff } from './parse'; +import { loadFromGit, loadFromGitSync, readTreeAtRef, readTreeAtRefSync } from './load-git.js'; +import { parse as handleStuff } from './parse.js'; import { parse } from 'graphql'; import { asArray, BaseLoaderOptions, Loader, Source, AggregateError } from '@graphql-tools/utils'; import isGlob from 'is-glob'; diff --git a/packages/loaders/git/tests/loader.spec.ts b/packages/loaders/git/tests/loader.spec.ts index a17a01fc434..bb19db0c682 100644 --- a/packages/loaders/git/tests/loader.spec.ts +++ b/packages/loaders/git/tests/loader.spec.ts @@ -1,7 +1,7 @@ import { execSync } from 'child_process'; -import { GitLoader } from '../src'; -import { runTests } from '../../../testing/utils'; +import { GitLoader } from '../src/index.js'; +import { runTests } from '../../../testing/utils.js'; describe('GitLoader', () => { const loader = new GitLoader(); diff --git a/packages/loaders/github/package.json b/packages/loaders/github/package.json index a2f88755297..5e21a419675 100644 --- a/packages/loaders/github/package.json +++ b/packages/loaders/github/package.json @@ -10,21 +10,42 @@ "author": "Dotan Simha ", "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -37,7 +58,8 @@ "tslib": "^2.4.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/loaders/github/tests/schema-from-github.spec.ts b/packages/loaders/github/tests/schema-from-github.spec.ts index b367b970fa5..da06378cc06 100644 --- a/packages/loaders/github/tests/schema-from-github.spec.ts +++ b/packages/loaders/github/tests/schema-from-github.spec.ts @@ -1,5 +1,5 @@ import { printSchema, buildSchema, parse, print } from 'graphql'; -import { GithubLoader } from '../src'; +import { GithubLoader } from '../src/index.js'; import { Response } from 'sync-fetch'; const owner = 'kamilkisiela'; diff --git a/packages/loaders/graphql-file/package.json b/packages/loaders/graphql-file/package.json index 73675678cad..70f0e2906a8 100644 --- a/packages/loaders/graphql-file/package.json +++ b/packages/loaders/graphql-file/package.json @@ -10,21 +10,42 @@ "author": "Dotan Simha ", "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -40,7 +61,8 @@ "tslib": "^2.4.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/loaders/graphql-file/tests/loader.spec.ts b/packages/loaders/graphql-file/tests/loader.spec.ts index 8ea680b5a53..62add69c84b 100644 --- a/packages/loaders/graphql-file/tests/loader.spec.ts +++ b/packages/loaders/graphql-file/tests/loader.spec.ts @@ -2,8 +2,8 @@ import { join } from 'path'; import { print } from 'graphql'; -import { GraphQLFileLoader } from '../src'; -import { runTests } from '../../../testing/utils'; +import { GraphQLFileLoader } from '../src/index.js'; +import { runTests } from '../../../testing/utils.js'; import '../../../testing/to-be-similar-gql-doc'; describe('GraphQLFileLoader', () => { diff --git a/packages/loaders/json-file/package.json b/packages/loaders/json-file/package.json index a187aeb7d08..3ca64d3768c 100644 --- a/packages/loaders/json-file/package.json +++ b/packages/loaders/json-file/package.json @@ -10,21 +10,42 @@ "author": "Dotan Simha ", "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -36,7 +57,8 @@ "tslib": "^2.4.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/loaders/json-file/tests/loader.spec.ts b/packages/loaders/json-file/tests/loader.spec.ts index c4768e58924..f502a94c747 100644 --- a/packages/loaders/json-file/tests/loader.spec.ts +++ b/packages/loaders/json-file/tests/loader.spec.ts @@ -1,7 +1,7 @@ import { join } from 'path'; -import { JsonFileLoader } from '../src'; -import { runTests } from '../../../testing/utils'; +import { JsonFileLoader } from '../src/index.js'; +import { runTests } from '../../../testing/utils.js'; describe('JsonFileLoader', () => { const loader = new JsonFileLoader(); diff --git a/packages/loaders/module/package.json b/packages/loaders/module/package.json index f1dc38b8070..b81bf0963e8 100644 --- a/packages/loaders/module/package.json +++ b/packages/loaders/module/package.json @@ -10,21 +10,42 @@ "author": "Dotan Simha ", "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -34,7 +55,8 @@ "tslib": "^2.4.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/loaders/module/tests/loader.spec.ts b/packages/loaders/module/tests/loader.spec.ts index 077b3db1a52..985049ef598 100644 --- a/packages/loaders/module/tests/loader.spec.ts +++ b/packages/loaders/module/tests/loader.spec.ts @@ -1,7 +1,7 @@ import { join } from 'path'; -import { ModuleLoader } from '../src'; -import { runTests } from '../../../testing/utils'; +import { ModuleLoader } from '../src/index.js'; +import { runTests } from '../../../testing/utils.js'; describe('ModuleLoader', () => { const loader = new ModuleLoader(); diff --git a/packages/loaders/prisma/package.json b/packages/loaders/prisma/package.json index 537f41ca4f1..1d54b7c425b 100644 --- a/packages/loaders/prisma/package.json +++ b/packages/loaders/prisma/package.json @@ -10,21 +10,42 @@ "author": "Dotan Simha ", "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -52,7 +73,8 @@ "yaml-ast-parser": "^0.0.43" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/loaders/prisma/src/index.ts b/packages/loaders/prisma/src/index.ts index 7b6c68e4a95..6ecc7037bc7 100644 --- a/packages/loaders/prisma/src/index.ts +++ b/packages/loaders/prisma/src/index.ts @@ -1,5 +1,5 @@ import { UrlLoader, LoadFromUrlOptions } from '@graphql-tools/url-loader'; -import { PrismaDefinitionClass, Environment } from './prisma-yml'; +import { PrismaDefinitionClass, Environment } from './prisma-yml/index.js'; import { join } from 'path'; import { promises as fsPromises } from 'fs'; import { homedir } from 'os'; diff --git a/packages/loaders/prisma/src/prisma-yml/Cluster.test.ts b/packages/loaders/prisma/src/prisma-yml/Cluster.test.ts index 00aab12cc07..709948f0ad6 100644 --- a/packages/loaders/prisma/src/prisma-yml/Cluster.test.ts +++ b/packages/loaders/prisma/src/prisma-yml/Cluster.test.ts @@ -1,4 +1,4 @@ -import { Cluster, Output } from '.'; +import { Cluster, Output } from './index.js'; describe('cluster endpoint generation', () => { test('local cluster', () => { diff --git a/packages/loaders/prisma/src/prisma-yml/Cluster.ts b/packages/loaders/prisma/src/prisma-yml/Cluster.ts index e5e969d328b..01e9aaaf5cd 100644 --- a/packages/loaders/prisma/src/prisma-yml/Cluster.ts +++ b/packages/loaders/prisma/src/prisma-yml/Cluster.ts @@ -1,10 +1,10 @@ import 'isomorphic-fetch'; import jwt from 'jsonwebtoken'; -import { cloudApiEndpoint } from './constants'; +import { cloudApiEndpoint } from './constants.js'; import { GraphQLClient } from 'graphql-request'; import chalk from 'chalk'; -import { IOutput } from './Output'; -import { getProxyAgent } from './utils/getProxyAgent'; +import { IOutput } from './Output.js'; +import { getProxyAgent } from './utils/getProxyAgent.js'; import debugPkg from 'debug'; const debug = debugPkg('Environment'); diff --git a/packages/loaders/prisma/src/prisma-yml/Environment.test.ts b/packages/loaders/prisma/src/prisma-yml/Environment.test.ts index 7abb6fb1714..ffb0c509e5d 100644 --- a/packages/loaders/prisma/src/prisma-yml/Environment.test.ts +++ b/packages/loaders/prisma/src/prisma-yml/Environment.test.ts @@ -1,8 +1,8 @@ -import { Environment } from './Environment'; -import { getTmpDir } from './test/getTmpDir'; +import { Environment } from './Environment.js'; +import { getTmpDir } from './test/getTmpDir.js'; import * as fs from 'fs'; -import { Cluster } from './Cluster'; -import { Output } from './Output'; +import { Cluster } from './Cluster.js'; +import { Output } from './Output.js'; export function makeEnv(_?: string) { const tmpDir = getTmpDir(); diff --git a/packages/loaders/prisma/src/prisma-yml/Environment.ts b/packages/loaders/prisma/src/prisma-yml/Environment.ts index b3c55017a6b..812d852628c 100644 --- a/packages/loaders/prisma/src/prisma-yml/Environment.ts +++ b/packages/loaders/prisma/src/prisma-yml/Environment.ts @@ -1,16 +1,16 @@ -import { Args } from './types/common'; -import { Cluster } from './Cluster'; +import { Args } from './types/common.js'; +import { Cluster } from './Cluster.js'; import * as fs from 'fs'; import * as yaml from 'js-yaml'; -import { ClusterNotFound } from './errors/ClusterNotFound'; -import { Variables } from './Variables'; -import { IOutput, Output } from './Output'; +import { ClusterNotFound } from './errors/ClusterNotFound.js'; +import { Variables } from './Variables.js'; +import { IOutput, Output } from './Output.js'; import * as path from 'path'; import 'isomorphic-fetch'; -import { RC } from './index'; -import { ClusterNotSet } from './errors/ClusterNotSet'; -import { clusterEndpointMap } from './constants'; -import { getProxyAgent } from './utils/getProxyAgent'; +import { RC } from './index.js'; +import { ClusterNotSet } from './errors/ClusterNotSet.js'; +import { clusterEndpointMap } from './constants.js'; +import { getProxyAgent } from './utils/getProxyAgent.js'; // eslint-disable-next-line // @ts-ignore import jwt from 'jsonwebtoken'; diff --git a/packages/loaders/prisma/src/prisma-yml/PrismaDefinition.test.ts b/packages/loaders/prisma/src/prisma-yml/PrismaDefinition.test.ts index f8b7a4e7f89..35f7e4df443 100644 --- a/packages/loaders/prisma/src/prisma-yml/PrismaDefinition.test.ts +++ b/packages/loaders/prisma/src/prisma-yml/PrismaDefinition.test.ts @@ -1,9 +1,9 @@ -import { PrismaDefinitionClass } from './PrismaDefinition'; +import { PrismaDefinitionClass } from './PrismaDefinition.js'; import * as fs from 'fs'; import * as path from 'path'; -import { getTmpDir } from './test/getTmpDir'; -import { makeEnv } from './Environment.test'; -import { Args } from './types/common'; +import { getTmpDir } from './test/getTmpDir.js'; +import { makeEnv } from './Environment.test.js'; +import { Args } from './types/common.js'; const defaultGlobalRC = `prisma-1.0: clusters: diff --git a/packages/loaders/prisma/src/prisma-yml/PrismaDefinition.ts b/packages/loaders/prisma/src/prisma-yml/PrismaDefinition.ts index 48493011ec8..fdfbb775bdd 100644 --- a/packages/loaders/prisma/src/prisma-yml/PrismaDefinition.ts +++ b/packages/loaders/prisma/src/prisma-yml/PrismaDefinition.ts @@ -1,19 +1,19 @@ -import { readDefinition } from './yaml'; -import { PrismaDefinition } from './prisma-json-schema'; +import { readDefinition } from './yaml.js'; +import { PrismaDefinition } from './prisma-json-schema.js'; import * as fs from 'fs'; import * as dotenv from 'dotenv'; import * as path from 'path'; // eslint-disable-next-line // @ts-ignore import jwt from 'jsonwebtoken'; -import { Args } from './types/common'; -import { Environment } from './Environment'; -import { IOutput } from './Output'; -import { Cluster } from './Cluster'; -import { FunctionInput, Header } from './types/rc'; +import { Args } from './types/common.js'; +import { Environment } from './Environment.js'; +import { IOutput } from './Output.js'; +import { Cluster } from './Cluster.js'; +import { FunctionInput, Header } from './types/rc.js'; import chalk from 'chalk'; -import { replaceYamlValue } from './utils/yamlComment'; -import { parseEndpoint, ParseEndpointResult } from './utils/parseEndpoint'; +import { replaceYamlValue } from './utils/yamlComment.js'; +import { parseEndpoint, ParseEndpointResult } from './utils/parseEndpoint.js'; export interface EnvVars { [key: string]: string | undefined; diff --git a/packages/loaders/prisma/src/prisma-yml/Variables.ts b/packages/loaders/prisma/src/prisma-yml/Variables.ts index 6abb8d0bb5a..10aa7f3fb08 100644 --- a/packages/loaders/prisma/src/prisma-yml/Variables.ts +++ b/packages/loaders/prisma/src/prisma-yml/Variables.ts @@ -2,8 +2,8 @@ import _ from 'lodash'; // eslint-disable-next-line // @ts-ignore import replaceall from 'replaceall'; -import { Args } from './types/common'; -import { Output, IOutput } from './Output'; +import { Args } from './types/common.js'; +import { Output, IOutput } from './Output.js'; export class Variables { json: any; diff --git a/packages/loaders/prisma/src/prisma-yml/index.ts b/packages/loaders/prisma/src/prisma-yml/index.ts index a2ff531d639..2867871cbe4 100644 --- a/packages/loaders/prisma/src/prisma-yml/index.ts +++ b/packages/loaders/prisma/src/prisma-yml/index.ts @@ -1,12 +1,12 @@ -export { parseEndpoint } from './utils/parseEndpoint'; -export { Cluster } from './Cluster'; -export { PrismaDefinitionClass } from './PrismaDefinition'; -export { Environment } from './Environment'; -export { Args } from './types/common'; -export { ClusterNotFound } from './errors/ClusterNotFound'; -export { ClusterNotSet } from './errors/ClusterNotSet'; -export { StageNotFound } from './errors/StageNotFound'; -export { Output, IOutput } from './Output'; -export { Variables } from './Variables'; -export { RC, Clusters, ClusterConfig, FunctionInput } from './types/rc'; -export { getProxyAgent } from './utils/getProxyAgent'; +export { parseEndpoint } from './utils/parseEndpoint.js'; +export { Cluster } from './Cluster.js'; +export { PrismaDefinitionClass } from './PrismaDefinition.js'; +export { Environment } from './Environment.js'; +export { Args } from './types/common.js'; +export { ClusterNotFound } from './errors/ClusterNotFound.js'; +export { ClusterNotSet } from './errors/ClusterNotSet.js'; +export { StageNotFound } from './errors/StageNotFound.js'; +export { Output, IOutput } from './Output.js'; +export { Variables } from './Variables.js'; +export { RC, Clusters, ClusterConfig, FunctionInput } from './types/rc.js'; +export { getProxyAgent } from './utils/getProxyAgent.js'; diff --git a/packages/loaders/prisma/src/prisma-yml/utils/parseEndpoint.test.ts b/packages/loaders/prisma/src/prisma-yml/utils/parseEndpoint.test.ts index e0d5c231b2d..a8a46d6f210 100644 --- a/packages/loaders/prisma/src/prisma-yml/utils/parseEndpoint.test.ts +++ b/packages/loaders/prisma/src/prisma-yml/utils/parseEndpoint.test.ts @@ -1,4 +1,4 @@ -import { parseEndpoint } from './parseEndpoint'; +import { parseEndpoint } from './parseEndpoint.js'; describe('parseEndpoint', () => { test('work for minimal url', () => { diff --git a/packages/loaders/prisma/src/prisma-yml/utils/parseEndpoint.ts b/packages/loaders/prisma/src/prisma-yml/utils/parseEndpoint.ts index 59cbc06e7de..2187d61791b 100644 --- a/packages/loaders/prisma/src/prisma-yml/utils/parseEndpoint.ts +++ b/packages/loaders/prisma/src/prisma-yml/utils/parseEndpoint.ts @@ -1,4 +1,4 @@ -import { clusterEndpointMapReverse } from '../constants'; +import { clusterEndpointMapReverse } from '../constants.js'; import { URL } from 'url'; function getClusterName(origin: any): string { diff --git a/packages/loaders/prisma/src/prisma-yml/utils/yamlComment.test.ts b/packages/loaders/prisma/src/prisma-yml/utils/yamlComment.test.ts index 199c9242996..413b9c050a1 100644 --- a/packages/loaders/prisma/src/prisma-yml/utils/yamlComment.test.ts +++ b/packages/loaders/prisma/src/prisma-yml/utils/yamlComment.test.ts @@ -1,4 +1,4 @@ -import { replaceYamlValue, migrateToEndpoint } from './yamlComment'; +import { replaceYamlValue, migrateToEndpoint } from './yamlComment.js'; describe('replaceYamlValue', () => { test('when document is clean', () => { diff --git a/packages/loaders/prisma/src/prisma-yml/yaml.ts b/packages/loaders/prisma/src/prisma-yml/yaml.ts index 83babb05eab..3adc9953c00 100644 --- a/packages/loaders/prisma/src/prisma-yml/yaml.ts +++ b/packages/loaders/prisma/src/prisma-yml/yaml.ts @@ -1,9 +1,9 @@ import * as yaml from 'js-yaml'; import * as fs from 'fs'; -import { PrismaDefinition } from './prisma-json-schema'; -import { Variables } from './Variables'; -import { Args } from './types/common'; -import { Output, IOutput } from './Output'; +import { PrismaDefinition } from './prisma-json-schema.js'; +import { Variables } from './Variables.js'; +import { Args } from './types/common.js'; +import { Output, IOutput } from './Output.js'; const cache = {}; diff --git a/packages/loaders/url/package.json b/packages/loaders/url/package.json index 35474235838..934faeaa2bc 100644 --- a/packages/loaders/url/package.json +++ b/packages/loaders/url/package.json @@ -10,26 +10,47 @@ "author": "Dotan Simha ", "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "buildOptions": { "external": [ "eventsource/lib/eventsource-polyfill" ] }, "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -66,7 +87,8 @@ "ws": "^8.3.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/loaders/url/src/event-stream/handleEventStreamResponse.ts b/packages/loaders/url/src/event-stream/handleEventStreamResponse.ts index b63aecbb143..2b4db366b70 100644 --- a/packages/loaders/url/src/event-stream/handleEventStreamResponse.ts +++ b/packages/loaders/url/src/event-stream/handleEventStreamResponse.ts @@ -1,7 +1,7 @@ import { ExecutionResult } from 'graphql'; import { inspect, isAsyncIterable } from '@graphql-tools/utils'; -import { handleReadable } from './handleReadable'; -import { handleReadableStream } from './handleReadableStream'; +import { handleReadable } from './handleReadable.js'; +import { handleReadableStream } from './handleReadableStream.js'; export async function handleEventStreamResponse(response: Response): Promise> { // node-fetch returns body as a promise so we need to resolve it diff --git a/packages/loaders/url/src/index.ts b/packages/loaders/url/src/index.ts index 028d78af06b..b7bb72f71b9 100644 --- a/packages/loaders/url/src/index.ts +++ b/packages/loaders/url/src/index.ts @@ -22,13 +22,13 @@ import WebSocket from 'isomorphic-ws'; import { extractFiles, isExtractableFile } from 'extract-files'; import { ValueOrPromise } from 'value-or-promise'; import { isLiveQueryOperationDefinitionNode } from '@n1ru4l/graphql-live-query'; -import { AsyncFetchFn, defaultAsyncFetch } from './defaultAsyncFetch'; -import { defaultSyncFetch, SyncFetchFn } from './defaultSyncFetch'; -import { handleMultipartMixedResponse } from './handleMultipartMixedResponse'; -import { handleEventStreamResponse } from './event-stream/handleEventStreamResponse'; -import { addCancelToResponseStream } from './addCancelToResponseStream'; +import { AsyncFetchFn, defaultAsyncFetch } from './defaultAsyncFetch.js'; +import { defaultSyncFetch, SyncFetchFn } from './defaultSyncFetch.js'; +import { handleMultipartMixedResponse } from './handleMultipartMixedResponse.js'; +import { handleEventStreamResponse } from './event-stream/handleEventStreamResponse.js'; +import { addCancelToResponseStream } from './addCancelToResponseStream.js'; import { AbortController, FormData, File } from 'cross-undici-fetch'; -import { isBlob, isGraphQLUpload, isPromiseLike, LEGACY_WS } from './utils'; +import { isBlob, isGraphQLUpload, isPromiseLike, LEGACY_WS } from './utils.js'; export type FetchFn = AsyncFetchFn | SyncFetchFn; diff --git a/packages/loaders/url/tests/handleEventStreamResponse.test.ts b/packages/loaders/url/tests/handleEventStreamResponse.test.ts index ef1e437b13a..5d783951814 100644 --- a/packages/loaders/url/tests/handleEventStreamResponse.test.ts +++ b/packages/loaders/url/tests/handleEventStreamResponse.test.ts @@ -1,4 +1,4 @@ -import { handleEventStreamResponse } from '../src/event-stream/handleEventStreamResponse'; +import { handleEventStreamResponse } from '../src/event-stream/handleEventStreamResponse.js'; import { ReadableStream, Response } from 'cross-undici-fetch'; describe('handleEventStreamResponse', () => { diff --git a/packages/loaders/url/tests/url-loader-browser.spec.ts b/packages/loaders/url/tests/url-loader-browser.spec.ts index 12a8f7954c9..aa27d3d1daf 100644 --- a/packages/loaders/url/tests/url-loader-browser.spec.ts +++ b/packages/loaders/url/tests/url-loader-browser.spec.ts @@ -3,7 +3,7 @@ import path from 'path'; import fs from 'fs'; import http from 'http'; import puppeteer from 'puppeteer'; -import type * as UrlLoaderModule from '../src'; +import type * as UrlLoaderModule from '../src/index.js'; import { ExecutionResult, parse } from 'graphql'; describe('[url-loader] webpack bundle compat', () => { @@ -22,7 +22,7 @@ describe('[url-loader] webpack bundle compat', () => { webpack( { mode: 'development', - entry: path.resolve(__dirname, '..', 'dist', 'index.mjs'), + entry: path.resolve(__dirname, '..', 'dist', 'esm', 'index.js'), output: { path: path.resolve(__dirname), filename: 'webpack.js', diff --git a/packages/loaders/url/tests/url-loader.spec.ts b/packages/loaders/url/tests/url-loader.spec.ts index c4a6350f467..f4fd87416b3 100644 --- a/packages/loaders/url/tests/url-loader.spec.ts +++ b/packages/loaders/url/tests/url-loader.spec.ts @@ -1,6 +1,6 @@ import '../../../testing/to-be-similar-gql-doc'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { SubscriptionProtocol, UrlLoader } from '../src'; +import { SubscriptionProtocol, UrlLoader } from '../src/index.js'; import { isAsyncIterable, printSchemaWithDirectives } from '@graphql-tools/utils'; import { execute, @@ -23,7 +23,7 @@ import { createHandler } from 'graphql-sse'; import { Server as WSServer } from 'ws'; import http from 'http'; import { SubscriptionServer } from 'subscriptions-transport-ws'; -import { AsyncFetchFn, defaultAsyncFetch } from '../src/defaultAsyncFetch'; +import { AsyncFetchFn, defaultAsyncFetch } from '../src/defaultAsyncFetch.js'; import { Response, File, Headers } from 'cross-undici-fetch'; import express from 'express'; import { inspect } from 'util'; diff --git a/packages/merge/package.json b/packages/merge/package.json index b9e60ae9bcf..b081aa7bb75 100644 --- a/packages/merge/package.json +++ b/packages/merge/package.json @@ -10,21 +10,42 @@ "author": "Dotan Simha ", "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -37,7 +58,8 @@ "tslib": "^2.4.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/merge/src/index.ts b/packages/merge/src/index.ts index 49d7c2dfa6a..0cf56486ef0 100644 --- a/packages/merge/src/index.ts +++ b/packages/merge/src/index.ts @@ -1,3 +1,3 @@ -export * from './merge-resolvers'; -export * from './typedefs-mergers'; -export * from './extensions'; +export * from './merge-resolvers.js'; +export * from './typedefs-mergers/index.js'; +export * from './extensions.js'; diff --git a/packages/merge/src/typedefs-mergers/arguments.ts b/packages/merge/src/typedefs-mergers/arguments.ts index c1e13be5438..2f31a533a07 100644 --- a/packages/merge/src/typedefs-mergers/arguments.ts +++ b/packages/merge/src/typedefs-mergers/arguments.ts @@ -1,5 +1,5 @@ import { InputValueDefinitionNode } from 'graphql'; -import { Config } from '.'; +import { Config } from './index.js'; import { compareNodes, isSome } from '@graphql-tools/utils'; export function mergeArguments( diff --git a/packages/merge/src/typedefs-mergers/directives.ts b/packages/merge/src/typedefs-mergers/directives.ts index ef2a2410ee1..1cffa9aab41 100644 --- a/packages/merge/src/typedefs-mergers/directives.ts +++ b/packages/merge/src/typedefs-mergers/directives.ts @@ -1,5 +1,5 @@ import { ArgumentNode, DirectiveNode, DirectiveDefinitionNode, ListValueNode, NameNode, print } from 'graphql'; -import { Config } from './merge-typedefs'; +import { Config } from './merge-typedefs.js'; import { isSome } from '@graphql-tools/utils'; function directiveAlreadyExists(directivesArr: ReadonlyArray, otherDirective: DirectiveNode): boolean { diff --git a/packages/merge/src/typedefs-mergers/enum-values.ts b/packages/merge/src/typedefs-mergers/enum-values.ts index c4b81a49ffb..377d6bdbdc2 100644 --- a/packages/merge/src/typedefs-mergers/enum-values.ts +++ b/packages/merge/src/typedefs-mergers/enum-values.ts @@ -1,6 +1,6 @@ import { EnumValueDefinitionNode } from 'graphql'; -import { mergeDirectives } from './directives'; -import { Config } from './merge-typedefs'; +import { mergeDirectives } from './directives.js'; +import { Config } from './merge-typedefs.js'; import { compareNodes } from '@graphql-tools/utils'; export function mergeEnumValues( diff --git a/packages/merge/src/typedefs-mergers/enum.ts b/packages/merge/src/typedefs-mergers/enum.ts index 160ab36d1c6..a80082fcc26 100644 --- a/packages/merge/src/typedefs-mergers/enum.ts +++ b/packages/merge/src/typedefs-mergers/enum.ts @@ -1,7 +1,7 @@ import { EnumTypeDefinitionNode, EnumTypeExtensionNode, Kind } from 'graphql'; -import { mergeDirectives } from './directives'; -import { mergeEnumValues } from './enum-values'; -import { Config } from './merge-typedefs'; +import { mergeDirectives } from './directives.js'; +import { mergeEnumValues } from './enum-values.js'; +import { Config } from './merge-typedefs.js'; export function mergeEnum( e1: EnumTypeDefinitionNode | EnumTypeExtensionNode, diff --git a/packages/merge/src/typedefs-mergers/fields.ts b/packages/merge/src/typedefs-mergers/fields.ts index b9f5d1ab1b5..c2235c81e32 100644 --- a/packages/merge/src/typedefs-mergers/fields.ts +++ b/packages/merge/src/typedefs-mergers/fields.ts @@ -1,9 +1,9 @@ -import { Config } from './merge-typedefs'; +import { Config } from './merge-typedefs.js'; import { FieldDefinitionNode, InputValueDefinitionNode, TypeNode, NameNode } from 'graphql'; -import { extractType, isWrappingTypeNode, isListTypeNode, isNonNullTypeNode, printTypeNode } from './utils'; -import { mergeDirectives } from './directives'; +import { extractType, isWrappingTypeNode, isListTypeNode, isNonNullTypeNode, printTypeNode } from './utils.js'; +import { mergeDirectives } from './directives.js'; import { compareNodes } from '@graphql-tools/utils'; -import { mergeArguments } from './arguments'; +import { mergeArguments } from './arguments.js'; function fieldAlreadyExists(fieldsArr: ReadonlyArray, otherField: any, config?: Config): boolean { const result: FieldDefinitionNode | null = fieldsArr.find(field => field.name.value === otherField.name.value); diff --git a/packages/merge/src/typedefs-mergers/index.ts b/packages/merge/src/typedefs-mergers/index.ts index 44e1b0f5323..a2f93622aa2 100644 --- a/packages/merge/src/typedefs-mergers/index.ts +++ b/packages/merge/src/typedefs-mergers/index.ts @@ -1,14 +1,14 @@ -export * from './arguments'; -export * from './directives'; -export * from './enum-values'; -export * from './enum'; -export * from './fields'; -export * from './input-type'; -export * from './interface'; -export * from './merge-named-type-array'; -export * from './merge-nodes'; -export * from './merge-typedefs'; -export * from './scalar'; -export * from './type'; -export * from './union'; -export * from './utils'; +export * from './arguments.js'; +export * from './directives.js'; +export * from './enum-values.js'; +export * from './enum.js'; +export * from './fields.js'; +export * from './input-type.js'; +export * from './interface.js'; +export * from './merge-named-type-array.js'; +export * from './merge-nodes.js'; +export * from './merge-typedefs.js'; +export * from './scalar.js'; +export * from './type.js'; +export * from './union.js'; +export * from './utils.js'; diff --git a/packages/merge/src/typedefs-mergers/input-type.ts b/packages/merge/src/typedefs-mergers/input-type.ts index f2d4ad517c3..25ebd135e39 100644 --- a/packages/merge/src/typedefs-mergers/input-type.ts +++ b/packages/merge/src/typedefs-mergers/input-type.ts @@ -1,7 +1,7 @@ -import { Config } from './merge-typedefs'; +import { Config } from './merge-typedefs.js'; import { InputObjectTypeDefinitionNode, InputValueDefinitionNode, InputObjectTypeExtensionNode, Kind } from 'graphql'; -import { mergeFields } from './fields'; -import { mergeDirectives } from './directives'; +import { mergeFields } from './fields.js'; +import { mergeDirectives } from './directives.js'; export function mergeInputType( node: InputObjectTypeDefinitionNode | InputObjectTypeExtensionNode, diff --git a/packages/merge/src/typedefs-mergers/interface.ts b/packages/merge/src/typedefs-mergers/interface.ts index 7b86f0a6051..9cafe854819 100644 --- a/packages/merge/src/typedefs-mergers/interface.ts +++ b/packages/merge/src/typedefs-mergers/interface.ts @@ -1,8 +1,8 @@ -import { Config } from './merge-typedefs'; +import { Config } from './merge-typedefs.js'; import { InterfaceTypeDefinitionNode, InterfaceTypeExtensionNode, Kind } from 'graphql'; -import { mergeFields } from './fields'; -import { mergeDirectives } from './directives'; -import { mergeNamedTypeArray } from '.'; +import { mergeFields } from './fields.js'; +import { mergeDirectives } from './directives.js'; +import { mergeNamedTypeArray } from './index.js'; export function mergeInterface( node: InterfaceTypeDefinitionNode | InterfaceTypeExtensionNode, diff --git a/packages/merge/src/typedefs-mergers/merge-named-type-array.ts b/packages/merge/src/typedefs-mergers/merge-named-type-array.ts index 6b6574684e0..0e1a3ac6987 100644 --- a/packages/merge/src/typedefs-mergers/merge-named-type-array.ts +++ b/packages/merge/src/typedefs-mergers/merge-named-type-array.ts @@ -1,5 +1,5 @@ import { NamedTypeNode } from 'graphql'; -import { Config } from '.'; +import { Config } from '../index.js'; import { compareNodes } from '@graphql-tools/utils'; function alreadyExists(arr: ReadonlyArray, other: NamedTypeNode): boolean { diff --git a/packages/merge/src/typedefs-mergers/merge-nodes.ts b/packages/merge/src/typedefs-mergers/merge-nodes.ts index be999a6cc4d..f2989aa154b 100644 --- a/packages/merge/src/typedefs-mergers/merge-nodes.ts +++ b/packages/merge/src/typedefs-mergers/merge-nodes.ts @@ -1,13 +1,13 @@ -import { Config } from './merge-typedefs'; +import { Config } from './merge-typedefs.js'; import { DefinitionNode, Kind, SchemaDefinitionNode, SchemaExtensionNode } from 'graphql'; -import { mergeType } from './type'; -import { mergeEnum } from './enum'; -import { mergeScalar } from './scalar'; -import { mergeUnion } from './union'; -import { mergeInputType } from './input-type'; -import { mergeInterface } from './interface'; -import { mergeDirective } from './directives'; -import { mergeSchemaDefs } from './schema-def'; +import { mergeType } from './type.js'; +import { mergeEnum } from './enum.js'; +import { mergeScalar } from './scalar.js'; +import { mergeUnion } from './union.js'; +import { mergeInputType } from './input-type.js'; +import { mergeInterface } from './interface.js'; +import { mergeDirective } from './directives.js'; +import { mergeSchemaDefs } from './schema-def.js'; import { NamedDefinitionNode, collectComment } from '@graphql-tools/utils'; export const schemaDefSymbol = 'SCHEMA_DEF_SYMBOL'; diff --git a/packages/merge/src/typedefs-mergers/merge-typedefs.ts b/packages/merge/src/typedefs-mergers/merge-typedefs.ts index 3916d729006..97913331602 100644 --- a/packages/merge/src/typedefs-mergers/merge-typedefs.ts +++ b/packages/merge/src/typedefs-mergers/merge-typedefs.ts @@ -9,8 +9,8 @@ import { isDefinitionNode, ParseOptions, } from 'graphql'; -import { CompareFn, defaultStringComparator, isSourceTypes, isStringTypes } from './utils'; -import { MergedResultMap, mergeGraphQLNodes, schemaDefSymbol } from './merge-nodes'; +import { CompareFn, defaultStringComparator, isSourceTypes, isStringTypes } from './utils.js'; +import { MergedResultMap, mergeGraphQLNodes, schemaDefSymbol } from './merge-nodes.js'; import { getDocumentNodeFromSchema, GetDocumentNodeFromSchemaOptions, @@ -19,7 +19,7 @@ import { resetComments, printWithComments, } from '@graphql-tools/utils'; -import { DEFAULT_OPERATION_TYPE_NAME_MAP } from './schema-def'; +import { DEFAULT_OPERATION_TYPE_NAME_MAP } from './schema-def.js'; type Omit = Pick>; diff --git a/packages/merge/src/typedefs-mergers/scalar.ts b/packages/merge/src/typedefs-mergers/scalar.ts index 5869cf2852d..cdfeabb5156 100644 --- a/packages/merge/src/typedefs-mergers/scalar.ts +++ b/packages/merge/src/typedefs-mergers/scalar.ts @@ -1,6 +1,6 @@ import { Kind, ScalarTypeDefinitionNode, ScalarTypeExtensionNode } from 'graphql'; -import { mergeDirectives } from './directives'; -import { Config } from './merge-typedefs'; +import { mergeDirectives } from './directives.js'; +import { Config } from './merge-typedefs.js'; export function mergeScalar( node: ScalarTypeDefinitionNode | ScalarTypeExtensionNode, diff --git a/packages/merge/src/typedefs-mergers/schema-def.ts b/packages/merge/src/typedefs-mergers/schema-def.ts index 2e4002b454c..6c82d099d1d 100644 --- a/packages/merge/src/typedefs-mergers/schema-def.ts +++ b/packages/merge/src/typedefs-mergers/schema-def.ts @@ -1,6 +1,6 @@ import { Kind, OperationTypeDefinitionNode, SchemaDefinitionNode, SchemaExtensionNode } from 'graphql'; -import { mergeDirectives } from './directives'; -import { Config } from './merge-typedefs'; +import { mergeDirectives } from './directives.js'; +import { Config } from './merge-typedefs.js'; export const DEFAULT_OPERATION_TYPE_NAME_MAP = { query: 'Query', diff --git a/packages/merge/src/typedefs-mergers/type.ts b/packages/merge/src/typedefs-mergers/type.ts index bdc546c8b3f..5ae2d58f8b4 100644 --- a/packages/merge/src/typedefs-mergers/type.ts +++ b/packages/merge/src/typedefs-mergers/type.ts @@ -1,8 +1,8 @@ -import { Config } from './merge-typedefs'; +import { Config } from './merge-typedefs.js'; import { Kind, ObjectTypeDefinitionNode, ObjectTypeExtensionNode } from 'graphql'; -import { mergeFields } from './fields'; -import { mergeDirectives } from './directives'; -import { mergeNamedTypeArray } from './merge-named-type-array'; +import { mergeFields } from './fields.js'; +import { mergeDirectives } from './directives.js'; +import { mergeNamedTypeArray } from './merge-named-type-array.js'; export function mergeType( node: ObjectTypeDefinitionNode | ObjectTypeExtensionNode, diff --git a/packages/merge/src/typedefs-mergers/union.ts b/packages/merge/src/typedefs-mergers/union.ts index 86aff8ac19d..3e08f92b390 100644 --- a/packages/merge/src/typedefs-mergers/union.ts +++ b/packages/merge/src/typedefs-mergers/union.ts @@ -1,7 +1,7 @@ import { Kind, UnionTypeDefinitionNode, UnionTypeExtensionNode } from 'graphql'; -import { mergeDirectives } from './directives'; -import { mergeNamedTypeArray } from './merge-named-type-array'; -import { Config } from './merge-typedefs'; +import { mergeDirectives } from './directives.js'; +import { mergeNamedTypeArray } from './merge-named-type-array.js'; +import { Config } from './merge-typedefs.js'; export function mergeUnion( first: UnionTypeDefinitionNode | UnionTypeExtensionNode, diff --git a/packages/merge/tests/extract-extensions-from-schema.spec.ts b/packages/merge/tests/extract-extensions-from-schema.spec.ts index 6ac63540943..703e0ba89a1 100644 --- a/packages/merge/tests/extract-extensions-from-schema.spec.ts +++ b/packages/merge/tests/extract-extensions-from-schema.spec.ts @@ -6,9 +6,9 @@ import { assertGraphQLInterfaceType, assertGraphQLUnionType, assertGraphQLScalerType, -} from '../../testing/assertion'; +} from '../../testing/assertion.js'; import { assertSome } from '@graphql-tools/utils'; -import { extractExtensionsFromSchema, mergeExtensions, applyExtensions } from '../src/extensions'; +import { extractExtensionsFromSchema, mergeExtensions, applyExtensions } from '../src/extensions.js'; describe('extensions', () => { let schema: GraphQLSchema; diff --git a/packages/merge/tests/merge-nodes.spec.ts b/packages/merge/tests/merge-nodes.spec.ts index 20476c28e1c..cafb25753c3 100644 --- a/packages/merge/tests/merge-nodes.spec.ts +++ b/packages/merge/tests/merge-nodes.spec.ts @@ -1,4 +1,4 @@ -import { mergeGraphQLNodes } from '../src'; +import { mergeGraphQLNodes } from '../src/index.js'; import { parse } from 'graphql'; import { assertEnumTypeDefinitionNode, @@ -7,7 +7,7 @@ import { assertObjectTypeDefinitionNode, assertScalarTypeDefinitionNode, assertUnionTypeDefinitionNode, -} from '../../testing/assertion'; +} from '../../testing/assertion.js'; import { assertSome } from '@graphql-tools/utils'; describe('Merge Nodes', () => { diff --git a/packages/merge/tests/merge-resolvers.spec.ts b/packages/merge/tests/merge-resolvers.spec.ts index b0c928dac11..450c2a82291 100644 --- a/packages/merge/tests/merge-resolvers.spec.ts +++ b/packages/merge/tests/merge-resolvers.spec.ts @@ -1,4 +1,4 @@ -import { mergeResolvers } from '../src'; +import { mergeResolvers } from '../src/index.js'; describe('Merge Resolvers', () => { it('should return the correct value when falsely value provided', () => { diff --git a/packages/merge/tests/merge-typedefs.spec.ts b/packages/merge/tests/merge-typedefs.spec.ts index 3d190a72684..95a3e9abc44 100644 --- a/packages/merge/tests/merge-typedefs.spec.ts +++ b/packages/merge/tests/merge-typedefs.spec.ts @@ -1,10 +1,10 @@ import '../../testing/to-be-similar-gql-doc'; import '../../testing/to-be-similar-string'; -import { mergeDirectives, mergeTypeDefs, mergeGraphQLTypes } from '../src'; +import { mergeDirectives, mergeTypeDefs, mergeGraphQLTypes } from '../src/index.js'; import { makeExecutableSchema } from '@graphql-tools/schema'; import { stitchSchemas } from '@graphql-tools/stitch'; import { buildSchema, buildClientSchema, print, parse, Kind, DirectiveNode, version as graphqlVersion } from 'graphql'; -import { stripWhitespaces } from './utils'; +import { stripWhitespaces } from './utils.js'; import gql from 'graphql-tag'; import { readFileSync } from 'fs'; import { join } from 'path'; diff --git a/packages/mock/package.json b/packages/mock/package.json index f0962996238..c1a3412471c 100644 --- a/packages/mock/package.json +++ b/packages/mock/package.json @@ -9,21 +9,42 @@ }, "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -41,7 +62,8 @@ "casual": "1.6.2" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/mock/src/MockStore.ts b/packages/mock/src/MockStore.ts index 7e3d4f8c854..937f3456412 100644 --- a/packages/mock/src/MockStore.ts +++ b/packages/mock/src/MockStore.ts @@ -27,9 +27,9 @@ import { KeyTypeConstraints, IScalarMock, ITypeMock, -} from './types'; -import { uuidv4, randomListLength, takeRandom, makeRef } from './utils'; -import { deepResolveMockList, isMockList } from './MockList'; +} from './types.js'; +import { uuidv4, randomListLength, takeRandom, makeRef } from './utils.js'; +import { deepResolveMockList, isMockList } from './MockList.js'; export const defaultMocks = { Int: () => Math.round(Math.random() * 200) - 100, diff --git a/packages/mock/src/addMocksToSchema.ts b/packages/mock/src/addMocksToSchema.ts index f13b01caeb2..d82cc6daea0 100644 --- a/packages/mock/src/addMocksToSchema.ts +++ b/packages/mock/src/addMocksToSchema.ts @@ -10,9 +10,9 @@ import { } from 'graphql'; import { mapSchema, MapperKind, IResolvers } from '@graphql-tools/utils'; import { addResolversToSchema } from '@graphql-tools/schema'; -import { isRef, IMockStore, IMocks, TypePolicy } from './types'; -import { copyOwnProps, isObject, isRootType } from './utils'; -import { createMockStore } from './MockStore'; +import { isRef, IMockStore, IMocks, TypePolicy } from './types.js'; +import { copyOwnProps, isObject, isRootType } from './utils.js'; +import { createMockStore } from './MockStore.js'; type IMockOptions = { schema: GraphQLSchema; diff --git a/packages/mock/src/index.ts b/packages/mock/src/index.ts index 36c1c6c9522..70215cd6d97 100644 --- a/packages/mock/src/index.ts +++ b/packages/mock/src/index.ts @@ -1,6 +1,6 @@ -export * from './MockStore'; -export * from './addMocksToSchema'; -export * from './mockServer'; -export * from './types'; -export * from './MockList'; -export * from './pagination'; +export * from './MockStore.js'; +export * from './addMocksToSchema.js'; +export * from './mockServer.js'; +export * from './types.js'; +export * from './MockList.js'; +export * from './pagination.js'; diff --git a/packages/mock/src/mockServer.ts b/packages/mock/src/mockServer.ts index 6a6a1891944..192c272e876 100644 --- a/packages/mock/src/mockServer.ts +++ b/packages/mock/src/mockServer.ts @@ -1,8 +1,8 @@ import { TypeSource } from '@graphql-tools/utils'; import { isSchema, graphql } from 'graphql'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { addMocksToSchema } from './addMocksToSchema'; -import { IMockServer, IMocks } from './types'; +import { addMocksToSchema } from './addMocksToSchema.js'; +import { IMockServer, IMocks } from './types.js'; /** * A convenience wrapper on top of addMocksToSchema. It adds your mock resolvers diff --git a/packages/mock/src/pagination.ts b/packages/mock/src/pagination.ts index 60a1f28cddf..ab02dd01859 100644 --- a/packages/mock/src/pagination.ts +++ b/packages/mock/src/pagination.ts @@ -1,7 +1,7 @@ import { IFieldResolver } from '@graphql-tools/utils'; import { GraphQLResolveInfo } from 'graphql'; -import { IMockStore, Ref } from './types'; -import { isRootType, makeRef } from './utils'; +import { IMockStore, Ref } from './types.js'; +import { isRootType, makeRef } from './utils.js'; export type AllNodesFn = ( parent: Ref, diff --git a/packages/mock/src/utils.ts b/packages/mock/src/utils.ts index 5aafe3c3a98..6714dfb00e2 100644 --- a/packages/mock/src/utils.ts +++ b/packages/mock/src/utils.ts @@ -1,6 +1,6 @@ import { getRootTypeNames } from '@graphql-tools/utils'; import { GraphQLObjectType, GraphQLSchema } from 'graphql'; -import { Ref, KeyTypeConstraints } from './types'; +import { Ref, KeyTypeConstraints } from './types.js'; export function uuidv4() { return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => { diff --git a/packages/mock/tests/addMocksToSchema.spec.ts b/packages/mock/tests/addMocksToSchema.spec.ts index 79b5d591e7e..923a35e3aa9 100644 --- a/packages/mock/tests/addMocksToSchema.spec.ts +++ b/packages/mock/tests/addMocksToSchema.spec.ts @@ -1,5 +1,5 @@ import { buildSchema, graphql } from 'graphql'; -import { addMocksToSchema, assertIsRef, createMockStore, isRef } from '../src'; +import { addMocksToSchema, assertIsRef, createMockStore, isRef } from '../src/index.js'; const typeDefs = /* GraphQL */ ` type User { diff --git a/packages/mock/tests/mocking-compatibility.spec.ts b/packages/mock/tests/mocking-compatibility.spec.ts index 9dd08aa319b..dd5b6f96ffe 100644 --- a/packages/mock/tests/mocking-compatibility.spec.ts +++ b/packages/mock/tests/mocking-compatibility.spec.ts @@ -3,7 +3,7 @@ import { graphql, GraphQLSchema, buildSchema, subscribe, parse } from 'graphql'; import { sentence, first_name } from 'casual'; -import { addMocksToSchema, MockList, mockServer, IMocks, IMockStore } from '../src'; +import { addMocksToSchema, MockList, mockServer, IMocks, IMockStore } from '../src/index.js'; import { addResolversToSchema, makeExecutableSchema } from '@graphql-tools/schema'; describe('Mock retro-compatibility', () => { diff --git a/packages/mock/tests/pagination.spec.ts b/packages/mock/tests/pagination.spec.ts index 50466ce4612..0436ec2f6b6 100644 --- a/packages/mock/tests/pagination.spec.ts +++ b/packages/mock/tests/pagination.spec.ts @@ -1,5 +1,5 @@ import { buildSchema, graphql, GraphQLSchema } from 'graphql'; -import { addMocksToSchema, RelayPaginationParams, relayStylePaginationMock } from '../src'; +import { addMocksToSchema, RelayPaginationParams, relayStylePaginationMock } from '../src/index.js'; const typeDefs = /* GraphQL */ ` type Item { diff --git a/packages/mock/tests/store.spec.ts b/packages/mock/tests/store.spec.ts index 7732f6ae8d1..f42d040c399 100644 --- a/packages/mock/tests/store.spec.ts +++ b/packages/mock/tests/store.spec.ts @@ -1,7 +1,7 @@ import { buildSchema } from 'graphql'; -import { createMockStore } from '../src'; -import { assertIsRef, Ref } from '../src/types'; -import { makeRef } from '../src/utils'; +import { createMockStore } from '../src/index.js'; +import { assertIsRef, Ref } from '../src/types.js'; +import { makeRef } from '../src/utils.js'; const typeDefs = /* GraphQL */ ` type User { diff --git a/packages/node-require/package.json b/packages/node-require/package.json index f4188c3e4de..d995849d442 100644 --- a/packages/node-require/package.json +++ b/packages/node-require/package.json @@ -9,21 +9,42 @@ }, "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -38,7 +59,8 @@ "tslib": "^2.4.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/node-require/test/node-require.spec.ts b/packages/node-require/test/node-require.spec.ts index 9c8cbbaf97d..c6a591dd6c2 100644 --- a/packages/node-require/test/node-require.spec.ts +++ b/packages/node-require/test/node-require.spec.ts @@ -1,4 +1,4 @@ -import { handleModule } from '../src'; +import { handleModule } from '../src/index.js'; import { print } from 'graphql'; import { readFileSync } from 'fs'; import { join } from 'path'; diff --git a/packages/optimize/package.json b/packages/optimize/package.json index 9faafbf93f1..4dc3d58b832 100644 --- a/packages/optimize/package.json +++ b/packages/optimize/package.json @@ -9,21 +9,42 @@ }, "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -35,7 +56,8 @@ "tslib": "^2.4.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/optimize/src/index.ts b/packages/optimize/src/index.ts index 917f140be1f..dce42ebd480 100644 --- a/packages/optimize/src/index.ts +++ b/packages/optimize/src/index.ts @@ -1,5 +1,5 @@ -export * from './optimize'; -export * from './types'; -export * from './optimizers/remove-description'; -export * from './optimizers/remove-empty-nodes'; -export * from './optimizers/remove-loc'; +export * from './optimize.js'; +export * from './types.js'; +export * from './optimizers/remove-description.js'; +export * from './optimizers/remove-empty-nodes.js'; +export * from './optimizers/remove-loc.js'; diff --git a/packages/optimize/src/optimize.ts b/packages/optimize/src/optimize.ts index 930bc2ec281..3a51abfaa2f 100644 --- a/packages/optimize/src/optimize.ts +++ b/packages/optimize/src/optimize.ts @@ -1,8 +1,8 @@ import { DocumentNode } from 'graphql'; -import { removeDescriptions } from './optimizers/remove-description'; -import { removeEmptyNodes } from './optimizers/remove-empty-nodes'; -import { removeLoc } from './optimizers/remove-loc'; -import { DocumentOptimizer } from './types'; +import { removeDescriptions } from './optimizers/remove-description.js'; +import { removeEmptyNodes } from './optimizers/remove-empty-nodes.js'; +import { removeLoc } from './optimizers/remove-loc.js'; +import { DocumentOptimizer } from './types.js'; const DEFAULT_OPTIMIZERS: DocumentOptimizer[] = [removeDescriptions, removeEmptyNodes, removeLoc]; diff --git a/packages/optimize/src/optimizers/remove-description.ts b/packages/optimize/src/optimizers/remove-description.ts index c9b975aa36a..6b394f715c5 100644 --- a/packages/optimize/src/optimizers/remove-description.ts +++ b/packages/optimize/src/optimizers/remove-description.ts @@ -1,5 +1,5 @@ import { visit } from 'graphql'; -import { DocumentOptimizer } from '../types'; +import { DocumentOptimizer } from '../types.js'; /** * This optimizer removes "description" field from schema AST definitions. diff --git a/packages/optimize/src/optimizers/remove-empty-nodes.ts b/packages/optimize/src/optimizers/remove-empty-nodes.ts index 2ede350bb51..cde660ad9ad 100644 --- a/packages/optimize/src/optimizers/remove-empty-nodes.ts +++ b/packages/optimize/src/optimizers/remove-empty-nodes.ts @@ -1,5 +1,5 @@ import { visit } from 'graphql'; -import { DocumentOptimizer } from '../types'; +import { DocumentOptimizer } from '../types.js'; /** * This optimizer removes empty nodes/arrays (directives/argument/variableDefinitions) from a given DocumentNode of operation/fragment. diff --git a/packages/optimize/src/optimizers/remove-loc.ts b/packages/optimize/src/optimizers/remove-loc.ts index 533c0b1971d..9efb611e5d8 100644 --- a/packages/optimize/src/optimizers/remove-loc.ts +++ b/packages/optimize/src/optimizers/remove-loc.ts @@ -1,5 +1,5 @@ import { visit } from 'graphql'; -import { DocumentOptimizer } from '../types'; +import { DocumentOptimizer } from '../types.js'; /** * This optimizer removes "loc" fields diff --git a/packages/optimize/tests/remove-description.spec.ts b/packages/optimize/tests/remove-description.spec.ts index ccb43282071..b3f77e0652e 100644 --- a/packages/optimize/tests/remove-description.spec.ts +++ b/packages/optimize/tests/remove-description.spec.ts @@ -1,5 +1,5 @@ import { parse, print } from 'graphql'; -import { removeDescriptions } from '../src'; +import { removeDescriptions } from '../src/index.js'; describe('removeDescription', () => { it('Should remove description', () => { diff --git a/packages/optimize/tests/remove-empty-nodes.spec.ts b/packages/optimize/tests/remove-empty-nodes.spec.ts index f6156254522..156f4ea04d6 100644 --- a/packages/optimize/tests/remove-empty-nodes.spec.ts +++ b/packages/optimize/tests/remove-empty-nodes.spec.ts @@ -1,5 +1,5 @@ import { DocumentNode, parse, print, visit } from 'graphql'; -import { removeEmptyNodes } from '../src'; +import { removeEmptyNodes } from '../src/index.js'; describe('removeEmptyNodes', () => { it('Should remove all empty notes from GraphQL operations', () => { diff --git a/packages/optimize/tests/remove-loc.spec.ts b/packages/optimize/tests/remove-loc.spec.ts index 046e54645f4..0c9d9cf6b14 100644 --- a/packages/optimize/tests/remove-loc.spec.ts +++ b/packages/optimize/tests/remove-loc.spec.ts @@ -1,5 +1,5 @@ import { parse, print } from 'graphql'; -import { removeLoc } from '../src/optimizers/remove-loc'; +import { removeLoc } from '../src/optimizers/remove-loc.js'; describe('removeLoc', () => { it('Should remove location field', () => { diff --git a/packages/relay-operation-optimizer/package.json b/packages/relay-operation-optimizer/package.json index f0e26932cf1..03c819d2538 100644 --- a/packages/relay-operation-optimizer/package.json +++ b/packages/relay-operation-optimizer/package.json @@ -21,21 +21,42 @@ "relay" ], "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -61,7 +82,8 @@ ] }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/resolvers-composition/package.json b/packages/resolvers-composition/package.json index e0756c341d6..577c46a2d4c 100644 --- a/packages/resolvers-composition/package.json +++ b/packages/resolvers-composition/package.json @@ -10,21 +10,42 @@ "author": "Dotan Simha ", "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -40,7 +61,8 @@ "tslib": "^2.4.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/resolvers-composition/src/index.ts b/packages/resolvers-composition/src/index.ts index fe9508cf13d..d346b284cfb 100644 --- a/packages/resolvers-composition/src/index.ts +++ b/packages/resolvers-composition/src/index.ts @@ -1 +1 @@ -export * from './resolvers-composition'; +export * from './resolvers-composition.js'; diff --git a/packages/resolvers-composition/src/resolvers-composition.ts b/packages/resolvers-composition/src/resolvers-composition.ts index ff88bbec07b..6ea4ac7e1db 100644 --- a/packages/resolvers-composition/src/resolvers-composition.ts +++ b/packages/resolvers-composition/src/resolvers-composition.ts @@ -1,4 +1,4 @@ -import { chainFunctions } from './chain-functions'; +import { chainFunctions } from './chain-functions.js'; import _ from 'lodash'; import { GraphQLFieldResolver, GraphQLScalarTypeConfig } from 'graphql'; import { asArray } from '@graphql-tools/utils'; diff --git a/packages/resolvers-composition/tests/resolvers-composition.spec.ts b/packages/resolvers-composition/tests/resolvers-composition.spec.ts index c52d641bb9c..fcadf6e9333 100644 --- a/packages/resolvers-composition/tests/resolvers-composition.spec.ts +++ b/packages/resolvers-composition/tests/resolvers-composition.spec.ts @@ -1,5 +1,5 @@ import gql from 'graphql-tag'; -import { composeResolvers, ResolversComposerMapping } from '../src'; +import { composeResolvers, ResolversComposerMapping } from '../src/index.js'; import { makeExecutableSchema } from '@graphql-tools/schema'; import { execute, GraphQLScalarType, Kind } from 'graphql'; import { inspect } from '@graphql-tools/utils'; diff --git a/packages/schema/package.json b/packages/schema/package.json index 2045d906535..4a85157b87b 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -9,21 +9,42 @@ }, "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -41,7 +62,8 @@ "value-or-promise": "1.0.11" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/schema/src/addResolversToSchema.ts b/packages/schema/src/addResolversToSchema.ts index d1b73ee394c..c019f8ba948 100644 --- a/packages/schema/src/addResolversToSchema.ts +++ b/packages/schema/src/addResolversToSchema.ts @@ -30,8 +30,8 @@ import { forEachField, } from '@graphql-tools/utils'; -import { checkForResolveTypeResolver } from './checkForResolveTypeResolver'; -import { extendResolversFromInterfaces } from './extendResolversFromInterfaces'; +import { checkForResolveTypeResolver } from './checkForResolveTypeResolver.js'; +import { extendResolversFromInterfaces } from './extendResolversFromInterfaces.js'; export function addResolversToSchema( schemaOrOptions: GraphQLSchema | IAddResolversToSchemaOptions, diff --git a/packages/schema/src/index.ts b/packages/schema/src/index.ts index 68212c5ac90..ba12b322242 100644 --- a/packages/schema/src/index.ts +++ b/packages/schema/src/index.ts @@ -1,8 +1,8 @@ -export { assertResolversPresent } from './assertResolversPresent'; -export { chainResolvers } from './chainResolvers'; -export { addResolversToSchema } from './addResolversToSchema'; -export { checkForResolveTypeResolver } from './checkForResolveTypeResolver'; -export { extendResolversFromInterfaces } from './extendResolversFromInterfaces'; -export * from './makeExecutableSchema'; -export * from './types'; -export * from './merge-schemas'; +export { assertResolversPresent } from './assertResolversPresent.js'; +export { chainResolvers } from './chainResolvers.js'; +export { addResolversToSchema } from './addResolversToSchema.js'; +export { checkForResolveTypeResolver } from './checkForResolveTypeResolver.js'; +export { extendResolversFromInterfaces } from './extendResolversFromInterfaces.js'; +export * from './makeExecutableSchema.js'; +export * from './types.js'; +export * from './merge-schemas.js'; diff --git a/packages/schema/src/makeExecutableSchema.ts b/packages/schema/src/makeExecutableSchema.ts index cb41c97047a..96b84c07b14 100644 --- a/packages/schema/src/makeExecutableSchema.ts +++ b/packages/schema/src/makeExecutableSchema.ts @@ -1,10 +1,10 @@ import { buildASTSchema, buildSchema, GraphQLSchema, isSchema } from 'graphql'; import { asArray, pruneSchema } from '@graphql-tools/utils'; -import { addResolversToSchema } from './addResolversToSchema'; +import { addResolversToSchema } from './addResolversToSchema.js'; -import { assertResolversPresent } from './assertResolversPresent'; -import { IExecutableSchemaDefinition } from './types'; +import { assertResolversPresent } from './assertResolversPresent.js'; +import { IExecutableSchemaDefinition } from './types.js'; import { applyExtensions, mergeExtensions, mergeResolvers, mergeTypeDefs } from '@graphql-tools/merge'; /** diff --git a/packages/schema/src/merge-schemas.ts b/packages/schema/src/merge-schemas.ts index 9742b26c469..3a5f55e8eab 100644 --- a/packages/schema/src/merge-schemas.ts +++ b/packages/schema/src/merge-schemas.ts @@ -1,8 +1,8 @@ import { GraphQLSchema } from 'graphql'; import { extractExtensionsFromSchema, SchemaExtensions } from '@graphql-tools/merge'; import { IResolvers, asArray, getResolversFromSchema, TypeSource } from '@graphql-tools/utils'; -import { makeExecutableSchema } from './makeExecutableSchema'; -import { IExecutableSchemaDefinition } from './types'; +import { makeExecutableSchema } from './makeExecutableSchema.js'; +import { IExecutableSchemaDefinition } from './types.js'; /** * Configuration object for schema merging diff --git a/packages/schema/tests/fixtures/circularSchemaA.ts b/packages/schema/tests/fixtures/circularSchemaA.ts index 12c1bb403f6..87c06788abe 100644 --- a/packages/schema/tests/fixtures/circularSchemaA.ts +++ b/packages/schema/tests/fixtures/circularSchemaA.ts @@ -1,4 +1,4 @@ -import TypeB from './circularSchemaB'; +import TypeB from './circularSchemaB.js'; const TypeA = () => [ ` diff --git a/packages/schema/tests/fixtures/circularSchemaB.ts b/packages/schema/tests/fixtures/circularSchemaB.ts index e417fecc203..ae3332fd464 100644 --- a/packages/schema/tests/fixtures/circularSchemaB.ts +++ b/packages/schema/tests/fixtures/circularSchemaB.ts @@ -1,4 +1,4 @@ -import TypeA from './circularSchemaA'; +import TypeA from './circularSchemaA.js'; const TypeB = () => [ ` diff --git a/packages/schema/tests/merge-schemas.spec.ts b/packages/schema/tests/merge-schemas.spec.ts index 5cab9f7eb0b..416cd5dff55 100644 --- a/packages/schema/tests/merge-schemas.spec.ts +++ b/packages/schema/tests/merge-schemas.spec.ts @@ -1,8 +1,8 @@ import { makeExecutableSchema } from '@graphql-tools/schema'; import { graphql, buildSchema, GraphQLScalarType, Kind, GraphQLSchema, print } from 'graphql'; -import { mergeSchemas } from '../src/merge-schemas'; +import { mergeSchemas } from '../src/merge-schemas.js'; import { assertSome, printSchemaWithDirectives } from '@graphql-tools/utils'; -import { assertListValueNode } from '../../testing/assertion'; +import { assertListValueNode } from '../../testing/assertion.js'; describe('Merge Schemas', () => { it('Should include extensions in merged schemas', () => { diff --git a/packages/schema/tests/schemaGenerator.test.ts b/packages/schema/tests/schemaGenerator.test.ts index 7bcf59961f1..4d36a2fd5b3 100644 --- a/packages/schema/tests/schemaGenerator.test.ts +++ b/packages/schema/tests/schemaGenerator.test.ts @@ -23,7 +23,7 @@ import { makeExecutableSchema, addResolversToSchema, chainResolvers } from '@gra import { IResolverValidationOptions, IResolvers, ExecutionResult, TypeSource } from '@graphql-tools/utils'; -import TypeA from './fixtures/circularSchemaA'; +import TypeA from './fixtures/circularSchemaA.js'; interface Bird { name: string; diff --git a/packages/stitch/package.json b/packages/stitch/package.json index 631b3992d02..886c7e8e67c 100644 --- a/packages/stitch/package.json +++ b/packages/stitch/package.json @@ -9,21 +9,42 @@ }, "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -46,7 +67,8 @@ "value-or-promise": "^1.0.11" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/stitch/src/createDelegationPlanBuilder.ts b/packages/stitch/src/createDelegationPlanBuilder.ts index 74bfd22b7ed..8d4e12a598b 100644 --- a/packages/stitch/src/createDelegationPlanBuilder.ts +++ b/packages/stitch/src/createDelegationPlanBuilder.ts @@ -11,7 +11,7 @@ import { import { DelegationPlanBuilder, MergedTypeInfo, StitchingInfo, Subschema } from '@graphql-tools/delegate'; -import { getFieldsNotInSubschema } from './getFieldsNotInSubschema'; +import { getFieldsNotInSubschema } from './getFieldsNotInSubschema.js'; import { memoize1, memoize2, memoize3, memoize5 } from '@graphql-tools/utils'; function calculateDelegationStage( diff --git a/packages/stitch/src/index.ts b/packages/stitch/src/index.ts index f8918faa8ea..ebb1ca7e4c0 100755 --- a/packages/stitch/src/index.ts +++ b/packages/stitch/src/index.ts @@ -1,7 +1,7 @@ -export { stitchSchemas } from './stitchSchemas'; -export { createMergedTypeResolver } from './createMergedTypeResolver'; -export { forwardArgsToSelectionSet } from './selectionSetArgs'; +export { stitchSchemas } from './stitchSchemas.js'; +export { createMergedTypeResolver } from './createMergedTypeResolver.js'; +export { forwardArgsToSelectionSet } from './selectionSetArgs.js'; -export * from './subschemaConfigTransforms'; -export * from './types'; -export * from './relay'; +export * from './subschemaConfigTransforms/index.js'; +export * from './types.js'; +export * from './relay.js'; diff --git a/packages/stitch/src/mergeCandidates.ts b/packages/stitch/src/mergeCandidates.ts index cf8b7f30a24..101eb755920 100644 --- a/packages/stitch/src/mergeCandidates.ts +++ b/packages/stitch/src/mergeCandidates.ts @@ -42,13 +42,13 @@ import { MergeFieldConfigCandidate, MergeInputFieldConfigCandidate, MergeEnumValueConfigCandidate, -} from './types'; +} from './types.js'; import { validateFieldConsistency, validateInputFieldConsistency, validateInputObjectConsistency, -} from './mergeValidations'; +} from './mergeValidations.js'; import { isSubschemaConfig } from '@graphql-tools/delegate'; import { Maybe } from '@graphql-tools/utils'; diff --git a/packages/stitch/src/mergeValidations.ts b/packages/stitch/src/mergeValidations.ts index 4ed13197d4e..1ca3fc9ae58 100644 --- a/packages/stitch/src/mergeValidations.ts +++ b/packages/stitch/src/mergeValidations.ts @@ -19,7 +19,7 @@ import { TypeMergingOptions, ValidationSettings, ValidationLevel, -} from './types'; +} from './types.js'; export function validateFieldConsistency>( finalFieldConfig: GraphQLFieldConfig, diff --git a/packages/stitch/src/stitchSchemas.ts b/packages/stitch/src/stitchSchemas.ts index 665d370fe3e..4b824bb3add 100644 --- a/packages/stitch/src/stitchSchemas.ts +++ b/packages/stitch/src/stitchSchemas.ts @@ -13,15 +13,15 @@ import { addResolversToSchema, assertResolversPresent, extendResolversFromInterf import { SubschemaConfig, isSubschemaConfig, Subschema, defaultMergedResolver } from '@graphql-tools/delegate'; -import { IStitchSchemasOptions, SubschemaConfigTransform } from './types'; +import { IStitchSchemasOptions, SubschemaConfigTransform } from './types.js'; -import { buildTypeCandidates, buildTypes } from './typeCandidates'; -import { createStitchingInfo, completeStitchingInfo, addStitchingInfo } from './stitchingInfo'; +import { buildTypeCandidates, buildTypes } from './typeCandidates.js'; +import { createStitchingInfo, completeStitchingInfo, addStitchingInfo } from './stitchingInfo.js'; import { defaultSubschemaConfigTransforms, isolateComputedFieldsTransformer, splitMergedTypeEntryPointsTransformer, -} from './subschemaConfigTransforms'; +} from './subschemaConfigTransforms/index.js'; import { applyExtensions, mergeExtensions, mergeResolvers } from '@graphql-tools/merge'; export function stitchSchemas = Record>({ diff --git a/packages/stitch/src/stitchingInfo.ts b/packages/stitch/src/stitchingInfo.ts index d62c4bf01bf..0cf34f05d8c 100644 --- a/packages/stitch/src/stitchingInfo.ts +++ b/packages/stitch/src/stitchingInfo.ts @@ -19,10 +19,10 @@ import { collectFields, parseSelectionSet, IResolvers, IFieldResolverOptions, is import { MergedTypeResolver, Subschema, SubschemaConfig, MergedTypeInfo, StitchingInfo } from '@graphql-tools/delegate'; -import { MergeTypeCandidate, MergeTypeFilter } from './types'; +import { MergeTypeCandidate, MergeTypeFilter } from './types.js'; -import { createMergedTypeResolver } from './createMergedTypeResolver'; -import { createDelegationPlanBuilder } from './createDelegationPlanBuilder'; +import { createMergedTypeResolver } from './createMergedTypeResolver.js'; +import { createDelegationPlanBuilder } from './createDelegationPlanBuilder.js'; import { ValueOrPromise } from 'value-or-promise'; export function createStitchingInfo = Record>( diff --git a/packages/stitch/src/subschemaConfigTransforms/computedDirectiveTransformer.ts b/packages/stitch/src/subschemaConfigTransforms/computedDirectiveTransformer.ts index d39e097cc5a..e13f9a1aa5f 100644 --- a/packages/stitch/src/subschemaConfigTransforms/computedDirectiveTransformer.ts +++ b/packages/stitch/src/subschemaConfigTransforms/computedDirectiveTransformer.ts @@ -1,7 +1,7 @@ import { getDirective, MapperKind, mapSchema } from '@graphql-tools/utils'; import { cloneSubschemaConfig, SubschemaConfig } from '@graphql-tools/delegate'; -import { SubschemaConfigTransform } from '../types'; +import { SubschemaConfigTransform } from '../types.js'; export function computedDirectiveTransformer(computedDirectiveName: string): SubschemaConfigTransform { return (subschemaConfig: SubschemaConfig): SubschemaConfig => { diff --git a/packages/stitch/src/subschemaConfigTransforms/index.ts b/packages/stitch/src/subschemaConfigTransforms/index.ts index f9ea965783e..40e61f68392 100644 --- a/packages/stitch/src/subschemaConfigTransforms/index.ts +++ b/packages/stitch/src/subschemaConfigTransforms/index.ts @@ -1,9 +1,9 @@ -import { SubschemaConfigTransform } from '../types'; -import { computedDirectiveTransformer } from './computedDirectiveTransformer'; +import { SubschemaConfigTransform } from '../types.js'; +import { computedDirectiveTransformer } from './computedDirectiveTransformer.js'; -export { computedDirectiveTransformer } from './computedDirectiveTransformer'; -export { isolateComputedFieldsTransformer } from './isolateComputedFieldsTransformer'; -export { splitMergedTypeEntryPointsTransformer } from './splitMergedTypeEntryPointsTransformer'; +export { computedDirectiveTransformer } from './computedDirectiveTransformer.js'; +export { isolateComputedFieldsTransformer } from './isolateComputedFieldsTransformer.js'; +export { splitMergedTypeEntryPointsTransformer } from './splitMergedTypeEntryPointsTransformer.js'; export const defaultSubschemaConfigTransforms: Array> = [ computedDirectiveTransformer('computed'), diff --git a/packages/stitch/src/typeCandidates.ts b/packages/stitch/src/typeCandidates.ts index 8b10e2445e3..0b50276e5d4 100644 --- a/packages/stitch/src/typeCandidates.ts +++ b/packages/stitch/src/typeCandidates.ts @@ -24,10 +24,10 @@ import { getRootTypes, } from '@graphql-tools/utils'; -import typeFromAST from './typeFromAST'; -import { MergeTypeCandidate, MergeTypeFilter, OnTypeConflict, TypeMergingOptions } from './types'; -import { mergeCandidates } from './mergeCandidates'; -import { extractDefinitions } from './definitions'; +import typeFromAST from './typeFromAST.js'; +import { MergeTypeCandidate, MergeTypeFilter, OnTypeConflict, TypeMergingOptions } from './types.js'; +import { mergeCandidates } from './mergeCandidates.js'; +import { extractDefinitions } from './definitions.js'; import { mergeTypeDefs } from '@graphql-tools/merge'; type CandidateSelector> = ( diff --git a/packages/stitch/tests/alternateStitchSchemas.test.ts b/packages/stitch/tests/alternateStitchSchemas.test.ts index f97f3a09024..d16ba1afd94 100644 --- a/packages/stitch/tests/alternateStitchSchemas.test.ts +++ b/packages/stitch/tests/alternateStitchSchemas.test.ts @@ -37,7 +37,7 @@ import { makeExecutableSchema } from '@graphql-tools/schema'; import { addMocksToSchema } from '@graphql-tools/mock'; import { filterSchema, ExecutionResult, assertSome, createGraphQLError } from '@graphql-tools/utils'; -import { stitchSchemas } from '../src/stitchSchemas'; +import { stitchSchemas } from '../src/stitchSchemas.js'; import { bookingSchema, @@ -46,7 +46,7 @@ import { subscriptionSchema, subscriptionPubSub, subscriptionPubSubTrigger, -} from '../../testing/fixtures/schemas'; +} from '../../testing/fixtures/schemas.js'; const linkSchema = /* GraphQL */ ` """ diff --git a/packages/stitch/tests/dataloader.test.ts b/packages/stitch/tests/dataloader.test.ts index 29175e40ed5..10fe78720c3 100644 --- a/packages/stitch/tests/dataloader.test.ts +++ b/packages/stitch/tests/dataloader.test.ts @@ -4,7 +4,7 @@ import { graphql, GraphQLList, GraphQLResolveInfo, OperationTypeNode } from 'gra import { delegateToSchema } from '@graphql-tools/delegate'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { stitchSchemas } from '../src/stitchSchemas'; +import { stitchSchemas } from '../src/stitchSchemas.js'; describe('dataloader', () => { test('should work', async () => { diff --git a/packages/stitch/tests/extendedInterface.test.ts b/packages/stitch/tests/extendedInterface.test.ts index 308cd5a466d..b298220e508 100644 --- a/packages/stitch/tests/extendedInterface.test.ts +++ b/packages/stitch/tests/extendedInterface.test.ts @@ -1,6 +1,6 @@ import { graphql } from 'graphql'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { stitchSchemas } from '../src/stitchSchemas'; +import { stitchSchemas } from '../src/stitchSchemas.js'; import { assertSome } from '@graphql-tools/utils'; describe('extended interfaces', () => { diff --git a/packages/stitch/tests/mergeDefinitions.test.ts b/packages/stitch/tests/mergeDefinitions.test.ts index 95733dc430f..99c939b6583 100644 --- a/packages/stitch/tests/mergeDefinitions.test.ts +++ b/packages/stitch/tests/mergeDefinitions.test.ts @@ -10,7 +10,7 @@ import { assertGraphQLObjectType, assertGraphQLScalerType, assertGraphQLUnionType, -} from '../../testing/assertion'; +} from '../../testing/assertion.js'; describe('merge canonical types', () => { const firstSchema = makeExecutableSchema({ diff --git a/packages/stitch/tests/mergeInterfaces.test.ts b/packages/stitch/tests/mergeInterfaces.test.ts index d335123e2f7..695ae297570 100644 --- a/packages/stitch/tests/mergeInterfaces.test.ts +++ b/packages/stitch/tests/mergeInterfaces.test.ts @@ -1,6 +1,6 @@ import { graphql } from 'graphql'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { stitchSchemas } from '../src/stitchSchemas'; +import { stitchSchemas } from '../src/stitchSchemas.js'; import { assertSome } from '@graphql-tools/utils'; describe('merged interfaces via concrete type', () => { diff --git a/packages/stitch/tests/mergeMultipleEntryPoints.test.ts b/packages/stitch/tests/mergeMultipleEntryPoints.test.ts index 3e25e5d1016..b3b579c21c0 100644 --- a/packages/stitch/tests/mergeMultipleEntryPoints.test.ts +++ b/packages/stitch/tests/mergeMultipleEntryPoints.test.ts @@ -1,7 +1,7 @@ import { graphql } from 'graphql'; import { makeExecutableSchema } from '@graphql-tools/schema'; import { assertSome } from '@graphql-tools/utils'; -import { stitchSchemas } from '../src/stitchSchemas'; +import { stitchSchemas } from '../src/stitchSchemas.js'; describe('merge on multiple keys', () => { const catalogSchema = makeExecutableSchema({ diff --git a/packages/stitch/tests/mergeValidations.test.ts b/packages/stitch/tests/mergeValidations.test.ts index 2782ab45545..25e496965ee 100644 --- a/packages/stitch/tests/mergeValidations.test.ts +++ b/packages/stitch/tests/mergeValidations.test.ts @@ -1,6 +1,6 @@ import { stitchSchemas } from '@graphql-tools/stitch'; import { buildSchema } from 'graphql'; -import { ValidationLevel } from '../src/types'; +import { ValidationLevel } from '../src/types.js'; describe('Field validations', () => { describe('fieldTypeConsistency', () => { diff --git a/packages/stitch/tests/relay.spec.ts b/packages/stitch/tests/relay.spec.ts index bd702c9f614..069c5897d11 100644 --- a/packages/stitch/tests/relay.spec.ts +++ b/packages/stitch/tests/relay.spec.ts @@ -1,6 +1,6 @@ import { makeExecutableSchema } from '@graphql-tools/schema'; import { execute, parse } from 'graphql'; -import { handleRelaySubschemas, stitchSchemas } from '../src'; +import { handleRelaySubschemas, stitchSchemas } from '../src/index.js'; const users = [ { diff --git a/packages/stitch/tests/selectionSetArgs.test.ts b/packages/stitch/tests/selectionSetArgs.test.ts index 356b01ecc9c..7c9741b8bbf 100644 --- a/packages/stitch/tests/selectionSetArgs.test.ts +++ b/packages/stitch/tests/selectionSetArgs.test.ts @@ -1,6 +1,6 @@ import { assertSome, parseSelectionSet } from '@graphql-tools/utils'; import { FieldNode, SelectionNode, IntValueNode, ValueNode } from 'graphql'; -import { forwardArgsToSelectionSet } from '../src'; +import { forwardArgsToSelectionSet } from '../src/index.js'; function assertIntValueNode(input: ValueNode): asserts input is IntValueNode { if (input.kind !== 'IntValue') { diff --git a/packages/stitch/tests/selectionSets.test.ts b/packages/stitch/tests/selectionSets.test.ts index fba85cf30bf..67362b57580 100644 --- a/packages/stitch/tests/selectionSets.test.ts +++ b/packages/stitch/tests/selectionSets.test.ts @@ -5,9 +5,9 @@ import { batchDelegateToSchema } from '@graphql-tools/batch-delegate'; import { makeExecutableSchema } from '@graphql-tools/schema'; import { assertSome, IResolvers } from '@graphql-tools/utils'; -import { stitchSchemas } from '../src/stitchSchemas'; +import { stitchSchemas } from '../src/stitchSchemas.js'; -import { propertySchema, bookingSchema, sampleData, Property } from '../../testing/fixtures/schemas'; +import { propertySchema, bookingSchema, sampleData, Property } from '../../testing/fixtures/schemas.js'; describe('delegateToSchema ', () => { test('should add selection sets for deep types', async () => { diff --git a/packages/stitch/tests/stitchSchemas.test.ts b/packages/stitch/tests/stitchSchemas.test.ts index ed022e21c81..d7286ce654e 100644 --- a/packages/stitch/tests/stitchSchemas.test.ts +++ b/packages/stitch/tests/stitchSchemas.test.ts @@ -12,7 +12,7 @@ import { import { delegateToSchema, SubschemaConfig } from '@graphql-tools/delegate'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { stitchSchemas } from '../src/stitchSchemas'; +import { stitchSchemas } from '../src/stitchSchemas.js'; import { getResolversFromSchema, IResolvers, @@ -33,7 +33,7 @@ import { remoteProductSchema, subscriptionPubSub, subscriptionPubSubTrigger, -} from '../../testing/fixtures/schemas'; +} from '../../testing/fixtures/schemas.js'; const removeLocations = ({ locations, positions, source, originalError, nodes, ...rest }: any): any => ({ ...rest }); diff --git a/packages/stitch/tests/transforms.test.ts b/packages/stitch/tests/transforms.test.ts index 5773703ffc5..1fc1c1adbd8 100644 --- a/packages/stitch/tests/transforms.test.ts +++ b/packages/stitch/tests/transforms.test.ts @@ -4,9 +4,9 @@ import { makeExecutableSchema } from '@graphql-tools/schema'; import { wrapSchema, RenameRootTypes, FilterObjectFields } from '@graphql-tools/wrap'; import { addMocksToSchema } from '@graphql-tools/mock'; -import { stitchSchemas } from '../src/stitchSchemas'; +import { stitchSchemas } from '../src/stitchSchemas.js'; -import { propertySchema } from '../../testing/fixtures/schemas'; +import { propertySchema } from '../../testing/fixtures/schemas.js'; describe('rename root type', () => { test('works with stitchSchemas', async () => { diff --git a/packages/stitch/tests/typeMerging.test.ts b/packages/stitch/tests/typeMerging.test.ts index 879a211ceab..b92ade7faa8 100644 --- a/packages/stitch/tests/typeMerging.test.ts +++ b/packages/stitch/tests/typeMerging.test.ts @@ -12,7 +12,7 @@ import { delegateToSchema } from '@graphql-tools/delegate'; import { RenameRootFields, RenameTypes } from '@graphql-tools/wrap'; import { assertSome } from '@graphql-tools/utils'; -import { stitchSchemas } from '../src/stitchSchemas'; +import { stitchSchemas } from '../src/stitchSchemas.js'; describe('merging using type merging', () => { test('works', async () => { diff --git a/packages/stitch/tests/typeMergingWithDirectives.test.ts b/packages/stitch/tests/typeMergingWithDirectives.test.ts index 3910b94a1f5..b850442b6d8 100644 --- a/packages/stitch/tests/typeMergingWithDirectives.test.ts +++ b/packages/stitch/tests/typeMergingWithDirectives.test.ts @@ -12,7 +12,7 @@ import { ExecutionResult } from '@graphql-tools/utils'; import { stitchSchemas } from '@graphql-tools/stitch'; import { stitchingDirectives } from '@graphql-tools/stitching-directives'; -import { ValidationLevel } from '../src/types'; +import { ValidationLevel } from '../src/types.js'; describe('merging using type merging with directives', () => { const { allStitchingDirectivesTypeDefs, stitchingDirectivesTransformer } = stitchingDirectives(); diff --git a/packages/stitch/tests/typeMergingWithExtensions.test.ts b/packages/stitch/tests/typeMergingWithExtensions.test.ts index 42614930068..1f87ff18357 100644 --- a/packages/stitch/tests/typeMergingWithExtensions.test.ts +++ b/packages/stitch/tests/typeMergingWithExtensions.test.ts @@ -24,7 +24,7 @@ import { ExecutionResult } from '@graphql-tools/utils'; import { stitchSchemas } from '@graphql-tools/stitch'; import { stitchingDirectives } from '@graphql-tools/stitching-directives'; -import { ValidationLevel } from '../src/types'; +import { ValidationLevel } from '../src/types.js'; describe('merging using type merging', () => { const { stitchingDirectivesValidator, stitchingDirectivesTransformer } = stitchingDirectives(); diff --git a/packages/stitch/tests/typeMergingWithInterfaces.test.ts b/packages/stitch/tests/typeMergingWithInterfaces.test.ts index edee4efca61..6e10e4439e4 100644 --- a/packages/stitch/tests/typeMergingWithInterfaces.test.ts +++ b/packages/stitch/tests/typeMergingWithInterfaces.test.ts @@ -12,7 +12,7 @@ import { ExecutionResult } from '@graphql-tools/utils'; import { stitchSchemas } from '@graphql-tools/stitch'; import { stitchingDirectives } from '@graphql-tools/stitching-directives'; -import { ValidationLevel } from '../src/types'; +import { ValidationLevel } from '../src/types.js'; describe('merging using type merging', () => { const { allStitchingDirectivesTypeDefs, stitchingDirectivesTransformer } = stitchingDirectives(); diff --git a/packages/stitch/tests/unknownType.test.ts b/packages/stitch/tests/unknownType.test.ts index 5a28786292e..15123c1b1c2 100644 --- a/packages/stitch/tests/unknownType.test.ts +++ b/packages/stitch/tests/unknownType.test.ts @@ -6,7 +6,7 @@ import { makeExecutableSchema } from '@graphql-tools/schema'; import { RenameTypes } from '@graphql-tools/wrap'; -import { stitchSchemas } from '../src/stitchSchemas'; +import { stitchSchemas } from '../src/stitchSchemas.js'; const ITEM = { __typename: 'Item', diff --git a/packages/stitching-directives/package.json b/packages/stitching-directives/package.json index 0eaf93598b3..f902b4e4d98 100644 --- a/packages/stitching-directives/package.json +++ b/packages/stitching-directives/package.json @@ -9,21 +9,42 @@ }, "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -40,7 +61,8 @@ "@graphql-tools/schema": "8.4.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/stitching-directives/src/defaultStitchingDirectiveOptions.ts b/packages/stitching-directives/src/defaultStitchingDirectiveOptions.ts index 4a36846226e..fdba1a96a11 100644 --- a/packages/stitching-directives/src/defaultStitchingDirectiveOptions.ts +++ b/packages/stitching-directives/src/defaultStitchingDirectiveOptions.ts @@ -1,4 +1,4 @@ -import { StitchingDirectivesFinalOptions } from './types'; +import { StitchingDirectivesFinalOptions } from './types.js'; export const defaultStitchingDirectiveOptions: StitchingDirectivesFinalOptions = { keyDirectiveName: 'key', diff --git a/packages/stitching-directives/src/federationToStitchingSDL.ts b/packages/stitching-directives/src/federationToStitchingSDL.ts index 25349b92eeb..a653664e172 100644 --- a/packages/stitching-directives/src/federationToStitchingSDL.ts +++ b/packages/stitching-directives/src/federationToStitchingSDL.ts @@ -12,7 +12,7 @@ import { parse, SchemaDefinitionNode, } from 'graphql'; -import { stitchingDirectives, StitchingDirectivesResult } from './stitchingDirectives'; +import { stitchingDirectives, StitchingDirectivesResult } from './stitchingDirectives.js'; const extensionKind = /Extension$/; diff --git a/packages/stitching-directives/src/getSourcePaths.ts b/packages/stitching-directives/src/getSourcePaths.ts index c5dbf7b6f9d..16587242b3b 100644 --- a/packages/stitching-directives/src/getSourcePaths.ts +++ b/packages/stitching-directives/src/getSourcePaths.ts @@ -1,8 +1,8 @@ import { SelectionSetNode, TypeNameMetaFieldDef } from 'graphql'; -import { MappingInstruction } from './types'; +import { MappingInstruction } from './types.js'; -import { pathsFromSelectionSet } from './pathsFromSelectionSet'; +import { pathsFromSelectionSet } from './pathsFromSelectionSet.js'; export function getSourcePaths( mappingInstructions: Array, diff --git a/packages/stitching-directives/src/index.ts b/packages/stitching-directives/src/index.ts index 3cbe75f12b8..579f40dfb4f 100644 --- a/packages/stitching-directives/src/index.ts +++ b/packages/stitching-directives/src/index.ts @@ -1,3 +1,3 @@ -export * from './stitchingDirectives'; -export * from './types'; -export * from './federationToStitchingSDL'; +export * from './stitchingDirectives.js'; +export * from './types.js'; +export * from './federationToStitchingSDL.js'; diff --git a/packages/stitching-directives/src/parseMergeArgsExpr.ts b/packages/stitching-directives/src/parseMergeArgsExpr.ts index 6c46443c7ca..cda4e800be2 100644 --- a/packages/stitching-directives/src/parseMergeArgsExpr.ts +++ b/packages/stitching-directives/src/parseMergeArgsExpr.ts @@ -1,11 +1,11 @@ import { parseValue, SelectionSetNode, valueFromASTUntyped } from 'graphql'; -import { Expansion, MappingInstruction, ParsedMergeArgsExpr } from './types'; +import { Expansion, MappingInstruction, ParsedMergeArgsExpr } from './types.js'; -import { extractVariables } from './extractVariables'; -import { EXPANSION_PREFIX, KEY_DELIMITER, preparseMergeArgsExpr } from './preparseMergeArgsExpr'; -import { propertyTreeFromPaths } from './properties'; -import { getSourcePaths } from './getSourcePaths'; +import { extractVariables } from './extractVariables.js'; +import { EXPANSION_PREFIX, KEY_DELIMITER, preparseMergeArgsExpr } from './preparseMergeArgsExpr.js'; +import { propertyTreeFromPaths } from './properties.js'; +import { getSourcePaths } from './getSourcePaths.js'; type VariablePaths = Record>; diff --git a/packages/stitching-directives/src/properties.ts b/packages/stitching-directives/src/properties.ts index f33aaec9066..b7076c76602 100644 --- a/packages/stitching-directives/src/properties.ts +++ b/packages/stitching-directives/src/properties.ts @@ -1,4 +1,4 @@ -import { PropertyTree } from './types'; +import { PropertyTree } from './types.js'; export function addProperty(object: Record, path: Array, value: any) { const initialSegment = path[0]; diff --git a/packages/stitching-directives/src/stitchingDirectives.ts b/packages/stitching-directives/src/stitchingDirectives.ts index 0ce1a117367..e86966e0d6f 100644 --- a/packages/stitching-directives/src/stitchingDirectives.ts +++ b/packages/stitching-directives/src/stitchingDirectives.ts @@ -2,11 +2,11 @@ import { GraphQLDirective, GraphQLList, GraphQLNonNull, GraphQLSchema, GraphQLSt import { SubschemaConfig } from '@graphql-tools/delegate'; -import { StitchingDirectivesFinalOptions, StitchingDirectivesOptions } from './types'; +import { StitchingDirectivesFinalOptions, StitchingDirectivesOptions } from './types.js'; -import { defaultStitchingDirectiveOptions } from './defaultStitchingDirectiveOptions'; -import { stitchingDirectivesValidator } from './stitchingDirectivesValidator'; -import { stitchingDirectivesTransformer } from './stitchingDirectivesTransformer'; +import { defaultStitchingDirectiveOptions } from './defaultStitchingDirectiveOptions.js'; +import { stitchingDirectivesValidator } from './stitchingDirectivesValidator.js'; +import { stitchingDirectivesTransformer } from './stitchingDirectivesTransformer.js'; export interface StitchingDirectivesResult { keyDirectiveTypeDefs: string; diff --git a/packages/stitching-directives/src/stitchingDirectivesTransformer.ts b/packages/stitching-directives/src/stitchingDirectivesTransformer.ts index 205e4d48de5..9fac770125c 100644 --- a/packages/stitching-directives/src/stitchingDirectivesTransformer.ts +++ b/packages/stitching-directives/src/stitchingDirectivesTransformer.ts @@ -25,12 +25,12 @@ import { parseSelectionSet, } from '@graphql-tools/utils'; -import { MergedTypeResolverInfo, StitchingDirectivesOptions } from './types'; +import { MergedTypeResolverInfo, StitchingDirectivesOptions } from './types.js'; -import { defaultStitchingDirectiveOptions } from './defaultStitchingDirectiveOptions'; -import { parseMergeArgsExpr } from './parseMergeArgsExpr'; -import { addProperty, getProperty, getProperties } from './properties'; -import { stitchingDirectivesValidator } from './stitchingDirectivesValidator'; +import { defaultStitchingDirectiveOptions } from './defaultStitchingDirectiveOptions.js'; +import { parseMergeArgsExpr } from './parseMergeArgsExpr.js'; +import { addProperty, getProperty, getProperties } from './properties.js'; +import { stitchingDirectivesValidator } from './stitchingDirectivesValidator.js'; export function stitchingDirectivesTransformer( options: StitchingDirectivesOptions = {} diff --git a/packages/stitching-directives/src/stitchingDirectivesValidator.ts b/packages/stitching-directives/src/stitchingDirectivesValidator.ts index f5d82b8512f..387ab62df2c 100644 --- a/packages/stitching-directives/src/stitchingDirectivesValidator.ts +++ b/packages/stitching-directives/src/stitchingDirectivesValidator.ts @@ -19,10 +19,10 @@ import { parseSelectionSet, } from '@graphql-tools/utils'; -import { StitchingDirectivesOptions } from './types'; +import { StitchingDirectivesOptions } from './types.js'; -import { defaultStitchingDirectiveOptions } from './defaultStitchingDirectiveOptions'; -import { parseMergeArgsExpr } from './parseMergeArgsExpr'; +import { defaultStitchingDirectiveOptions } from './defaultStitchingDirectiveOptions.js'; +import { parseMergeArgsExpr } from './parseMergeArgsExpr.js'; const dottedNameRegEx = /^[_A-Za-z][_0-9A-Za-z]*(.[_A-Za-z][_0-9A-Za-z]*)*$/; diff --git a/packages/stitching-directives/tests/extractVariables.test.ts b/packages/stitching-directives/tests/extractVariables.test.ts index 4f0e5a349b9..9f0f1fb679f 100644 --- a/packages/stitching-directives/tests/extractVariables.test.ts +++ b/packages/stitching-directives/tests/extractVariables.test.ts @@ -1,6 +1,6 @@ import { parseValue } from 'graphql'; -import { extractVariables } from '../src/extractVariables'; +import { extractVariables } from '../src/extractVariables.js'; describe('can extract variables', () => { test('return unmodified input value if no variables present', () => { diff --git a/packages/stitching-directives/tests/federationToStitchingSDL.test.ts b/packages/stitching-directives/tests/federationToStitchingSDL.test.ts index bedfdb7a0c5..83a3216af08 100644 --- a/packages/stitching-directives/tests/federationToStitchingSDL.test.ts +++ b/packages/stitching-directives/tests/federationToStitchingSDL.test.ts @@ -1,6 +1,6 @@ import '../../testing/to-be-similar-string'; -import { federationToStitchingSDL } from '../src/federationToStitchingSDL'; -import { stitchingDirectives } from '../src/stitchingDirectives'; +import { federationToStitchingSDL } from '../src/federationToStitchingSDL.js'; +import { stitchingDirectives } from '../src/stitchingDirectives.js'; const defaultStitchingDirectives = stitchingDirectives(); diff --git a/packages/stitching-directives/tests/parseMergeArgsExpr.test.ts b/packages/stitching-directives/tests/parseMergeArgsExpr.test.ts index f8a4eb93407..b2ee58f8dca 100644 --- a/packages/stitching-directives/tests/parseMergeArgsExpr.test.ts +++ b/packages/stitching-directives/tests/parseMergeArgsExpr.test.ts @@ -1,6 +1,6 @@ import { parseSelectionSet } from '@graphql-tools/utils'; -import { parseMergeArgsExpr } from '../src/parseMergeArgsExpr'; +import { parseMergeArgsExpr } from '../src/parseMergeArgsExpr.js'; describe('can parse merge arguments', () => { test('throws if no key declared', () => { diff --git a/packages/stitching-directives/tests/pathsFromSelectionSets.ts b/packages/stitching-directives/tests/pathsFromSelectionSets.ts index 9a81fb44909..d092ce75bac 100644 --- a/packages/stitching-directives/tests/pathsFromSelectionSets.ts +++ b/packages/stitching-directives/tests/pathsFromSelectionSets.ts @@ -1,6 +1,6 @@ import { parseSelectionSet } from '@graphql-tools/utils'; -import { pathsFromSelectionSet } from '../src/pathsFromSelectionSet'; +import { pathsFromSelectionSet } from '../src/pathsFromSelectionSet.js'; describe('can convert selectionSet hints to paths', () => { test('can convert a simple selection set', () => { diff --git a/packages/stitching-directives/tests/preparseMergeArgsExpr.test.ts b/packages/stitching-directives/tests/preparseMergeArgsExpr.test.ts index ec4d6405fb6..6267ff0b86a 100644 --- a/packages/stitching-directives/tests/preparseMergeArgsExpr.test.ts +++ b/packages/stitching-directives/tests/preparseMergeArgsExpr.test.ts @@ -1,4 +1,4 @@ -import { EXPANSION_PREFIX, KEY_DELIMITER, preparseMergeArgsExpr } from '../src/preparseMergeArgsExpr'; +import { EXPANSION_PREFIX, KEY_DELIMITER, preparseMergeArgsExpr } from '../src/preparseMergeArgsExpr.js'; describe('can preparse merge arguments', () => { test('throws if nested key expansions used', () => { diff --git a/packages/stitching-directives/tests/properties.test.ts b/packages/stitching-directives/tests/properties.test.ts index be2d6d7c3cd..1a72d8ae5e1 100644 --- a/packages/stitching-directives/tests/properties.test.ts +++ b/packages/stitching-directives/tests/properties.test.ts @@ -1,4 +1,4 @@ -import { addProperty, getProperties } from '../src/properties'; +import { addProperty, getProperties } from '../src/properties.js'; describe('addProperty', () => { test('can add a key to an object', () => { diff --git a/packages/stitching-directives/tests/stitchingDirectivesTransformer.test.ts b/packages/stitching-directives/tests/stitchingDirectivesTransformer.test.ts index bf51bc3c2ea..5354314b864 100644 --- a/packages/stitching-directives/tests/stitchingDirectivesTransformer.test.ts +++ b/packages/stitching-directives/tests/stitchingDirectivesTransformer.test.ts @@ -4,7 +4,7 @@ import { print } from 'graphql'; import { makeExecutableSchema } from '@graphql-tools/schema'; import { parseSelectionSet } from '@graphql-tools/utils'; -import { stitchingDirectives } from '../src'; +import { stitchingDirectives } from '../src/index.js'; describe('type merging directives', () => { const { allStitchingDirectivesTypeDefs, stitchingDirectivesTransformer } = stitchingDirectives(); diff --git a/packages/stitching-directives/tests/stitchingDirectivesValidator.test.ts b/packages/stitching-directives/tests/stitchingDirectivesValidator.test.ts index c6433ed347e..cf358fad8ad 100644 --- a/packages/stitching-directives/tests/stitchingDirectivesValidator.test.ts +++ b/packages/stitching-directives/tests/stitchingDirectivesValidator.test.ts @@ -1,6 +1,6 @@ import { makeExecutableSchema } from '@graphql-tools/schema'; -import { stitchingDirectives } from '../src'; +import { stitchingDirectives } from '../src/index.js'; describe('type merging directives', () => { const { allStitchingDirectivesTypeDefs, stitchingDirectivesValidator } = stitchingDirectives(); diff --git a/packages/testing/to-be-similar-string.ts b/packages/testing/to-be-similar-string.ts index 69905846105..de15012a42e 100644 --- a/packages/testing/to-be-similar-string.ts +++ b/packages/testing/to-be-similar-string.ts @@ -1,4 +1,4 @@ -import { normalizeString } from './utils'; +import { normalizeString } from './utils.js'; import { diff } from 'jest-diff'; declare global { diff --git a/packages/utils/package.json b/packages/utils/package.json index b672783041d..617161d600e 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -10,21 +10,42 @@ "author": "Dotan Simha ", "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -38,7 +59,8 @@ "tslib": "^2.4.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/utils/src/addTypes.ts b/packages/utils/src/addTypes.ts index 174b9172592..a6b5040d242 100644 --- a/packages/utils/src/addTypes.ts +++ b/packages/utils/src/addTypes.ts @@ -28,8 +28,8 @@ import { GraphQLSchema, GraphQLNamedType, GraphQLDirective, isNamedType, isDirective } from 'graphql'; -import { getObjectTypeFromTypeMap } from './getObjectTypeFromTypeMap'; -import { rewireTypes } from './rewire'; +import { getObjectTypeFromTypeMap } from './getObjectTypeFromTypeMap.js'; +import { rewireTypes } from './rewire.js'; export function addTypes( schema: GraphQLSchema, diff --git a/packages/utils/src/astFromType.ts b/packages/utils/src/astFromType.ts index f69d19d1049..f48e11099c0 100644 --- a/packages/utils/src/astFromType.ts +++ b/packages/utils/src/astFromType.ts @@ -1,5 +1,5 @@ import { isNonNullType, Kind, GraphQLType, TypeNode, isListType } from 'graphql'; -import { inspect } from './inspect'; +import { inspect } from './inspect.js'; export function astFromType(type: GraphQLType): TypeNode { if (isNonNullType(type)) { diff --git a/packages/utils/src/build-operation-for-field.ts b/packages/utils/src/build-operation-for-field.ts index 23b6fad89ae..02cc32fa467 100644 --- a/packages/utils/src/build-operation-for-field.ts +++ b/packages/utils/src/build-operation-for-field.ts @@ -28,7 +28,7 @@ import { Kind, } from 'graphql'; -import { getDefinedRootType, getRootTypeNames } from './rootTypes'; +import { getDefinedRootType, getRootTypeNames } from './rootTypes.js'; let operationVariables: VariableDefinitionNode[] = []; let fieldTypeMap = new Map(); @@ -326,7 +326,7 @@ function resolveSelectionSet({ const selectedSubFields = typeof selectedFields === 'object' ? selectedFields[fieldName] : true; if (selectedSubFields) { return resolveField({ - type: type, + type, field: fields[fieldName], models, path: [...path, fieldName], diff --git a/packages/utils/src/collectFields.ts b/packages/utils/src/collectFields.ts index 7d7ead8ecce..71a1cf22163 100644 --- a/packages/utils/src/collectFields.ts +++ b/packages/utils/src/collectFields.ts @@ -1,4 +1,4 @@ -import { memoize5 } from './memoize'; +import { memoize5 } from './memoize.js'; import { GraphQLSchema, FragmentDefinitionNode, diff --git a/packages/utils/src/comments.ts b/packages/utils/src/comments.ts index a1301697bfb..9d099f7f1ae 100644 --- a/packages/utils/src/comments.ts +++ b/packages/utils/src/comments.ts @@ -1,4 +1,4 @@ -import { Maybe } from './types'; +import { Maybe } from './types.js'; import { StringValueNode, FieldDefinitionNode, diff --git a/packages/utils/src/errors.ts b/packages/utils/src/errors.ts index a34771f8bd0..c74b328a961 100644 --- a/packages/utils/src/errors.ts +++ b/packages/utils/src/errors.ts @@ -1,5 +1,5 @@ import { ASTNode, GraphQLError, Source, versionInfo } from 'graphql'; -import { Maybe } from './types'; +import { Maybe } from './types.js'; interface GraphQLErrorOptions { nodes?: ReadonlyArray | ASTNode | null; diff --git a/packages/utils/src/executor.ts b/packages/utils/src/executor.ts index 46493f634b9..7b2d2e57f7d 100644 --- a/packages/utils/src/executor.ts +++ b/packages/utils/src/executor.ts @@ -1,4 +1,4 @@ -import { ExecutionResult, ExecutionRequest } from './Interfaces'; +import { ExecutionResult, ExecutionRequest } from './Interfaces.js'; type MaybePromise = Promise | T; type MaybeAsyncIterable = AsyncIterable | T; diff --git a/packages/utils/src/fields.ts b/packages/utils/src/fields.ts index e33180753e6..68ee8fb2720 100644 --- a/packages/utils/src/fields.ts +++ b/packages/utils/src/fields.ts @@ -1,7 +1,7 @@ import { GraphQLFieldConfigMap, GraphQLObjectType, GraphQLFieldConfig, GraphQLSchema } from 'graphql'; -import { MapperKind } from './Interfaces'; -import { mapSchema, correctASTNodes } from './mapSchema'; -import { addTypes } from './addTypes'; +import { MapperKind } from './Interfaces.js'; +import { mapSchema, correctASTNodes } from './mapSchema.js'; +import { addTypes } from './addTypes.js'; export function appendObjectFields( schema: GraphQLSchema, diff --git a/packages/utils/src/filterSchema.ts b/packages/utils/src/filterSchema.ts index 74e04b06232..f36e4d144ab 100644 --- a/packages/utils/src/filterSchema.ts +++ b/packages/utils/src/filterSchema.ts @@ -8,11 +8,11 @@ import { GraphQLSchema, } from 'graphql'; -import { MapperKind, FieldFilter, RootFieldFilter, TypeFilter, ArgumentFilter } from './Interfaces'; +import { MapperKind, FieldFilter, RootFieldFilter, TypeFilter, ArgumentFilter } from './Interfaces.js'; -import { mapSchema } from './mapSchema'; +import { mapSchema } from './mapSchema.js'; -import { Constructor } from './types'; +import { Constructor } from './types.js'; export function filterSchema({ schema, diff --git a/packages/utils/src/fixSchemaAst.ts b/packages/utils/src/fixSchemaAst.ts index acf7739a848..aa1583cc2ad 100644 --- a/packages/utils/src/fixSchemaAst.ts +++ b/packages/utils/src/fixSchemaAst.ts @@ -1,6 +1,6 @@ import { GraphQLSchema, BuildSchemaOptions, buildASTSchema } from 'graphql'; -import { SchemaPrintOptions } from './types'; -import { getDocumentNodeFromSchema } from './print-schema-with-directives'; +import { SchemaPrintOptions } from './types.js'; +import { getDocumentNodeFromSchema } from './print-schema-with-directives.js'; function buildFixedSchema(schema: GraphQLSchema, options: BuildSchemaOptions & SchemaPrintOptions) { const document = getDocumentNodeFromSchema(schema); diff --git a/packages/utils/src/forEachDefaultValue.ts b/packages/utils/src/forEachDefaultValue.ts index 4ff70bc5a4c..673486ed4e2 100644 --- a/packages/utils/src/forEachDefaultValue.ts +++ b/packages/utils/src/forEachDefaultValue.ts @@ -1,6 +1,6 @@ import { getNamedType, GraphQLSchema, isObjectType, isInputObjectType } from 'graphql'; -import { IDefaultValueIteratorFn } from './Interfaces'; +import { IDefaultValueIteratorFn } from './Interfaces.js'; export function forEachDefaultValue(schema: GraphQLSchema, fn: IDefaultValueIteratorFn): void { const typeMap = schema.getTypeMap(); diff --git a/packages/utils/src/forEachField.ts b/packages/utils/src/forEachField.ts index a59a9a969cb..9b0591d7d33 100644 --- a/packages/utils/src/forEachField.ts +++ b/packages/utils/src/forEachField.ts @@ -1,6 +1,6 @@ import { getNamedType, GraphQLSchema, isObjectType } from 'graphql'; -import { IFieldIteratorFn } from './Interfaces'; +import { IFieldIteratorFn } from './Interfaces.js'; export function forEachField(schema: GraphQLSchema, fn: IFieldIteratorFn): void { const typeMap = schema.getTypeMap(); diff --git a/packages/utils/src/get-directives.ts b/packages/utils/src/get-directives.ts index c3cdf3b2759..0817e8e3a20 100644 --- a/packages/utils/src/get-directives.ts +++ b/packages/utils/src/get-directives.ts @@ -24,7 +24,7 @@ import { EnumValueDefinitionNode, } from 'graphql'; -import { getArgumentValues } from './getArgumentValues'; +import { getArgumentValues } from './getArgumentValues.js'; export interface DirectiveAnnotation { name: string; diff --git a/packages/utils/src/getArgumentValues.ts b/packages/utils/src/getArgumentValues.ts index b8c5352f833..4f20fe16d49 100644 --- a/packages/utils/src/getArgumentValues.ts +++ b/packages/utils/src/getArgumentValues.ts @@ -9,9 +9,9 @@ import { print, ArgumentNode, } from 'graphql'; -import { createGraphQLError } from './errors'; +import { createGraphQLError } from './errors.js'; -import { inspect } from './inspect'; +import { inspect } from './inspect.js'; /** * Prepares an object map of argument values given a list of argument diff --git a/packages/utils/src/getObjectTypeFromTypeMap.ts b/packages/utils/src/getObjectTypeFromTypeMap.ts index a4f67aa0162..ec50f65e546 100644 --- a/packages/utils/src/getObjectTypeFromTypeMap.ts +++ b/packages/utils/src/getObjectTypeFromTypeMap.ts @@ -1,6 +1,6 @@ import { GraphQLNamedType, GraphQLObjectType, isObjectType } from 'graphql'; -import { Maybe } from './types'; +import { Maybe } from './types.js'; export function getObjectTypeFromTypeMap( typeMap: Record, diff --git a/packages/utils/src/getOperationASTFromRequest.ts b/packages/utils/src/getOperationASTFromRequest.ts index 94e5840321b..1e019a8610c 100644 --- a/packages/utils/src/getOperationASTFromRequest.ts +++ b/packages/utils/src/getOperationASTFromRequest.ts @@ -1,6 +1,6 @@ import { DocumentNode, getOperationAST, OperationDefinitionNode } from 'graphql'; -import { ExecutionRequest } from './Interfaces'; -import { memoize1 } from './memoize'; +import { ExecutionRequest } from './Interfaces.js'; +import { memoize1 } from './memoize.js'; export function getOperationASTFromDocument( documentNode: DocumentNode, diff --git a/packages/utils/src/getResolversFromSchema.ts b/packages/utils/src/getResolversFromSchema.ts index e6d4ce645a2..c43651f49c9 100644 --- a/packages/utils/src/getResolversFromSchema.ts +++ b/packages/utils/src/getResolversFromSchema.ts @@ -9,7 +9,7 @@ import { isSpecifiedScalarType, } from 'graphql'; -import { IResolvers } from './Interfaces'; +import { IResolvers } from './Interfaces.js'; export function getResolversFromSchema( schema: GraphQLSchema, diff --git a/packages/utils/src/implementsAbstractType.ts b/packages/utils/src/implementsAbstractType.ts index 18f776402e8..9282fdb9643 100644 --- a/packages/utils/src/implementsAbstractType.ts +++ b/packages/utils/src/implementsAbstractType.ts @@ -1,5 +1,5 @@ import { GraphQLType, GraphQLSchema, doTypesOverlap, isCompositeType } from 'graphql'; -import { Maybe } from './types'; +import { Maybe } from './types.js'; export function implementsAbstractType(schema: GraphQLSchema, typeA: Maybe, typeB: Maybe) { if (typeB == null || typeA == null) { diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index b3325bdf4c4..ae455cf86f1 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -1,50 +1,50 @@ -export * from './loaders'; -export * from './helpers'; -export * from './get-directives'; -export * from './get-fields-with-directives'; -export * from './get-implementing-types'; -export * from './print-schema-with-directives'; -export * from './get-fields-with-directives'; -export * from './validate-documents'; -export * from './parse-graphql-json'; -export * from './parse-graphql-sdl'; -export * from './build-operation-for-field'; -export * from './types'; -export * from './filterSchema'; -export * from './heal'; -export * from './getResolversFromSchema'; -export * from './forEachField'; -export * from './forEachDefaultValue'; -export * from './mapSchema'; -export * from './addTypes'; -export * from './rewire'; -export * from './prune'; -export * from './mergeDeep'; -export * from './Interfaces'; -export * from './stub'; -export * from './selectionSets'; -export * from './getResponseKeyFromInfo'; -export * from './fields'; -export * from './renameType'; -export * from './transformInputValue'; -export * from './mapAsyncIterator'; -export * from './updateArgument'; -export * from './implementsAbstractType'; -export * from './errors'; -export * from './observableToAsyncIterable'; -export * from './visitResult'; -export * from './getArgumentValues'; -export * from './valueMatchesCriteria'; -export * from './isAsyncIterable'; -export * from './isDocumentNode'; -export * from './astFromValueUntyped'; -export * from './executor'; -export * from './withCancel'; -export * from './AggregateError'; -export * from './rootTypes'; -export * from './comments'; -export * from './collectFields'; -export * from './inspect'; -export * from './memoize'; -export * from './fixSchemaAst'; -export * from './getOperationASTFromRequest'; +export * from './loaders.js'; +export * from './helpers.js'; +export * from './get-directives.js'; +export * from './get-fields-with-directives.js'; +export * from './get-implementing-types.js'; +export * from './print-schema-with-directives.js'; +export * from './get-fields-with-directives.js'; +export * from './validate-documents.js'; +export * from './parse-graphql-json.js'; +export * from './parse-graphql-sdl.js'; +export * from './build-operation-for-field.js'; +export * from './types.js'; +export * from './filterSchema.js'; +export * from './heal.js'; +export * from './getResolversFromSchema.js'; +export * from './forEachField.js'; +export * from './forEachDefaultValue.js'; +export * from './mapSchema.js'; +export * from './addTypes.js'; +export * from './rewire.js'; +export * from './prune.js'; +export * from './mergeDeep.js'; +export * from './Interfaces.js'; +export * from './stub.js'; +export * from './selectionSets.js'; +export * from './getResponseKeyFromInfo.js'; +export * from './fields.js'; +export * from './renameType.js'; +export * from './transformInputValue.js'; +export * from './mapAsyncIterator.js'; +export * from './updateArgument.js'; +export * from './implementsAbstractType.js'; +export * from './errors.js'; +export * from './observableToAsyncIterable.js'; +export * from './visitResult.js'; +export * from './getArgumentValues.js'; +export * from './valueMatchesCriteria.js'; +export * from './isAsyncIterable.js'; +export * from './isDocumentNode.js'; +export * from './astFromValueUntyped.js'; +export * from './executor.js'; +export * from './withCancel.js'; +export * from './AggregateError.js'; +export * from './rootTypes.js'; +export * from './comments.js'; +export * from './collectFields.js'; +export * from './inspect.js'; +export * from './memoize.js'; +export * from './fixSchemaAst.js'; +export * from './getOperationASTFromRequest.js'; diff --git a/packages/utils/src/inspect.ts b/packages/utils/src/inspect.ts index 8860edf7429..81ce20c3652 100644 --- a/packages/utils/src/inspect.ts +++ b/packages/utils/src/inspect.ts @@ -2,7 +2,7 @@ // https://github.com/graphql/graphql-js/blob/main/src/jsutils/inspect.ts import { GraphQLError } from 'graphql'; -import { isAggregateError } from './AggregateError'; +import { isAggregateError } from './AggregateError.js'; const MAX_RECURSIVE_DEPTH = 3; diff --git a/packages/utils/src/loaders.ts b/packages/utils/src/loaders.ts index 9c6a88d15d4..3d6c868dbb7 100644 --- a/packages/utils/src/loaders.ts +++ b/packages/utils/src/loaders.ts @@ -1,5 +1,5 @@ import { DocumentNode, GraphQLSchema, BuildSchemaOptions } from 'graphql'; -import { GraphQLParseOptions } from './Interfaces'; +import { GraphQLParseOptions } from './Interfaces.js'; export interface Source { document?: DocumentNode; diff --git a/packages/utils/src/mapSchema.ts b/packages/utils/src/mapSchema.ts index c2159da429d..b4ddad7e8dd 100644 --- a/packages/utils/src/mapSchema.ts +++ b/packages/utils/src/mapSchema.ts @@ -30,7 +30,7 @@ import { EnumValueDefinitionNode, } from 'graphql'; -import { getObjectTypeFromTypeMap } from './getObjectTypeFromTypeMap'; +import { getObjectTypeFromTypeMap } from './getObjectTypeFromTypeMap.js'; import { SchemaMapper, @@ -42,10 +42,10 @@ import { ArgumentMapper, EnumValueMapper, SchemaFieldMapperTypes, -} from './Interfaces'; +} from './Interfaces.js'; -import { rewireTypes } from './rewire'; -import { serializeInputValue, parseInputValue } from './transformInputValue'; +import { rewireTypes } from './rewire.js'; +import { serializeInputValue, parseInputValue } from './transformInputValue.js'; export function mapSchema(schema: GraphQLSchema, schemaMapper: SchemaMapper = {}): GraphQLSchema { const newTypeMap = mapArguments( diff --git a/packages/utils/src/mergeDeep.ts b/packages/utils/src/mergeDeep.ts index d7513207168..d36feb99407 100644 --- a/packages/utils/src/mergeDeep.ts +++ b/packages/utils/src/mergeDeep.ts @@ -1,4 +1,4 @@ -import { isSome } from './helpers'; +import { isSome } from './helpers.js'; type BoxedTupleTypes = { [P in keyof T]: [T[P]] }[Exclude]; type UnionToIntersection = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never; diff --git a/packages/utils/src/parse-graphql-json.ts b/packages/utils/src/parse-graphql-json.ts index 4374fdcede8..4a081ba0baa 100644 --- a/packages/utils/src/parse-graphql-json.ts +++ b/packages/utils/src/parse-graphql-json.ts @@ -1,6 +1,6 @@ import { buildClientSchema, ParseOptions } from 'graphql'; -import { Source } from './loaders'; -import { SchemaPrintOptions } from './types'; +import { Source } from './loaders.js'; +import { SchemaPrintOptions } from './types.js'; function stripBOM(content: string): string { content = content.toString(); diff --git a/packages/utils/src/parse-graphql-sdl.ts b/packages/utils/src/parse-graphql-sdl.ts index d5667121e22..6acbe8ac666 100644 --- a/packages/utils/src/parse-graphql-sdl.ts +++ b/packages/utils/src/parse-graphql-sdl.ts @@ -9,8 +9,8 @@ import { StringValueNode, print, } from 'graphql'; -import { dedentBlockStringValue, getLeadingCommentBlock } from './comments'; -import { GraphQLParseOptions } from './Interfaces'; +import { dedentBlockStringValue, getLeadingCommentBlock } from './comments.js'; +import { GraphQLParseOptions } from './Interfaces.js'; export function parseGraphQLSDL(location: string | undefined, rawSDL: string, options: GraphQLParseOptions = {}) { let document: DocumentNode; diff --git a/packages/utils/src/print-schema-with-directives.ts b/packages/utils/src/print-schema-with-directives.ts index 4ffa9223523..4e09848d710 100644 --- a/packages/utils/src/print-schema-with-directives.ts +++ b/packages/utils/src/print-schema-with-directives.ts @@ -48,13 +48,13 @@ import { DocumentNode, StringValueNode, } from 'graphql'; -import { GetDocumentNodeFromSchemaOptions, PrintSchemaWithDirectivesOptions, Maybe } from './types'; +import { GetDocumentNodeFromSchemaOptions, PrintSchemaWithDirectivesOptions, Maybe } from './types.js'; -import { astFromType } from './astFromType'; -import { getDirectivesInExtensions } from './get-directives'; -import { astFromValueUntyped } from './astFromValueUntyped'; -import { isSome } from './helpers'; -import { getRootTypeMap } from './rootTypes'; +import { astFromType } from './astFromType.js'; +import { getDirectivesInExtensions } from './get-directives.js'; +import { astFromValueUntyped } from './astFromValueUntyped.js'; +import { isSome } from './helpers.js'; +import { getRootTypeMap } from './rootTypes.js'; export function getDocumentNodeFromSchema( schema: GraphQLSchema, diff --git a/packages/utils/src/prune.ts b/packages/utils/src/prune.ts index bd047234b40..7c2bfa931b4 100644 --- a/packages/utils/src/prune.ts +++ b/packages/utils/src/prune.ts @@ -10,12 +10,12 @@ import { isScalarType, } from 'graphql'; -import { PruneSchemaOptions } from './types'; +import { PruneSchemaOptions } from './types.js'; -import { mapSchema } from './mapSchema'; -import { MapperKind } from './Interfaces'; -import { getRootTypes } from './rootTypes'; -import { getImplementingTypes } from './get-implementing-types'; +import { mapSchema } from './mapSchema.js'; +import { MapperKind } from './Interfaces.js'; +import { getRootTypes } from './rootTypes.js'; +import { getImplementingTypes } from './get-implementing-types.js'; /** * Prunes the provided schema, removing unused and empty types diff --git a/packages/utils/src/rewire.ts b/packages/utils/src/rewire.ts index 1dd07cc8687..bfc26e7c565 100644 --- a/packages/utils/src/rewire.ts +++ b/packages/utils/src/rewire.ts @@ -26,7 +26,7 @@ import { isSpecifiedDirective, } from 'graphql'; -import { getBuiltInForStub, isNamedStub } from './stub'; +import { getBuiltInForStub, isNamedStub } from './stub.js'; export function rewireTypes( originalTypeMap: Record, diff --git a/packages/utils/src/rootTypes.ts b/packages/utils/src/rootTypes.ts index 128de4cb4c9..77ad19a566c 100644 --- a/packages/utils/src/rootTypes.ts +++ b/packages/utils/src/rootTypes.ts @@ -1,5 +1,5 @@ import { GraphQLObjectType, GraphQLSchema, OperationTypeNode } from 'graphql'; -import { memoize1 } from './memoize'; +import { memoize1 } from './memoize.js'; export function getDefinedRootType(schema: GraphQLSchema, operation: OperationTypeNode): GraphQLObjectType { const rootTypeMap = getRootTypeMap(schema); diff --git a/packages/utils/src/selectionSets.ts b/packages/utils/src/selectionSets.ts index 6cbb72be594..b115f2d198b 100644 --- a/packages/utils/src/selectionSets.ts +++ b/packages/utils/src/selectionSets.ts @@ -1,5 +1,5 @@ import { OperationDefinitionNode, SelectionSetNode, parse } from 'graphql'; -import { GraphQLParseOptions } from './Interfaces'; +import { GraphQLParseOptions } from './Interfaces.js'; export function parseSelectionSet(selectionSet: string, options?: GraphQLParseOptions): SelectionSetNode { const query = parse(selectionSet, options).definitions[0] as OperationDefinitionNode; diff --git a/packages/utils/src/transformInputValue.ts b/packages/utils/src/transformInputValue.ts index fd40b90b747..ef0318a8967 100644 --- a/packages/utils/src/transformInputValue.ts +++ b/packages/utils/src/transformInputValue.ts @@ -1,6 +1,6 @@ import { GraphQLInputType, getNullableType, isLeafType, isListType, isInputObjectType } from 'graphql'; -import { InputLeafValueTransformer, InputObjectValueTransformer, Maybe } from './types'; +import { InputLeafValueTransformer, InputObjectValueTransformer, Maybe } from './types.js'; export function transformInputValue( type: GraphQLInputType, diff --git a/packages/utils/src/updateArgument.ts b/packages/utils/src/updateArgument.ts index 913ddc198b4..9c2e0a367a1 100644 --- a/packages/utils/src/updateArgument.ts +++ b/packages/utils/src/updateArgument.ts @@ -1,6 +1,6 @@ import { GraphQLInputType, ArgumentNode, VariableDefinitionNode, Kind } from 'graphql'; -import { astFromType } from './astFromType'; +import { astFromType } from './astFromType.js'; export function updateArgument( argumentNodes: Record, diff --git a/packages/utils/src/validate-documents.ts b/packages/utils/src/validate-documents.ts index 6734de3e5c6..d807868fbdd 100644 --- a/packages/utils/src/validate-documents.ts +++ b/packages/utils/src/validate-documents.ts @@ -12,8 +12,8 @@ import { DocumentNode, versionInfo, } from 'graphql'; -import { Source } from './loaders'; -import { AggregateError } from './AggregateError'; +import { Source } from './loaders.js'; +import { AggregateError } from './AggregateError.js'; export type ValidationRule = (context: ValidationContext) => ASTVisitor; diff --git a/packages/utils/src/visitResult.ts b/packages/utils/src/visitResult.ts index 504d2698efd..9c94e506e27 100644 --- a/packages/utils/src/visitResult.ts +++ b/packages/utils/src/visitResult.ts @@ -1,4 +1,4 @@ -import { getOperationASTFromRequest } from './getOperationASTFromRequest'; +import { getOperationASTFromRequest } from './getOperationASTFromRequest.js'; import { GraphQLSchema, Kind, @@ -15,10 +15,10 @@ import { FragmentDefinitionNode, SchemaMetaFieldDef, } from 'graphql'; -import { collectFields, collectSubFields } from './collectFields'; +import { collectFields, collectSubFields } from './collectFields.js'; -import { ExecutionRequest, ExecutionResult } from './Interfaces'; -import { Maybe } from './types'; +import { ExecutionRequest, ExecutionResult } from './Interfaces.js'; +import { Maybe } from './types.js'; export type ValueVisitor = (value: any) => any; diff --git a/packages/utils/src/withCancel.ts b/packages/utils/src/withCancel.ts index 9b857e4b404..904441e071d 100644 --- a/packages/utils/src/withCancel.ts +++ b/packages/utils/src/withCancel.ts @@ -1,4 +1,4 @@ -import { memoize2 } from './memoize'; +import { memoize2 } from './memoize.js'; async function defaultAsyncIteratorReturn(value?: any) { return { value, done: true } as const; diff --git a/packages/utils/tests/build-operation-node-for-field.spec.ts b/packages/utils/tests/build-operation-node-for-field.spec.ts index 136e5febdfb..9f7a0419e1c 100644 --- a/packages/utils/tests/build-operation-node-for-field.spec.ts +++ b/packages/utils/tests/build-operation-node-for-field.spec.ts @@ -1,6 +1,6 @@ import { print, parse, buildSchema, ASTNode, OperationTypeNode } from 'graphql'; -import { buildOperationNodeForField } from '../src/build-operation-for-field'; +import { buildOperationNodeForField } from '../src/build-operation-for-field.js'; function clean(doc: string | ASTNode) { return print(typeof doc === 'string' ? parse(doc) : doc).trim(); diff --git a/packages/utils/tests/get-directives.spec.ts b/packages/utils/tests/get-directives.spec.ts index f0f58879263..a5616be2912 100644 --- a/packages/utils/tests/get-directives.spec.ts +++ b/packages/utils/tests/get-directives.spec.ts @@ -1,6 +1,6 @@ import { makeExecutableSchema } from '@graphql-tools/schema'; -import { getDirectives } from '../src'; -import { assertGraphQLObjectType } from '../../testing/assertion'; +import { getDirectives } from '../src/index.js'; +import { assertGraphQLObjectType } from '../../testing/assertion.js'; import { GraphQLSchema } from 'graphql'; describe('getDirectives', () => { diff --git a/packages/utils/tests/get-fields-with-directives.spec.ts b/packages/utils/tests/get-fields-with-directives.spec.ts index d12cb5f963f..887f0ff1d13 100644 --- a/packages/utils/tests/get-fields-with-directives.spec.ts +++ b/packages/utils/tests/get-fields-with-directives.spec.ts @@ -1,5 +1,5 @@ import { parse } from 'graphql'; -import { getFieldsWithDirectives } from '../src'; +import { getFieldsWithDirectives } from '../src/index.js'; describe('getFieldsWithDirectives', () => { it('Should detect single basic directive', () => { diff --git a/packages/utils/tests/mapSchema.test.ts b/packages/utils/tests/mapSchema.test.ts index cdf32c0702b..d177af8b08d 100644 --- a/packages/utils/tests/mapSchema.test.ts +++ b/packages/utils/tests/mapSchema.test.ts @@ -25,7 +25,7 @@ import { } from 'graphql'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { MapperKind, mapSchema, getDirectives, getDirective } from '../src'; +import { MapperKind, mapSchema, getDirectives, getDirective } from '../src/index.js'; import { createHash } from 'crypto'; import { addMocksToSchema } from '@graphql-tools/mock'; import formatDate from 'dateformat'; diff --git a/packages/utils/tests/parse-graphql-sdl.spec.ts b/packages/utils/tests/parse-graphql-sdl.spec.ts index a21b9bad1f0..558f5415bbb 100644 --- a/packages/utils/tests/parse-graphql-sdl.spec.ts +++ b/packages/utils/tests/parse-graphql-sdl.spec.ts @@ -1,4 +1,4 @@ -import { transformCommentsToDescriptions, parseGraphQLSDL } from '../src/parse-graphql-sdl'; +import { transformCommentsToDescriptions, parseGraphQLSDL } from '../src/parse-graphql-sdl.js'; import { Kind, print, ObjectTypeDefinitionNode } from 'graphql'; describe('parse sdl', () => { diff --git a/packages/utils/tests/print-schema-with-directives.spec.ts b/packages/utils/tests/print-schema-with-directives.spec.ts index fe6574b181c..c7882b41641 100644 --- a/packages/utils/tests/print-schema-with-directives.spec.ts +++ b/packages/utils/tests/print-schema-with-directives.spec.ts @@ -13,7 +13,7 @@ import { GraphQLID, GraphQLList, } from 'graphql'; -import { printSchemaWithDirectives } from '../src'; +import { printSchemaWithDirectives } from '../src/index.js'; import { GraphQLJSON } from 'graphql-scalars'; describe('printSchemaWithDirectives', () => { diff --git a/packages/utils/tests/prune.test.ts b/packages/utils/tests/prune.test.ts index f1d20dd3389..bffe12a21cd 100644 --- a/packages/utils/tests/prune.test.ts +++ b/packages/utils/tests/prune.test.ts @@ -1,6 +1,6 @@ import { buildSchema, GraphQLNamedType } from 'graphql'; -import { pruneSchema } from '../src/prune'; -import { PruneSchemaFilter } from '../src'; +import { pruneSchema } from '../src/prune.js'; +import { PruneSchemaFilter } from '../src/index.js'; describe('pruneSchema', () => { test('can handle recursive input types', () => { diff --git a/packages/utils/tests/relocatedError.test.ts b/packages/utils/tests/relocatedError.test.ts index f19d9f1c2b6..1f6a30df854 100644 --- a/packages/utils/tests/relocatedError.test.ts +++ b/packages/utils/tests/relocatedError.test.ts @@ -1,4 +1,4 @@ -import { relocatedError, createGraphQLError } from '../src/errors'; +import { relocatedError, createGraphQLError } from '../src/errors.js'; describe('Errors', () => { describe('relocatedError', () => { diff --git a/packages/utils/tests/validate-documents.spec.ts b/packages/utils/tests/validate-documents.spec.ts index 4cdcd709aad..16f05c4748d 100644 --- a/packages/utils/tests/validate-documents.spec.ts +++ b/packages/utils/tests/validate-documents.spec.ts @@ -1,4 +1,4 @@ -import { checkValidationErrors, validateGraphQlDocuments } from '../src'; +import { checkValidationErrors, validateGraphQlDocuments } from '../src/index.js'; import { buildSchema, parse, GraphQLError } from 'graphql'; describe('validateGraphQlDocuments', () => { diff --git a/packages/utils/tests/valueMatchedCriteria.test.ts b/packages/utils/tests/valueMatchedCriteria.test.ts index cd6c69cb8e5..d700be37942 100644 --- a/packages/utils/tests/valueMatchedCriteria.test.ts +++ b/packages/utils/tests/valueMatchedCriteria.test.ts @@ -1,4 +1,4 @@ -import { valueMatchesCriteria } from '../src/index'; +import { valueMatchesCriteria } from '../src/index.js'; describe('valueMatchesCriteria', () => { test('matches empty values', () => { diff --git a/packages/utils/tests/visitResult.test.ts b/packages/utils/tests/visitResult.test.ts index 91f006bdffc..ce6934bfd58 100644 --- a/packages/utils/tests/visitResult.test.ts +++ b/packages/utils/tests/visitResult.test.ts @@ -2,9 +2,9 @@ import { buildSchema, parse, GraphQLError, getIntrospectionQuery, introspectionF import { createGraphQLError, ExecutionRequest, ExecutionResult } from '@graphql-tools/utils'; -import { relocatedError } from '../src/errors'; +import { relocatedError } from '../src/errors.js'; -import { visitData, visitResult } from '../src/visitResult'; +import { visitData, visitResult } from '../src/visitResult.js'; describe('visiting results', () => { const schema = buildSchema(/* GraphQL */ ` diff --git a/packages/webpack-loader-runtime/package.json b/packages/webpack-loader-runtime/package.json index 8cbf967d5dc..f470a9d2351 100644 --- a/packages/webpack-loader-runtime/package.json +++ b/packages/webpack-loader-runtime/package.json @@ -9,21 +9,42 @@ }, "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -32,7 +53,8 @@ "input": "./src/index.ts" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/webpack-loader/package.json b/packages/webpack-loader/package.json index cd01f17002b..3bbc3993630 100644 --- a/packages/webpack-loader/package.json +++ b/packages/webpack-loader/package.json @@ -9,21 +9,42 @@ }, "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -40,7 +61,8 @@ "@types/webpack": "5.28.0" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/webpack-loader/src/index.ts b/packages/webpack-loader/src/index.ts index da45e5aa978..8d2d2e8165a 100644 --- a/packages/webpack-loader/src/index.ts +++ b/packages/webpack-loader/src/index.ts @@ -1,7 +1,7 @@ import os from 'os'; import { isExecutableDefinitionNode, Kind, DocumentNode } from 'graphql'; import { uniqueCode } from '@graphql-tools/webpack-loader-runtime'; -import { parseDocument } from './parser'; +import { parseDocument } from './parser.js'; import { optimizeDocumentNode, removeDescriptions, removeEmptyNodes } from '@graphql-tools/optimize'; import type { LoaderContext } from 'webpack'; diff --git a/packages/webpack-loader/tests/loader.test.ts b/packages/webpack-loader/tests/loader.test.ts index a26ec48634f..91b77e39a7a 100644 --- a/packages/webpack-loader/tests/loader.test.ts +++ b/packages/webpack-loader/tests/loader.test.ts @@ -1,7 +1,7 @@ import '../../testing/to-be-similar-string'; import { print, parse } from 'graphql'; import { uniqueCode } from '@graphql-tools/webpack-loader-runtime'; -import loader from '../src/index'; +import loader from '../src/index.js'; function useLoader(source: string, options: any): string { return loader.call({ cacheable() {}, query: options } as any, source); diff --git a/packages/webpack-loader/tests/parser.test.ts b/packages/webpack-loader/tests/parser.test.ts index 90858720a94..d2b0458147a 100644 --- a/packages/webpack-loader/tests/parser.test.ts +++ b/packages/webpack-loader/tests/parser.test.ts @@ -1,5 +1,5 @@ import { print, parse } from 'graphql'; -import { parseDocument } from '../src/parser'; +import { parseDocument } from '../src/parser.js'; test('basic query', () => { const docStr = /* GraphQL */ ` diff --git a/packages/wrap/package.json b/packages/wrap/package.json index 418c77c6a8a..73920875cbb 100644 --- a/packages/wrap/package.json +++ b/packages/wrap/package.json @@ -9,21 +9,42 @@ }, "license": "MIT", "sideEffects": false, - "main": "dist/index.js", - "module": "dist/index.mjs", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "exports": { ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs" + "require": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/cjs/index.js" + }, + "import": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + }, + "default": { + "types": "./dist/typings/index.d.ts", + "default": "./dist/esm/index.js" + } }, "./*": { - "require": "./dist/*.js", - "import": "./dist/*.mjs" - } + "require": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/cjs/*.js" + }, + "import": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + }, + "default": { + "types": "./dist/typings/*.d.ts", + "default": "./dist/esm/*.js" + } + }, + "./package.json": "./package.json" }, - "typings": "dist/index.d.ts", + "typings": "dist/typings/index.d.ts", "typescript": { - "definition": "dist/index.d.ts" + "definition": "dist/typings/index.d.ts" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" @@ -39,7 +60,8 @@ "value-or-promise": "1.0.11" }, "publishConfig": { - "access": "public", - "directory": "dist" - } + "directory": "dist", + "access": "public" + }, + "type": "module" } diff --git a/packages/wrap/src/index.ts b/packages/wrap/src/index.ts index 317d012e34c..077df2aa24e 100644 --- a/packages/wrap/src/index.ts +++ b/packages/wrap/src/index.ts @@ -1,7 +1,7 @@ -export { wrapSchema } from './wrapSchema'; -export { defaultCreateProxyingResolver, generateProxyingResolvers } from './generateProxyingResolvers'; +export { wrapSchema } from './wrapSchema.js'; +export { defaultCreateProxyingResolver, generateProxyingResolvers } from './generateProxyingResolvers.js'; -export * from './transforms/index'; +export * from './transforms/index.js'; -export * from './types'; -export * from './introspect'; +export * from './types.js'; +export * from './introspect.js'; diff --git a/packages/wrap/src/transforms/FilterInputObjectFields.ts b/packages/wrap/src/transforms/FilterInputObjectFields.ts index d16565b9c3f..aec3d1b8b3e 100644 --- a/packages/wrap/src/transforms/FilterInputObjectFields.ts +++ b/packages/wrap/src/transforms/FilterInputObjectFields.ts @@ -4,9 +4,9 @@ import { ExecutionRequest, InputFieldFilter } from '@graphql-tools/utils'; import { Transform, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import { InputObjectNodeTransformer } from '../types'; +import { InputObjectNodeTransformer } from '../types.js'; -import TransformInputObjectFields from './TransformInputObjectFields'; +import TransformInputObjectFields from './TransformInputObjectFields.js'; interface FilterInputObjectFieldsTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/FilterInterfaceFields.ts b/packages/wrap/src/transforms/FilterInterfaceFields.ts index 317451e0de0..ca6918fcd84 100644 --- a/packages/wrap/src/transforms/FilterInterfaceFields.ts +++ b/packages/wrap/src/transforms/FilterInterfaceFields.ts @@ -4,7 +4,7 @@ import { FieldFilter } from '@graphql-tools/utils'; import { SubschemaConfig, Transform } from '@graphql-tools/delegate'; -import TransformInterfaceFields from './TransformInterfaceFields'; +import TransformInterfaceFields from './TransformInterfaceFields.js'; interface FilterInterfaceFieldsTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/FilterObjectFieldDirectives.ts b/packages/wrap/src/transforms/FilterObjectFieldDirectives.ts index bc02639df1e..d79472ad7f9 100644 --- a/packages/wrap/src/transforms/FilterObjectFieldDirectives.ts +++ b/packages/wrap/src/transforms/FilterObjectFieldDirectives.ts @@ -4,7 +4,7 @@ import { getArgumentValues } from '@graphql-tools/utils'; import { SubschemaConfig, Transform } from '@graphql-tools/delegate'; -import TransformObjectFields from './TransformObjectFields'; +import TransformObjectFields from './TransformObjectFields.js'; interface FilterObjectFieldDirectivesTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/FilterObjectFields.ts b/packages/wrap/src/transforms/FilterObjectFields.ts index 5160fe22176..b7ac160c12d 100644 --- a/packages/wrap/src/transforms/FilterObjectFields.ts +++ b/packages/wrap/src/transforms/FilterObjectFields.ts @@ -4,7 +4,7 @@ import { ObjectFieldFilter } from '@graphql-tools/utils'; import { SubschemaConfig, Transform } from '@graphql-tools/delegate'; -import TransformObjectFields from './TransformObjectFields'; +import TransformObjectFields from './TransformObjectFields.js'; interface FilterObjectFieldsTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/FilterRootFields.ts b/packages/wrap/src/transforms/FilterRootFields.ts index 08358e10d4b..f75cacc1852 100644 --- a/packages/wrap/src/transforms/FilterRootFields.ts +++ b/packages/wrap/src/transforms/FilterRootFields.ts @@ -4,7 +4,7 @@ import { RootFieldFilter } from '@graphql-tools/utils'; import { SubschemaConfig, Transform } from '@graphql-tools/delegate'; -import TransformRootFields from './TransformRootFields'; +import TransformRootFields from './TransformRootFields.js'; interface FilterRootFieldsTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/HoistField.ts b/packages/wrap/src/transforms/HoistField.ts index 29c6111d7ff..afce3f11a24 100644 --- a/packages/wrap/src/transforms/HoistField.ts +++ b/packages/wrap/src/transforms/HoistField.ts @@ -20,9 +20,9 @@ import { import { Transform, defaultMergedResolver, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import { defaultCreateProxyingResolver } from '../generateProxyingResolvers'; +import { defaultCreateProxyingResolver } from '../generateProxyingResolvers.js'; -import MapFields from './MapFields'; +import MapFields from './MapFields.js'; interface HoistFieldTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/MapFields.ts b/packages/wrap/src/transforms/MapFields.ts index 019a8c614e7..44e6ff91b76 100644 --- a/packages/wrap/src/transforms/MapFields.ts +++ b/packages/wrap/src/transforms/MapFields.ts @@ -4,9 +4,9 @@ import { ExecutionRequest, FieldNodeMappers, ExecutionResult } from '@graphql-to import { Transform, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import { ObjectValueTransformerMap, ErrorsTransformer } from '../types'; +import { ObjectValueTransformerMap, ErrorsTransformer } from '../types.js'; -import TransformCompositeFields from './TransformCompositeFields'; +import TransformCompositeFields from './TransformCompositeFields.js'; interface MapFieldsTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/MapLeafValues.ts b/packages/wrap/src/transforms/MapLeafValues.ts index f1706e566d1..e1fa2825187 100644 --- a/packages/wrap/src/transforms/MapLeafValues.ts +++ b/packages/wrap/src/transforms/MapLeafValues.ts @@ -25,7 +25,7 @@ import { import { Transform, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import { LeafValueTransformer } from '../types'; +import { LeafValueTransformer } from '../types.js'; export interface MapLeafValuesTransformationContext { transformedRequest: ExecutionRequest; diff --git a/packages/wrap/src/transforms/RemoveObjectFieldDeprecations.ts b/packages/wrap/src/transforms/RemoveObjectFieldDeprecations.ts index 53762b3deee..761f4a6b97e 100644 --- a/packages/wrap/src/transforms/RemoveObjectFieldDeprecations.ts +++ b/packages/wrap/src/transforms/RemoveObjectFieldDeprecations.ts @@ -4,8 +4,8 @@ import { valueMatchesCriteria } from '@graphql-tools/utils'; import { SubschemaConfig, Transform } from '@graphql-tools/delegate'; -import FilterObjectFieldDirectives from './FilterObjectFieldDirectives'; -import TransformObjectFields from './TransformObjectFields'; +import FilterObjectFieldDirectives from './FilterObjectFieldDirectives.js'; +import TransformObjectFields from './TransformObjectFields.js'; interface RemoveObjectFieldDeprecationsTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/RemoveObjectFieldDirectives.ts b/packages/wrap/src/transforms/RemoveObjectFieldDirectives.ts index 50b80f27468..aa2548471ad 100644 --- a/packages/wrap/src/transforms/RemoveObjectFieldDirectives.ts +++ b/packages/wrap/src/transforms/RemoveObjectFieldDirectives.ts @@ -4,7 +4,7 @@ import { valueMatchesCriteria } from '@graphql-tools/utils'; import { SubschemaConfig, Transform } from '@graphql-tools/delegate'; -import FilterObjectFieldDirectives from './FilterObjectFieldDirectives'; +import FilterObjectFieldDirectives from './FilterObjectFieldDirectives.js'; interface RemoveObjectFieldDirectivesTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/RemoveObjectFieldsWithDeprecation.ts b/packages/wrap/src/transforms/RemoveObjectFieldsWithDeprecation.ts index faa7757cdab..ca256e26c9b 100644 --- a/packages/wrap/src/transforms/RemoveObjectFieldsWithDeprecation.ts +++ b/packages/wrap/src/transforms/RemoveObjectFieldsWithDeprecation.ts @@ -4,7 +4,7 @@ import { valueMatchesCriteria } from '@graphql-tools/utils'; import { SubschemaConfig, Transform } from '@graphql-tools/delegate'; -import FilterObjectFields from './FilterObjectFields'; +import FilterObjectFields from './FilterObjectFields.js'; interface RemoveObjectFieldsWithDeprecationTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/RemoveObjectFieldsWithDirective.ts b/packages/wrap/src/transforms/RemoveObjectFieldsWithDirective.ts index cbb34425471..28d14b6c11c 100644 --- a/packages/wrap/src/transforms/RemoveObjectFieldsWithDirective.ts +++ b/packages/wrap/src/transforms/RemoveObjectFieldsWithDirective.ts @@ -4,7 +4,7 @@ import { getDirectives, valueMatchesCriteria } from '@graphql-tools/utils'; import { SubschemaConfig, Transform } from '@graphql-tools/delegate'; -import FilterObjectFields from './FilterObjectFields'; +import FilterObjectFields from './FilterObjectFields.js'; interface RemoveObjectFieldsWithDirectiveTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/RenameInputObjectFields.ts b/packages/wrap/src/transforms/RenameInputObjectFields.ts index 49c66f5e2a6..2b2ff881e23 100644 --- a/packages/wrap/src/transforms/RenameInputObjectFields.ts +++ b/packages/wrap/src/transforms/RenameInputObjectFields.ts @@ -4,7 +4,7 @@ import { ExecutionRequest, mapSchema, MapperKind } from '@graphql-tools/utils'; import { Transform, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import TransformInputObjectFields from './TransformInputObjectFields'; +import TransformInputObjectFields from './TransformInputObjectFields.js'; type RenamerFunction = ( typeName: string, diff --git a/packages/wrap/src/transforms/RenameInterfaceFields.ts b/packages/wrap/src/transforms/RenameInterfaceFields.ts index cb42a4651af..0dbf59733ef 100644 --- a/packages/wrap/src/transforms/RenameInterfaceFields.ts +++ b/packages/wrap/src/transforms/RenameInterfaceFields.ts @@ -4,7 +4,7 @@ import { ExecutionRequest } from '@graphql-tools/utils'; import { Transform, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import TransformInterfaceFields from './TransformInterfaceFields'; +import TransformInterfaceFields from './TransformInterfaceFields.js'; interface RenameInterfaceFieldsTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/RenameObjectFieldArguments.ts b/packages/wrap/src/transforms/RenameObjectFieldArguments.ts index 4eacea8c015..e691367d94d 100644 --- a/packages/wrap/src/transforms/RenameObjectFieldArguments.ts +++ b/packages/wrap/src/transforms/RenameObjectFieldArguments.ts @@ -4,7 +4,7 @@ import { ExecutionRequest, mapSchema, MapperKind } from '@graphql-tools/utils'; import { Transform, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import TransformObjectFields from './TransformObjectFields'; +import TransformObjectFields from './TransformObjectFields.js'; type RenamerFunction = (typeName: string, fieldName: string, argName: string) => string; diff --git a/packages/wrap/src/transforms/RenameObjectFields.ts b/packages/wrap/src/transforms/RenameObjectFields.ts index 963342f013a..ff14695a534 100644 --- a/packages/wrap/src/transforms/RenameObjectFields.ts +++ b/packages/wrap/src/transforms/RenameObjectFields.ts @@ -4,7 +4,7 @@ import { ExecutionRequest } from '@graphql-tools/utils'; import { Transform, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import TransformObjectFields from './TransformObjectFields'; +import TransformObjectFields from './TransformObjectFields.js'; interface RenameObjectFieldsTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/RenameRootFields.ts b/packages/wrap/src/transforms/RenameRootFields.ts index b0ab9cc96b6..8b776236919 100644 --- a/packages/wrap/src/transforms/RenameRootFields.ts +++ b/packages/wrap/src/transforms/RenameRootFields.ts @@ -4,7 +4,7 @@ import { ExecutionRequest } from '@graphql-tools/utils'; import { Transform, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import TransformRootFields from './TransformRootFields'; +import TransformRootFields from './TransformRootFields.js'; interface RenameRootFieldsTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/TransformCompositeFields.ts b/packages/wrap/src/transforms/TransformCompositeFields.ts index 69f44b1d705..5244a84c1c0 100644 --- a/packages/wrap/src/transforms/TransformCompositeFields.ts +++ b/packages/wrap/src/transforms/TransformCompositeFields.ts @@ -15,7 +15,7 @@ import { ExecutionRequest, MapperKind, mapSchema, visitData, ExecutionResult, Ma import { Transform, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import { FieldTransformer, FieldNodeTransformer, DataTransformer, ErrorsTransformer } from '../types'; +import { FieldTransformer, FieldNodeTransformer, DataTransformer, ErrorsTransformer } from '../types.js'; interface TransformCompositeFieldsTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/TransformEnumValues.ts b/packages/wrap/src/transforms/TransformEnumValues.ts index bde4aecf257..4698cf5a975 100644 --- a/packages/wrap/src/transforms/TransformEnumValues.ts +++ b/packages/wrap/src/transforms/TransformEnumValues.ts @@ -4,9 +4,9 @@ import { ExecutionRequest, MapperKind, mapSchema, Maybe } from '@graphql-tools/u import { Transform, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import { EnumValueTransformer, LeafValueTransformer } from '../types'; +import { EnumValueTransformer, LeafValueTransformer } from '../types.js'; -import MapLeafValues, { MapLeafValuesTransformationContext } from './MapLeafValues'; +import MapLeafValues, { MapLeafValuesTransformationContext } from './MapLeafValues.js'; interface TransformEnumValuesTransformationContext extends MapLeafValuesTransformationContext {} diff --git a/packages/wrap/src/transforms/TransformInputObjectFields.ts b/packages/wrap/src/transforms/TransformInputObjectFields.ts index de005a5beb4..89a78d1d529 100644 --- a/packages/wrap/src/transforms/TransformInputObjectFields.ts +++ b/packages/wrap/src/transforms/TransformInputObjectFields.ts @@ -19,7 +19,7 @@ import { Maybe, ExecutionRequest, MapperKind, mapSchema, transformInputValue } f import { Transform, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import { InputFieldTransformer, InputFieldNodeTransformer, InputObjectNodeTransformer } from '../types'; +import { InputFieldTransformer, InputFieldNodeTransformer, InputObjectNodeTransformer } from '../types.js'; interface TransformInputObjectFieldsTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/TransformInterfaceFields.ts b/packages/wrap/src/transforms/TransformInterfaceFields.ts index 663b3dc36dd..377284f318a 100644 --- a/packages/wrap/src/transforms/TransformInterfaceFields.ts +++ b/packages/wrap/src/transforms/TransformInterfaceFields.ts @@ -4,9 +4,9 @@ import { ExecutionRequest, ExecutionResult } from '@graphql-tools/utils'; import { Transform, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import { FieldTransformer, FieldNodeTransformer } from '../types'; +import { FieldTransformer, FieldNodeTransformer } from '../types.js'; -import TransformCompositeFields from './TransformCompositeFields'; +import TransformCompositeFields from './TransformCompositeFields.js'; interface TransformInterfaceFieldsTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/TransformObjectFields.ts b/packages/wrap/src/transforms/TransformObjectFields.ts index a44f9feccc6..2a8f6ff19fb 100644 --- a/packages/wrap/src/transforms/TransformObjectFields.ts +++ b/packages/wrap/src/transforms/TransformObjectFields.ts @@ -4,9 +4,9 @@ import { ExecutionRequest, ExecutionResult } from '@graphql-tools/utils'; import { Transform, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import { FieldTransformer, FieldNodeTransformer } from '../types'; +import { FieldTransformer, FieldNodeTransformer } from '../types.js'; -import TransformCompositeFields from './TransformCompositeFields'; +import TransformCompositeFields from './TransformCompositeFields.js'; interface TransformObjectFieldsTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/TransformRootFields.ts b/packages/wrap/src/transforms/TransformRootFields.ts index 47af3b3096e..068807d10f9 100644 --- a/packages/wrap/src/transforms/TransformRootFields.ts +++ b/packages/wrap/src/transforms/TransformRootFields.ts @@ -4,9 +4,9 @@ import { ExecutionRequest, ExecutionResult } from '@graphql-tools/utils'; import { Transform, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import { RootFieldTransformer, FieldNodeTransformer } from '../types'; +import { RootFieldTransformer, FieldNodeTransformer } from '../types.js'; -import TransformObjectFields from './TransformObjectFields'; +import TransformObjectFields from './TransformObjectFields.js'; interface TransformRootFieldsTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/WrapFields.ts b/packages/wrap/src/transforms/WrapFields.ts index 5362dc8cc25..f1a208a6a76 100644 --- a/packages/wrap/src/transforms/WrapFields.ts +++ b/packages/wrap/src/transforms/WrapFields.ts @@ -24,8 +24,8 @@ import { import { Transform, defaultMergedResolver, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import MapFields from './MapFields'; -import { defaultCreateProxyingResolver } from '../generateProxyingResolvers'; +import MapFields from './MapFields.js'; +import { defaultCreateProxyingResolver } from '../generateProxyingResolvers.js'; interface WrapFieldsTransformationContext { nextIndex: number; diff --git a/packages/wrap/src/transforms/WrapType.ts b/packages/wrap/src/transforms/WrapType.ts index ed6bc85d54f..7e2c4df469b 100644 --- a/packages/wrap/src/transforms/WrapType.ts +++ b/packages/wrap/src/transforms/WrapType.ts @@ -4,7 +4,7 @@ import { ExecutionRequest, ExecutionResult } from '@graphql-tools/utils'; import { Transform, DelegationContext, SubschemaConfig } from '@graphql-tools/delegate'; -import WrapFields from './WrapFields'; +import WrapFields from './WrapFields.js'; interface WrapTypeTransformationContext extends Record {} diff --git a/packages/wrap/src/transforms/index.ts b/packages/wrap/src/transforms/index.ts index 2e5605b690a..55576440b73 100644 --- a/packages/wrap/src/transforms/index.ts +++ b/packages/wrap/src/transforms/index.ts @@ -1,35 +1,35 @@ -export { default as RenameTypes } from './RenameTypes'; -export { default as FilterTypes } from './FilterTypes'; -export { default as RenameRootTypes } from './RenameRootTypes'; -export { default as TransformCompositeFields } from './TransformCompositeFields'; -export { default as TransformRootFields } from './TransformRootFields'; -export { default as RenameRootFields } from './RenameRootFields'; -export { default as FilterRootFields } from './FilterRootFields'; -export { default as TransformObjectFields } from './TransformObjectFields'; -export { default as RenameObjectFields } from './RenameObjectFields'; -export { default as RenameObjectFieldArguments } from './RenameObjectFieldArguments'; -export { default as FilterObjectFields } from './FilterObjectFields'; -export { default as TransformInterfaceFields } from './TransformInterfaceFields'; -export { default as RenameInterfaceFields } from './RenameInterfaceFields'; -export { default as FilterInterfaceFields } from './FilterInterfaceFields'; -export { default as TransformInputObjectFields } from './TransformInputObjectFields'; -export { default as RenameInputObjectFields } from './RenameInputObjectFields'; -export { default as FilterInputObjectFields } from './FilterInputObjectFields'; -export { default as MapLeafValues } from './MapLeafValues'; -export { default as TransformEnumValues } from './TransformEnumValues'; -export { default as TransformQuery } from './TransformQuery'; -export { default as FilterObjectFieldDirectives } from './FilterObjectFieldDirectives'; -export { default as RemoveObjectFieldDirectives } from './RemoveObjectFieldDirectives'; -export { default as RemoveObjectFieldsWithDirective } from './RemoveObjectFieldsWithDirective'; -export { default as RemoveObjectFieldDeprecations } from './RemoveObjectFieldDeprecations'; -export { default as RemoveObjectFieldsWithDeprecation } from './RemoveObjectFieldsWithDeprecation'; +export { default as RenameTypes } from './RenameTypes.js'; +export { default as FilterTypes } from './FilterTypes.js'; +export { default as RenameRootTypes } from './RenameRootTypes.js'; +export { default as TransformCompositeFields } from './TransformCompositeFields.js'; +export { default as TransformRootFields } from './TransformRootFields.js'; +export { default as RenameRootFields } from './RenameRootFields.js'; +export { default as FilterRootFields } from './FilterRootFields.js'; +export { default as TransformObjectFields } from './TransformObjectFields.js'; +export { default as RenameObjectFields } from './RenameObjectFields.js'; +export { default as RenameObjectFieldArguments } from './RenameObjectFieldArguments.js'; +export { default as FilterObjectFields } from './FilterObjectFields.js'; +export { default as TransformInterfaceFields } from './TransformInterfaceFields.js'; +export { default as RenameInterfaceFields } from './RenameInterfaceFields.js'; +export { default as FilterInterfaceFields } from './FilterInterfaceFields.js'; +export { default as TransformInputObjectFields } from './TransformInputObjectFields.js'; +export { default as RenameInputObjectFields } from './RenameInputObjectFields.js'; +export { default as FilterInputObjectFields } from './FilterInputObjectFields.js'; +export { default as MapLeafValues } from './MapLeafValues.js'; +export { default as TransformEnumValues } from './TransformEnumValues.js'; +export { default as TransformQuery } from './TransformQuery.js'; +export { default as FilterObjectFieldDirectives } from './FilterObjectFieldDirectives.js'; +export { default as RemoveObjectFieldDirectives } from './RemoveObjectFieldDirectives.js'; +export { default as RemoveObjectFieldsWithDirective } from './RemoveObjectFieldsWithDirective.js'; +export { default as RemoveObjectFieldDeprecations } from './RemoveObjectFieldDeprecations.js'; +export { default as RemoveObjectFieldsWithDeprecation } from './RemoveObjectFieldsWithDeprecation.js'; -export { default as PruneSchema } from './PruneSchema'; -export { default as WrapType } from './WrapType'; -export { default as WrapFields } from './WrapFields'; -export { default as HoistField } from './HoistField'; -export { default as MapFields } from './MapFields'; +export { default as PruneSchema } from './PruneSchema.js'; +export { default as WrapType } from './WrapType.js'; +export { default as WrapFields } from './WrapFields.js'; +export { default as HoistField } from './HoistField.js'; +export { default as MapFields } from './MapFields.js'; // superseded by TransformQuery -export { default as WrapQuery } from './WrapQuery'; -export { default as ExtractField } from './ExtractField'; +export { default as WrapQuery } from './WrapQuery.js'; +export { default as ExtractField } from './ExtractField.js'; diff --git a/packages/wrap/src/wrapSchema.ts b/packages/wrap/src/wrapSchema.ts index 39edb49b3ea..c3409f16452 100644 --- a/packages/wrap/src/wrapSchema.ts +++ b/packages/wrap/src/wrapSchema.ts @@ -9,7 +9,7 @@ import { import { MapperKind, mapSchema } from '@graphql-tools/utils'; import { SubschemaConfig, defaultMergedResolver, applySchemaTransforms } from '@graphql-tools/delegate'; -import { generateProxyingResolvers } from './generateProxyingResolvers'; +import { generateProxyingResolvers } from './generateProxyingResolvers.js'; export function wrapSchema = Record>( subschemaConfig: SubschemaConfig diff --git a/packages/wrap/tests/fragmentsAreNotDuplicated.test.ts b/packages/wrap/tests/fragmentsAreNotDuplicated.test.ts index 6fb04845765..a16b690fc81 100644 --- a/packages/wrap/tests/fragmentsAreNotDuplicated.test.ts +++ b/packages/wrap/tests/fragmentsAreNotDuplicated.test.ts @@ -1,6 +1,6 @@ import { graphql } from 'graphql'; -import { wrapSchema } from '../src'; +import { wrapSchema } from '../src/index.js'; import { makeExecutableSchema } from '@graphql-tools/schema'; import { addMocksToSchema } from '@graphql-tools/mock'; import { ExecutionResult } from '@graphql-tools/utils'; diff --git a/packages/wrap/tests/gatsbyTransforms.test.ts b/packages/wrap/tests/gatsbyTransforms.test.ts index 321a8d36974..3599dcc499d 100644 --- a/packages/wrap/tests/gatsbyTransforms.test.ts +++ b/packages/wrap/tests/gatsbyTransforms.test.ts @@ -8,7 +8,7 @@ import { } from 'graphql'; import { mapSchema, MapperKind, addTypes, modifyObjectFields, assertSome } from '@graphql-tools/utils'; -import { wrapSchema, RenameTypes } from '../src'; +import { wrapSchema, RenameTypes } from '../src/index.js'; import { makeExecutableSchema } from '@graphql-tools/schema'; import { addMocksToSchema } from '@graphql-tools/mock'; diff --git a/packages/wrap/tests/makeRemoteExecutableSchema.test.ts b/packages/wrap/tests/makeRemoteExecutableSchema.test.ts index 46f2fec2fee..c60526cf5d8 100644 --- a/packages/wrap/tests/makeRemoteExecutableSchema.test.ts +++ b/packages/wrap/tests/makeRemoteExecutableSchema.test.ts @@ -1,6 +1,6 @@ import { GraphQLSchema, subscribe, parse, print, ExecutionResult, buildSchema, graphql } from 'graphql'; -import { wrapSchema } from '../src/index'; +import { wrapSchema } from '../src/index.js'; import { propertySchema, @@ -8,7 +8,7 @@ import { subscriptionPubSubTrigger, subscriptionPubSub, makeSchemaRemote, -} from '../../testing/fixtures/schemas'; +} from '../../testing/fixtures/schemas.js'; describe('remote queries', () => { let schema: GraphQLSchema; diff --git a/packages/wrap/tests/transformFilterTypes.test.ts b/packages/wrap/tests/transformFilterTypes.test.ts index cd232972071..4ff0d651eeb 100644 --- a/packages/wrap/tests/transformFilterTypes.test.ts +++ b/packages/wrap/tests/transformFilterTypes.test.ts @@ -1,7 +1,7 @@ import { wrapSchema, FilterTypes } from '@graphql-tools/wrap'; import { graphql, GraphQLSchema, GraphQLNamedType } from 'graphql'; import { assertSome } from '@graphql-tools/utils'; -import { bookingSchema } from '../../testing/fixtures/schemas'; +import { bookingSchema } from '../../testing/fixtures/schemas.js'; describe('FilterTypes', () => { let schema: GraphQLSchema; diff --git a/packages/wrap/tests/transformRemoveObjectFieldDeprecations.test.ts b/packages/wrap/tests/transformRemoveObjectFieldDeprecations.test.ts index 451df1792aa..9a4b15bb08f 100644 --- a/packages/wrap/tests/transformRemoveObjectFieldDeprecations.test.ts +++ b/packages/wrap/tests/transformRemoveObjectFieldDeprecations.test.ts @@ -1,6 +1,6 @@ import { wrapSchema, RemoveObjectFieldDeprecations } from '@graphql-tools/wrap'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { assertGraphQLObjectType } from '../../testing/assertion'; +import { assertGraphQLObjectType } from '../../testing/assertion.js'; import { assertSome } from '@graphql-tools/utils'; describe('RemoveObjectFieldDeprecations', () => { diff --git a/packages/wrap/tests/transformRemoveObjectFieldDirectives.test.ts b/packages/wrap/tests/transformRemoveObjectFieldDirectives.test.ts index 72fafd3a4e0..0f59573cd32 100644 --- a/packages/wrap/tests/transformRemoveObjectFieldDirectives.test.ts +++ b/packages/wrap/tests/transformRemoveObjectFieldDirectives.test.ts @@ -1,6 +1,6 @@ import { wrapSchema, RemoveObjectFieldDirectives } from '@graphql-tools/wrap'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { assertGraphQLObjectType } from '../../testing/assertion'; +import { assertGraphQLObjectType } from '../../testing/assertion.js'; import { assertSome } from '@graphql-tools/utils'; describe('RemoveObjectFieldDirectives', () => { diff --git a/packages/wrap/tests/transformRemoveObjectFieldsWithDeprecation.test.ts b/packages/wrap/tests/transformRemoveObjectFieldsWithDeprecation.test.ts index 572e92b5027..97e55313cf3 100644 --- a/packages/wrap/tests/transformRemoveObjectFieldsWithDeprecation.test.ts +++ b/packages/wrap/tests/transformRemoveObjectFieldsWithDeprecation.test.ts @@ -1,6 +1,6 @@ import { wrapSchema, RemoveObjectFieldsWithDeprecation } from '@graphql-tools/wrap'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { assertGraphQLObjectType } from '../../testing/assertion'; +import { assertGraphQLObjectType } from '../../testing/assertion.js'; describe('RemoveObjectFieldsWithDeprecation', () => { const originalSchema = makeExecutableSchema({ diff --git a/packages/wrap/tests/transformRemoveObjectFieldsWithDirective.test.ts b/packages/wrap/tests/transformRemoveObjectFieldsWithDirective.test.ts index ba6d6d764ee..e0c49d48e29 100644 --- a/packages/wrap/tests/transformRemoveObjectFieldsWithDirective.test.ts +++ b/packages/wrap/tests/transformRemoveObjectFieldsWithDirective.test.ts @@ -1,6 +1,6 @@ import { wrapSchema, RemoveObjectFieldsWithDirective } from '@graphql-tools/wrap'; import { makeExecutableSchema } from '@graphql-tools/schema'; -import { assertGraphQLObjectType } from '../../testing/assertion'; +import { assertGraphQLObjectType } from '../../testing/assertion.js'; describe('RemoveObjectFieldsWithDirective', () => { const originalSchema = makeExecutableSchema({ diff --git a/packages/wrap/tests/transformRenameObjectFieldArguments.test.ts b/packages/wrap/tests/transformRenameObjectFieldArguments.test.ts index d502c952c85..392c0f2a7ba 100644 --- a/packages/wrap/tests/transformRenameObjectFieldArguments.test.ts +++ b/packages/wrap/tests/transformRenameObjectFieldArguments.test.ts @@ -3,7 +3,7 @@ import { makeExecutableSchema } from '@graphql-tools/schema'; import { execute, parse } from 'graphql'; import { assertSome } from '@graphql-tools/utils'; -import RenameObjectFieldArguments from '../src/transforms/RenameObjectFieldArguments'; +import RenameObjectFieldArguments from '../src/transforms/RenameObjectFieldArguments.js'; describe('RenameObjectFieldArguments', () => { test('renaming with arguments works', async () => { diff --git a/packages/wrap/tests/transformRenameTypes.test.ts b/packages/wrap/tests/transformRenameTypes.test.ts index 581ea4617a5..c338bfc5a6a 100644 --- a/packages/wrap/tests/transformRenameTypes.test.ts +++ b/packages/wrap/tests/transformRenameTypes.test.ts @@ -1,6 +1,6 @@ import { wrapSchema, RenameTypes } from '@graphql-tools/wrap'; import { execute, GraphQLSchema, parse } from 'graphql'; -import { propertySchema } from '../../testing/fixtures/schemas'; +import { propertySchema } from '../../testing/fixtures/schemas.js'; describe('RenameTypes', () => { describe('rename type', () => { diff --git a/tsconfig.build.json b/tsconfig.build.json deleted file mode 100644 index 5fd95c36e08..00000000000 --- a/tsconfig.build.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "sourceMap": false, - "inlineSourceMap": false - }, - "exclude": ["**/test/*.ts", "*.spec.ts", "**/tests", "**/test-assets", "**/test-files", "packages/testing"] -} diff --git a/tsconfig.json b/tsconfig.json index 369c78932f9..140c5ce2ab6 100755 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,6 @@ { "compilerOptions": { "incremental": true, - "outDir": "dist", "baseUrl": ".", diff --git a/yarn.lock b/yarn.lock index d4d7afca42a..5c0fd43179d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3202,25 +3202,26 @@ resolved "https://registry.yarnpkg.com/@repeaterjs/repeater/-/repeater-3.0.4.tgz#a04d63f4d1bf5540a41b01a921c9a7fddc3bd1ca" integrity sha512-AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA== -"@rollup/plugin-json@4.1.0": +"@rollup/plugin-json@^4.1.0": version "4.1.0" resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.1.0.tgz#54e09867ae6963c593844d8bd7a9c718294496f3" integrity sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw== dependencies: "@rollup/pluginutils" "^3.0.8" -"@rollup/plugin-node-resolve@7.1.1": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.1.tgz#8c6e59c4b28baf9d223028d0e450e06a485bb2b7" - integrity sha512-14ddhD7TnemeHE97a4rLOhobfYvUVcaYuqTnL8Ti7Jxi9V9Jr5LY7Gko4HZ5k4h4vqQM0gBQt6tsp9xXW94WPA== +"@rollup/plugin-node-resolve@^13.3.0": + version "13.3.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz#da1c5c5ce8316cef96a2f823d111c1e4e498801c" + integrity sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw== dependencies: - "@rollup/pluginutils" "^3.0.6" - "@types/resolve" "0.0.8" - builtin-modules "^3.1.0" + "@rollup/pluginutils" "^3.1.0" + "@types/resolve" "1.17.1" + deepmerge "^4.2.2" + is-builtin-module "^3.1.0" is-module "^1.0.0" - resolve "^1.14.2" + resolve "^1.19.0" -"@rollup/pluginutils@^3.0.6", "@rollup/pluginutils@^3.0.8": +"@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg== @@ -3229,6 +3230,14 @@ estree-walker "^1.0.1" picomatch "^2.2.2" +"@rollup/pluginutils@^4.1.2": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d" + integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ== + dependencies: + estree-walker "^2.0.1" + picomatch "^2.2.2" + "@sideway/address@^4.1.3": version "4.1.3" resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.3.tgz#d93cce5d45c5daec92ad76db492cc2ee3c64ab27" @@ -3748,10 +3757,10 @@ resolved "https://registry.yarnpkg.com/@types/relay-runtime/-/relay-runtime-11.0.2.tgz#3e7a1371c13ee731288c751a53e7392c6afff2b5" integrity sha512-GDw27MCYF45medCb0Ug08EPJVHA/K0yNKZ4N4LOGMaclUnLmzZJz9w6ja6pZMhBT84PQ9wsPZbHRPyXl57Am1Q== -"@types/resolve@0.0.8": - version "0.0.8" - resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194" - integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ== +"@types/resolve@1.17.1": + version "1.17.1" + resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6" + integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw== dependencies: "@types/node" "*" @@ -3903,10 +3912,10 @@ "@typescript-eslint/types" "5.29.0" eslint-visitor-keys "^3.3.0" -"@vercel/ncc@0.31.1": - version "0.31.1" - resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.31.1.tgz#9346c7e59326f5eeac75c0286e47df94c2d6d8f7" - integrity sha512-g0FAxwdViI6UzsiVz5HssIHqjcPa1EHL6h+2dcJD893SoCJaGdqqgUF09xnMW6goWnnhbLvgiKlgJWrJa+7qYA== +"@vercel/ncc@^0.34.0": + version "0.34.0" + resolved "https://registry.yarnpkg.com/@vercel/ncc/-/ncc-0.34.0.tgz#d0139528320e46670d949c82967044a8f66db054" + integrity sha512-G9h5ZLBJ/V57Ou9vz5hI8pda/YQX5HQszCs3AmIus3XzsmRn/0Ptic5otD3xVST8QLKk7AMk7AqpsyQGN7MZ9A== "@vue/compiler-core@3.2.37": version "3.2.37" @@ -4529,11 +4538,6 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= -at-least-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" - integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== - atob@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" @@ -4780,32 +4784,34 @@ bl@^4.0.3, bl@^4.1.0: inherits "^2.0.4" readable-stream "^3.4.0" -bob-the-bundler@1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/bob-the-bundler/-/bob-the-bundler-1.7.3.tgz#d89a341b82747a726c88a9c6afd6e0ebf8cd9fc3" - integrity sha512-cuuizaM1KpJGC5L+3omt51ZYSTtEdjZF+/fO0ATn3FPDWU8j8xecqQCz/NlyIl5ef457eNYwadt+IQkYzmos0g== - dependencies: - "@rollup/plugin-json" "4.1.0" - "@rollup/plugin-node-resolve" "7.1.1" - "@vercel/ncc" "0.31.1" - builtins "4.0.0" - consola "2.11.3" - cosmiconfig "6.0.0" - cross-spawn "7.0.1" - dependency-graph "0.11.0" - fs-extra "9.0.0" - globby "11.0.0" - lodash.get "4.4.2" - minimatch "3.0.4" - mkdirp "1.0.4" - p-limit "2.2.2" - param-case "3.0.4" - rollup "2.3.2" - rollup-plugin-generate-package-json "3.2.0" - rollup-plugin-typescript2 "0.27.0" - tslib "^1.11.1" +bob-the-bundler@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/bob-the-bundler/-/bob-the-bundler-2.0.0.tgz#a0b5971e557d15f53c942e559a979542786677fc" + integrity sha512-3/qnKDSlUc/65hDgJLK/t7P2eWYKJF8Siz3Cu5mJRgMvtvYnbhKc5lbJyda/Y1sox1fnePHfBn+mFd/L/Z9KtA== + dependencies: + "@rollup/plugin-json" "^4.1.0" + "@rollup/plugin-node-resolve" "^13.3.0" + "@vercel/ncc" "^0.34.0" + builtins "^5.0.1" + consola "^2.15.3" + cosmiconfig "^7.0.1" + cross-spawn "^7.0.3" + dependency-graph "^0.11.0" + fs-extra "^10.1.0" + globby "^11.0.0" + lodash.get "^4.4.2" + minimatch "^5.1.0" + mkdirp "^1.0.4" + p-limit "^3.1.0" + param-case "^3.0.4" + resolve.exports "^1.1.0" + rollup "^2.75.6" + rollup-plugin-generate-package-json "^3.2.0" + rollup-plugin-typescript2 "^0.32.1" + tslib "^2.0.0" tsup "^5.11.6" - yargs "15.3.1" + yargs "^17.5.1" + zod "^3.17.3" body-parser@1.20.0, body-parser@^1.19.0: version "1.20.0" @@ -4918,17 +4924,10 @@ buffer@^5.2.1, buffer@^5.5.0, buffer@^5.7.1: base64-js "^1.3.1" ieee754 "^1.1.13" -builtin-modules@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" - integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA== - -builtins@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/builtins/-/builtins-4.0.0.tgz#a8345420de82068fdc4d6559d0456403a8fb1905" - integrity sha512-qC0E2Dxgou1IHhvJSLwGDSTvokbRovU5zZFuDY6oY8Y2lF3nGt5Ad8YZK7GMtqzY84Wu7pXTPeHQeHcXSXsRhw== - dependencies: - semver "^7.0.0" +builtin-modules@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6" + integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw== builtins@^5.0.1: version "5.0.1" @@ -5423,10 +5422,10 @@ concurrently@7.2.2: tree-kill "^1.2.2" yargs "^17.3.1" -consola@2.11.3: - version "2.11.3" - resolved "https://registry.yarnpkg.com/consola/-/consola-2.11.3.tgz#f7315836224c143ac5094b47fd4c816c2cd1560e" - integrity sha512-aoW0YIIAmeftGR8GSpw6CGQluNdkWMWh3yEFjH/hmynTYnMtibXszii3lxCXmk8YxJtI3FAK5aTiquA5VH68Gw== +consola@^2.15.3: + version "2.15.3" + resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550" + integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw== content-disposition@0.5.4: version "0.5.4" @@ -5482,7 +5481,7 @@ core-js@^3: resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.1.tgz#f4485ce5c9f3c6a7cb18fa80488e08d362097249" integrity sha512-AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw== -cosmiconfig@6.0.0, cosmiconfig@^6.0.0: +cosmiconfig@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== @@ -5523,15 +5522,6 @@ cross-fetch@3.1.5, cross-fetch@^3.0.4, cross-fetch@^3.0.6: dependencies: node-fetch "2.6.7" -cross-spawn@7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14" - integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -6100,7 +6090,7 @@ depd@^1.1.2: resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= -dependency-graph@0.11.0: +dependency-graph@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27" integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg== @@ -6773,7 +6763,7 @@ estree-walker@^1.0.1: resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== -estree-walker@^2.0.2: +estree-walker@^2.0.1, estree-walker@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== @@ -6978,7 +6968,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.1.1, fast-glob@^3.2.11, fast-glob@^3.2.7, fast-glob@^3.2.9: +fast-glob@^3.2.11, fast-glob@^3.2.7, fast-glob@^3.2.9: version "3.2.11" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== @@ -7119,6 +7109,15 @@ find-cache-dir@^3.3.1: make-dir "^3.0.2" pkg-dir "^4.1.0" +find-cache-dir@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== + dependencies: + commondir "^1.0.1" + make-dir "^3.0.2" + pkg-dir "^4.1.0" + find-root@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" @@ -7313,26 +7312,7 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-extra@8.1.0, fs-extra@^8.1, fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3" - integrity sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^1.0.0" - -fs-extra@^10.0.0: +fs-extra@^10.0.0, fs-extra@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== @@ -7350,6 +7330,15 @@ fs-extra@^7.0.1: jsonfile "^4.0.0" universalify "^0.1.0" +fs-extra@^8.1, fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-minipass@^2.0.0, fs-minipass@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -7367,11 +7356,6 @@ fsevents@^2.3.2, fsevents@~2.3.2: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== -fsevents@~2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" - integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== - function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -7525,18 +7509,6 @@ globals@^13.15.0: dependencies: type-fest "^0.20.2" -globby@11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.0.tgz#56fd0e9f0d4f8fb0c456f1ab0dee96e1380bc154" - integrity sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg== - dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.1.1" - ignore "^5.1.4" - merge2 "^1.3.0" - slash "^3.0.0" - globby@11.1.0, globby@^11.0.0, globby@^11.0.1, globby@^11.0.3, globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" @@ -7984,7 +7956,7 @@ ieee754@^1.1.13, ieee754@^1.2.1: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -ignore@^5.1.1, ignore@^5.1.4, ignore@^5.2.0: +ignore@^5.1.1, ignore@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== @@ -8193,6 +8165,13 @@ is-buffer@^2.0.0: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== +is-builtin-module@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.1.0.tgz#6fdb24313b1c03b75f8b9711c0feb8c30b903b00" + integrity sha512-OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg== + dependencies: + builtin-modules "^3.0.0" + is-callable@^1.1.4, is-callable@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" @@ -9305,7 +9284,7 @@ lodash.flatmap@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz#ef8cbf408f6e48268663345305c6acc0b778702e" integrity sha1-74y/QI9uSCaGYzRTBcaswLd4cC4= -lodash.get@4.4.2, lodash.get@^4.4.2: +lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= @@ -10258,13 +10237,6 @@ min-indent@^1.0.0, min-indent@^1.0.1: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -minimatch@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -10279,6 +10251,13 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" +minimatch@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" + integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== + dependencies: + brace-expansion "^2.0.1" + minimist-options@4.1.0, minimist-options@^4.0.2: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -10365,7 +10344,7 @@ mkdirp-classic@^0.5.2: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== -mkdirp@1.0.4, mkdirp@^1.0.3, mkdirp@^1.0.4: +mkdirp@^1.0.3, mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== @@ -10830,13 +10809,6 @@ p-filter@^2.1.0: dependencies: p-map "^2.0.0" -p-limit@2.2.2, p-limit@^2.0.0, p-limit@^2.2.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" - integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== - dependencies: - p-try "^2.0.0" - p-limit@3.1.0, p-limit@^3.0.2, p-limit@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" @@ -10851,6 +10823,13 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" +p-limit@^2.0.0, p-limit@^2.2.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" + integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== + dependencies: + p-try "^2.0.0" + p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" @@ -10901,7 +10880,7 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== -param-case@3.0.4: +param-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== @@ -11017,7 +10996,7 @@ path-key@^4.0.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18" integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ== -path-parse@^1.0.6, path-parse@^1.0.7: +path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== @@ -11882,13 +11861,6 @@ resolve.exports@^1.1.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== -resolve@1.15.1: - version "1.15.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" - integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== - dependencies: - path-parse "^1.0.6" - resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0: version "1.22.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" @@ -11898,6 +11870,15 @@ resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.2 path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +resolve@^1.19.0: + version "1.22.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" + integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== + dependencies: + is-core-module "^2.9.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + restore-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" @@ -11955,7 +11936,7 @@ rimraf@^2.6.3, rimraf@~2.6.2: dependencies: glob "^7.1.3" -rollup-plugin-generate-package-json@3.2.0: +rollup-plugin-generate-package-json@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/rollup-plugin-generate-package-json/-/rollup-plugin-generate-package-json-3.2.0.tgz#e9c1d358f2be6c58b49853af58205292d45a33ff" integrity sha512-+Kq1kFVr+maxW/mZB+E+XuaieCXVZqjl2tNU9k3TtAMs3NOaeREa5sRHy67qKDmcnFtZZukIQ3dFCcnV+r0xyw== @@ -11963,23 +11944,16 @@ rollup-plugin-generate-package-json@3.2.0: read-pkg "^5.2.0" write-pkg "^4.0.0" -rollup-plugin-typescript2@0.27.0: - version "0.27.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.27.0.tgz#95ff96f9e07d5000a9d2df4d76b548f9a1f83511" - integrity sha512-SRKG/Canve3cxBsqhY1apIBznqnX9X/WU3Lrq3XSwmTmFqccj3+//logLXFEmp+PYFNllSVng+f4zjqRTPKNkA== +rollup-plugin-typescript2@^0.32.1: + version "0.32.1" + resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.32.1.tgz#470ded8e1965efac02043cc0ef4a7fa36bed83b9" + integrity sha512-RanO8bp1WbeMv0bVlgcbsFNCn+Y3rX7wF97SQLDxf0fMLsg0B/QFF005t4AsGUcDgF3aKJHoqt4JF2xVaABeKw== dependencies: - "@rollup/pluginutils" "^3.0.8" - find-cache-dir "^3.3.1" - fs-extra "8.1.0" - resolve "1.15.1" - tslib "1.11.1" - -rollup@2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.3.2.tgz#afa68e4f3325bcef4e150d082056bef450bcac60" - integrity sha512-p66+fbfaUUOGE84sHXAOgfeaYQMslgAazoQMp//nlR519R61213EPFgrMZa48j31jNacJwexSAR1Q8V/BwGKBA== - optionalDependencies: - fsevents "~2.1.2" + "@rollup/pluginutils" "^4.1.2" + find-cache-dir "^3.3.2" + fs-extra "^10.0.0" + resolve "^1.20.0" + tslib "^2.4.0" rollup@^2.60.0: version "2.61.1" @@ -11988,6 +11962,13 @@ rollup@^2.60.0: optionalDependencies: fsevents "~2.3.2" +rollup@^2.75.6: + version "2.75.7" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.75.7.tgz#221ff11887ae271e37dcc649ba32ce1590aaa0b9" + integrity sha512-VSE1iy0eaAYNCxEXaleThdFXqZJ42qDBatAwrfnPlENEZ8erQ+0LYX4JXOLPceWfZpV1VtZwZ3dFCuOZiSyFtQ== + optionalDependencies: + fsevents "~2.3.2" + rtl-css-js@^1.14.0: version "1.14.1" resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.14.1.tgz#f79781d6a0c510abe73fde60aa3cbe9dfd134a45" @@ -13227,7 +13208,7 @@ tsconfig-paths@^3.14.1: minimist "^1.2.6" strip-bom "^3.0.0" -tslib@1.11.1, tslib@^1.0.0, tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.0.0, tslib@^1.8.1, tslib@^1.9.0: version "1.11.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== @@ -13624,11 +13605,6 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -universalify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" - integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== - universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -14157,7 +14133,7 @@ yargs-parser@^21.0.0, yargs-parser@^21.0.1: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== -yargs@15.3.1, yargs@^15.1.0, yargs@^15.3.1: +yargs@^15.1.0, yargs@^15.3.1: version "15.3.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA== @@ -14187,6 +14163,19 @@ yargs@^17.3.1: y18n "^5.0.5" yargs-parser "^21.0.0" +yargs@^17.5.1: + version "17.5.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e" + integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.0.0" + yauzl@^2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" @@ -14217,6 +14206,11 @@ zen-observable@0.8.15: resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15" integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ== +zod@^3.17.3: + version "3.17.3" + resolved "https://registry.yarnpkg.com/zod/-/zod-3.17.3.tgz#86abbc670ff0063a4588d85a4dcc917d6e4af2ba" + integrity sha512-4oKP5zvG6GGbMlqBkI5FESOAweldEhSOZ6LI6cG+JzUT7ofj1ZOC0PJudpQOpT1iqOFpYYtX5Pw0+o403y4bcg== + zustand@3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/zustand/-/zustand-3.7.2.tgz#7b44c4f4a5bfd7a8296a3957b13e1c346f42514d"