Merge pull request #23 from Clifftech123/dev

Refactor package.json and package-lock.json: Update countrydata.js to…

Sample/TypeScript/package.json

@@ -1,19 +1,14 @@
 {
-  "name": "typescript",
+  "name": "typescript-sample",
   "version": "1.0.0",
-  "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "ts-node index.ts  "
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "description": "",
-  "devDependencies": {
-    "typescript": "^5.6.2"
+    "start": "ts-node index.ts"
   },
   "dependencies": {
     "countrydata.js": "^1.0.2"
+  },
+  "devDependencies": {
+    "ts-node": "^10.9.2",
+    "typescript": "^5.6.2"
   }
-}
+}

Sample/javascript/app.js

@@ -1,32 +1,56 @@
-import { CountryHelper } from 'countrydata.js';
+import { CountryHelper } from '.'; // Import the CountryHelper class
 
+// Create an instance of CountryHelper
 const countryHelper = new CountryHelper();
 
+/**
+ * Fetches and logs all countries.
+ */
 const getCountries = async () => {
   const allCountries = await countryHelper.getCountries();
   console.log(JSON.stringify(allCountries, null, 2));
 };
 
+/**
+ * Fetches and logs a country by its short code.
+ * @param {string} shortCode - The short code of the country (e.g., "US").
+ */
 const getCountryByShortCode = async (shortCode) => {
   const country = await countryHelper.getCountryByShortCode(shortCode);
   console.log(country);
 };
 
+/**
+ * Fetches and logs the regions of a country by its short code.
+ * @param {string} shortCode - The short code of the country (e.g., "US").
+ */
 const getRegionsByCountryShortCode = async (shortCode) => {
   const regions = await countryHelper.getRegionsByCountryShortCode(shortCode);
   console.log(regions);
 };
 
+/**
+ * Fetches and logs the flag emoji of a country by its short code.
+ * @param {string} shortCode - The short code of the country (e.g., "US").
+ */
 const getCountryFlag = async (shortCode) => {
   const country = await countryHelper.getCountryByShortCode(shortCode);
   console.log(country?.countryFlag);
 };
 
+/**
+ * Fetches and logs a country by its phone code.
+ * @param {string} phoneCode - The phone code of the country (e.g., "1" for the US).
+ */
 const getCountryByPhoneCode = async (phoneCode) => {
   const country = await countryHelper.getCountryByPhoneCode(phoneCode);
   console.log(country);
 };
 
+/**
+ * Fetches and logs the phone code of a country by its short code.
+ * @param {string} shortCode - The short code of the country (e.g., "US").
+ */
 const getCountryPhoneCodeByShortCode = async (shortCode) => {
   const phoneCode = await countryHelper.getCountryPhoneCodeByShortCode(shortCode);
   console.log(phoneCode);

Sample/javascript/package.json

@@ -6,6 +6,6 @@
     "dev": "node app.js"
   },
   "dependencies": {
-    "countrydata.js": "^1.0.2"
+    "countrydata.js": "^1.0.3"
   }
 }

package.json

@@ -35,7 +35,7 @@
     "src/data.json"
   ],
   "scripts": {
-    "build": "tsup && shx cp src/data.json dist/",
+    "build": "tsup",
     "format": "prettier --write .",
     "check-format": "prettier --check .",
     "release": "npm run build && changeset publish --access public",

src/utils.ts

@@ -12,8 +12,16 @@ export class CountryHelper {
   private loadingPromise: Promise<void> | null = null;
   private timeoutId: NodeJS.Timeout | null = null;
 
-  // Use import.meta.url to get the current file URL and convert it to a path
-  private static readonly fileName = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'src', 'data.json');
+  // Determine the file path based on the module system
+  private static readonly fileName = (() => {
+    if (typeof __dirname !== 'undefined') {
+      // CommonJS
+      return path.join(__dirname, '..', 'src', 'data.json');
+    } else {
+      // ESM
+      return path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'src', 'data.json');
+    }
+  })();
 
   /**
    * Initializes the CountryHelper instance and starts loading the country data.

tsconfig.json

@@ -1,3 +1,4 @@
+
 {
   "compilerOptions": {
     "esModuleInterop": true,
@@ -7,7 +8,7 @@
     "resolveJsonModule": true,
     "moduleDetection": "force",
     "isolatedModules": true,
-    "verbatimModuleSyntax": false, 
+    "verbatimModuleSyntax": false,
     "strict": true,
     "noUncheckedIndexedAccess": true,
     "noImplicitOverride": true,