envshed 0.10.0 → 0.11.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (79) hide show
  1. package/dist/commands/completions.d.ts +3 -0
  2. package/dist/commands/completions.d.ts.map +1 -0
  3. package/dist/commands/completions.js +329 -0
  4. package/dist/commands/completions.js.map +1 -0
  5. package/dist/commands/completions.test.d.ts +2 -0
  6. package/dist/commands/completions.test.d.ts.map +1 -0
  7. package/dist/commands/completions.test.js +158 -0
  8. package/dist/commands/completions.test.js.map +1 -0
  9. package/dist/commands/diff.d.ts +3 -0
  10. package/dist/commands/diff.d.ts.map +1 -0
  11. package/dist/commands/diff.js +53 -0
  12. package/dist/commands/diff.js.map +1 -0
  13. package/dist/commands/import.d.ts +3 -0
  14. package/dist/commands/import.d.ts.map +1 -0
  15. package/dist/commands/import.js +137 -0
  16. package/dist/commands/import.js.map +1 -0
  17. package/dist/commands/import.test.d.ts +2 -0
  18. package/dist/commands/import.test.d.ts.map +1 -0
  19. package/dist/commands/import.test.js +385 -0
  20. package/dist/commands/import.test.js.map +1 -0
  21. package/dist/commands/run.d.ts.map +1 -1
  22. package/dist/commands/run.js +102 -5
  23. package/dist/commands/run.js.map +1 -1
  24. package/dist/commands/run.test.js +334 -1
  25. package/dist/commands/run.test.js.map +1 -1
  26. package/dist/index.js +6 -0
  27. package/dist/index.js.map +1 -1
  28. package/dist/lib/diff-renderer.d.ts +17 -0
  29. package/dist/lib/diff-renderer.d.ts.map +1 -0
  30. package/dist/lib/diff-renderer.js +82 -0
  31. package/dist/lib/diff-renderer.js.map +1 -0
  32. package/dist/lib/diff-renderer.test.d.ts +2 -0
  33. package/dist/lib/diff-renderer.test.d.ts.map +1 -0
  34. package/dist/lib/diff-renderer.test.js +214 -0
  35. package/dist/lib/diff-renderer.test.js.map +1 -0
  36. package/dist/lib/importers/csv.d.ts +8 -0
  37. package/dist/lib/importers/csv.d.ts.map +1 -0
  38. package/dist/lib/importers/csv.js +26 -0
  39. package/dist/lib/importers/csv.js.map +1 -0
  40. package/dist/lib/importers/csv.test.d.ts +2 -0
  41. package/dist/lib/importers/csv.test.d.ts.map +1 -0
  42. package/dist/lib/importers/csv.test.js +25 -0
  43. package/dist/lib/importers/csv.test.js.map +1 -0
  44. package/dist/lib/importers/dotenv.d.ts +7 -0
  45. package/dist/lib/importers/dotenv.d.ts.map +1 -0
  46. package/dist/lib/importers/dotenv.js +13 -0
  47. package/dist/lib/importers/dotenv.js.map +1 -0
  48. package/dist/lib/importers/dotenv.test.d.ts +2 -0
  49. package/dist/lib/importers/dotenv.test.d.ts.map +1 -0
  50. package/dist/lib/importers/dotenv.test.js +30 -0
  51. package/dist/lib/importers/dotenv.test.js.map +1 -0
  52. package/dist/lib/importers/index.d.ts +17 -0
  53. package/dist/lib/importers/index.d.ts.map +1 -0
  54. package/dist/lib/importers/index.js +42 -0
  55. package/dist/lib/importers/index.js.map +1 -0
  56. package/dist/lib/importers/index.test.d.ts +2 -0
  57. package/dist/lib/importers/index.test.d.ts.map +1 -0
  58. package/dist/lib/importers/index.test.js +23 -0
  59. package/dist/lib/importers/index.test.js.map +1 -0
  60. package/dist/lib/importers/json.d.ts +9 -0
  61. package/dist/lib/importers/json.d.ts.map +1 -0
  62. package/dist/lib/importers/json.js +30 -0
  63. package/dist/lib/importers/json.js.map +1 -0
  64. package/dist/lib/importers/json.test.d.ts +2 -0
  65. package/dist/lib/importers/json.test.d.ts.map +1 -0
  66. package/dist/lib/importers/json.test.js +47 -0
  67. package/dist/lib/importers/json.test.js.map +1 -0
  68. package/dist/lib/importers/yaml.d.ts +8 -0
  69. package/dist/lib/importers/yaml.d.ts.map +1 -0
  70. package/dist/lib/importers/yaml.js +18 -0
  71. package/dist/lib/importers/yaml.js.map +1 -0
  72. package/dist/lib/importers/yaml.test.d.ts +2 -0
  73. package/dist/lib/importers/yaml.test.d.ts.map +1 -0
  74. package/dist/lib/importers/yaml.test.js +38 -0
  75. package/dist/lib/importers/yaml.test.js.map +1 -0
  76. package/dist/locales/en.json +45 -1
  77. package/dist/locales/es.json +111 -67
  78. package/dist/locales/pt-BR.json +144 -100
  79. package/package.json +5 -2
