Better build

bin/clean.mjs

@@ -1,20 +1,20 @@
 //!/usr/bin/env node
-import fs from 'fs'
+import fs from "node:fs";
 
 const libDirectoryPath = "./lib";
 
-console.log(`🗑️ Removing old files from ${libDirectoryPath}`);
+console.log(`🗑 Removing old files from ${libDirectoryPath}`);
 
 //check if the directory exists
 if (!fs.existsSync(libDirectoryPath)) {
-    console.log("Directory not found... skipping");
+	console.log("Directory not found... skipping");
 } else {
-    await fs.rm(libDirectoryPath, { recursive: true, force: true }, (err) => {
-        if (err) {
-            // File deletion failed
-            console.error(err.message)
-            return
-        }
-        console.log(`Directory ${libDirectoryPath} deleted successfully`)
-    })
+	await fs.rm(libDirectoryPath, { recursive: true, force: true }, (err) => {
+		if (err) {
+			// File deletion failed
+			console.error(err.message);
+			return;
+		}
+		console.log(`Directory ${libDirectoryPath} deleted successfully`);
+	});
 }

package.json

@@ -32,15 +32,7 @@
 		"ISO 3166-1",
 		"language tag"
 	],
-	"files": [
-		"lib/",
-		"tests/",
-		"*.json",
-		".gitignore",
-		".eslintrc.js",
-		"LICENSE",
-		"README.md"
-	],
+	"files": ["lib/", "tests/", "*.json", ".gitignore", "LICENSE", "*.md"],
 	"author": "Erik Golinelli <https://github.com/erikyo>",
 	"repository": {
 		"type": "git",
@@ -66,12 +58,13 @@
 	},
 	"scripts": {
 		"prepare": "husky install",
-		"lint": "npx @biomejs/biome check --apply src tests",
+		"lint": "npx @biomejs/biome check --apply src tests/*.ts",
 		"clean": "node bin/clean.mjs",
 		"watch": "npx esbuild src/index.ts --outfile=lib/browser/isoToLanguage.js --global-name=isoToLanguage --allow-overwrite --watch --bundle --sourcemap",
-		"build": "pnpm run clean && concurrently pnpm:build-* ",
-		"build-node": "tsup src/**/*.ts lib",
-		"build-browser": "npx esbuild src/index.ts --outfile=lib/browser/isoToLanguage.js --global-name=isoToLanguage  --allow-overwrite --bundle --minify --sourcemap",
+		"build": "pnpm run clean && concurrently pnpm:build-*",
+		"build-node": "tsup",
+		"build-dataset": "esbuild src/data/*.ts --outdir=lib/data/ --minify",
+		"build-browser": "esbuild src/index.ts --outfile=lib/browser/isoToLanguage.js --global-name=isoToLanguage  --allow-overwrite --bundle --minify --sourcemap",
 		"test": "vitest --coverage"
 	},
 	"tsup": {
@@ -80,14 +73,13 @@
 		"bundle": false,
 		"treeshake": true,
 		"minify": true,
-		"clean": true,
 		"shims": true,
 		"cjsInterop": true,
 		"target": "node16",
 		"moduleName": "isoToLanguage",
 		"format": ["esm", "cjs"],
 		"tsconfig": "./tsconfig.json",
-		"entry": ["src/**/*.ts"],
+		"entry": ["src/*.ts"],
 		"outDir": "lib"
 	}
 }

src/data/countries-iso.ts

