varlock 0.7.2 → 0.7.3

package/dist/chunk-4JWJZ4P3.js

@@ -0,0 +1,86 @@
+import { CliExitError, loadEnvGraph } from './chunk-CNDSEDGU.js';
+import { runWithWorkspaceInfo } from './chunk-5LNYCOEO.js';
+import { createDebug } from './chunk-6CCHLM3U.js';
+import { __name } from './chunk-6PEHRAEP.js';
+import fs from 'fs';
+import path2 from 'path';
+
+function readVarlockPackageJsonConfig(opts) {
+  const cwd = opts?.cwd ?? process.cwd();
+  const pkgPath = path2.join(cwd, "package.json");
+  if (!fs.existsSync(pkgPath)) return void 0;
+  try {
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
+    if (pkg.varlock && typeof pkg.varlock === "object") {
+      return pkg.varlock;
+    }
+  } catch {
+  }
+  return void 0;
+}
+__name(readVarlockPackageJsonConfig, "readVarlockPackageJsonConfig");
+
+// src/lib/load-graph.ts
+var debug = createDebug("varlock:load");
+function loadVarlockEnvGraph(opts) {
+  const pkgLoadPath = readVarlockPackageJsonConfig()?.loadPath;
+  if (opts?.entryFilePath) {
+    debug("using path from --path flag: %s", path2.resolve(opts.entryFilePath));
+    const resolvedPath = path2.resolve(opts.entryFilePath);
+    if (!fs.existsSync(resolvedPath)) {
+      throw new CliExitError(`The --path value does not exist: ${resolvedPath}`, {
+        suggestion: "Use `--path` to specify a valid file or directory."
+      });
+    }
+    return runWithWorkspaceInfo(() => loadEnvGraph({
+      ...opts,
+      entryFilePath: opts.entryFilePath,
+      afterInit: /* @__PURE__ */ __name(async (_g) => {
+      }, "afterInit")
+    }));
+  }
+  let pkgLoadPaths;
+  if (pkgLoadPath) {
+    pkgLoadPaths = Array.isArray(pkgLoadPath) ? pkgLoadPath : [pkgLoadPath];
+  }
+  if (pkgLoadPaths) {
+    const resolvedLoadPaths = pkgLoadPaths.map((p) => path2.resolve(p));
+    if (resolvedLoadPaths.length === 1) {
+      debug("using path from package.json varlock.loadPath: %s", resolvedLoadPaths[0]);
+    } else {
+      debug(
+        "using %d paths from package.json varlock.loadPath: %s",
+        resolvedLoadPaths.length,
+        resolvedLoadPaths.join(", ")
+      );
+    }
+    for (const resolvedPath of resolvedLoadPaths) {
+      if (!fs.existsSync(resolvedPath)) {
+        throw new CliExitError(
+          `A path in \`varlock.loadPath\` configured in package.json does not exist: ${resolvedPath}`,
+          { suggestion: "Update `varlock.loadPath` in your package.json to point to valid files or directories." }
+        );
+      }
+    }
+    return runWithWorkspaceInfo(() => loadEnvGraph({
+      ...opts,
+      // For a single path, use the existing entryFilePath option for backward compatibility
+      entryFilePath: resolvedLoadPaths.length === 1 ? resolvedLoadPaths[0] : void 0,
+      // For multiple paths, use entryFilePaths to trigger the multi-path container
+      entryFilePaths: resolvedLoadPaths.length > 1 ? resolvedLoadPaths : void 0,
+      afterInit: /* @__PURE__ */ __name(async (_g) => {
+      }, "afterInit")
+    }));
+  }
+  debug("no path configured, using cwd: %s", process.cwd());
+  return runWithWorkspaceInfo(() => loadEnvGraph({
+    ...opts,
+    afterInit: /* @__PURE__ */ __name(async (_g) => {
+    }, "afterInit")
+  }));
+}
+__name(loadVarlockEnvGraph, "loadVarlockEnvGraph");
+
+export { loadVarlockEnvGraph };
+//# sourceMappingURL=chunk-4JWJZ4P3.js.map
+//# sourceMappingURL=chunk-4JWJZ4P3.js.map

