@detergent-software/atk 8.5.0-dev.9 → 8.5.1-dev.1
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/CHANGELOG.md +41 -0
- package/build/commands/update.d.ts.map +1 -1
- package/build/commands/update.js +2 -1
- package/build/commands/update.js.map +1 -1
- package/build/hooks/useListActions.d.ts.map +1 -1
- package/build/hooks/useListActions.js +20 -5
- package/build/hooks/useListActions.js.map +1 -1
- package/build/lib/asset-tools.d.ts +33 -12
- package/build/lib/asset-tools.d.ts.map +1 -1
- package/build/lib/asset-tools.js +57 -16
- package/build/lib/asset-tools.js.map +1 -1
- package/build/lib/installer.js +7 -3
- package/build/lib/installer.js.map +1 -1
- package/build/lib/registry.d.ts +5 -0
- package/build/lib/registry.d.ts.map +1 -1
- package/build/lib/registry.js +9 -2
- package/build/lib/registry.js.map +1 -1
- package/build/lib/schemas/lockfile.d.ts +2 -0
- package/build/lib/schemas/lockfile.d.ts.map +1 -1
- package/build/lib/schemas/lockfile.js +5 -1
- package/build/lib/schemas/lockfile.js.map +1 -1
- package/build/lib/sync.d.ts +2 -1
- package/build/lib/sync.d.ts.map +1 -1
- package/build/lib/sync.js +21 -7
- package/build/lib/sync.js.map +1 -1
- package/build/lib/uninstaller.d.ts +2 -1
- package/build/lib/uninstaller.d.ts.map +1 -1
- package/build/lib/uninstaller.js +3 -2
- package/build/lib/uninstaller.js.map +1 -1
- package/build/lib/updater.d.ts +12 -0
- package/build/lib/updater.d.ts.map +1 -1
- package/build/lib/updater.js +69 -19
- package/build/lib/updater.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,12 @@
|
|
|
1
|
+
## [8.5.1-dev.1](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTv8.5.0&targetVersion=GTv8.5.1-dev.1) (2026-10-12)
|
|
2
|
+
|
|
3
|
+
### Bug Fixes
|
|
4
|
+
|
|
5
|
+
* **cli:** keep a lifted hook from removing or overwriting user files ([61cab02](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/61cab02fce388f4c0e738fd68c9582c11fdc9de6))
|
|
6
|
+
* **cli:** place a hook for a tool once a later version declares it ([c7e1c82](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/c7e1c828fa0328c76a7d18e4141132e8be6aa567))
|
|
7
|
+
* **cli:** remove a dropped tool's hook copy only after every update ([e68f7b2](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/e68f7b22cd1aa8cfa55a531c2fbcb3ecde890774))
|
|
8
|
+
* **cli:** remove hook copies left for a tool the hook doesn't declare ([146d215](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/146d2159162a0ce853ba22c92fd216a1c07617a1))
|
|
9
|
+
|
|
1
10
|
## [8.5.0-dev.9](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTv8.5.0-dev.8&targetVersion=GTv8.5.0-dev.9) (2026-10-12)
|
|
2
11
|
|
|
3
12
|
### Bug Fixes
|
|
@@ -5,6 +14,38 @@
|
|
|
5
14
|
* **cli:** remove a dropped tool's hook copy only after every update ([e68f7b2](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/e68f7b22cd1aa8cfa55a531c2fbcb3ecde890774))
|
|
6
15
|
* **cli:** remove hook copies left for a tool the hook doesn't declare ([146d215](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/146d2159162a0ce853ba22c92fd216a1c07617a1))
|
|
7
16
|
|
|
17
|
+
## [8.5.0](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTv8.4.3&targetVersion=GTv8.5.0) (2026-10-12)
|
|
18
|
+
|
|
19
|
+
### Features
|
|
20
|
+
|
|
21
|
+
* **cli:** check dependencies in atk publish (ATK-224) ([9ae179b](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/9ae179b1774972048e46ff11e369f48941f5b59b))
|
|
22
|
+
* **cli:** declare dependencies in atk init (ATK-224) ([f8b7780](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/f8b7780ec38b5962eabd046154f801b1ae28eb8b))
|
|
23
|
+
* **cli:** publish new dependencies in the same PR with --with (ATK-225) ([add2e31](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/add2e31b25264ae96f981d775c21b0034e1afb11))
|
|
24
|
+
* **cli:** sign in with Emergent only, drop GitHub token sources (ATK-35) ([352871f](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/352871f925ea9630b462593011d49342fb4c3a35))
|
|
25
|
+
|
|
26
|
+
### Bug Fixes
|
|
27
|
+
|
|
28
|
+
* **cli:** accept latest as a dependency version (ATK-263) ([ae1ae11](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/ae1ae1117439719e1a6f98bb8587de5428e46084))
|
|
29
|
+
* **cli:** address code review of --with (ATK-225) ([9bc6cf6](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/9bc6cf6705370b0b60c1d753302ec92a092db3ab))
|
|
30
|
+
* **cli:** audit skips a hook its locked version doesn't declare (ATK-230) ([5d3d512](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/5d3d512f46f53438b942699d75e2e08a2c1e3c30))
|
|
31
|
+
* **cli:** keep piped init runs out of the dependency prompt (ATK-224) ([9353959](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/9353959c228f8ab4d11afad02af79ee05c7262a3))
|
|
32
|
+
* **cli:** keep the other config's keys when saving ~/.atkrc.json (ATK-323) ([447ace4](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/447ace4f4cb485338a318c49d3bd105374ef858d))
|
|
33
|
+
* **cli:** show an entry problem once in publish errors (ATK-225) ([3580d0c](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/3580d0c490be1d031af3d421538602fb2ee12e7c))
|
|
34
|
+
* **cli:** tighten the --with prompts after review (ATK-225) ([399d3d8](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/399d3d8228ec924d41c76aca7345ad1d7a1c0471))
|
|
35
|
+
* **cli:** tighten the init dependency step after review (ATK-224) ([e0d7468](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/e0d74689ac9b52949a6754783ff949d1026bf329))
|
|
36
|
+
* **cli:** treat a .atkrc.json without tools as no project config (ATK-323) ([a70585c](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/a70585c95a23c543f4f6edb04b44461e5df98c03))
|
|
37
|
+
* **cli:** treat a latest dependency like one with no version (ATK-263) ([7c6db18](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/7c6db187c9aac37594042c7750197429d3c13239))
|
|
38
|
+
* **cli:** treat LATEST like latest when installing a bundle (ATK-267) ([e461f56](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/e461f564327921e24a784e536f5af31c8821237d))
|
|
39
|
+
|
|
40
|
+
### Refactoring
|
|
41
|
+
|
|
42
|
+
* **schemas:** move the wire schemas to @atk/schemas (ATK-291) ([27b8811](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/27b88112ca6805474ff7c3358d74ac91bbe57b8f))
|
|
43
|
+
* **schemas:** take AssetType from lib/atk-schemas in the CLI (ATK-291) ([18df6c5](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/18df6c5e933fe31d91ef244f7fe00de5c56b2467))
|
|
44
|
+
|
|
45
|
+
### Styling
|
|
46
|
+
|
|
47
|
+
* **cli:** sort isLatestAlias among the registry exports (ATK-263) ([f94e442](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/f94e44227d0e98e53b832d69ac356247219ab713))
|
|
48
|
+
|
|
8
49
|
## [8.5.0-dev.8](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTv8.5.0-dev.7&targetVersion=GTv8.5.0-dev.8) (2026-10-12)
|
|
9
50
|
|
|
10
51
|
### Features
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/commands/update.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAmCxB,eAAO,MAAM,WAAW,4BAA4B,CAAC;AAErD,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;iBA6DlB,CAAC;AAEH,eAAO,MAAM,IAAI,gDAEf,CAAC;AAEH,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;IAC3B,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,CAAC;CAClC,CAAC;AAoCF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/commands/update.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAmCxB,eAAO,MAAM,WAAW,4BAA4B,CAAC;AAErD,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;iBA6DlB,CAAC;AAEH,eAAO,MAAM,IAAI,gDAEf,CAAC;AAEH,KAAK,KAAK,GAAG;IACX,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;IAC3B,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,CAAC;CAClC,CAAC;AAoCF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,2CA2XnH"}
|
package/build/commands/update.js
CHANGED
|
@@ -158,9 +158,10 @@ export default function Update({ args: [rawName], options: { dryRun, force, json
|
|
|
158
158
|
for (const r of results) {
|
|
159
159
|
updatedFor.add(`${r.type}:${r.org ?? ''}:${r.name}`);
|
|
160
160
|
}
|
|
161
|
+
// A tool that never had the asset (a lifted exclusion) kept nothing back, so it holds no one up.
|
|
161
162
|
for (const f of failures) {
|
|
162
163
|
const key = `${f.type}:${f.org ?? ''}:${f.name}`;
|
|
163
|
-
if (!updatedFor.has(key))
|
|
164
|
+
if (!f.lifted && !updatedFor.has(key))
|
|
164
165
|
failedFor.set(key, toolName);
|
|
165
166
|
}
|
|
166
167
|
toolResults.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,SAAS,EACT,cAAc,EACd,mBAAmB,EACnB,OAAO,EACP,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EACL,aAAa,EACb,gBAAgB,EAEhB,2BAA2B,EAE3B,YAAY,GAIb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,CAAC,MAAM,WAAW,GAAG,yBAAyB,CAAC;AAErD,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,MAAM,EAAE,CAAC;SACN,OAAO,EAAE;SACT,OAAO,CAAC,KAAK,CAAC;SACd,QAAQ,CACP,MAAM,CAAC;QACL,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,mDAAmD;KACjE,CAAC,CACH;IACH,KAAK,EAAE,CAAC;SACL,OAAO,EAAE;SACT,OAAO,CAAC,KAAK,CAAC;SACd,QAAQ,CACP,MAAM,CAAC;QACL,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,0CAA0C;KACxD,CAAC,CACH;IACH,IAAI,EAAE,CAAC;SACJ,OAAO,EAAE;SACT,OAAO,CAAC,KAAK,CAAC;SACd,QAAQ,CACP,MAAM,CAAC;QACL,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,wCAAwC;KACtD,CAAC,CACH;IACH,WAAW,EAAE,CAAC;SACX,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,MAAM,CAAC;QACL,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,iCAAiC;KAC/C,CAAC,CACH;IACH,OAAO,EAAE,CAAC;SACP,OAAO,EAAE;SACT,OAAO,CAAC,KAAK,CAAC;SACd,QAAQ,CACP,MAAM,CAAC;QACL,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,4EAA4E;KAC1F,CAAC,CACH;IACH,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,MAAM,CAAC;QACL,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,iCAAiC;KAC/C,CAAC,CACH;IACH,IAAI,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,QAAQ,CACjC,MAAM,CAAC;QACL,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,+EAA+E;KAC7F,CAAC,CACH;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC;IAC1B,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,mEAAmE,CAAC;CACpG,CAAC,CAAC;AAyCH,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,EAAS;IAClH,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/D,MAAM,IAAI,GAAG,MAAM,EAAE,IAAI,CAAC;IAC1B,MAAM,gBAAgB,GAAG,MAAM,EAAE,OAAO,CAAC;IACzC,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAExD,MAAM,KAAK,GAAG,UAAU,CACtB,KAAK,EAAE,QAAQ,EAAE,EAAE;QACjB,MAAM,UAAU,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;QAEhD,2CAA2C;QAC3C,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,IAAI,GAAG,CACzB,CAAC,aAAa,EAAE,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CACrF,CAAC;QAEF,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAE3C,QAAQ,CAAC,sBAAsB,CAAC,CAAC;QACjC,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAEtD,yEAAyE;QACzE,QAAQ,CAAC,qBAAqB,CAAC,CAAC;QAChC,MAAM,gBAAgB,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC,CAAC;QAExD,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEhH,IAAI,CAAC,gBAAgB,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjD,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAW,CAAC;QAC9D,CAAC;QAED,uCAAuC;QACvC,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,QAAQ,GAAG,gBAAgB,CAAC;YAElC,IAAI,QAAQ,GAAG,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;YAE9D,IAAI,MAAM,EAAE,CAAC;gBACX,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC;YAC9G,CAAC;YAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1B,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAW,CAAC;YAC9D,CAAC;YAED,wDAAwD;YACxD,MAAM,aAAa,GAAoB,EAAE,CAAC;YAC1C,MAAM,aAAa,GAAoB,EAAE,CAAC;YAC1C,MAAM,SAAS,GAAoB,EAAE,CAAC;YACtC,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;gBACzB,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;oBACb,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC;qBAAM,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,EAAE,CAAC;oBACxC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACxB,CAAC;qBAAM,CAAC;oBACN,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACpB,CAAC;YACH,CAAC;YAED,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvF,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAW,CAAC;YAC9D,CAAC;YAED,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,EAAW,CAAC;QAC9G,CAAC;QAED,OAAO,MAAM,yBAAyB,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE;YAC5D,QAAQ,CAAC,qBAAqB,CAAC,CAAC;YAChC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC,CAAC;YAEhD,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;YAChE,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAE9C,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACnC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAW,CAAC;YAC9D,CAAC;YAED,oFAAoF;YACpF,wDAAwD;YACxD,MAAM,kBAAkB,GAAG,IAAI;gBAC7B,CAAC,CAAC,CAAC,MAAM,YAAY,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;gBACnF,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAEhC,8EAA8E;YAC9E,gFAAgF;YAChF,+EAA+E;YAC/E,8EAA8E;YAC9E,uFAAuF;YACvF,qFAAqF;YACrF,0IAA0I;YAC1I,+DAA+D;YAC/D,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;YAC5C,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;YACrC,MAAM,WAAW,GAAwB,EAAE,CAAC;YAC5C,MAAM,aAAa,GAAG,IAAI,GAAG,EAA4B,CAAC;YAC1D,KAAK,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,KAAK,EAAE,CAAC;gBAC7D,QAAQ,CAAC,uBAAuB,QAAQ,KAAK,CAAC,CAAC;gBAC/C,MAAM,EACJ,eAAe,EACf,aAAa,EACb,QAAQ,EACR,aAAa,EACb,YAAY,EACZ,OAAO,EACP,OAAO,EACP,UAAU,GACX,GAAG,MAAM,YAAY,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE;oBACtD,OAAO,EAAE,WAAW;oBACpB,kBAAkB;oBAClB,SAAS;oBACT,KAAK;oBACL,YAAY,EAAE,WAAW;oBACzB,UAAU,EAAE,QAAQ;oBACpB,UAAU;oBACV,aAAa,EAAE,gBAAgB;oBAC/B,IAAI;iBACL,CAAC,CAAC;gBACH,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;oBACxB,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBACvD,CAAC;gBACD,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;oBACzB,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;oBACjD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;wBAAE,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;gBACzD,CAAC;gBACD,WAAW,CAAC,IAAI,CAAC;oBACf,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC/C,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC3C,QAAQ;oBACR,aAAa;oBACb,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACzC,OAAO;oBACP,OAAO;oBACP,IAAI,EAAE,QAAQ;iBACf,CAAC,CAAC;gBACH,IAAI,UAAU;oBAAE,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;gBACxD,yFAAyF;gBACzF,IAAI,YAAY;oBAAE,MAAM;YAC1B,CAAC;YACD,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAExD,0FAA0F;YAC1F,mFAAmF;YACnF,KAAK,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC,IAAI,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACpD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,2BAA2B,CAC7D,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EACxC,QAAQ,EACR,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAE,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,CACzF,CAAC;gBACF,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;oBAAE,UAAU,CAAC,cAAc,GAAG,QAAQ,CAAC;gBAC9D,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;oBAAE,UAAU,CAAC,iBAAiB,GAAG,OAAO,CAAC;YACjE,CAAC;YAED,0CAA0C;YAC1C,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAChC,CAAC,EAAE,EAAE,EAAE,CACL,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;gBACvB,EAAE,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;gBACxB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM;gBACnB,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM;gBACzB,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM;gBAC3B,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM;gBACzB,CAAC,EAAE,CAAC,iBAAiB,EAAE,MAAM;gBAC7B,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,CAC7B,CAAC;YACF,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAW,CAAC;YAC9D,CAAC;YAED,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBAC7F,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBACnE,OAAO;oBACL,GAAG,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAClD,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;oBAC1C,WAAW;iBACH,CAAC;YACb,CAAC;YAED,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAW,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC,EACD,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,gBAAgB,EAAE,IAAI,EAAE,IAAI,CAAC,CACjE,CAAC;IAEF,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,KAAC,OAAO,IAAC,OAAO,EAAE,KAAK,CAAC,OAAO,GAAI,CAAC;IAC7C,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC7B,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,UAAU,CAAC;gBAChB,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3C,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpD,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3C,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,OAAO,EAAE,OAAO;aACjB,CAAC,CAAC;QACL,CAAC;QACD,OAAO,KAAC,SAAS,IAAC,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,GAAI,CAAC;IACzF,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IAEvB,IAAI,IAAI,CAAC,OAAO,KAAK,QAAQ,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QAC5D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,IAAI,IAAI,CAAC,OAAO,KAAK,YAAY,EAAE,CAAC;QAClC,OAAO,MAAC,IAAI,IAAC,KAAK,EAAC,OAAO,sDAAkC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;IAC7F,CAAC;IAED,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QAE9C,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACxB,YAAY,IAAI,CACf,8BACE,KAAC,YAAY,IAAC,MAAM,EAAC,QAAQ,EAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,GAAI,EAChF,KAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,SAAS,EAAE,CAAC,YACrC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CACxB,KAAC,gBAAgB,IACf,gBAAgB,EAAE,CAAC,CAAC,gBAAgB,EAEpC,aAAa,EAAE,CAAC,CAAC,aAAa,EAC9B,IAAI,EAAE,CAAC,CAAC,IAAI,EACZ,IAAI,EAAE,CAAC,CAAC,IAAI,IAHP,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAIzC,CACH,CAAC,GACE,IACL,CACJ,EACD,KAAC,mBAAmB,IAClB,SAAS,EAAC,QAAQ,EAClB,KAAK,EAAC,MAAM,EACZ,IAAI,EAAC,0BAA0B,EAC/B,IAAI,EAAC,QAAG,EACR,KAAK,EAAE,IAAI,CAAC,aAAa,EACzB,KAAK,EAAC,QAAQ,EACd,UAAU,EAAE,YAAY,GACxB,EACF,KAAC,mBAAmB,IAClB,SAAS,EAAC,QAAQ,EAClB,KAAK,EAAC,QAAQ,EACd,IAAI,EAAC,yCAAyC,EAC9C,IAAI,EAAC,QAAG,EACR,KAAK,EAAE,IAAI,CAAC,aAAa,EACzB,KAAK,EAAC,QAAQ,EACd,UAAU,EAAE,YAAY,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,GACzD,IACE,CACP,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;IAEjE,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACxB,IAAI,CAAC,WAAW,CAAC,GAAG,CACnB,CAAC,EACC,eAAe,EACf,QAAQ,EACR,aAAa,EACb,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,OAAO,EACP,IAAI,EAAE,YAAY,GACnB,EAAE,EAAE,CAAC,CACJ,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACxB,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CACrB,8BACE,MAAC,IAAI,IAAC,KAAK,EAAC,OAAO,gCACN,OAAO,CAAC,MAAM,YAAQ,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,WAAO,YAAY,IAC9E,EACP,KAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,SAAS,EAAE,CAAC,YACrC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAClB,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,KAAC,gBAAgB,IACf,gBAAgB,EAAE,CAAC,CAAC,WAAW,EAC/B,aAAa,EAAE,CAAC,CAAC,SAAS,EAC1B,IAAI,EAAE,CAAC,CAAC,IAAI,EACZ,IAAI,EAAE,CAAC,CAAC,IAAI,GACZ,EACD,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CACtC,MAAC,IAAI,IAAC,QAAQ,QAAqB,IAAI,EAAC,UAAU,aAC/C,IAAI,aAAI,CAAC,CAAC,WAAW,KADJ,CAAC,CAAC,WAAW,CAE1B,CACR,CAAC,EACD,CAAC,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAChC,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,MAAC,IAAI,IAAC,KAAK,EAAC,QAAQ,aACjB,IAAI,aAAI,CAAC,CAAC,OAAO,IACb,EACP,MAAC,IAAI,IAAC,QAAQ,mBACX,MAAM,EACN,CAAC,CAAC,OAAO,IACL,KAPwB,CAAC,CAQ5B,CACP,CAAC,KAtB6B,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAuB/D,CACP,CAAC,GACE,IACL,CACJ,EACA,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,CACtB,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,SAAS,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAC/D,MAAC,IAAI,IAAC,KAAK,EAAC,KAAK,yCACK,QAAQ,CAAC,MAAM,YAAQ,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IACtE,EACP,KAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,WAAW,EAAE,CAAC,YACvC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CACnB,KAAC,SAAS,IACR,OAAO,EAAE,CAAC,CAAC,OAAO,EAClB,IAAI,EAAE,CAAC,CAAC,IAAI,EAEZ,OAAO,EAAE,CAAC,CAAC,KAAK,IADX,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAEzC,CACH,CAAC,GACE,IACF,CACP,EACD,KAAC,mBAAmB,IAClB,SAAS,EAAC,QAAQ,EAClB,KAAK,EAAC,MAAM,EACZ,IAAI,EAAC,0BAA0B,EAC/B,IAAI,EAAC,QAAG,EACR,KAAK,EAAE,aAAa,IAAI,EAAE,EAC1B,KAAK,EAAC,QAAQ,EACd,UAAU,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,GACrD,EACF,KAAC,mBAAmB,IAClB,SAAS,EAAC,QAAQ,EAClB,KAAK,EAAC,QAAQ,EACd,IAAI,EAAC,yCAAyC,EAC9C,IAAI,EAAC,QAAG,EACR,KAAK,EAAE,OAAO,IAAI,EAAE,EACpB,KAAK,EAAC,QAAQ,EACd,UAAU,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,GACzF,EACD,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CACrC,MAAC,IAAI,IAAC,QAAQ,mCACC,YAAY,mCAA+B,GAAG,EAC1D,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IACjD,CACR,EACD,KAAC,qBAAqB,IAAC,MAAM,EAAE,iBAAiB,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,GAAI,EAC7E,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CACjC,KAAC,SAAS,IACR,OAAO,EAAE,CAAC,CAAC,OAAO,EAClB,IAAI,EAAE,CAAC,CAAC,IAAI,EAEZ,OAAO,EAAE,CAAC,CAAC,KAAK,IADX,UAAU,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAEhD,CACH,CAAC,KArF6B,YAAY,CAsFvC,CACP,CACF,EACA,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,CAClE,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAC/B,MAAC,IAAI,IAAC,QAAQ,uCACK,YAAY,QAC5B,CAAC,CAAC,UAAU;wBACX,CAAC,CAAC,kBAAkB,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAmB;wBACzF,CAAC,CAAC,eAAe,EAAE,GAAG,UACnB,CAAC,CAAC,SAAS,SAAK,CAAC,CAAC,IAAI,KALT,UAAU,YAAY,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAMxE,CACR,CAAC,CACH,EACA,SAAS,EAAE,YAAY,IAAI,CAC1B,KAAC,cAAc,IAAC,YAAY,EAAE,SAAS,CAAC,YAAY,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE,GAAI,CAC9F,IACG,CACP,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useListActions.d.ts","sourceRoot":"","sources":["../../src/hooks/useListActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,OAAO,CAAC;AAE1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"useListActions.d.ts","sourceRoot":"","sources":["../../src/hooks/useListActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,OAAO,CAAC;AAE1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAuB/D;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EACpC,aAAa,EAAE,SAAS,CAAC,MAAM,CAAC,EAChC,eAAe,EAAE,SAAS,CAAC,IAAI,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EACrG,gBAAgB,CAAC,EAAE,SAAS,CAAC,IAAI,GAAG,aAAa,CAAC,GACjD,IAAI,CA6NN"}
|
|
@@ -4,7 +4,7 @@ import { freezeAssetInConfig, isAssetFrozen, loadProjectConfig, thawAssetInConfi
|
|
|
4
4
|
import { errorMessage } from '../lib/errors.js';
|
|
5
5
|
import { LOCKFILE_LOCKED_MESSAGE, LockfileLockedError, pinAssetVersion, readLockfile, unpinAssetVersion, withLockfileLock, writeLockfile, } from '../lib/lockfile.js';
|
|
6
6
|
import { uninstallAsset } from '../lib/uninstaller.js';
|
|
7
|
-
import { declarationAllowsVersion, removeUndeclaredAfterUpdate, updateAsset, } from '../lib/updater.js';
|
|
7
|
+
import { declarationAllowsVersion, excludedAtVersion, removeUndeclaredAfterUpdate, updateAsset, } from '../lib/updater.js';
|
|
8
8
|
/**
|
|
9
9
|
* Encapsulates the action execution side-effect for the list command.
|
|
10
10
|
*
|
|
@@ -128,14 +128,18 @@ export function useListActions(state, dispatch, projectDirRef, resolvedToolRef,
|
|
|
128
128
|
const toolResults = [];
|
|
129
129
|
// Tools the latest version of a hook no longer declares: the installer would refuse it.
|
|
130
130
|
const undeclared = [];
|
|
131
|
+
// Failures placing a hook whose exclusion the latest version lifts: the tool never had
|
|
132
|
+
// it, so, as in `atk update`, the other tools still update.
|
|
133
|
+
const liftErrors = [];
|
|
131
134
|
for (const adapter of adapters) {
|
|
132
|
-
if (
|
|
135
|
+
if (excludedAtVersion(registry, installed, undefined, adapter) ||
|
|
136
|
+
!supportsType(adapter, installed.type))
|
|
133
137
|
continue;
|
|
134
138
|
if (!declarationAllowsVersion(registry, installed, undefined, adapter)) {
|
|
135
139
|
undeclared.push(adapter);
|
|
136
140
|
continue;
|
|
137
141
|
}
|
|
138
|
-
|
|
142
|
+
const update = updateAsset(asset.name, installed, registry, {
|
|
139
143
|
adapter,
|
|
140
144
|
configuredAdapters: adapters,
|
|
141
145
|
onProgress: (message) => {
|
|
@@ -144,12 +148,23 @@ export function useListActions(state, dispatch, projectDirRef, resolvedToolRef,
|
|
|
144
148
|
},
|
|
145
149
|
projectDir: projectDirRef.current,
|
|
146
150
|
toolLockfile: lockfile,
|
|
147
|
-
})
|
|
151
|
+
});
|
|
152
|
+
if (isExcludedForTool(installed, adapter.tool)) {
|
|
153
|
+
try {
|
|
154
|
+
toolResults.push(await update);
|
|
155
|
+
}
|
|
156
|
+
catch (error) {
|
|
157
|
+
liftErrors.push(errorMessage(error));
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
else {
|
|
161
|
+
toolResults.push(await update);
|
|
162
|
+
}
|
|
148
163
|
}
|
|
149
164
|
// Then, as `atk update` does, those tools lose their copy when the version the lockfile
|
|
150
165
|
// now records doesn't declare them either.
|
|
151
166
|
const removedFor = [];
|
|
152
|
-
const removeErrors = [];
|
|
167
|
+
const removeErrors = [...liftErrors];
|
|
153
168
|
for (const adapter of undeclared) {
|
|
154
169
|
const { failures, removed } = await removeUndeclaredAfterUpdate([installed], registry, {
|
|
155
170
|
adapter,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useListActions.js","sourceRoot":"","sources":["../../src/hooks/useListActions.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"useListActions.js","sourceRoot":"","sources":["../../src/hooks/useListActions.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,9 @@ import type { InstalledAsset } from './schemas/lockfile.js';
|
|
|
6
6
|
* The lockfile is tool-agnostic: by default every lockfile asset is wanted for every tool a
|
|
7
7
|
* developer has configured. A tool-scoped uninstall (`atk uninstall <asset> --tool <tool>`)
|
|
8
8
|
* records the tool in the asset's `excludedTools` instead of dropping the shared entry, so the
|
|
9
|
-
* other tools keep tracking the asset and sync/audit/update skip it for the excluded tool.
|
|
9
|
+
* other tools keep tracking the asset and sync/audit/update skip it for the excluded tool. A hook
|
|
10
|
+
* skipped for a tool its manifest doesn't declare is excluded the same way, and the tool is also
|
|
11
|
+
* marked in `undeclaredTools`, so sync and update place it once a version declares the tool.
|
|
10
12
|
*
|
|
11
13
|
* Like `config-entries.ts`, this module is intentionally dependency-free (type-only imports
|
|
12
14
|
* plus that module) so it can be shared by lib code, hooks and commands without import cycles
|
|
@@ -23,12 +25,13 @@ export interface LockfileEffect {
|
|
|
23
25
|
type: string;
|
|
24
26
|
}
|
|
25
27
|
type AssetToolFields = Pick<InstalledAsset, 'configEntries' | 'excludedTools' | 'type'>;
|
|
28
|
+
type ExclusionFields = Pick<InstalledAsset, 'excludedTools' | 'undeclaredTools'>;
|
|
26
29
|
/**
|
|
27
|
-
* The
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
+
* The exclusions to record after (re)installing an asset for one tool: the previously recorded
|
|
31
|
+
* `excludedTools` and `undeclaredTools` minus the tool being installed. A field with none left is
|
|
32
|
+
* omitted, so it is left out of the lockfile.
|
|
30
33
|
*/
|
|
31
|
-
export declare function
|
|
34
|
+
export declare function carryExclusions(previous: ExclusionFields | undefined, installingTool: string): ExclusionFields;
|
|
32
35
|
/**
|
|
33
36
|
* Whether an asset of this type whose manifest lists `declaredTools` may go to `tool`. A hook's
|
|
34
37
|
* files are the tool's own config (a hooks file, its event names), so a hook goes only to the
|
|
@@ -48,9 +51,14 @@ export declare function describeLockfileEffects(assets: InstalledAsset[], removi
|
|
|
48
51
|
/**
|
|
49
52
|
* The lockfile entry to keep after uninstalling an asset for one tool: the tool is recorded in
|
|
50
53
|
* `excludedTools` (sorted, so teammates do not reorder the committed lockfile) and only the
|
|
51
|
-
* other tools' config entries are kept.
|
|
54
|
+
* other tools' config entries are kept. An uninstall makes the exclusion explicit, so the tool
|
|
55
|
+
* leaves `undeclaredTools`. With `undeclared` (a hook's copy removed because its manifest doesn't
|
|
56
|
+
* declare the tool) a newly excluded tool is marked there instead; an exclusion already recorded
|
|
57
|
+
* keeps its kind, so an uninstall never becomes one a later version lifts.
|
|
52
58
|
*/
|
|
53
|
-
export declare function excludeToolFromAsset(asset: InstalledAsset, adapter: Adapter
|
|
59
|
+
export declare function excludeToolFromAsset(asset: InstalledAsset, adapter: Adapter, { undeclared }?: {
|
|
60
|
+
undeclared?: boolean;
|
|
61
|
+
}): InstalledAsset;
|
|
54
62
|
/**
|
|
55
63
|
* Tools that still have the asset once it is removed for `removingTools`: the configured
|
|
56
64
|
* adapters that can place this asset type, plus any tool that tagged a config entry on the
|
|
@@ -58,13 +66,25 @@ export declare function excludeToolFromAsset(asset: InstalledAsset, adapter: Ada
|
|
|
58
66
|
* the tools already excluded and the ones being removed now.
|
|
59
67
|
*/
|
|
60
68
|
export declare function getRemainingTools(asset: AssetToolFields, removingTools: string[], configuredAdapters: Adapter[]): string[];
|
|
61
|
-
/**
|
|
69
|
+
/**
|
|
70
|
+
* Whether the asset is excluded for `tool` at a version whose manifest lists `declaredTools`: it
|
|
71
|
+
* was uninstalled for the tool, or it is a hook skipped for a tool its manifest didn't declare
|
|
72
|
+
* that this version still doesn't declare either. `declaredTools` null means the version is not
|
|
73
|
+
* known, so the exclusion stands.
|
|
74
|
+
*/
|
|
75
|
+
export declare function isExcludedAtVersion(asset: ExclusionFields & Pick<InstalledAsset, 'type'>, tool: string, declaredTools: null | string[] | undefined): boolean;
|
|
76
|
+
/** Whether the asset was uninstalled for the given tool, or is a hook skipped for it (`excludedTools`). */
|
|
62
77
|
export declare function isExcludedForTool(asset: Pick<InstalledAsset, 'excludedTools'>, tool: string): boolean;
|
|
63
78
|
/**
|
|
64
79
|
* Whether the asset was uninstalled for every one of `tools`. False for no tools, so a removal
|
|
65
80
|
* that is not tool-scoped still counts the asset.
|
|
66
81
|
*/
|
|
67
82
|
export declare function isExcludedForTools(asset: Pick<InstalledAsset, 'excludedTools'>, tools: string[]): boolean;
|
|
83
|
+
/**
|
|
84
|
+
* Whether the asset is excluded for the given tool only because a hook's manifest didn't declare
|
|
85
|
+
* it (`undeclaredTools`), not because it was uninstalled there.
|
|
86
|
+
*/
|
|
87
|
+
export declare function isUndeclaredForTool(asset: ExclusionFields, tool: string): boolean;
|
|
68
88
|
/**
|
|
69
89
|
* Whether the adapter's tool takes an asset of this type whose manifest lists `declaredTools`:
|
|
70
90
|
* it has a placement for the type, and the declaration allows it ({@link declarationAllows}).
|
|
@@ -73,10 +93,11 @@ export declare function placesAsset(adapter: Adapter, assetType: string, declare
|
|
|
73
93
|
/** Whether the adapter has a placement for the asset type (mirrors adapter.ts `supportsAssetType`). */
|
|
74
94
|
export declare function supportsType(adapter: Adapter, assetType: string): boolean;
|
|
75
95
|
/**
|
|
76
|
-
* The lockfile entry with `tool` recorded in `excludedTools` (sorted), for
|
|
77
|
-
*
|
|
78
|
-
* still finds what an older CLI registered for it.
|
|
96
|
+
* The lockfile entry with `tool` recorded in `excludedTools` and `undeclaredTools` (sorted), for a
|
|
97
|
+
* hook whose manifest doesn't declare the tool. Unlike {@link excludeToolFromAsset}, the tool's
|
|
98
|
+
* config entries stay, so an uninstall still finds what an older CLI registered for it. A tool
|
|
99
|
+
* already excluded keeps its kind.
|
|
79
100
|
*/
|
|
80
|
-
export declare function withToolExcluded<T extends
|
|
101
|
+
export declare function withToolExcluded<T extends ExclusionFields>(asset: T, tool: string): T;
|
|
81
102
|
export {};
|
|
82
103
|
//# sourceMappingURL=asset-tools.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset-tools.d.ts","sourceRoot":"","sources":["../../src/lib/asset-tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAI5D
|
|
1
|
+
{"version":3,"file":"asset-tools.d.ts","sourceRoot":"","sources":["../../src/lib/asset-tools.ts"],"names":[],"mappings":"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"}
|
package/build/lib/asset-tools.js
CHANGED
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { getOtherToolsConfigEntries } from './config-entries.js';
|
|
2
2
|
/**
|
|
3
|
-
* The
|
|
4
|
-
*
|
|
5
|
-
*
|
|
3
|
+
* The exclusions to record after (re)installing an asset for one tool: the previously recorded
|
|
4
|
+
* `excludedTools` and `undeclaredTools` minus the tool being installed. A field with none left is
|
|
5
|
+
* omitted, so it is left out of the lockfile.
|
|
6
6
|
*/
|
|
7
|
-
export function
|
|
8
|
-
|
|
9
|
-
return remaining.length > 0 ? remaining : undefined;
|
|
7
|
+
export function carryExclusions(previous, installingTool) {
|
|
8
|
+
return withExclusions((previous?.excludedTools ?? []).filter((t) => t !== installingTool), (previous?.undeclaredTools ?? []).filter((t) => t !== installingTool));
|
|
10
9
|
}
|
|
11
10
|
/**
|
|
12
11
|
* Whether an asset of this type whose manifest lists `declaredTools` may go to `tool`. A hook's
|
|
@@ -42,16 +41,22 @@ export function describeLockfileEffects(assets, removingTools, configuredAdapter
|
|
|
42
41
|
/**
|
|
43
42
|
* The lockfile entry to keep after uninstalling an asset for one tool: the tool is recorded in
|
|
44
43
|
* `excludedTools` (sorted, so teammates do not reorder the committed lockfile) and only the
|
|
45
|
-
* other tools' config entries are kept.
|
|
44
|
+
* other tools' config entries are kept. An uninstall makes the exclusion explicit, so the tool
|
|
45
|
+
* leaves `undeclaredTools`. With `undeclared` (a hook's copy removed because its manifest doesn't
|
|
46
|
+
* declare the tool) a newly excluded tool is marked there instead; an exclusion already recorded
|
|
47
|
+
* keeps its kind, so an uninstall never becomes one a later version lifts.
|
|
46
48
|
*/
|
|
47
|
-
export function excludeToolFromAsset(asset, adapter) {
|
|
48
|
-
const { configEntries: _configEntries, excludedTools: _excludedTools, ...rest } = asset;
|
|
49
|
+
export function excludeToolFromAsset(asset, adapter, { undeclared = false } = {}) {
|
|
50
|
+
const { configEntries: _configEntries, excludedTools: _excludedTools, undeclaredTools: _undeclared, ...rest } = asset;
|
|
49
51
|
const otherEntries = getOtherToolsConfigEntries(asset, adapter);
|
|
50
|
-
const
|
|
52
|
+
const marked = (asset.undeclaredTools ?? []).filter((t) => t !== adapter.tool);
|
|
53
|
+
if (undeclared && (!isExcludedForTool(asset, adapter.tool) || isUndeclaredForTool(asset, adapter.tool))) {
|
|
54
|
+
marked.push(adapter.tool);
|
|
55
|
+
}
|
|
51
56
|
return {
|
|
52
57
|
...rest,
|
|
53
58
|
...(otherEntries.length > 0 ? { configEntries: otherEntries } : {}),
|
|
54
|
-
excludedTools,
|
|
59
|
+
...withExclusions([...(asset.excludedTools ?? []), adapter.tool], marked),
|
|
55
60
|
};
|
|
56
61
|
}
|
|
57
62
|
/**
|
|
@@ -75,7 +80,20 @@ export function getRemainingTools(asset, removingTools, configuredAdapters) {
|
|
|
75
80
|
const gone = new Set([...(asset.excludedTools ?? []), ...removingTools]);
|
|
76
81
|
return [...candidates].filter((t) => !gone.has(t)).sort();
|
|
77
82
|
}
|
|
78
|
-
/**
|
|
83
|
+
/**
|
|
84
|
+
* Whether the asset is excluded for `tool` at a version whose manifest lists `declaredTools`: it
|
|
85
|
+
* was uninstalled for the tool, or it is a hook skipped for a tool its manifest didn't declare
|
|
86
|
+
* that this version still doesn't declare either. `declaredTools` null means the version is not
|
|
87
|
+
* known, so the exclusion stands.
|
|
88
|
+
*/
|
|
89
|
+
export function isExcludedAtVersion(asset, tool, declaredTools) {
|
|
90
|
+
if (!isExcludedForTool(asset, tool))
|
|
91
|
+
return false;
|
|
92
|
+
if (!isUndeclaredForTool(asset, tool) || declaredTools === null)
|
|
93
|
+
return true;
|
|
94
|
+
return !declarationAllows(asset.type, declaredTools, tool);
|
|
95
|
+
}
|
|
96
|
+
/** Whether the asset was uninstalled for the given tool, or is a hook skipped for it (`excludedTools`). */
|
|
79
97
|
export function isExcludedForTool(asset, tool) {
|
|
80
98
|
return (asset.excludedTools ?? []).includes(tool);
|
|
81
99
|
}
|
|
@@ -86,6 +104,13 @@ export function isExcludedForTool(asset, tool) {
|
|
|
86
104
|
export function isExcludedForTools(asset, tools) {
|
|
87
105
|
return tools.length > 0 && tools.every((tool) => isExcludedForTool(asset, tool));
|
|
88
106
|
}
|
|
107
|
+
/**
|
|
108
|
+
* Whether the asset is excluded for the given tool only because a hook's manifest didn't declare
|
|
109
|
+
* it (`undeclaredTools`), not because it was uninstalled there.
|
|
110
|
+
*/
|
|
111
|
+
export function isUndeclaredForTool(asset, tool) {
|
|
112
|
+
return isExcludedForTool(asset, tool) && (asset.undeclaredTools ?? []).includes(tool);
|
|
113
|
+
}
|
|
89
114
|
/**
|
|
90
115
|
* Whether the adapter's tool takes an asset of this type whose manifest lists `declaredTools`:
|
|
91
116
|
* it has a placement for the type, and the declaration allows it ({@link declarationAllows}).
|
|
@@ -98,13 +123,29 @@ export function supportsType(adapter, assetType) {
|
|
|
98
123
|
return assetType in adapter.placements;
|
|
99
124
|
}
|
|
100
125
|
/**
|
|
101
|
-
* The lockfile entry with `tool` recorded in `excludedTools` (sorted), for
|
|
102
|
-
*
|
|
103
|
-
* still finds what an older CLI registered for it.
|
|
126
|
+
* The lockfile entry with `tool` recorded in `excludedTools` and `undeclaredTools` (sorted), for a
|
|
127
|
+
* hook whose manifest doesn't declare the tool. Unlike {@link excludeToolFromAsset}, the tool's
|
|
128
|
+
* config entries stay, so an uninstall still finds what an older CLI registered for it. A tool
|
|
129
|
+
* already excluded keeps its kind.
|
|
104
130
|
*/
|
|
105
131
|
export function withToolExcluded(asset, tool) {
|
|
106
132
|
if (isExcludedForTool(asset, tool))
|
|
107
133
|
return asset;
|
|
108
|
-
return {
|
|
134
|
+
return {
|
|
135
|
+
...asset,
|
|
136
|
+
excludedTools: [...(asset.excludedTools ?? []), tool].sort(),
|
|
137
|
+
undeclaredTools: [...(asset.undeclaredTools ?? []), tool].sort(),
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
/**
|
|
141
|
+
* The exclusion fields for `excludedTools` and `undeclaredTools`, deduplicated and sorted (so
|
|
142
|
+
* teammates do not reorder the committed lockfile); a field with no tools is omitted.
|
|
143
|
+
*/
|
|
144
|
+
function withExclusions(excludedTools, undeclaredTools) {
|
|
145
|
+
const sorted = (tools) => [...new Set(tools)].sort();
|
|
146
|
+
return {
|
|
147
|
+
...(excludedTools.length > 0 ? { excludedTools: sorted(excludedTools) } : {}),
|
|
148
|
+
...(undeclaredTools.length > 0 ? { undeclaredTools: sorted(undeclaredTools) } : {}),
|
|
149
|
+
};
|
|
109
150
|
}
|
|
110
151
|
//# sourceMappingURL=asset-tools.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset-tools.js","sourceRoot":"","sources":["../../src/lib/asset-tools.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"asset-tools.js","sourceRoot":"","sources":["../../src/lib/asset-tools.ts"],"names":[],"mappings":"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"}
|
package/build/lib/installer.js
CHANGED
|
@@ -2,7 +2,7 @@ import { existsSync } from 'node:fs';
|
|
|
2
2
|
import { mkdir, readFile, unlink } from 'node:fs/promises';
|
|
3
3
|
import { dirname, join } from 'node:path';
|
|
4
4
|
import { getPlacement, isEntrypoint, resolveInstalledPaths } from './adapter.js';
|
|
5
|
-
import {
|
|
5
|
+
import { carryExclusions, declarationAllows, declaresTool, isExcludedForTool } from './asset-tools.js';
|
|
6
6
|
import { computeConfigEntryChecksum, computeHookGroupChecksum, hashBytes } from './checksum.js';
|
|
7
7
|
import { getConfigEntriesForTool, getOtherToolsConfigEntries, mergeConfigEntriesForTool, normalizeConfigPath, } from './config-entries.js';
|
|
8
8
|
import { normalizeForFormat, readConfigFile, resolveConfigFormat, writeConfigFile, } from './config-file.js';
|
|
@@ -390,6 +390,9 @@ function buildManagedEntries(lockfile, projectDir, adapter) {
|
|
|
390
390
|
function buildManagedPaths(lockfile, projectDir, adapter) {
|
|
391
391
|
const paths = new Map();
|
|
392
392
|
for (const asset of lockfile.assets ?? []) {
|
|
393
|
+
// Uninstalled for this tool, or a hook never placed by it: a file at its path is not ATK's.
|
|
394
|
+
if (isExcludedForTool(asset, adapter.tool))
|
|
395
|
+
continue;
|
|
393
396
|
const resolved = resolveInstalledPaths(asset, adapter, projectDir);
|
|
394
397
|
for (const file of resolved.files) {
|
|
395
398
|
addOwner(paths, join(projectDir, file.installedPath), asset);
|
|
@@ -739,7 +742,7 @@ async function installAsset(entry, options, managedPaths, managedEntries, owners
|
|
|
739
742
|
const previousEntry = (lockfile.assets ?? []).find((a) => a.name === asset.name && a.type === asset.type && a.org === entry.asset.org);
|
|
740
743
|
const lockfileConfigEntries = mergeConfigEntriesForTool(previousEntry, adapter, configEntries);
|
|
741
744
|
// Installing for a tool re-includes it; exclusions recorded for other tools carry over.
|
|
742
|
-
const
|
|
745
|
+
const exclusions = carryExclusions(previousEntry, adapter.tool);
|
|
743
746
|
// An asset the user installed directly stays direct in the lockfile when another install pulls it
|
|
744
747
|
// in as a dependency; the result keeps the plan's reason, which is its role in this run.
|
|
745
748
|
const installReason = previousEntry && (previousEntry.installReason ?? 'direct') === 'direct' ? 'direct' : entry.reason;
|
|
@@ -761,13 +764,14 @@ async function installAsset(entry, options, managedPaths, managedEntries, owners
|
|
|
761
764
|
})),
|
|
762
765
|
...(entry.versionData.description ? { description: entry.versionData.description } : {}),
|
|
763
766
|
...(declaredEntrypoint ? { entrypoint: declaredEntrypoint } : {}),
|
|
764
|
-
...(excludedTools ? { excludedTools } : {}),
|
|
767
|
+
...(exclusions.excludedTools ? { excludedTools: exclusions.excludedTools } : {}),
|
|
765
768
|
files: placedFiles,
|
|
766
769
|
installReason,
|
|
767
770
|
name: asset.name,
|
|
768
771
|
...(entry.asset.org ? { org: entry.asset.org } : {}),
|
|
769
772
|
...(pinnedVersion ? { pinnedVersion } : {}),
|
|
770
773
|
type: asset.type,
|
|
774
|
+
...(exclusions.undeclaredTools ? { undeclaredTools: exclusions.undeclaredTools } : {}),
|
|
771
775
|
version: entry.version,
|
|
772
776
|
};
|
|
773
777
|
const updatedLockfile = addAssetToLockfile(lockfile, installedAsset);
|