feat: graphql 17 support

.changeset/fast-socks-brake.md

@@ -0,0 +1,10 @@
+---
+"@n1ru4l/graphql-live-query": minor
+"@n1ru4l/graphql-live-query-patch": minor
+"@n1ru4l/graphql-live-query-patch-jsondiffpatch": minor
+"@n1ru4l/graphql-live-query-patch-json-patch": minor
+"@n1ru4l/in-memory-live-query-store": minor
+"@n1ru4l/socket-io-graphql-server": minor
+---
+
+add support for graphql-js 17

.changeset/odd-vans-join.md

@@ -0,0 +1,10 @@
+---
+"@n1ru4l/graphql-live-query": minor
+"@n1ru4l/graphql-live-query-patch": minor
+"@n1ru4l/graphql-live-query-patch-jsondiffpatch": minor
+"@n1ru4l/graphql-live-query-patch-json-patch": minor
+"@n1ru4l/in-memory-live-query-store": minor
+"@n1ru4l/socket-io-graphql-server": minor
+---
+
+Drop support for graphql-js `15.x.x`. Require at least graphql-js `^16.5.0`.

.changeset/tidy-goats-collect.md

@@ -0,0 +1,26 @@
+---
+"@n1ru4l/in-memory-live-query-store": minor
+---
+
+Drop the `execute` constructor argument option.
+Please use `InMemoryLiveQueryStore.makeExecute` instead.
+
+**Old**
+
+```ts
+import { InMemoryLiveQueryStore } from "@n1ru4l/in-memory-live-query-store";
+import { execute as executeImplementation } from "graphql";
+
+const liveQueryStore = new InMemoryLiveQueryStore({ execute });
+const execute = liveQueryStore.execute;
+```
+
+**New**
+
+```ts
+import { InMemoryLiveQueryStore } from "@n1ru4l/in-memory-live-query-store";
+import { execute as executeImplementation } from "graphql";
+
+const liveQueryStore = new InMemoryLiveQueryStore();
+const execute = liveQueryStore.makeExecute(executeImplementation);
+```

.github/workflows/ci-todo-example.yml

@@ -8,17 +8,25 @@ jobs:
  ci:
  name: CI
  runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ graphql_version:
+ - "16"
+ - "17.0.0-alpha.1"
  steps:
  - name: Checkout Repo
  uses: actions/checkout@master
  with:
  # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
  fetch-depth: 0
 
- - name: Setup Node.js 14.x
+ - name: Setup Node.js 16.x
  uses: actions/setup-node@master
  with:
- node-version: 14.x
+ node-version: 16.x
+
+ - name: Use GraphQL v${{matrix.graphql_version}}
+ run: node ./scripts/match-graphql.js ${{matrix.graphql_version}}
 
  - name: Install Dependencies
  run: yarn

.github/workflows/ci.yml

@@ -8,17 +8,25 @@ jobs:
  ci:
  name: CI
  runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ graphql_version:
+ - "16"
+ - "17.0.0-alpha.1"
  steps:
  - name: Checkout Repo
  uses: actions/checkout@master
  with:
  # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
  fetch-depth: 0
 
- - name: Setup Node.js 14.x
+ - name: Setup Node.js 16.x
  uses: actions/setup-node@master
  with:
- node-version: 14.x
+ node-version: 16.x
+
+ - name: Use GraphQL v${{matrix.graphql_version}}
+ run: node ./scripts/match-graphql.js ${{matrix.graphql_version}}
 
  - name: Install Dependencies
  run: yarn

.github/workflows/release.yml

@@ -16,10 +16,10 @@ jobs:
  # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
  fetch-depth: 0
 
- - name: Setup Node.js 14.x
+ - name: Setup Node.js 16.x
  uses: actions/setup-node@master
  with:
- node-version: 14.x
+ node-version: 16.x
 
  - name: Install Dependencies
  run: yarn

babel.config.js

@@ -1,7 +1,11 @@
+"use strict";
+
 module.exports = {
  presets: [
- ["@babel/preset-env", { targets: { node: "current" } }],
+ [
+ "@babel/preset-env",
+ { targets: { node: process.versions.node.split(".")[0] } },
+ ],
  "@babel/preset-typescript",
  ],
- plugins: ["@babel/plugin-proposal-class-properties"],
 };

jest.config.js

@@ -1,12 +1,13 @@
 const { resolve } = require("path");
