Merge branch 'main' into remove-3.5-data-files

2025-12-23 21:07:12 -05:00 · 2023-07-13 11:44:36 -07:00
parent de7c01fc77 3ab6f341fa
commit e7b16c6f28
8 changed files with 261 additions and 2 deletions
--- a/data/graphql/ghae/schema.docs-ghae.graphql
+++ b/data/graphql/ghae/schema.docs-ghae.graphql
@@ -13256,6 +13256,31 @@ type EnvironmentEdge {
  node: Environment
 }

+"""
+Properties by which environments connections can be ordered
+"""
+enum EnvironmentOrderField {
+  """
+  Order environments by name.
+  """
+  NAME
+}
+
+"""
+Ordering options for environments
+"""
+input Environments {
+  """
+  The direction in which to order environments by the specified field.
+  """
+  direction: OrderDirection!
+
+  """
+  The field to order environments by.
+  """
+  field: EnvironmentOrderField!
+}
+
 """
 An external identity provisioned by SAML SSO or SCIM. If SAML is configured on
 the organization, the external identity is visible to (1) organization owners,
@@ -34728,6 +34753,11 @@ type Repository implements Node & ProjectOwner & RepositoryInfo & Starrable & Su
    Returns the last _n_ elements from the list.
    """
    last: Int
+
+    """
+    Ordering options for the environments
+    """
+    orderBy: Environments = {field: NAME, direction: ASC}
  ): EnvironmentConnection!

  """
--- a/data/graphql/ghec/schema.docs.graphql
+++ b/data/graphql/ghec/schema.docs.graphql
@@ -14921,6 +14921,31 @@ type EnvironmentEdge {
  node: Environment
 }

+"""
+Properties by which environments connections can be ordered
+"""
+enum EnvironmentOrderField {
+  """
+  Order environments by name.
+  """
+  NAME
+}
+
+"""
+Ordering options for environments
+"""
+input Environments {
+  """
+  The direction in which to order environments by the specified field.
+  """
+  direction: OrderDirection!
+
+  """
+  The field to order environments by.
+  """
+  field: EnvironmentOrderField!
+}
+
 """
 An external identity provisioned by SAML SSO or SCIM. If SAML is configured on
 the organization, the external identity is visible to (1) organization owners,
@@ -42149,6 +42174,11 @@ type Repository implements Node & PackageOwner & ProjectOwner & ProjectV2Recent
    Returns the last _n_ elements from the list.
    """
    last: Int
+
+    """
+    Ordering options for the environments
+    """
+    orderBy: Environments = {field: NAME, direction: ASC}
  ): EnvironmentConnection!

  """
--- a/data/graphql/schema.docs.graphql
+++ b/data/graphql/schema.docs.graphql
@@ -14921,6 +14921,31 @@ type EnvironmentEdge {
  node: Environment
 }

+"""
+Properties by which environments connections can be ordered
+"""
+enum EnvironmentOrderField {
+  """
+  Order environments by name.
+  """
+  NAME
+}
+
+"""
+Ordering options for environments
+"""
+input Environments {
+  """
+  The direction in which to order environments by the specified field.
+  """
+  direction: OrderDirection!
+
+  """
+  The field to order environments by.
+  """
+  field: EnvironmentOrderField!
+}
+
 """
 An external identity provisioned by SAML SSO or SCIM. If SAML is configured on
 the organization, the external identity is visible to (1) organization owners,
@@ -42149,6 +42174,11 @@ type Repository implements Node & PackageOwner & ProjectOwner & ProjectV2Recent
    Returns the last _n_ elements from the list.
    """
    last: Int
