@udondan/avanti 0.15.0 → 0.17.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 +147 -2
- package/dist/binary.d.ts +2 -0
- package/dist/binary.d.ts.map +1 -0
- package/dist/binary.js +13 -0
- package/dist/binary.js.map +1 -0
- package/dist/cli.js +7 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/diff.d.ts.map +1 -1
- package/dist/commands/diff.js +13 -7
- package/dist/commands/diff.js.map +1 -1
- package/dist/commands/pull.d.ts.map +1 -1
- package/dist/commands/pull.js +20 -12
- package/dist/commands/pull.js.map +1 -1
- package/dist/config-writeback.d.ts.map +1 -1
- package/dist/config-writeback.js +12 -4
- package/dist/config-writeback.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +64 -6
- package/dist/config.js.map +1 -1
- package/dist/diff.d.ts +3 -1
- package/dist/diff.d.ts.map +1 -1
- package/dist/diff.js +35 -4
- package/dist/diff.js.map +1 -1
- package/dist/fetch.d.ts +1 -0
- package/dist/fetch.d.ts.map +1 -1
- package/dist/fetch.js +57 -1
- package/dist/fetch.js.map +1 -1
- package/dist/history.d.ts +2 -2
- package/dist/history.js +4 -4
- package/dist/history.js.map +1 -1
- package/dist/logger.d.ts +4 -0
- package/dist/logger.d.ts.map +1 -0
- package/dist/logger.js +17 -0
- package/dist/logger.js.map +1 -0
- package/dist/processors/toml.d.ts +4 -0
- package/dist/processors/toml.d.ts.map +1 -0
- package/dist/processors/toml.js +100 -0
- package/dist/processors/toml.js.map +1 -0
- package/dist/sha.d.ts +1 -1
- package/dist/sha.d.ts.map +1 -1
- package/dist/sha.js +8 -1
- package/dist/sha.js.map +1 -1
- package/dist/sources/bitbucket.d.ts +2 -2
- package/dist/sources/bitbucket.d.ts.map +1 -1
- package/dist/sources/bitbucket.js +26 -18
- package/dist/sources/bitbucket.js.map +1 -1
- package/dist/sources/exec.d.ts +1 -1
- package/dist/sources/exec.d.ts.map +1 -1
- package/dist/sources/exec.js +8 -3
- package/dist/sources/exec.js.map +1 -1
- package/dist/sources/git.d.ts +7 -1
- package/dist/sources/git.d.ts.map +1 -1
- package/dist/sources/git.js +53 -2
- package/dist/sources/git.js.map +1 -1
- package/dist/sources/github.d.ts +2 -2
- package/dist/sources/github.d.ts.map +1 -1
- package/dist/sources/github.js +52 -32
- package/dist/sources/github.js.map +1 -1
- package/dist/sources/gitlab.d.ts +2 -2
- package/dist/sources/gitlab.d.ts.map +1 -1
- package/dist/sources/gitlab.js +82 -46
- package/dist/sources/gitlab.js.map +1 -1
- package/dist/sources/http.d.ts +4 -4
- package/dist/sources/http.js +1 -1
- package/dist/sources/http.js.map +1 -1
- package/dist/sources/index.d.ts +8 -3
- package/dist/sources/index.d.ts.map +1 -1
- package/dist/sources/index.js +164 -20
- package/dist/sources/index.js.map +1 -1
- package/dist/sources/local.d.ts +1 -1
- package/dist/sources/local.d.ts.map +1 -1
- package/dist/sources/local.js +4 -2
- package/dist/sources/local.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 +25 -19
- package/dist/sources/s3.js.map +1 -1
- package/dist/sources/vault.d.ts +1 -1
- package/dist/sources/vault.d.ts.map +1 -1
- package/dist/sources/vault.js +15 -6
- package/dist/sources/vault.js.map +1 -1
- package/dist/types.d.ts +12 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/writer.d.ts +1 -1
- package/dist/writer.js +1 -1
- package/dist/writer.js.map +1 -1
- package/package.json +2 -1
package/README.md
CHANGED
|
@@ -129,6 +129,7 @@ avanti [options] [command]
|
|
|
129
129
|
Options:
|
|
130
130
|
-c, --config <path|url> path or remote spec for config file (default: auto-detected)
|
|
131
131
|
-w, --working-dir <path> working directory for resolving paths (default: current directory)
|
|
132
|
+
-v, --verbose print verbose debug output to stderr
|
|
132
133
|
|
|
133
134
|
Commands:
|
|
134
135
|
diff [pullId] Show diff between remote sources and local files, or vs a past pull
|
|
@@ -271,6 +272,25 @@ Apply? [y/N]
|
|
|
271
272
|
|
|
272
273
|
Use `--yes` to skip the prompt. The history log is preserved — you can still run `avanti log` after a reset.
|
|
273
274
|
|
|
275
|
+
### `--verbose` / `-v`
|
|
276
|
+
|
|
277
|
+
Pass `--verbose` (or `-v`) to any command to print internal debug details to stderr. Verbose output does not appear on stdout, so piping diff output is unaffected.
|
|
278
|
+
|
|
279
|
+
```sh
|
|
280
|
+
avanti diff --verbose
|
|
281
|
+
avanti pull -v
|
|
282
|
+
```
|
|
283
|
+
|
|
284
|
+
Each line is prefixed with `[verbose]` and includes:
|
|
285
|
+
|
|
286
|
+
- The source being fetched (e.g. `github:org/repo:file@main`)
|
|
287
|
+
- Every HTTP request URL and response status code
|
|
288
|
+
- Retry delays and reasons
|
|
289
|
+
- CLI tool invocations (`gh`, `glab`, `aws`, `vault`, `git`)
|
|
290
|
+
- Cache hits
|
|
291
|
+
|
|
292
|
+
**Credential safety:** tokens are read from environment variables and sent as HTTP headers, which are never logged. Git URLs with embedded credentials are redacted. `exec:` source commands are logged verbatim — if your config embeds secrets in an exec command (e.g. `exec: curl -H "Token: $env:MY_SECRET"`), those secrets will appear in verbose output after variable substitution.
|
|
293
|
+
|
|
274
294
|
## Working Directory
|
|
275
295
|
|
|
276
296
|
All relative `src` and `target` paths are resolved relative to the **working directory** — the directory where you invoke `avanti`, or the path given with `-w`.
|
|
@@ -404,6 +424,7 @@ src:
|
|
|
404
424
|
file: path/to/file.txt # file or directory in repo
|
|
405
425
|
ref: main # branch, tag, or $latest (optional)
|
|
406
426
|
sha: abc123... # optional SHA-256 fingerprint
|
|
427
|
+
host: gitlab.mycompany.com # override default gitlab.com (optional)
|
|
407
428
|
|
|
408
429
|
src:
|
|
409
430
|
github:
|
|
@@ -411,6 +432,7 @@ src:
|
|
|
411
432
|
file: path/to/file.txt # file or directory in repo
|
|
412
433
|
ref: main # branch, tag, or $latest (optional)
|
|
413
434
|
sha: abc123... # optional SHA-256 fingerprint
|
|
435
|
+
host: github.mycompany.com # GitHub Enterprise Server hostname (optional)
|
|
414
436
|
|
|
415
437
|
src:
|
|
416
438
|
bitbucket:
|
|
@@ -419,6 +441,7 @@ src:
|
|
|
419
441
|
file: path/to/file.txt # file or directory in repo
|
|
420
442
|
ref: main # branch, tag, or $latest (optional)
|
|
421
443
|
sha: abc123... # optional SHA-256 fingerprint
|
|
444
|
+
host: bitbucket.mycompany.com # override default api.bitbucket.org (optional)
|
|
422
445
|
|
|
423
446
|
src:
|
|
424
447
|
git:
|
|
@@ -427,6 +450,14 @@ src:
|
|
|
427
450
|
ref: main # branch, tag, or commit hash (optional)
|
|
428
451
|
sha: abc123... # optional SHA-256 fingerprint
|
|
429
452
|
|
|
453
|
+
# git+ssh:// (and git://, ssh://) also work as plain strings or url: values using
|
|
454
|
+
# double-slash to separate the repo URL from the file path inside the repo:
|
|
455
|
+
src: git+ssh://git@ssh.git.private.de/org/repo.git//path/to/file.txt
|
|
456
|
+
src: git+ssh://git@ssh.git.private.de/org/repo.git//path/to/file.txt@main
|
|
457
|
+
|
|
458
|
+
src:
|
|
459
|
+
url: git+ssh://git@ssh.git.private.de/org/repo.git//path/to/file.txt@main
|
|
460
|
+
|
|
430
461
|
src:
|
|
431
462
|
s3: s3://my-bucket/path/to/file.txt # S3 URI; end with / for a prefix sync
|
|
432
463
|
sha: abc123... # optional SHA-256 fingerprint
|
|
@@ -660,6 +691,74 @@ files:
|
|
|
660
691
|
src: ./config.yaml
|
|
661
692
|
```
|
|
662
693
|
|
|
694
|
+
### TOML Merging
|
|
695
|
+
|
|
696
|
+
When all sources in a list have a `.toml` extension, TOML merging is enabled
|
|
697
|
+
automatically — no extra config needed:
|
|
698
|
+
|
|
699
|
+
```yaml
|
|
700
|
+
files:
|
|
701
|
+
merged.toml:
|
|
702
|
+
src:
|
|
703
|
+
- ./defaults.toml
|
|
704
|
+
- ./overrides.toml
|
|
705
|
+
```
|
|
706
|
+
|
|
707
|
+
To merge sources that don't have a TOML extension (e.g. `exec:`, `raw:`, or a URL without `.toml`), set `toml: true`:
|
|
708
|
+
|
|
709
|
+
```yaml
|
|
710
|
+
files:
|
|
711
|
+
merged.toml:
|
|
712
|
+
src:
|
|
713
|
+
- exec: cat defaults.toml
|
|
714
|
+
- ./overrides.toml
|
|
715
|
+
toml: true
|
|
716
|
+
```
|
|
717
|
+
|
|
718
|
+
To opt out of auto-detection and force plain concatenation, set `toml: false`.
|
|
719
|
+
|
|
720
|
+
**Fine-grained options** — pass an object to control merge behavior:
|
|
721
|
+
|
|
722
|
+
```yaml
|
|
723
|
+
files:
|
|
724
|
+
merged.toml:
|
|
725
|
+
src:
|
|
726
|
+
- ./defaults.toml
|
|
727
|
+
- github:
|
|
728
|
+
repo: org/configs
|
|
729
|
+
file: overrides.toml
|
|
730
|
+
toml:
|
|
731
|
+
conflicts: last_wins # abort | first_wins | last_wins (default)
|
|
732
|
+
arrays: replace # replace (default) | concat
|
|
733
|
+
objects: merge # merge (default) | replace
|
|
734
|
+
```
|
|
735
|
+
|
|
736
|
+
The options behave identically to JSON and YAML merging:
|
|
737
|
+
|
|
738
|
+
- `conflicts` — what to do when the same key holds a scalar (or an array/object when their strategy is `replace`):
|
|
739
|
+
- `last_wins` _(default)_ — the last source's value wins
|
|
740
|
+
- `first_wins` — the first source's value is kept
|
|
741
|
+
- `abort` — throw an error (identical values are not considered a conflict)
|
|
742
|
+
- `arrays` — how to combine arrays at the same key:
|
|
743
|
+
- `replace` _(default)_ — the later source's array replaces the earlier one
|
|
744
|
+
- `concat` — arrays are concatenated (no deduplication)
|
|
745
|
+
- `objects` — how to combine objects (tables) at the same key:
|
|
746
|
+
- `merge` _(default)_ — deep merge, applying the same rules recursively to nested keys
|
|
747
|
+
- `replace` — the later source's table replaces the earlier one entirely
|
|
748
|
+
|
|
749
|
+
> **Note:** TOML comments are **not preserved** in the merged or formatted
|
|
750
|
+
> output. TOML parsers do not support comment round-tripping.
|
|
751
|
+
|
|
752
|
+
**Pretty-printing a single file** — `toml` works on single-source entries too.
|
|
753
|
+
Auto-detection applies here as well, so a single `.toml` source is normalized
|
|
754
|
+
automatically:
|
|
755
|
+
|
|
756
|
+
```yaml
|
|
757
|
+
files:
|
|
758
|
+
config.toml:
|
|
759
|
+
src: ./config.toml
|
|
760
|
+
```
|
|
761
|
+
|
|
663
762
|
### Variables
|
|
664
763
|
|
|
665
764
|
Define reusable values at the top level under `variables:`:
|
|
@@ -794,18 +893,51 @@ If a GitHub or GitLab request fails with a 401, 403, or 404 response and `gh` /
|
|
|
794
893
|
|
|
795
894
|
### Private Instances
|
|
796
895
|
|
|
896
|
+
Set the `host` field directly on a source to target a private instance.
|
|
897
|
+
This is the preferred approach when different sources in the same config
|
|
898
|
+
point to different hosts:
|
|
899
|
+
|
|
900
|
+
```yaml
|
|
901
|
+
src:
|
|
902
|
+
gitlab:
|
|
903
|
+
project: group/repo
|
|
904
|
+
file: path/to/file.txt
|
|
905
|
+
host: gitlab.mycompany.com # private GitLab instance
|
|
906
|
+
|
|
907
|
+
src:
|
|
908
|
+
github:
|
|
909
|
+
repo: owner/repo
|
|
910
|
+
file: path/to/file.txt
|
|
911
|
+
host: github.mycompany.com # GitHub Enterprise Server
|
|
912
|
+
```
|
|
913
|
+
|
|
914
|
+
Alternatively, set an environment variable to apply a host override globally
|
|
915
|
+
for all sources of that type (useful when every source in the config targets
|
|
916
|
+
the same private instance):
|
|
917
|
+
|
|
797
918
|
**GitLab** — set `GITLAB_HOST` to override the default `gitlab.com`:
|
|
798
919
|
|
|
799
920
|
```bash
|
|
800
921
|
GITLAB_HOST=gitlab.mycompany.com avanti pull
|
|
801
922
|
```
|
|
802
923
|
|
|
803
|
-
**GitHub Enterprise Server** — set `GITHUB_HOST` to override the default
|
|
924
|
+
**GitHub Enterprise Server** — set `GITHUB_HOST` to override the default
|
|
925
|
+
`github.com` (API requests go to `https://{GITHUB_HOST}/api/v3`):
|
|
804
926
|
|
|
805
927
|
```bash
|
|
806
928
|
GITHUB_HOST=github.mycompany.com avanti pull
|
|
807
929
|
```
|
|
808
930
|
|
|
931
|
+
**Bitbucket** — set `BITBUCKET_HOST` to override the default
|
|
932
|
+
`api.bitbucket.org` (Bitbucket Cloud REST API host):
|
|
933
|
+
|
|
934
|
+
```bash
|
|
935
|
+
BITBUCKET_HOST=bitbucket.mycompany.com avanti pull
|
|
936
|
+
```
|
|
937
|
+
|
|
938
|
+
A `host` field on a source always takes precedence over the corresponding
|
|
939
|
+
environment variable.
|
|
940
|
+
|
|
809
941
|
## Use Cases
|
|
810
942
|
|
|
811
943
|
### Composable AI Agent Instructions (CLAUDE.md / AGENTS.md)
|
|
@@ -1168,9 +1300,22 @@ avanti pull -c gitlab:myorg/infra/dotfiles:avanti.yml@main
|
|
|
1168
1300
|
|
|
1169
1301
|
# Or a plain HTTPS URL
|
|
1170
1302
|
avanti pull -c https://configs.example.com/bootstrap.yml
|
|
1303
|
+
|
|
1304
|
+
# From a private git repo over SSH (double-slash separates repo from file path)
|
|
1305
|
+
avanti pull -c git+ssh://git@ssh.git.private.de/org/repo.git//avanti.yml
|
|
1306
|
+
avanti pull -c git+ssh://git@ssh.git.private.de/org/repo.git//avanti.yml@main
|
|
1171
1307
|
```
|
|
1172
1308
|
|
|
1173
|
-
The
|
|
1309
|
+
The `github:` and `gitlab:` config formats use the `gh`/`glab` CLI (with their
|
|
1310
|
+
token auth and fallback) to fetch the file — no extra setup needed for repos
|
|
1311
|
+
those tools can already access.
|
|
1312
|
+
|
|
1313
|
+
For any other git remote, use
|
|
1314
|
+
`git+ssh://git@host/org/repo.git//path/to/file.yml[@ref]` (or `git://` /
|
|
1315
|
+
`ssh://`). The `//` separator splits the repo URL from the file path inside the
|
|
1316
|
+
repo; `@ref` pins to a branch, tag, or commit. This form runs `git clone`
|
|
1317
|
+
directly, so authentication uses your SSH agent, `~/.ssh/config`, or any
|
|
1318
|
+
credential helper configured for that host.
|
|
1174
1319
|
|
|
1175
1320
|
This scales to any number of machines or containers. Update the central repo once; every client picks up the change on its next pull. No config drift, no manual distribution.
|
|
1176
1321
|
|
package/dist/binary.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"binary.d.ts","sourceRoot":"","sources":["../src/binary.ts"],"names":[],"mappings":"AAAA,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAO7C"}
|
package/dist/binary.js
ADDED
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isBinary = isBinary;
|
|
4
|
+
function isBinary(buf) {
|
|
5
|
+
// Mirror git's heuristic: if any of the first 8000 bytes is a NUL byte, treat as binary.
|
|
6
|
+
const limit = Math.min(buf.length, 8000);
|
|
7
|
+
for (let i = 0; i < limit; i++) {
|
|
8
|
+
if (buf[i] === 0)
|
|
9
|
+
return true;
|
|
10
|
+
}
|
|
11
|
+
return false;
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=binary.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"binary.js","sourceRoot":"","sources":["../src/binary.ts"],"names":[],"mappings":";;AAAA,4BAOC;AAPD,SAAgB,QAAQ,CAAC,GAAW;IAClC,yFAAyF;IACzF,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/B,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;IAChC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/dist/cli.js
CHANGED
|
@@ -9,13 +9,19 @@ const lock_1 = require("./commands/lock");
|
|
|
9
9
|
const revert_1 = require("./commands/revert");
|
|
10
10
|
const reset_1 = require("./commands/reset");
|
|
11
11
|
const package_json_1 = require("../package.json");
|
|
12
|
+
const logger_1 = require("./logger");
|
|
12
13
|
const program = new commander_1.Command();
|
|
13
14
|
program
|
|
14
15
|
.name('avanti')
|
|
15
16
|
.description('Assemble local files from any source via a declarative YAML spec')
|
|
16
17
|
.version(package_json_1.version)
|
|
17
18
|
.option('-c, --config <path>', 'path to config file')
|
|
18
|
-
.option('-w, --working-dir <path>', 'working directory for resolving relative paths (default: current directory)')
|
|
19
|
+
.option('-w, --working-dir <path>', 'working directory for resolving relative paths (default: current directory)')
|
|
20
|
+
.option('-v, --verbose', 'print verbose debug output to stderr');
|
|
21
|
+
program.hook('preAction', () => {
|
|
22
|
+
if (program.opts().verbose)
|
|
23
|
+
(0, logger_1.setVerbose)(true);
|
|
24
|
+
});
|
|
19
25
|
program.addCommand((0, diff_1.diffCommand)());
|
|
20
26
|
program.addCommand((0, pull_1.pullCommand)());
|
|
21
27
|
program.addCommand((0, lock_1.lockCommand)());
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;AACA,yCAAoC;AACpC,0CAA8C;AAC9C,0CAA8C;AAC9C,wCAA4C;AAC5C,0CAA8C;AAC9C,8CAAkD;AAClD,4CAAgD;AAChD,kDAA0C;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;AACA,yCAAoC;AACpC,0CAA8C;AAC9C,0CAA8C;AAC9C,wCAA4C;AAC5C,0CAA8C;AAC9C,8CAAkD;AAClD,4CAAgD;AAChD,kDAA0C;AAC1C,qCAAsC;AAEtC,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,QAAQ,CAAC;KACd,WAAW,CACV,kEAAkE,CACnE;KACA,OAAO,CAAC,sBAAO,CAAC;KAChB,MAAM,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;KACpD,MAAM,CACL,0BAA0B,EAC1B,6EAA6E,CAC9E;KACA,MAAM,CAAC,eAAe,EAAE,sCAAsC,CAAC,CAAC;AAEnE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;IAC7B,IAAI,OAAO,CAAC,IAAI,EAAyB,CAAC,OAAO;QAAE,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;AACtE,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,UAAU,CAAC,IAAA,kBAAW,GAAE,CAAC,CAAC;AAClC,OAAO,CAAC,UAAU,CAAC,IAAA,kBAAW,GAAE,CAAC,CAAC;AAClC,OAAO,CAAC,UAAU,CAAC,IAAA,kBAAW,GAAE,CAAC,CAAC;AAClC,OAAO,CAAC,UAAU,CAAC,IAAA,gBAAU,GAAE,CAAC,CAAC;AACjC,OAAO,CAAC,UAAU,CAAC,IAAA,sBAAa,GAAE,CAAC,CAAC;AACpC,OAAO,CAAC,UAAU,CAAC,IAAA,oBAAY,GAAE,CAAC,CAAC;AAEnC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../src/commands/diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../src/commands/diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwFpC,wBAAgB,WAAW,IAAI,OAAO,CAkIrC"}
|
package/dist/commands/diff.js
CHANGED
|
@@ -40,6 +40,7 @@ const config_1 = require("../config");
|
|
|
40
40
|
const sources_1 = require("../sources");
|
|
41
41
|
const replace_1 = require("../processors/replace");
|
|
42
42
|
const post_1 = require("../processors/post");
|
|
43
|
+
const binary_1 = require("../binary");
|
|
43
44
|
const diff_1 = require("../diff");
|
|
44
45
|
const history_1 = require("../history");
|
|
45
46
|
async function runDiffLoop(config, workingDir, cache) {
|
|
@@ -66,12 +67,16 @@ async function runDiffLoop(config, workingDir, cache) {
|
|
|
66
67
|
}
|
|
67
68
|
for (const [relPath, rawContent] of result.files) {
|
|
68
69
|
let content = rawContent;
|
|
69
|
-
if (
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
70
|
+
if (!(0, binary_1.isBinary)(content)) {
|
|
71
|
+
let text = content.toString('utf8');
|
|
72
|
+
if (entry.replace?.length)
|
|
73
|
+
text = (0, replace_1.applyReplace)(text, entry.replace, vars);
|
|
74
|
+
if (entry.post)
|
|
75
|
+
text = (0, post_1.applyPost)(text, entry.post, vars);
|
|
76
|
+
content = Buffer.from(text, 'utf8');
|
|
77
|
+
}
|
|
73
78
|
if (isSelf) {
|
|
74
|
-
selfContent = content;
|
|
79
|
+
selfContent = content.toString('utf8');
|
|
75
80
|
continue;
|
|
76
81
|
}
|
|
77
82
|
const targetPath = (0, diff_1.resolveTargetPath)(entry, relPath, workingDir, vars);
|
|
@@ -158,11 +163,12 @@ function diffCommand() {
|
|
|
158
163
|
}
|
|
159
164
|
if (!(0, config_1.isRemoteConfigSpec)(configPath)) {
|
|
160
165
|
const existingIdx = allDiffs.findIndex((d) => d.targetPath === configPath);
|
|
166
|
+
const selfBuf = Buffer.from(currentSelfContent, 'utf8');
|
|
161
167
|
if (existingIdx === -1) {
|
|
162
|
-
allDiffs.push((0, diff_1.computeDiff)(configPath,
|
|
168
|
+
allDiffs.push((0, diff_1.computeDiff)(configPath, selfBuf));
|
|
163
169
|
}
|
|
164
170
|
else {
|
|
165
|
-
allDiffs[existingIdx] = (0, diff_1.computeDiff)(configPath,
|
|
171
|
+
allDiffs[existingIdx] = (0, diff_1.computeDiff)(configPath, selfBuf);
|
|
166
172
|
}
|
|
167
173
|
}
|
|
168
174
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/commands/diff.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/commands/diff.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;AA0IpC,wBAAgB,WAAW,IAAI,OAAO,CA+XrC"}
|
package/dist/commands/pull.js
CHANGED
|
@@ -40,6 +40,7 @@ const config_1 = require("../config");
|
|
|
40
40
|
const sources_1 = require("../sources");
|
|
41
41
|
const replace_1 = require("../processors/replace");
|
|
42
42
|
const post_1 = require("../processors/post");
|
|
43
|
+
const binary_1 = require("../binary");
|
|
43
44
|
const diff_1 = require("../diff");
|
|
44
45
|
const writer_1 = require("../writer");
|
|
45
46
|
const history_1 = require("../history");
|
|
@@ -78,12 +79,17 @@ async function runFetchLoop(config, workingDir, cache) {
|
|
|
78
79
|
}
|
|
79
80
|
for (const [relPath, rawContent] of result.files) {
|
|
80
81
|
let content = rawContent;
|
|
81
|
-
if (
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
82
|
+
if (!(0, binary_1.isBinary)(content)) {
|
|
83
|
+
// Processors only operate on text; binary files are passed through unchanged.
|
|
84
|
+
let text = content.toString('utf8');
|
|
85
|
+
if (entry.replace?.length)
|
|
86
|
+
text = (0, replace_1.applyReplace)(text, entry.replace, vars);
|
|
87
|
+
if (entry.post)
|
|
88
|
+
text = (0, post_1.applyPost)(text, entry.post, vars);
|
|
89
|
+
content = Buffer.from(text, 'utf8');
|
|
90
|
+
}
|
|
85
91
|
if (isSelf) {
|
|
86
|
-
selfContent = content;
|
|
92
|
+
selfContent = content.toString('utf8');
|
|
87
93
|
selfMode = entry.mode;
|
|
88
94
|
if (result.sourceRecords.length > 0)
|
|
89
95
|
selfSourceRecords = result.sourceRecords;
|
|
@@ -239,22 +245,23 @@ function pullCommand() {
|
|
|
239
245
|
// replace it with the stabilized $self content so the on-disk config
|
|
240
246
|
// always matches what was actually used for this run.
|
|
241
247
|
if (!(0, config_1.isRemoteConfigSpec)(configPath)) {
|
|
248
|
+
const selfBuf = Buffer.from(currentSelfContent, 'utf8');
|
|
242
249
|
const existingIdx = writeTargets.findIndex((t) => t.targetPath === configPath);
|
|
243
250
|
if (existingIdx === -1) {
|
|
244
251
|
writeTargets.push({
|
|
245
252
|
targetPath: configPath,
|
|
246
|
-
content:
|
|
253
|
+
content: selfBuf,
|
|
247
254
|
mode: currentSelfMode,
|
|
248
255
|
});
|
|
249
|
-
allDiffs.push((0, diff_1.computeDiff)(configPath,
|
|
256
|
+
allDiffs.push((0, diff_1.computeDiff)(configPath, selfBuf));
|
|
250
257
|
}
|
|
251
258
|
else {
|
|
252
259
|
writeTargets[existingIdx] = {
|
|
253
260
|
...writeTargets[existingIdx],
|
|
254
|
-
content:
|
|
261
|
+
content: selfBuf,
|
|
255
262
|
mode: currentSelfMode ?? writeTargets[existingIdx].mode,
|
|
256
263
|
};
|
|
257
|
-
allDiffs[existingIdx] = (0, diff_1.computeDiff)(configPath,
|
|
264
|
+
allDiffs[existingIdx] = (0, diff_1.computeDiff)(configPath, selfBuf);
|
|
258
265
|
}
|
|
259
266
|
// Content comes from $self — attribute the config file write to the
|
|
260
267
|
// $self sources so history reflects the actual origin.
|
|
@@ -338,15 +345,16 @@ function pullCommand() {
|
|
|
338
345
|
if (shaUpdates !== null) {
|
|
339
346
|
const configTargetIdx = writeTargets.findIndex((t) => t.targetPath === configPath);
|
|
340
347
|
if (configTargetIdx !== -1) {
|
|
341
|
-
const patched = (0, config_writeback_1.applyUpdatedShas)(writeTargets[configTargetIdx].content, shaUpdates);
|
|
348
|
+
const patched = (0, config_writeback_1.applyUpdatedShas)(writeTargets[configTargetIdx].content.toString('utf8'), shaUpdates);
|
|
342
349
|
if (patched !== null) {
|
|
350
|
+
const patchedBuf = Buffer.from(patched, 'utf8');
|
|
343
351
|
writeTargets[configTargetIdx] = {
|
|
344
352
|
...writeTargets[configTargetIdx],
|
|
345
|
-
content:
|
|
353
|
+
content: patchedBuf,
|
|
346
354
|
};
|
|
347
355
|
// Recompute diff so staging and atomicWrite both see SHA-patched content,
|
|
348
356
|
// even when the original content diff was empty.
|
|
349
|
-
allDiffs[configTargetIdx] = (0, diff_1.computeDiff)(writeTargets[configTargetIdx].targetPath,
|
|
357
|
+
allDiffs[configTargetIdx] = (0, diff_1.computeDiff)(writeTargets[configTargetIdx].targetPath, patchedBuf);
|
|
350
358
|
configShaPreApplied = true;
|
|
351
359
|
}
|
|
352
360
|
}
|
|
@@ -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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0IA,kCA+XC;AAzgBD,yCAAoC;AACpC,2CAA6B;AAC7B,sCAOmB;AACnB,wCAAwE;AACxE,mDAAqD;AACrD,6CAA+C;AAC/C,sCAAqC;AACrC,kCAKiB;AACjB,sCAAqD;AAGrD,wCAA6E;AAC7E,sCAAoC;AACpC,0DAAyE;AAmBzE,KAAK,UAAU,YAAY,CACzB,MAAoB,EACpB,UAAkB,EAClB,KAAkB;IAElB,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;IACpC,MAAM,YAAY,GAAkB,EAAE,CAAC;IACvC,MAAM,QAAQ,GAAe,EAAE,CAAC;IAChC,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC7C,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAA+B,CAAC;IACrE,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,WAA+B,CAAC;IACpC,IAAI,QAA4B,CAAC;IACjC,IAAI,iBAAkD,CAAC;IAEvD,MAAM,OAAO,GAAG,iBAAQ,IAAI,MAAM,CAAC,KAAK,CAAC;IACzC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,GAAG,KAAK,iBAAQ,CAAC;QAChC,IAAI,OAAO,IAAI,CAAC,MAAM;YAAE,SAAS;QACjC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAW,EAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YAEjE,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;gBACvC,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC7D,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;oBACxC,SAAS,CAAC,IAAI,CAAC;wBACb,WAAW,EAAE,GAAG,CAAC,WAAW;wBAC5B,WAAW,EAAE,GAAG,CAAC,WAAY;wBAC7B,WAAW,EAAE,GAAG,CAAC,WAAW;qBAC7B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBACtC,MAAM,IAAI,KAAK,CACb,+CAA+C,MAAM,CAAC,KAAK,CAAC,IAAI,oEAAoE,CACrI,CAAC;YACJ,CAAC;YAED,KAAK,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBACjD,IAAI,OAAO,GAAG,UAAU,CAAC;gBACzB,IAAI,CAAC,IAAA,iBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC;oBACvB,8EAA8E;oBAC9E,IAAI,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBACpC,IAAI,KAAK,CAAC,OAAO,EAAE,MAAM;wBACvB,IAAI,GAAG,IAAA,sBAAY,EAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;oBACjD,IAAI,KAAK,CAAC,IAAI;wBAAE,IAAI,GAAG,IAAA,gBAAS,EAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBACzD,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBACtC,CAAC;gBACD,IAAI,MAAM,EAAE,CAAC;oBACX,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBACvC,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;oBACtB,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC;wBACjC,iBAAiB,GAAG,MAAM,CAAC,aAAa,CAAC;oBAC3C,SAAS;gBACX,CAAC;gBACD,MAAM,UAAU,GAAG,IAAA,wBAAiB,EAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;gBACvE,QAAQ,CAAC,IAAI,CAAC,IAAA,kBAAW,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;gBAChD,YAAY,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC7D,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACpC,qBAAqB,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,CACX,oBAAoB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,KAAM,GAAa,CAAC,OAAO,EAAE,CAC3E,CAAC;YACF,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;IACH,CAAC;IAED,OAAO;QACL,YAAY;QACZ,QAAQ;QACR,QAAQ;QACR,SAAS;QACT,qBAAqB;QACrB,WAAW;QACX,QAAQ;QACR,iBAAiB;KAClB,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,MAAkB;IACxC,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACvB,OAAO,CAAC,KAAK,CACX,oBAAoB,CAAC,CAAC,WAAW,IAAI;YACnC,eAAe,CAAC,CAAC,WAAW,IAAI;YAChC,eAAe,CAAC,CAAC,WAAW,EAAE,CACjC,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAgB,WAAW;IACzB,OAAO,IAAI,mBAAO,CAAC,MAAM,CAAC;SACvB,WAAW,CAAC,8CAA8C,CAAC;SAC3D,MAAM,CAAC,WAAW,EAAE,0BAA0B,CAAC;SAC/C,MAAM,CACL,kBAAkB,EAClB,uEAAuE,CACxE;SACA,MAAM,CAAC,KAAK,EAAE,OAAgB,EAAE,GAAY,EAAE,EAAE;QAC/C,MAAM,IAAI,GAAG,OAAqD,CAAC;QACnE,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAClC,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,MAA4B,CAChD,CAAC;QACF,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,UAAgC,CAAC;QAC1E,MAAM,UAAU,GAAG,aAAa;YAC9B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;YAC7B,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QAElB,IAAI,MAAM,CAAC;QACX,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,IAAA,mBAAU,EAAC,UAAU,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,CAAE,GAAa,CAAC,OAAO,CAAC,CAAC;YACtC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,wBAAc,CAChC,IAAA,2BAAkB,EAAC,UAAU,CAAC,EAC9B,UAAU,CACX,CAAC;QACF,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACpD,MAAM,MAAM,GAAG,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAEnE,MAAM,UAAU,GAAe,IAAI,GAAG,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QACrE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,qBAAqB,EAAE,GAAG,SAAS,CAAC;QAElE,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACvB,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,iDAAiD;QACjD,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YAC1D,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YACpC,OAAO,CAAC,KAAK,CACX,gFAAgF,CACjF,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,yEAAyE;QACzE,gEAAgE;QAChE,IAAI,SAAS,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACxC,IAAI,eAAmC,CAAC;YACxC,IAAI,kBAAkB,GAAG,SAAS,CAAC,WAAW,CAAC;YAC/C,IAAI,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAC;YACzC,IAAI,wBAAwB,GAAG,SAAS,CAAC,iBAAiB,CAAC;YAC3D,IAAI,YAAsC,CAAC;YAE3C,OAAO,YAAY,KAAK,SAAS,EAAE,CAAC;gBAClC,IAAI,aAA2B,CAAC;gBAChC,IAAI,CAAC;oBACH,aAAa,GAAG,IAAA,2BAAkB,EAAC,kBAAkB,CAAC,CAAC;gBACzD,CAAC;gBAAC,OAAO,GAAY,EAAE,CAAC;oBACtB,OAAO,CAAC,KAAK,CAAC,4BAA6B,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;oBACpE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;gBAED,sEAAsE;gBACtE,oEAAoE;gBACpE,IACE,CAAC,CAAC,iBAAQ,IAAI,aAAa,CAAC,KAAK,CAAC;oBAClC,kBAAkB,KAAK,eAAe,EACtC,CAAC;oBACD,YAAY,GAAG,aAAa,CAAC;oBAC7B,MAAM;gBACR,CAAC;gBAED,OAAO,CAAC,GAAG,CACT,4DAA4D,CAC7D,CAAC;gBACF,MAAM,IAAI,GAAG,MAAM,YAAY,CAC7B,aAAa,EACb,UAAU,EACV,UAAU,CACX,CAAC;gBAEF,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAClB,OAAO,CAAC,KAAK,CACX,sDAAsD,CACvD,CAAC;oBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;gBACD,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;oBACrD,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC/B,OAAO,CAAC,KAAK,CACX,gFAAgF,CACjF,CAAC;oBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;gBACD,MAAM,UAAU,GAAG,IAAI,GAAG,CACxB,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAC9C,CAAC;gBACF,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;oBAC/B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC;wBAAE,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClE,CAAC;gBAED,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;oBACnC,YAAY,GAAG,aAAa,CAAC;oBAC7B,MAAM;gBACR,CAAC;gBAED,eAAe,GAAG,kBAAkB,CAAC;gBACrC,kBAAkB,GAAG,IAAI,CAAC,WAAW,CAAC;gBACtC,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC;gBAChC,wBAAwB,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACpD,CAAC;YAED,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;gBAC/B,sDAAsD;gBACtD,mEAAmE;gBACnE,mEAAmE;gBACnE,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CACpC,IAAI,CACwB,CAAC;gBAC/B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;oBACxD,IAAI,CAAC,KAAK,iBAAQ;wBAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC9C,CAAC;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC7C,MAAM,MAAM,GAAG,MAAM,YAAY,CAC/B,EAAE,GAAG,YAAY,EAAE,KAAK,EAAE,gBAAgB,EAAE,EAC5C,UAAU,EACV,UAAU,CACX,CAAC;oBACF,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;wBACpB,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;wBACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBAClB,CAAC;oBACD,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;wBACvD,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;wBACjC,OAAO,CAAC,KAAK,CACX,gFAAgF,CACjF,CAAC;wBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBAClB,CAAC;oBACD,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;oBACnC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;oBAC3B,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,CAAC;oBACrD,MAAM,YAAY,GAAG,IAAI,GAAG,CAC1B,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAC9C,CAAC;oBACF,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;wBACjC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC;4BAAE,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACpE,CAAC;gBACH,CAAC;gBACD,kEAAkE;gBAClE,kEAAkE;gBAClE,qEAAqE;gBACrE,sDAAsD;gBACtD,IAAI,CAAC,IAAA,2BAAkB,EAAC,UAAU,CAAC,EAAE,CAAC;oBACpC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;oBACxD,MAAM,WAAW,GAAG,YAAY,CAAC,SAAS,CACxC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CACnC,CAAC;oBACF,IAAI,WAAW,KAAK,CAAC,CAAC,EAAE,CAAC;wBACvB,YAAY,CAAC,IAAI,CAAC;4BAChB,UAAU,EAAE,UAAU;4BACtB,OAAO,EAAE,OAAO;4BAChB,IAAI,EAAE,eAAe;yBACtB,CAAC,CAAC;wBACH,QAAQ,CAAC,IAAI,CAAC,IAAA,kBAAW,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;oBAClD,CAAC;yBAAM,CAAC;wBACN,YAAY,CAAC,WAAW,CAAC,GAAG;4BAC1B,GAAG,YAAY,CAAC,WAAW,CAAC;4BAC5B,OAAO,EAAE,OAAO;4BAChB,IAAI,EAAE,eAAe,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC,IAAI;yBACxD,CAAC;wBACF,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAA,kBAAW,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;oBAC3D,CAAC;oBACD,oEAAoE;oBACpE,uDAAuD;oBACvD,IAAI,wBAAwB,KAAK,SAAS,EAAE,CAAC;wBAC3C,qBAAqB,CAAC,GAAG,CAAC,UAAU,EAAE,wBAAwB,CAAC,CAAC;oBAClE,CAAC;yBAAM,CAAC;wBACN,qBAAqB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;oBAC3C,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,iFAAiF;QACjF,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,MAAM,cAAc,GAAkB,EAAE,CAAC;QACzC,MAAM,UAAU,GAAe,EAAE,CAAC;QAElC,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAC7C,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;YACpE,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;gBAC5B,IAAI,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC;oBAAE,SAAS;gBACjD,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBACnD,IAAI,CAAC,IAAI;oBAAE,SAAS;gBACpB,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;oBAC7B,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;oBAC1D,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;wBACtB,cAAc,CAAC,IAAI,CAAC;4BAClB,UAAU,EAAE,GAAG,CAAC,YAAY;4BAC5B,OAAO,EAAE,QAAQ;yBAClB,CAAC,CAAC;wBACH,UAAU,CAAC,IAAI,CAAC,IAAA,kBAAW,EAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC;oBAC3D,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;oBACrC,UAAU,CAAC,IAAI,CAAC,IAAA,wBAAiB,EAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;gBACvD,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GACd,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;YAClC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACvC,IAAA,iBAAU,EAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC;QAEzC,wDAAwD;QACxD,IAAI,IAAI,CAAC,aAAa,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzD,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAClB,cAAc,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;QAED,IAAI,CAAC,UAAU,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpD,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,GAAG,GAAY,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC;QACvC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,SAAS,GACb,IAAI,CAAC,aAAa,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;gBAClD,CAAC,CAAC,iDAAiD;gBACnD,CAAC,CAAC,uBAAuB,CAAC;YAC9B,MAAM,EAAE,GAAG,MAAM,IAAA,gBAAO,EAAC,SAAS,CAAC,CAAC;YACpC,IAAI,CAAC,EAAE,EAAE,CAAC;gBACR,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACxB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;QAED,sEAAsE;QACtE,uEAAuE;QACvE,IACE,IAAI,CAAC,aAAa;YAClB,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;YAC9B,IAAA,2BAAkB,EAAC,UAAU,CAAC,EAC9B,CAAC;YACD,OAAO,CAAC,IAAI,CACV,gEAAgE;gBAC9D,4CAA4C,CAC/C,CAAC;QACJ,CAAC;QAED,0EAA0E;QAC1E,2EAA2E;QAC3E,MAAM,UAAU,GACd,IAAI,CAAC,aAAa;YAClB,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;YAC9B,CAAC,IAAA,2BAAkB,EAAC,UAAU,CAAC;YAC7B,CAAC,CAAC,IAAI,GAAG,CACL,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAC/D;YACH,CAAC,CAAC,IAAI,CAAC;QACX,IAAI,mBAAmB,GAAG,KAAK,CAAC;QAChC,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACxB,MAAM,eAAe,GAAG,YAAY,CAAC,SAAS,CAC5C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CACnC,CAAC;YACF,IAAI,eAAe,KAAK,CAAC,CAAC,EAAE,CAAC;gBAC3B,MAAM,OAAO,GAAG,IAAA,mCAAgB,EAC9B,YAAY,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EACtD,UAAU,CACX,CAAC;gBACF,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;oBACrB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;oBAChD,YAAY,CAAC,eAAe,CAAC,GAAG;wBAC9B,GAAG,YAAY,CAAC,eAAe,CAAC;wBAChC,OAAO,EAAE,UAAU;qBACpB,CAAC;oBACF,0EAA0E;oBAC1E,iDAAiD;oBACjD,QAAQ,CAAC,eAAe,CAAC,GAAG,IAAA,kBAAW,EACrC,YAAY,CAAC,eAAe,CAAC,CAAC,UAAU,EACxC,UAAU,CACX,CAAC;oBACF,mBAAmB,GAAG,IAAI,CAAC;gBAC7B,CAAC;YACH,CAAC;QACH,CAAC;QAED,+EAA+E;QAC/E,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAC9C,CAAC;YACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC7C,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;gBAC9C,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACtD,MAAM,cAAc,GAClB,IAAI,CAAC,aAAa;oBAClB,OAAO,EAAE,IAAI,CACX,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAC1D,CAAC;gBACJ,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,cAAc;oBAAE,SAAS;gBACzD,IAAI,CAAC;oBACH,MAAM,gBAAgB,GACpB,OAAO,KAAK,SAAS;wBACnB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;4BAClB,KAAK,EAAE,CAAC,CAAC,WAAW;4BACpB,WAAW,EAAE,CAAC,CAAC,WAAW;4BAC1B,WAAW,EAAE,CAAC,CAAC,WAAW;4BAC1B,QAAQ,EACN,CAAC,CAAC,CAAC,OAAO;gCACV,CAAC,IAAI,CAAC,aAAa,IAAI,KAAK,CAAC;gCAC7B,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC;yBACvC,CAAC,CAAC;wBACL,CAAC,CAAC,SAAS,CAAC;oBAChB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAC1C,MAAM,EACN,UAAU,EACV,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO,EACvB,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,EACjB,gBAAgB,CACjB,CAAC;oBACF,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC/B,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO,CAAC,IAAI,CACV,yCAAyC,YAAY,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CACtE,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,YAAY,CAAC,MAAM,CACxC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CACjC,CAAC;YACF,IAAA,oBAAW,EAAC,CAAC,GAAG,cAAc,EAAE,GAAG,cAAc,CAAC,EAAE,aAAa,CAAC,CAAC;YACnE,MAAM,OAAO,GACX,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;YACvE,OAAO,CAAC,GAAG,CAAC,SAAS,OAAO,WAAW,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,CAAC,iBAAkB,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YACzD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,sFAAsF;QACtF,8EAA8E;QAC9E,IAAI,UAAU,KAAK,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAChD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAA,mCAAgB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;gBACxD,IAAI,MAAM;oBACR,OAAO,CAAC,GAAG,CAAC,WAAW,UAAU,CAAC,IAAI,wBAAwB,CAAC,CAAC;YACpE,CAAC;YAAC,OAAO,GAAY,EAAE,CAAC;gBACtB,OAAO,CAAC,IAAI,CACV,mDAAoD,GAAa,CAAC,OAAO,EAAE,CAC5E,CAAC;YACJ,CAAC;QACH,CAAC;QAED,yEAAyE;QACzE,0DAA0D;QAC1D,IAAI,MAAM,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC;gBACH,OAAO,CAAC,gBAAgB,CACtB,MAAM,EACN,IAAA,2BAAkB,EAAC,UAAU,CAAC,EAC9B,cAAc,CACf,CAAC;YACJ,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -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,CA8Jf;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
|
@@ -82,8 +82,10 @@ function applyUpdatedShas(raw, updates) {
|
|
|
82
82
|
const repo = gh.get('repo');
|
|
83
83
|
const file = gh.get('file');
|
|
84
84
|
const ref = gh.get('ref');
|
|
85
|
+
const host = gh.get('host');
|
|
85
86
|
if (repo && file) {
|
|
86
|
-
|
|
87
|
+
const hostPart = host ? `[${host}]` : '';
|
|
88
|
+
label = `github${hostPart}:${repo}:${file}${ref ? `@${ref}` : ''}`;
|
|
87
89
|
shaPath = [...srcBase, 'github', 'sha'];
|
|
88
90
|
}
|
|
89
91
|
}
|
|
@@ -94,8 +96,10 @@ function applyUpdatedShas(raw, updates) {
|
|
|
94
96
|
const project = gl.get('project');
|
|
95
97
|
const file = gl.get('file');
|
|
96
98
|
const ref = gl.get('ref');
|
|
99
|
+
const host = gl.get('host');
|
|
97
100
|
if (project && file) {
|
|
98
|
-
|
|
101
|
+
const hostPart = host ? `[${host}]` : '';
|
|
102
|
+
label = `gitlab${hostPart}:${project}:${file}${ref ? `@${ref}` : ''}`;
|
|
99
103
|
shaPath = [...srcBase, 'gitlab', 'sha'];
|
|
100
104
|
}
|
|
101
105
|
}
|
|
@@ -107,8 +111,10 @@ function applyUpdatedShas(raw, updates) {
|
|
|
107
111
|
const repo = bb.get('repo');
|
|
108
112
|
const file = bb.get('file');
|
|
109
113
|
const ref = bb.get('ref');
|
|
114
|
+
const host = bb.get('host');
|
|
110
115
|
if (ws && repo && file) {
|
|
111
|
-
|
|
116
|
+
const hostPart = host ? `[${host}]` : '';
|
|
117
|
+
label = `bitbucket${hostPart}:${ws}/${repo}:${file}${ref ? `@${ref}` : ''}`;
|
|
112
118
|
shaPath = [...srcBase, 'bitbucket', 'sha'];
|
|
113
119
|
}
|
|
114
120
|
}
|
|
@@ -201,7 +207,9 @@ function writeUpdatedShas(configPath, updates) {
|
|
|
201
207
|
const raw = fs.readFileSync(configPath, 'utf8');
|
|
202
208
|
const newContent = applyUpdatedShas(raw, updates);
|
|
203
209
|
if (newContent !== null) {
|
|
204
|
-
(0, writer_1.atomicWrite)([
|
|
210
|
+
(0, writer_1.atomicWrite)([
|
|
211
|
+
{ targetPath: configPath, content: Buffer.from(newContent, 'utf8') },
|
|
212
|
+
]);
|
|
205
213
|
return true;
|
|
206
214
|
}
|
|
207
215
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-writeback.js","sourceRoot":"","sources":["../src/config-writeback.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,
|
|
1
|
+
{"version":3,"file":"config-writeback.js","sourceRoot":"","sources":["../src/config-writeback.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,EAoBb,MAAM,SAAS,CAAC;AAOjB,eAAO,MAAM,QAAQ,UAAU,CAAC;AAShC,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAQrD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAcvD;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAgB3D;AAmGD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CA4FhE;AAED,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAQ1E"}
|