Squashed 'json/' changes from 54f3784a..4ba013d5

4ba013d5 Merge pull request #747 from santhosh-tekuri/duration
aa500e80 Merge pull request #749 from json-schema-org/gregsdennis/json-everything-update
eb8ce976 Merge pull request #757 from ajevans99/main
dcdae5c0 Merge pull request #758 from sirosen/hostname-format-check-empty-string
db21d21b Merge branch 'main' into hostname-format-check-empty-string
3fd78f04 Merge pull request #1 from ajevans99/swift-json-schema
3cada3a9 Update README.md
82a07749 Merge pull request #753 from json-schema-org/ether/fix-draft-locations
a66d23d4  move draft-specific files to the dedicated dir for its draft
8ef15501 Merge pull request #751 from big-andy-coates/format_tests_under_format
fe1b1392 All format test cases should be under the `format` directory.
b1ee90f6 json-everything moved to an org
c00a3f94 test: duration format must start with P
9fc880bf Merge pull request #740 from notEthan/format-pattern-control-char
cbd48ea5 Simplify test of \a regex character to test directly against `pattern` schema
d6f1010a Merge pull request #746 from json-schema-org/annotations
4aec22c1 Revert the changes to additionalProperties.json.
2dc10671 Move the workflow step title.
d9ce71ac May as well also show quotes in the annotation.
1b719a84 Pick the line after the description when attaching spec annotations.
08105151 Markdown is apparently not (yet?) supported in annotations.
81645773 Tidy up the specification annotator a bit.
38628b79 Make the spec URLs structure a bit easier for internal use.
4ebbeaf4 Merge branch 'Era-cell/main'
e4bd7554 dumbness2 corrected
d8ade402 inside run
57c7c869 changed install location
11f8e511 Added installing command in workflow
f2766616 template library, url loads changes
c2badb12 Merge pull request #734 from OptimumCode/idn-hostname-arabic-indic-mixed
dd9599a5 Merge branch 'main' of github.com:json-schema-org/JSON-Schema-Test-Suite
5b393436 add pr dependencies action
3a509007 Clear existin annotations on same PR
23674123 Cases for rfc and iso written separately
0b780b2c Corected yaml format
2b1ffb74 Best practices followed with optimized code
e88a2da6 Works for all OS
7b40efe4 Base path for neighbouring file?
564e6957 Walking through all leaf files
7b84fb44 Merge branch 'main' of https://github.com/Era-cell/JSON-Schema-Test-Suite
891d0265 First workflow2
1c175195 regex correction
96f7683a Final correction2 - file names beautufied
5f050a07 Final correction1
77527b63 Stupidity corrected
eb8fd760 Branch name specified
540a269b Log2
f29d090a Wrong location sepcification
582e12be logging logs check
df3bdecc path corrected
c6b937ca Reading all jsons and spec urls added
cbdd1755 change day2
79dc92f1 TOKEN
ce52852d Python file location changed
3558c2c6 Fake add to tests
eecc7b7a Merge branch 'main' of https://github.com/Era-cell/JSON-Schema-Test-Suite
810d148a First workflow2
4eac02c7 First workflow
40bcb8b3 Corrected replaced unevaluated with additoinalProperties
4ae14268 Add valid first character to avoid Bidi rule violation
202d5625 test: hostname format check fails on empty string

git-subtree-dir: json
git-subtree-split: 4ba013d58e747ecaf48c8bb7cf248cb0d564afbc

Author: Julian

.github/workflows/pr-dependencies.yml

@@ -0,0 +1,12 @@
+name: Check PR Dependencies
+
+on: pull_request
+
+jobs:
+  check_dependencies:
+    runs-on: ubuntu-latest
+    name: Check Dependencies
+    steps:
+    - uses: gregsdennis/dependencies-action@main
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/show_specification_annotations.yml

@@ -0,0 +1,21 @@
+name: Show Specification Annotations
+
+on:
+  pull_request:
+    paths:
+      - 'tests/**'
+
+jobs:
+  annotate:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Generate Annotations
+        run: pip install uritemplate && bin/annotate-specification-links

README.md

