fix(file-url): fix file path to conform to ES module requirements

toddbluhm · Dec 3, 2024 · a3c908b · a3c908b
1 parent 7eae0da
commit a3c908b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/dist/parse-env-file.js b/dist/parse-env-file.js
@@ -1,26 +1,27 @@
-import * as fs from 'fs';
-import * as path from 'path';
+import { existsSync, readFileSync } from 'node:fs';
+import { extname } from 'node:path';
+import { pathToFileURL } from 'node:url';
 import { resolveEnvFilePath, IMPORT_HOOK_EXTENSIONS, isPromise } from './utils.js';
 /**
  * Gets the environment vars from an env file
  */
 export async function getEnvFileVars(envFilePath) {
     const absolutePath = resolveEnvFilePath(envFilePath);
-    if (!fs.existsSync(absolutePath)) {
+    if (!existsSync(absolutePath)) {
         const pathError = new Error(`Invalid env file path (${envFilePath}).`);
         pathError.name = 'PathError';
         throw pathError;
     }
     // Get the file extension
-    const ext = path.extname(absolutePath).toLowerCase();
+    const ext = extname(absolutePath).toLowerCase();
     let env = {};
     if (IMPORT_HOOK_EXTENSIONS.includes(ext)) {
         // For some reason in ES Modules, only JSON file types need to be specifically delinated when importing them
         let attributeTypes = {};
         if (ext === '.json') {
             attributeTypes = { with: { type: 'json' } };
         }
-        const res = await import(absolutePath, attributeTypes);
+        const res = await import(pathToFileURL(absolutePath).href, attributeTypes);
         if ('default' in res) {
             env = res.default;
         }
@@ -33,7 +34,7 @@ export async function getEnvFileVars(envFilePath) {
         }
     }
     else {
-        const file = fs.readFileSync(absolutePath, { encoding: 'utf8' });
+        const file = readFileSync(absolutePath, { encoding: 'utf8' });
         env = parseEnvString(file);
     }
     return env;

diff --git a/dist/parse-rc-file.js b/dist/parse-rc-file.js
@@ -1,6 +1,7 @@
-import { stat, readFile } from 'fs';
-import { promisify } from 'util';
-import { extname } from 'path';
+import { stat, readFile } from 'node:fs';
+import { promisify } from 'node:util';
+import { extname } from 'node:path';
+import { pathToFileURL } from 'node:url';
 import { resolveEnvFilePath, IMPORT_HOOK_EXTENSIONS, isPromise } from './utils.js';
 const statAsync = promisify(stat);
 const readFileAsync = promisify(readFile);
@@ -27,7 +28,7 @@ export async function getRCFileVars({ environments, filePath }) {
             if (ext === '.json') {
                 attributeTypes = { with: { type: 'json' } };
             }
-            const res = await import(absolutePath, attributeTypes);
+            const res = await import(pathToFileURL(absolutePath).href, attributeTypes);
             if ('default' in res) {
                 parsedData = res.default;
             }

diff --git a/src/parse-env-file.ts b/src/parse-env-file.ts
@@ -1,5 +1,6 @@
-import * as fs from 'fs'
-import * as path from 'path'
+import { existsSync, readFileSync } from 'node:fs'
+import { extname } from 'node:path'
+import { pathToFileURL } from 'node:url'
 import { resolveEnvFilePath, IMPORT_HOOK_EXTENSIONS, isPromise } from './utils.js'
 import type { Environment } from './types.ts'
 
@@ -8,22 +9,22 @@ import type { Environment } from './types.ts'
  */
 export async function getEnvFileVars(envFilePath: string): Promise<Environment> {
   const absolutePath = resolveEnvFilePath(envFilePath)
-  if (!fs.existsSync(absolutePath)) {
+  if (!existsSync(absolutePath)) {
     const pathError = new Error(`Invalid env file path (${envFilePath}).`)
     pathError.name = 'PathError'
     throw pathError
   }
 
   // Get the file extension
-  const ext = path.extname(absolutePath).toLowerCase()
+  const ext = extname(absolutePath).toLowerCase()
   let env: Environment = {}
   if (IMPORT_HOOK_EXTENSIONS.includes(ext)) {
     // For some reason in ES Modules, only JSON file types need to be specifically delinated when importing them
     let attributeTypes = {}
     if (ext === '.json') {
       attributeTypes = { with: { type: 'json' } }
     }
-    const res = await import(absolutePath, attributeTypes) as Environment | { default: Environment }
+    const res = await import(pathToFileURL(absolutePath).href, attributeTypes) as Environment | { default: Environment }
     if ('default' in res) {
       env = res.default as Environment
     } else {
@@ -35,7 +36,7 @@ export async function getEnvFileVars(envFilePath: string): Promise<Environment>
     }
   }
   else {
-    const file = fs.readFileSync(absolutePath, { encoding: 'utf8' })
+    const file = readFileSync(absolutePath, { encoding: 'utf8' })
     env = parseEnvString(file)
   }
   return env

diff --git a/src/parse-rc-file.ts b/src/parse-rc-file.ts
@@ -1,6 +1,7 @@
-import { stat, readFile } from 'fs'
-import { promisify } from 'util'
-import { extname } from 'path'
+import { stat, readFile } from 'node:fs'
+import { promisify } from 'node:util'
+import { extname } from 'node:path'
+import { pathToFileURL } from 'node:url'
 import { resolveEnvFilePath, IMPORT_HOOK_EXTENSIONS, isPromise } from './utils.js'
 import type { Environment, RCEnvironment } from './types.ts'
 
@@ -34,7 +35,7 @@ export async function getRCFileVars(
       if (ext === '.json') {
         attributeTypes = { with: { type: 'json' } }
       }
-      const res = await import(absolutePath, attributeTypes) as RCEnvironment | { default: RCEnvironment }
+      const res = await import(pathToFileURL(absolutePath).href, attributeTypes) as RCEnvironment | { default: RCEnvironment }
       if ('default' in res) {
         parsedData = res.default as RCEnvironment
       } else {