varlock 0.0.15 → 0.1.1

package/dist/cli/cli-executable.js

@@ -1,25 +1,24 @@
-import { CONFIG, commandSpec as commandSpec$5 } from '../chunk-EPKIAPPA.js';
-import { commandSpec } from '../chunk-WTAZCEL6.js';
-import { commandSpec as commandSpec$1 } from '../chunk-XTPPJ3UK.js';
-import { commandSpec as commandSpec$2 } from '../chunk-WMCJKFEN.js';
+import { commandSpec as commandSpec$4 } from '../chunk-2VZORH2Y.js';
+import { commandSpec } from '../chunk-D7YI7IQX.js';
+import { CliExitError, fmt } from '../chunk-IBAUYNXV.js';
+import { commandSpec as commandSpec$1 } from '../chunk-R66KFGSX.js';
+import { commandSpec as commandSpec$2 } from '../chunk-VYAOZFZB.js';
 import { commandSpec as commandSpec$3 } from '../chunk-RZT65DRA.js';
-import { commandSpec as commandSpec$4 } from '../chunk-OLZUI45U.js';
-import { CliExitError, fmt } from '../chunk-LYSRVOTA.js';
 import { cli } from '../chunk-33ROL4J5.js';
-import { InvalidEnvError } from '../chunk-UPLR6H2O.js';
-import { ansis_default, gracefulExit, EnvSourceParseError, asyncExitHook } from '../chunk-IWQ4BDSW.js';
+import { InvalidEnvError } from '../chunk-H3R4W3XK.js';
+import { ansis_default, gracefulExit, asyncExitHook } from '../chunk-7UWLKQXP.js';
 import '../chunk-FGMXIEFA.js';
 import { __commonJS, __name, __toESM } from '../chunk-XN24GZXQ.js';
 import os2 from 'os';
 import crypto, { createHash } from 'crypto';
 import { join, dirname } from 'path';
