@karmaniverous/get-dotenv 2.4.1 → 2.4.3

package/bin/getdotenv/index.js

@@ -2,12 +2,11 @@
 
 // Import npm packages.
 import spawn from 'cross-spawn';
-import branch from 'git-branch';
 import _ from 'lodash';
 import { parseArgsStringToArgv } from 'string-argv';
 
 // Import package exports.
-import { getDotenv } from '@karmaniverous/get-dotenv';
+import { getDotenv, parseBranch } from '@karmaniverous/get-dotenv';
 
 // Create CLI.
 import { program } from 'commander';
@@ -118,11 +117,12 @@ const {
 
 if (command && program.args.length) program.error('command specified twice');
 
+if (branchToDefault) {
+  var { envToken } = parseBranch();
+}
+
 // Get environment.
-const env =
-  environment ??
-  defaultEnvironment ??
-  (branchToDefault ? branch.sync() : undefined);
+const env = environment ?? envToken ?? defaultEnvironment;
 
 // Load dotenvs.
 await getDotenv({

package/dist/default/lib/{getDotenv/getDotenv.js → getDotenv.js}

@@ -8,7 +8,7 @@ var _dotenvExpand = require("dotenv-expand");
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _path = _interopRequireDefault(require("path"));
 var _uuid = require("uuid");
-var _readDotenv = require("../readDotEnv/readDotenv.js");
+var _readDotenv = require("./readDotenv.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // npm imports
 

package/dist/default/lib/index.js

@@ -15,4 +15,11 @@ Object.defineProperty(exports, "getDotenvSync", {
     return _getDotenv.getDotenvSync;
   }
 });
-var _getDotenv = require("./getDotenv/getDotenv.js");
+Object.defineProperty(exports, "parseBranch", {
+  enumerable: true,
+  get: function () {
+    return _parseBranch.parseBranch;
+  }
+});
+var _getDotenv = require("./getDotenv.js");
+var _parseBranch = require("./parseBranch.js");

package/dist/default/lib/parseBranch.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parseBranch = void 0;
+var _gitBranch = _interopRequireDefault(require("git-branch"));
+var _lodash = _interopRequireDefault(require("lodash"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// npm imports
+
+const parseBranch = branchName => {
+  try {
+    branchName ??= _gitBranch.default.sync() ?? '';
+  } catch {
+    branchName ??= '';
+  }
+  return _lodash.default.omitBy(branchName.match(/^(?<branchType>[^/\s]+)(?:\/(?<branchLabel>[^/\s]+)(?:\/(?<envToken>[^/\s]+))?)?$/)?.groups ?? {}, _lodash.default.isNil);
+};
+exports.parseBranch = parseBranch;

package/lib/{getDotenv/getDotenv.js → getDotenv.js}

@@ -5,7 +5,7 @@ import path from 'path';
 import { v4 as uuid } from 'uuid';
 
 // lib imports
-import { readDotenv, readDotenvSync } from '../readDotEnv/readDotenv.js';
+import { readDotenv, readDotenvSync } from './readDotenv.js';
 
 /**
  * get-dotenv options type

package/lib/index.js

@@ -1 +1,2 @@
-export { getDotenv, getDotenvSync } from './getDotenv/getDotenv.js';
+export { getDotenv, getDotenvSync } from './getDotenv.js';
+export { parseBranch } from './parseBranch.js';

package/lib/parseBranch.js

@@ -0,0 +1,18 @@
+// npm imports
+import branch from 'git-branch';
+import _ from 'lodash';
+
+export const parseBranch = (branchName) => {
+  try {
+    branchName ??= branch.sync() ?? '';
+  } catch {
+    branchName ??= '';
+  }
+
+  return _.omitBy(
+    branchName.match(
+      /^(?<branchType>[^/\s]+)(?:\/(?<branchLabel>[^/\s]+)(?:\/(?<envToken>[^/\s]+))?)?$/
+    )?.groups ?? {},
+    _.isNil
+  );
+};

package/package.json

@@ -3,7 +3,7 @@
   "bin": {
     "getdotenv": "bin/getdotenv/index.js"
   },
-  "version": "2.4.1",
+  "version": "2.4.3",
   "publishConfig": {
     "access": "public"
   },