Dependency cleanup

.changeset/nasty-peas-ring.md

@@ -0,0 +1,10 @@
+---
+'@graphql-tools/graphql-file-loader': patch
+'@graphql-tools/code-file-loader': patch
+'@graphql-tools/json-file-loader': patch
+'@graphql-tools/load-files': patch
+'@graphql-tools/documents': patch
+'@graphql-tools/load': patch
+---
+
+Replace globby with tinyglobby and remove lodash.sortby dependency

package.json

@@ -59,7 +59,6 @@
     "babel-jest": "29.7.0",
     "bob-the-bundler": "7.0.1",
     "bun": "^1.1.43",
-    "chalk": "5.4.1",
     "concurrently": "9.1.2",
     "cross-env": "7.0.3",
     "eslint": "9.19.0",
@@ -69,14 +68,14 @@
     "eslint-plugin-n": "17.15.1",
     "eslint-plugin-promise": "7.2.1",
     "eslint-plugin-standard": "5.0.0",
-    "globby": "11.1.0",
     "graphql": "16.10.0",
     "husky": "9.1.7",
     "jest": "29.7.0",
     "lint-staged": "15.4.3",
     "patch-package": "8.0.0",
     "prettier": "3.4.2",
     "prettier-plugin-tailwindcss": "0.6.11",
+    "tinyglobby": "^0.2.10",
     "ts-jest": "29.2.5",
     "tsx": "4.19.2",
     "typedoc": "0.25.13",

packages/documents/package.json

@@ -50,12 +50,9 @@
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "lodash.sortby": "^4.7.0",
     "tslib": "^2.4.0"
   },
-  "devDependencies": {
-    "@types/lodash.sortby": "^4.7.7"
-  },
+  "devDependencies": {},
   "publishConfig": {
     "directory": "dist",
     "access": "public"

packages/documents/src/sort-executable-nodes.ts

@@ -8,7 +8,6 @@ import {
   type SelectionNode,
   type VariableDefinitionNode,
 } from 'graphql';
-import sortBy from 'lodash.sortby';
 import { normalizeWhiteSpace } from './normalize-whitespace.js';
 
 // Cache the sorted nodes to avoid sorting the same nodes multiple times
@@ -44,39 +43,54 @@ export function sortExecutableNodes(
     }
 
     if (isOfKindList<DirectiveNode>(nodes, Kind.DIRECTIVE)) {
-      return cacheResult(sortBy(nodes as any, 'name.value'));
+      return cacheResult(nodes.sort((a, b) => a.name.value.localeCompare(b.name.value)));
     }
 
     if (isOfKindList<VariableDefinitionNode>(nodes, Kind.VARIABLE_DEFINITION)) {
-      return cacheResult(sortBy(nodes as any, 'variable.name.value'));
+      return cacheResult(
+        nodes.sort((a, b) => a.variable.name.value.localeCompare(b.variable.name.value)),
+      );
     }
 
     if (isOfKindList<ArgumentNode>(nodes, Kind.ARGUMENT)) {
-      return cacheResult(sortBy(nodes as any, 'name.value'));
+      return cacheResult(nodes.sort((a, b) => a.name.value.localeCompare(b.name.value)));
     }
 
     if (
       isOfKindList<SelectionNode>(nodes, [Kind.FIELD, Kind.FRAGMENT_SPREAD, Kind.INLINE_FRAGMENT])
     ) {
       return cacheResult(
-        sortBy(nodes as any, node => {
-          if (node.kind === Kind.FIELD) {
-            return sortPrefixField + node.name.value;
-          } else if (node.kind === Kind.FRAGMENT_SPREAD) {
-            return sortPrefixFragmentSpread + node.name.value;
-          } else {
-            const typeCondition = node.typeCondition?.name.value ?? '';
-            // if you have a better idea, send a PR :)
-            const sortedNodes = buildInlineFragmentSelectionSetKey(
-              cacheResult(sortExecutableNodes(node.selectionSet.selections)),
-            );
-            return sortPrefixInlineFragmentNode + typeCondition + sortedNodes;
-          }
+        nodes.sort((a, b) => {
+          const getSortKey = (node: SelectionNode) => {
+            if (node.kind === Kind.FIELD) {
+              return sortPrefixField + node.name.value;
+            } else if (node.kind === Kind.FRAGMENT_SPREAD) {
+              return sortPrefixFragmentSpread + node.name.value;
+            } else {
+              const typeCondition = node.typeCondition?.name.value ?? '';
+              const sortedSelections = buildInlineFragmentSelectionSetKey(
+                cacheResult(sortExecutableNodes(node.selectionSet.selections)),
+              );
+              return sortPrefixInlineFragmentNode + typeCondition + sortedSelections;
+            }
+          };
+
+          return getSortKey(a).localeCompare(getSortKey(b));
         }),
       );
     }
+    const _nodes = nodes as ASTNode[];
+    return cacheResult(
+      _nodes.sort((nodeA, nodeB) => {
+        const kindComparison = nodeA.kind.localeCompare(nodeB.kind);
+        if (kindComparison !== 0) return kindComparison;
+
+        const nameA = (nodeA as any).name?.value ?? '';
+        const nameB = (nodeB as any).name?.value ?? '';
 
-    return cacheResult(sortBy(nodes as any, 'kind', 'name.value'));
+        return nameA.localeCompare(nameB);
+      }),
+    );
   }
 }
 

packages/load-files/package.json

@@ -51,9 +51,9 @@
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "globby": "11.1.0",
-    "tslib": "^2.4.0",
-    "unixify": "^1.0.0"
+    "@graphql-tools/utils": "^10.7.2",
+    "tinyglobby": "^0.2.10",
+    "tslib": "^2.4.0"
   },
   "publishConfig": {
     "directory": "dist",

packages/load-files/src/index.ts

@@ -2,9 +2,9 @@ import { promises as fsPromises, readFileSync, statSync } from 'fs';
 import { createRequire } from 'module';
 import { extname, join } from 'path';
 import { cwd } from 'process';
-import globby, { GlobbyOptions, sync as globbySync } from 'globby';
 import { DocumentNode, parse } from 'graphql';
-import unixify from 'unixify';
+import { glob, GlobOptions, globSync } from 'tinyglobby';
+import { unixifyWithDriveLetter } from '@graphql-tools/utils';
 
 const { readFile, stat } = fsPromises;
 
@@ -63,8 +63,8 @@ async function isDirectory(path: string) {
   }
 }
 