@@ -134,7 +134,7 @@ export const countriesIso = {
 	BH: {
 		languages: ["ar"],
 		name: "Bahrain",
-		original: "‏البحرين",
+		original: "البحرين",
 		iso3: "BHR",
 	},
 	BI: {
@@ -212,7 +212,7 @@ export const countriesIso = {
 	BY: {
 		languages: ["be", "ru"],
 		name: "Belarus",
-		original: "Белару́сь",
+		original: "Беларусь",
 		iso3: "BLR",
 	},
 	BZ: {
@@ -386,7 +386,7 @@ export const countriesIso = {
 	EG: {
 		languages: ["ar"],
 		name: "Egypt",
-		original: "مصر‎",
+		original: "مصر�",
 		iso3: "EGY",
 	},
 	EH: {
@@ -614,7 +614,7 @@ export const countriesIso = {
 	IL: {
 		languages: ["he", "ar"],
 		name: "Israel",
-		original: "יִשְׂרָאֵל",
+		original: "ישראל",
 		iso3: "ISR",
 	},
 	IM: {
@@ -626,7 +626,7 @@ export const countriesIso = {
 	IN: {
 		languages: ["hi", "en"],
 		name: "India",
-		original: "भारत",
+		original: "भरत",
 		iso3: "IND",
 	},
 	IO: {
@@ -812,7 +812,7 @@ export const countriesIso = {
 	LY: {
 		languages: ["ar"],
 		name: "Libya",
-		original: "‏ليبيا",
+		original: "ليبيا",
 		iso3: "LBY",
 	},
 	MA: {
@@ -854,7 +854,7 @@ export const countriesIso = {
 	MH: {
 		languages: ["en", "mh"],
 		name: "Marshall Islands",
-		original: "M̧ajeļ",
+		original: "Majeļ",
 		iso3: "MHL",
 	},
 	MK: {
@@ -872,7 +872,7 @@ export const countriesIso = {
 	MM: {
 		languages: ["my"],
 		name: "Myanmar (Burma)",
-		original: "မြန်မာ",
+		original: "မနမာ",
 		iso3: "MMR",
 	},
 	MN: {
@@ -1004,7 +1004,7 @@ export const countriesIso = {
 	NP: {
 		languages: ["ne"],
 		name: "Nepal",
-		original: "नेपाल",
+		original: "नपल",
 		iso3: "NPL",
 	},
 	NR: {
@@ -1472,7 +1472,7 @@ export const countriesIso = {
 	YE: {
 		languages: ["ar"],
 		name: "Yemen",
-		original: "اليَمَن",
+		original: "اليمن",
 		iso3: "YEM",
 	},
 	YT: {

src/getCountry.ts

@@ -121,27 +121,25 @@ export function getCountry(
 			}
 
 			if (fields.includes("locale")) {
-				const localeCode = country.languages.map(
+				countryData.locale = country.languages.map(
 					(langIso) =>
 						formatIso(
 							langIso as ISOLangCode,
 							countryIso as ISOCountryCode,
 							"locale",
 						) ?? countryIso,
 				) as string[];
-				countryData.locale = localeCode;
 			}
 
 			if (fields.includes("language-code")) {
-				const isoCodes = country.languages?.map(
+				countryData["language-code"] = country.languages?.map(
 					(langIso) =>
 						formatIso(
 							langIso as ISOLangCode,
 							countryIso as ISOCountryCode,
 							"language-code",
 						) ?? countryIso,
 				) as string[];
-				countryData["language-code"] = isoCodes;
 			}
 
 			// If the requested fields is the code, return the iso country code

src/getKeyValue.ts

@@ -20,9 +20,11 @@ export function getKeyValue(
 	const unpackData = (data: unknown, field?: string): string[] => {
 		if (typeof data === "string") {
 			return [data];
-		} else if (Array.isArray(data)) {
+		}
+		if (Array.isArray(data)) {
 			return data.flatMap((item) => unpackData(item, field));
-		} else if (typeof data === "object" && data !== null) {
+		}
+		if (typeof data === "object" && data !== null) {
 			if (field && field in data) {
 				return [data[field as keyof typeof data]];
 			}

src/getLanguage.ts

@@ -44,7 +44,8 @@ export function getLanguage(
 			// if the fields are iso, return the isoCode otherwise create the array of fields to return
 			if (fields === "iso2") {
 				return isoCode;
-			} else if (fields === "all") {
+			}
+			if (fields === "all") {
 				fields = ["iso2", "name", "original", "iso3"];
 			} else if (typeof fields === "string") {
 				fields = [fields as LanguageDataFields];
@@ -54,14 +55,13 @@ export function getLanguage(
 			const collected: Partial<LanguageData> = {};
 			if (Object.keys(fields).length === 1) {
 				return language[Object.values(fields)[0] as LanguageFields];
-			} else {
-				for (const field of fields) {
-					const key = field;
-					if (key === "iso2") {
-						collected["iso2"] = isoCode as ISOLangCode;
-					} else {
-						collected[key as LanguageFields] = language[key as LanguageFields];
-					}
+			}
+			for (const field of fields) {
+				const key = field;
+				if (key === "iso2") {
+					collected.iso2 = isoCode as ISOLangCode;
+				} else {
+					collected[key as LanguageFields] = language[key as LanguageFields];
 				}
 			}
 

tests/iso.test.ts

@@ -107,7 +107,7 @@ describe("ISO", () => {
 	it("should return a field for the provided original name", () => {
 		const isoCode = "Italia";
 		const result = getIso(isoCode, "country", "name");
-		const expectedOriginal = countriesIso["IT"].name;
+		const expectedOriginal = countriesIso.IT.name;
 
 		expect(result).toEqual(expectedOriginal);
 	});

tsconfig.json

@@ -1,36 +1,29 @@
 {
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "ES2022",
-    "moduleResolution": "node",    // Search under node_modules for non-relative imports.
-    // Process & infer types from .js files.
-    "pretty": true,
-    "sourceMap": true,
-    "strict": true, // Enable the strictest settings like strictNullChecks & noImplicitAny.
-    "isolatedModules": true, // Disallow features that require cross-file information for emitting.
-    "allowSyntheticDefaultImports": true,
-    "skipLibCheck": true,
-    "noImplicitAny": true,
-    "strictNullChecks": true,
-    "declaration": true,
-    "forceConsistentCasingInFileNames": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "esModuleInterop": true,
-    // "verbatimModuleSyntax": true,
-    "typeRoots": [
-      "node_modules/@types/"
-    ]
-  },
-  "include": [
-    "src/**/*"
-  ],
-  "exclude": [
-    "node_modules",
-    "coverage",
-    "docs",
-    "example",
-    "lib",
-    "src/isoToLanguage.ts"
-  ]
+	"compilerOptions": {
+		"target": "ES2022",
+		"module": "ES2022",
+		"moduleResolution": "node",
+		"pretty": true,
+		"sourceMap": true,
+		"strict": true,
+		"isolatedModules": true,
+		"allowSyntheticDefaultImports": true,
+		"skipLibCheck": true,
+		"noImplicitAny": true,
+		"strictNullChecks": true,
+		"declaration": true,
+		"forceConsistentCasingInFileNames": true,
+		"rootDir": "src",
+		"outDir": "lib",
+		"esModuleInterop": true
+	},
+	"include": ["src/**/*", "data/**/*"],
+	"exclude": [
+		"node_modules",
+		"coverage",
+		"docs",
+		"example",
+		"lib",
+		"src/isoToLanguage.ts"
+	]
 }