-import fs, { readFileSync, existsSync, mkdirSync, writeFileSync } from 'fs';
+import fs, { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';
 import Debug from 'debug';
 import process2 from 'process';
 
-// ../../node_modules/.pnpm/ci-info@4.3.0/node_modules/ci-info/vendors.json
+// ../../node_modules/.pnpm/ci-info@4.3.1/node_modules/ci-info/vendors.json
 var require_vendors = __commonJS({
-  "../../node_modules/.pnpm/ci-info@4.3.0/node_modules/ci-info/vendors.json"(exports, module) {
+  "../../node_modules/.pnpm/ci-info@4.3.1/node_modules/ci-info/vendors.json"(exports, module) {
     module.exports = [
       {
         name: "Agola CI",
@@ -381,9 +380,9 @@ var require_vendors = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/ci-info@4.3.0/node_modules/ci-info/index.js
+// ../../node_modules/.pnpm/ci-info@4.3.1/node_modules/ci-info/index.js
 var require_ci_info = __commonJS({
-  "../../node_modules/.pnpm/ci-info@4.3.0/node_modules/ci-info/index.js"(exports) {
+  "../../node_modules/.pnpm/ci-info@4.3.1/node_modules/ci-info/index.js"(exports) {
     var vendors = require_vendors();
     var env = process.env;
     Object.defineProperty(exports, "_vendors", {
@@ -394,19 +393,21 @@ var require_ci_info = __commonJS({
     exports.name = null;
     exports.isPR = null;
     exports.id = null;
-    vendors.forEach(function(vendor) {
-      const envs = Array.isArray(vendor.env) ? vendor.env : [vendor.env];
-      const isCI2 = envs.every(function(obj) {
-        return checkEnv(obj);
+    if (env.CI !== "false") {
+      vendors.forEach(function(vendor) {
+        const envs = Array.isArray(vendor.env) ? vendor.env : [vendor.env];
+        const isCI2 = envs.every(function(obj) {
+          return checkEnv(obj);
+        });
+        exports[vendor.constant] = isCI2;
+        if (!isCI2) {
+          return;
+        }
+        exports.name = vendor.name;
+        exports.isPR = checkPR(vendor);
+        exports.id = vendor.constant;
       });
-      exports[vendor.constant] = isCI2;
-      if (!isCI2) {
-        return;
-      }
-      exports.name = vendor.name;
-      exports.isPR = checkPR(vendor);
-      exports.id = vendor.constant;
-    });
+    }
     exports.isCI = !!(env.CI !== "false" && // Bypass all checks if CI env is explicitly set to 'false'
     (env.BUILD_ID || // Jenkins, Cloudbees
     env.BUILD_NUMBER || // Jenkins, TeamCity
@@ -493,13 +494,46 @@ function hasDockerCGroup() {
   }
 }
 __name(hasDockerCGroup, "hasDockerCGroup");
-function isDocker() {
-  if (isDockerCached === void 0) {
-    isDockerCached = hasDockerEnv() || hasDockerCGroup();
+function hasDockerMountInfo() {
+  try {
+    return fs.readFileSync("/proc/self/mountinfo", "utf8").includes("/docker/containers/");
+  } catch {
+    return false;
   }
+}
+__name(hasDockerMountInfo, "hasDockerMountInfo");
+function isDocker() {
+  isDockerCached ??= hasDockerEnv() || hasDockerCGroup() || hasDockerMountInfo();
   return isDockerCached;
 }
 __name(isDocker, "isDocker");
+var isDockerCached2;
+function hasDockerEnv2() {
+  try {
+    fs.statSync("/.dockerenv");
+    return true;
+  } catch {
+    return false;
+  }
+}
+__name(hasDockerEnv2, "hasDockerEnv");
+function hasDockerCGroup2() {
+  try {
+    return fs.readFileSync("/proc/self/cgroup", "utf8").includes("docker");
+  } catch {
+    return false;
+  }
+}
+__name(hasDockerCGroup2, "hasDockerCGroup");
+function isDocker2() {
+  if (isDockerCached2 === void 0) {
+    isDockerCached2 = hasDockerEnv2() || hasDockerCGroup2();
+  }
+  return isDockerCached2;
+}
+__name(isDocker2, "isDocker");
+
+// ../../node_modules/.pnpm/is-inside-container@1.0.0/node_modules/is-inside-container/index.js
 var cachedResult;
 var hasContainerEnv = /* @__PURE__ */ __name(() => {
   try {
@@ -511,7 +545,7 @@ var hasContainerEnv = /* @__PURE__ */ __name(() => {
 }, "hasContainerEnv");
 function isInsideContainer() {
   if (cachedResult === void 0) {
-    cachedResult = hasContainerEnv() || isDocker();
+    cachedResult = hasContainerEnv() || isDocker2();
   }
   return cachedResult;
 }
@@ -538,58 +572,142 @@ var is_wsl_default = process2.env.__IS_WSL_TEST__ ? isWsl : isWsl();
 
 // package.json
 var package_default = {
-  version: "0.0.15"};
+  version: "0.1.1"};
+
+// src/config.ts
+var CONFIG = {
+  // varlock.dev app
+  POSTHOG_API_KEY: "phc_bfzH97VIta8yQa8HrsgmitqS6rTydjMISs0m8aqJTnq",
+  POSTHOG_HOST: "https://ph.varlock.dev"
+};
 
 // src/cli/helpers/telemetry.ts
 var debug = Debug("varlock:telemetry");
 var TRUE_ENV_VAR_VALUES = ["true", "1", "t"];
-var varlockConfigDirPath = join(os2.homedir(), ".varlock");
-var varlockConfigFilePath = join(varlockConfigDirPath, "config.json");
-var varlockConfigFileContents;
-function getConfigFileContents() {
-  if (varlockConfigFileContents) return varlockConfigFileContents;
+var userVarlockDirPath = join(os2.homedir(), ".varlock");
+var userVarlockConfigFilePath = join(userVarlockDirPath, "config.json");
+var userVarlockConfig;
+var projectVarlockConfig;
+var mergedVarlockConfigFileContents;
+var _gitDirPath;
+var _varlockDirPath;
+var _projectRootDirPath;
+var _foundProjectRoot = false;
+function findProjectDirs() {
+  if (!_foundProjectRoot) {
+    let currentDir = process.cwd();
+    while (currentDir) {
+      const possibleGitDirPath = join(currentDir, ".git");
+      if (!_gitDirPath && existsSync(possibleGitDirPath)) {
+        _gitDirPath = possibleGitDirPath;
+      }
+      const possibleVarlockDirPath = join(currentDir, ".varlock");
+      if (!_varlockDirPath && possibleVarlockDirPath !== userVarlockDirPath && existsSync(possibleVarlockDirPath)) {
+        _varlockDirPath = possibleVarlockDirPath;
+      }
+      const parentDir = dirname(currentDir);
+      if (parentDir === currentDir) break;
+      currentDir = parentDir;
+    }
+    if (_gitDirPath) _projectRootDirPath = dirname(_gitDirPath);
+    else if (_varlockDirPath) _projectRootDirPath = dirname(_varlockDirPath);
+    else _projectRootDirPath = process.cwd();
+    _foundProjectRoot = true;
+  }
+  return {
+    gitDirPath: _gitDirPath,
+    varlockDirPath: _varlockDirPath,
+    projectRootDirPath: _projectRootDirPath
+  };
+}
+__name(findProjectDirs, "findProjectDirs");
+function loadVarlockConfig() {
+  if (mergedVarlockConfigFileContents) return mergedVarlockConfigFileContents;
   try {
-    const configContent = readFileSync(varlockConfigFilePath, "utf-8");
-    varlockConfigFileContents = JSON.parse(configContent);
-    return varlockConfigFileContents;
-  } catch (error) {
-    debug("Failed to read varlock config:", error);
-    return {};
+    const userConfigStr = readFileSync(userVarlockConfigFilePath, "utf-8");
+    userVarlockConfig = userConfigStr.trim() ? JSON.parse(userConfigStr) : void 0;
+  } catch (err) {
+    if (err instanceof Error && "code" in err && err.code === "ENOENT") {
+      debug(`User varlock config file not found - ${userVarlockConfigFilePath}`);
+    } else if (err instanceof SyntaxError) {
+      throw new Error(`Invalid JSON in project varlock config - ${userVarlockConfigFilePath}`, { cause: err });
+    } else {
+      throw new Error(`Problem reading project varlock config - ${userVarlockConfigFilePath}`, { cause: err });
+    }
+  }
+  const { varlockDirPath } = findProjectDirs();
+  if (varlockDirPath) {
+    const projectVarlockConfigPath = join(varlockDirPath, "config.json");
+    try {
+      const projectConfigStr = readFileSync(projectVarlockConfigPath, "utf-8");
+      projectVarlockConfig = projectConfigStr.trim() ? JSON.parse(projectConfigStr) : void 0;
+    } catch (err) {
+      if (err instanceof Error && "code" in err && err.code === "ENOENT") {
+        debug(`Project varlock config file not found - ${projectVarlockConfigPath}`);
+      } else if (err instanceof SyntaxError) {
+        throw new Error(`Invalid JSON in project varlock config - ${projectVarlockConfigPath}`, { cause: err });
+      } else {
+        throw new Error(`Problem reading project varlock config - ${projectVarlockConfigPath}`, { cause: err });
+      }
+    }
+    if (projectVarlockConfig?.anonymousId) throw new Error("Anonymous ID should not be set in project varlock config");
   }
+  mergedVarlockConfigFileContents = {
+    ...userVarlockConfig,
+    ...projectVarlockConfig
+  };
+  return mergedVarlockConfigFileContents;
 }
-__name(getConfigFileContents, "getConfigFileContents");
+__name(loadVarlockConfig, "loadVarlockConfig");
 var cachedAnonymousId;
 function getAnonymousId() {
   if (cachedAnonymousId) return cachedAnonymousId;
-  const configFileContents = getConfigFileContents();
-  if (configFileContents?.anonymousId) {
-    cachedAnonymousId = configFileContents.anonymousId;
-    return configFileContents.anonymousId;
+  const varlockConfig = loadVarlockConfig();
+  if (varlockConfig?.anonymousId) {
+    cachedAnonymousId = varlockConfig.anonymousId;
+    return varlockConfig.anonymousId;
   }
   const newAnonymousId = `${import_ci_info.isCI ? "ci-" : ""}${crypto.randomUUID()}`;
-  if (!existsSync(varlockConfigDirPath)) {
-    mkdirSync(varlockConfigDirPath, { recursive: true });
+  try {
+    if (!existsSync(userVarlockDirPath)) {
+      mkdirSync(userVarlockDirPath, { recursive: true });
+    }
+    writeFileSync(
+      userVarlockConfigFilePath,
+      JSON.stringify({
+        ...userVarlockConfig,
+        anonymousId: newAnonymousId
+      }, null, 2),
+      { flag: "w" }
+    );
+  } catch (err) {
+    if (os2.homedir() === "/dev/null") {
+      console.error([
+        "Your HOME directory is not set - probably because you are running within Docker.",
+        "Please set HOME within your Dockerfile to a writable directory.",
+        "For example: `ENV HOME=/app/.home` (or whatever directory you want to use)."
+      ].join("\n"));
+    } else {
+      console.error([
+        "There was a problem writing to the ~/.varlock folder",
+        err.message,
+        "Please ensure your home folder (or at least the ~/.varlock folder) is writable"
+      ].join("\n"));
+    }
+    gracefulExit(1);
   }
-  writeFileSync(
-    varlockConfigFilePath,
-    JSON.stringify({
-      ...configFileContents,
-      anonymousId: newAnonymousId
-    }, null, 2),
-    { flag: "w" }
-  );
   cachedAnonymousId = newAnonymousId;
   return newAnonymousId;
 }
 __name(getAnonymousId, "getAnonymousId");
 function checkIsOptedOut() {
-  if (process.env.PH_OPT_OUT === "true" || TRUE_ENV_VAR_VALUES.includes((process.env.VARLOCK_TELEMETRY_DISABLED || "").toLowerCase())) {
+  if (process.env.PH_OPT_OUT === "true" || process.env.VARLOCK_TELEMETRY_DISABLED && TRUE_ENV_VAR_VALUES.includes(process.env.VARLOCK_TELEMETRY_DISABLED.toLowerCase())) {
     debug("telemetry opted out - env var");
     return true;
   }
-  const varlockConfigFile = getConfigFileContents();
-  if (varlockConfigFile?.analytics_opt_out || varlockConfigFile?.telemetryDisabled) {
-    debug("telemetry opted out - config file");
+  const varlockConfig = loadVarlockConfig();
+  if (varlockConfig?.analytics_opt_out || varlockConfig?.telemetryDisabled) {
+    debug(`telemetry opted out - config file (${projectVarlockConfig?.telemetryDisabled ? "project" : "user"} config)`);
     return true;
   }
   return false;
@@ -605,21 +723,10 @@ function anonymizeValue(payload) {
 }
 __name(anonymizeValue, "anonymizeValue");
 function getProjectGitRemoteUrl() {
+  findProjectDirs();
+  if (!_gitDirPath) return void 0;
   try {
-    let gitDirPath;
-    let currentDir = process.cwd();
-    while (currentDir) {
-      const possibleGitDirPath = join(currentDir, ".git");
-      if (existsSync(possibleGitDirPath)) {
-        gitDirPath = possibleGitDirPath;
-        break;
-      }
-      const parentDir = dirname(currentDir);
-      if (parentDir === currentDir) break;
-      currentDir = parentDir;
-    }
-    if (!gitDirPath) return void 0;
-    const gitConfigContents = readFileSync(join(gitDirPath, "config"), "utf-8");
+    const gitConfigContents = readFileSync(join(_gitDirPath, "config"), "utf-8");
     const remoteUpstreamPos = gitConfigContents.indexOf('[remote "upstream"]');
     if (remoteUpstreamPos !== -1) {
       const remoteUpstreamUrl = gitConfigContents.slice(remoteUpstreamPos).match(/url = (.+)/)?.[1];
@@ -679,7 +786,7 @@ async function posthogCapture(event, properties) {
       ...telemetryMeta,
       ...properties
     },
-    distinct_id: getAnonymousId()
+    distinct_id: isOptedOut ? "---" : getAnonymousId()
   };
   debug(`track${isOptedOut ? " (disabled)" : ""}`, payload);
   if (isOptedOut) return;
@@ -712,10 +819,10 @@ __name(trackCommand, "trackCommand");
 
 // src/cli/cli-executable.ts
 var versionId = package_default.version;
-function buildLazyCommand(commandSpec7, loadCommandFn) {
-  const commandName = commandSpec7.name;
+function buildLazyCommand(commandSpec6, loadCommandFn) {
+  const commandName = commandSpec6.name;
   return {
-    ...commandSpec7,
+    ...commandSpec6,
     run: /* @__PURE__ */ __name(async (...args) => {
       await trackCommand(commandName, { command: commandName });
       const commandSpecAndFn = await loadCommandFn();
@@ -725,12 +832,11 @@ function buildLazyCommand(commandSpec7, loadCommandFn) {
 }
 __name(buildLazyCommand, "buildLazyCommand");
 var subCommands = /* @__PURE__ */ new Map();
-subCommands.set("init", buildLazyCommand(commandSpec, async () => await import('../init.command-YZ23U7SF.js')));
-subCommands.set("load", buildLazyCommand(commandSpec$1, async () => await import('../load.command-NVMWXLOK.js')));
-subCommands.set("run", buildLazyCommand(commandSpec$2, async () => await import('../run.command-CXMAPHO7.js')));
+subCommands.set("init", buildLazyCommand(commandSpec, async () => await import('../init.command-A52ZWKL2.js')));
+subCommands.set("load", buildLazyCommand(commandSpec$1, async () => await import('../load.command-C75DTSKP.js')));
+subCommands.set("run", buildLazyCommand(commandSpec$2, async () => await import('../run.command-YSQDB4GE.js')));
 subCommands.set("help", buildLazyCommand(commandSpec$3, async () => await import('../help.command-B7VWA53B.js')));
-subCommands.set("telemetry", buildLazyCommand(commandSpec$4, async () => await import('../telemetry.command-3DVW7H2K.js')));
-subCommands.set("login", buildLazyCommand(commandSpec$5, async () => await import('../login.command-W4DP7RUO.js')));
+subCommands.set("telemetry", buildLazyCommand(commandSpec$4, async () => await import('../telemetry.command-JIHKG3ZH.js')));
 (/* @__PURE__ */ __name(async function go() {
   try {
     let args = process.argv.slice(2);
@@ -765,17 +871,6 @@ subCommands.set("login", buildLazyCommand(commandSpec$5, async () => await impor
       gracefulExit(1);
     } else if (error instanceof CliExitError || error instanceof InvalidEnvError) {
       console.error(error.getFormattedOutput());
-    } else if (error instanceof EnvSourceParseError) {
-      console.error(`\u{1F6A8} Error encountered while loading ${error.location.path}`);
-      console.error(error.message);
-      const errLoc = error.location;
-      const errPreview = [
-        errLoc.lineStr,
-        `${ansis_default.gray("-".repeat(errLoc.colNumber - 1))}${ansis_default.red("^")}`
-      ].join("\n");
-      console.error("Error parsing .env file");
-      console.error(fmt.filePath(`${errLoc.path}:${errLoc.lineNumber}:${errLoc.colNumber}`));
-      console.error(errPreview);
       gracefulExit(1);
     } else {
       throw error;