@karmaniverous/get-dotenv 0.3.4-3 → 1.0.0-0

package/README.md

@@ -46,17 +46,21 @@ See [OptionsType](#optionstype--object) below for configuration options.
 
 This package supports the full [`dotenv-expand`](https://www.npmjs.com/package/dotenv-expand) syntax.
 
-For the async form only (`getDotenv`, not `getDotenvSync), use the `dynamicPath` option to add a relative path to a module with a default export like this:
+Yse the `dynamicPath` option to add a relative path to a Javascript file with a function expression like this:
 
 ```js
-export default {
+(dotenv) => ({
   SOME_DYNAMIC_VARIABLE: (dotenv) => someLogic(dotenv),
   ANOTHER_DYNAMIC_VARIABLE: (dotenv) =>
     someOtherLogic(dotenv.SOME_DYNAMIC_VARIABLE),
-};
+});
 ```
 
-Each function takes the current `dotenv` variable package as an argument. These variables will be processed progressively, meaning each successive one will have access to the previous ones. They can also override existing variables.
+This function should take the expanded `dotenv` object as an argument and return an object. Each object key will be evaluated progressively.
+
+If the corresponding value is a function, it will be executed with the current state of `dotenv` as its single argument and the result applied back to the `dotenv` object. Otherwise, the value will just be applied back to `dotenv`.
+
+Since keys will be evaluated progressively, each successive key function will have access to any previous ones. These keys can also override existing variables.
 
 # Command Line Interface
 

package/dist/default/lib/getDotenv/getDotenv.js

@@ -4,13 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getDotenvSync = exports.getDotenv = void 0;
-var _path = _interopRequireDefault(require("path"));
 var _dotenvExpand = require("dotenv-expand");
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _path = _interopRequireDefault(require("path"));
 var _readDotenv = require("../readDotEnv/readDotenv.js");
-var _dirname2 = _interopRequireDefault(require("./dirname.js"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+// npm imports
+
+// lib imports
+
 /**
  * get-dotenv options type
  *
@@ -72,31 +74,7 @@ const getDotenv = async function () {
 
   // Process dynamic variables.
   if (dynamicPath) {
-    const {
-      default: dynamic
-    } = await Promise.resolve(`${function transformExtension(filepath, extMapping) {
-      if (!filepath.startsWith('./') && !filepath.startsWith('../')) {
-        // Package import
-        return filepath;
-      }
-      const idx = filepath.lastIndexOf('.');
-      if (idx === -1 || filepath.includes('/', idx)) {
-        // No extension
-        const newExt = extMapping[''];
-        if (newExt) {
-          return filepath + newExt;
-        }
-        return filepath;
-      }
-      for (let [origExt, newExt] of Object.entries(extMapping).sort((a, b) => b[0].length - a[0].length)) {
-        if (filepath.endsWith(origExt)) {
-          return filepath.slice(0, -origExt.length) + newExt;
-        }
-      }
-      return filepath;
-    }(_path.default.relative(_dirname2.default, dynamicPath).replace(/\\/g, '/'), {
-      ".cjs": ".js"
-    })}`).then(s => _interopRequireWildcard(require(s)));
+    const dynamic = new Function(`return ${(await _fsExtra.default.readFile(dynamicPath)).toString()}`)()(dotenv);
     Object.keys(dynamic).forEach(key => {
       Object.assign(dotenv, {
         [key]: dynamic[key](dotenv)
@@ -155,8 +133,15 @@ const getDotenvSync = function () {
   });
   if (error) throw new Error(error);
 
-  // Throw error if dynamicPath is set.
-  if (dynamicPath) throw new Error('dynamicPath not supported in sync mode');
+  // Process dynamic variables.
+  if (dynamicPath) {
+    const dynamic = new Function(`return ${_fsExtra.default.readFileSync(dynamicPath).toString()}`)()(dotenv);
+    Object.keys(dynamic).forEach(key => {
+      Object.assign(dotenv, {
+        [key]: typeof dynamic[key] === 'function' ? dynamic[key](dotenv) : dynamic[key]
+      });
+    });
+  }
 
   // Log result.
   if (log) console.log(dotenv);

package/lib/getDotenv/getDotenv.js

@@ -1,7 +1,10 @@
-import path from 'path';
+// npm imports
 import { expand } from 'dotenv-expand';
+import fs from 'fs-extra';
+import path from 'path';
+
+// lib imports
 import { readDotenv, readDotenvSync } from '../readDotEnv/readDotenv.js';
-import __dirname from './dirname.cjs';
 
 /**
  * get-dotenv options type
@@ -77,10 +80,9 @@ export const getDotenv = async ({
 
   // Process dynamic variables.
   if (dynamicPath) {
-    const { default: dynamic } = await import(
-      path.relative(__dirname, dynamicPath).replace(/\\/g, '/')
-    );
-
+    const dynamic = new Function(
+      `return ${(await fs.readFile(dynamicPath)).toString()}`
+    )()(dotenv);
     Object.keys(dynamic).forEach((key) => {
       Object.assign(dotenv, { [key]: dynamic[key](dotenv) });
     });
@@ -150,8 +152,20 @@ export const getDotenvSync = ({
 
   if (error) throw new Error(error);
 
-  // Throw error if dynamicPath is set.
-  if (dynamicPath) throw new Error('dynamicPath not supported in sync mode');
+  // Process dynamic variables.
+  if (dynamicPath) {
+    const dynamic = new Function(
+      `return ${fs.readFileSync(dynamicPath).toString()}`
+    )()(dotenv);
+    Object.keys(dynamic).forEach((key) => {
+      Object.assign(dotenv, {
+        [key]:
+          typeof dynamic[key] === 'function'
+            ? dynamic[key](dotenv)
+            : dynamic[key],
+      });
+    });
+  }
 
   // Log result.
   if (log) console.log(dotenv);

package/package.json

@@ -3,7 +3,7 @@
   "bin": {
     "getdotenv": "bin/getdotenv/index.js"
   },
-  "version": "0.3.4-3",
+  "version": "1.0.0-0",
   "publishConfig": {
     "access": "public"
   },
@@ -46,7 +46,6 @@
     "@babel/preset-env": "^7.20.2",
     "@babel/register": "^7.21.0",
     "@types/node": "^18.15.3",
-    "babel-plugin-replace-import-extension": "^1.1.3",
     "chai": "^4.3.7",
     "concat-md": "^0.5.1",
     "eslint": "^8.36.0",

package/dist/default/lib/getDotenv/dirname.js

@@ -1,3 +0,0 @@
-"use strict";
-
-module.exports = __dirname;

package/lib/getDotenv/dirname.cjs

@@ -1 +0,0 @@
-module.exports = __dirname;