-const { pathsToModuleNameMapper } = require("ts-jest/utils");
+const { pathsToModuleNameMapper } = require("ts-jest");
 const CI = !!process.env.CI;
 
 const ROOT_DIR = __dirname;
 const TSCONFIG = resolve(ROOT_DIR, "tsconfig.json");
 const tsconfig = require(TSCONFIG);
 
 module.exports = {
+ transform: { "^.+\\.[jt]sx?$": "babel-jest" },
  testEnvironment: "node",
  rootDir: ROOT_DIR,
  restoreMocks: true,

jest.end2end.config.js

@@ -1,5 +1,5 @@
 const { resolve } = require("path");
-const { pathsToModuleNameMapper } = require("ts-jest/utils");
+const { pathsToModuleNameMapper } = require("ts-jest");
 const CI = !!process.env.CI;
 
 const ROOT_DIR = __dirname;
@@ -8,6 +8,7 @@ const tsconfig = require(TSCONFIG);
 
 module.exports = {
  testEnvironment: "node",
+ transform: { "^.+\\.[jt]sx?$": "babel-jest" },
  rootDir: ROOT_DIR,
  restoreMocks: true,
  reporters: ["default"],

jest.project.js

@@ -1,5 +1,5 @@
 const { resolve } = require("path");
-const { pathsToModuleNameMapper } = require("ts-jest/utils");
+const { pathsToModuleNameMapper } = require("ts-jest");
 
 const ROOT_DIR = __dirname;
 const TSCONFIG = resolve(ROOT_DIR, "tsconfig.json");
@@ -13,7 +13,7 @@ module.exports = ({ dirname, projectMode = true }) => {
  ...(CI || !projectMode
  ? {}
  : { displayName: pkg.name.replace("@graphql-codegen/", "") }),
- transform: { "^.+\\.tsx?$": "ts-jest" },
+ transform: { "^.+\\.[jt]sx?$": "babel-jest" },
  testEnvironment: "node",
  rootDir: dirname,
  globals: {

package.json

@@ -15,22 +15,23 @@
  "@babel/preset-typescript": "7.17.12",
  "@changesets/cli": "2.21.1",
  "@types/jest": "27.5.1",
- "babel-jest": "27.5.1",
+ "babel-jest": "28.1.0",
  "bob-the-bundler": "1.5.1",
  "chalk": "4.1.2",
  "globby": "12.2.0",
  "husky": "7.0.4",
- "jest": "27.5.1",
+ "jest": "28.1.0",
  "lint-staged": "12.4.1",
  "patch-package": "6.4.7",
  "prettier": "2.5.1",
  "semver": "7.3.7",
- "ts-jest": "27.1.5",
+ "ts-jest": "28.0.2",
  "tsc-watch": "4.6.2",
  "typescript": "4.5.5"
  },
  "resolutions": {
- "graphql": "16.0.0-experimental-stream-defer.5"
+ "@graphql-tools/utils": "^8.6.12",
+ "graphql": "17.0.0-alpha.1"
  },
  "scripts": {
  "build": "yarn ts:transpile && bob build",
@@ -40,7 +41,7 @@
  "ts:transpile": "tsc --project tsconfig.build.json",
  "prerelease": "yarn build",
  "release": "changeset publish",
- "postinstall": "patch-package",
+ "postinstall": "patch-package && node scripts/cjsify-graphql.js",
  "prepare": "husky install",
  "lint-staged": "lint-staged",
  "release:canary": "(node scripts/canary-release.js && yarn build && yarn changeset publish --tag alpha) || echo Skipping Canary..."

packages/graphql-live-query-patch-json-diff/package.json

@@ -28,7 +28,7 @@
  "@n1ru4l/in-memory-live-query-store": "*"
  },
  "peerDependencies": {
- "graphql": "^15.4.0 || ^16.0.0"
+ "graphql": "^16.5.0 || ^17.0.0"
  },
  "main": "dist/index.js",
  "module": "dist/esm/index.js",

packages/graphql-live-query-patch-json-patch/package.json

@@ -28,7 +28,7 @@
  "@n1ru4l/in-memory-live-query-store": "*"
  },
  "peerDependencies": {
- "graphql": "^15.4.0 || ^16.0.0"
+ "graphql": "^16.5.0 || ^17.0.0"
  },
  "main": "dist/index.js",
  "module": "dist/esm/index.js",

packages/graphql-live-query-patch/package.json

@@ -27,7 +27,7 @@
  "@n1ru4l/in-memory-live-query-store": "*"
  },
  "peerDependencies": {
- "graphql": "^15.4.0 || ^16.0.0"
+ "graphql": "^16.5.0 || ^17.0.0"
  },
  "main": "dist/index.js",
  "module": "dist/esm/index.js",

packages/graphql-live-query/package.json

@@ -19,7 +19,7 @@
  "real-time"
  ],
  "peerDependencies": {
- "graphql": "^15.4.0 || ^16.0.0"
+ "graphql": "^16.5.0 || ^17.0.0"
  },
  "main": "dist/index.js",
  "module": "dist/esm/index.js",

