.eslintrc.json

@@ -61,7 +61,8 @@
     "packages/load/tests/loaders/schema",
     "website",
     "scripts",
-    "packages/loaders/code-file/tests/test-files"
+    "packages/loaders/code-file/tests/test-files",
+    "packages/loaders/git/tests/test-files"
   ],
   "globals":{
     "BigInt": true

.github/ISSUE_TEMPLATE/config.yml

@@ -3,3 +3,6 @@ contact_links:
   - name: Have a question?
     url: https://github.com/ardatan/graphql-tools/discussions/new
     about: Not sure about something? need help from the community? have a question to our team? please ask and answer questions here.
+  - name: Any issue with `npm audit`
+    url: https://overreacted.io/npm-audit-broken-by-design/
+    about: Please do not create issues about `npm audit` and you can contact with us directly for more questions.

.github/workflows/benchmark.yml

@@ -0,0 +1,52 @@
+name: Benchmark
+
+on:
+  pull_request: {}
+  workflow_dispatch: {}
+
+jobs:
+  federation-benchmark:
+    name: Federation Benchmark with ${{matrix.products_size}} Products
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        products_size: [3, 10, 50, 100, 1000]
+    steps:
+      - name: Checkout Master
+        uses: actions/checkout@v2
+      - name: Use Node
+        uses: actions/setup-node@master
+        with:
+          node-version: 16
+      - name: Cache Yarn
+        uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ${{ runner.os }}-16-16-yarn-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-16-16-yarn
+      - name: Install Dependencies using Yarn
+        run: yarn install --ignore-engines && git checkout yarn.lock
+      - name: Build
+        run: yarn build
+      - name: Setup K6
+        run: |
+          sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C5AD17C747E3415A3642D57D77C6C491D6AC1D69
+          echo "deb https://dl.k6.io/deb stable main" | sudo tee /etc/apt/sources.list.d/k6.list
+          sudo apt-get update
+          sudo apt-get install k6
+      - name: GraphQL API
+        working-directory: ./benchmark/federation
+        run: |
+          yarn start &
+          yarn wait-on tcp:3000
+        env:
+          PRODUCTS_SIZE: ${{matrix.products_size}}
+      - name: Federation
+        run: k6 -e ENDPOINT=federation run --out json=federation.json benchmark/federation/k6.js
+      - name: Stitching
+        run: k6 -e ENDPOINT=stitching run --out json=stitching.json benchmark/federation/k6.js
+      - name: Monolith
+        run: k6 -e ENDPOINT=monolith run --out json=monolith.json benchmark/federation/k6.js
+      - name: Compare
+        run: node benchmark/compare monolith:monolith.json federation:federation.json stitching:stitching.json

.github/workflows/canary.yml

@@ -4,12 +4,24 @@ on:
   pull_request:
     branches:
       - master
-
+  workflow_dispatch:
+    inputs:
+      onDemand:
+        description: 'Are you sure?'
+        required: true
+        default: 'yes'
+      npmTag:
+        description: 'NPM Tag'
+        required: true
+        default: 'alpha'
+      npmVersionSuffix:
+        description: 'Custom NPM Version Suffix'
+        required: false
 jobs:
   publish-canary:
     name: Publish Canary
     runs-on: ubuntu-latest
-    if: github.event.pull_request.head.repo.full_name == github.repository
+    if: github.event.pull_request.head.repo.full_name == github.repository || github.event.inputs.onDemand == 'yes'
     steps:
       - name: Checkout Master
         uses: actions/checkout@v2
@@ -44,6 +56,10 @@ jobs:
           npm-token: ${{ secrets.NODE_AUTH_TOKEN }}
           npm-script: 'yarn release:canary'
           changesets: true
+        env:
+          ON_DEMAND: ${{github.event.inputs.onDemand}}
+          NPM_TAG: ${{github.event.inputs.npmTag || 'alpha'}}
+          NPM_VERSION_SUFFIX: ${{github.event.inputs.npmVersionSuffix}}
       - name: Publish a message
         if: steps.canary.outputs.released
         uses: 'kamilkisiela/pr-comment@master'

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,69 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/tests.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Lint
         run: yarn lint
   build:
-    name: Build on ${{matrix.os}} GraphQL v${{matrix.graphql_version}}
+    name: Type Check on GraphQL v${{matrix.graphql_version}}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -55,15 +55,19 @@ jobs:
       - name: Install Dependencies using Yarn
         run: yarn install --ignore-engines && git checkout yarn.lock
       - name: Build
-        run: yarn ts:transpile
+        run: yarn ts:check
   test:
-    name: Test on ${{matrix.os}}, Node ${{matrix.node_version}} and GraphQL v${{matrix.graphql_version}}
+    name: Unit Test on Node ${{matrix.node_version}} (${{matrix.os}}) and GraphQL v${{matrix.graphql_version}}
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
-        node_version: [10, 16]
+        os: [ubuntu-latest] # remove windows to speed up the tests
+        node_version: [12, 16]
         graphql_version: [14, 15]
+        include:
+          - node_version: 14
+            os: windows-latest
+            graphql_version: 15
     steps:
       - name: Checkout Master
         uses: actions/checkout@v2

.github/workflows/website.yml

@@ -35,6 +35,8 @@ jobs:
           key: ${{ runner.os }}-16-16-yarn-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-16-16-yarn-
+      - name: Align TypeScript version with typedoc
+        run: node scripts/install-typedocs-typescript-version.js
       - name: Install Dependencies using Yarn
         run: yarn install --ignore-engines && git checkout yarn.lock
       - name: Deploy 🚀

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn lint-staged

benchmark/compare.js

@@ -0,0 +1,35 @@
+const fs = require('fs');
+const path = require('path');
+let [, , ...rawPointers] = process.argv;
+
+function createReport(pointer) {
+  const [name, file] = pointer.split(':');
+
+  const lines = fs.readFileSync(path.join(process.cwd(), file), 'utf-8').split('\n');
+
+  let sum = 0;
+  let count = 0;
+
+  for (let line of lines) {
+    if (line.trim().length) {
+      const metric = JSON.parse(line);
+
+      if (metric.type === 'Point' && metric.metric === 'http_req_duration' && metric.data.tags.status === '200') {
+        count++;
+        sum += metric.data.value;
+      }
+    }
+  }
+
+  return {
+    name,
+    file,
+    avg: sum / count,
+  };
+}
+
+const pointers = rawPointers.map(createReport);
+
+const stats = pointers.map(pointer => `${pointer.name}: ${pointer.avg.toFixed(2)} ms`).join('\n')
+
+console.log(stats);

benchmark/federation/.gitignore

@@ -0,0 +1,53 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# environment variables
+.env

benchmark/federation/CHANGELOG.md

@@ -0,0 +1,14 @@
+# federation-benchmark
+
+## 0.0.1
+### Patch Changes
+
+- Updated dependencies [91155ab6]
+- Updated dependencies [7d3e3006]
+- Updated dependencies [dae6dc7b]
+- Updated dependencies [1b0ce2ae]
+- Updated dependencies [74581cf3]
+- Updated dependencies [70cd65eb]
+- Updated dependencies [c0ca3190]
+  - @graphql-tools/stitch@8.0.0
+  - @graphql-tools/stitching-directives@2.0.0

benchmark/federation/call.js

@@ -0,0 +1,54 @@
+const fetch = require('cross-fetch');
+
+fetch('http://localhost:3000/stitching', {
+  method: 'POST',
+  headers: {
+    'content-type': 'application/json',
+  },
+  body: JSON.stringify({
+    query: /* GraphQL */ `
+      fragment User on User {
+        id
+        username
+        name
+      }
+
+      fragment Review on Review {
+        id
+        body
+      }
+
+      fragment Product on Product {
+        inStock
+        name
+        price
+        shippingEstimate
+        upc
+        weight
+      }
+
+      query TestQuery {
+        users {
+          ...User
+          reviews {
+            ...Review
+            product {
+              ...Product
+            }
+          }
+        }
+        topProducts {
+          ...Product
+          reviews {
+            ...Review
+            author {
+              ...User
+            }
+          }
+        }
+      }
+    `,
+  }),
+})
+  .then(res => res.json())
+  .then(data => console.log(JSON.stringify(data, null, 2)));