Merge branch 'main' into oneof-v2

Author: leebyron

.github/algorithm-format-check.mjs

@@ -28,7 +28,7 @@ for (const filename of filenames) {
       const matches = line.match(/^([a-z0-9A-Z]+)(\s*)\(([^)]*)\)(\s*):(\s*)$/);
       const grammarMatches =
         filename === "Section 2 -- Language.md" &&
-        line.match(/^([A-Za-z0-9]+) :\s+((\S).*)$/);
+        line.match(/^([A-Za-z0-9]+) ::?\s+((\S).*)$/);
       if (matches) {
         const [, algorithmName, ns1, _args, ns2, ns3] = matches;
         if (ns1 || ns2 || ns3) {
@@ -67,14 +67,23 @@ for (const filename of filenames) {
             console.log();
             process.exitCode = 1;
           }
-          if (step.match(/^\s*(-|[0-9]\.)\s+[a-z]/)) {
+          if (step.match(/^\s*(-|[0-9]+\.)\s+[a-z]/)) {
             console.log(
               `Bad formatting of '${algorithmName}' step (should start with a capital) in '${filename}':`
             );
             console.dir(step);
             console.log();
             process.exitCode = 1;
           }
+          const assertMatch = step.match(/^\s*(-|[0-9]+\.)\s*Assert([^:])/);
+          if (assertMatch) {
+            console.log(
+              `Bad formatting of '${algorithmName}' step (Assert should be immediately followed by ':'; found '${assertMatch[2]}') in '${filename}':`
+            );
+            console.dir(step);
+            console.log();
+            process.exitCode = 1;
+          }
 
           const stepWithoutValueLiterals = step.replace(
             valueLiteralsRegexp,
@@ -131,6 +140,10 @@ for (const filename of filenames) {
           console.log();
           process.exitCode = 1;
         }
+        while (lines[i + 1].trim() !== "") {
+          // Continuation of definition
+          i++;
+        }
         if (!lines[i + 2].startsWith("- ")) {
           // Not an algorithm; probably more grammar
           continue;
@@ -176,6 +189,15 @@ for (const filename of filenames) {
             console.log();
             process.exitCode = 1;
           }
+          const assertMatch = step.match(/^\s*(-|[0-9]+\.)\s*Assert([^:])/);
+          if (assertMatch) {
+            console.log(
+              `Bad formatting of '${grammarName}' step (Assert should be immediately followed by ':'; found '${assertMatch[2]}') in '${filename}':`
+            );
+            console.dir(step);
+            console.log();
+            process.exitCode = 1;
+          }
         }
       }
     }

package-lock.json

@@ -21,13 +21,15 @@
     "suggest:format": "echo \"\nTo resolve this, run: $(tput bold)npm run format$(tput sgr0)\" && exit 1",
     "build": "./build.sh",
     "test:build": "spec-md --metadata spec/metadata.json spec/GraphQL.md > /dev/null",
-    "watch": "nodemon -e json,md --exec \"npm run build\""
+    "watch": "nodemon -e json,md --exec \"npm run build\"",
+    "update-appendix-c": "node scripts/update-appendix-c.mjs; prettier --write \"spec/Appendix C -- Built-in Definitions.md\""
   },
   "devDependencies": {
     "cspell": "5.9.1",
     "nodemon": "2.0.20",
     "prettier": "2.8.2",
-    "spec-md": "3.1.0"
+    "spec-md": "3.1.0",
+    "graphql": "^17.0.0-alpha.8"
   },
   "prettier": {
     "proseWrap": "always",

package.json

@@ -0,0 +1,28 @@
+import { writeFile } from 'node:fs/promises';
+import { printIntrospectionSchema, buildSchema, specifiedScalarTypes, printType } from 'graphql';
+
+const FILE = './spec/Appendix C -- Specified Definitions.md';
+function printSpecifiedScalars() {
+  return specifiedScalarTypes
+    .map((type) => printType(type))
+    .join('\n\n');
+}
+
+const introspectionSchema = printIntrospectionSchema(buildSchema(`type Query { i: Int }`));
+const prefix = `
+# C. Appendix: Type System Definitions
+
+This appendix lists the specified type system definitions.
+
+The descriptions are non-normative. Implementations are recommended to use them
+for consistency but different descriptions are allowed.
+
+The order of types, fields, arguments, values and directives is non-normative.
+
+\`\`\`graphql
+`
+
+const suffix = `
+\`\`\`
+`
+await writeFile(FILE, prefix + printSpecifiedScalars() + '\n\n' + introspectionSchema + suffix);

scripts/update-appendix-c.mjs

@@ -214,5 +214,36 @@ Fibonacci(number):
 - Return {Fibonacci(previousNumber)} + {Fibonacci(previousPreviousNumber)}.
 
 Note: Algorithms described in this document are written to be easy to
-understand. Implementers are encouraged to include equivalent but optimized
-implementations.
+understand. Implementers are encouraged to include observably equivalent but
+optimized implementations.
+
+## Data Collections
+
+Algorithms within this specification refer to abstract data collection types to
+express normative structural, uniqueness, and ordering requirements. Temporary
+data collections internal to an algorithm use these types to best describe
+expected behavior, but implementers are encouraged to provide observably
+equivalent but optimized implementations. Implementations may use any data
+structure as long as the expected requirements are met.
+
+**List**
+
+:: A _list_ is an ordered collection of values which may contain duplicates. A
+value added to a list is ordered after existing values.
+
+**Set**
+
+:: A _set_ is a collection of values which must not contain duplicates.
+
+:: An _ordered set_ is a set which has a defined order. A value added to an
+ordered set, which does not already contain that value, is ordered after
+existing values.
+
+**Map**
+
+:: A _map_ is a collection of entries, each of which has a key and value. Each
+entry has a unique key, and can be directly referenced by that key.
+
+:: An _ordered map_ is a map which has a defined order. An entry added to an
+ordered map, which does not have an entry with that key, is ordered after
+existing entries.

spec/Appendix A -- Notation Conventions.md

@@ -133,6 +133,8 @@ lines and uniform indentation with {BlockStringValue()}.
 
 ## Document Syntax
 
+Description : StringValue
+
 Document : Definition+
 
 Definition :
@@ -149,7 +151,7 @@ ExecutableDefinition :
 
 OperationDefinition :
 
-- OperationType Name? VariablesDefinition? Directives? SelectionSet
+- Description? OperationType Name? VariablesDefinition? Directives? SelectionSet
 - SelectionSet
 
 OperationType : one of `query` `mutation` `subscription`
@@ -174,8 +176,8 @@ FragmentSpread : ... FragmentName Directives?
 
 InlineFragment : ... TypeCondition? Directives? SelectionSet
 
-FragmentDefinition : fragment FragmentName TypeCondition Directives?
-SelectionSet
+FragmentDefinition : Description? fragment FragmentName TypeCondition
+Directives? SelectionSet
 
 FragmentName : Name but not `on`
 
@@ -213,7 +215,8 @@ ObjectField[Const] : Name : Value[?Const]
 
 VariablesDefinition : ( VariableDefinition+ )
 
-VariableDefinition : Variable : Type DefaultValue? Directives[Const]?
+VariableDefinition : Description? Variable : Type DefaultValue?
+Directives[Const]?
 
 Variable : $ Name
 
@@ -268,8 +271,6 @@ SchemaExtension :
 
 RootOperationTypeDefinition : OperationType : NamedType
 
-Description : StringValue
-
 TypeDefinition :
 
 - ScalarTypeDefinition