Merge remote-tracking branch 'upstream/main' into tsdoc-eslint

Author: saihaj

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql",
-  "version": "16.0.0-alpha.2",
+  "version": "16.0.0-alpha.3",
   "description": "A Query Language and Runtime which can target any service.",
   "license": "MIT",
   "private": true,
@@ -25,7 +25,7 @@
   },
   "scripts": {
     "preversion": ". ./resources/checkgit.sh && npm ci",
-    "version": "node resources/gen-version.js && npm test && git add src/version.js",
+    "version": "node resources/gen-version.js && npm test && git add src/version.ts",
     "fuzzonly": "mocha --full-trace src/**/__tests__/**/*-fuzz.ts",
     "changelog": "node resources/gen-changelog.js",
     "benchmark": "node benchmark/benchmark.js",

package.json

@@ -90,14 +90,17 @@ function buildPackageJSON() {
   const { preReleaseTag } = versionMatch.groups;
 
   if (preReleaseTag != null) {
-    const [tag] = preReleaseTag.split('.');
+    const splittedTag = preReleaseTag.split('.');
+    // Note: `experimental-*` take precedence over `alpha`, `beta` or `rc`.
+    const publishTag = splittedTag[2] ?? splittedTag[0];
     assert(
-      tag.startsWith('experimental-') || ['alpha', 'beta', 'rc'].includes(tag),
-      `"${tag}" tag is supported.`,
+      ['alpha', 'beta', 'rc'].includes(publishTag) ||
+        publishTag.startsWith('experimental-'),
+      `"${publishTag}" tag is supported.`,
     );
 
     assert(!packageJSON.publishConfig, 'Can not override "publishConfig".');
-    packageJSON.publishConfig = { tag: tag || 'latest' };
+    packageJSON.publishConfig = { tag: publishTag || 'latest' };
   }
 
   return packageJSON;

resources/build-npm.js

@@ -4,13 +4,6 @@ import { describe, it } from 'mocha';
 import { version, versionInfo } from '../version';
 
 describe('Version', () => {
-  it('version', () => {
-    expect(version).to.be.a('string');
-    expect(version).to.match(
-      /^\d+\.\d+\.\d(-(alpha|beta|rc|(experimental-[\w-]+))\.\d+)?$/,
-    );
-  });
-
   it('versionInfo', () => {
     expect(versionInfo).to.be.an('object');
     expect(versionInfo).to.have.all.keys(
@@ -21,20 +14,38 @@ describe('Version', () => {
     );
 
     const { major, minor, patch, preReleaseTag } = versionInfo;
-
-    expect(major).to.be.a('number');
-    expect(minor).to.be.a('number');
-    expect(patch).to.be.a('number');
+    expect(major).to.be.a('number').at.least(0);
+    expect(minor).to.be.a('number').at.least(0);
+    expect(patch).to.be.a('number').at.least(0);
 
     // istanbul ignore next (Can't be verified on all versions)
-    if (preReleaseTag !== null) {
-      expect(preReleaseTag).to.be.a('string');
+    switch (preReleaseTag?.split('.').length) {
+      case null:
+        break;
+      case 2:
+        expect(preReleaseTag).to.match(
+          /^(alpha|beta|rc|experimental-[\w-]+)\.\d+/,
+        );
+        break;
+      case 4:
+        expect(preReleaseTag).to.match(
+          /^(alpha|beta|rc)\.\d+.experimental-[\w-]+\.\d+/,
+        );
+        break;
+      default:
+        expect.fail('Invalid pre-release tag: ' + preReleaseTag);
     }
+  });
+
+  it('version', () => {
+    expect(version).to.be.a('string');
 
-    expect(
-      `${major}.${minor}.${patch}` +
-        // istanbul ignore next (Can't be verified on all versions)
-        (preReleaseTag !== null ? '-' + preReleaseTag : ''),
-    ).to.equal(version);
+    const { major, minor, patch, preReleaseTag } = versionInfo;
+    expect(version).to.equal(
+      // istanbul ignore next (Can't be verified on all versions)
+      preReleaseTag === null
+        ? `${major}.${minor}.${patch}`
+        : `${major}.${minor}.${patch}-${preReleaseTag}`,
+    );
   });
 });

src/__tests__/version-test.ts

@@ -142,7 +142,7 @@ export interface ExecutionArgs {
 }
 
 /**
- * Implements the "Evaluating requests" section of the GraphQL specification.
+ * Implements the "Executing requests" section of the GraphQL specification.
  *
  * Returns either a synchronous ExecutionResult (if all encountered resolvers
  * are synchronous), or a Promise of an ExecutionResult that will eventually be
@@ -196,7 +196,7 @@ export function execute(args: ExecutionArgs): PromiseOrValue<ExecutionResult> {
 }
 
 /**
- * Also implements the "Evaluating requests" section of the GraphQL specification.
+ * Also implements the "Executing requests" section of the GraphQL specification.
  * However, it guarantees to complete synchronously (or throw an error) assuming
  * that all field resolvers are also synchronous.
  */
@@ -327,7 +327,7 @@ export function buildExecutionContext(
 }
 
 /**
- * Implements the "Evaluating operations" section of the spec.
+ * Implements the "Executing operations" section of the spec.
  */
 function executeOperation(
   exeContext: ExecutionContext,
@@ -367,8 +367,8 @@ function executeOperation(
 }
 
 /**
- * Implements the "Evaluating selection sets" section of the spec
- * for "write" mode.
+ * Implements the "Executing selection sets" section of the spec
+ * for fields that must be executed serially.
  */
 function executeFieldsSerially(
   exeContext: ExecutionContext,
@@ -381,7 +381,7 @@ function executeFieldsSerially(
     fields.entries(),
     (results, [responseName, fieldNodes]) => {
       const fieldPath = addPath(path, responseName, parentType.name);
-      const result = resolveField(
+      const result = executeField(
         exeContext,
         parentType,
         sourceValue,
@@ -405,8 +405,8 @@ function executeFieldsSerially(
 }
 
 /**
- * Implements the "Evaluating selection sets" section of the spec
- * for "read" mode.
+ * Implements the "Executing selection sets" section of the spec
+ * for fields that may be executed in parallel.
  */
 function executeFields(
   exeContext: ExecutionContext,
@@ -420,7 +420,7 @@ function executeFields(
 
   for (const [responseName, fieldNodes] of fields.entries()) {
     const fieldPath = addPath(path, responseName, parentType.name);
-    const result = resolveField(
+    const result = executeField(
       exeContext,
       parentType,
       sourceValue,
@@ -583,12 +583,12 @@ function getFieldEntryKey(node: FieldNode): string {
 }
 
 /**
- * Resolves the field on the given source object. In particular, this
- * figures out the value that the field returns by calling its resolve function,
- * then calls completeValue to complete promises, serialize scalars, or execute
- * the sub-selection-set for objects.
+ * Implements the "Executing field" section of the spec
+ * In particular, this function figures out the value that the field returns by
+ * calling its resolve function, then calls completeValue to complete promises,
+ * serialize scalars, or execute the sub-selection-set for objects.
  */
-function resolveField(
+function executeField(
   exeContext: ExecutionContext,
   parentType: GraphQLObjectType,
   source: unknown,
@@ -722,7 +722,7 @@ function handleFieldError(
  * and then complete based on that type
  *
  * Otherwise, the field type expects a sub-selection set, and will complete the
- * value by evaluating all sub-selections.
+ * value by executing all sub-selections.
  */
 function completeValue(
   exeContext: ExecutionContext,