envlock-core 0.4.0 → 0.6.0

package/dist/cli/index.js

@@ -2,6 +2,7 @@
 
 // src/cli/index.ts
 import { pathToFileURL as pathToFileURL2 } from "url";
+import { realpathSync } from "fs";
 
 // src/types.ts
 var ENVIRONMENTS = {
@@ -15,6 +16,32 @@ import { spawnSync } from "child_process";
 
 // src/detect.ts
 import { execFileSync } from "child_process";
+
+// src/logger.ts
+var verbose = false;
+function setVerbose(flag) {
+  verbose = flag;
+}
+var log = {
+  debug: (msg) => {
+    if (verbose) process.stderr.write(`[envlock:debug] ${msg}
+`);
+  },
+  info: (msg) => {
+    process.stderr.write(`[envlock] ${msg}
+`);
+  },
+  warn: (msg) => {
+    process.stderr.write(`[envlock] Warning: ${msg}
+`);
+  },
+  error: (msg) => {
+    process.stderr.write(`[envlock] Error: ${msg}
+`);
+  }
+};
+
+// src/detect.ts
 var WHICH = process.platform === "win32" ? "where" : "which";
 function hasBinary(name) {
   try {
@@ -26,10 +53,10 @@ function hasBinary(name) {
 }
 function checkBinary(name, installHint) {
   if (!hasBinary(name)) {
-    console.error(`[envlock] '${name}' not found in PATH.
+    throw new Error(`[envlock] '${name}' not found in PATH.
 ${installHint}`);
-    process.exit(1);
   }
+  log.debug(`Binary check: ${name} found`);
 }
 
 // src/invoke.ts
@@ -43,16 +70,21 @@ function runWithSecrets(options) {
   const keyAlreadyInjected = !!process.env[privateKeyVar];
   let result;
   if (keyAlreadyInjected) {
+    log.debug(`Spawning: dotenvx run -f ${envFile} -- ${command} ${args.join(" ")}`);
     result = spawnSync(
       "dotenvx",
       ["run", "-f", envFile, "--", command, ...args],
       { stdio: "inherit" }
     );
+    if (result.error) {
+      throw new Error(`[envlock] Failed to spawn 'dotenvx': ${result.error.message}`);
+    }
   } else {
     checkBinary(
       "op",
       "Install 1Password CLI: brew install --cask 1password-cli@beta\nThen sign in: op signin"
     );
+    log.debug(`Spawning: op run --environment ${onePasswordEnvId} -- dotenvx run -f ${envFile} -- ${command} ${args.join(" ")}`);
     result = spawnSync(
       "op",
       [
@@ -70,6 +102,9 @@ function runWithSecrets(options) {
       ],
       { stdio: "inherit" }
     );
+    if (result.error) {
+      throw new Error(`[envlock] Failed to spawn 'op': ${result.error.message}`);
+    }
   }
   process.exit(result.status ?? 1);
 }
@@ -114,12 +149,12 @@ async function resolveConfig(cwd) {
       const mod = await import(pathToFileURL(fullPath).href);
       const config = mod.default ?? mod;
       if (config && typeof config === "object") {
+        log.debug(`Config loaded from ${candidate}`);
         return config;
       }
     } catch (err) {
-      console.warn(
-        `[envlock] Failed to load ${candidate}: ${err instanceof Error ? err.message : String(err)}`
-      );
+      log.warn(`Failed to load ${candidate}: ${err instanceof Error ? err.message : String(err)}`);
+      log.debug(`Stack: ${err instanceof Error ? err.stack ?? "" : ""}`);
     }
   }
   return null;
@@ -145,6 +180,11 @@ function splitCommand(cmd) {
   return parts;
 }
 async function run(argv, cwd = process.cwd()) {
+  const debugIdx = argv.findIndex((a) => a === "--debug" || a === "-d");
+  if (debugIdx !== -1) {
+    setVerbose(true);
+    argv = argv.filter((_, i) => i !== debugIdx);
+  }
   const environment = argv.includes(ARGUMENT_FLAGS.production) ? ENVIRONMENTS.production : argv.includes(ARGUMENT_FLAGS.staging) ? ENVIRONMENTS.staging : ENVIRONMENTS.development;
   const passthrough = argv.filter(
     (f) => f !== ARGUMENT_FLAGS.staging && f !== ARGUMENT_FLAGS.production
@@ -159,8 +199,8 @@ async function run(argv, cwd = process.cwd()) {
   }
   if (firstArg === "run") {
     if (config?.commands?.["run"]) {
-      console.warn(
-        '[envlock] Warning: "run" is a reserved subcommand. The config command named "run" is ignored.\nRename it in envlock.config.js to use it as a named command.'
+      log.warn(
+        '"run" is a reserved subcommand. The config command named "run" is ignored.\nRename it in envlock.config.js to use it as a named command.'
       );
     }
     const runArgs = passthrough.slice(1);
@@ -196,11 +236,25 @@ async function run(argv, cwd = process.cwd()) {
   validateOnePasswordEnvId(onePasswordEnvId);
   const envFile = config?.envFiles?.[environment] ?? DEFAULT_ENV_FILES[environment];
   validateEnvFilePath(envFile, cwd);
+  log.debug(`Environment: ${environment}`);
+  log.debug(`Env file: ${envFile}`);
+  log.debug(`Command: ${command} ${args.join(" ")}`);
   runWithSecrets({ envFile, environment, onePasswordEnvId, command, args });
 }
-if (import.meta.url === pathToFileURL2(process.argv[1] ?? "").href) {
+var _resolvedArgv1 = (() => {
+  try {
+    return realpathSync(process.argv[1] ?? "");
+  } catch {
+    return process.argv[1] ?? "";
+  }
+})();
+if (import.meta.url === pathToFileURL2(_resolvedArgv1).href) {
+  if (process.argv.includes("--debug") || process.argv.includes("-d")) {
+    setVerbose(true);
+  }
+  log.debug(`Resolved argv[1]: ${_resolvedArgv1}`);
   run(process.argv.slice(2)).catch((err) => {
-    console.error(err instanceof Error ? err.message : String(err));
+    log.error(err instanceof Error ? err.message : String(err));
     process.exit(1);
   });
 }

package/dist/index.d.ts

@@ -33,4 +33,14 @@ declare function checkBinary(name: string, installHint: string): void;
 declare function validateOnePasswordEnvId(id: string): void;
 declare function validateEnvFilePath(envFile: string, cwd: string): void;
 
-export { ENVIRONMENTS, type Environment, type EnvlockConfig, type EnvlockOptions, type RunWithSecretsOptions, checkBinary, hasBinary, runWithSecrets, validateEnvFilePath, validateOnePasswordEnvId };
+declare function setVerbose(flag: boolean): void;
+declare const log: {
+    debug: (msg: string) => void;
+    info: (msg: string) => void;
+    warn: (msg: string) => void;
+    error: (msg: string) => void;
+};
+
+declare function findFreePort(preferred: number): Promise<number>;
+
+export { ENVIRONMENTS, type Environment, type EnvlockConfig, type EnvlockOptions, type RunWithSecretsOptions, checkBinary, findFreePort, hasBinary, log, runWithSecrets, setVerbose, validateEnvFilePath, validateOnePasswordEnvId };

package/dist/index.js

@@ -3,6 +3,32 @@ import { spawnSync } from "child_process";
 
 // src/detect.ts
 import { execFileSync } from "child_process";
+
+// src/logger.ts
+var verbose = false;
+function setVerbose(flag) {
+  verbose = flag;
+}
+var log = {
+  debug: (msg) => {
+    if (verbose) process.stderr.write(`[envlock:debug] ${msg}
+`);
+  },
+  info: (msg) => {
+    process.stderr.write(`[envlock] ${msg}
+`);
+  },
+  warn: (msg) => {
+    process.stderr.write(`[envlock] Warning: ${msg}
+`);
+  },
+  error: (msg) => {
+    process.stderr.write(`[envlock] Error: ${msg}
+`);
+  }
+};
+
+// src/detect.ts
 var WHICH = process.platform === "win32" ? "where" : "which";
 function hasBinary(name) {
   try {
@@ -14,10 +40,10 @@ function hasBinary(name) {
 }
 function checkBinary(name, installHint) {
   if (!hasBinary(name)) {
-    console.error(`[envlock] '${name}' not found in PATH.
+    throw new Error(`[envlock] '${name}' not found in PATH.
 ${installHint}`);
-    process.exit(1);
   }
+  log.debug(`Binary check: ${name} found`);
 }
 
 // src/invoke.ts
@@ -31,16 +57,21 @@ function runWithSecrets(options) {
   const keyAlreadyInjected = !!process.env[privateKeyVar];
   let result;
   if (keyAlreadyInjected) {
+    log.debug(`Spawning: dotenvx run -f ${envFile} -- ${command} ${args.join(" ")}`);
     result = spawnSync(
       "dotenvx",
       ["run", "-f", envFile, "--", command, ...args],
       { stdio: "inherit" }
     );
+    if (result.error) {
+      throw new Error(`[envlock] Failed to spawn 'dotenvx': ${result.error.message}`);
+    }
   } else {
     checkBinary(
       "op",
       "Install 1Password CLI: brew install --cask 1password-cli@beta\nThen sign in: op signin"
     );
+    log.debug(`Spawning: op run --environment ${onePasswordEnvId} -- dotenvx run -f ${envFile} -- ${command} ${args.join(" ")}`);
     result = spawnSync(
       "op",
       [
@@ -58,6 +89,9 @@ function runWithSecrets(options) {
       ],
       { stdio: "inherit" }
     );
+    if (result.error) {
+      throw new Error(`[envlock] Failed to spawn 'op': ${result.error.message}`);
+    }
   }
   process.exit(result.status ?? 1);
 }
@@ -92,11 +126,33 @@ var ENVIRONMENTS = {
   staging: "staging",
   production: "production"
 };
+
+// src/find-port.ts
+import { createServer } from "net";
+function isPortFree(port) {
+  return new Promise((resolve2) => {
+    const server = createServer();
+    server.once("error", () => resolve2(false));
+    server.once("listening", () => server.close(() => resolve2(true)));
+    server.listen(port, "127.0.0.1");
+  });
+}
+async function findFreePort(preferred) {
+  for (let port = preferred; port <= preferred + 10; port++) {
+    if (await isPortFree(port)) return port;
+  }
+  throw new Error(
+    `[envlock] No free port found in range ${preferred}\u2013${preferred + 10}.`
+  );
+}
 export {
   ENVIRONMENTS,
   checkBinary,
+  findFreePort,
   hasBinary,
+  log,
   runWithSecrets,
+  setVerbose,
   validateEnvFilePath,
   validateOnePasswordEnvId
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envlock-core",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "type": "module",
   "description": "Core 1Password + dotenvx secret injection logic for envlock",
   "license": "MIT",
@@ -26,7 +26,9 @@
       "types": "./dist/index.d.ts"
     }
   },
-  "files": ["dist"],
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "build": "tsup",
     "dev": "tsup --watch",