vscode-apollo 1.19.3 → 1.20.1

package/README.md

@@ -2,7 +2,7 @@
 
 GraphQL has the potential to create incredible developer experiences, thanks to its strongly typed schema and query language. The Apollo platform brings these possibilities to life by enhancing your editor with rich metadata from your graph API.
 
-![demo](https://raw.githubusercontent.com/apollographql/apollo-tooling/master/packages/vscode-apollo/images/marketplace/jump-to-def.gif)
+![demo](https://raw.githubusercontent.com/apollographql/vscode-graphql/main/images/marketplace/jump-to-def.gif)
 
 The Apollo GraphQL extension for VS Code brings an all-in-one tooling experience for developing apps with Apollo.
 
@@ -17,7 +17,7 @@ The Apollo GraphQL extension for VS Code brings an all-in-one tooling experience
 
 <h2 id="getting-started">Getting started</h2>
 
-Some features of this extension (like syntax highlighting) will work without any configuration, but to get all of the benefits of the VS Code experience, it's best to link the schema that is being developed against **before** installing the extension. The best way to do that is by [publishing a schema](https://www.apollographql.com/docs/platform/schema-registry.html#setup) to the Apollo schema registry. Once that is done, two steps are needed:
+Some features of this extension (like syntax highlighting) will work without any configuration, but to get all of the benefits of the VS Code experience, it's best to link the schema that is being developed against **before** installing the extension. The best way to do that is by [publishing a schema](https://www.apollographql.com/docs/graphos/delivery/) to the Apollo schema registry. Once that is done, two steps are needed:
 
 1. Create an `apollo.config.js` at the root of the project
 2. Copy an API key from the Apollo Studio dashboard of the published graph
@@ -94,7 +94,7 @@ Once you have a config set up and a schema published, **install the Apollo Graph
 
 When a file open, clicking the status bar icon will open the output window and print stats about the project associated with that file. This is helpful when confirming the project is setup properly.
 
-<img src="https://raw.githubusercontent.com/apollographql/apollo-tooling/master/packages/vscode-apollo/images/marketplace/stats.gif"  alt="Clicking the status bar icon to open the output pane">
+<img src="https://raw.githubusercontent.com/apollographql/vscode-graphql/main/images/marketplace/stats.gif"  alt="Clicking the status bar icon to open the output pane">
 
 <h2 id="features">Features</h2>
 
@@ -104,19 +104,19 @@ Apollo for VS Code brings many helpful features for working on a GraphQL project
 
 Once configured, VS Code has full knowledge of the schema clients are running operations against, including client-only schemas (for things like local state mutations). Because of this, it have the ability to autocomplete fields and arguments as you type.
 
-<img src="https://raw.githubusercontent.com/apollographql/apollo-tooling/master/packages/vscode-apollo/images/marketplace/autocomplete.gif"  alt="vscode completing a field when typing">
+<img src="https://raw.githubusercontent.com/apollographql/vscode-graphql/main/images/marketplace/autocomplete.gif"  alt="vscode completing a field when typing">
 
 <h3 id="errors-and-warnings">Inline errors and warnings</h3>
 
 VS Code can use local or published schemas to validate operations before running them. **Syntax errors**, **invalid fields or arguments**, and even **deprecated fields** instantly appear as errors or warnings right in your editor, ensuring all developers are working with the most up-to-date production schemas.
 
-<img src="https://raw.githubusercontent.com/apollographql/apollo-tooling/master/packages/vscode-apollo/images/marketplace/warnings-and-errors.gif"  alt="tooltip showing a field deprecation warning and error">
+<img src="https://raw.githubusercontent.com/apollographql/vscode-graphql/main/images/marketplace/warnings-and-errors.gif"  alt="tooltip showing a field deprecation warning and error">
 
 <h3 id="field-type-info">Inline field type information</h3>
 
 Because of GraphQL's strongly-typed schema, VS Code not only know about which fields and arguments are valid, but also what types are expected. Hover over any type in a valid GraphQL operation to see what type that field returns and whether or not it can be null.
 
-<img src="https://raw.githubusercontent.com/apollographql/apollo-tooling/master/packages/vscode-apollo/images/marketplace/type-info.png" style="max-width:800px;" alt="a tooltip showing a Boolean type for a field">
+<img src="https://raw.githubusercontent.com/apollographql/vscode-graphql/main/images/marketplace/type-info.png" style="max-width:800px;" alt="a tooltip showing a Boolean type for a field">
 
 <h3 id="performance-insights">Performance insights</h3>
 
@@ -126,7 +126,7 @@ To turn on tracing for your GraphQL server, please visit our [guide](https://www
 
 The VS Code extension will show inline performance diagnostics when connected to a service with reported metrics in Apollo Studio. As operations are typed, any fields that take longer than 1ms to respond will be annotated to the right of the field inline! This gives team members a picture of how long the operation will take as more and more fields are added to operations or fragments.
 
-<img src="https://raw.githubusercontent.com/apollographql/apollo-tooling/master/packages/vscode-apollo/images/marketplace/perf-annotation.png"  style="max-width:800px;" alt="Performance annotation next to a field">
+<img src="https://raw.githubusercontent.com/apollographql/vscode-graphql/main/images/marketplace/perf-annotation.png"  style="max-width:800px;" alt="Performance annotation next to a field">
 
 <h3 id="syntax">Syntax highlighting</h3>
 
@@ -136,7 +136,7 @@ Apollo's editor extension provides syntax highlighting for all things GraphQL, i
 
 Navigating large codebases can be difficult, but the Apollo GraphQL extension makes this easier than ever. Right-clicking on any field in operations or schemas gives you the ability to jump to (or peek at) definitions, as well as find any other references to that field in your project. Searching a project for any occurrence of a certain field is now a thing of the past!
 
-<img src="https://raw.githubusercontent.com/apollographql/apollo-tooling/master/packages/vscode-apollo/images/marketplace/jump-to-def.gif"  alt="Using jump to definition on a fragment">
+<img src="https://raw.githubusercontent.com/apollographql/vscode-graphql/main/images/marketplace/jump-to-def.gif"  alt="Using jump to definition on a fragment">
 
 <h3 id="commands">Schema tag switching</h3>
 
@@ -151,6 +151,6 @@ Other errors may be caused from an old version of a published schema. To reload
 
 Sometimes errors will show up as a notification at the bottom of your editor. Other, less critical messages may be shown in the output pane of the editor. To open the output pane and get diagnostic information about the extension and the current service loaded (if working with a client project), just click the "Apollo GraphQL" icon in the status bar at the bottom.
 
-<img src="https://raw.githubusercontent.com/apollographql/apollo-tooling/master/packages/vscode-apollo/images/marketplace/stats.gif"  alt="Clicking the status bar icon to open the output pane">
+<img src="https://raw.githubusercontent.com/apollographql/vscode-graphql/main/images/marketplace/stats.gif"  alt="Clicking the status bar icon to open the output pane">
 
 If problems persist or the error messages are unhelpful, an [issue](https://github.com/apollographql/apollo-tooling/issues) can be opened on the `apollo-tooling` repository.

package/codegen.yml

@@ -0,0 +1,12 @@
+# Would be better to get the schema from the Studio registry once it can be a public variant.
+schema: https://graphql.api.apollographql.com/api/graphql
+generates:
+  ./src/language-server/graphqlTypes.ts:
+    documents:
+      - src/**/*.ts
+      - "!src/**/__tests__**/*.ts"
+    plugins:
+      - typescript
+      - typescript-operations
+    config:
+      avoidOptionals: true

package/images/IconRun.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svgjs="http://svgjs.com/svgjs" viewBox="0 0 20 20" width="7" height="7">
+  <title>
+    Exported from Streamline App (https://app.streamlineicons.com)
+  </title>
+  <g transform="matrix(2.54 0 0 2.54 10 9.97)" id="LVKu-U2gXNoh456TxJx47"  >
+    <path style="stroke: rgb(255,255,255); stroke-width: 1; stroke-dasharray: none; stroke-linecap: round; stroke-dashoffset: 0; stroke-linejoin: round; stroke-miterlimit: 4; fill: #2075D6; fill-rule: evenodd; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-10.25, -9.71)" d="M 7 6.502 L 7 12.926 C 7 13.293 7.317 13.534 7.592 13.379 L 13.259 10.166 C 13.408058725855952 10.063593398311438 13.49712261259461 9.89434694032026 13.49712261259461 9.7135 C 13.49712261259461 9.532653059679742 13.408058725855952 9.363406601688563 13.259 9.261000000000001 L 7.592 6.047 C 7.317 5.893 7 6.135 7 6.502 Z" stroke-linecap="round" />
+  </g>
+</svg>

package/jest.config.ts

@@ -0,0 +1,11 @@
+import type { Config } from '@jest/types';
+
+const config: Config.InitialOptions = {
+  roots: ['<rootDir>/src'],
+  testMatch: ['**/__tests__/**/*.test.ts'],
+  transform: {
+    '^.+\\.(ts)$': 'ts-jest',
+  },
+};
+
+export default config;

package/package.json

@@ -2,36 +2,93 @@
   "name": "vscode-apollo",
   "displayName": "Apollo GraphQL",
   "description": "Rich editor support for GraphQL client and server development that seamlessly integrates with the Apollo platform",
-  "version": "1.19.3",
+  "version": "1.20.1",
   "referenceID": "87197759-7617-40d0-b32e-46d378e907c7",
   "author": "Apollo GraphQL <opensource@apollographql.com>",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollographql/apollo-tooling"
+    "url": "https://github.com/apollographql/vscode-graphql"
   },
-  "homepage": "https://github.com/apollographql/apollo-tooling",
-  "bugs": "https://github.com/apollographql/apollo-tooling/issues",
+  "homepage": "https://github.com/apollographql/vscode-graphql",
+  "bugs": "https://github.com/apollographql/vscode-graphql/issues",
   "main": "./lib/extension",
   "types": "lib/index.d.ts",
   "scripts": {
-    "preinstall": "npx rimraf node_modules && mkdir node_modules",
-    "postinstall": "npm run update-vscode && npm run create-server-symlink",
-    "update-vscode": "node ../../node_modules/vscode/bin/install",
-    "create-server-symlink": "npx rimraf node_modules && mkdir node_modules && node create-server-symlink.js",
-    "_internal:prepare-extension": "npx rimraf node_modules && yarn install --force --production --ignore-scripts",
-    "_internal:cleanup-extension": "git clean -dfqX -- ./node_modules ./yarn.lock && npm run create-server-symlink",
-    "package-extension": "npm run _internal:prepare-extension && ../../node_modules/vsce/out/vsce package --yarn --baseContentUrl https://raw.githubusercontent.com/apollographql/apollo-tooling/master/packages/vscode-apollo && npm run _internal:cleanup-extension",
-    "publish-extension": "npm run _internal:prepare-extension && ../../node_modules/vsce/out/vsce publish -p $VS_MARKETPLACE_TOKEN --yarn --baseContentUrl https://raw.githubusercontent.com/apollographql/apollo-tooling/master/packages/vscode-apollo && npm run _internal:cleanup-extension",
-    "test": "node ./lib/testRunner/vscode-test-script.js"
+    "build": "tsc --build tsconfig.build.json",
+    "build:clean": "npm run build -- --clean",
+    "watch": "npm run build -- --watch",
+    "postinstall": "curl https://raw.githubusercontent.com/Microsoft/vscode/c6e592b2b5770e40a98cb9c2715a8ef89aec3d74/src/vs/vscode.d.ts -o node_modules/vscode/vscode.d.ts",
+    "changeset-version": "changeset version && npm ci --ignore-scripts",
+    "changeset-publish": "npm run build && changeset publish",
+    "typecheck": "tsc --noEmit",
+    "lint": "eslint src --ext .ts",
+    "test-unit": "jest",
+    "codegen": "graphql-codegen"
   },
   "engines": {
     "vscode": "^1.30.0"
   },
   "dependencies": {
-    "apollo-env": "^0.10.0",
-    "apollo-language-server": "^1.26.3",
-    "vscode-languageclient": "^5.2.1"
+    "@apollo/federation": "^0.23.1",
+    "@endemolshinegroup/cosmiconfig-typescript-loader": "^1.0.0",
+    "@types/lz-string": "^1.3.34",
+    "@types/node-fetch": "2.5.10",
+    "apollo-datasource": "^0.8.0",
+    "apollo-link": "^1.2.3",
+    "apollo-link-context": "^1.0.9",
+    "apollo-link-error": "^1.1.1",
+    "apollo-link-http": "^1.5.5",
+    "apollo-server-errors": "^2.0.2",
+    "await-to-js": "^2.0.1",
+    "codemirror": "^5.63.3",
+    "core-js": "^3.0.1",
+    "cosmiconfig": "^5.0.6",
+    "dotenv": "^10.0.0",
+    "glob": "^7.1.3",
+    "graphql": "^15.5.0",
+    "graphql-language-service-interface": "^2.8.4",
+    "graphql-tag": "^2.10.1",
+    "lodash.debounce": "^4.0.8",
+    "lodash.merge": "^4.6.1",
+    "lz-string": "^1.4.4",
+    "minimatch": "^3.0.4",
+    "moment": "^2.29.1",
+    "node-fetch": "^2.2.0",
+    "query-string": "^7.0.1",
+    "resolve-from": "^5.0.0",
+    "sha.js": "^2.4.11",
+    "vscode-languageclient": "^5.2.1",
+    "vscode-languageserver": "^5.1.0",
+    "vscode-uri": "1.0.6"
+  },
+  "devDependencies": {
+    "@changesets/changelog-github": "^0.4.8",
+    "@changesets/cli": "^2.26.2",
+    "@graphql-codegen/cli": "^2.2.0",
+    "@graphql-codegen/typescript-operations": "^2.1.3",
+    "@types/cosmiconfig": "5.0.3",
+    "@types/glob": "7.1.1",
+    "@types/jest": "^26.0.24",
+    "@types/lodash.debounce": "4.0.6",
+    "@types/lodash.merge": "4.6.6",
+    "@types/node": "^14.14.41",
+    "@types/node-fetch": "2.5.10",
+    "@typescript-eslint/eslint-plugin": "^4.29.0",
+    "@typescript-eslint/parser": "^4.29.0",
+    "eslint": "^7.32.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^3.4.0",
+    "jest": "^27.0.6",
+    "jest-environment-node": "^26.6.2",
+    "jest-junit": "^12.2.0",
+    "memfs": "^3.2.2",
+    "prettier": "^2.3.2",
+    "rimraf": "^3.0.2",
+    "ts-jest": "^27.0.4",
+    "typescript": "^4.3.5",
+    "vsce": "^1.87.1",
+    "vscode": "^1.1.37"
   },
   "publisher": "apollographql",
   "categories": [
@@ -40,12 +97,13 @@
   ],
   "icon": "images/icon-apollo-blue-400x400.png",
   "activationEvents": [
-    "workspaceContains:**/apollo.config.[jt]s"
+    "workspaceContains:**/apollo.config.[jt]s",
+    "workspaceContains:**/apollo.config.cjs"
   ],
   "contributes": {
     "configuration": {
       "type": "object",
-      "title": "Configuration",
+      "title": "Apollo GraphQL",
       "properties": {
         "apollographql.trace.server": {
           "scope": "window",
@@ -57,6 +115,18 @@
           ],
           "default": "off",
           "description": "Traces the communication between VS Code and the language server."
+        },
+        "apollographql.debug.revealOutputOnLanguageServerError": {
+          "type": "boolean",
+          "default": true,
+          "markdownDescription": "Switches to the \"Output\" tab whenever an error occurs in the language server.",
+          "scope": "window"
+        },
+        "apollographql.display.showRunInStudioButton": {
+          "type": "boolean",
+          "default": true,
+          "markdownDescription": "Show a \"Run in Studio\" button to the right of Operation Signatures.",
+          "scope": "window"
         }
       }
     },
@@ -84,9 +154,10 @@
         "injectTo": [
           "source.js",
           "source.ts",
-          "source.js.jsx",
+          "source.jsx",
           "source.tsx",
-          "source.vue"
+          "source.vue",
+          "source.svelte"
         ],
         "scopeName": "inline.graphql",
         "path": "./syntaxes/graphql.js.json",
@@ -104,6 +175,16 @@
           "meta.embedded.block.graphql": "graphql"
         }
       },
+      {
+        "injectTo": [
+          "source.lua"
+        ],
+        "scopeName": "inline.graphql.lua",
+        "path": "./syntaxes/graphql.lua.json",
+        "embeddedLanguages": {
+          "meta.embedded.block.graphql": "graphql"
+        }
+      },
       {
         "injectTo": [
           "source.ruby"
@@ -166,6 +247,5 @@
   "galleryBanner": {
     "color": "#1d127d",
     "theme": "dark"
-  },
-  "gitHead": "7f77a11e5c3123137af9235b4a32ac76ec1aad39"
+  }
 }

package/renovate.json

@@ -0,0 +1,23 @@
+{
+  "extends": ["apollo-open-source"],
+  "dependencyDashboard": true,
+  "packageRules": [
+    {
+      "groupName": "all @types",
+      "groupSlug": "all-types",
+      "matchPackagePatterns": ["@types/*"]
+    },
+    {
+      "groupName": "all devDependencies",
+      "groupSlug": "all-dev",
+      "matchPackagePatterns": ["*"],
+      "matchDepTypes": ["devDependencies"]
+    },
+    {
+      "groupName": "all dependencies - patch updates",
+      "groupSlug": "all-patch",
+      "matchPackagePatterns": ["*"],
+      "matchUpdateTypes": ["patch"]
+    }
+  ]
+}

package/src/__mocks__/fs.js

@@ -0,0 +1,3 @@
+const { fs } = require("memfs");
+
+module.exports = fs;

package/src/__tests__/statusBar.test.ts

@@ -1,11 +1,12 @@
-import StatusBar from "../statusBar";
+// import StatusBar from "../statusBar";
 
-describe("statusBar", () => {
+// TODO (jgzuke) disable this until we migrate away from `vscode`.
+// https://code.visualstudio.com/api/working-with-extensions/testing-extension#migrating-from-vscode
+describe.skip("statusBar", () => {
   it("only shows loaded state when it's supposed to", () => {
-    const statusBar = new StatusBar({ hasActiveTextEditor: true });
-
-    expect(statusBar.statusBarItem.text).toEqual(StatusBar.loadingStateText);
-    statusBar.showLoadedState({ hasActiveTextEditor: true });
-    expect(statusBar.statusBarItem.text).toEqual(StatusBar.loadedStateText);
+    // const statusBar = new StatusBar({ hasActiveTextEditor: true });
+    // expect(statusBar.statusBarItem.text).toEqual(StatusBar.loadingStateText);
+    // statusBar.showLoadedState({ hasActiveTextEditor: true });
+    // expect(statusBar.statusBarItem.text).toEqual(StatusBar.loadedStateText);
   });
 });

package/src/debug.ts

@@ -1,4 +1,4 @@
-import { window, workspace, OutputChannel } from "vscode";
+import { OutputChannel } from "vscode";
 
 /**
  * for errors (and other logs in debug mode) we want to print
@@ -10,10 +10,7 @@ const createAndTrimStackTrace = () => {
   let stack: string | undefined = new Error().stack;
   // remove the lines in the stack from _this_ function and the caller (in this file) and shorten the trace
   return stack && stack.split("\n").length > 2
-    ? stack
-        .split("\n")
-        .slice(3, 7)
-        .join("\n")
+    ? stack.split("\n").slice(3, 7).join("\n")
     : stack;
 };
 

package/src/env/fetch/fetch.ts

@@ -0,0 +1,32 @@
+import { Agent as HttpAgent } from "http";
+import { Agent as HttpsAgent } from "https";
+
+export type RequestAgent = HttpAgent | HttpsAgent;
+
+export type ReferrerPolicy =
+  | ""
+  | "no-referrer"
+  | "no-referrer-when-downgrade"
+  | "same-origin"
+  | "origin"
+  | "strict-origin"
+  | "origin-when-cross-origin"
+  | "strict-origin-when-cross-origin"
+  | "unsafe-url";
+
+export {
+  default as fetch,
+  Request,
+  Response,
+  Headers,
+  ResponseInit,
+  BodyInit,
+  RequestInfo,
+  HeadersInit,
+  Body,
+  RequestInit,
+  RequestMode,
+  RequestCredentials,
+  RequestCache,
+  RequestRedirect,
+} from "node-fetch";

package/src/env/fetch/global.ts

@@ -0,0 +1,30 @@
+declare function fetch(
+  input?: RequestInfo,
+  init?: RequestInit
+): Promise<Response>;
+
+declare interface GlobalFetch {
+  fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
+}
+
+declare interface WindowOrWorkerGlobalScope {
+  fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
+}
+
+type RequestInfo = import("./fetch").RequestInfo;
+type Headers = import("./fetch").Headers;
+type HeadersInit = import("./fetch").HeadersInit;
+type Body = import("./fetch").Body;
+type Request = import("./fetch").Request;
+type RequestAgent = import("./fetch").RequestAgent;
+type RequestInit = import("./fetch").RequestInit;
+type RequestMode = import("./fetch").RequestMode;
+type RequestCredentials = import("./fetch").RequestCredentials;
+type RequestCache = import("./fetch").RequestCache;
+type RequestRedirect = import("./fetch").RequestRedirect;
+type ReferrerPolicy = import("./fetch").ReferrerPolicy;
+type Response = import("./fetch").Response;
+type ResponseInit = import("./fetch").ResponseInit;
+type BodyInit = import("./fetch").BodyInit;
+type URLSearchParams = import("./url").URLSearchParams;
+type URLSearchParamsInit = import("./url").URLSearchParamsInit;

package/src/env/fetch/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./fetch";
+export * from "./url";

package/src/env/fetch/index.ts

@@ -0,0 +1,2 @@
+export * from "./fetch";
+export * from "./url";

package/src/env/fetch/url.ts

@@ -0,0 +1,9 @@
+import { URLSearchParams } from "url";
+export { URL, URLSearchParams } from "url";
+
+export type URLSearchParamsInit =
+  | URLSearchParams
+  | string
+  | { [key: string]: Object | Object[] | undefined }
+  | Iterable<[string, Object]>
+  | Array<[string, Object]>;

package/src/env/index.ts

@@ -0,0 +1,4 @@
+import "./polyfills";
+
+export * from "./typescript-utility-types";
+export * from "./fetch";

package/src/env/polyfills/array.ts

@@ -0,0 +1,17 @@
+/// <reference lib="esnext.array" />
+import "core-js/features/array/flat";
+import "core-js/features/array/flat-map";
+
+// The built-in Array.flat typings don't contain an overload for ReadonlyArray<U>[],
+// which means the return type is inferred to be any[] instead of U[], hence this augmentation.
+declare global {
+  interface Array<T> {
+    /**
+     * Returns a new array with all sub-array elements concatenated into it recursively up to the
+     * specified depth.
+     *
+     * @param depth The maximum recursion depth
+     */
+    flat<U>(this: ReadonlyArray<U>[], depth?: 1): U[];
+  }
+}

package/src/env/polyfills/index.ts

@@ -0,0 +1,2 @@
+import "./array";
+import "./object";

package/src/env/polyfills/object.ts

@@ -0,0 +1,7 @@
+import "core-js/features/object/from-entries";
+
+declare global {
+  interface ObjectConstructor {
+    fromEntries<K extends string, V>(map: [K, V][]): Record<K, V>;
+  }
+}

package/src/env/typescript-utility-types.ts

@@ -0,0 +1,2 @@
+export type WithRequired<T, K extends keyof T> = T & Required<Pick<T, K>>;
+export type DeepPartial<T> = { [P in keyof T]?: DeepPartial<T[P]> };