chore: sort schemas

scarf005 · Feb 2, 2025 · f8999b8 · f8999b8
1 parent 20899e2
commit f8999b8
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 36 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -24,15 +24,15 @@
   "json.schemas": [
     {
       "fileMatch": [
-        "src/main/resources/marisa/localization/ENG/keywords.json",
-        "src/main/resources/marisa/localization/FRA/keywords.json",
-        "src/main/resources/marisa/localization/JPN/keywords.json",
-        "src/main/resources/marisa/localization/KOR/keywords.json",
-        "src/main/resources/marisa/localization/ZHS/keywords.json",
-        "src/main/resources/marisa/localization/ZHT/keywords.json",
-        "src/main/resources/marisa/localization/SPA/keywords.json"
+        "src/main/resources/marisa/localization/ENG/cards.json",
+        "src/main/resources/marisa/localization/FRA/cards.json",
+        "src/main/resources/marisa/localization/JPN/cards.json",
+        "src/main/resources/marisa/localization/KOR/cards.json",
+        "src/main/resources/marisa/localization/ZHS/cards.json",
+        "src/main/resources/marisa/localization/ZHT/cards.json",
+        "src/main/resources/marisa/localization/SPA/cards.json"
       ],
-      "url": "./src/main/resources/marisa/localization/schemas/keywords.json"
+      "url": "./src/main/resources/marisa/localization/schemas/cards.json"
     },
     {
       "fileMatch": [
@@ -48,27 +48,27 @@
     },
     {
       "fileMatch": [
-        "src/main/resources/marisa/localization/ENG/cards.json",
-        "src/main/resources/marisa/localization/FRA/cards.json",
-        "src/main/resources/marisa/localization/JPN/cards.json",
-        "src/main/resources/marisa/localization/KOR/cards.json",
-        "src/main/resources/marisa/localization/ZHS/cards.json",
-        "src/main/resources/marisa/localization/ZHT/cards.json",
-        "src/main/resources/marisa/localization/SPA/cards.json"
+        "src/main/resources/marisa/localization/ENG/keywords.json",
+        "src/main/resources/marisa/localization/FRA/keywords.json",
+        "src/main/resources/marisa/localization/JPN/keywords.json",
+        "src/main/resources/marisa/localization/KOR/keywords.json",
+        "src/main/resources/marisa/localization/ZHS/keywords.json",
+        "src/main/resources/marisa/localization/ZHT/keywords.json",
+        "src/main/resources/marisa/localization/SPA/keywords.json"
       ],
-      "url": "./src/main/resources/marisa/localization/schemas/cards.json"
+      "url": "./src/main/resources/marisa/localization/schemas/keywords.json"
     },
     {
       "fileMatch": [
-        "src/main/resources/marisa/localization/ENG/relics.json",
-        "src/main/resources/marisa/localization/FRA/relics.json",
-        "src/main/resources/marisa/localization/JPN/relics.json",
-        "src/main/resources/marisa/localization/KOR/relics.json",
-        "src/main/resources/marisa/localization/ZHS/relics.json",
-        "src/main/resources/marisa/localization/ZHT/relics.json",
-        "src/main/resources/marisa/localization/SPA/relics.json"
+        "src/main/resources/marisa/localization/ENG/potions.json",
+        "src/main/resources/marisa/localization/FRA/potions.json",
+        "src/main/resources/marisa/localization/JPN/potions.json",
+        "src/main/resources/marisa/localization/KOR/potions.json",
+        "src/main/resources/marisa/localization/ZHS/potions.json",
+        "src/main/resources/marisa/localization/ZHT/potions.json",
+        "src/main/resources/marisa/localization/SPA/potions.json"
       ],
-      "url": "./src/main/resources/marisa/localization/schemas/relics.json"
+      "url": "./src/main/resources/marisa/localization/schemas/potions.json"
     },
     {
       "fileMatch": [
@@ -84,15 +84,15 @@
     },
     {
       "fileMatch": [
-        "src/main/resources/marisa/localization/ENG/potions.json",
-        "src/main/resources/marisa/localization/FRA/potions.json",
-        "src/main/resources/marisa/localization/JPN/potions.json",
-        "src/main/resources/marisa/localization/KOR/potions.json",
-        "src/main/resources/marisa/localization/ZHS/potions.json",
-        "src/main/resources/marisa/localization/ZHT/potions.json",
-        "src/main/resources/marisa/localization/SPA/potions.json"
+        "src/main/resources/marisa/localization/ENG/relics.json",
+        "src/main/resources/marisa/localization/FRA/relics.json",
+        "src/main/resources/marisa/localization/JPN/relics.json",
+        "src/main/resources/marisa/localization/KOR/relics.json",
+        "src/main/resources/marisa/localization/ZHS/relics.json",
+        "src/main/resources/marisa/localization/ZHT/relics.json",
+        "src/main/resources/marisa/localization/SPA/relics.json"
       ],
-      "url": "./src/main/resources/marisa/localization/schemas/potions.json"
+      "url": "./src/main/resources/marisa/localization/schemas/relics.json"
     }
   ],
   "explorer.autoRevealExclude": {

diff --git a/src/main/resources/marisa/localization/dirEntries_test.ts b/src/main/resources/marisa/localization/dirEntries_test.ts
@@ -8,13 +8,13 @@ Deno.test(async function testDirEntries() {
     .map((x) => x.name)
     .map((x) => x.replace(".json", ""))
 
-  const expected = [
+  const expected = new Set([
     "keywords",
     "events",
     "cards",
     "relics",
     "powers",
     "potions",
-  ]
-  assertEquals(entries, expected)
+  ])
+  assertEquals(new Set(entries), expected)
 })
diff --git a/src/main/resources/marisa/localization/vscode.ts b/src/main/resources/marisa/localization/vscode.ts
@@ -14,7 +14,7 @@ function schemaSettingsGen(name: string) {
 if (import.meta.main) {
   const settingsFile = `${projectRoot}/.vscode/settings.json`
   const settings = JSON.parse(await Deno.readTextFile(settingsFile))
-  const schemas = names.map(schemaSettingsGen)
+  const schemas = names.map(schemaSettingsGen).toSorted((a, b) => a.url.localeCompare(b.url))
   const newSettings = { ...settings, "json.schemas": schemas }
 
   await Deno.writeTextFile(settingsFile, JSON.stringify(newSettings, null, 2) + "\n")