Allow use of raw.githubusercontent.com links (SchemaStore#4724)

Author: hyperupcall

cli.js

@@ -62,7 +62,10 @@ const SchemaValidation = /** @type {SchemaValidationJson} */ (
 const SchemaDir = './src/schemas/json'
 const TestPositiveDir = './src/test'
 const TestNegativeDir = './src/negative_test'
-const UrlSchemaStore = 'https://json.schemastore.org/'
+const SchemaStoreUrls = /** @type {const} */ ([
+  'https://json.schemastore.org/',
+  'https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/',
+])
 const [SchemasToBeTested, FoldersPositiveTest, FoldersNegativeTest] = (
   await Promise.all([
     fs.readdir(SchemaDir),
@@ -230,9 +233,11 @@ async function forEachFile(/** @type {ForEachTestFile} */ obj) {
     const schemaFile = await toFile(schemaPath)
     if (obj.actionName) {
       if (process.env.CI) {
-        console.info(`Running "${obj.actionName}" on file "${schemaFile.path}"`)
+        console.info(
+          `Running "${obj.actionName}" on file "./${schemaFile.path}"`,
+        )
       } else {
-        spinner.text = `Running "${obj.actionName}" on file "${schemaFile.path}"`
+        spinner.text = `Running "${obj.actionName}" on file "./${schemaFile.path}"`
       }
     }
     const data = await obj?.onSchemaFile?.(schemaFile, { spinner })
@@ -832,7 +837,12 @@ async function taskMaintenance() {
   {
     console.info(`===== BROKEN SCHEMAS =====`)
     forEachCatalogUrl((url) => {
-      if (url.startsWith(UrlSchemaStore)) return
+      if (
+        url.startsWith(SchemaStoreUrls[0]) ||
+        url.startsWith(SchemaStoreUrls[1])
+      ) {
+        return
+      }
 
       fetch(url)
         .then(async (res) => {
@@ -1105,11 +1115,14 @@ async function assertCatalogJsonLocalURLsAreOneToOne() {
   {
     await forEachCatalogUrl((/** @type {string} */ catalogUrl) => {
       // Skip external schemas.
-      if (!catalogUrl.startsWith(UrlSchemaStore)) {
+      if (
+        !catalogUrl.startsWith(SchemaStoreUrls[0]) &&
+        !catalogUrl.startsWith(SchemaStoreUrls[1])
+      ) {
         return
       }
 
-      const filename = new URL(catalogUrl).pathname.slice(1)
+      const filename = path.basename(new URL(catalogUrl).pathname)
 
       // Check that local URLs end in .json
       if (!filename.endsWith('.json')) {
@@ -1136,8 +1149,11 @@ async function assertCatalogJsonLocalURLsAreOneToOne() {
     const /** @type {string[]} */ allCatalogLocalJsonFiles = []
 
     await forEachCatalogUrl((catalogUrl) => {
-      if (catalogUrl.startsWith(UrlSchemaStore)) {
-        const filename = new URL(catalogUrl).pathname.slice(1)
+      if (
+        catalogUrl.startsWith(SchemaStoreUrls[0]) ||
+        catalogUrl.startsWith(SchemaStoreUrls[1])
+      ) {
+        const filename = path.basename(new URL(catalogUrl).pathname)
         allCatalogLocalJsonFiles.push(filename)
       }
     })
@@ -1154,7 +1170,9 @@ async function assertCatalogJsonLocalURLsAreOneToOne() {
       if (!allCatalogLocalJsonFiles.includes(schemaName)) {
         printErrorAndExit(new Error(), [
           `Expected schema file "${schemaName}" to have a corresponding entry in the catalog file "${CatalogFile}"`,
-          `Expected to find entry with "url" of "${UrlSchemaStore}${schemaName}"`,
+          `Expected to find entry with "url" that is one of:`,
+          `  - "${SchemaStoreUrls[0]}${schemaName}"`,
+          `  - "${SchemaStoreUrls[1]}${schemaName}"`,
           `If this is intentional, ignore this error by appending to the property "missingCatalogUrl" in file "${SchemaValidationFile}"`,
         ])
       }
@@ -1641,7 +1659,8 @@ async function printSimpleStatistics() {
     let countScanURLInternal = 0
 
     await forEachCatalogUrl((catalogUrl) => {
-      catalogUrl.startsWith(UrlSchemaStore)
+      catalogUrl.startsWith(SchemaStoreUrls[0]) ||
+      catalogUrl.startsWith(SchemaStoreUrls[1])
         ? countScanURLInternal++
         : countScanURLExternal++
     })

src/api/json/catalog.json

@@ -853,7 +853,7 @@
       "name": "partial-black.json",
       "description": "black, a Python formatter",
       "fileMatch": [],
-      "url": "https://json.schemastore.org/partial-black.json"
+      "url": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/partial-black.json"
     },
     {
       "name": "bozr.suite.json",
@@ -1094,7 +1094,7 @@
       "name": "cibuildwheel",
       "description": "cibuildwheel, a Python redistributable wheel builder",
       "fileMatch": ["cibuildwheel.toml", ".cibuildwheel.toml"],
-      "url": "https://json.schemastore.org/cibuildwheel.json"
+      "url": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/cibuildwheel.json"
     },
     {
       "name": "CityJSON",
@@ -4670,7 +4670,7 @@
       "name": "PyProject",
       "description": "Python project metadata and configuration",
       "fileMatch": ["pyproject.toml"],
-      "url": "https://json.schemastore.org/pyproject.json"
+      "url": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/pyproject.json"
     },
     {
       "name": "Pyright",
@@ -4681,7 +4681,7 @@
     {
       "name": "pytest",
       "description": "pytest configuration",
-      "url": "https://json.schemastore.org/partial-pytest.json"
+      "url": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/partial-pytest.json"
     },
     {
       "name": "Qgoda",
@@ -5769,7 +5769,7 @@
       "name": "uv",
       "description": "uv, a fast Python package installer",
       "fileMatch": ["uv.toml"],
-      "url": "https://json.schemastore.org/uv.json"
+      "url": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/uv.json"
     },
     {
       "name": "Vector",
@@ -6312,7 +6312,7 @@
       "name": "Hatch",
       "description": "Python package build tool",
       "fileMatch": ["hatch.toml"],
-      "url": "https://json.schemastore.org/hatch.json"
+      "url": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/hatch.json"
     },
     {
       "name": "helmfile",
@@ -8020,7 +8020,7 @@
       "name": "Python script metadata",
       "description": "Metadata of a Python script, as defined by PEP 723",
       "fileMatch": [],
-      "url": "https://json.schemastore.org/pep-723.json"
+      "url": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/pep-723.json"
     },
     {
       "name": "vtcfg",