packages/graphql-live-query/src/rules/NoLiveMixedWithDeferStreamRule.spec.ts

@@ -10,8 +10,19 @@ import {
  GraphQLID,
  GraphQLList,
  specifiedDirectives,
+ extendSchema,
 } from "graphql";
 
+const deferAST = parse(/* GraphQL */ `
+ directive @defer(
+ label: String
+ if: Boolean
+ ) on FRAGMENT_SPREAD | INLINE_FRAGMENT
+`);
+const streamAST = parse(/* GraphQL */ `
+ directive @stream(label: String, initialCount: Int = 0, if: Boolean) on FIELD
+`);
+
 const createSchema = () => {
  const GraphQLUserType = new GraphQLObjectType({
  name: "User",
@@ -78,7 +89,7 @@ test("validation passes with usage of @live", () => {
 });
 
 test("validation passes with usage of @stream", () => {
- const schema = createSchema();
+ const schema = extendSchema(createSchema(), streamAST);
  const document = parse(/* GraphQL */ `
  query foo {
  users @stream(initialCount: 1) {
@@ -94,7 +105,7 @@ test("validation passes with usage of @stream", () => {
 });
 
 test("validation passes with usage of @defer", () => {
- const schema = createSchema();
+ const schema = extendSchema(createSchema(), deferAST);
  const document = parse(/* GraphQL */ `
  query foo {
  user {
@@ -113,7 +124,7 @@ test("validation passes with usage of @defer", () => {
 });
 
 test("validation fails with @live and @defer on the same operation", () => {
- const schema = createSchema();
+ const schema = extendSchema(createSchema(), deferAST);
  const document = parse(/* GraphQL */ `
  query foo @live {
  user {
@@ -136,7 +147,7 @@ test("validation fails with @live and @defer on the same operation", () => {
 });
 
 test("validation fails with @live and @stream on the same operation", () => {
- const schema = createSchema();
+ const schema = extendSchema(createSchema(), streamAST);
  const document = parse(/* GraphQL */ `
  query foo @live {
  users @stream(initialCount: 1) {
@@ -157,7 +168,7 @@ test("validation fails with @live and @stream on the same operation", () => {
 });
 
 test("validation passes with @live and @defer on different operations in the same document", () => {
- const schema = createSchema();
+ const schema = extendSchema(createSchema(), streamAST);
  const document = parse(/* GraphQL */ `
  query foo @live {
  users {

packages/graphql-live-query/src/rules/NoLiveMixedWithDeferStreamRule.ts

@@ -18,7 +18,9 @@ export const NoLiveMixedWithDeferStreamRule: ValidationRule = (context) => {
  context.reportError(
  new GraphQLError(
  `Cannot mix "@${directiveNode.name.value}" with "@live".`,
- directiveNode.name
+ {
+ nodes: directiveNode.name,
+ }
  )
  );
  }

packages/in-memory-live-query-store/package.json

@@ -19,15 +19,16 @@
  "real-time"
  ],
  "devDependencies": {
- "graphql": "16.0.0-experimental-stream-defer.5"
+ "graphql": "16.0.0-experimental-stream-defer.5",
+ "jest-time-helpers": "0.1.0"
  },
  "dependencies": {
- "@graphql-tools/utils": "^8.5.2",
+ "@graphql-tools/utils": "^8.6.12",
  "@n1ru4l/graphql-live-query": "0.9.0",
  "@repeaterjs/repeater": "^3.0.4"
  },
  "peerDependencies": {
- "graphql": "^15.4.0 || ^16.0.0"
+ "graphql": "^16.5.0 || ^17.0.0"
  },
  "main": "dist/index.js",
  "module": "dist/esm/index.js",