package/dist/chunk-4JWJZ4P3.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/lib/package-json-config.ts","../src/lib/load-graph.ts"],"names":["path","fs"],"mappings":";;;;;;;AAYO,SAAS,6BAA6B,IAAA,EAA+D;AAC1G,EAAA,MAAM,GAAA,GAAM,IAAA,EAAM,GAAA,IAAO,OAAA,CAAQ,GAAA,EAAI;AACrC,EAAA,MAAM,OAAA,GAAUA,KAAA,CAAK,IAAA,CAAK,GAAA,EAAK,cAAc,CAAA;AAC7C,EAAA,IAAI,CAAC,EAAA,CAAG,UAAA,CAAW,OAAO,GAAG,OAAO,MAAA;AACpC,EAAA,IAAI;AACF,IAAA,MAAM,MAAM,IAAA,CAAK,KAAA,CAAM,GAAG,YAAA,CAAa,OAAA,EAAS,OAAO,CAAC,CAAA;AACxD,IAAA,IAAI,GAAA,CAAI,OAAA,IAAW,OAAO,GAAA,CAAI,YAAY,QAAA,EAAU;AAClD,MAAA,OAAO,GAAA,CAAI,OAAA;AAAA,IACb;AAAA,EACF,CAAA,CAAA,MAAQ;AAAA,EAA4B;AACpC,EAAA,OAAO,MAAA;AACT;AAXgB,MAAA,CAAA,4BAAA,EAAA,8BAAA,CAAA;;;ACJhB,IAAM,KAAA,GAAQ,YAAY,cAAc,CAAA;AAEjC,SAAS,oBAAoB,IAAA,EAIjC;AACD,EAAA,MAAM,WAAA,GAAc,8BAA6B,EAAG,QAAA;AAGpD,EAAA,IAAI,MAAM,aAAA,EAAe;AACvB,IAAA,KAAA,CAAM,iCAAA,EAAmCA,KAAAA,CAAK,OAAA,CAAQ,IAAA,CAAK,aAAa,CAAC,CAAA;AAEzE,IAAA,MAAM,YAAA,GAAeA,KAAAA,CAAK,OAAA,CAAQ,IAAA,CAAK,aAAa,CAAA;AACpD,IAAA,IAAI,CAACC,EAAAA,CAAG,UAAA,CAAW,YAAY,CAAA,EAAG;AAChC,MAAA,MAAM,IAAI,YAAA,CAAa,CAAA,iCAAA,EAAoC,YAAY,CAAA,CAAA,EAAI;AAAA,QACzE,UAAA,EAAY;AAAA,OACb,CAAA;AAAA,IACH;AAEA,IAAA,OAAO,oBAAA,CAAqB,MAAM,YAAA,CAAa;AAAA,MAC7C,GAAG,IAAA;AAAA,MACH,eAAe,IAAA,CAAK,aAAA;AAAA,MACpB,SAAA,gCAAkB,EAAA,KAAO;AAAA,MAEzB,CAAA,EAFW,WAAA;AAAA,KAGZ,CAAC,CAAA;AAAA,EACJ;AAGA,EAAA,IAAI,YAAA;AACJ,EAAA,IAAI,WAAA,EAAa;AACf,IAAA,YAAA,GAAe,MAAM,OAAA,CAAQ,WAAW,CAAA,GAAI,WAAA,GAAc,CAAC,WAAW,CAAA;AAAA,EACxE;AAEA,EAAA,IAAI,YAAA,EAAc;AAChB,IAAA,MAAM,iBAAA,GAAoB,aAAa,GAAA,CAAI,CAAC,MAAMD,KAAAA,CAAK,OAAA,CAAQ,CAAC,CAAC,CAAA;AAEjE,IAAA,IAAI,iBAAA,CAAkB,WAAW,CAAA,EAAG;AAClC,MAAA,KAAA,CAAM,mDAAA,EAAqD,iBAAA,CAAkB,CAAC,CAAC,CAAA;AAAA,IACjF,CAAA,MAAO;AACL,MAAA,KAAA;AAAA,QACE,uDAAA;AAAA,QACA,iBAAA,CAAkB,MAAA;AAAA,QAClB,iBAAA,CAAkB,KAAK,IAAI;AAAA,OAC7B;AAAA,IACF;AAGA,IAAA,KAAA,MAAW,gBAAgB,iBAAA,EAAmB;AAC5C,MAAA,IAAI,CAACC,EAAAA,CAAG,UAAA,CAAW,YAAY,CAAA,EAAG;AAChC,QAAA,MAAM,IAAI,YAAA;AAAA,UACR,6EAA6E,YAAY,CAAA,CAAA;AAAA,UACzF,EAAE,YAAY,wFAAA;AAAyF,SACzG;AAAA,MACF;AAAA,IACF;AAEA,IAAA,OAAO,oBAAA,CAAqB,MAAM,YAAA,CAAa;AAAA,MAC7C,GAAG,IAAA;AAAA;AAAA,MAEH,eAAe,iBAAA,CAAkB,MAAA,KAAW,CAAA,GAAI,iBAAA,CAAkB,CAAC,CAAA,GAAI,MAAA;AAAA;AAAA,MAEvE,cAAA,EAAgB,iBAAA,CAAkB,MAAA,GAAS,CAAA,GAAI,iBAAA,GAAoB,MAAA;AAAA,MACnE,SAAA,gCAAkB,EAAA,KAAO;AAAA,MAEzB,CAAA,EAFW,WAAA;AAAA,KAGZ,CAAC,CAAA;AAAA,EACJ;AAEA,EAAA,KAAA,CAAM,mCAAA,EAAqC,OAAA,CAAQ,GAAA,EAAK,CAAA;AAExD,EAAA,OAAO,oBAAA,CAAqB,MAAM,YAAA,CAAa;AAAA,IAC7C,GAAG,IAAA;AAAA,IACH,SAAA,gCAAkB,EAAA,KAAO;AAAA,IAEzB,CAAA,EAFW,WAAA;AAAA,GAGZ,CAAC,CAAA;AACJ;AA5EgB,MAAA,CAAA,mBAAA,EAAA,qBAAA,CAAA","file":"chunk-4JWJZ4P3.js","sourcesContent":["import path from 'node:path';\nimport fs from 'node:fs';\n\nexport type VarlockPackageJsonConfig = {\n  /** Path (or array of paths) to a specific .env file or directory to use as the entry point for loading */\n  loadPath?: string | Array<string>;\n};\n\n/**\n * Reads varlock configuration from the `package.json` in `cwd`.\n * Returns undefined if no `package.json` exists or it has no `varlock` key.\n */\nexport function readVarlockPackageJsonConfig(opts?: { cwd?: string }): VarlockPackageJsonConfig | undefined {\n  const cwd = opts?.cwd ?? process.cwd();\n  const pkgPath = path.join(cwd, 'package.json');\n  if (!fs.existsSync(pkgPath)) return undefined;\n  try {\n    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));\n    if (pkg.varlock && typeof pkg.varlock === 'object') {\n      return pkg.varlock as VarlockPackageJsonConfig;\n    }\n  } catch { /* ignore parse errors */ }\n  return undefined;\n}\n","import fs from 'node:fs';\nimport path from 'node:path';\nimport { loadEnvGraph } from '../env-graph';\nimport { CliExitError } from '../cli/helpers/exit-error';\nimport { runWithWorkspaceInfo } from './workspace-utils';\nimport { readVarlockPackageJsonConfig } from './package-json-config';\nimport { createDebug } from './debug';\n\nconst debug = createDebug('varlock:load');\n\nexport function loadVarlockEnvGraph(opts?: {\n  currentEnvFallback?: string,\n  /** Explicit entry file path - overrides package.json config */\n  entryFilePath?: string,\n}) {\n  const pkgLoadPath = readVarlockPackageJsonConfig()?.loadPath;\n\n  // If --path flag is provided, it takes precedence over package.json config\n  if (opts?.entryFilePath) {\n    debug('using path from --path flag: %s', path.resolve(opts.entryFilePath));\n\n    const resolvedPath = path.resolve(opts.entryFilePath);\n    if (!fs.existsSync(resolvedPath)) {\n      throw new CliExitError(`The --path value does not exist: ${resolvedPath}`, {\n        suggestion: 'Use `--path` to specify a valid file or directory.',\n      });\n    }\n\n    return runWithWorkspaceInfo(() => loadEnvGraph({\n      ...opts,\n      entryFilePath: opts.entryFilePath,\n      afterInit: async (_g) => {\n        // TODO: register varlock resolver\n      },\n    }));\n  }\n\n  // Normalize package.json loadPath to an array (or undefined)\n  let pkgLoadPaths: Array<string> | undefined;\n  if (pkgLoadPath) {\n    pkgLoadPaths = Array.isArray(pkgLoadPath) ? pkgLoadPath : [pkgLoadPath];\n  }\n\n  if (pkgLoadPaths) {\n    const resolvedLoadPaths = pkgLoadPaths.map((p) => path.resolve(p));\n\n    if (resolvedLoadPaths.length === 1) {\n      debug('using path from package.json varlock.loadPath: %s', resolvedLoadPaths[0]);\n    } else {\n      debug(\n        'using %d paths from package.json varlock.loadPath: %s',\n        resolvedLoadPaths.length,\n        resolvedLoadPaths.join(', '),\n      );\n    }\n\n    // Validate that all paths exist\n    for (const resolvedPath of resolvedLoadPaths) {\n      if (!fs.existsSync(resolvedPath)) {\n        throw new CliExitError(\n          `A path in \\`varlock.loadPath\\` configured in package.json does not exist: ${resolvedPath}`,\n          { suggestion: 'Update `varlock.loadPath` in your package.json to point to valid files or directories.' },\n        );\n      }\n    }\n\n    return runWithWorkspaceInfo(() => loadEnvGraph({\n      ...opts,\n      // For a single path, use the existing entryFilePath option for backward compatibility\n      entryFilePath: resolvedLoadPaths.length === 1 ? resolvedLoadPaths[0] : undefined,\n      // For multiple paths, use entryFilePaths to trigger the multi-path container\n      entryFilePaths: resolvedLoadPaths.length > 1 ? resolvedLoadPaths : undefined,\n      afterInit: async (_g) => {\n        // TODO: register varlock resolver\n      },\n    }));\n  }\n\n  debug('no path configured, using cwd: %s', process.cwd());\n\n  return runWithWorkspaceInfo(() => loadEnvGraph({\n    ...opts,\n    afterInit: async (_g) => {\n      // TODO: register varlock resolver\n    },\n  }));\n}\n"]}

package/dist/{chunk-G2GPGCAP.js → chunk-5LNYCOEO.js}

@@ -8617,7 +8617,7 @@ var builtInRootDecorators = [
         dataSource._loadingError = err instanceof SchemaError ? err : new SchemaError(err);
         return;
       }
-      const { ConfigItem: ConfigItem2 } = await import('./config-item-I7ZL2FXU.js');
+      const { ConfigItem: ConfigItem2 } = await import('./config-item-IYYV4PO6.js');
       for (const [key, entry] of Object.entries(entries)) {
         const existsInSchema = key in graph.configSchema;
         if (!existsInSchema && !createMissing) {
@@ -8684,6 +8684,7 @@ function refToBranch(ref) {
   const s = ref.trim();
   if (s.startsWith("refs/heads/")) return s.slice("refs/heads/".length);
   if (s.startsWith("refs/head/")) return s.slice("refs/head/".length);
+  if (s.startsWith("refs/pull/")) return void 0;
   return s;
 }
 __name(refToBranch, "refToBranch");
@@ -8777,7 +8778,7 @@ var PLATFORMS = [
     isPR: /* @__PURE__ */ __name((env) => env.GITHUB_EVENT_NAME === "pull_request", "isPR"),
     prNumber: /* @__PURE__ */ __name((env) => parsePrNumber(env.GITHUB_EVENT_NUMBER), "prNumber"),
     repo: /* @__PURE__ */ __name((env) => parseRepoSlug(env.GITHUB_REPOSITORY), "repo"),
-    branch: /* @__PURE__ */ __name((env) => refToBranch(env.GITHUB_REF), "branch"),
+    branch: /* @__PURE__ */ __name((env) => env.GITHUB_HEAD_REF || refToBranch(env.GITHUB_REF), "branch"),
     commitSha: "GITHUB_SHA",
     runId: "GITHUB_RUN_ID",
     buildUrl: /* @__PURE__ */ __name((env) => {
@@ -9235,8 +9236,9 @@ var BUILTIN_VARS = {
   },
   VARLOCK_IS_CI: {
     name: "VARLOCK_IS_CI",
-    description: 'Whether running in a CI environment ("true" or "false")',
-    resolver: /* @__PURE__ */ __name((ciEnv) => ciEnv.isCI ? "true" : "false", "resolver")
+    description: "Whether running in a CI environment",
+    type: "boolean",
+    resolver: /* @__PURE__ */ __name((ciEnv) => ciEnv.isCI, "resolver")
   },
   VARLOCK_BRANCH: {
     name: "VARLOCK_BRANCH",
@@ -9266,6 +9268,7 @@ var BUILTIN_VARS = {
   VARLOCK_BUILD_URL: {
     name: "VARLOCK_BUILD_URL",
     description: "Link to the CI build/deploy",
+    type: "url",
     resolver: /* @__PURE__ */ __name((ciEnv) => ciEnv.buildUrl, "resolver")
   },
   VARLOCK_REPO: {
@@ -10637,6 +10640,14 @@ var EnvGraphDataSource2 = class {
     await this._initChild(child, importMeta);
     await child._processImports();
   }
+  /**
+   * When true, direct children of this data source are treated as top-level entry points:
+   * they inherit the "no parent" semantics and are never classified as env-specific
+   * solely because of their filename (e.g. `.env.production` used as an explicit entry
+   * point would not be env-specific, but one auto-loaded inside a directory would be).
+   * Only `MultiplePathsContainerDataSource` sets this to true.
+   */
+  childrenAreRoots;
   /**
    * Whether this data source is environment-specific.
    * A source is env-specific if:
@@ -10649,11 +10660,12 @@ var EnvGraphDataSource2 = class {
    * Note: `applyForEnv` from filename parsing is only relevant for auto-loaded files.
    * Explicitly imported files (via `@import`) are controlled by the import mechanism,
    * not the auto-load-by-env logic, so their `applyForEnv` is ignored here.
-   * Similarly, a file that is the explicit root entry point (no parent) is never
-   * treated as env-specific even if its filename contains an env qualifier.
+   * Similarly, a file that is the explicit root entry point (no parent, or whose parent
+   * has `childrenAreRoots` set) is never treated as env-specific even if its filename
+   * contains an env qualifier.
    */
   get isEnvSpecific() {
-    if (this.applyForEnv && !this.isImport && this.parent) return true;
+    if (this.applyForEnv && !this.isImport && this.parent && !this.parent?.childrenAreRoots) return true;
     if (this.type === "overrides") return true;
     if (this._hasConditionalDisable) return true;
     if (this.importMeta?.isConditionallyEnabled) return true;
@@ -11252,6 +11264,43 @@ var DirectoryDataSource = class extends EnvGraphDataSource2 {
     }
   }
 };
+var MultiplePathsContainerDataSource = class extends EnvGraphDataSource2 {
+  constructor(paths) {
+    super();
+    this.paths = paths;
+  }
+  static {
+    __name(this, "MultiplePathsContainerDataSource");
+  }
+  type = "container";
+  typeLabel = "multi-path-container";
+  get label() {
+    return `multi-path container (${this.paths.length} paths)`;
+  }
+  /**
+   * Direct children of this container are treated as top-level entry points,
+   * inheriting root semantics (never classified as env-specific due to filename).
+   */
+  childrenAreRoots = true;
+  async _finishInit() {
+    if (!this.graph) throw new Error("expected graph to be set");
+    for (const entryPath of this.paths) {
+      const isDirectory = entryPath.endsWith("/") || entryPath.endsWith(path2.sep) || !this.graph.virtualImports && await fs2.stat(entryPath).then((s) => s.isDirectory()).catch(() => false);
+      let child;
+      if (isDirectory) {
+        child = new DirectoryDataSource(entryPath);
+      } else {
+        const virtualContents = this.graph.virtualImports?.[entryPath];
+        child = new DotEnvFileDataSource(
+          entryPath,
+          virtualContents ? { overrideContents: virtualContents } : void 0
+        );
+      }
+      await this._initChild(child);
+      await child._processImports();
+    }
+  }
+};
 
 // src/env-graph/lib/graph-utils.ts
 function getTransitiveDeps(key, adjacencyList) {
@@ -11639,10 +11688,10 @@ var EnvGraph2 = class {
     let item = this.configSchema[key];
     if (item?._internalDefs.length) return;
     const graph = this;
+    const builtinType = builtinDef.type || "string";
     const BuiltinVarResolver = createResolver({
       name: `\0builtin:${key}`,
       description: builtinDef.description,
-      inferredType: "string",
       async resolve() {
         return builtinDef.resolver(graph.ciEnvInfo, graph.processEnvForBuiltins);
       }
@@ -11651,7 +11700,8 @@ var EnvGraph2 = class {
       item = new ConfigItem(this, key);
       item._isRequired = false;
       item._isSensitive = false;
-      item.dataType = this.dataTypesRegistry.string();
+      const dataTypeFactory = this.dataTypesRegistry[builtinType] ?? this.dataTypesRegistry.string;
+      item.dataType = dataTypeFactory();
       this.configSchema[key] = item;
     }
     item.isBuiltin = true;
@@ -12532,6 +12582,6 @@ var ConfigItem = class {
   }
 };
 
-export { ConfigItem, Ct, DirectoryDataSource, DotEnvFileDataSource, EnvGraph2 as EnvGraph, FileBasedDataSource, Jt, ParsedEnvSpecStaticValue, StaticValueResolver, ansis_default, detectWorkspaceInfo, downloadPluginToCache, envSpecUpdater, getUserVarlockDir, parseEnvSpecDotEnvFile, pathExists, prompts_default, require_semver2 as require_semver, runWithWorkspaceInfo, tryCatch };
-//# sourceMappingURL=chunk-G2GPGCAP.js.map
-//# sourceMappingURL=chunk-G2GPGCAP.js.map
+export { ConfigItem, Ct, DirectoryDataSource, DotEnvFileDataSource, EnvGraph2 as EnvGraph, FileBasedDataSource, Jt, MultiplePathsContainerDataSource, ParsedEnvSpecStaticValue, StaticValueResolver, ansis_default, detectWorkspaceInfo, downloadPluginToCache, envSpecUpdater, getUserVarlockDir, parseEnvSpecDotEnvFile, pathExists, prompts_default, require_semver2 as require_semver, runWithWorkspaceInfo, tryCatch };
+//# sourceMappingURL=chunk-5LNYCOEO.js.map
+//# sourceMappingURL=chunk-5LNYCOEO.js.map