@karmaniverous/get-dotenv 4.2.3 → 4.3.0

package/README.md

@@ -60,7 +60,7 @@ See the [GetDotenvOptions](./src/GetDotenvOptions.ts) type for descriptions of a
 
 This package supports the full [`dotenv-expand`](https://www.npmjs.com/package/dotenv-expand) syntax, with some internal performance improvements.
 
-Use the `dynamicPath` option to add a relative path to a Javascript file with a default export like this:
+Use the `dynamicPath` option to add a relative path to a Javascript module with a default export like this:
 
 ```js
 export default {
@@ -72,10 +72,29 @@ export default {
 };
 ```
 
-If the value corresponding to a key 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`.
+If the value corresponding to a key 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`. (Although if you're going to do that then you might as well just create a public global variable in the first place.)
 
 Since keys will be evaluated progressively, each successive key function will have access to any previous ones. These keys can also override existing variables.
 
+### Dynamic Processing with TypeScript
+
+Even though the rest of your project is in TypeScript, the dynamic processing module SHOULD be in JavasScript.
+
+Think about it: the module is loaded via a dynamic import, with the file name determined at run time. You will have to jump through some hoops to get your bundler to compile this file, and you'll have to be careful to set `dynamicPath` to reference the compiled file. That's a lot of work for some very simple log.
+
+BUT... if you must, then your dynamic module's default export should be of the `GetDotenvDynamic` type, which is defined [here](./src/GetDotenvOptions.ts) and looks like this:
+
+```ts
+export type ProcessEnv = Record<string, string | undefined>;
+
+export type GetDotenvDynamicFunction = (vars: ProcessEnv) => string | undefined;
+
+export type GetDotenvDynamic = Record<
+  string,
+  GetDotenvDynamicFunction | ReturnType<GetDotenvDynamicFunction>
+>;
+```
+
 ## Command Line Interface
 
 You can also use `getdotenv` from the command line:

package/dist/getdotenv.cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import require$$0 from 'events';
 import require$$1 from 'child_process';
-import require$$0$1 from 'path';
+import require$$0$1, { join } from 'path';
 import require$$0$2 from 'fs';
 import require$$4$1 from 'process';
 import { fileURLToPath } from 'node:url';
@@ -23,7 +23,7 @@ import require$$0$4 from 'stream';
 import require$$0$5 from 'util';
 import require$$5 from 'assert';
 import { webcrypto } from 'node:crypto';
-import url, { resolve as resolve$1, fileURLToPath as fileURLToPath$1 } from 'url';
+import url, { fileURLToPath as fileURLToPath$1 } from 'url';
 import fsPromises from 'node:fs/promises';
 import require$$2 from 'os';
 import require$$3 from 'crypto';
@@ -30905,7 +30905,7 @@ const getDotenvCliOptions2Options = ({ paths, pathsDelimiter, pathsDelimiterPatt
 const resolveGetDotenvOptions = async (customOptions) => {
     const localPkgDir = await packageDirectory();
     const localOptionsPath = localPkgDir
-        ? resolve$1(localPkgDir, getDotenvOptionsFilename)
+        ? join(localPkgDir, getDotenvOptionsFilename)
         : undefined;
     const localOptions = (localOptionsPath && (await fs$a.exists(localOptionsPath))
         ? JSON.parse((await fs$a.readFile(localOptionsPath)).toString())
@@ -39227,7 +39227,6 @@ const execShellCommandBatch = async ({ command, globs, ignoreErrors, list, logge
     logger.info(headerRootPath);
     logger.info(headerGlobs);
     logger.info(headerCommand);
-    logger.info('');
     for (const path of paths) {
         // Write path and command to console.
         const pathLabel = `CWD:   ${path}`;
@@ -39238,7 +39237,7 @@ const execShellCommandBatch = async ({ command, globs, ignoreErrors, list, logge
         logger.info('');
         logger.info('*'.repeat(pathLabel.length));
         logger.info(pathLabel);
-        logger.info('');
+        logger.info(headerCommand);
         // Execute shell command.
         try {
             await execaCommand(command, {
@@ -39354,14 +39353,14 @@ const resolveGetDotenvCliGenerateOptions = async ({ importMetaUrl, ...customOpti
         })
         : undefined;
     const globalOptionsPath = globalPkgDir
-        ? resolve$1(globalPkgDir, getDotenvOptionsFilename)
+        ? join(globalPkgDir, getDotenvOptionsFilename)
         : undefined;
     const globalOptions = (globalOptionsPath && (await fs$a.exists(globalOptionsPath))
         ? JSON.parse((await fs$a.readFile(globalOptionsPath)).toString())
         : {});
     const localPkgDir = await packageDirectory();
     const localOptionsPath = localPkgDir
-        ? resolve$1(localPkgDir, getDotenvOptionsFilename)
+        ? join(localPkgDir, getDotenvOptionsFilename)
         : undefined;
     const localOptions = (localOptionsPath &&
         localOptionsPath !== globalOptionsPath &&

package/dist/index.cjs

@@ -30906,7 +30906,7 @@ const getDotenvCliOptions2Options = ({ paths, pathsDelimiter, pathsDelimiterPatt
 const resolveGetDotenvOptions = async (customOptions) => {
     const localPkgDir = await packageDirectory();
     const localOptionsPath = localPkgDir
-        ? url.resolve(localPkgDir, getDotenvOptionsFilename)
+        ? require$$0$1.join(localPkgDir, getDotenvOptionsFilename)
         : undefined;
     const localOptions = (localOptionsPath && (await fs$a.exists(localOptionsPath))
         ? JSON.parse((await fs$a.readFile(localOptionsPath)).toString())
@@ -39228,7 +39228,6 @@ const execShellCommandBatch = async ({ command, globs, ignoreErrors, list, logge
     logger.info(headerRootPath);
     logger.info(headerGlobs);
     logger.info(headerCommand);
-    logger.info('');
     for (const path of paths) {
         // Write path and command to console.
         const pathLabel = `CWD:   ${path}`;
@@ -39239,7 +39238,7 @@ const execShellCommandBatch = async ({ command, globs, ignoreErrors, list, logge
         logger.info('');
         logger.info('*'.repeat(pathLabel.length));
         logger.info(pathLabel);
-        logger.info('');
+        logger.info(headerCommand);
         // Execute shell command.
         try {
             await execaCommand(command, {
@@ -39355,14 +39354,14 @@ const resolveGetDotenvCliGenerateOptions = async ({ importMetaUrl, ...customOpti
         })
         : undefined;
     const globalOptionsPath = globalPkgDir
-        ? url.resolve(globalPkgDir, getDotenvOptionsFilename)
+        ? require$$0$1.join(globalPkgDir, getDotenvOptionsFilename)
         : undefined;
     const globalOptions = (globalOptionsPath && (await fs$a.exists(globalOptionsPath))
         ? JSON.parse((await fs$a.readFile(globalOptionsPath)).toString())
         : {});
     const localPkgDir = await packageDirectory();
     const localOptionsPath = localPkgDir
-        ? url.resolve(localPkgDir, getDotenvOptionsFilename)
+        ? require$$0$1.join(localPkgDir, getDotenvOptionsFilename)
         : undefined;
     const localOptions = (localOptionsPath &&
         localOptionsPath !== globalOptionsPath &&
@@ -39510,3 +39509,4 @@ exports.dotenvExpandAll = dotenvExpandAll;
 exports.dotenvExpandFromProcessEnv = dotenvExpandFromProcessEnv;
 exports.generateGetDotenvCli = generateGetDotenvCli;
 exports.getDotenv = getDotenv;
+exports.getDotenvCliOptions2Options = getDotenvCliOptions2Options;

package/dist/index.d.cts

@@ -126,6 +126,14 @@ interface GetDotenvOptions {
      */
     vars?: ProcessEnv;
 }
+/**
+ * Converts programmatic CLI options to `getDotenv` options.
+ *
+ * @param cliOptions - CLI options. Defaults to `{}`.
+ *
+ * @returns `getDotenv` options.
+ */
+declare const getDotenvCliOptions2Options: ({ paths, pathsDelimiter, pathsDelimiterPattern, vars, varsAssignor, varsAssignorPattern, varsDelimiter, varsDelimiterPattern, ...rest }: GetDotenvCliOptions) => GetDotenvOptions;
 
 /**
  * Recursively expands environment variables in a string. Variables may be
@@ -220,4 +228,4 @@ declare const generateGetDotenvCli: (customOptions: Pick<GetDotenvCliGenerateOpt
  */
 declare const getDotenv: (options?: Partial<GetDotenvOptions>) => Promise<ProcessEnv>;
 
-export { type GetDotenvDynamic, type GetDotenvOptions, type ProcessEnv, dotenvExpand, dotenvExpandAll, dotenvExpandFromProcessEnv, generateGetDotenvCli, getDotenv };
+export { type GetDotenvDynamic, type GetDotenvOptions, type ProcessEnv, dotenvExpand, dotenvExpandAll, dotenvExpandFromProcessEnv, generateGetDotenvCli, getDotenv, getDotenvCliOptions2Options };

package/dist/index.d.mts

@@ -126,6 +126,14 @@ interface GetDotenvOptions {
      */
     vars?: ProcessEnv;
 }
+/**
+ * Converts programmatic CLI options to `getDotenv` options.
+ *
+ * @param cliOptions - CLI options. Defaults to `{}`.
+ *
+ * @returns `getDotenv` options.
+ */
+declare const getDotenvCliOptions2Options: ({ paths, pathsDelimiter, pathsDelimiterPattern, vars, varsAssignor, varsAssignorPattern, varsDelimiter, varsDelimiterPattern, ...rest }: GetDotenvCliOptions) => GetDotenvOptions;
 
 /**
  * Recursively expands environment variables in a string. Variables may be
@@ -220,4 +228,4 @@ declare const generateGetDotenvCli: (customOptions: Pick<GetDotenvCliGenerateOpt
  */
 declare const getDotenv: (options?: Partial<GetDotenvOptions>) => Promise<ProcessEnv>;
 
-export { type GetDotenvDynamic, type GetDotenvOptions, type ProcessEnv, dotenvExpand, dotenvExpandAll, dotenvExpandFromProcessEnv, generateGetDotenvCli, getDotenv };
+export { type GetDotenvDynamic, type GetDotenvOptions, type ProcessEnv, dotenvExpand, dotenvExpandAll, dotenvExpandFromProcessEnv, generateGetDotenvCli, getDotenv, getDotenvCliOptions2Options };

package/dist/index.d.ts

@@ -126,6 +126,14 @@ interface GetDotenvOptions {
      */
     vars?: ProcessEnv;
 }
+/**
+ * Converts programmatic CLI options to `getDotenv` options.
+ *
+ * @param cliOptions - CLI options. Defaults to `{}`.
+ *
+ * @returns `getDotenv` options.
+ */
+declare const getDotenvCliOptions2Options: ({ paths, pathsDelimiter, pathsDelimiterPattern, vars, varsAssignor, varsAssignorPattern, varsDelimiter, varsDelimiterPattern, ...rest }: GetDotenvCliOptions) => GetDotenvOptions;
 
 /**
  * Recursively expands environment variables in a string. Variables may be
@@ -220,4 +228,4 @@ declare const generateGetDotenvCli: (customOptions: Pick<GetDotenvCliGenerateOpt
  */
 declare const getDotenv: (options?: Partial<GetDotenvOptions>) => Promise<ProcessEnv>;
 
-export { type GetDotenvDynamic, type GetDotenvOptions, type ProcessEnv, dotenvExpand, dotenvExpandAll, dotenvExpandFromProcessEnv, generateGetDotenvCli, getDotenv };
+export { type GetDotenvDynamic, type GetDotenvOptions, type ProcessEnv, dotenvExpand, dotenvExpandAll, dotenvExpandFromProcessEnv, generateGetDotenvCli, getDotenv, getDotenvCliOptions2Options };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import require$$0 from 'events';
 import require$$1 from 'child_process';
-import require$$0$1 from 'path';
+import require$$0$1, { join } from 'path';
 import require$$0$2 from 'fs';
 import require$$4$1 from 'process';
 import { fileURLToPath } from 'node:url';
@@ -22,7 +22,7 @@ import require$$0$4 from 'stream';
 import require$$0$5 from 'util';
 import require$$5 from 'assert';
 import { webcrypto } from 'node:crypto';
-import url, { resolve as resolve$1, fileURLToPath as fileURLToPath$1 } from 'url';
+import url, { fileURLToPath as fileURLToPath$1 } from 'url';
 import fsPromises from 'node:fs/promises';
 import require$$2 from 'os';
 import require$$3 from 'crypto';
@@ -30904,7 +30904,7 @@ const getDotenvCliOptions2Options = ({ paths, pathsDelimiter, pathsDelimiterPatt
 const resolveGetDotenvOptions = async (customOptions) => {
     const localPkgDir = await packageDirectory();
     const localOptionsPath = localPkgDir
-        ? resolve$1(localPkgDir, getDotenvOptionsFilename)
+        ? join(localPkgDir, getDotenvOptionsFilename)
         : undefined;
     const localOptions = (localOptionsPath && (await fs$a.exists(localOptionsPath))
         ? JSON.parse((await fs$a.readFile(localOptionsPath)).toString())
@@ -39226,7 +39226,6 @@ const execShellCommandBatch = async ({ command, globs, ignoreErrors, list, logge
     logger.info(headerRootPath);
     logger.info(headerGlobs);
     logger.info(headerCommand);
-    logger.info('');
     for (const path of paths) {
         // Write path and command to console.
         const pathLabel = `CWD:   ${path}`;
@@ -39237,7 +39236,7 @@ const execShellCommandBatch = async ({ command, globs, ignoreErrors, list, logge
         logger.info('');
         logger.info('*'.repeat(pathLabel.length));
         logger.info(pathLabel);
-        logger.info('');
+        logger.info(headerCommand);
         // Execute shell command.
         try {
             await execaCommand(command, {
@@ -39353,14 +39352,14 @@ const resolveGetDotenvCliGenerateOptions = async ({ importMetaUrl, ...customOpti
         })
         : undefined;
     const globalOptionsPath = globalPkgDir
-        ? resolve$1(globalPkgDir, getDotenvOptionsFilename)
+        ? join(globalPkgDir, getDotenvOptionsFilename)
         : undefined;
     const globalOptions = (globalOptionsPath && (await fs$a.exists(globalOptionsPath))
         ? JSON.parse((await fs$a.readFile(globalOptionsPath)).toString())
         : {});
     const localPkgDir = await packageDirectory();
     const localOptionsPath = localPkgDir
-        ? resolve$1(localPkgDir, getDotenvOptionsFilename)
+        ? join(localPkgDir, getDotenvOptionsFilename)
         : undefined;
     const localOptions = (localOptionsPath &&
         localOptionsPath !== globalOptionsPath &&
@@ -39503,4 +39502,4 @@ const generateGetDotenvCli = async (customOptions) => {
     });
 };
 
-export { dotenvExpand, dotenvExpandAll, dotenvExpandFromProcessEnv, generateGetDotenvCli, getDotenv };
+export { dotenvExpand, dotenvExpandAll, dotenvExpandFromProcessEnv, generateGetDotenvCli, getDotenv, getDotenvCliOptions2Options };

package/package.json

@@ -131,5 +131,5 @@
   },
   "type": "module",
   "types": "dist/index.d.ts",
-  "version": "4.2.3"
+  "version": "4.3.0"
 }