chore: don't include $schema in generated locale files

serhalp · serhalp · commit 90f9219c4a28 · 2026-02-08T20:11:40.000-05:00
I had to eliminate the teeny perf optimization that was `copy: true`. It
doesn't seem to affect the run time much.
diff --git a/lunaria/files/ar-EG.json b/lunaria/files/ar-EG.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - متصفح الحزم لسجل npm",
diff --git a/lunaria/files/az-AZ.json b/lunaria/files/az-AZ.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - npm Reyestri üçün Paket Brauzeri",
diff --git a/lunaria/files/cs-CZ.json b/lunaria/files/cs-CZ.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - Prohlížeč balíčků pro registr npm",
diff --git a/lunaria/files/de-DE.json b/lunaria/files/de-DE.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - Paket-Browser für die npm Registry",
diff --git a/lunaria/files/en-GB.json b/lunaria/files/en-GB.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - Package Browser for the npm Registry",
diff --git a/lunaria/files/en-US.json b/lunaria/files/en-US.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - Package Browser for the npm Registry",
diff --git a/lunaria/files/es-419.json b/lunaria/files/es-419.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - Explorador de Paquetes para el Registro npm",
diff --git a/lunaria/files/es-ES.json b/lunaria/files/es-ES.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - Explorador de Paquetes para el Registro npm",
diff --git a/lunaria/files/fr-FR.json b/lunaria/files/fr-FR.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - Explorateur de paquets pour le registre npm",
diff --git a/lunaria/files/hi-IN.json b/lunaria/files/hi-IN.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - npm रजिस्ट्री के लिए पैकेज ब्राउज़र",
diff --git a/lunaria/files/hu-HU.json b/lunaria/files/hu-HU.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - Csomagböngésző az npm regiszterhez",
diff --git a/lunaria/files/id-ID.json b/lunaria/files/id-ID.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - Penjelajah Paket untuk Registri npm",
diff --git a/lunaria/files/it-IT.json b/lunaria/files/it-IT.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - Il browser dei pacchetti npm",
diff --git a/lunaria/files/ja-JP.json b/lunaria/files/ja-JP.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - npmレジストリのためのパッケージブラウザ",
diff --git a/lunaria/files/mr-IN.json b/lunaria/files/mr-IN.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - npm नोंदणीसाठी पॅकेज ब्राउझर",
diff --git a/lunaria/files/ne-NP.json b/lunaria/files/ne-NP.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - npm रजिस्ट्रीका लागि प्याकेज ब्राउजर",
diff --git a/lunaria/files/no-NO.json b/lunaria/files/no-NO.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - Pakkeleser for npm-registeret",
diff --git a/lunaria/files/pl-PL.json b/lunaria/files/pl-PL.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - Przeglądarka pakietów dla rejestru npm",
diff --git a/lunaria/files/pt-BR.json b/lunaria/files/pt-BR.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - Navegador de Pacotes para o Registro npm",
diff --git a/lunaria/files/ru-RU.json b/lunaria/files/ru-RU.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx — Браузер пакетов для реестра npm",
diff --git a/lunaria/files/te-IN.json b/lunaria/files/te-IN.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - npm రిజిస్ట్రీకి ప్యాకేజ్ బ్రౌజర్",
diff --git a/lunaria/files/uk-UA.json b/lunaria/files/uk-UA.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - Браузер пакетів для реєстру npm",
diff --git a/lunaria/files/zh-CN.json b/lunaria/files/zh-CN.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - 更好的 npm 仓库浏览工具",
diff --git a/lunaria/files/zh-TW.json b/lunaria/files/zh-TW.json
@@ -1,5 +1,4 @@
 {
-  "$schema": "../schema.json",
   "seo": {
     "home": {
       "title": "npmx - 更好的 npm 套件註冊表瀏覽工具",
diff --git a/lunaria/prepare-json-files.ts b/lunaria/prepare-json-files.ts
@@ -39,49 +39,45 @@ export async function prepareJsonFiles(): Promise<void> {
 
 type NestedObject = Record<string, unknown>
 
-export async function mergeLocaleObject(
-  locale: LocaleObject,
-  options: { copy?: boolean } = {},
-): Promise<NestedObject | undefined> {
-  const { copy = false } = options
+export async function mergeLocaleObject(locale: LocaleObject): Promise<NestedObject | undefined> {
   const files = locale.files ?? []
   if (locale.file || files.length === 1) {
     const json =
       (locale.file ? getFileName(locale.file) : undefined) ??
       (files[0] ? getFileName(files[0]) : undefined)
     if (!json) return undefined
-    if (copy) {
-      await fs.cp(path.resolve(`${localesFolder}/${json}`), path.resolve(`${destFolder}/${json}`))
-      return undefined
-    }
 
-    return await loadJsonFile<NestedObject>(json)
+    return await loadLocaleSourceJson<NestedObject>(json)
   }
 
   const firstFile = files[0]
   if (!firstFile) return undefined
-  const source = await loadJsonFile<NestedObject>(getFileName(firstFile))
+  const source = await loadLocaleSourceJson<NestedObject>(getFileName(firstFile))
   let currentSource: unknown
   for (let i = 1; i < files.length; i++) {
     const file = files[i]
     if (!file) continue
-    currentSource = await loadJsonFile(getFileName(file))
+    currentSource = await loadLocaleSourceJson(getFileName(file))
     deepCopy(currentSource, source)
   }
 
   return source
 }
 
-async function loadJsonFile<T = unknown>(name: string): Promise<T> {
-  return JSON.parse(await fs.readFile(path.resolve(`${localesFolder}/${name}`), 'utf8'))
+async function loadLocaleSourceJson<T = unknown>(name: string): Promise<T> {
+  const rawJson = JSON.parse(await fs.readFile(path.resolve(`${localesFolder}/${name}`), 'utf8'))
+  // Exclude $schema since it isn't useful in generated files and the relative path
+  // would be wrong anyway
+  const { $schema: _, ...rest } = rawJson
+  return rest
 }
 
 function getFileName(file: string | { path: string }): string {
   return typeof file === 'string' ? file : file.path
 }
 
 async function mergeLocale(locale: LocaleObject): Promise<void> {
-  const source = await mergeLocaleObject(locale, { copy: true })
+  const source = await mergeLocaleObject(locale)
   if (!source) {
     return
   }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{`
`2`		`- "$schema": "../schema.json",`
`3`	`2`	`"seo": {`
`4`	`3`	`"home": {`
`5`	`4`	`"title": "npmx - متصفح الحزم لسجل npm",`