@udondan/avanti 0.19.1 → 0.21.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.
- package/README.md +239 -27
- package/dist/commands/diff.d.ts.map +1 -1
- package/dist/commands/diff.js +51 -12
- package/dist/commands/diff.js.map +1 -1
- package/dist/commands/lock.d.ts.map +1 -1
- package/dist/commands/lock.js +19 -5
- package/dist/commands/lock.js.map +1 -1
- package/dist/commands/pull.d.ts.map +1 -1
- package/dist/commands/pull.js +135 -15
- package/dist/commands/pull.js.map +1 -1
- package/dist/commands/reset.d.ts.map +1 -1
- package/dist/commands/reset.js +1 -1
- package/dist/commands/reset.js.map +1 -1
- package/dist/commands/revert.d.ts.map +1 -1
- package/dist/commands/revert.js +1 -1
- package/dist/commands/revert.js.map +1 -1
- package/dist/condition.d.ts +4 -0
- package/dist/condition.d.ts.map +1 -0
- package/dist/condition.js +86 -0
- package/dist/condition.js.map +1 -0
- package/dist/config-writeback.d.ts.map +1 -1
- package/dist/config-writeback.js +26 -3
- package/dist/config-writeback.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +278 -34
- package/dist/config.js.map +1 -1
- package/dist/history.d.ts +9 -0
- package/dist/history.d.ts.map +1 -1
- package/dist/history.js +59 -1
- package/dist/history.js.map +1 -1
- package/dist/processors/insert.d.ts +3 -0
- package/dist/processors/insert.d.ts.map +1 -0
- package/dist/processors/insert.js +285 -0
- package/dist/processors/insert.js.map +1 -0
- package/dist/processors/json.d.ts +1 -1
- package/dist/processors/json.d.ts.map +1 -1
- package/dist/processors/json.js +124 -3
- package/dist/processors/json.js.map +1 -1
- package/dist/sources/index.d.ts +6 -2
- package/dist/sources/index.d.ts.map +1 -1
- package/dist/sources/index.js +89 -16
- package/dist/sources/index.js.map +1 -1
- package/dist/sources/s3.d.ts +1 -1
- package/dist/sources/s3.d.ts.map +1 -1
- package/dist/sources/s3.js +49 -48
- package/dist/sources/s3.js.map +1 -1
- package/dist/sources/secrets-manager.d.ts +5 -0
- package/dist/sources/secrets-manager.d.ts.map +1 -0
- package/dist/sources/secrets-manager.js +48 -0
- package/dist/sources/secrets-manager.js.map +1 -0
- package/dist/sources/ssm.d.ts +5 -0
- package/dist/sources/ssm.d.ts.map +1 -0
- package/dist/sources/ssm.js +79 -0
- package/dist/sources/ssm.js.map +1 -0
- package/dist/types.d.ts +68 -4
- package/dist/types.d.ts.map +1 -1
- package/dist/variables-remote.d.ts +4 -0
- package/dist/variables-remote.d.ts.map +1 -0
- package/dist/variables-remote.js +52 -0
- package/dist/variables-remote.js.map +1 -0
- package/dist/variables.d.ts +2 -2
- package/dist/variables.d.ts.map +1 -1
- package/dist/variables.js.map +1 -1
- package/dist/writer.d.ts.map +1 -1
- package/dist/writer.js +1 -1
- package/dist/writer.js.map +1 -1
- package/package.json +5 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../src/commands/lock.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../src/commands/lock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuRpC,wBAAgB,WAAW,IAAI,OAAO,CAubrC"}
|
package/dist/commands/pull.js
CHANGED
|
@@ -35,35 +35,107 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.pullCommand = pullCommand;
|
|
37
37
|
const commander_1 = require("commander");
|
|
38
|
+
const fs = __importStar(require("fs"));
|
|
38
39
|
const path = __importStar(require("path"));
|
|
39
40
|
const config_1 = require("../config");
|
|
41
|
+
const condition_1 = require("../condition");
|
|
40
42
|
const sources_1 = require("../sources");
|
|
41
43
|
const replace_1 = require("../processors/replace");
|
|
42
44
|
const post_1 = require("../processors/post");
|
|
45
|
+
const insert_1 = require("../processors/insert");
|
|
43
46
|
const binary_1 = require("../binary");
|
|
44
47
|
const diff_1 = require("../diff");
|
|
45
48
|
const writer_1 = require("../writer");
|
|
46
49
|
const history_1 = require("../history");
|
|
47
50
|
const prompt_1 = require("../prompt");
|
|
48
51
|
const config_writeback_1 = require("../config-writeback");
|
|
49
|
-
|
|
50
|
-
|
|
52
|
+
const variables_remote_1 = require("../variables-remote");
|
|
53
|
+
async function runFetchLoop(config, workingDir, cache, configPath, history) {
|
|
54
|
+
let vars;
|
|
55
|
+
try {
|
|
56
|
+
vars = await (0, variables_remote_1.resolveVariableSpec)(config.variables ?? {}, workingDir, cache);
|
|
57
|
+
}
|
|
58
|
+
catch (err) {
|
|
59
|
+
console.error(err instanceof Error ? err.message : String(err));
|
|
60
|
+
return {
|
|
61
|
+
writeTargets: [],
|
|
62
|
+
allDiffs: [],
|
|
63
|
+
hasError: true,
|
|
64
|
+
shaErrors: [],
|
|
65
|
+
sourceRecordsByTarget: new Map(),
|
|
66
|
+
skippedPaths: new Set(),
|
|
67
|
+
hasUnresolvableSkippedPath: false,
|
|
68
|
+
insertedFragments: new Map(),
|
|
69
|
+
};
|
|
70
|
+
}
|
|
51
71
|
const writeTargets = [];
|
|
52
72
|
const allDiffs = [];
|
|
53
73
|
const shaErrors = [];
|
|
54
74
|
const seenShaErrorLabels = new Set();
|
|
55
75
|
const sourceRecordsByTarget = new Map();
|
|
76
|
+
const skippedPaths = new Set();
|
|
77
|
+
const insertedFragments = new Map();
|
|
78
|
+
let hasUnresolvableSkippedPath = false;
|
|
56
79
|
let hasError = false;
|
|
57
80
|
let selfContent;
|
|
58
81
|
let selfMode;
|
|
59
82
|
let selfSourceRecords;
|
|
60
|
-
|
|
83
|
+
let hasSelf = config_1.SELF_KEY in config.files;
|
|
84
|
+
if (hasSelf) {
|
|
85
|
+
const selfEntry = config.files[config_1.SELF_KEY];
|
|
86
|
+
try {
|
|
87
|
+
hasSelf = (0, condition_1.evaluateConditions)(selfEntry['if'], selfEntry.ifAny, () => configPath !== undefined
|
|
88
|
+
? configPath
|
|
89
|
+
: (0, diff_1.resolveTargetPath)(selfEntry, '', workingDir, vars), workingDir, vars);
|
|
90
|
+
}
|
|
91
|
+
catch (err) {
|
|
92
|
+
console.error(`Error processing ${config_1.SELF_KEY}: ${err instanceof Error ? err.message : String(err)}`);
|
|
93
|
+
return {
|
|
94
|
+
writeTargets,
|
|
95
|
+
allDiffs,
|
|
96
|
+
hasError: true,
|
|
97
|
+
shaErrors,
|
|
98
|
+
sourceRecordsByTarget,
|
|
99
|
+
skippedPaths,
|
|
100
|
+
hasUnresolvableSkippedPath,
|
|
101
|
+
insertedFragments,
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
// $self was condition-skipped: protect configPath from stale cleanup so a
|
|
105
|
+
// previously-written config file is not restored or deleted on this run.
|
|
106
|
+
if (!hasSelf &&
|
|
107
|
+
configPath !== undefined &&
|
|
108
|
+
!(0, config_1.isRemoteConfigSpec)(configPath)) {
|
|
109
|
+
skippedPaths.add(configPath);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
61
112
|
for (const [key, entry] of Object.entries(config.files)) {
|
|
62
113
|
const isSelf = key === config_1.SELF_KEY;
|
|
63
|
-
if (hasSelf
|
|
114
|
+
if (hasSelf !== isSelf)
|
|
64
115
|
continue;
|
|
65
116
|
try {
|
|
66
|
-
|
|
117
|
+
if (!isSelf &&
|
|
118
|
+
!(0, condition_1.evaluateConditions)(entry['if'], entry.ifAny, () => (0, diff_1.resolveTargetPath)(entry, '', workingDir, vars), workingDir, vars)) {
|
|
119
|
+
try {
|
|
120
|
+
skippedPaths.add((0, diff_1.resolveTargetPath)(entry, '', workingDir, vars));
|
|
121
|
+
}
|
|
122
|
+
catch {
|
|
123
|
+
console.warn(`Warning: skipped entry has an unresolvable target path — stale cleanup disabled for this run.`);
|
|
124
|
+
hasUnresolvableSkippedPath = true;
|
|
125
|
+
}
|
|
126
|
+
continue;
|
|
127
|
+
}
|
|
128
|
+
const result = await (0, sources_1.fetchSource)(entry, workingDir, vars, cache, isSelf && configPath !== undefined ? () => configPath : undefined);
|
|
129
|
+
if (result.allSkipped && !isSelf) {
|
|
130
|
+
try {
|
|
131
|
+
skippedPaths.add((0, diff_1.resolveTargetPath)(entry, '', workingDir, vars));
|
|
132
|
+
}
|
|
133
|
+
catch {
|
|
134
|
+
console.warn(`Warning: skipped entry has an unresolvable target path — stale cleanup disabled for this run.`);
|
|
135
|
+
hasUnresolvableSkippedPath = true;
|
|
136
|
+
}
|
|
137
|
+
continue;
|
|
138
|
+
}
|
|
67
139
|
for (const rec of result.sourceRecords) {
|
|
68
140
|
if (!rec.matched && !seenShaErrorLabels.has(rec.sourceLabel)) {
|
|
69
141
|
seenShaErrorLabels.add(rec.sourceLabel);
|
|
@@ -81,11 +153,29 @@ async function runFetchLoop(config, workingDir, cache) {
|
|
|
81
153
|
let content = rawContent;
|
|
82
154
|
if (!(0, binary_1.isBinary)(content)) {
|
|
83
155
|
// Processors only operate on text; binary files are passed through unchanged.
|
|
84
|
-
|
|
156
|
+
const rawText = content.toString('utf8');
|
|
157
|
+
let text = rawText;
|
|
85
158
|
if (entry.replace?.length)
|
|
86
159
|
text = (0, replace_1.applyReplace)(text, entry.replace, vars);
|
|
87
160
|
if (entry.post)
|
|
88
161
|
text = (0, post_1.applyPost)(text, entry.post, vars);
|
|
162
|
+
if (entry.strategy === 'insert' && !isSelf) {
|
|
163
|
+
const targetPath = (0, diff_1.resolveTargetPath)(entry, relPath, workingDir, vars);
|
|
164
|
+
const lastInserted = history?.getInsertedFragment(targetPath) ?? null;
|
|
165
|
+
if (lastInserted !== null &&
|
|
166
|
+
rawText === lastInserted.raw &&
|
|
167
|
+
text === lastInserted.processed &&
|
|
168
|
+
fs.existsSync(targetPath)) {
|
|
169
|
+
skippedPaths.add(targetPath); // keep stale detection from treating this as missing
|
|
170
|
+
continue; // source and processed output unchanged — skip write entirely (no-op)
|
|
171
|
+
}
|
|
172
|
+
const processedText = text;
|
|
173
|
+
text = (0, insert_1.applyInsertMode)(entry, processedText, lastInserted?.processed ?? null, targetPath);
|
|
174
|
+
insertedFragments.set(targetPath, {
|
|
175
|
+
raw: rawText,
|
|
176
|
+
processed: processedText,
|
|
177
|
+
});
|
|
178
|
+
}
|
|
89
179
|
content = Buffer.from(text, 'utf8');
|
|
90
180
|
}
|
|
91
181
|
if (isSelf) {
|
|
@@ -104,7 +194,7 @@ async function runFetchLoop(config, workingDir, cache) {
|
|
|
104
194
|
}
|
|
105
195
|
}
|
|
106
196
|
catch (err) {
|
|
107
|
-
console.error(`Error processing ${JSON.stringify(entry.src)}: ${err.message}`);
|
|
197
|
+
console.error(`Error processing ${JSON.stringify(entry.src)}: ${err instanceof Error ? err.message : String(err)}`);
|
|
108
198
|
hasError = true;
|
|
109
199
|
}
|
|
110
200
|
}
|
|
@@ -114,6 +204,9 @@ async function runFetchLoop(config, workingDir, cache) {
|
|
|
114
204
|
hasError,
|
|
115
205
|
shaErrors,
|
|
116
206
|
sourceRecordsByTarget,
|
|
207
|
+
skippedPaths,
|
|
208
|
+
hasUnresolvableSkippedPath,
|
|
209
|
+
insertedFragments,
|
|
117
210
|
selfContent,
|
|
118
211
|
selfMode,
|
|
119
212
|
selfSourceRecords,
|
|
@@ -144,15 +237,18 @@ function pullCommand() {
|
|
|
144
237
|
config = await (0, config_1.loadConfig)(configPath, via);
|
|
145
238
|
}
|
|
146
239
|
catch (err) {
|
|
147
|
-
console.error(err.message);
|
|
240
|
+
console.error(err instanceof Error ? err.message : String(err));
|
|
148
241
|
process.exit(2);
|
|
149
242
|
}
|
|
150
243
|
const history = new history_1.HistoryManager((0, config_1.normalizeConfigKey)(configPath), workingDir);
|
|
151
244
|
const historyAvailable = history.ensureStorageDir();
|
|
152
245
|
const pullId = historyAvailable ? history.openPullSession() : null;
|
|
153
246
|
const fetchCache = new Map();
|
|
154
|
-
const firstPass = await runFetchLoop(config, workingDir, fetchCache);
|
|
247
|
+
const firstPass = await runFetchLoop(config, workingDir, fetchCache, configPath, history);
|
|
155
248
|
let { writeTargets, allDiffs, sourceRecordsByTarget } = firstPass;
|
|
249
|
+
let insertedFragments = firstPass.insertedFragments;
|
|
250
|
+
let skippedPaths = firstPass.skippedPaths;
|
|
251
|
+
let hasUnresolvableSkippedPath = firstPass.hasUnresolvableSkippedPath;
|
|
156
252
|
if (firstPass.hasError) {
|
|
157
253
|
console.error('Aborting due to errors.');
|
|
158
254
|
process.exit(2);
|
|
@@ -177,7 +273,7 @@ function pullCommand() {
|
|
|
177
273
|
currentConfig = (0, config_1.parseConfigContent)(currentSelfContent);
|
|
178
274
|
}
|
|
179
275
|
catch (err) {
|
|
180
|
-
console.error(`$self config is invalid: ${err.message}`);
|
|
276
|
+
console.error(`$self config is invalid: ${err instanceof Error ? err.message : String(err)}`);
|
|
181
277
|
process.exit(2);
|
|
182
278
|
}
|
|
183
279
|
// Stable when: merged config has no $self, or fetching $self produced
|
|
@@ -188,7 +284,7 @@ function pullCommand() {
|
|
|
188
284
|
break;
|
|
189
285
|
}
|
|
190
286
|
console.log('$self config resolved; re-evaluating with merged config...');
|
|
191
|
-
const next = await runFetchLoop(currentConfig, workingDir, fetchCache);
|
|
287
|
+
const next = await runFetchLoop(currentConfig, workingDir, fetchCache, configPath, history);
|
|
192
288
|
if (next.hasError) {
|
|
193
289
|
console.error('Aborting due to errors in $self re-evaluated config.');
|
|
194
290
|
process.exit(2);
|
|
@@ -222,7 +318,7 @@ function pullCommand() {
|
|
|
222
318
|
filesWithoutSelf[k] = v;
|
|
223
319
|
}
|
|
224
320
|
if (Object.keys(filesWithoutSelf).length > 0) {
|
|
225
|
-
const second = await runFetchLoop({ ...stableConfig, files: filesWithoutSelf }, workingDir, fetchCache);
|
|
321
|
+
const second = await runFetchLoop({ ...stableConfig, files: filesWithoutSelf }, workingDir, fetchCache, configPath, history);
|
|
226
322
|
if (second.hasError) {
|
|
227
323
|
console.error('Aborting due to errors.');
|
|
228
324
|
process.exit(2);
|
|
@@ -235,6 +331,10 @@ function pullCommand() {
|
|
|
235
331
|
writeTargets = second.writeTargets;
|
|
236
332
|
allDiffs = second.allDiffs;
|
|
237
333
|
sourceRecordsByTarget = second.sourceRecordsByTarget;
|
|
334
|
+
insertedFragments = second.insertedFragments;
|
|
335
|
+
skippedPaths = second.skippedPaths;
|
|
336
|
+
if (second.hasUnresolvableSkippedPath)
|
|
337
|
+
hasUnresolvableSkippedPath = true;
|
|
238
338
|
const seenInSecond = new Set(firstPass.shaErrors.map((e) => e.sourceLabel));
|
|
239
339
|
for (const e of second.shaErrors) {
|
|
240
340
|
if (!seenInSecond.has(e.sourceLabel))
|
|
@@ -279,12 +379,21 @@ function pullCommand() {
|
|
|
279
379
|
const staleToDelete = [];
|
|
280
380
|
const staleToRestore = [];
|
|
281
381
|
const staleDiffs = [];
|
|
282
|
-
if (historyAvailable) {
|
|
382
|
+
if (historyAvailable && !hasUnresolvableSkippedPath) {
|
|
283
383
|
const lastFiles = history.getLastPullFiles();
|
|
284
384
|
const currentPaths = new Set(writeTargets.map((t) => t.targetPath));
|
|
385
|
+
const skippedPathsArr = [...skippedPaths];
|
|
285
386
|
for (const ref of lastFiles) {
|
|
286
387
|
if (currentPaths.has(ref.absolutePath))
|
|
287
388
|
continue;
|
|
389
|
+
// Files covered by a skipped (condition-gated) entry should not be
|
|
390
|
+
// treated as stale — the entry is still in the config, it just didn't
|
|
391
|
+
// run this time. Exact match for file entries; prefix match for
|
|
392
|
+
// directory entries (whose resolved base path is the directory itself).
|
|
393
|
+
const coveredBySkipped = skippedPathsArr.some((sp) => ref.absolutePath === sp ||
|
|
394
|
+
ref.absolutePath.startsWith(sp + path.sep));
|
|
395
|
+
if (coveredBySkipped)
|
|
396
|
+
continue;
|
|
288
397
|
const meta = history.getFileMeta(ref.absolutePath);
|
|
289
398
|
if (!meta)
|
|
290
399
|
continue;
|
|
@@ -313,6 +422,11 @@ function pullCommand() {
|
|
|
313
422
|
printShaErrors(firstPass.shaErrors);
|
|
314
423
|
}
|
|
315
424
|
if (!hasChanges && firstPass.shaErrors.length === 0) {
|
|
425
|
+
if (historyAvailable && insertedFragments.size > 0) {
|
|
426
|
+
for (const [targetPath, fragment] of insertedFragments) {
|
|
427
|
+
history.saveInsertedFragment(targetPath, fragment.raw, fragment.processed);
|
|
428
|
+
}
|
|
429
|
+
}
|
|
316
430
|
console.log('Nothing to do.');
|
|
317
431
|
process.exit(0);
|
|
318
432
|
}
|
|
@@ -397,9 +511,15 @@ function pullCommand() {
|
|
|
397
511
|
console.log(`Wrote ${written} file(s).`);
|
|
398
512
|
}
|
|
399
513
|
catch (err) {
|
|
400
|
-
console.error(`Write failed: ${err.message}`);
|
|
514
|
+
console.error(`Write failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
401
515
|
process.exit(2);
|
|
402
516
|
}
|
|
517
|
+
// Save inserted fragments to history for future idempotency detection
|
|
518
|
+
if (historyAvailable && insertedFragments.size > 0) {
|
|
519
|
+
for (const [targetPath, fragment] of insertedFragments) {
|
|
520
|
+
history.saveInsertedFragment(targetPath, fragment.raw, fragment.processed);
|
|
521
|
+
}
|
|
522
|
+
}
|
|
403
523
|
// SHA writeback: write updated sha values into config file after all writes complete.
|
|
404
524
|
// Skipped when config was a write target and already patched in-memory above.
|
|
405
525
|
if (shaUpdates !== null && !configShaPreApplied) {
|
|
@@ -409,7 +529,7 @@ function pullCommand() {
|
|
|
409
529
|
console.log(`Updated ${shaUpdates.size} SHA pin(s) in config.`);
|
|
410
530
|
}
|
|
411
531
|
catch (err) {
|
|
412
|
-
console.warn(`Warning: could not update SHA values in config: ${err.message}`);
|
|
532
|
+
console.warn(`Warning: could not update SHA values in config: ${err instanceof Error ? err.message : String(err)}`);
|
|
413
533
|
}
|
|
414
534
|
}
|
|
415
535
|
// Only record to pulls.jsonl if at least one file was staged (written or
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reset.d.ts","sourceRoot":"","sources":["../../src/commands/reset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASpC,wBAAgB,YAAY,IAAI,OAAO,
|
|
1
|
+
{"version":3,"file":"reset.d.ts","sourceRoot":"","sources":["../../src/commands/reset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASpC,wBAAgB,YAAY,IAAI,OAAO,CA0FtC"}
|
package/dist/commands/reset.js
CHANGED
|
@@ -107,7 +107,7 @@ function resetCommand() {
|
|
|
107
107
|
console.log(`Restored ${writeTargets.length} file(s), deleted ${deletions.length} file(s).`);
|
|
108
108
|
}
|
|
109
109
|
catch (err) {
|
|
110
|
-
console.error(`Reset failed: ${err.message}`);
|
|
110
|
+
console.error(`Reset failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
111
111
|
process.exit(2);
|
|
112
112
|
}
|
|
113
113
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../src/commands/reset.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA,
|
|
1
|
+
{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../src/commands/reset.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revert.d.ts","sourceRoot":"","sources":["../../src/commands/revert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASpC,wBAAgB,aAAa,IAAI,OAAO,
|
|
1
|
+
{"version":3,"file":"revert.d.ts","sourceRoot":"","sources":["../../src/commands/revert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASpC,wBAAgB,aAAa,IAAI,OAAO,CA2JvC"}
|
package/dist/commands/revert.js
CHANGED
|
@@ -154,7 +154,7 @@ function revertCommand() {
|
|
|
154
154
|
console.log(`Reverted ${writeTargets.length + deletions.length} file(s).`);
|
|
155
155
|
}
|
|
156
156
|
catch (err) {
|
|
157
|
-
console.error(`Revert failed: ${err.message}`);
|
|
157
|
+
console.error(`Revert failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
158
158
|
process.exit(2);
|
|
159
159
|
}
|
|
160
160
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revert.js","sourceRoot":"","sources":["../../src/commands/revert.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA,
|
|
1
|
+
{"version":3,"file":"revert.js","sourceRoot":"","sources":["../../src/commands/revert.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { Condition, Variables } from './types';
|
|
2
|
+
export declare function evaluateCondition(cond: Condition, getTargetPath: () => string, workingDir: string, vars: Variables): boolean;
|
|
3
|
+
export declare function evaluateConditions(ifCond: Condition | Condition[] | undefined, ifAnyCond: Condition[] | undefined, getTargetPath: () => string, workingDir: string, vars: Variables): boolean;
|
|
4
|
+
//# sourceMappingURL=condition.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"condition.d.ts","sourceRoot":"","sources":["../src/condition.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAI/C,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,MAAM,MAAM,EAC3B,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,SAAS,GACd,OAAO,CAwBT;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,SAAS,GAAG,SAAS,EAAE,GAAG,SAAS,EAC3C,SAAS,EAAE,SAAS,EAAE,GAAG,SAAS,EAClC,aAAa,EAAE,MAAM,MAAM,EAC3B,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,SAAS,GACd,OAAO,CAgBT"}
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.evaluateCondition = evaluateCondition;
|
|
37
|
+
exports.evaluateConditions = evaluateConditions;
|
|
38
|
+
const os = __importStar(require("os"));
|
|
39
|
+
const path = __importStar(require("path"));
|
|
40
|
+
const fs_1 = require("fs");
|
|
41
|
+
const child_process_1 = require("child_process");
|
|
42
|
+
const variables_1 = require("./variables");
|
|
43
|
+
const shell_1 = require("./shell");
|
|
44
|
+
function evaluateCondition(cond, getTargetPath, workingDir, vars) {
|
|
45
|
+
let result = true;
|
|
46
|
+
if (cond.os !== undefined) {
|
|
47
|
+
const platforms = Array.isArray(cond.os) ? cond.os : [cond.os];
|
|
48
|
+
if (!platforms.includes(currentPlatform()))
|
|
49
|
+
result = false;
|
|
50
|
+
}
|
|
51
|
+
if (result && cond.exists !== undefined) {
|
|
52
|
+
let existsPath = (0, variables_1.resolveVars)(cond.exists, vars);
|
|
53
|
+
if (existsPath.startsWith('~/')) {
|
|
54
|
+
existsPath = path.join(os.homedir(), existsPath.slice(2));
|
|
55
|
+
}
|
|
56
|
+
result = (0, fs_1.existsSync)(path.resolve(workingDir, existsPath));
|
|
57
|
+
}
|
|
58
|
+
if (result && cond.exec !== undefined) {
|
|
59
|
+
const { shell, args } = (0, shell_1.getShellArgs)((0, variables_1.resolveVarsShellSafe)(cond.exec, vars));
|
|
60
|
+
result =
|
|
61
|
+
(0, child_process_1.spawnSync)(shell, args, { cwd: workingDir, stdio: 'ignore' }).status === 0;
|
|
62
|
+
}
|
|
63
|
+
if (result && cond.target_exists === true) {
|
|
64
|
+
result = (0, fs_1.existsSync)(getTargetPath());
|
|
65
|
+
}
|
|
66
|
+
return cond.not === true ? !result : result;
|
|
67
|
+
}
|
|
68
|
+
function evaluateConditions(ifCond, ifAnyCond, getTargetPath, workingDir, vars) {
|
|
69
|
+
if (ifCond !== undefined) {
|
|
70
|
+
const list = Array.isArray(ifCond) ? ifCond : [ifCond];
|
|
71
|
+
if (!list.every((c) => evaluateCondition(c, getTargetPath, workingDir, vars)))
|
|
72
|
+
return false;
|
|
73
|
+
}
|
|
74
|
+
if (ifAnyCond !== undefined &&
|
|
75
|
+
!ifAnyCond.some((c) => evaluateCondition(c, getTargetPath, workingDir, vars)))
|
|
76
|
+
return false;
|
|
77
|
+
return true;
|
|
78
|
+
}
|
|
79
|
+
function currentPlatform() {
|
|
80
|
+
if (process.platform === 'win32')
|
|
81
|
+
return 'windows';
|
|
82
|
+
if (process.platform === 'darwin')
|
|
83
|
+
return 'mac';
|
|
84
|
+
return process.platform;
|
|
85
|
+
}
|
|
86
|
+
//# sourceMappingURL=condition.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"condition.js","sourceRoot":"","sources":["../src/condition.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-writeback.d.ts","sourceRoot":"","sources":["../src/config-writeback.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,MAAM,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"config-writeback.d.ts","sourceRoot":"","sources":["../src/config-writeback.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,MAAM,GAAG,IAAI,CAuLf;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAWT"}
|
package/dist/config-writeback.js
CHANGED
|
@@ -138,13 +138,36 @@ function applyUpdatedShas(raw, updates) {
|
|
|
138
138
|
shaPath = [...srcBase, 'sha'];
|
|
139
139
|
}
|
|
140
140
|
}
|
|
141
|
-
else if (n.get('
|
|
142
|
-
const s3 = n.get('
|
|
141
|
+
else if (n.get('aws_s3') !== undefined) {
|
|
142
|
+
const s3 = n.get('aws_s3');
|
|
143
143
|
if (s3) {
|
|
144
|
-
label = `
|
|
144
|
+
label = `aws_s3:${s3}`;
|
|
145
145
|
shaPath = [...srcBase, 'sha'];
|
|
146
146
|
}
|
|
147
147
|
}
|
|
148
|
+
else if (n.get('aws_secrets_manager')) {
|
|
149
|
+
const sm = n.get('aws_secrets_manager');
|
|
150
|
+
if (sm?.get) {
|
|
151
|
+
const smName = sm.get('name');
|
|
152
|
+
const smKey = sm.get('key');
|
|
153
|
+
const smRegion = sm.get('region');
|
|
154
|
+
if (smName) {
|
|
155
|
+
label = `aws_secrets_manager:${smName}${smKey ? `#${smKey}` : ''}${smRegion ? `@${smRegion}` : ''}`;
|
|
156
|
+
shaPath = [...srcBase, 'aws_secrets_manager', 'sha'];
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
else if (n.get('aws_systems_manager_parameter')) {
|
|
161
|
+
const ssm = n.get('aws_systems_manager_parameter');
|
|
162
|
+
if (ssm?.get) {
|
|
163
|
+
const ssmName = ssm.get('name');
|
|
164
|
+
const ssmRegion = ssm.get('region');
|
|
165
|
+
if (ssmName) {
|
|
166
|
+
label = `aws_systems_manager_parameter:${ssmName}${ssmRegion ? `@${ssmRegion}` : ''}`;
|
|
167
|
+
shaPath = [...srcBase, 'aws_systems_manager_parameter', 'sha'];
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
}
|
|
148
171
|
else if (n.get('vault')) {
|
|
149
172
|
const vt = n.get('vault');
|
|
150
173
|
if (vt?.get) {
|