@@ -4,13 +4,21 @@ import path from "path";
4
4
  import ora from "ora";
5
5
  import { apiGet } from "../api.js";
6
6
  import chalk from "chalk";
7
- import { resolveOpts, getOriginalCwd, logContext, getWorkspaceContext, resolveWorkspaceOpts, getVersionCache, hasProjectConfig, } from "../config.js";
7
+ import { resolveOpts, getOriginalCwd, logContext, getWorkspaceContext, resolveWorkspaceOpts, getVersionCache, hasProjectConfig, getToken, getApiUrl, } from "../config.js";
8
8
  import { t } from "../i18n.js";
9
+ function buildChildEnv(secrets) {
10
+ const env = { ...process.env, ...secrets };
11
+ delete env["ENVSHED_TOKEN"];
12
+ delete env["ENVSHED_API_URL"];
13
+ return env;
14
+ }
9
15
  export const runCommand = new Command("run")
10
16
  .description(t("run.description"))
11
17
  .option("-o, --org <slug>", t("common.orgOption"))
12
18
  .option("-p, --project <slug>", t("common.projectOption"))
13
19
  .option("-e, --env <slug>", t("common.envOption"))
20
+ .option("--watch", t("run.watchOption"))
21
+ .option("--interval <seconds>", t("run.intervalOption"), "30")
14
22
  .argument("<command...>", t("run.commandArg"))
