@detergent-software/atk 8.5.0-dev.1 → 8.5.0-dev.3
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 +23 -0
- package/build/commands/init.js +1 -1
- package/build/commands/init.js.map +1 -1
- package/build/commands/publish.d.ts +2 -1
- package/build/commands/publish.d.ts.map +1 -1
- package/build/commands/publish.js +73 -12
- package/build/commands/publish.js.map +1 -1
- package/build/hooks/usePublishState.d.ts +43 -2
- package/build/hooks/usePublishState.d.ts.map +1 -1
- package/build/hooks/usePublishState.js +237 -24
- package/build/hooks/usePublishState.js.map +1 -1
- package/build/lib/api-client.d.ts +5 -2
- package/build/lib/api-client.d.ts.map +1 -1
- package/build/lib/api-client.js +15 -4
- package/build/lib/api-client.js.map +1 -1
- package/build/lib/bundle-version.js +2 -2
- package/build/lib/bundle-version.js.map +1 -1
- package/build/lib/init.d.ts +4 -3
- package/build/lib/init.d.ts.map +1 -1
- package/build/lib/init.js +7 -6
- package/build/lib/init.js.map +1 -1
- package/build/lib/multi-tool-install.d.ts.map +1 -1
- package/build/lib/multi-tool-install.js +3 -1
- package/build/lib/multi-tool-install.js.map +1 -1
- package/build/lib/publisher.d.ts +51 -5
- package/build/lib/publisher.d.ts.map +1 -1
- package/build/lib/publisher.js +161 -40
- package/build/lib/publisher.js.map +1 -1
- package/build/lib/registry.d.ts +5 -3
- package/build/lib/registry.d.ts.map +1 -1
- package/build/lib/registry.js +8 -4
- package/build/lib/registry.js.map +1 -1
- package/build/lib/resolver.js +4 -2
- package/build/lib/resolver.js.map +1 -1
- package/package.json +1 -1
package/build/lib/resolver.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { satisfies } from 'semver';
|
|
2
2
|
import { GuidedError } from './errors.js';
|
|
3
3
|
import { formatOrgName } from './org.js';
|
|
4
|
-
import { findAsset, findAssetsByName } from './registry.js';
|
|
4
|
+
import { findAsset, findAssetsByName, isLatestAlias } from './registry.js';
|
|
5
5
|
/** Module-level cache for resolved install plans, keyed by registry version + org + asset type + asset name + version. */
|
|
6
6
|
const resolverCache = new Map();
|
|
7
7
|
export class ResolverError extends GuidedError {
|
|
@@ -124,7 +124,9 @@ function resolveAsset(registry, entries, visiting, name, type, version, reason,
|
|
|
124
124
|
const displayName = formatOrgName(result.asset.org, name);
|
|
125
125
|
const planned = entries.find((e) => e.asset.org === result.asset.org && e.asset.type === result.asset.type && e.asset.name === name);
|
|
126
126
|
if (planned) {
|
|
127
|
-
|
|
127
|
+
// `latest` is no range, as no version is: the planned version serves it.
|
|
128
|
+
const range = version === undefined || isLatestAlias(version) ? undefined : version;
|
|
129
|
+
if (planned.version !== result.version && range !== undefined && !satisfies(planned.version, range)) {
|
|
128
130
|
throw new ResolverError(`"${displayName}" is required at two versions: ${planned.version} by ${requester(planned.requiredBy)} ` +
|
|
129
131
|
`and ${result.version} by ${requester(requiredBy)}. An asset installs at one version.`, { hint: 'Install the assets that need it separately, or align their version ranges.' });
|
|
130
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/lib/resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAInC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/lib/resolver.ts"],"names":[],"mappings":"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"}
|