@@ -293,7 +293,7 @@ Node-specific support is maintained in a [separate repository](https://github.co
 
 ### .NET
 
-* [JsonSchema.Net](https://github.com/gregsdennis/json-everything)
+* [JsonSchema.Net](https://github.com/json-everything/json-everything)
 * [Newtonsoft.Json.Schema](https://github.com/JamesNK/Newtonsoft.Json.Schema)
 
 ### Perl
@@ -339,6 +339,7 @@ Node-specific support is maintained in a [separate repository](https://github.co
 ### Swift
 
 * [JSONSchema](https://github.com/kylef/JSONSchema.swift)
+* [swift-json-schema](https://github.com/ajevans99/swift-json-schema)
 
 If you use it as well, please fork and send a pull request adding yourself to
 the list :).

bin/annotate-specification-links

@@ -0,0 +1,115 @@
+#!/usr/bin/env python3
+"""
+Annotate pull requests to the GitHub repository with links to specifications.
+"""
+
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Any
+import json
+import re
+import sys
+
+from uritemplate import URITemplate
+
+
+BIN_DIR = Path(__file__).parent
+TESTS = BIN_DIR.parent / "tests"
+URLS = json.loads(BIN_DIR.joinpath("specification_urls.json").read_text())
+
+
+def urls(version: str) -> dict[str, URITemplate]:
+    """
+    Retrieve the version-specific URLs for specifications.
+    """
+    for_version = {**URLS["json-schema"][version], **URLS["external"]}
+    return {k: URITemplate(v) for k, v in for_version.items()}
+
+
+def annotation(
+    path: Path,
+    message: str,
+    line: int = 1,
+    level: str = "notice",
+    **kwargs: Any,
+) -> str:
+    """
+    Format a GitHub annotation.
+
+    See https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions
+    for full syntax.
+    """
+
+    if kwargs:
+        additional = "," + ",".join(f"{k}={v}" for k, v in kwargs.items())
+    else:
+        additional = ""
+
+    relative = path.relative_to(TESTS.parent)
+    return f"::{level} file={relative},line={line}{additional}::{message}\n"
+
+
+def line_number_of(path: Path, case: dict[str, Any]) -> int:
+    """
+    Crudely find the line number of a test case.
+    """
+    with path.open() as file:
+        description = case["description"]
+        return next(
+            (i + 1 for i, line in enumerate(file, 1) if description in line),
+            1,
+        )
+
+
+def main():
+    # Clear annotations which may have been emitted by a previous run.
+    sys.stdout.write("::remove-matcher owner=me::\n")
+
+    for version in TESTS.iterdir():
+        if version.name in {"draft-next", "latest"}:
+            continue
+
+        version_urls = urls(version.name)
+
+        for path in version.rglob("*.json"):
+            try:
+                contents = json.loads(path.read_text())
+            except json.JSONDecodeError as error:
+                error = annotation(
+                    level="error",
+                    path=path,
+                    line=error.lineno,
+                    col=error.pos + 1,
+                    title=str(error),
+                )
+                sys.stdout.write(error)
+
+            for test_case in contents:
+                specifications = test_case.get("specification")
+                if specifications is not None:
+                    for each in specifications:
+                        quote = each.pop("quote", "")
+                        (kind, section), = each.items()
+
+                        number = re.search(r"\d+", kind)
+                        spec = "" if number is None else number.group(0)
+
+                        url = version_urls[kind].expand(
+                            spec=spec,
+                            section=section,
+                        )
+
+                        message = f"{url}\n\n{quote}" if quote else url
+                        sys.stdout.write(
+                            annotation(
+                                path=path,
+                                line=line_number_of(path, test_case),
+                                title="Specification Link",
+                                message=message,
+                            ),
+                        )
+
+
+if __name__ == "__main__":
+    main()

bin/specification_urls.json

@@ -0,0 +1,34 @@
+{
+  "json-schema": {
+    "draft2020-12": {
+      "core": "https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-01#section-{section}",
+      "validation": "https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-01#section-{section}"
+    },
+    "draft2019-09": {
+      "core": "https://json-schema.org/draft/2019-09/draft-handrews-json-schema-02#rfc.section.{section}",
+      "validation": "https://json-schema.org/draft/2019-09/draft-handrews-json-schema-validation-02#rfc.section.{section}"
+    },
+    "draft7": {
+      "core": "https://json-schema.org/draft-07/draft-handrews-json-schema-01#rfc.section.{section}",
+      "validation": "https://json-schema.org/draft-07/draft-handrews-json-schema-validation-01#rfc.section.{section}"
+    },
+    "draft6": {
+      "core": "https://json-schema.org/draft-06/draft-wright-json-schema-01#rfc.section.{section}",
+      "validation": "https://json-schema.org/draft-06/draft-wright-json-schema-validation-01#rfc.section.{section}"
+    },
+    "draft4": {
+      "core": "https://json-schema.org/draft-04/draft-zyp-json-schema-04#rfc.section.{section}",
+      "validation": "https://json-schema.org/draft-04/draft-fge-json-schema-validation-00#rfc.section.{section}"
+    },
+    "draft3": {
+      "core": "https://json-schema.org/draft-03/draft-zyp-json-schema-03.pdf"
+    }
+  },
+
+  "external": {
+    "ecma262": "https://262.ecma-international.org/{section}",
+    "perl5": "https://perldoc.perl.org/perlre#{section}",
+    "rfc": "https://www.rfc-editor.org/rfc/{spec}.txt#{section}",
+    "iso": "https://www.iso.org/obp/ui"
+  }
+}

remotes/subSchemas.json renamed to remotes/draft3/subSchemas.json

@@ -0,0 +1,10 @@
+{
+    "definitions": {
+        "integer": {
+            "type": "integer"
+        },
+        "refToInteger": {
+            "$ref": "#/definitions/integer"
+        }
+    }
+}