-function scanForFilesSync(globStr: string | string[], globOptions: GlobbyOptions = {}): string[] {
-  return globbySync(globStr, { absolute: true, ...globOptions });
+function scanForFilesSync(globStr: string | string[], globOptions: GlobOptions = {}): string[] {
+  return globSync(globStr, { absolute: true, ...globOptions });
 }
 
 function formatExtension(extension: string): string {
@@ -99,7 +99,7 @@ export interface LoadFilesOptions {
   // An alternative to `require` to use if `require` would be used to load a file
   requireMethod?: any;
   // Additional options to pass to globby
-  globOptions?: GlobbyOptions;
+  globOptions?: GlobOptions;
   // Named exports to extract from each file. Defaults to ['typeDefs', 'schema']
   exportNames?: string[];
   // Load files from nested directories. Set to `false` to only search the top-level directory.
@@ -138,12 +138,12 @@ export function loadFilesSync<T = any>(
     asArray(pattern).map(path =>
       isDirectorySync(path)
         ? buildGlob(
-            unixify(path),
+            unixifyWithDriveLetter(path),
             execOptions.extensions,
             execOptions.ignoredExtensions,
             execOptions.recursive,
           )
-        : unixify(path),
+        : unixifyWithDriveLetter(path),
     ),
     options.globOptions,
   );
@@ -183,9 +183,9 @@ export function loadFilesSync<T = any>(
 
 async function scanForFiles(
   globStr: string | string[],
-  globOptions: GlobbyOptions = {},
+  globOptions: GlobOptions = {},
 ): Promise<string[]> {
-  return globby(globStr, { absolute: true, ...globOptions });
+  return glob(globStr, { absolute: true, ...globOptions });
 }
 
 const checkExtension = (
@@ -237,12 +237,12 @@ export async function loadFiles(
       asArray(pattern).map(async path =>
         (await isDirectory(path))
           ? buildGlob(
-              unixify(path),
+              unixifyWithDriveLetter(path),
               execOptions.extensions,
               execOptions.ignoredExtensions,
               execOptions.recursive,
             )
-          : unixify(path),
+          : unixifyWithDriveLetter(path),
       ),
     ),
     options.globOptions,

packages/load/tests/loaders/documents/documents-from-glob.spec.ts

@@ -6,7 +6,7 @@ import { loadDocuments, loadDocumentsSync } from '@graphql-tools/load';
 import { runTests } from '../../../../testing/utils.js';
 import '../../../../testing/to-be-similar-string';
 import { readFileSync } from 'fs';
-import globby from 'globby';
+import { globSync } from 'tinyglobby';
 import { removeLoc } from '@graphql-tools/optimize';
 
 describe('documentsFromGlob', () => {
@@ -20,7 +20,7 @@ describe('documentsFromGlob', () => {
         loaders: [new GraphQLFileLoader()],
       });
       expect(result).toHaveLength(1);
-      const expectedFiles = globby.sync(glob);
+      const expectedFiles = globSync(glob.replace(/\\/g, '/'));
       for (const expectedFileName of expectedFiles) {
         const fileNameResult = result?.find(({ location }) => location === expectedFileName);
         if (fileNameResult) {
@@ -38,7 +38,7 @@ describe('documentsFromGlob', () => {
         loaders: [new GraphQLFileLoader()],
       });
       expect(result).toHaveLength(2);
-      const expectedFiles = globby.sync(glob);
+      const expectedFiles = globSync(glob.replace(/\\/g, '/'));
       for (const expectedFileName of expectedFiles) {
         const fileNameResult = result?.find(({ location }) => location === expectedFileName);
         if (fileNameResult) {

packages/loaders/code-file/package.json

@@ -53,9 +53,8 @@
   "dependencies": {
     "@graphql-tools/graphql-tag-pluck": "8.3.12",
     "@graphql-tools/utils": "^10.7.2",
-    "globby": "^11.0.3",
-    "tslib": "^2.4.0",
-    "unixify": "^1.0.0"
+    "tinyglobby": "^0.2.10",
+    "tslib": "^2.4.0"
   },
   "publishConfig": {
     "directory": "dist",

packages/loaders/code-file/src/index.ts

@@ -2,10 +2,8 @@ import { existsSync, promises as fsPromises, readFileSync } from 'fs';
 import { createRequire } from 'module';
 import { isAbsolute, resolve } from 'path';
 import { cwd, env } from 'process';
-import type { GlobbyOptions } from 'globby';
-import globby from 'globby';
 import { DocumentNode, GraphQLSchema, isSchema, parse } from 'graphql';
-import unixify from 'unixify';
+import { glob, globSync, type GlobOptions } from 'tinyglobby';
 import {
   gqlPluckFromCodeString,
   gqlPluckFromCodeStringSync,
@@ -19,6 +17,7 @@ import {
   Loader,
   parseGraphQLSDL,
   Source,
+  unixifyWithDriveLetter,
 } from '@graphql-tools/utils';
 import { tryToLoadFromExport, tryToLoadFromExportSync } from './load-from-module.js';
 
@@ -59,7 +58,7 @@ const FILE_EXTENSIONS = [
   '.gjs',
 ];
 
-function createGlobbyOptions(options: CodeFileLoaderOptions): GlobbyOptions {
+function createGlobbyOptions(options: CodeFileLoaderOptions): GlobOptions {
   return { absolute: true, ...options, ignore: [] };
 }
 
@@ -131,20 +130,23 @@ export class CodeFileLoader implements Loader<CodeFileLoaderOptions> {
 
   private _buildGlobs(glob: string, options: CodeFileLoaderOptions) {
     const ignores = asArray(options.ignore || []);
-    const globs = [unixify(glob), ...ignores.map(v => buildIgnoreGlob(unixify(v)))];
+    const globs = [
+      unixifyWithDriveLetter(glob),
+      ...ignores.map(v => buildIgnoreGlob(unixifyWithDriveLetter(v))),
+    ];
     return globs;
   }
 
-  async resolveGlobs(glob: string, options: CodeFileLoaderOptions) {
+  async resolveGlobs(path: string, options: CodeFileLoaderOptions) {
     options = this.getMergedOptions(options);
-    const globs = this._buildGlobs(glob, options);
-    return globby(globs, createGlobbyOptions(options));
+    const globs = this._buildGlobs(path, options);
+    return glob(globs, createGlobbyOptions(options));
   }
 
   resolveGlobsSync(glob: string, options: CodeFileLoaderOptions) {
     options = this.getMergedOptions(options);
     const globs = this._buildGlobs(glob, options);
-    return globby.sync(globs, createGlobbyOptions(options));
+    return globSync(globs, createGlobbyOptions(options));
   }
 
   async load(pointer: string, options: CodeFileLoaderOptions): Promise<Source[]> {

packages/loaders/graphql-file/package.json

@@ -53,7 +53,7 @@
   "dependencies": {
     "@graphql-tools/import": "7.0.11",
     "@graphql-tools/utils": "^10.7.2",
-    "globby": "^11.0.3",
+    "tinyglobby": "^0.2.10",
     "tslib": "^2.4.0",
     "unixify": "^1.0.0"
   },