varlock 0.0.3 → 0.0.5

package/dist/{chunk-2CM6PMED.js → chunk-GVAD672U.js}

@@ -1,19 +1,20 @@
 import { define } from './chunk-33ROL4J5.js';
-import { checkForSchemaErrors, checkForConfigErrors } from './chunk-OSSLRXKM.js';
-import { loadVarlockEnvGraph } from './chunk-Q5P7F3WA.js';
+import { checkForSchemaErrors, checkForConfigErrors } from './chunk-WFN3ZXGS.js';
+import { loadVarlockEnvGraph } from './chunk-Y7WD33L3.js';
+import { gracefulExit } from './chunk-LHTLO65N.js';
 import { __name } from './chunk-XN24GZXQ.js';
 import { execa } from 'execa';
 import which from 'which';
 
 var commandSpec = define({
   name: "run",
-  description: "Run a command with the environment variables loaded from the .env file",
+  description: "Run a command with your environment variables injected",
   args: {
-    watch: {
-      type: "boolean",
-      short: "w",
-      description: "Watch mode"
-    }
+    // watch: {
+    //   type: 'boolean',
+    //   short: 'w',
+    //   description: 'Watch mode',
+    // },
   }
 });
 var commandProcess;
@@ -33,7 +34,6 @@ var commandFn = /* @__PURE__ */ __name(async (ctx) => {
   const rawCommand = commandToRunAsArgs[0];
   const commandArgsOnly = commandToRunAsArgs.slice(1);
   const pathAwareCommand = which.sync(rawCommand, { nothrow: true });
-  const isWatchEnabled = ctx.values.watch;
   const envGraph = await loadVarlockEnvGraph();
   checkForSchemaErrors(envGraph);
   await envGraph.resolveEnvValues();
@@ -57,7 +57,7 @@ var commandFn = /* @__PURE__ */ __name(async (ctx) => {
     ["SIGTERM", "SIGINT"].forEach((signal) => {
       process.on(signal, () => {
         commandProcess?.kill(9);
-        process.exit(1);
+        gracefulExit(1);
       });
     });
   }
@@ -68,7 +68,7 @@ var commandFn = /* @__PURE__ */ __name(async (ctx) => {
   } catch (error) {
     if (error.signal === "SIGINT" && childCommandKilledFromRestart) ;
     if (error.signal === "SIGINT" || error.signal === "SIGKILL") {
-      process.exit(1);
+      gracefulExit(1);
     } else {
       console.log(error.message);
       console.log(`command [${commandToRunStr}] failed`);
@@ -77,23 +77,11 @@ var commandFn = /* @__PURE__ */ __name(async (ctx) => {
     }
     exitCode = error.exitCode || 1;
   }
-  if (isWatchEnabled) {
-    {
-      if (exitCode === 0) {
-        console.log("\n\u2705 command completed successfully");
-      } else {
-        console.log(`
-\u{1F4A5} command failed - exit code = ${exitCode}`);
-      }
-    }
-  }
-  if (!isWatchEnabled) {
-    process.exit(exitCode);
-  } else {
-    console.log("... watching for changes ...");
+  {
+    return gracefulExit(exitCode);
   }
 }, "commandFn");
 
 export { commandFn, commandSpec };
-//# sourceMappingURL=chunk-2CM6PMED.js.map
-//# sourceMappingURL=chunk-2CM6PMED.js.map
+//# sourceMappingURL=chunk-GVAD672U.js.map
+//# sourceMappingURL=chunk-GVAD672U.js.map

package/dist/chunk-GVAD672U.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/cli/commands/run.command.ts"],"names":[],"mappings":"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","file":"chunk-GVAD672U.js","sourcesContent":["import { execa, type ResultPromise } from 'execa';\nimport which from 'which';\nimport { define } from 'gunshi';\n\nimport { loadVarlockEnvGraph } from '../../lib/load-graph';\nimport { checkForConfigErrors, checkForSchemaErrors } from '../helpers/error-checks';\nimport { type TypedGunshiCommandFn } from '../helpers/gunshi-type-utils';\nimport { gracefulExit } from 'exit-hook';\n\n\nexport const commandSpec = define({\n  name: 'run',\n  description: 'Run a command with your environment variables injected',\n  args: {\n    // watch: {\n    //   type: 'boolean',\n    //   short: 'w',\n    //   description: 'Watch mode',\n    // },\n  },\n});\n\nlet commandProcess: ResultPromise | undefined;\nlet childCommandKilledFromRestart = false;\nlet isWatchModeRestart = false;\n\nexport const commandFn: TypedGunshiCommandFn<typeof commandSpec> = async (ctx) => {\n  // if \"--\" is present, split the args into our command and the rest, which will be another external command\n  const argv = process.argv.slice(2);\n  let commandArgs: Array<string> = [];\n  let restCommandArgs: Array<string> = [];\n  if (argv.includes('--')) {\n    const doubleDashIndex = argv.indexOf('--');\n    commandArgs = argv.slice(0, doubleDashIndex);\n    restCommandArgs = argv.slice(doubleDashIndex + 1);\n  } else {\n    throw new Error('No command to run! Your command should look like `varlock run -- <your-command>`');\n  }\n  const commandToRunAsArgs = restCommandArgs;\n  const commandToRunStr = restCommandArgs.join(' ');\n\n  const rawCommand = commandToRunAsArgs[0];\n  const commandArgsOnly = commandToRunAsArgs.slice(1);\n  const pathAwareCommand = which.sync(rawCommand, { nothrow: true });\n\n  // const isWatchEnabled = ctx.values.watch;\n  const isWatchEnabled = false;\n\n  // console.log('running command', pathAwareCommand || rawCommand, commandArgsOnly);\n\n\n  const envGraph = await loadVarlockEnvGraph();\n  checkForSchemaErrors(envGraph);\n  await envGraph.resolveEnvValues();\n  checkForConfigErrors(envGraph);\n\n  // will fail above if there are any errors\n\n  const resolvedEnv = envGraph.getResolvedEnvObject();\n  // console.log(resolvedEnv);\n\n  // needs more thought here\n  const fullInjectedEnv = {\n    ...process.env,\n    ...resolvedEnv,\n    __VARLOCK_RUN: '1', // flag for a child process to detect it is runnign via `varlock run`\n    __VARLOCK_ENV: JSON.stringify(envGraph.getSerializedGraph()),\n  };\n\n  commandProcess = execa(pathAwareCommand || rawCommand, commandArgsOnly, {\n    stdio: 'inherit',\n    env: fullInjectedEnv,\n  });\n  // console.log('PARENT PID = ', process.pid);\n  // console.log('CHILD PID = ', commandProcess.pid);\n\n  // if first run, we need to attach some extra exit handling\n  if (!isWatchModeRestart) {\n    // try to make sure we shut down cleanly and kill the child process\n    process.on('exit', (code: any, signal: any) => {\n      // if (childCommandKilledFromRestart) {\n      //   childCommandKilledFromRestart = false;\n      //   return;\n      // }\n      // console.log('exit!', code, signal);\n      commandProcess?.kill(9);\n    });\n\n    ['SIGTERM', 'SIGINT'].forEach((signal) => {\n      process.on(signal, () => {\n        // console.log('SIGNAL = ', signal);\n        commandProcess?.kill(9);\n        gracefulExit(1);\n      });\n    });\n    // TODO: handle other signals?\n  }\n\n\n  let exitCode: any; // TODO: fix this any\n  try {\n    const commandResult = await commandProcess;\n    exitCode = commandResult.exitCode;\n  } catch (error) {\n    // console.log('child command error!', error);\n    if ((error as any).signal === 'SIGINT' && childCommandKilledFromRestart) {\n      // console.log('child command failed due to being killed form restart');\n      childCommandKilledFromRestart = false;\n      return;\n    }\n\n    // console.log('child command result error', error);\n    if ((error as any).signal === 'SIGINT' || (error as any).signal === 'SIGKILL') {\n      gracefulExit(1);\n    } else {\n      console.log((error as Error).message);\n      console.log(`command [${commandToRunStr}] failed`);\n      console.log('try running the same command without dmno');\n      console.log('if you get a different result, dmno may be the problem...');\n      // console.log(`Please report issue here: <${REPORT_ISSUE_LINK}>`);\n    }\n    exitCode = (error as any).exitCode || 1;\n  }\n\n  if (isWatchEnabled) {\n    if (!childCommandKilledFromRestart) {\n      if (exitCode === 0) {\n        console.log('\\n✅ command completed successfully');\n      } else {\n        console.log(`\\n💥 command failed - exit code = ${exitCode}`);\n      }\n    }\n  }\n\n  if (!isWatchEnabled) {\n    return gracefulExit(exitCode);\n  } else {\n    console.log('... watching for changes ...');\n  }\n};\n"]}

package/dist/{chunk-RPLDMNWT.js → chunk-HMRN5QZL.js}

@@ -1,5 +1,5 @@
 import { define } from './chunk-33ROL4J5.js';
-import { loadEnvGraph } from './chunk-TYL3Q4QG.js';
+import { loadEnvGraph } from './chunk-EVHLEWHL.js';
 import { __name } from './chunk-XN24GZXQ.js';
 
 // src/cli/helpers/install-detection.ts
@@ -28,5 +28,5 @@ var commandFn = /* @__PURE__ */ __name(async (ctx) => {
 }, "commandFn");
 
 export { commandFn, commandSpec };
-//# sourceMappingURL=chunk-RPLDMNWT.js.map
-//# sourceMappingURL=chunk-RPLDMNWT.js.map
+//# sourceMappingURL=chunk-HMRN5QZL.js.map
+//# sourceMappingURL=chunk-HMRN5QZL.js.map

package/dist/{chunk-RPLDMNWT.js.map → chunk-HMRN5QZL.js.map}

@@ -1 +1 @@
-{"version":3,"sources":["../src/cli/helpers/install-detection.ts","../src/cli/commands/doctor.command.ts"],"names":[],"mappings":";;;;;AACO,SAAS,YAAe,GAAA;AAC7B,EAAI,IAAA;AACF,IAAO,OAAA,KAAA;AAAA,WACA,CAAG,EAAA;AACV,IAAO,OAAA,KAAA;AAAA;AAEX;AANgB,MAAA,CAAA,YAAA,EAAA,cAAA,CAAA;;;ACIT,IAAM,cAAc,MAAO,CAAA;AAAA,EAChC,IAAM,EAAA,QAAA;AAAA,EACN,WAAa,EAAA,4DAAA;AAAA,EACb,MAAM;AACR,CAAC;AAEY,IAAA,SAAA,iCAA6D,GAAQ,KAAA;AAChF,EAAA,OAAA,CAAQ,IAAI,EAAE,CAAA;AACd,EAAM,MAAA,OAAA,CAAQ,IAAI,yCAA6B,CAAA;AAE/C,EAAQ,OAAA,CAAA,GAAA,CAAI,cAAgB,EAAA,YAAA,EAAc,CAAA;AAE1C,EAAM,MAAA,QAAA,GAAW,MAAM,YAAa,EAAA;AACpC,EAAA,MAAM,SAAS,gBAAiB,EAAA;AAChC,EAAoB,SAAS,oBAAqB;AAIpD,CAZmE,EAAA,WAAA","file":"chunk-RPLDMNWT.js","sourcesContent":["\nexport function isBundledSEA() {\n  try {\n    return __VARLOCK_SEA_BUILD__;\n  } catch (e) {\n    return false;\n  }\n}\n","import { define } from 'gunshi';\nimport { loadEnvGraph } from '@env-spec/env-graph';\nimport { isBundledSEA } from '../helpers/install-detection';\nimport { TypedGunshiCommandFn } from '../helpers/gunshi-type-utils';\n\nexport const commandSpec = define({\n  name: 'doctor',\n  description: 'Debug and diagnose issues with your env file(s) and system',\n  args: {},\n});\n\nexport const commandFn: TypedGunshiCommandFn<typeof commandSpec> = async (ctx) => {\n  console.log('');\n  await console.log('🧙 Scanning for issues... ✨');\n\n  console.log('Bundled SEA?', isBundledSEA());\n\n  const envGraph = await loadEnvGraph();\n  await envGraph.resolveEnvValues();\n  const resolvedEnv = envGraph.getResolvedEnvObject();\n\n  // TODO: Mac app checks\n  // - installed, running, logged in, set up (keys exist), locked/unlocked state\n};\n\n"]}
+{"version":3,"sources":["../src/cli/helpers/install-detection.ts","../src/cli/commands/doctor.command.ts"],"names":[],"mappings":";;;;;AACO,SAAS,YAAe,GAAA;AAC7B,EAAI,IAAA;AACF,IAAO,OAAA,KAAA;AAAA,WACA,CAAG,EAAA;AACV,IAAO,OAAA,KAAA;AAAA;AAEX;AANgB,MAAA,CAAA,YAAA,EAAA,cAAA,CAAA;;;ACIT,IAAM,cAAc,MAAO,CAAA;AAAA,EAChC,IAAM,EAAA,QAAA;AAAA,EACN,WAAa,EAAA,4DAAA;AAAA,EACb,MAAM;AACR,CAAC;AAEY,IAAA,SAAA,iCAA6D,GAAQ,KAAA;AAChF,EAAA,OAAA,CAAQ,IAAI,EAAE,CAAA;AACd,EAAM,MAAA,OAAA,CAAQ,IAAI,yCAA6B,CAAA;AAE/C,EAAQ,OAAA,CAAA,GAAA,CAAI,cAAgB,EAAA,YAAA,EAAc,CAAA;AAE1C,EAAM,MAAA,QAAA,GAAW,MAAM,YAAa,EAAA;AACpC,EAAA,MAAM,SAAS,gBAAiB,EAAA;AAChC,EAAoB,SAAS,oBAAqB;AAIpD,CAZmE,EAAA,WAAA","file":"chunk-HMRN5QZL.js","sourcesContent":["\nexport function isBundledSEA() {\n  try {\n    return __VARLOCK_SEA_BUILD__;\n  } catch (e) {\n    return false;\n  }\n}\n","import { define } from 'gunshi';\nimport { loadEnvGraph } from '@env-spec/env-graph';\nimport { isBundledSEA } from '../helpers/install-detection';\nimport { type TypedGunshiCommandFn } from '../helpers/gunshi-type-utils';\n\nexport const commandSpec = define({\n  name: 'doctor',\n  description: 'Debug and diagnose issues with your env file(s) and system',\n  args: {},\n});\n\nexport const commandFn: TypedGunshiCommandFn<typeof commandSpec> = async (ctx) => {\n  console.log('');\n  await console.log('🧙 Scanning for issues... ✨');\n\n  console.log('Bundled SEA?', isBundledSEA());\n\n  const envGraph = await loadEnvGraph();\n  await envGraph.resolveEnvValues();\n  const resolvedEnv = envGraph.getResolvedEnvObject();\n\n  // TODO: Mac app checks\n  // - installed, running, logged in, set up (keys exist), locked/unlocked state\n};\n\n"]}