+
+    """
+    Ordering options for the environments
+    """
+    orderBy: Environments = {field: NAME, direction: ASC}
  ): EnvironmentConnection!

  """
--- a/src/content-render/unified/annotate.js
+++ b/src/content-render/unified/annotate.js
@@ -77,13 +77,23 @@ function createAnnotatedNode(node) {

 function validate(lang, code) {
  if (!lang) {
-    throw new Error('No language specific for annotate info string')
+    throw new Error('No language specific for annotate info string.')
  }
  if (!languages[lang]) {
    throw new Error(
-      `Unsupported language for annotate info string. Please use one of: ${Object.keys(languages)}`,
+      `Unsupported language for annotate info string. Please use one of: ${Object.keys(
+        languages,
+      )}.`,
    )
  }
+
+  const firstLine = code.split('\n')[0]
+  if (!getRegexp(lang).test(firstLine)) {
+    throw new Error(
+      `Make sure the annotated code example starts with a single line annotation. It's currently starting with: ${firstLine}`,
+    )
+  }
+
  if (!new RegExp(getRegexp(lang), 'm').test(code)) {
    throw new Error(
      'Make sure the comment syntax matches the language. Use single-line comments only.',
--- a/src/graphql/data/fpt/changelog.json
+++ b/src/graphql/data/fpt/changelog.json
@@ -1,4 +1,19 @@
 [
+  {
+    "schemaChanges": [
+      {
+        "title": "The GraphQL schema includes these changes:",
+        "changes": [
+          "<p>Type <code>EnvironmentOrderField</code> was added</p>",
+          "<p>Type <code>Environments</code> was added</p>",
+          "<p>Argument <code>orderBy: Environments</code> (with default value) added to field <code>Repository.environments</code></p>"
+        ]
+      }
+    ],
+    "previewChanges": [],
+    "upcomingChanges": [],
+    "date": "2023-07-13"
+  },
  {
    "schemaChanges": [
      {
--- a/src/graphql/data/fpt/schema.json
+++ b/src/graphql/data/fpt/schema.json
@@ -58069,6 +58069,16 @@
                "kind": "scalars",
                "href": "/graphql/reference/scalars#int"
              }
+            },
+            {
+              "name": "orderBy",
+              "description": "<p>Ordering options for the environments.</p>",
+              "type": {
+                "name": "Environments",
+                "id": "environments",
+                "kind": "input-objects",
+                "href": "/graphql/reference/input-objects#environments"
+              }
            }
          ]
        },
@@ -79249,6 +79259,19 @@
        }
      ]
    },
+    {
+      "name": "EnvironmentOrderField",
+      "kind": "enums",
+      "id": "environmentorderfield",
+      "href": "/graphql/reference/enums#environmentorderfield",
+      "description": "<p>Properties by which environments connections can be ordered.</p>",
+      "values": [
+        {
+          "name": "NAME",
+          "description": "<p>Order environments by name.</p>"
+        }
+      ]
+    },
    {
      "name": "FileViewedState",
      "kind": "enums",
@@ -91786,6 +91809,31 @@
        }
      ]
    },
+    {
+      "name": "Environments",
+      "kind": "inputObjects",
+      "id": "environments",
+      "href": "/graphql/reference/input-objects#environments",
+      "description": "<p>Ordering options for environments.</p>",
+      "inputFields": [
+        {
+          "name": "direction",
+          "description": "<p>The direction in which to order environments by the specified field.</p>",
+          "type": "OrderDirection!",
+          "id": "orderdirection",
+          "kind": "enums",
+          "href": "/graphql/reference/enums#orderdirection"
+        },
+        {
+          "name": "field",
+          "description": "<p>The field to order environments by.</p>",
+          "type": "EnvironmentOrderField!",
+          "id": "environmentorderfield",
+          "kind": "enums",
+          "href": "/graphql/reference/enums#environmentorderfield"
+        }
+      ]
+    },
    {
      "name": "FileAddition",
      "kind": "inputObjects",
--- a/src/graphql/data/ghae/schema.json
+++ b/src/graphql/data/ghae/schema.json
@@ -48474,6 +48474,16 @@
                "kind": "scalars",
                "href": "/graphql/reference/scalars#int"
              }
+            },
+            {
+              "name": "orderBy",
+              "description": "<p>Ordering options for the environments.</p>",
+              "type": {
+                "name": "Environments",
+                "id": "environments",
+                "kind": "input-objects",
+                "href": "/graphql/reference/input-objects#environments"
+              }
            }
          ]
        },
@@ -65722,6 +65732,19 @@
        }
      ]
    },
+    {
+      "name": "EnvironmentOrderField",
+      "kind": "enums",
+      "id": "environmentorderfield",
+      "href": "/graphql/reference/enums#environmentorderfield",
+      "description": "<p>Properties by which environments connections can be ordered.</p>",
+      "values": [
+        {
+          "name": "NAME",
+          "description": "<p>Order environments by name.</p>"
+        }
+      ]
+    },
    {
      "name": "FileViewedState",
      "kind": "enums",
@@ -74903,6 +74926,31 @@
        }
      ]
    },
+    {
+      "name": "Environments",
+      "kind": "inputObjects",
+      "id": "environments",
+      "href": "/graphql/reference/input-objects#environments",
+      "description": "<p>Ordering options for environments.</p>",
+      "inputFields": [
+        {
+          "name": "direction",
+          "description": "<p>The direction in which to order environments by the specified field.</p>",
+          "type": "OrderDirection!",
+          "id": "orderdirection",
+          "kind": "enums",
+          "href": "/graphql/reference/enums#orderdirection"
+        },
+        {
+          "name": "field",
+          "description": "<p>The field to order environments by.</p>",
+          "type": "EnvironmentOrderField!",
+          "id": "environmentorderfield",
+          "kind": "enums",
+          "href": "/graphql/reference/enums#environmentorderfield"
+        }
+      ]
+    },
    {
      "name": "FileAddition",
      "kind": "inputObjects",
--- a/src/graphql/data/ghec/schema.json
+++ b/src/graphql/data/ghec/schema.json
@@ -58069,6 +58069,16 @@
                "kind": "scalars",
                "href": "/graphql/reference/scalars#int"
              }
+            },
+            {
+              "name": "orderBy",
+              "description": "<p>Ordering options for the environments.</p>",
+              "type": {
+                "name": "Environments",
+                "id": "environments",
+                "kind": "input-objects",
+                "href": "/graphql/reference/input-objects#environments"
+              }
            }
          ]
        },
@@ -79249,6 +79259,19 @@
        }
      ]
    },
+    {
+      "name": "EnvironmentOrderField",
+      "kind": "enums",
+      "id": "environmentorderfield",
+      "href": "/graphql/reference/enums#environmentorderfield",
+      "description": "<p>Properties by which environments connections can be ordered.</p>",
+      "values": [
+        {
+          "name": "NAME",
+          "description": "<p>Order environments by name.</p>"
+        }
+      ]
+    },
    {
      "name": "FileViewedState",
      "kind": "enums",
@@ -91786,6 +91809,31 @@
        }
      ]
    },
+    {
+      "name": "Environments",
+      "kind": "inputObjects",
+      "id": "environments",
+      "href": "/graphql/reference/input-objects#environments",
+      "description": "<p>Ordering options for environments.</p>",
+      "inputFields": [
+        {
+          "name": "direction",
+          "description": "<p>The direction in which to order environments by the specified field.</p>",
+          "type": "OrderDirection!",
+          "id": "orderdirection",
+          "kind": "enums",
+          "href": "/graphql/reference/enums#orderdirection"
+        },
+        {
+          "name": "field",
+          "description": "<p>The field to order environments by.</p>",
+          "type": "EnvironmentOrderField!",
+          "id": "environmentorderfield",
+          "kind": "enums",
+          "href": "/graphql/reference/enums#environmentorderfield"
+        }
+      ]
+    },
    {
      "name": "FileAddition",
      "kind": "inputObjects",