15
23
  .action(async (commandArgs, opts) => {
16
24
  const program = runCommand.parent;
@@ -62,15 +70,104 @@ export const runCommand = new Command("run")
62
70
  console.log(chalk.dim(` ${t("run.staleHint")}\n`));
63
71
  }
64
72
  const [cmd, ...args] = commandArgs;
65
- const child = spawn(cmd, args, {
73
+ if (!opts.watch) {
74
+ // Non-watch mode: existing behavior
75
+ const child = spawn(cmd, args, {
76
+ stdio: "inherit",
77
+ env: { ...process.env, ...data.secrets },
78
+ cwd,
79
+ shell: true,
80
+ });
81
+ child.on("exit", (code) => {
82
+ process.exit(code ?? 0);
83
+ });
84
+ return;
85
+ }
86
+ // Watch mode
87
+ const intervalSec = Math.max(10, parseInt(opts.interval ?? "30", 10));
88
+ const intervalMs = intervalSec * 1_000;
89
+ const MAX_BACKOFF_MS = 5 * 60 * 1_000; // 5 minutes
90
+ let child = spawn(cmd, args, {
66
91
  stdio: "inherit",
67
- env: { ...process.env, ...data.secrets },
92
+ env: buildChildEnv(data.secrets),
68
93
  cwd,
69
94
  shell: true,
70
95
  });
71
- child.on("exit", (code) => {
72
- process.exit(code ?? 0);
96
+ // Seed ETag from version endpoint
97
+ const versionUrl = `${getApiUrl()}/api/v1/version/${org}/${project}/${env}`;
98
+ let currentEtag = null;
99
+ const seedRes = await fetch(versionUrl, {
100
+ headers: { Authorization: `Bearer ${getToken()}` },
73
101
  });
102
+ if (seedRes.ok)
103
+ currentEtag = seedRes.headers.get("etag");
104
+ let pollTimer = null;
105
+ let backoffMs = intervalMs;
106
+ const cleanup = () => {
107
+ if (pollTimer)
108
+ clearInterval(pollTimer);
109
+ if (child)
110
+ child.kill("SIGTERM");
111
+ process.exit(0);
112
+ };
113
+ process.on("SIGINT", cleanup);
114
+ process.on("SIGTERM", cleanup);
115
+ const poll = async () => {
116
+ try {
117
+ const headers = {
118
+ Authorization: `Bearer ${getToken()}`,
119
+ };
120
+ if (currentEtag)
121
+ headers["If-None-Match"] = currentEtag;
122
+ const pollRes = await fetch(versionUrl, { headers });
123
+ if (pollRes.status === 304) {
124
+ backoffMs = intervalMs; // reset backoff on success
125
+ return; // no change
126
+ }
127
+ if (pollRes.status === 429) {
128
+ backoffMs = Math.min(backoffMs * 2, MAX_BACKOFF_MS);
129
+ console.warn(chalk.yellow(t("run.watchRateLimit", { nextSec: Math.round(backoffMs / 1000) })));
130
+ // Switch to backoff timer
131
+ if (pollTimer)
132
+ clearInterval(pollTimer);
133
+ pollTimer = setTimeout(async () => {
134
+ await poll();
135
+ pollTimer = setInterval(poll, intervalMs);
136
+ }, backoffMs);
137
+ return;
138
+ }
139
+ if (!pollRes.ok) {
140
+ // Non-429 error: warn and continue polling
141
+ console.warn(chalk.yellow(t("run.watchPollError", { status: pollRes.status })));
142
+ return;
143
+ }
144
+ // 200: secrets changed
145
+ const newEtag = pollRes.headers.get("etag");
146
+ if (newEtag)
147
+ currentEtag = newEtag;
148
+ backoffMs = intervalMs;
149
+ const versionData = (await pollRes.json());
150
+ console.log(chalk.cyan(t("run.watchRestarting", { version: versionData.version })));
151
+ // Kill existing child
152
+ child.kill("SIGTERM");
153
+ // Re-fetch secrets then re-spawn
154
+ const secretsRes = await apiGet(`/secrets/${org}/${project}/${env}`);
155
+ const newData = (await secretsRes.json());
156
+ child = spawn(cmd, args, {
157
+ stdio: "inherit",
158
+ env: buildChildEnv(newData.secrets),
159
+ cwd,
160
+ shell: true,
161
+ });
162
+ // Note: do NOT chain child.on("exit") → process.exit in watch mode
163
+ }
164
+ catch (err) {
165
+ console.warn(chalk.yellow(t("run.watchPollFailed", { message: err.message })));
166
+ }
167
+ };
168
+ pollTimer = setInterval(poll, intervalMs);
169
+ console.log(chalk.dim(t("run.watchStarted", { interval: intervalSec })));
170
+ // In watch mode, the process stays alive via the poll interval
74
171
  }
75
172
  catch (err) {
76
173
  spinner.fail(t("run.runFailed", { message: err.message }));
@@ -1 +1 @@
1
- {"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,WAAW,EACX,cAAc,EACd,UAAU,EACV,mBAAmB,EACnB,oBAAoB,EACpB,eAAe,EACf,gBAAgB,EAChB,QAAQ,EACR,SAAS,GACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAC;AAE/B,SAAS,aAAa,CAAC,OAA+B;IACpD,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;IAC3C,OAAO,GAAG,CAAC,eAAe,CAAC,CAAC;IAC5B,OAAO,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC9B,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC;KACzC,WAAW,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;KACjC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,kBAAkB,CAAC,CAAC;KACjD,MAAM,CAAC,sBAAsB,EAAE,CAAC,CAAC,sBAAsB,CAAC,CAAC;KACzD,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,kBAAkB,CAAC,CAAC;KACjD,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,iBAAiB,CAAC,CAAC;KACvC,MAAM,CAAC,sBAAsB,EAAE,CAAC,CAAC,oBAAoB,CAAC,EAAE,IAAI,CAAC;KAC7D,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC;KAC7C,MAAM,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE;IAClC,MAAM,OAAO,GAAG,UAAU,CAAC,MAAO,CAAC;IACnC,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAClC,MAAM,GAAG,GAAG,mBAAmB,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IAEtE,IAAI,GAAuB,CAAC;IAC5B,IAAI,OAA2B,CAAC;IAChC,IAAI,GAAuB,CAAC;IAC5B,IAAI,GAAW,CAAC;IAEhB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QACnC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;QACnB,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QAC3B,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;QACnB,GAAG,GAAG,cAAc,EAAE,CAAC;IACzB,CAAC;SAAM,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACpC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACjD,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;QACnB,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QAC3B,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;QACnB,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;IACvD,CAAC;SAAM,CAAC;QACN,yDAAyD;QACzD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC;QACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACrE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;QACxD,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,UAAU,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IAClC,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IAE/C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,YAAY,GAAG,IAAI,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC;QAC9D,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAA0D,CAAC;QAEzF,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAE9E,8CAA8C;QAC9C,MAAM,QAAQ,GAAG,GAAG,GAAG,IAAI,OAAO,IAAI,GAAG,EAAE,CAAC;QAC5C,MAAM,aAAa,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,aAAa,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,GAAG,aAAa,EAAE,CAAC;YAClE,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,kBAAkB,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CACtF,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,WAAW,CAAC;QAEnC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,oCAAoC;YACpC,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE;gBAC7B,KAAK,EAAE,SAAS;gBAChB,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE;gBACxC,GAAG;gBACH,KAAK,EAAE,IAAI;aACZ,CAAC,CAAC;YAEH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBACxB,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;YAC1B,CAAC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,aAAa;QACb,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QACtE,MAAM,UAAU,GAAG,WAAW,GAAG,KAAK,CAAC;QACvC,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,YAAY;QAEnD,IAAI,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE;YAC3B,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC;YAChC,GAAG;YACH,KAAK,EAAE,IAAI;SACZ,CAAC,CAAC;QAEH,kCAAkC;QAClC,MAAM,UAAU,GAAG,GAAG,SAAS,EAAE,mBAAmB,GAAG,IAAI,OAAO,IAAI,GAAG,EAAE,CAAC;QAC5E,IAAI,WAAW,GAAkB,IAAI,CAAC;QAEtC,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,UAAU,EAAE;YACtC,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,QAAQ,EAAE,EAAE,EAAE;SACnD,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,EAAE;YAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE1D,IAAI,SAAS,GAA0C,IAAI,CAAC;QAC5D,IAAI,SAAS,GAAG,UAAU,CAAC;QAE3B,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,IAAI,SAAS;gBAAE,aAAa,CAAC,SAAS,CAAC,CAAC;YACxC,IAAI,KAAK;gBAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC;QAEF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC9B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAE/B,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;YACtB,IAAI,CAAC;gBACH,MAAM,OAAO,GAA2B;oBACtC,aAAa,EAAE,UAAU,QAAQ,EAAE,EAAE;iBACtC,CAAC;gBACF,IAAI,WAAW;oBAAE,OAAO,CAAC,eAAe,CAAC,GAAG,WAAW,CAAC;gBAExD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;gBAErD,IAAI,OAAO,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3B,SAAS,GAAG,UAAU,CAAC,CAAC,2BAA2B;oBACnD,OAAO,CAAC,YAAY;gBACtB,CAAC;gBAED,IAAI,OAAO,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3B,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,EAAE,cAAc,CAAC,CAAC;oBACpD,OAAO,CAAC,IAAI,CACV,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CACjF,CAAC;oBACF,0BAA0B;oBAC1B,IAAI,SAAS;wBAAE,aAAa,CAAC,SAAS,CAAC,CAAC;oBACxC,SAAS,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;wBAChC,MAAM,IAAI,EAAE,CAAC;wBACb,SAAS,GAAG,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;oBAC5C,CAAC,EAAE,SAAS,CAAQ,CAAC;oBACrB,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;oBAChB,2CAA2C;oBAC3C,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;oBAChF,OAAO;gBACT,CAAC;gBAED,uBAAuB;gBACvB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC5C,IAAI,OAAO;oBAAE,WAAW,GAAG,OAAO,CAAC;gBACnC,SAAS,GAAG,UAAU,CAAC;gBAEvB,MAAM,WAAW,GAAG,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAwB,CAAC;gBAClE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;gBAEpF,sBAAsB;gBACtB,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAEtB,iCAAiC;gBACjC,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,YAAY,GAAG,IAAI,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC;gBACrE,MAAM,OAAO,GAAG,CAAC,MAAM,UAAU,CAAC,IAAI,EAAE,CAAwC,CAAC;gBAEjF,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE;oBACvB,KAAK,EAAE,SAAS;oBAChB,GAAG,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC;oBACnC,GAAG;oBACH,KAAK,EAAE,IAAI;iBACZ,CAAC,CAAC;gBACH,mEAAmE;YACrE,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;YACjF,CAAC;QACH,CAAC,CAAC;QAEF,SAAS,GAAG,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC1C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;QACzE,+DAA+D;IACjE,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC3D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC"}
@@ -1,4 +1,4 @@
1
- import { describe, it, expect, vi, beforeEach } from "vitest";
1
+ import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
2
2
  vi.mock("../api.js", () => ({
3
3
  apiGet: vi.fn(),
4
4
  }));
@@ -46,6 +46,8 @@ vi.mock("../config.js", () => ({
46
46
  resolveWorkspaceOpts: vi.fn(),
47
47
  getVersionCache: vi.fn(() => null),
48
48
  hasProjectConfig: vi.fn(() => true),
49
+ getToken: vi.fn(() => "test-token"),
50
+ getApiUrl: vi.fn(() => "https://api.envshed.com"),
49
51
  }));
50
52
  import { apiGet } from "../api.js";
51
53
  import { getVersionCache } from "../config.js";
@@ -60,6 +62,7 @@ describe("run command", () => {
60
62
  // (we only verify spawn was called with correct args)
61
63
  spawnMock.mockImplementation(() => ({
62
64
  on: vi.fn(),
65
+ kill: vi.fn(),
63
66
  }));
64
67
  });
65
68
  it("fetches secrets and spawns command with injected env vars", async () => {
@@ -149,4 +152,334 @@ describe("run command", () => {
149
152
  expect(console.error).toHaveBeenCalledWith("run.specifyWorkspace");
150
153
  });
151
154
  });
155
+ describe("run --watch", () => {
156
+ // Captured setInterval callback and clearInterval tracking
157
+ let capturedIntervalCallback = null;
158
+ let capturedIntervalMs = null;
159
+ let intervalCleared = false;
160
+ beforeEach(() => {
161
+ capturedIntervalCallback = null;
162
+ capturedIntervalMs = null;
163
+ intervalCleared = false;
164
+ vi.spyOn(console, "log").mockImplementation(() => { });
165
+ vi.spyOn(console, "warn").mockImplementation(() => { });
166
+ vi.spyOn(console, "error").mockImplementation(() => { });
167
+ vi.spyOn(process, "exit").mockImplementation((() => { }));
168
+ spawnMock.mockImplementation(() => ({
169
+ on: vi.fn(),
170
+ kill: vi.fn(),
171
+ }));
172
+ // Intercept setInterval to capture the poll callback without actually running timers
173
+ vi.spyOn(global, "setInterval").mockImplementation((fn, ms) => {
174
+ capturedIntervalCallback = fn;
175
+ capturedIntervalMs = ms ?? 0;
176
+ // Return a fake timer ID
177
+ return 999;
178
+ });
179
+ // Intercept clearInterval to track calls
180
+ vi.spyOn(global, "clearInterval").mockImplementation(() => {
181
+ intervalCleared = true;
182
+ });
183
+ // Reset global fetch mock
184
+ vi.stubGlobal("fetch", vi.fn());
185
+ });
186
+ afterEach(() => {
187
+ // Remove all SIGINT/SIGTERM listeners added by watch mode to prevent MaxListeners warning
188
+ process.removeAllListeners("SIGINT");
189
+ process.removeAllListeners("SIGTERM");
190
+ vi.restoreAllMocks();
191
+ vi.unstubAllGlobals();
192
+ });
193
+ async function runWatchCommand(extraArgs = []) {
194
+ const { runCommand } = await import("./run.js");
195
+ const { Command } = await import("commander");
196
+ const program = new Command();
197
+ program.addCommand(runCommand);
198
+ // Don't await — watch mode never resolves on its own
199
+ program.parseAsync(["node", "test", "run", "--watch", ...extraArgs, "--", "node", "server.js"], { from: "node" }).catch(() => { });
200
+ // Allow the event loop to fully process the async action chain:
201
+ // apiGet() → .json() → fetch(seed) → .headers.get() → setInterval
202
+ // Each await in the implementation is a microtask boundary.
203
+ // Use a real setTimeout(0) to let the full chain settle.
204
+ await new Promise((r) => setTimeout(r, 50));
205
+ }
206
+ it("starts a poll timer after spawning the child process", async () => {
207
+ vi.mocked(apiGet).mockResolvedValue({
208
+ json: () => Promise.resolve({ secrets: { DB: "url" } }),
209
+ });
210
+ vi.mocked(global.fetch).mockResolvedValue({
211
+ ok: true,
212
+ status: 200,
213
+ headers: { get: (h) => (h === "etag" ? '"v1"' : null) },
214
+ json: () => Promise.resolve({ version: 1 }),
215
+ });
216
+ await runWatchCommand();
217
+ // setInterval should have been called with the poll function and default 30000ms
218
+ expect(capturedIntervalMs).toBe(30000);
219
+ expect(capturedIntervalCallback).toBeInstanceOf(Function);
220
+ });
221
+ it("sends If-None-Match header with stored ETag on subsequent polls", async () => {
222
+ vi.mocked(apiGet).mockResolvedValue({
223
+ json: () => Promise.resolve({ secrets: { DB: "url" } }),
224
+ });
225
+ const fetchMock = vi.mocked(global.fetch);
226
+ // Seed fetch returns ETag "v1"
227
+ fetchMock.mockResolvedValueOnce({
228
+ ok: true,
229
+ status: 200,
230
+ headers: { get: (h) => (h === "etag" ? '"v1"' : null) },
231
+ json: () => Promise.resolve({ version: 1 }),
232
+ });
233
+ // Poll (after interval) returns 304
234
+ fetchMock.mockResolvedValue({
235
+ ok: false,
236
+ status: 304,
237
+ headers: { get: () => null },
238
+ });
239
+ await runWatchCommand();
240
+ // Manually trigger the poll
241
+ await capturedIntervalCallback();
242
+ // The second fetch call (poll) should include If-None-Match
243
+ expect(fetchMock).toHaveBeenCalledTimes(2);
244
+ const pollCallArgs = fetchMock.mock.calls[1];
245
+ expect(pollCallArgs[1]).toMatchObject({
246
+ headers: expect.objectContaining({
247
+ "If-None-Match": '"v1"',
248
+ }),
249
+ });
250
+ });
251
+ it("does NOT kill or restart child on 304 (no change)", async () => {
252
+ vi.mocked(apiGet).mockResolvedValue({
253
+ json: () => Promise.resolve({ secrets: { DB: "url" } }),
254
+ });
255
+ const fetchMock = vi.mocked(global.fetch);
256
+ fetchMock.mockResolvedValueOnce({
257
+ ok: true,
258
+ status: 200,
259
+ headers: { get: (h) => (h === "etag" ? '"v1"' : null) },
260
+ json: () => Promise.resolve({ version: 1 }),
261
+ });
262
+ // Poll returns 304
263
+ fetchMock.mockResolvedValue({
264
+ ok: false,
265
+ status: 304,
266
+ headers: { get: () => null },
267
+ });
268
+ await runWatchCommand();
269
+ const firstChild = spawnMock.mock.results[0].value;
270
+ const spawnCallCount = spawnMock.mock.calls.length;
271
+ // Trigger poll
272
+ await capturedIntervalCallback();
273
+ // Child was NOT killed
274
+ expect(firstChild.kill).not.toHaveBeenCalled();
275
+ // No re-spawn
276
+ expect(spawnMock).toHaveBeenCalledTimes(spawnCallCount);
277
+ });
278
+ it("kills child with SIGTERM and re-spawns on 200 (version change)", async () => {
279
+ // Initial secrets fetch
280
+ vi.mocked(apiGet)
281
+ .mockResolvedValueOnce({
282
+ json: () => Promise.resolve({ secrets: { DB: "url" } }),
283
+ })
284
+ // Re-fetch after version change
285
+ .mockResolvedValueOnce({
286
+ json: () => Promise.resolve({ secrets: { DB: "new-url" } }),
287
+ });
288
+ const fetchMock = vi.mocked(global.fetch);
289
+ // Seed version fetch
290
+ fetchMock.mockResolvedValueOnce({
291
+ ok: true,
292
+ status: 200,
293
+ headers: { get: (h) => (h === "etag" ? '"v1"' : null) },
294
+ json: () => Promise.resolve({ version: 1 }),
295
+ });
296
+ // Poll returns 200 (version changed)
297
+ fetchMock.mockResolvedValue({
298
+ ok: true,
299
+ status: 200,
300
+ headers: { get: (h) => (h === "etag" ? '"v2"' : null) },
301
+ json: () => Promise.resolve({ version: 2 }),
302
+ });
303
+ await runWatchCommand();
304
+ const firstChild = spawnMock.mock.results[0].value;
305
+ // Trigger poll
306
+ await capturedIntervalCallback();
307
+ // First child killed with SIGTERM
308
+ expect(firstChild.kill).toHaveBeenCalledWith("SIGTERM");
309
+ // Re-spawn happened
310
+ expect(spawnMock).toHaveBeenCalledTimes(2);
311
+ });
312
+ it("doubles the interval on 429 (exponential backoff) and does NOT restart child", async () => {
313
+ vi.mocked(apiGet).mockResolvedValue({
314
+ json: () => Promise.resolve({ secrets: { DB: "url" } }),
315
+ });
316
+ const fetchMock = vi.mocked(global.fetch);
317
+ // Seed fetch
318
+ fetchMock.mockResolvedValueOnce({
319
+ ok: true,
320
+ status: 200,
321
+ headers: { get: (h) => (h === "etag" ? '"v1"' : null) },
322
+ json: () => Promise.resolve({ version: 1 }),
323
+ });
324
+ // Poll returns 429
325
+ fetchMock.mockResolvedValue({
326
+ ok: false,
327
+ status: 429,
328
+ headers: { get: () => null },
329
+ });
330
+ await runWatchCommand();
331
+ const firstChild = spawnMock.mock.results[0].value;
332
+ // Trigger poll
333
+ await capturedIntervalCallback();
334
+ // Child was NOT restarted
335
+ expect(firstChild.kill).not.toHaveBeenCalled();
336
+ expect(spawnMock).toHaveBeenCalledTimes(1);
337
+ // clearInterval was called to cancel the regular timer (switching to backoff)
338
+ expect(intervalCleared).toBe(true);
339
+ // Warning logged
340
+ expect(console.warn).toHaveBeenCalledWith(expect.stringContaining("run.watchRateLimit"));
341
+ });
342
+ it("logs warning on non-429 poll error and does NOT restart child", async () => {
343
+ vi.mocked(apiGet).mockResolvedValue({
344
+ json: () => Promise.resolve({ secrets: { DB: "url" } }),
345
+ });
346
+ const fetchMock = vi.mocked(global.fetch);
347
+ // Seed fetch
348
+ fetchMock.mockResolvedValueOnce({
349
+ ok: true,
350
+ status: 200,
351
+ headers: { get: (h) => (h === "etag" ? '"v1"' : null) },
352
+ json: () => Promise.resolve({ version: 1 }),
353
+ });
354
+ // Poll returns 500
355
+ fetchMock.mockResolvedValue({
356
+ ok: false,
357
+ status: 500,
358
+ headers: { get: () => null },
359
+ });
360
+ await runWatchCommand();
361
+ const firstChild = spawnMock.mock.results[0].value;
362
+ // Trigger poll
363
+ await capturedIntervalCallback();
364
+ expect(firstChild.kill).not.toHaveBeenCalled();
365
+ expect(spawnMock).toHaveBeenCalledTimes(1);
366
+ expect(console.warn).toHaveBeenCalledWith(expect.stringContaining("run.watchPollError"));
367
+ });
368
+ it("logs warning on network error (throw) and does NOT restart child", async () => {
369
+ vi.mocked(apiGet).mockResolvedValue({
370
+ json: () => Promise.resolve({ secrets: { DB: "url" } }),
371
+ });
372
+ const fetchMock = vi.mocked(global.fetch);
373
+ // Seed fetch
374
+ fetchMock.mockResolvedValueOnce({
375
+ ok: true,
376
+ status: 200,
377
+ headers: { get: (h) => (h === "etag" ? '"v1"' : null) },
378
+ json: () => Promise.resolve({ version: 1 }),
379
+ });
380
+ // Poll throws network error
381
+ fetchMock.mockRejectedValue(new Error("ECONNREFUSED"));
382
+ await runWatchCommand();
383
+ const firstChild = spawnMock.mock.results[0].value;
384
+ // Trigger poll
385
+ await capturedIntervalCallback();
386
+ expect(firstChild.kill).not.toHaveBeenCalled();
387
+ expect(spawnMock).toHaveBeenCalledTimes(1);
388
+ expect(console.warn).toHaveBeenCalledWith(expect.stringContaining("run.watchPollFailed"));
389
+ });
390
+ it("SIGINT calls clearInterval, child.kill(SIGTERM), and process.exit(0)", async () => {
391
+ vi.mocked(apiGet).mockResolvedValue({
392
+ json: () => Promise.resolve({ secrets: {} }),
393
+ });
394
+ vi.mocked(global.fetch).mockResolvedValue({
395
+ ok: true,
396
+ status: 200,
397
+ headers: { get: (h) => (h === "etag" ? '"v1"' : null) },
398
+ json: () => Promise.resolve({ version: 1 }),
399
+ });
400
+ const processOnSpy = vi.spyOn(process, "on");
401
+ await runWatchCommand();
402
+ expect(processOnSpy).toHaveBeenCalledWith("SIGINT", expect.any(Function));
403
+ const sigintHandler = processOnSpy.mock.calls.find(([event]) => event === "SIGINT")?.[1];
404
+ expect(sigintHandler).toBeDefined();
405
+ const firstChild = spawnMock.mock.results[0].value;
406
+ // Invoke the SIGINT handler
407
+ sigintHandler();
408
+ expect(intervalCleared).toBe(true);
409
+ expect(firstChild.kill).toHaveBeenCalledWith("SIGTERM");
410
+ expect(process.exit).toHaveBeenCalledWith(0);
411
+ });
412
+ it("strips ENVSHED_TOKEN from child process environment", async () => {
413
+ vi.mocked(apiGet).mockResolvedValue({
414
+ json: () => Promise.resolve({ secrets: { MY_SECRET: "value" } }),
415
+ });
416
+ vi.mocked(global.fetch).mockResolvedValue({
417
+ ok: true,
418
+ status: 200,
419
+ headers: { get: (h) => (h === "etag" ? '"v1"' : null) },
420
+ json: () => Promise.resolve({ version: 1 }),
421
+ });
422
+ // Set ENVSHED_TOKEN in process.env before running
423
+ const originalToken = process.env["ENVSHED_TOKEN"];
424
+ process.env["ENVSHED_TOKEN"] = "secret-token-value";
425
+ await runWatchCommand();
426
+ // Restore
427
+ if (originalToken === undefined) {
428
+ delete process.env["ENVSHED_TOKEN"];
429
+ }
430
+ else {
431
+ process.env["ENVSHED_TOKEN"] = originalToken;
432
+ }
433
+ const spawnCall = spawnMock.mock.calls[0];
434
+ expect(spawnCall[2].env).not.toHaveProperty("ENVSHED_TOKEN");
435
+ });
436
+ it("strips ENVSHED_API_URL from child process environment", async () => {
437
+ vi.mocked(apiGet).mockResolvedValue({
438
+ json: () => Promise.resolve({ secrets: {} }),
439
+ });
440
+ vi.mocked(global.fetch).mockResolvedValue({
441
+ ok: true,
442
+ status: 200,
443
+ headers: { get: (h) => (h === "etag" ? '"v1"' : null) },
444
+ json: () => Promise.resolve({ version: 1 }),
445
+ });
446
+ const originalApiUrl = process.env["ENVSHED_API_URL"];
447
+ process.env["ENVSHED_API_URL"] = "https://api.envshed.com";
448
+ await runWatchCommand();
449
+ if (originalApiUrl === undefined) {
450
+ delete process.env["ENVSHED_API_URL"];
451
+ }
452
+ else {
453
+ process.env["ENVSHED_API_URL"] = originalApiUrl;
454
+ }
455
+ const spawnCall = spawnMock.mock.calls[0];
456
+ expect(spawnCall[2].env).not.toHaveProperty("ENVSHED_API_URL");
457
+ });
458
+ it("--interval 15 sets poll interval to 15000ms", async () => {
459
+ vi.mocked(apiGet).mockResolvedValue({
460
+ json: () => Promise.resolve({ secrets: {} }),
461
+ });
462
+ vi.mocked(global.fetch).mockResolvedValue({
463
+ ok: true,
464
+ status: 200,
465
+ headers: { get: (h) => (h === "etag" ? '"v1"' : null) },
466
+ json: () => Promise.resolve({ version: 1 }),
467
+ });
468
+ await runWatchCommand(["--interval", "15"]);
469
+ expect(capturedIntervalMs).toBe(15000);
470
+ });
471
+ it("--interval 5 is clamped to 10s minimum (10000ms)", async () => {
472
+ vi.mocked(apiGet).mockResolvedValue({
473
+ json: () => Promise.resolve({ secrets: {} }),
474
+ });
475
+ vi.mocked(global.fetch).mockResolvedValue({
476
+ ok: true,
477
+ status: 200,
478
+ headers: { get: (h) => (h === "etag" ? '"v1"' : null) },
479
+ json: () => Promise.resolve({ version: 1 }),
480
+ });
481
+ await runWatchCommand(["--interval", "5"]);
482
+ expect(capturedIntervalMs).toBe(10000);
483
+ });
484
+ });
152
485
  //# sourceMappingURL=run.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"run.test.js","sourceRoot":"","sources":["../../src/commands/run.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"run.test.js","sourceRoot":"","sources":["../../src/commands/run.test.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -21,6 +21,9 @@ import { envVersionCommand } from "./commands/env-version.js";
21
21
  import { versionsCommand, rollbackCommand } from "./commands/versions.js";
22
22
  import { snapshotCommand } from "./commands/snapshot.js";
23
23
  import { renameEnvCommand } from "./commands/rename-env.js";
24
+ import { completionsCommand } from "./commands/completions.js";
25
+ import { diffCommand } from "./commands/diff.js";
26
+ import { importCommand } from "./commands/import.js";
24
27
  const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
25
28
  const program = new Command();
26
29
  program
@@ -33,6 +36,8 @@ program
33
36
  program.addCommand(loginCommand);
34
37
  program.addCommand(pullCommand);
35
38
  program.addCommand(pushCommand);
39
+ program.addCommand(diffCommand);
40
+ program.addCommand(importCommand);
36
41
  program.addCommand(runCommand);
37
42
  program.addCommand(listOrgsCommand);
38
43
  program.addCommand(listProjectsCommand);
@@ -50,6 +55,7 @@ program.addCommand(versionsCommand);
50
55
  program.addCommand(rollbackCommand);
51
56
  program.addCommand(snapshotCommand);
52
57
  program.addCommand(renameEnvCommand);
58
+ program.addCommand(completionsCommand);
53
59
  // pnpm inserts "--" between the script and args (e.g. tsx src/index.ts -- pull --force)
54
60
  // which causes Commander to treat flags as positional arguments. Strip it.
55
61
  const argv = process.argv.slice();
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,17 @@
1
+ /**
2
+ * Compute the diff between two sets of secrets.
3
+ * Returns categorized lists of keys: added, removed, changed, unchanged.
4
+ */
5
+ export declare function computeDiff(a: Record<string, string>, b: Record<string, string>): {
6
+ added: string[];
7
+ removed: string[];
8
+ changed: string[];
9
+ unchanged: string[];
10
+ };
11
+ /**
12
+ * Render a color-coded diff table to stdout.
13
+ * Values are masked as *** by default; pass showValues=true to reveal them.
14
+ * Green = added, red = removed, yellow = changed.
15
+ */
16
+ export declare function renderDiffTable(envA: string, envB: string, a: Record<string, string>, b: Record<string, string>, showValues: boolean): void;
17
+ //# sourceMappingURL=diff-renderer.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"diff-renderer.d.ts","sourceRoot":"","sources":["../../src/lib/diff-renderer.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,WAAW,CACzB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACzB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACxB;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAuBhF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACzB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACzB,UAAU,EAAE,OAAO,GAClB,IAAI,CAmDN"}