getmyenv 0.9.2 → 0.9.4

package/README.md

@@ -35,7 +35,7 @@ Prompts and status lines go to stderr, so `export --stdout > .env` stays clean.
 Commit `.getmyenv/project.json`. `token.json` and `claim.json` stay local and are gitignored.
 
 <!-- cli:help -->
-Output of `npx getmyenv --help` (0.9.2):
+Output of `npx getmyenv --help` (0.9.4):
 
 ```text
 Usage: getmyenv [options] [command]

package/dist/bin.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { formatCliError } from "@getmyenv/shared";
 import { runCli } from "./cli.js";
 import { maybeSuggestUpdate } from "./lib/update-check.js";
 async function main() {
@@ -8,7 +9,7 @@ async function main() {
 main().catch((err) => {
     const message = err instanceof Error ? err.message : "Unexpected error";
     // Never print secret values - sanitize to message only
-    console.error(`getmyenv: ${message}`);
+    console.error(formatCliError(message));
     // Not process.exit(): on Windows it can abort while sockets are still closing.
     process.exitCode = process.exitCode ? Number(process.exitCode) : 1;
 });

package/dist/commands/import.js

@@ -44,7 +44,7 @@ async function ensureTargetContext(linked, slug, opts) {
     if (found)
         return found;
     if (linked.who.isGuest || linked.who.token.kind !== "folder") {
-        const why = linked.who.isGuest ? "Guest projects have Development only." : "Server tokens are read-only.";
+        const why = linked.who.isGuest ? FACTS.guestContexts : "Server tokens are read-only.";
         console.error(pc.yellow(`Skipped ${slug}: no such context. ${why}`));
         return null;
     }

package/dist/commands/run.js

@@ -6,7 +6,7 @@ import { ensureTokenAndLink } from "../lib/bootstrap.js";
 import { resolveContext } from "../lib/context.js";
 import { resolveValues } from "../lib/resolve.js";
 import { contextKey } from "../lib/vault.js";
-import { assertVariableNames, explainLines, mergeEnv, signalExitCode, validationError, windowsCommandLine, } from "../lib/run-env.js";
+import { assertVariableNames, explainLines, mergeEnv, runContextLabel, signalExitCode, validationError, windowsCommandLine, } from "../lib/run-env.js";
 /** Status lines go to stderr so the child's stdout stays clean for pipes. */
 const log = (line = "") => console.error(line);
 /** Resolve, validate, merge, spawn. */
@@ -27,7 +27,7 @@ export async function runCommand(opts, childArgs) {
         }
     }
     const merged = mergeEnv(process.env, values, res.missing, opts.keepExisting === true);
-    const label = `${res.context.name} (${res.context.slug}${res.context.protection === "locked" ? ", read-only" : ""})`;
+    const label = runContextLabel(res.context);
     if (opts.explain) {
         log(pc.bold(`${who.project.name} / ${label}`));
         for (const line of explainLines(merged, res.context.slug))

package/dist/lib/context.js

@@ -1,4 +1,4 @@
-import { DEFAULT_CONTEXT_SLUG, slugify } from "@getmyenv/shared";
+import { DEFAULT_CONTEXT_SLUG, FACTS, slugify } from "@getmyenv/shared";
 /**
  * Default context for this folder:
  * server token's bound context, then project.json `context`, then `development`.
@@ -39,7 +39,7 @@ export function resolveContext(who, meta, explicit) {
     }
     const available = who.contexts.map((c) => c.slug).join(", ") || "none";
     const next = who.isGuest
-        ? "Guest projects have Development only. Claim it to add contexts: npx getmyenv claim"
+        ? `${FACTS.guestContexts} Claim it to add contexts: npx getmyenv claim`
         : `Create one: npx getmyenv context create "${wanted}"`;
     throw new Error(`No context "${wanted}". Available: ${available}\n${next}`);
 }

package/dist/lib/run-env.d.ts

@@ -1,40 +1,6 @@
+export { explainLines, mergeEnv, runContextLabel, validationError, type MissingKey } from "@getmyenv/shared";
 /** Names from the server go into an environment or a file. Refuse any that are not variable names. */
 export declare function assertVariableNames(names: Iterable<string>): void;
-export type MissingKey = {
-    name: string;
-    reason: "missing" | "expired";
-};
-export type ParentEnv = Record<string, string | undefined>;
-export type Origin = "context" | "context-overrides-parent" | "parent-kept" | "parent-fills-missing" | "missing";
-export type ExplainEntry = {
-    name: string;
-    origin: Origin;
-    reason?: MissingKey["reason"];
-};
-export type MergeResult = {
-    env: ParentEnv;
-    /** Names set from the context. */
-    applied: string[];
-    /** Names the context replaced in the parent env. */
-    overridden: string[];
-    /** Names the parent env kept because of --keep-existing. */
-    kept: string[];
-    /** Keys missing in the context but present in the parent env. */
-    filledByParent: string[];
-    /** Keys missing in the context and absent from the parent env. */
-    unresolved: MissingKey[];
-    entries: ExplainEntry[];
-};
-/** The child never sees the CLI's own settings (token, API URL, config dir). */
-export declare function withoutOwnEnv(parent: ParentEnv): ParentEnv;
-/**
- * Merge context values into the parent env.
- * The context wins unless keepExisting is set. A key missing in the context is
- * satisfied when the parent env already has it (for example from `op run`).
- */
-export declare function mergeEnv(parent: ParentEnv, values: Record<string, string>, missing: MissingKey[], keepExisting: boolean): MergeResult;
-/** Error text when keys are unresolved and --allow-missing is not set. Null when fine. */
-export declare function validationError(result: Pick<MergeResult, "unresolved">, contextSlug: string, allowMissing: boolean): string | null;
 /**
  * One cmd.exe command line from argv. Windows needs the shell to find `npm.cmd`
  * and friends, and Node does not quote args passed alongside `shell: true`.
@@ -44,5 +10,3 @@ export declare function validationError(result: Pick<MergeResult, "unresolved">,
 export declare function windowsCommandLine(args: string[]): string;
 /** Exit code for a child that ended by signal: 128 + signal number, like a shell. */
 export declare function signalExitCode(signal: NodeJS.Signals, numbers: Record<string, number>): number;
-/** `--explain` output. Names and origins only, never values. */
-export declare function explainLines(result: MergeResult, contextSlug: string): string[];

package/dist/lib/run-env.js

@@ -1,7 +1,9 @@
 /**
- * Pure pieces of `getmyenv run`: validate and merge. Names only in any output.
+ * Pure pieces of `getmyenv run`. Merge, validate and explain live in
+ * @getmyenv/shared so the homepage demo prints the same text.
  */
 import { isValidVariableName } from "@getmyenv/shared";
+export { explainLines, mergeEnv, runContextLabel, validationError } from "@getmyenv/shared";
 /** Names from the server go into an environment or a file. Refuse any that are not variable names. */
 export function assertVariableNames(names) {
     for (const name of names) {
@@ -10,85 +12,6 @@ export function assertVariableNames(names) {
         }
     }
 }
-/** The child never sees the CLI's own settings (token, API URL, config dir). */
-export function withoutOwnEnv(parent) {
-    const env = {};
-    for (const [k, v] of Object.entries(parent)) {
-        if (!k.toUpperCase().startsWith("GETMYENV_"))
-            env[k] = v;
-    }
-    return env;
-}
-function present(parent, name) {
-    const v = parent[name];
-    return v !== undefined && v !== "";
-}
-/**
- * Merge context values into the parent env.
- * The context wins unless keepExisting is set. A key missing in the context is
- * satisfied when the parent env already has it (for example from `op run`).
- */
-export function mergeEnv(parent, values, missing, keepExisting) {
-    const env = withoutOwnEnv(parent);
-    const applied = [];
-    const overridden = [];
-    const kept = [];
-    const entries = [];
-    for (const name of Object.keys(values).sort()) {
-        if (present(parent, name)) {
-            if (keepExisting) {
-                kept.push(name);
-                entries.push({ name, origin: "parent-kept" });
-                continue;
-            }
-            if (parent[name] !== values[name]) {
-                overridden.push(name);
-                entries.push({ name, origin: "context-overrides-parent" });
-            }
-            else {
-                entries.push({ name, origin: "context" });
-            }
-        }
-        else {
-            entries.push({ name, origin: "context" });
-        }
-        env[name] = values[name];
-        applied.push(name);
-    }
-    const filledByParent = [];
-    const unresolved = [];
-    for (const m of [...missing].sort((a, b) => a.name.localeCompare(b.name))) {
-        if (present(parent, m.name)) {
-            filledByParent.push(m.name);
-            entries.push({ name: m.name, origin: "parent-fills-missing", reason: m.reason });
-        }
-        else {
-            unresolved.push(m);
-            entries.push({ name: m.name, origin: "missing", reason: m.reason });
-        }
-    }
-    entries.sort((a, b) => a.name.localeCompare(b.name));
-    return { env, applied, overridden, kept, filledByParent, unresolved, entries };
-}
-/** Error text when keys are unresolved and --allow-missing is not set. Null when fine. */
-export function validationError(result, contextSlug, allowMissing) {
-    if (allowMissing || result.unresolved.length === 0)
-        return null;
-    const lines = result.unresolved.map((m) => `  ${m.name}${m.reason === "expired" ? " (expired)" : ""}`);
-    return [
-        `${result.unresolved.length} variable(s) have no value in ${contextSlug}:`,
-        ...lines,
-        `Set them: npx getmyenv set NAME -c ${contextSlug}`,
-        "Or run anyway: --allow-missing",
-    ].join("\n");
-}
-const ORIGIN_TEXT = {
-    context: (ctx) => `getmyenv (${ctx})`,
-    "context-overrides-parent": (ctx) => `getmyenv (${ctx}), replaces parent env`,
-    "parent-kept": () => "parent env (--keep-existing)",
-    "parent-fills-missing": (ctx, reason) => `parent env (${reason === "expired" ? "expired" : "missing"} in ${ctx})`,
-    missing: (ctx, reason) => `not set (${reason === "expired" ? "expired" : "missing"} in ${ctx})`,
-};
 /**
  * One cmd.exe command line from argv. Windows needs the shell to find `npm.cmd`
  * and friends, and Node does not quote args passed alongside `shell: true`.
@@ -112,11 +35,3 @@ export function signalExitCode(signal, numbers) {
     const n = numbers[signal];
     return typeof n === "number" ? 128 + n : 1;
 }
-/** `--explain` output. Names and origins only, never values. */
-export function explainLines(result, contextSlug) {
-    const width = Math.max(4, ...result.entries.map((e) => e.name.length));
-    const lines = result.entries.map((e) => `  ${e.name.padEnd(width)}  ${ORIGIN_TEXT[e.origin](contextSlug, e.reason)}`);
-    lines.push("");
-    lines.push(`  ${result.applied.length} from getmyenv, ${result.overridden.length} replaced, ${result.kept.length} kept, ${result.filledByParent.length} from parent env, ${result.unresolved.length} not set`);
-    return lines;
-}

package/dist/lib/vault.js

@@ -44,7 +44,7 @@ export async function contextKey(linked, target, opts = {}) {
         const key = opened.get(target.id);
         if (!key) {
             throw new Error(member
-                ? `The owner has not sent you the key for ${target.slug} yet. Ask them to open Project settings, Members in the dashboard.`
+                ? `Waiting for the owner to send the key for ${target.slug}. It arrives the next time they unlock the vault in the dashboard.`
                 : `No key for ${target.slug} on this account. Open the project in the dashboard once.`);
         }
         for (const [id, k] of opened)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getmyenv",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "CLI for getmyenv, an encrypted store for environment variables and secrets. We store ciphertext only.",
   "type": "module",
   "bin": {
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@getmyenv/crypto": "0.4.1",
-    "@getmyenv/shared": "0.7.0",
+    "@getmyenv/shared": "0.8.0",
     "@napi-rs/keyring": "^2.1.0",
     "commander": "^15.0.0",
     "dotenv": "^16.4.7",