@detergent-software/atk 9.4.0-dev.2 → 9.4.0-dev.4
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 +18 -0
- package/build/command-manifest.json +1 -1
- package/build/commands/info.js +1 -0
- package/build/commands/info.js.map +1 -1
- package/build/commands/install.d.ts.map +1 -1
- package/build/commands/install.js +128 -16
- package/build/commands/install.js.map +1 -1
- package/build/commands/update.d.ts.map +1 -1
- package/build/commands/update.js +14 -7
- package/build/commands/update.js.map +1 -1
- package/build/components/AssetDetail.d.ts.map +1 -1
- package/build/components/AssetDetail.js +1 -1
- package/build/components/AssetDetail.js.map +1 -1
- package/build/components/PreferredScopeQuestion.d.ts +16 -0
- package/build/components/PreferredScopeQuestion.d.ts.map +1 -0
- package/build/components/PreferredScopeQuestion.js +20 -0
- package/build/components/PreferredScopeQuestion.js.map +1 -0
- package/build/components/PreferredScopeWarning.d.ts +17 -0
- package/build/components/PreferredScopeWarning.d.ts.map +1 -0
- package/build/components/PreferredScopeWarning.js +13 -0
- package/build/components/PreferredScopeWarning.js.map +1 -0
- package/build/components/index.d.ts +2 -0
- package/build/components/index.d.ts.map +1 -1
- package/build/components/index.js +2 -0
- package/build/components/index.js.map +1 -1
- package/build/hooks/useListActions.d.ts.map +1 -1
- package/build/hooks/useListActions.js +5 -1
- package/build/hooks/useListActions.js.map +1 -1
- package/build/lib/atk-schemas/index.d.ts +1 -1
- package/build/lib/atk-schemas/index.d.ts.map +1 -1
- package/build/lib/atk-schemas/index.js +1 -1
- package/build/lib/atk-schemas/index.js.map +1 -1
- package/build/lib/atk-schemas/manifest.d.ts +14 -0
- package/build/lib/atk-schemas/manifest.d.ts.map +1 -1
- package/build/lib/atk-schemas/manifest.js +3 -0
- package/build/lib/atk-schemas/manifest.js.map +1 -1
- package/build/lib/atk-schemas/registry.d.ts +16 -0
- package/build/lib/atk-schemas/registry.d.ts.map +1 -1
- package/build/lib/atk-schemas/registry.js +2 -1
- package/build/lib/atk-schemas/registry.js.map +1 -1
- package/build/lib/multi-tool-install.d.ts +6 -1
- package/build/lib/multi-tool-install.d.ts.map +1 -1
- package/build/lib/multi-tool-install.js +8 -3
- package/build/lib/multi-tool-install.js.map +1 -1
- package/build/lib/preferred-scope.d.ts +38 -0
- package/build/lib/preferred-scope.d.ts.map +1 -0
- package/build/lib/preferred-scope.js +53 -0
- package/build/lib/preferred-scope.js.map +1 -0
- package/build/lib/updater.d.ts +14 -3
- package/build/lib/updater.d.ts.map +1 -1
- package/build/lib/updater.js +22 -5
- package/build/lib/updater.js.map +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
## [9.4.0-dev.4](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTv9.4.0-dev.3&targetVersion=GTv9.4.0-dev.4) (2026-10-27)
|
|
2
|
+
|
|
3
|
+
### Bug Fixes
|
|
4
|
+
|
|
5
|
+
* **cli:** keep or move a dependency for every tool from atk list's update (ATK-241) ([f8c63ea](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/f8c63ea8bcddd6b91b2889c624d8398c898e9c71))
|
|
6
|
+
* **cli:** keep or move a dependency for every tool in a multi-tool update (ATK-241) ([f14c778](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/f14c77863c8d7a258d716998cb174b37165b1333))
|
|
7
|
+
|
|
8
|
+
## [9.4.0-dev.3](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTv9.4.0-dev.2&targetVersion=GTv9.4.0-dev.3) (2026-10-27)
|
|
9
|
+
|
|
10
|
+
### Features
|
|
11
|
+
|
|
12
|
+
* **cli:** accept a manifest preferredScope and show it in atk info (ATK-715) ([ee8889f](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/ee8889f7b7c57f8f7bfed0d854f936eff666b770))
|
|
13
|
+
* **cli:** offer an asset's preferred install scope in atk install (ATK-715) ([68e4837](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/68e4837ecfb518a372911181ff5d3e8c5dbf9110))
|
|
14
|
+
|
|
15
|
+
### Bug Fixes
|
|
16
|
+
|
|
17
|
+
* **cli:** keep the resolved asset when install moves to its preferred scope (ATK-715) ([74e13ae](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/74e13ae2ca750ea570ed0cd999ecf52c6ffbf2de))
|
|
18
|
+
|
|
1
19
|
## [9.4.0-dev.2](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTv9.4.0-dev.1&targetVersion=GTv9.4.0-dev.2) (2026-10-27)
|
|
2
20
|
|
|
3
21
|
### Performance
|
|
@@ -602,7 +602,7 @@
|
|
|
602
602
|
},
|
|
603
603
|
{
|
|
604
604
|
"flags": "-y, --yes",
|
|
605
|
-
"description": "Alias for --all: install every asset from an org scope without prompting",
|
|
605
|
+
"description": "Alias for --all: install every asset from an org scope without prompting; also installs at the scope asked without asking about an asset's preferred scope",
|
|
606
606
|
"defaultValue": false
|
|
607
607
|
}
|
|
608
608
|
]
|
package/build/commands/info.js
CHANGED
|
@@ -302,6 +302,7 @@ function buildJsonOutput(data) {
|
|
|
302
302
|
dependencies: data.versionData.dependencies,
|
|
303
303
|
description: data.versionData.description,
|
|
304
304
|
files: data.versionData.files,
|
|
305
|
+
preferredScope: data.versionData.preferredScope,
|
|
305
306
|
security: data.versionData.security,
|
|
306
307
|
tools: data.versionData.tools,
|
|
307
308
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"info.js","sourceRoot":"","sources":["../../src/commands/info.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"info.js","sourceRoot":"","sources":["../../src/commands/info.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAEL,gBAAgB,EAChB,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,EACb,SAAS,EACT,gBAAgB,EAChB,UAAU,EACV,oBAAoB,EACpB,sBAAsB,EACtB,iBAAiB,EAEjB,YAAY,EACZ,aAAa,EAEb,cAAc,GACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACxE,MAAM,CAAC,MAAM,WAAW,GAAG,uCAAuC,CAAC;AAEnE,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,IAAI,EAAE,CAAC;SACJ,OAAO,EAAE;SACT,OAAO,CAAC,KAAK,CAAC;SACd,QAAQ,CACP,MAAM,CAAC;QACL,WAAW,EAAE,qDAAqD;KACnE,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,GAAG,EAAE,CAAC;SACH,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,MAAM,CAAC;QACL,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,qCAAqC;KACnD,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,gDAAgD;KAC9D,CAAC,CACH;IACH,IAAI,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,QAAQ,CACjC,MAAM,CAAC;QACL,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,8EAA8E;KAC5F,CAAC,CACH;IACD,OAAO,EAAE,CAAC;SACP,OAAO,EAAE;SACT,OAAO,CAAC,KAAK,CAAC;SACd,QAAQ,CACP,MAAM,CAAC;QACL,WAAW,EAAE,uCAAuC;KACrD,CAAC,CACH;IACH,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,MAAM,CAAC;QACL,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,0DAA0D;KACxE,CAAC,CACH;CACJ,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC;IAC1B,CAAC;SACE,MAAM,EAAE;SACR,QAAQ,CACP,QAAQ,CAAC,EAAE,WAAW,EAAE,mEAAmE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAC7G;CACJ,CAAC,CAAC;AAyDH,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,EAC3B,IAAI,EAAE,CAAC,OAAO,CAAC,EACf,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAC/D;IACN,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAE/E,+CAA+C;IAC/C,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC3E,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC;IAClD,MAAM,WAAW,GAAG,SAAS,IAAI,MAAM,CAAC;IAExC,MAAM,gBAAgB,GAAG,OAAO,IAAI,aAAa,CAAC;IAClD,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAExD,MAAM,KAAK,GAAG,UAAU,CACtB,KAAK,EAAE,QAAQ,EAAE,EAAE;QACjB,uDAAuD;QACvD,IAAI,UAA8B,CAAC;QACnC,IAAI,CAAC;YACH,UAAU,GAAG,eAAe,EAAE,CAAC;QACjC,CAAC;QAAC,MAAM,CAAC;YACP,6DAA6D;QAC/D,CAAC;QAED,oDAAoD;QACpD,IAAI,QAA8B,CAAC;QACnC,IAAI,CAAC;YACH,IAAI,UAAU,EAAE,CAAC;gBACf,QAAQ,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,oCAAoC;QACtC,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;QAElC,QAAQ,CAAC,sBAAsB,CAAC,CAAC;QACjC,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAEtE,wFAAwF;QACxF,8CAA8C;QAC9C,MAAM,GAAG,GAAG,gBAAgB,CAAC,WAAW,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;QAErE,2FAA2F;QAC3F,uFAAuF;QACvF,4CAA4C;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QAC1E,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,UAAU,GAAG,gBAAgB,CAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;YACzD,6DAA6D;YAC7D,MAAM,iBAAiB,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;YACrF,MAAM,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;YACnE,MAAM,SAAS,GAAG,gBAAgB,IAAI,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC;YACrG,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;YAC7B,uFAAuF;YACvF,IAAI,SAAS,IAAI,SAAS,KAAK,MAAM,CAAC,OAAO,EAAE,CAAC;gBAC9C,QAAQ,CAAC,6BAA6B,CAAC,CAAC;gBACxC,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,GAAG,CAAC,CAAC;gBAChD,MAAM,QAAQ,GAAG,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;gBACrE,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,OAAO;wBACL,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBAChD,iBAAiB,EAAE,QAAQ;wBAC3B,IAAI;wBACJ,OAAO,EAAE,mBAAmB;wBAC5B,OAAO,EAAE,SAAS;qBACnB,CAAC;gBACJ,CAAC;gBACD,OAAO,GAAG,QAAQ,CAAC;YACrB,CAAC;YACD,MAAM,KAAK,GAAG,OAAO,KAAK,MAAM,CAAC,OAAO,CAAC;YACzC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,IAAI,IAAI,OAAO,KAAK,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;YAC1E,4FAA4F;YAC5F,gDAAgD;YAChD,MAAM,CAAC,QAAQ,EAAE,cAAc,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC3D,KAAK,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;gBACrD,2BAA2B,CAAC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC;gBAChD,mBAAmB,CAAC,GAAG,EAAE,OAAO,CAAC;aAClC,CAAC,CAAC;YACH,OAAO;gBACL,UAAU;gBACV,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM;gBACtE,2FAA2F;gBAC3F,gFAAgF;gBAChF,YAAY,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,cAAc,EAAE,QAAQ,EAAE,CAAC,cAAc,CAAC,KAAK,IAAI;gBAChF,WAAW,EAAE,iBAAiB;gBAC9B,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;gBAC5C,OAAO,EAAE,cAAc;gBACvB,MAAM;aACP,CAAC;QACJ,CAAC;QAED,IAAI,QAAQ,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAC;QACtE,IAAI,cAAkC,CAAC;QAEvC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAI,gBAAgB,EAAE,CAAC;gBACrB,MAAM,WAAW,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;gBACpE,IAAI,WAAW,EAAE,CAAC;oBAChB,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,iBAAiB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;oBAC7E,OAAO;wBACL,iBAAiB;wBACjB,IAAI;wBACJ,OAAO,EAAE,mBAAmB;wBAC5B,OAAO,EAAE,gBAAgB;qBAC1B,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,8FAA8F;YAC9F,8FAA8F;YAC9F,4FAA4F;YAC5F,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,UAAU,GAAG,gBAAgB,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;gBAC/F,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;gBAC1B,IAAI,CAAC,GAAG,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;oBAC5C,QAAQ,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;oBAC5E,IAAI,CAAC,QAAQ,IAAI,gBAAgB,EAAE,CAAC;wBAClC,MAAM,WAAW,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;wBAC9E,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,WAAW;4BACjD,CAAC,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,CAAC;4BACtC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;wBACrB,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;oBAC9F,CAAC;oBACD,cAAc,GAAG,eAAe,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,IAAI,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;gBACnH,CAAC;qBAAM,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACjC,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC;gBACrF,CAAC;YACH,CAAC;YAED,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;YACxC,CAAC;QACH,CAAC;QAED,MAAM,WAAW,GAAG,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1F,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAE1E,wDAAwD;QACxD,QAAQ,CAAC,4BAA4B,CAAC,CAAC;QACvC,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,IAAI,gBAAoC,CAAC;QACzC,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,SAAS,GAAG,kBAAkB,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9F,IAAI,SAAS,EAAE,CAAC;gBACd,WAAW,GAAG,IAAI,CAAC;gBACnB,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC;YACvC,CAAC;QACH,CAAC;QAED,QAAQ,CAAC,oBAAoB,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAM,mBAAmB,CACtC,EAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,EACjF,QAAQ,CAAC,OAAO,CACjB,CAAC;QAEF,OAAO;YACL,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,iBAAiB;YACjB,YAAY,EAAE,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC;YAC9D,WAAW;YACX,iBAAiB,EAAE,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC;YACjE,cAAc;YACd,gBAAgB;YAChB,WAAW;YACX,OAAO,EAAE,OAAO;YAChB,MAAM;YACN,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,WAAW,EAAE,QAAQ,CAAC,WAAW;SAClC,CAAC;IACJ,CAAC,EACD,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,CAAC,EAC1D,gBAAgB,CAAC,CAAC,CAAC,qBAAqB,IAAI,IAAI,gBAAgB,KAAK,CAAC,CAAC,CAAC,wBAAwB,CACjG,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,IACE,IAAI,CAAC,OAAO,KAAK,WAAW;QAC5B,IAAI,CAAC,OAAO,KAAK,4BAA4B;QAC7C,IAAI,CAAC,OAAO,KAAK,mBAAmB,EACpC,CAAC;QACD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,IAAI,CAAC,OAAO,KAAK,cAAc,EAAE,CAAC;QACpC,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,KAAC,YAAY,IACX,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,WAAW,EAAE,IAAI,CAAC,WAAW,EAC7B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,GAC9E,EACF,KAAC,eAAe,IAAC,UAAU,EAAE,IAAI,CAAC,UAAU,GAAI,IAC5C,CACP,CAAC;IACJ,CAAC;IAED,wEAAwE;IACxE,0EAA0E;IAC1E,6CAA6C;IAC7C,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAErD,IAAI,IAAI,CAAC,OAAO,KAAK,mBAAmB,EAAE,CAAC;QACzC,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,MAAC,IAAI,IAAC,KAAK,EAAC,KAAK,yBACP,MAAC,IAAI,IAAC,IAAI,yBAAG,IAAI,CAAC,OAAO,UAAS,UAAI,MAAC,IAAI,IAAC,IAAI,yBAAG,WAAW,UAAS,mBAC1E,EACN,IAAI,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,IAAI,CACpC,MAAC,IAAI,IAAC,QAAQ,2CAAsB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAQ,CAC9E,EACD,KAAC,eAAe,IAAC,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,EAAE,GAAI,IAClD,CACP,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,CAAC,OAAO,KAAK,4BAA4B,EAAE,CAAC;QAClD,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,MAAC,IAAI,IAAC,KAAK,EAAC,KAAK,uBACT,MAAC,IAAI,IAAC,IAAI,yBAAG,WAAW,UAAS,oBAAe,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,MAAM,CAAC,CAAC,CAAC,EAAE,4BAE/F,EACP,KAAC,IAAI,+DAAoD,EACxD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAC9B,MAAC,IAAI,eACF,IAAI,OAAG,KAAK,CAAC,GAAG,OAAG,KAAK,CAAC,IAAI,QAAI,KAAK,CAAC,IAAI,UADnC,WAAW,CAAC,KAAK,CAAC,CAEtB,CACR,CAAC,EACF,MAAC,IAAI,IAAC,QAAQ,2BACR,KAAC,IAAI,IAAC,IAAI,yCAA0B,qCACnC,IACH,CACP,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;QACjC,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,MAAC,IAAI,IAAC,KAAK,EAAC,KAAK,iCACC,MAAC,IAAI,IAAC,IAAI,yBAAG,WAAW,UAAS,mCAC5C,EACP,MAAC,IAAI,IAAC,QAAQ,2BACR,MAAC,IAAI,IAAC,IAAI,kCAAa,IAAI,CAAC,IAAI,IAAQ,gCACvC,IACH,CACP,CAAC;IACJ,CAAC;IAED,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,KAAC,WAAW,IACV,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EACzC,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,WAAW,EAAE,IAAI,CAAC,WAAW,EAC7B,IAAI,EAAE,IAAI,EACV,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EACzC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EACvC,WAAW,EAAE,IAAI,CAAC,WAAW,EAC7B,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,IAAI,CAAC,OAAO,EACrB,WAAW,EAAE,IAAI,CAAC,WAAW,GAC7B,EACD,IAAI,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAC3C,MAAC,IAAI,IAAC,QAAQ,oDACiB,KAAC,IAAI,IAAC,IAAI,kBAAE,IAAI,CAAC,cAAc,GAAQ,IAC/D,CACR,IACG,CACP,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,IAAiB;IACxC,QAAQ,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,KAAK,cAAc,CAAC,CAAC,CAAC;YACpB,OAAO;gBACL,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;gBAClC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;gBAC1B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;gBAC1B,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpD,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;gBACpC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;gBACpB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,IAAI;gBAC3B,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;gBAC5B,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC;aAC/E,CAAC;QACJ,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,OAAO;gBACL,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,WAAW;gBACzC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;gBACrB,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG;gBACnB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,IAAI;gBAC3B,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;gBACrB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;gBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,WAAW,EAAE;oBACX,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM;oBAC/B,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ;oBACnC,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,YAAY;oBAC3C,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,WAAW;oBACzC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK;oBAC7B,cAAc,EAAE,IAAI,CAAC,WAAW,CAAC,cAAc;oBAC/C,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ;oBACnC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,KAAK;iBAC9B;gBACD,MAAM,EAAE,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC;aAC9G,CAAC;QACJ,CAAC;QACD,KAAK,WAAW,CAAC,CAAC,CAAC;YACjB,OAAO;gBACL,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC;QACJ,CAAC;QACD,KAAK,4BAA4B,CAAC,CAAC,CAAC;YAClC,OAAO;gBACL,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC;QACJ,CAAC;QACD,KAAK,mBAAmB,CAAC,CAAC,CAAC;YACzB,OAAO;gBACL,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAED,+GAA+G;AAC/G,KAAK,UAAU,2BAA2B,CAAC,GAAa,EAAE,OAAe;IACvE,IAAI,CAAC;QACH,OAAO,MAAM,mBAAmB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,mBAAmB,CAAC,GAAa,EAAE,OAAe;IAC/D,IAAI,CAAC;QACH,OAAO,MAAM,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,gBAAgB,CAAC,QAAkB,EAAE,IAAY,EAAE,GAAuB;IACjF,OAAO,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACxC,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;QAC9D,IAAI,CAAC,KAAK;YAAE,OAAO,EAAE,CAAC;QACtB,yFAAyF;QACzF,8DAA8D;QAC9D,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC;QACtC,MAAM,OAAO,GAAG,YAAY,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;QAC3E,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;AACL,CAAC;AAED,qFAAqF;AACrF,SAAS,eAAe,CAAC,EAAE,UAAU,EAAqC;IACxE,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAC9B,MAAC,IAAI,IAAC,QAAQ,4BACN,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,OAAG,IAAI,CAAC,IAAI,OAAG,GAAG,EACxF,KAAC,IAAI,IAAC,IAAI,kBAAE,IAAI,CAAC,OAAO,GAAQ,KAFd,IAAI,CAAC,IAAI,CAGtB,CACR,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAwExB,eAAO,MAAM,WAAW,6DAA6D,CAAC;AAEtF,eAAO,MAAM,OAAO;;;;;;;;;;;;;iBA+GlB,CAAC;AAEH,eAAO,MAAM,IAAI,uDAqBd,CAAC;AAiJJ,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;AAQF,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,EAC9B,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,EACxB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAC9F,EAAE,KAAK,+BAyDP"}
|
|
@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
|
|
|
2
2
|
import { Box, Text, useApp } from 'ink';
|
|
3
3
|
import { Fragment, useCallback, useEffect, useRef, useState } from 'react';
|
|
4
4
|
import { z } from 'zod';
|
|
5
|
-
import { CrossScopeWarning, DryRunBanner, ErrorView, InstallSummary, MultiSelectList, Spinner, } from '../components/index.js';
|
|
5
|
+
import { CrossScopeWarning, DryRunBanner, ErrorView, InstallSummary, MultiSelectList, PreferredScopeQuestion, PreferredScopeWarning, Spinner, } from '../components/index.js';
|
|
6
6
|
import { useCommand } from '../hooks/useCommand.js';
|
|
7
7
|
import { useResolvedScope } from '../hooks/useResolvedScope.js';
|
|
8
8
|
import { placesAsset } from '../lib/asset-tools.js';
|
|
@@ -19,6 +19,7 @@ import { addNotice } from '../lib/notices.js';
|
|
|
19
19
|
import { formatOrgName, inlineOrgOf, isBareOrgScope, parseNameScope, resolveActiveOrg, resolveSpecOrg, } from '../lib/org.js';
|
|
20
20
|
import { renderJson, useNonInteractive } from '../lib/output.js';
|
|
21
21
|
import { argument, option } from '../lib/pastel/index.js';
|
|
22
|
+
import { canInstallAt, preferredScopeNotice, preferredScopeOf } from '../lib/preferred-scope.js';
|
|
22
23
|
import { fetchRegistry, findAsset, findAssetsByName, findBundle, getAssetsByOrg, isDeprecated, isLatestAlias, } from '../lib/registry.js';
|
|
23
24
|
import { resolveBundleInstallPlan, resolveInstallPlan, resolveMultipleInstallPlans, ResolverError, } from '../lib/resolver.js';
|
|
24
25
|
import { scopeLabel } from '../lib/scope.js';
|
|
@@ -107,7 +108,7 @@ export const options = z.object({
|
|
|
107
108
|
.default(false)
|
|
108
109
|
.describe(option({
|
|
109
110
|
alias: 'y',
|
|
110
|
-
description:
|
|
111
|
+
description: "Alias for --all: install every asset from an org scope without prompting; also installs at the scope asked without asking about an asset's preferred scope",
|
|
111
112
|
})),
|
|
112
113
|
});
|
|
113
114
|
export const args = z
|
|
@@ -136,7 +137,7 @@ export default function Install({ args: [rawName, ...more], options: { adopt, al
|
|
|
136
137
|
const orgName = rawName.slice(1);
|
|
137
138
|
return (_jsx(InstallOrg, { cliOrg: org, dryRun: dryRun, force: force, json: json, orgName: orgName, pin: pin, projectRoot: projectRoot, skipPicker: all || yes, tool: tool, user: user }));
|
|
138
139
|
}
|
|
139
|
-
return (_jsx(
|
|
140
|
+
return (_jsx(InstallAssetAtAnsweredScope, { adopt: adopt, dryRun: dryRun, force: force, json: json, org: org, pin: pin, projectRoot: projectRoot, rawName: rawName, tool: tool, user: user, yes: yes }));
|
|
140
141
|
}
|
|
141
142
|
/** The picker lists one org's assets, so type and name identify each. */
|
|
142
143
|
function assetKey(asset) {
|
|
@@ -215,7 +216,7 @@ async function crossScopeOf(plan, { installedAt, json, scope, tools }) {
|
|
|
215
216
|
function installAllCommand({ orgName, ...flags }) {
|
|
216
217
|
return installCommandFor(`@${orgName} --all`, flags);
|
|
217
218
|
}
|
|
218
|
-
function InstallAsset({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoot, rawName, tool, user, }) {
|
|
219
|
+
function InstallAsset({ adopt, answered = false, dryRun, force, json, onScopeAnswer, org: cliOrg, pin, projectRoot, rawName, tool, user, yes = false, }) {
|
|
219
220
|
const { json: effectiveJson } = useNonInteractive(json);
|
|
220
221
|
const { name: parsedName, version: requestedVersion } = parseNameVersion(rawName);
|
|
221
222
|
// Extract org from @org/name syntax if present (shared spec parser — the
|
|
@@ -239,6 +240,48 @@ function InstallAsset({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoo
|
|
|
239
240
|
const org = resolveSpecOrg(nameScope, cliOrg, currentLockfile.org, config.org);
|
|
240
241
|
const effectiveVersion = requestedVersion;
|
|
241
242
|
const crossScope = (plan, installedAt) => crossScopeOf(plan, { installedAt, json: effectiveJson, scope: installScope, tools: toolNames });
|
|
243
|
+
// The asset this run resolved, named so the other scope's active org (its lockfile's) can't turn
|
|
244
|
+
// it into another one: `@org/name`, or `global:name` for a global asset when `always` or an org
|
|
245
|
+
// is active here. A bundle's name never falls back across orgs, so it stays as asked.
|
|
246
|
+
const otherScopeSpec = (plan, { always }) => {
|
|
247
|
+
const target = plan.entries.find((entry) => entry.reason === 'direct');
|
|
248
|
+
if (indexBundle || !target)
|
|
249
|
+
return rawName;
|
|
250
|
+
const targetOrg = target.asset.org ?? target.org;
|
|
251
|
+
const spec = targetOrg
|
|
252
|
+
? formatOrgName(targetOrg, target.asset.name)
|
|
253
|
+
: always || org || config.org
|
|
254
|
+
? `global:${target.asset.name}`
|
|
255
|
+
: target.asset.name;
|
|
256
|
+
return effectiveVersion ? `${spec}@${effectiveVersion}` : spec;
|
|
257
|
+
};
|
|
258
|
+
// Once answered, the install goes where the answer said, with nothing more to say about it. When
|
|
259
|
+
// a bundle's members disagree, the command installs only the members that prefer the other scope.
|
|
260
|
+
const preferredScope = (plan) => answered
|
|
261
|
+
? {}
|
|
262
|
+
: preferredScopeField(preferredScopeOf(plan, installScope), (preferred) => preferredScopeCommand(preferred, {
|
|
263
|
+
adopt,
|
|
264
|
+
force,
|
|
265
|
+
orgActive: Boolean(org || config.org),
|
|
266
|
+
pin,
|
|
267
|
+
spec: indexBundle && preferred.conflict ? undefined : otherScopeSpec(plan, { always: false }),
|
|
268
|
+
tool,
|
|
269
|
+
}), effectiveJson);
|
|
270
|
+
// A terminal run asks before it installs, unless --yes, or the targets' authors disagree on the
|
|
271
|
+
// scope, or there is no other scope to move to (a --user install outside any project).
|
|
272
|
+
const askScope = async (plan, bundleName) => {
|
|
273
|
+
if (answered || yes || effectiveJson)
|
|
274
|
+
return undefined;
|
|
275
|
+
const preferred = preferredScopeOf(plan, installScope);
|
|
276
|
+
if (!preferred || preferred.conflict || !(await canInstallAt(preferred.scope)))
|
|
277
|
+
return undefined;
|
|
278
|
+
return {
|
|
279
|
+
...(bundleName ? { bundleName } : {}),
|
|
280
|
+
outcome: 'ask-scope',
|
|
281
|
+
preferred,
|
|
282
|
+
spec: otherScopeSpec(plan, { always: true }),
|
|
283
|
+
};
|
|
284
|
+
};
|
|
242
285
|
// Check if the name matches a bundle. Bundle identity is (name, org) with
|
|
243
286
|
// exact matching — an @org/name spec never falls back to a global bundle
|
|
244
287
|
// and a bare name never resolves to an org-scoped one.
|
|
@@ -319,6 +362,7 @@ function InstallAsset({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoo
|
|
|
319
362
|
version: bundle.version,
|
|
320
363
|
...bundleReport(adopt ? outside.filter((m) => m.bundle) : outside, adopt ? outside.filter((m) => !m.bundle) : [], { adoptCommand, bundle }),
|
|
321
364
|
...(await crossScope(resolved)),
|
|
365
|
+
...preferredScope(resolved),
|
|
322
366
|
};
|
|
323
367
|
}
|
|
324
368
|
const versionLabel = effectiveVersion ? `@${effectiveVersion}` : '';
|
|
@@ -329,6 +373,7 @@ function InstallAsset({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoo
|
|
|
329
373
|
plan: asInstalled(resolved),
|
|
330
374
|
tools: toolNames,
|
|
331
375
|
...(await crossScope(resolved)),
|
|
376
|
+
...preferredScope(resolved),
|
|
332
377
|
};
|
|
333
378
|
}
|
|
334
379
|
return await withLockfileErrorHandling(projectDir, async () => {
|
|
@@ -364,6 +409,9 @@ function InstallAsset({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoo
|
|
|
364
409
|
}
|
|
365
410
|
progress('Resolving bundle assets...');
|
|
366
411
|
const plan = resolveBundleInstallPlan(registry, bundle);
|
|
412
|
+
const question = await askScope(plan, bundle.name);
|
|
413
|
+
if (question)
|
|
414
|
+
return question;
|
|
367
415
|
const toolResults = await executeInstallPlanForTools(plan, tools, {
|
|
368
416
|
adopt,
|
|
369
417
|
bundleOrigin,
|
|
@@ -385,6 +433,7 @@ function InstallAsset({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoo
|
|
|
385
433
|
version: bundle.version,
|
|
386
434
|
...bundleReport(kept, adopted, { adoptCommand, bundle }),
|
|
387
435
|
...(await crossScope(plan, projectDir)),
|
|
436
|
+
...preferredScope(plan),
|
|
388
437
|
};
|
|
389
438
|
}
|
|
390
439
|
// Single asset installation flow
|
|
@@ -426,6 +475,9 @@ function InstallAsset({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoo
|
|
|
426
475
|
const versionLabel = effectiveVersion ? `@${effectiveVersion}` : '';
|
|
427
476
|
progress(`Resolving dependencies${versionLabel}...`);
|
|
428
477
|
const plan = resolveInstallPlan(registry, name, undefined, effectiveVersion, org);
|
|
478
|
+
const question = await askScope(plan);
|
|
479
|
+
if (question)
|
|
480
|
+
return question;
|
|
429
481
|
const toolResults = await executeInstallPlanForTools(plan, tools, {
|
|
430
482
|
force,
|
|
431
483
|
onProgress: progress,
|
|
@@ -434,7 +486,12 @@ function InstallAsset({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoo
|
|
|
434
486
|
projectDir: projectDir,
|
|
435
487
|
scope: installScope,
|
|
436
488
|
});
|
|
437
|
-
return {
|
|
489
|
+
return {
|
|
490
|
+
outcome: 'installed',
|
|
491
|
+
toolResults,
|
|
492
|
+
...(await crossScope(plan, projectDir)),
|
|
493
|
+
...preferredScope(plan),
|
|
494
|
+
};
|
|
438
495
|
});
|
|
439
496
|
}, [adopt, cliOrg, dryRun, force, inlineOrg, name, pin, requestedVersion, tool]);
|
|
440
497
|
if (state.status === 'loading') {
|
|
@@ -456,6 +513,9 @@ function InstallAsset({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoo
|
|
|
456
513
|
const { data } = state;
|
|
457
514
|
const label = resolved && scopeLabel(resolved);
|
|
458
515
|
const where = label ? ` in ${label}` : '';
|
|
516
|
+
if (data.outcome === 'ask-scope') {
|
|
517
|
+
return (_jsx(PreferredScopeQuestion, { bundleName: data.bundleName, onAnswer: (move) => onScopeAnswer?.(move ? { scope: data.preferred.scope, spec: data.spec } : undefined), preferred: data.preferred }));
|
|
518
|
+
}
|
|
459
519
|
if (effectiveJson) {
|
|
460
520
|
return renderJson({ ...data, ...fields });
|
|
461
521
|
}
|
|
@@ -463,7 +523,7 @@ function InstallAsset({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoo
|
|
|
463
523
|
return (_jsxs(Box, { flexDirection: 'column', children: [_jsxs(Text, { children: [_jsx(Text, { color: 'yellow', children: "!" }), " Bundle ", _jsx(Text, { bold: true, children: data.bundleName }), " is already fully installed (v", data.version, ")", where, "."] }), _jsx(Text, { dimColor: true, children: "Use --force to reinstall." }), _jsx(BundleReportLines, { bundleName: data.bundleName, report: data })] }));
|
|
464
524
|
}
|
|
465
525
|
if (data.outcome === 'bundle-installed') {
|
|
466
|
-
return (_jsxs(Box, { flexDirection: 'column', children: [data.toolResults.map(({ results, skipped, tool: toolName, warnings }) => (_jsxs(Box, { flexDirection: 'column', children: [_jsxs(Text, { color: 'green', children: ["\u2713 Bundle ", _jsx(Text, { bold: true, children: data.bundleName }), " v", data.version, " \u2014 ", results.length, " asset", results.length !== 1 ? 's' : ''] }), _jsx(InstallSummary, { results: results, skipped: skipped, tools: [toolName], warnings: warnings, where: label })] }, toolName))), _jsx(BundleReportLines, { bundleName: data.bundleName, report: data }), _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] })] }));
|
|
526
|
+
return (_jsxs(Box, { flexDirection: 'column', children: [data.toolResults.map(({ results, skipped, tool: toolName, warnings }) => (_jsxs(Box, { flexDirection: 'column', children: [_jsxs(Text, { color: 'green', children: ["\u2713 Bundle ", _jsx(Text, { bold: true, children: data.bundleName }), " v", data.version, " \u2014 ", results.length, " asset", results.length !== 1 ? 's' : ''] }), _jsx(InstallSummary, { results: results, skipped: skipped, tools: [toolName], warnings: warnings, where: label })] }, toolName))), _jsx(BundleReportLines, { bundleName: data.bundleName, report: data }), _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] }), _jsx(PreferredScopeWarning, { preferred: data.preferredScope })] }));
|
|
467
527
|
}
|
|
468
528
|
if (data.outcome === 'already-installed') {
|
|
469
529
|
return (_jsxs(Box, { flexDirection: 'column', children: [_jsxs(Text, { children: [_jsx(Text, { color: 'yellow', children: "!" }), " ", _jsx(Text, { bold: true, children: data.name }), " is already installed (v", data.version, ")", where, "."] }), _jsx(Text, { dimColor: true, children: "Use --force to reinstall." })] }));
|
|
@@ -472,15 +532,33 @@ function InstallAsset({ adopt, dryRun, force, json, org: cliOrg, pin, projectRoo
|
|
|
472
532
|
return (_jsxs(Box, { flexDirection: 'column', children: [_jsxs(Text, { color: 'green', children: ["\u2713 ", _jsx(Text, { bold: true, children: data.name }), " (v", data.version, ") is now a direct install", where, "."] }), _jsx(Text, { dimColor: true, children: "It will no longer be auto-removed when its parent is uninstalled." })] }));
|
|
473
533
|
}
|
|
474
534
|
if (data.outcome === 'dry-run-install') {
|
|
475
|
-
return (_jsxs(Box, { flexDirection: 'column', children: [_jsx(DryRunBanner, { action: 'install', count: data.plan.totalCount, tools: data.tools, where: label }), _jsx(Text, { children: " " }), _jsx(PlanEntryLines, { plan: data.plan }), _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] })] }));
|
|
535
|
+
return (_jsxs(Box, { flexDirection: 'column', children: [_jsx(DryRunBanner, { action: 'install', count: data.plan.totalCount, tools: data.tools, where: label }), _jsx(Text, { children: " " }), _jsx(PlanEntryLines, { plan: data.plan }), _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] }), _jsx(PreferredScopeWarning, { preferred: data.preferredScope })] }));
|
|
476
536
|
}
|
|
477
537
|
if (data.outcome === 'dry-run-bundle') {
|
|
478
|
-
return (_jsxs(Box, { flexDirection: 'column', children: [_jsx(DryRunBanner, { action: 'install', count: data.plan.totalCount, tools: data.tools, where: label }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsxs(Text, { bold: true, color: 'magenta', children: ["Bundle: ", data.bundleName] }), _jsxs(Text, { dimColor: true, children: [" v", data.version] })] }), _jsx(Text, { children: " " }), _jsx(PlanEntryLines, { plan: data.plan }), _jsx(BundleReportLines, { bundleName: data.bundleName, dryRun: true, report: data }), _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] })] }));
|
|
538
|
+
return (_jsxs(Box, { flexDirection: 'column', children: [_jsx(DryRunBanner, { action: 'install', count: data.plan.totalCount, tools: data.tools, where: label }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsxs(Text, { bold: true, color: 'magenta', children: ["Bundle: ", data.bundleName] }), _jsxs(Text, { dimColor: true, children: [" v", data.version] })] }), _jsx(Text, { children: " " }), _jsx(PlanEntryLines, { plan: data.plan }), _jsx(BundleReportLines, { bundleName: data.bundleName, dryRun: true, report: data }), _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] }), _jsx(PreferredScopeWarning, { preferred: data.preferredScope })] }));
|
|
479
539
|
}
|
|
480
540
|
if (data.outcome === 'deprecated') {
|
|
481
541
|
return (_jsxs(Box, { flexDirection: 'column', children: [_jsxs(Text, { color: 'yellow', children: ["Warning: \"", data.name, "\" is deprecated \u2014 ", data.reason] }), data.replacement && (_jsxs(Text, { children: ["Consider using", ' ', _jsx(Text, { bold: true, color: 'cyan', children: data.replacement }), ' ', "instead."] })), _jsx(Text, { dimColor: true, children: "Use --force to install anyway." })] }));
|
|
482
542
|
}
|
|
483
|
-
return (_jsxs(Box, { flexDirection: 'column', children: [data.toolResults.map(({ results, skipped, tool: toolName, warnings }) => (_jsx(InstallSummary, { results: results, skipped: skipped, tools: [toolName], warnings: warnings, where: label }, toolName))), _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] })] }));
|
|
543
|
+
return (_jsxs(Box, { flexDirection: 'column', children: [data.toolResults.map(({ results, skipped, tool: toolName, warnings }) => (_jsx(InstallSummary, { results: results, skipped: skipped, tools: [toolName], warnings: warnings, where: label }, toolName))), _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] }), _jsx(PreferredScopeWarning, { preferred: data.preferredScope })] }));
|
|
544
|
+
}
|
|
545
|
+
/**
|
|
546
|
+
* One asset or bundle, asking first when its authors prefer the other scope: the install runs again
|
|
547
|
+
* at the scope the answer picks, and doesn't ask twice.
|
|
548
|
+
*/
|
|
549
|
+
function InstallAssetAtAnsweredScope(props) {
|
|
550
|
+
const [answer, setAnswer] = useState();
|
|
551
|
+
if (!answer) {
|
|
552
|
+
// Only the first key answers: a second one, before the question goes, would change the scope under the install.
|
|
553
|
+
return _jsx(InstallAsset, { ...props, onScopeAnswer: (move) => setAnswer((first) => first ?? { move }) }, 'asking');
|
|
554
|
+
}
|
|
555
|
+
if (!answer.move) {
|
|
556
|
+
return _jsx(InstallAsset, { ...props, answered: true }, 'answered');
|
|
557
|
+
}
|
|
558
|
+
// The other scope's root: the user root, or the cwd's project, never the --project-root asked with; and
|
|
559
|
+
// the asset by the name the question resolved, which --org can't contradict.
|
|
560
|
+
const { scope, spec } = answer.move;
|
|
561
|
+
return (_jsx(InstallAsset, { ...props, answered: true, org: undefined, projectRoot: undefined, rawName: spec, user: scope === 'user' }, 'moved'));
|
|
484
562
|
}
|
|
485
563
|
/**
|
|
486
564
|
* `atk install a b@1.2.0 @org/c my-bundle @org --all`: the named assets, the bundles' members and
|
|
@@ -607,6 +685,13 @@ function InstallAssets({ adopt, all, dryRun, force, json, org: cliOrg, pin, proj
|
|
|
607
685
|
};
|
|
608
686
|
});
|
|
609
687
|
const crossScope = (resolvedPlan, installedAt) => crossScopeOf(resolvedPlan, { installedAt, json: effectiveJson, scope: installScope, tools: toolNames });
|
|
688
|
+
// Several names install together at one scope, so a preference for the other only gets a notice.
|
|
689
|
+
const preferredScope = (resolvedPlan) => preferredScopeField(preferredScopeOf(resolvedPlan, installScope), (preferred) => preferredScopeCommand(preferred, {
|
|
690
|
+
force,
|
|
691
|
+
orgActive: Boolean(cliOrg || currentLockfile.org || config.org),
|
|
692
|
+
pin,
|
|
693
|
+
tool,
|
|
694
|
+
}), effectiveJson);
|
|
610
695
|
// Each bundle in the plan, in the order named, then the ones left out; and the orgs.
|
|
611
696
|
const targetsField = (lockfile, planned) => {
|
|
612
697
|
const installedBundles = toInstall.flatMap((request) => {
|
|
@@ -645,6 +730,7 @@ function InstallAssets({ adopt, all, dryRun, force, json, org: cliOrg, pin, proj
|
|
|
645
730
|
}),
|
|
646
731
|
tools: toolNames,
|
|
647
732
|
...(await crossScope(plan)),
|
|
733
|
+
...preferredScope(plan),
|
|
648
734
|
};
|
|
649
735
|
}
|
|
650
736
|
return await withLockfileErrorHandling(projectDir, async () => {
|
|
@@ -665,6 +751,7 @@ function InstallAssets({ adopt, all, dryRun, force, json, org: cliOrg, pin, proj
|
|
|
665
751
|
outcome: 'installed',
|
|
666
752
|
toolResults,
|
|
667
753
|
...(await crossScope(plan, projectDir)),
|
|
754
|
+
...preferredScope(plan),
|
|
668
755
|
};
|
|
669
756
|
});
|
|
670
757
|
}, [adopt, all, cliOrg, dryRun, force, pin, specs.join(' '), tool]);
|
|
@@ -690,10 +777,10 @@ function InstallAssets({ adopt, all, dryRun, force, json, org: cliOrg, pin, proj
|
|
|
690
777
|
return renderJson({ ...data, ...fields });
|
|
691
778
|
}
|
|
692
779
|
if (data.outcome === 'dry-run-install') {
|
|
693
|
-
return (_jsxs(Box, { flexDirection: 'column', children: [_jsx(DryRunBanner, { action: 'install', count: data.plan.totalCount, tools: data.tools, where: label }), _jsx(Text, { children: " " }), _jsx(PlanEntryLines, { plan: data.plan }), _jsx(NamedAssetLines, { assets: data.assets, dryRun: true, where: label }), _jsx(TargetLines, { bundles: data.bundles, dryRun: true, orgs: data.orgs, where: label }), _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] })] }));
|
|
780
|
+
return (_jsxs(Box, { flexDirection: 'column', children: [_jsx(DryRunBanner, { action: 'install', count: data.plan.totalCount, tools: data.tools, where: label }), _jsx(Text, { children: " " }), _jsx(PlanEntryLines, { plan: data.plan }), _jsx(NamedAssetLines, { assets: data.assets, dryRun: true, where: label }), _jsx(TargetLines, { bundles: data.bundles, dryRun: true, orgs: data.orgs, where: label }), _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] }), _jsx(PreferredScopeWarning, { preferred: data.preferredScope })] }));
|
|
694
781
|
}
|
|
695
782
|
return (_jsxs(Box, { flexDirection: 'column', children: [data.outcome === 'installed' &&
|
|
696
|
-
data.toolResults.map(({ results, skipped, tool: toolName, warnings }) => (_jsx(InstallSummary, { results: results, skipped: skipped, tools: [toolName], warnings: warnings, where: label }, toolName))), _jsx(NamedAssetLines, { assets: data.assets, where: label }), _jsx(TargetLines, { bundles: data.bundles, orgs: data.orgs, where: label }), data.outcome === 'installed' && _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] })] }));
|
|
783
|
+
data.toolResults.map(({ results, skipped, tool: toolName, warnings }) => (_jsx(InstallSummary, { results: results, skipped: skipped, tools: [toolName], warnings: warnings, where: label }, toolName))), _jsx(NamedAssetLines, { assets: data.assets, where: label }), _jsx(TargetLines, { bundles: data.bundles, orgs: data.orgs, where: label }), data.outcome === 'installed' && _jsx(CrossScopeWarning, { installs: data.crossScope ?? [] }), data.outcome === 'installed' && _jsx(PreferredScopeWarning, { preferred: data.preferredScope })] }));
|
|
697
784
|
}
|
|
698
785
|
/** `atk install <spec>` with the run's own flags, for a command an error suggests. */
|
|
699
786
|
function installCommandFor(spec, { adopt, dryRun, force, pin, projectRoot, tool, user }) {
|
|
@@ -799,14 +886,19 @@ function InstallOrg({ cliOrg, dryRun, force, json, orgName, pin, projectRoot, sk
|
|
|
799
886
|
const refs = assetsToInstall.map((a) => ({ name: a.name, type: a.type }));
|
|
800
887
|
const plan = resolveMultipleInstallPlans(ctx.registry, refs, ctx.activeOrg);
|
|
801
888
|
const crossScope = (resolved, installedAt) => crossScopeOf(resolved, { installedAt, json: effectiveJson, scope: ctx.scope, tools: ctx.toolNames });
|
|
889
|
+
// The picker already chose what installs here, so a preference for the other scope only gets a
|
|
890
|
+
// notice, once the run has planned or installed (a failed install records none). An org's assets
|
|
891
|
+
// are all its own, so each is named `@org/name`.
|
|
892
|
+
const preferredScope = () => preferredScopeField(preferredScopeOf(plan, ctx.scope), (preferred) => preferredScopeCommand(preferred, { force, pin, tool }), effectiveJson);
|
|
802
893
|
if (dryRun) {
|
|
803
894
|
const kept = withoutKeptDependencies(plan, ctx.lockfile, ctx.tools, {
|
|
804
895
|
projectDir: ctx.projectDir,
|
|
805
896
|
scope: ctx.scope,
|
|
806
897
|
});
|
|
807
898
|
const field = await crossScope(plan);
|
|
808
|
-
if (!cancelled)
|
|
809
|
-
setState({ phase: 'dry-run', plan: kept, tools: ctx.toolNames, ...field });
|
|
899
|
+
if (!cancelled) {
|
|
900
|
+
setState({ phase: 'dry-run', plan: kept, tools: ctx.toolNames, ...field, ...preferredScope() });
|
|
901
|
+
}
|
|
810
902
|
return;
|
|
811
903
|
}
|
|
812
904
|
if (!cancelled)
|
|
@@ -827,7 +919,7 @@ function InstallOrg({ cliOrg, dryRun, force, json, orgName, pin, projectRoot, sk
|
|
|
827
919
|
}));
|
|
828
920
|
const field = await crossScope(plan, ctx.projectDir);
|
|
829
921
|
if (!cancelled)
|
|
830
|
-
setState({ phase: 'done', toolResults, ...field });
|
|
922
|
+
setState({ phase: 'done', toolResults, ...field, ...preferredScope() });
|
|
831
923
|
}
|
|
832
924
|
catch (err) {
|
|
833
925
|
showError(err);
|
|
@@ -937,11 +1029,12 @@ function InstallOrg({ cliOrg, dryRun, force, json, orgName, pin, projectRoot, sk
|
|
|
937
1029
|
org: orgName,
|
|
938
1030
|
outcome: 'dry-run-org',
|
|
939
1031
|
plan: state.plan,
|
|
1032
|
+
preferredScope: state.preferredScope,
|
|
940
1033
|
tools: state.tools,
|
|
941
1034
|
...fields,
|
|
942
1035
|
});
|
|
943
1036
|
}
|
|
944
|
-
return (_jsxs(Box, { flexDirection: 'column', children: [_jsx(DryRunBanner, { action: 'install', count: state.plan.totalCount, tools: state.tools, where: label }), _jsx(Text, { children: " " }), _jsx(Text, { children: _jsxs(Text, { bold: true, color: 'magenta', children: ["Org: @", orgName] }) }), _jsx(Text, { children: " " }), _jsx(PlanEntryLines, { plan: state.plan }), _jsx(CrossScopeWarning, { installs: state.crossScope ?? [] })] }));
|
|
1037
|
+
return (_jsxs(Box, { flexDirection: 'column', children: [_jsx(DryRunBanner, { action: 'install', count: state.plan.totalCount, tools: state.tools, where: label }), _jsx(Text, { children: " " }), _jsx(Text, { children: _jsxs(Text, { bold: true, color: 'magenta', children: ["Org: @", orgName] }) }), _jsx(Text, { children: " " }), _jsx(PlanEntryLines, { plan: state.plan }), _jsx(CrossScopeWarning, { installs: state.crossScope ?? [] }), _jsx(PreferredScopeWarning, { preferred: state.preferredScope })] }));
|
|
945
1038
|
}
|
|
946
1039
|
if (state.phase === 'done') {
|
|
947
1040
|
if (effectiveJson) {
|
|
@@ -949,11 +1042,12 @@ function InstallOrg({ cliOrg, dryRun, force, json, orgName, pin, projectRoot, sk
|
|
|
949
1042
|
crossScope: state.crossScope,
|
|
950
1043
|
org: orgName,
|
|
951
1044
|
outcome: 'org-installed',
|
|
1045
|
+
preferredScope: state.preferredScope,
|
|
952
1046
|
toolResults: state.toolResults,
|
|
953
1047
|
...fields,
|
|
954
1048
|
});
|
|
955
1049
|
}
|
|
956
|
-
return (_jsxs(Box, { flexDirection: 'column', children: [_jsxs(Text, { color: 'green', children: ["\u2713 Installed from ", _jsxs(Text, { bold: true, children: ["@", orgName] })] }), state.toolResults.map(({ results, skipped, tool: toolName, warnings }) => (_jsx(InstallSummary, { results: results, skipped: skipped, tools: [toolName], warnings: warnings, where: label }, toolName))), _jsx(CrossScopeWarning, { installs: state.crossScope ?? [] })] }));
|
|
1050
|
+
return (_jsxs(Box, { flexDirection: 'column', children: [_jsxs(Text, { color: 'green', children: ["\u2713 Installed from ", _jsxs(Text, { bold: true, children: ["@", orgName] })] }), state.toolResults.map(({ results, skipped, tool: toolName, warnings }) => (_jsx(InstallSummary, { results: results, skipped: skipped, tools: [toolName], warnings: warnings, where: label }, toolName))), _jsx(CrossScopeWarning, { installs: state.crossScope ?? [] }), _jsx(PreferredScopeWarning, { preferred: state.preferredScope })] }));
|
|
957
1051
|
}
|
|
958
1052
|
return null;
|
|
959
1053
|
}
|
|
@@ -1016,6 +1110,24 @@ function plannedOutsideBundle(plan, lockfile, members, bundle) {
|
|
|
1016
1110
|
return [{ ...(origin ? { bundle: origin } : {}), ...member }];
|
|
1017
1111
|
});
|
|
1018
1112
|
}
|
|
1113
|
+
/** The install of the targets that prefer the other scope, at that scope, with the run's own flags. */
|
|
1114
|
+
function preferredScopeCommand({ assets, scope }, { adopt, force, orgActive = false, pin, spec, tool, }) {
|
|
1115
|
+
const names = assets.map((asset) => asset.org ? formatOrgName(asset.org, asset.name) : orgActive ? `global:${asset.name}` : asset.name);
|
|
1116
|
+
return installCommandFor(spec ?? names.join(' '), { adopt, force, pin, tool, user: scope === 'user' });
|
|
1117
|
+
}
|
|
1118
|
+
/**
|
|
1119
|
+
* The plan's direct targets that prefer the other scope, as the outcome's `preferredScope`, with
|
|
1120
|
+
* `command`, which installs them there. In JSON mode it also records the `preferred-scope` notice; a
|
|
1121
|
+
* TTY run shows `PreferredScopeWarning` under its summary instead.
|
|
1122
|
+
*/
|
|
1123
|
+
function preferredScopeField(preferred, command, json) {
|
|
1124
|
+
if (!preferred)
|
|
1125
|
+
return {};
|
|
1126
|
+
const field = { ...preferred, command: command(preferred) };
|
|
1127
|
+
if (json)
|
|
1128
|
+
addNotice(preferredScopeNotice(preferred, field.command));
|
|
1129
|
+
return { preferredScope: field };
|
|
1130
|
+
}
|
|
1019
1131
|
/**
|
|
1020
1132
|
* The bundles and orgs a run of several names had among them: what it did with each bundle, the
|
|
1021
1133
|
* bundle's members outside it, and how many assets each org brought.
|