@lesliechan721/aw 0.1.0-beta.8 → 0.1.0-beta.9
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/dist/authoring/scripts/add-skill.mjs +4 -4
- package/dist/authoring/scripts/add-skill.mjs.map +1 -1
- package/dist/authoring/scripts/init-plugin.mjs +4 -4
- package/dist/authoring/scripts/init-plugin.mjs.map +1 -1
- package/dist/authoring/scripts/lib/plugin-version-check.mjs +1 -1
- package/dist/authoring/scripts/lib/skill-scaffold.d.mts +77 -90
- package/dist/authoring/scripts/lib/skill-scaffold.mjs +99 -120
- package/dist/authoring/scripts/lib/skill-scaffold.mjs.map +1 -1
- package/dist/authoring/scripts/remove-plugin.mjs +1 -1
- package/dist/authoring/scripts/remove-plugin.mjs.map +1 -1
- package/dist/authoring/scripts/validate-plugin.mjs +34 -778
- package/dist/authoring/scripts/validate-plugin.mjs.map +1 -1
- package/dist/scripts/aw-skill-eval-materializer.d.ts +24 -0
- package/dist/scripts/{plugin-eval-materializer.js → aw-skill-eval-materializer.js} +34 -145
- package/dist/scripts/aw-skill-eval-materializer.js.map +1 -0
- package/dist/scripts/bundle-plugins.d.ts +1 -0
- package/dist/scripts/bundle-plugins.js +2 -1
- package/dist/scripts/bundle-plugins.js.map +1 -1
- package/dist/scripts/plugin-staging.d.ts +5 -6
- package/dist/scripts/plugin-staging.js +12 -13
- package/dist/scripts/plugin-staging.js.map +1 -1
- package/dist/src/authoring/workspace-commands.d.ts +2 -1
- package/dist/src/authoring/workspace-commands.js.map +1 -1
- package/dist/src/commands/aw-capabilities.d.ts +2 -2
- package/dist/src/commands/aw-capabilities.js +6 -11
- package/dist/src/commands/aw-capabilities.js.map +1 -1
- package/dist/src/commands/catalog-dev-source.d.ts +18 -12
- package/dist/src/commands/catalog-dev-source.js +241 -305
- package/dist/src/commands/catalog-dev-source.js.map +1 -1
- package/dist/src/commands/catalog-generation.d.ts +6 -19
- package/dist/src/commands/catalog-generation.js +10 -11
- package/dist/src/commands/catalog-generation.js.map +1 -1
- package/dist/src/commands/catalog-publication-inspection.d.ts +28 -27
- package/dist/src/commands/catalog-publication-inspection.js +139 -50
- package/dist/src/commands/catalog-publication-inspection.js.map +1 -1
- package/dist/src/commands/catalog-publication-journal.d.ts +49 -0
- package/dist/src/commands/catalog-publication-journal.js +147 -0
- package/dist/src/commands/catalog-publication-journal.js.map +1 -0
- package/dist/src/commands/catalog-publication-target.d.ts +2 -1
- package/dist/src/commands/catalog-publication-target.js +37 -2
- package/dist/src/commands/catalog-publication-target.js.map +1 -1
- package/dist/src/commands/catalog-publish.d.ts +51 -15
- package/dist/src/commands/catalog-publish.js +576 -219
- package/dist/src/commands/catalog-publish.js.map +1 -1
- package/dist/src/commands/catalog-source.d.ts +3 -28
- package/dist/src/commands/catalog-source.js +29 -140
- package/dist/src/commands/catalog-source.js.map +1 -1
- package/dist/src/commands/catalog-status.d.ts +6 -26
- package/dist/src/commands/catalog-status.js +8 -146
- package/dist/src/commands/catalog-status.js.map +1 -1
- package/dist/src/commands/catalog-workspace-resolution.d.ts +13 -0
- package/dist/src/commands/catalog-workspace-resolution.js +42 -0
- package/dist/src/commands/catalog-workspace-resolution.js.map +1 -0
- package/dist/src/commands/dependency-operation-plan.d.ts +88 -9
- package/dist/src/commands/dependency-operation-plan.js +331 -6
- package/dist/src/commands/dependency-operation-plan.js.map +1 -1
- package/dist/src/commands/init.d.ts +5 -11
- package/dist/src/commands/init.js +30 -51
- package/dist/src/commands/init.js.map +1 -1
- package/dist/src/commands/offline-cleanup-evidence.d.ts +20 -0
- package/dist/src/commands/offline-cleanup-evidence.js +87 -9
- package/dist/src/commands/offline-cleanup-evidence.js.map +1 -1
- package/dist/src/commands/options.d.ts +6 -1
- package/dist/src/commands/options.js +64 -6
- package/dist/src/commands/options.js.map +1 -1
- package/dist/src/commands/plugin-capabilities.js +4 -0
- package/dist/src/commands/plugin-capabilities.js.map +1 -1
- package/dist/src/commands/rebuild-command.d.ts +10 -8
- package/dist/src/commands/rebuild-command.js +1217 -426
- package/dist/src/commands/rebuild-command.js.map +1 -1
- package/dist/src/commands/rebuild-integration.d.ts +54 -6
- package/dist/src/commands/rebuild-integration.js +691 -364
- package/dist/src/commands/rebuild-integration.js.map +1 -1
- package/dist/src/commands/rebuild-operations.d.ts +2 -0
- package/dist/src/commands/rebuild-operations.js +31 -17
- package/dist/src/commands/rebuild-operations.js.map +1 -1
- package/dist/src/commands/skill-eval.d.ts +33 -0
- package/dist/src/commands/skill-eval.js +363 -0
- package/dist/src/commands/skill-eval.js.map +1 -0
- package/dist/src/commands/{status-v5.d.ts → status-v6.d.ts} +59 -26
- package/dist/src/commands/{status-v5.js → status-v6.js} +882 -79
- package/dist/src/commands/status-v6.js.map +1 -0
- package/dist/src/commands/sync-command.d.ts +21 -0
- package/dist/src/commands/sync-command.js +206 -0
- package/dist/src/commands/sync-command.js.map +1 -0
- package/dist/src/commands/wizard.d.ts +2 -2
- package/dist/src/commands/write-commands.js +1 -43
- package/dist/src/commands/write-commands.js.map +1 -1
- package/dist/src/constants.d.ts +5 -4
- package/dist/src/constants.js +5 -4
- package/dist/src/constants.js.map +1 -1
- package/dist/src/eval/manifest-v1.d.ts +66 -0
- package/dist/src/eval/manifest-v1.js +326 -0
- package/dist/src/eval/manifest-v1.js.map +1 -0
- package/dist/src/generators/local-plugin.d.ts +3 -0
- package/dist/src/generators/local-plugin.js +123 -55
- package/dist/src/generators/local-plugin.js.map +1 -1
- package/dist/src/index.d.ts +2 -0
- package/dist/src/index.js +412 -152
- package/dist/src/index.js.map +1 -1
- package/dist/src/output/command-receipt.d.ts +58 -8
- package/dist/src/output/command-receipt.js +141 -11
- package/dist/src/output/command-receipt.js.map +1 -1
- package/dist/src/output/model.d.ts +3 -11
- package/dist/src/portable/commands.d.ts +2 -2
- package/dist/src/portable/commands.js +2 -8
- package/dist/src/portable/commands.js.map +1 -1
- package/dist/src/portable/materializer.d.ts +1 -4
- package/dist/src/portable/materializer.js +0 -2
- package/dist/src/portable/materializer.js.map +1 -1
- package/dist/src/tui/catalog-generation.d.ts +20 -41
- package/dist/src/tui/catalog-generation.js +65 -224
- package/dist/src/tui/catalog-generation.js.map +1 -1
- package/dist/src/tui/components.js +1 -2
- package/dist/src/tui/components.js.map +1 -1
- package/dist/src/tui/console-app-v4.js +461 -330
- package/dist/src/tui/console-app-v4.js.map +1 -1
- package/dist/src/tui/controller-runtime.d.ts +3 -5
- package/dist/src/tui/controller-runtime.js +182 -187
- package/dist/src/tui/controller-runtime.js.map +1 -1
- package/dist/src/tui/controller.d.ts +42 -45
- package/dist/src/tui/controller.js +454 -407
- package/dist/src/tui/controller.js.map +1 -1
- package/dist/src/tui/diagnostics.d.ts +1 -2
- package/dist/src/tui/diagnostics.js.map +1 -1
- package/dist/src/tui/index.d.ts +1 -1
- package/dist/src/tui/index.js +1 -1
- package/dist/src/tui/index.js.map +1 -1
- package/dist/src/tui/model.d.ts +81 -13
- package/dist/src/tui/model.js +378 -95
- package/dist/src/tui/model.js.map +1 -1
- package/dist/src/tui/router.d.ts +9 -0
- package/dist/src/tui/router.js.map +1 -1
- package/dist/src/types.d.ts +54 -47
- package/dist/src/types.js.map +1 -1
- package/dist/src/utils/agent-version.d.ts +4 -1
- package/dist/src/utils/agent-version.js +28 -3
- package/dist/src/utils/agent-version.js.map +1 -1
- package/dist/src/utils/catalog-digests.d.ts +7 -0
- package/dist/src/utils/catalog-digests.js +27 -0
- package/dist/src/utils/catalog-digests.js.map +1 -1
- package/dist/src/utils/catalog-generation-control-snapshot.d.ts +11 -0
- package/dist/src/utils/catalog-generation-control-snapshot.js +45 -0
- package/dist/src/utils/catalog-generation-control-snapshot.js.map +1 -0
- package/dist/src/utils/catalog-generation-error.d.ts +2 -1
- package/dist/src/utils/catalog-generation-error.js +12 -0
- package/dist/src/utils/catalog-generation-error.js.map +1 -1
- package/dist/src/utils/catalog-generation-resolver.d.ts +10 -3
- package/dist/src/utils/catalog-generation-resolver.js +90 -76
- package/dist/src/utils/catalog-generation-resolver.js.map +1 -1
- package/dist/src/utils/catalog-generation-service.d.ts +24 -33
- package/dist/src/utils/catalog-generation-service.js +253 -567
- package/dist/src/utils/catalog-generation-service.js.map +1 -1
- package/dist/src/utils/catalog-generation-state.d.ts +4 -0
- package/dist/src/utils/catalog-generation-state.js +73 -106
- package/dist/src/utils/catalog-generation-state.js.map +1 -1
- package/dist/src/utils/catalog-generation-store.d.ts +16 -26
- package/dist/src/utils/catalog-generation-store.js +154 -290
- package/dist/src/utils/catalog-generation-store.js.map +1 -1
- package/dist/src/utils/catalog-manifest-v6.d.ts +5 -0
- package/dist/src/utils/{catalog-manifest-v5.js → catalog-manifest-v6.js} +23 -35
- package/dist/src/utils/catalog-manifest-v6.js.map +1 -0
- package/dist/src/utils/catalog-operation-context.d.ts +6 -14
- package/dist/src/utils/catalog-operation-context.js +68 -169
- package/dist/src/utils/catalog-operation-context.js.map +1 -1
- package/dist/src/utils/catalog-public-error.js +1 -4
- package/dist/src/utils/catalog-public-error.js.map +1 -1
- package/dist/src/utils/catalog-runtime-projection.d.ts +3 -0
- package/dist/src/utils/catalog-runtime-projection.js +5 -40
- package/dist/src/utils/catalog-runtime-projection.js.map +1 -1
- package/dist/src/utils/catalog-snapshot.d.ts +2 -2
- package/dist/src/utils/catalog-source-references.d.ts +7 -0
- package/dist/src/utils/catalog-source-references.js +44 -55
- package/dist/src/utils/catalog-source-references.js.map +1 -1
- package/dist/src/utils/catalog-sources.js +25 -9
- package/dist/src/utils/catalog-sources.js.map +1 -1
- package/dist/src/utils/codex-config.d.ts +2 -0
- package/dist/src/utils/codex-config.js +22 -1
- package/dist/src/utils/codex-config.js.map +1 -1
- package/dist/src/utils/codex-manager.d.ts +50 -2
- package/dist/src/utils/codex-manager.js +160 -6
- package/dist/src/utils/codex-manager.js.map +1 -1
- package/dist/src/utils/codex-reconciler.d.ts +131 -0
- package/dist/src/utils/codex-reconciler.js +327 -0
- package/dist/src/utils/codex-reconciler.js.map +1 -0
- package/dist/src/utils/codex-shared-native.d.ts +56 -0
- package/dist/src/utils/codex-shared-native.js +87 -0
- package/dist/src/utils/codex-shared-native.js.map +1 -0
- package/dist/src/utils/codex-surface-analysis.d.ts +44 -0
- package/dist/src/utils/codex-surface-analysis.js +247 -0
- package/dist/src/utils/codex-surface-analysis.js.map +1 -0
- package/dist/src/utils/git-catalog-provider.js +56 -115
- package/dist/src/utils/git-catalog-provider.js.map +1 -1
- package/dist/src/utils/manifest.d.ts +1 -3
- package/dist/src/utils/manifest.js +1 -3
- package/dist/src/utils/manifest.js.map +1 -1
- package/dist/src/utils/multi-source-catalog.d.ts +1 -10
- package/dist/src/utils/multi-source-catalog.js +8 -175
- package/dist/src/utils/multi-source-catalog.js.map +1 -1
- package/dist/src/utils/native-cli.d.ts +34 -0
- package/dist/src/utils/native-cli.js +91 -0
- package/dist/src/utils/native-cli.js.map +1 -1
- package/dist/src/utils/orphan-marketplace-cleanup.js +1 -0
- package/dist/src/utils/orphan-marketplace-cleanup.js.map +1 -1
- package/dist/src/utils/ownership.d.ts +0 -10
- package/dist/src/utils/ownership.js +3 -88
- package/dist/src/utils/ownership.js.map +1 -1
- package/dist/src/utils/path-catalog-provider.d.ts +1 -1
- package/dist/src/utils/path-catalog-provider.js +45 -62
- package/dist/src/utils/path-catalog-provider.js.map +1 -1
- package/dist/src/utils/paths.d.ts +0 -1
- package/dist/src/utils/paths.js +0 -1
- package/dist/src/utils/paths.js.map +1 -1
- package/dist/src/utils/plugin-config-write.js +0 -5
- package/dist/src/utils/plugin-config-write.js.map +1 -1
- package/dist/src/utils/plugin-intent-state.d.ts +39 -0
- package/dist/src/utils/plugin-intent-state.js +325 -0
- package/dist/src/utils/plugin-intent-state.js.map +1 -0
- package/dist/src/utils/target-eligibility.d.ts +3 -2
- package/dist/src/utils/target-eligibility.js +4 -3
- package/dist/src/utils/target-eligibility.js.map +1 -1
- package/package.json +5 -4
- package/dist/scripts/aw-skill-eval-engine.d.ts +0 -13
- package/dist/scripts/aw-skill-eval-engine.js +0 -31
- package/dist/scripts/aw-skill-eval-engine.js.map +0 -1
- package/dist/scripts/codex-eval-app-server.d.ts +0 -91
- package/dist/scripts/codex-eval-app-server.js +0 -1334
- package/dist/scripts/codex-eval-app-server.js.map +0 -1
- package/dist/scripts/codex-eval-isolation.d.ts +0 -61
- package/dist/scripts/codex-eval-isolation.js +0 -318
- package/dist/scripts/codex-eval-isolation.js.map +0 -1
- package/dist/scripts/codex-eval-process-management.d.ts +0 -8
- package/dist/scripts/codex-eval-process-management.js +0 -69
- package/dist/scripts/codex-eval-process-management.js.map +0 -1
- package/dist/scripts/codex-eval-process-tree.d.ts +0 -38
- package/dist/scripts/codex-eval-process-tree.js +0 -803
- package/dist/scripts/codex-eval-process-tree.js.map +0 -1
- package/dist/scripts/codex-eval-runtime-config.d.ts +0 -62
- package/dist/scripts/codex-eval-runtime-config.js +0 -843
- package/dist/scripts/codex-eval-runtime-config.js.map +0 -1
- package/dist/scripts/codex-trigger-eval.d.ts +0 -84
- package/dist/scripts/codex-trigger-eval.js +0 -968
- package/dist/scripts/codex-trigger-eval.js.map +0 -1
- package/dist/scripts/eval-plugin-skills-audited.d.ts +0 -6
- package/dist/scripts/eval-plugin-skills-audited.js +0 -261
- package/dist/scripts/eval-plugin-skills-audited.js.map +0 -1
- package/dist/scripts/eval-plugin-skills.d.ts +0 -45
- package/dist/scripts/eval-plugin-skills.js +0 -1589
- package/dist/scripts/eval-plugin-skills.js.map +0 -1
- package/dist/scripts/eval-run-layout.d.ts +0 -17
- package/dist/scripts/eval-run-layout.js +0 -26
- package/dist/scripts/eval-run-layout.js.map +0 -1
- package/dist/scripts/plugin-eval-contract.d.ts +0 -189
- package/dist/scripts/plugin-eval-contract.js +0 -745
- package/dist/scripts/plugin-eval-contract.js.map +0 -1
- package/dist/scripts/plugin-eval-materializer.d.ts +0 -13
- package/dist/scripts/plugin-eval-materializer.js.map +0 -1
- package/dist/scripts/skill-reporting.d.ts +0 -212
- package/dist/scripts/skill-reporting.js +0 -922
- package/dist/scripts/skill-reporting.js.map +0 -1
- package/dist/src/commands/catalog-context.d.ts +0 -52
- package/dist/src/commands/catalog-context.js +0 -156
- package/dist/src/commands/catalog-context.js.map +0 -1
- package/dist/src/commands/status-v5.js.map +0 -1
- package/dist/src/utils/catalog-manifest-v5.d.ts +0 -5
- package/dist/src/utils/catalog-manifest-v5.js.map +0 -1
- package/dist/src/utils/catalog-source-cache.d.ts +0 -62
- package/dist/src/utils/catalog-source-cache.js +0 -321
- package/dist/src/utils/catalog-source-cache.js.map +0 -1
- package/dist/src/utils/codex-project-surface.d.ts +0 -3
- package/dist/src/utils/codex-project-surface.js +0 -49
- package/dist/src/utils/codex-project-surface.js.map +0 -1
- package/dist/src/utils/plugin-release.d.ts +0 -2
- package/dist/src/utils/plugin-release.js +0 -2
- package/dist/src/utils/plugin-release.js.map +0 -1
|
@@ -4,7 +4,7 @@ import { calculateCatalogEntryArtifactDigest, calculateCatalogEntryContentDigest
|
|
|
4
4
|
import { createMarketplaceManifestEntry, normalizeCatalogManifestBase, normalizeCatalogManifestEntries, normalizeCatalogMarketplaceIdentity, normalizeAwCapabilities, } from './manifest.js';
|
|
5
5
|
const DIGEST_PATTERN = /^sha256:[0-9a-f]{64}$/;
|
|
6
6
|
const SOURCE_HEAD_PATTERN = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/;
|
|
7
|
-
export const
|
|
7
|
+
export const CATALOG_SCHEMA_6_CAPABILITY = 'aw.catalog-snapshot.v6';
|
|
8
8
|
function assertObject(value, fieldName) {
|
|
9
9
|
if (typeof value !== 'object' || value === null || Array.isArray(value)) {
|
|
10
10
|
throw new Error(`Invalid ${fieldName}: expected an object.`);
|
|
@@ -24,63 +24,51 @@ function digest(value, fieldName) {
|
|
|
24
24
|
return value;
|
|
25
25
|
}
|
|
26
26
|
function normalizeRelease(raw) {
|
|
27
|
-
const release = assertObject(raw, 'catalog manifest
|
|
27
|
+
const release = assertObject(raw, 'catalog manifest v6.release');
|
|
28
28
|
if (release.state === 'development') {
|
|
29
|
-
assertAllowedKeys(release, 'catalog manifest
|
|
29
|
+
assertAllowedKeys(release, 'catalog manifest v6.release', ['state']);
|
|
30
30
|
return { state: 'development' };
|
|
31
31
|
}
|
|
32
32
|
if (release.state !== 'published') {
|
|
33
|
-
throw new Error('Invalid catalog manifest
|
|
34
|
-
}
|
|
35
|
-
assertAllowedKeys(release, 'catalog manifest v5.release', [
|
|
36
|
-
'state', 'targetVersion', 'planId', 'sourceHead', 'contentDigest',
|
|
37
|
-
]);
|
|
38
|
-
if (typeof release.targetVersion !== 'string' || !/^\d+\.\d+\.\d+$/u.test(release.targetVersion)) {
|
|
39
|
-
throw new Error('Invalid catalog manifest v5.release.targetVersion: expected a stable version.');
|
|
33
|
+
throw new Error('Invalid catalog manifest v6.release.state.');
|
|
40
34
|
}
|
|
35
|
+
assertAllowedKeys(release, 'catalog manifest v6.release', ['state', 'sourceHead']);
|
|
41
36
|
if (typeof release.sourceHead !== 'string' || !SOURCE_HEAD_PATTERN.test(release.sourceHead)) {
|
|
42
|
-
throw new Error('Invalid catalog manifest
|
|
37
|
+
throw new Error('Invalid catalog manifest v6.release.sourceHead.');
|
|
43
38
|
}
|
|
44
39
|
return {
|
|
45
40
|
state: 'published',
|
|
46
|
-
targetVersion: release.targetVersion,
|
|
47
|
-
planId: digest(release.planId, 'catalog manifest v5.release.planId'),
|
|
48
41
|
sourceHead: release.sourceHead,
|
|
49
|
-
contentDigest: digest(release.contentDigest, 'catalog manifest v5.release.contentDigest'),
|
|
50
42
|
};
|
|
51
43
|
}
|
|
52
|
-
export function
|
|
53
|
-
const input = assertObject(rawManifest, 'catalog manifest
|
|
54
|
-
assertAllowedKeys(input, 'catalog manifest
|
|
44
|
+
export function validateCatalogManifestV6(rawManifest) {
|
|
45
|
+
const input = assertObject(rawManifest, 'catalog manifest v6');
|
|
46
|
+
assertAllowedKeys(input, 'catalog manifest v6', [
|
|
55
47
|
'schemaVersion', 'catalogVersion', 'channel', 'requires', 'marketplace', 'release', 'entries',
|
|
56
48
|
]);
|
|
57
|
-
if (input.schemaVersion !==
|
|
58
|
-
throw new Error('Invalid catalog manifest
|
|
49
|
+
if (input.schemaVersion !== 6) {
|
|
50
|
+
throw new Error('Invalid catalog manifest v6.schemaVersion: expected 6.');
|
|
59
51
|
}
|
|
60
52
|
if (!Array.isArray(input.entries)) {
|
|
61
|
-
throw new Error('Invalid catalog manifest
|
|
53
|
+
throw new Error('Invalid catalog manifest v6.entries: expected an array.');
|
|
62
54
|
}
|
|
63
55
|
const contentDigests = [];
|
|
64
56
|
const entryInputs = input.entries.map((rawEntry, index) => {
|
|
65
|
-
const entry = assertObject(rawEntry, `catalog manifest
|
|
66
|
-
contentDigests.push(digest(entry.contentDigest, `catalog manifest
|
|
57
|
+
const entry = assertObject(rawEntry, `catalog manifest v6.entries[${index}]`);
|
|
58
|
+
contentDigests.push(digest(entry.contentDigest, `catalog manifest v6.entries[${index}].contentDigest`));
|
|
67
59
|
const entryInput = { ...entry };
|
|
68
60
|
delete entryInput.contentDigest;
|
|
69
61
|
return entryInput;
|
|
70
62
|
});
|
|
71
|
-
const base = normalizeCatalogManifestBase(input, 'catalog manifest
|
|
63
|
+
const base = normalizeCatalogManifestBase(input, 'catalog manifest v6');
|
|
72
64
|
const marketplace = normalizeCatalogMarketplaceIdentity(input.marketplace);
|
|
73
|
-
if (!(base.requires.aw.capabilities ?? []).includes(
|
|
74
|
-
throw new Error(`Invalid catalog manifest
|
|
65
|
+
if (!(base.requires.aw.capabilities ?? []).includes(CATALOG_SCHEMA_6_CAPABILITY)) {
|
|
66
|
+
throw new Error(`Invalid catalog manifest v6.requires.aw.capabilities: expected ${CATALOG_SCHEMA_6_CAPABILITY}.`);
|
|
75
67
|
}
|
|
76
|
-
const entries = normalizeCatalogManifestEntries(entryInputs, base, 'catalog manifest
|
|
68
|
+
const entries = normalizeCatalogManifestEntries(entryInputs, base, 'catalog manifest v6');
|
|
77
69
|
const release = normalizeRelease(input.release);
|
|
78
|
-
if (release.state === 'published'
|
|
79
|
-
&& release.targetVersion !== base.catalogVersion.replace(/-beta\.[1-9]\d*$/u, '')) {
|
|
80
|
-
throw new Error('Invalid catalog manifest v5.release.targetVersion: must equal the stable catalogVersion core.');
|
|
81
|
-
}
|
|
82
70
|
return {
|
|
83
|
-
schemaVersion:
|
|
71
|
+
schemaVersion: 6,
|
|
84
72
|
catalogVersion: base.catalogVersion,
|
|
85
73
|
channel: base.channel,
|
|
86
74
|
requires: base.requires,
|
|
@@ -89,10 +77,10 @@ export function validateCatalogManifestV5(rawManifest) {
|
|
|
89
77
|
entries: entries.map((entry, index) => ({ ...entry, contentDigest: contentDigests[index] })),
|
|
90
78
|
};
|
|
91
79
|
}
|
|
92
|
-
export function
|
|
93
|
-
return
|
|
80
|
+
export function createCatalogManifestV6(manifest) {
|
|
81
|
+
return validateCatalogManifestV6({ schemaVersion: 6, ...manifest });
|
|
94
82
|
}
|
|
95
|
-
export async function
|
|
83
|
+
export async function createCatalogManifestV6Entry(plugin, pluginRoot) {
|
|
96
84
|
return {
|
|
97
85
|
...createMarketplaceManifestEntry(plugin),
|
|
98
86
|
version: plugin.manifest.version,
|
|
@@ -107,4 +95,4 @@ export async function createCatalogManifestV5Entry(plugin, pluginRoot) {
|
|
|
107
95
|
contentDigest: await calculateCatalogEntryContentDigest(pluginRoot),
|
|
108
96
|
};
|
|
109
97
|
}
|
|
110
|
-
//# sourceMappingURL=catalog-manifest-
|
|
98
|
+
//# sourceMappingURL=catalog-manifest-v6.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"catalog-manifest-v6.js","sourceRoot":"","sources":["../../../src/utils/catalog-manifest-v6.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { CatalogGenerationSet, CatalogSourceId } from '../types.js';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import type { CatalogStoreEntry } from './catalog-generation-store.js';
|
|
3
|
+
import type { CatalogSourcesConfigSnapshot } from './catalog-sources.js';
|
|
4
4
|
import type { MultiSourceCatalogResolution } from './multi-source-catalog.js';
|
|
5
5
|
export interface CatalogOperationContext {
|
|
6
6
|
generationSet: CatalogGenerationSet;
|
|
@@ -8,21 +8,13 @@ export interface CatalogOperationContext {
|
|
|
8
8
|
catalog: MultiSourceCatalogResolution;
|
|
9
9
|
}
|
|
10
10
|
export interface ResolveCatalogOperationContextOptions {
|
|
11
|
-
cliVersion: string;
|
|
12
11
|
sourceIds?: CatalogSourceId[];
|
|
13
12
|
configSnapshot?: CatalogSourcesConfigSnapshot;
|
|
14
13
|
env?: NodeJS.ProcessEnv;
|
|
15
14
|
signal?: AbortSignal;
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
validatedStoreEntries?: Map<string, CatalogStoreEntry>;
|
|
16
|
+
validatingStoreEntries?: Map<string, Promise<CatalogStoreEntry>>;
|
|
18
17
|
}
|
|
19
18
|
export declare function selectCatalogOperationContext(context: CatalogOperationContext, sourceIds: CatalogSourceId[]): CatalogOperationContext;
|
|
20
|
-
export declare function
|
|
21
|
-
|
|
22
|
-
sourceIds?: CatalogSourceId[];
|
|
23
|
-
env?: NodeJS.ProcessEnv;
|
|
24
|
-
signal?: AbortSignal;
|
|
25
|
-
runtime?: CatalogGenerationServiceRuntime;
|
|
26
|
-
}): Promise<void>;
|
|
27
|
-
export declare function resolveCatalogOperationContext(options: ResolveCatalogOperationContextOptions): Promise<CatalogOperationContext>;
|
|
28
|
-
export declare function resolvePartialCatalogOperationContext(options: ResolveCatalogOperationContextOptions): Promise<CatalogOperationContext>;
|
|
19
|
+
export declare function resolveCatalogOperationContext(options?: ResolveCatalogOperationContextOptions): Promise<CatalogOperationContext>;
|
|
20
|
+
export declare function resolvePartialCatalogOperationContext(options?: ResolveCatalogOperationContextOptions): Promise<CatalogOperationContext>;
|
|
@@ -1,29 +1,19 @@
|
|
|
1
1
|
import { CatalogGenerationError } from './catalog-generation-error.js';
|
|
2
2
|
import { calculateCatalogGenerationSetDigest, resolveCatalogGenerationSet, } from './catalog-generation-resolver.js';
|
|
3
|
-
import {
|
|
4
|
-
import { readCatalogGenerationState } from './catalog-generation-state.js';
|
|
5
|
-
import { calculateCatalogSourceIdentity } from './catalog-source-identity.js';
|
|
6
|
-
import { readCatalogSourcesConfigSnapshot, } from './catalog-sources.js';
|
|
7
|
-
import { validateCatalogSnapshotTransport } from './catalog-snapshot.js';
|
|
3
|
+
import { readCatalogGenerationControlSnapshot, } from './catalog-generation-control-snapshot.js';
|
|
8
4
|
export function selectCatalogOperationContext(context, sourceIds) {
|
|
9
5
|
const requested = new Set(sourceIds);
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
if (missing) {
|
|
6
|
+
const missing = sourceIds.find((sourceId) => !context.generationSet.sources.some((source) => source.sourceId === sourceId));
|
|
7
|
+
if (missing)
|
|
13
8
|
throw new CatalogGenerationError({
|
|
14
9
|
code: 'catalogGenerationUnavailable',
|
|
15
10
|
sourceId: missing,
|
|
16
|
-
message: `Catalog source "${missing}" was unavailable when this operation context was bound.
|
|
11
|
+
message: `Catalog source "${missing}" was unavailable when this operation context was bound. Run aw catalog source sync ${missing}, then retry.`,
|
|
17
12
|
});
|
|
18
|
-
}
|
|
19
13
|
const sources = context.generationSet.sources.filter((source) => requested.has(source.sourceId));
|
|
20
|
-
const generationSetDigest = calculateCatalogGenerationSetDigest(context.generationSet.primarySourceId, sources);
|
|
14
|
+
const generationSetDigest = calculateCatalogGenerationSetDigest(context.generationSet.configDigest, context.generationSet.primarySourceId, sources);
|
|
21
15
|
return {
|
|
22
|
-
generationSet: {
|
|
23
|
-
...context.generationSet,
|
|
24
|
-
generationSetDigest,
|
|
25
|
-
sources,
|
|
26
|
-
},
|
|
16
|
+
generationSet: { ...context.generationSet, sources, generationSetDigest },
|
|
27
17
|
generationSetDigest,
|
|
28
18
|
catalog: {
|
|
29
19
|
...context.catalog,
|
|
@@ -37,204 +27,113 @@ function selectedSourceIds(snapshot, sourceIds) {
|
|
|
37
27
|
return snapshot.config.sources.map((source) => source.id);
|
|
38
28
|
const configured = new Set(snapshot.config.sources.map((source) => source.id));
|
|
39
29
|
const unknown = sourceIds.find((sourceId) => !configured.has(sourceId));
|
|
40
|
-
if (unknown)
|
|
30
|
+
if (unknown)
|
|
41
31
|
throw new CatalogGenerationError({
|
|
42
32
|
code: 'catalogGenerationSourceMissing',
|
|
43
33
|
sourceId: unknown,
|
|
44
34
|
message: `Catalog source "${unknown}" is not configured.`,
|
|
45
35
|
});
|
|
46
|
-
|
|
47
|
-
return
|
|
48
|
-
}
|
|
49
|
-
async function bootstrapMissingActiveGenerations(options) {
|
|
50
|
-
const [snapshot, state] = await Promise.all([
|
|
51
|
-
readCatalogSourcesConfigSnapshot(options.env),
|
|
52
|
-
readCatalogGenerationState(options.env),
|
|
53
|
-
]);
|
|
54
|
-
const missing = selectedSourceIds(snapshot, options.sourceIds)
|
|
55
|
-
.filter((sourceId) => !state.sources[sourceId]?.active);
|
|
56
|
-
if (missing.length === 0)
|
|
57
|
-
return;
|
|
58
|
-
let firstFailure;
|
|
59
|
-
for (const sourceId of missing) {
|
|
60
|
-
try {
|
|
61
|
-
await refreshCatalogSourceGeneration({
|
|
62
|
-
sourceId,
|
|
63
|
-
cliVersion: options.cliVersion,
|
|
64
|
-
env: options.env,
|
|
65
|
-
...(options.signal ? { signal: options.signal } : {}),
|
|
66
|
-
...(options.runtime ? { runtime: options.runtime } : {}),
|
|
67
|
-
});
|
|
68
|
-
}
|
|
69
|
-
catch (cause) {
|
|
70
|
-
if (options.signal?.aborted)
|
|
71
|
-
throw cause;
|
|
72
|
-
firstFailure ??= { sourceId, cause };
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
if (!firstFailure)
|
|
76
|
-
return;
|
|
77
|
-
throw new CatalogGenerationError({
|
|
78
|
-
code: 'catalogGenerationUnavailable',
|
|
79
|
-
sourceId: firstFailure.sourceId,
|
|
80
|
-
message: `Catalog source "${firstFailure.sourceId}" has no Active generation and automatic bootstrap failed. Run aw catalog source refresh ${firstFailure.sourceId}, then retry.`,
|
|
81
|
-
cause: firstFailure.cause,
|
|
82
|
-
});
|
|
83
|
-
}
|
|
84
|
-
export async function bootstrapCatalogOperationSources(options) {
|
|
85
|
-
return bootstrapMissingActiveGenerations({
|
|
86
|
-
cliVersion: options.cliVersion,
|
|
87
|
-
...(options.sourceIds ? { sourceIds: options.sourceIds } : {}),
|
|
88
|
-
env: options.env ?? process.env,
|
|
89
|
-
...(options.signal ? { signal: options.signal } : {}),
|
|
90
|
-
...(options.runtime ? { runtime: options.runtime } : {}),
|
|
91
|
-
});
|
|
92
|
-
}
|
|
93
|
-
async function resolveGenerationSetWithBootstrap(options) {
|
|
94
|
-
try {
|
|
95
|
-
return await resolveCatalogGenerationSet({
|
|
96
|
-
...(options.sourceIds ? { sourceIds: options.sourceIds } : {}),
|
|
97
|
-
env: options.env,
|
|
98
|
-
});
|
|
99
|
-
}
|
|
100
|
-
catch (error) {
|
|
101
|
-
if (!(error instanceof CatalogGenerationError)
|
|
102
|
-
|| error.code !== 'catalogGenerationUnavailable'
|
|
103
|
-
|| options.bootstrapMissingActive === false)
|
|
104
|
-
throw error;
|
|
105
|
-
await bootstrapMissingActiveGenerations(options);
|
|
106
|
-
return resolveCatalogGenerationSet({
|
|
107
|
-
...(options.sourceIds ? { sourceIds: options.sourceIds } : {}),
|
|
108
|
-
env: options.env,
|
|
109
|
-
});
|
|
110
|
-
}
|
|
36
|
+
const requested = new Set(sourceIds);
|
|
37
|
+
return snapshot.config.sources.filter((source) => requested.has(source.id)).map((source) => source.id);
|
|
111
38
|
}
|
|
112
|
-
|
|
113
|
-
const
|
|
114
|
-
options.
|
|
115
|
-
const generationSet = await resolveGenerationSetWithBootstrap({
|
|
116
|
-
cliVersion: options.cliVersion,
|
|
117
|
-
...(options.sourceIds ? { sourceIds: options.sourceIds } : {}),
|
|
118
|
-
env,
|
|
119
|
-
...(options.signal ? { signal: options.signal } : {}),
|
|
120
|
-
...(options.runtime ? { runtime: options.runtime } : {}),
|
|
121
|
-
...(options.bootstrapMissingActive === false ? { bootstrapMissingActive: false } : {}),
|
|
122
|
-
});
|
|
123
|
-
options.signal?.throwIfAborted();
|
|
124
|
-
const [configSnapshot, state] = await Promise.all([
|
|
125
|
-
options.configSnapshot
|
|
126
|
-
? Promise.resolve(options.configSnapshot)
|
|
127
|
-
: readCatalogSourcesConfigSnapshot(env),
|
|
128
|
-
readCatalogGenerationState(env),
|
|
129
|
-
]);
|
|
130
|
-
const configured = new Map(configSnapshot.config.sources.map((source) => [source.id, source]));
|
|
131
|
-
const sources = await Promise.all(generationSet.sources.map(async (generation) => {
|
|
39
|
+
async function createContext(options) {
|
|
40
|
+
const configured = new Map(options.control.configSnapshot.config.sources.map((source) => [source.id, source]));
|
|
41
|
+
const sources = options.generationSet.sources.map((generation) => {
|
|
132
42
|
options.signal?.throwIfAborted();
|
|
133
43
|
const source = configured.get(generation.sourceId);
|
|
134
|
-
const active =
|
|
44
|
+
const active = options.control.generationState.sources[generation.sourceId]?.active;
|
|
135
45
|
if (!source || !active
|
|
136
|
-
|| active.
|
|
137
|
-
|| active.
|
|
138
|
-
throw new CatalogGenerationError({
|
|
139
|
-
code: 'catalogGenerationIdentityMismatch',
|
|
140
|
-
sourceId: generation.sourceId,
|
|
141
|
-
message: `Active Catalog generation for source "${generation.sourceId}" changed while the operation context was being resolved. Retry the operation.`,
|
|
142
|
-
});
|
|
143
|
-
}
|
|
144
|
-
const validation = await validateCatalogSnapshotTransport(generation.snapshotPath);
|
|
145
|
-
if (validation.manifestDigest !== generation.manifestDigest
|
|
146
|
-
|| validation.snapshotDigest !== generation.snapshotDigest) {
|
|
46
|
+
|| active.snapshotDigest !== generation.snapshotDigest
|
|
47
|
+
|| active.sourceIdentity !== generation.sourceIdentity) {
|
|
147
48
|
throw new CatalogGenerationError({
|
|
148
49
|
code: 'catalogGenerationIdentityMismatch',
|
|
149
50
|
sourceId: generation.sourceId,
|
|
150
|
-
message: `Active Catalog
|
|
51
|
+
message: `Active Catalog snapshot for source "${generation.sourceId}" changed while the operation context was being resolved. Retry the operation.`,
|
|
151
52
|
});
|
|
152
53
|
}
|
|
153
54
|
const resolution = {
|
|
154
55
|
sourceId: generation.sourceId,
|
|
155
|
-
sourceIdentity:
|
|
56
|
+
sourceIdentity: generation.sourceIdentity,
|
|
156
57
|
requestedRef: active.requestedRef,
|
|
157
58
|
resolvedCommit: generation.resolvedCommit,
|
|
158
59
|
rootDir: generation.snapshotPath,
|
|
159
|
-
manifest:
|
|
60
|
+
manifest: generation.manifest,
|
|
160
61
|
manifestDigest: generation.manifestDigest,
|
|
161
62
|
snapshotDigest: generation.snapshotDigest,
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
cacheFallback: false,
|
|
63
|
+
transport: source.type,
|
|
64
|
+
async cleanup() { },
|
|
165
65
|
};
|
|
166
66
|
return { sourceId: generation.sourceId, resolution };
|
|
167
|
-
})
|
|
168
|
-
options.signal?.throwIfAborted();
|
|
67
|
+
});
|
|
169
68
|
return {
|
|
170
|
-
generationSet,
|
|
171
|
-
generationSetDigest: generationSet.generationSetDigest,
|
|
69
|
+
generationSet: options.generationSet,
|
|
70
|
+
generationSetDigest: options.generationSet.generationSetDigest,
|
|
172
71
|
catalog: {
|
|
173
72
|
sources,
|
|
174
|
-
primarySourceId: generationSet.primarySourceId,
|
|
175
|
-
configDigest:
|
|
176
|
-
compositeDigest: generationSet.generationSetDigest,
|
|
73
|
+
primarySourceId: options.generationSet.primarySourceId,
|
|
74
|
+
configDigest: options.generationSet.configDigest,
|
|
75
|
+
compositeDigest: options.generationSet.generationSetDigest,
|
|
177
76
|
},
|
|
178
77
|
};
|
|
179
78
|
}
|
|
180
|
-
export async function
|
|
79
|
+
export async function resolveCatalogOperationContext(options = {}) {
|
|
181
80
|
const env = options.env ?? process.env;
|
|
182
81
|
options.signal?.throwIfAborted();
|
|
183
|
-
const
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
}
|
|
202
|
-
const
|
|
82
|
+
const control = await readCatalogGenerationControlSnapshot({
|
|
83
|
+
env,
|
|
84
|
+
configSnapshot: options.configSnapshot,
|
|
85
|
+
});
|
|
86
|
+
const generationSet = await resolveCatalogGenerationSet({
|
|
87
|
+
sourceIds: selectedSourceIds(control.configSnapshot, options.sourceIds),
|
|
88
|
+
env,
|
|
89
|
+
controlSnapshot: control,
|
|
90
|
+
validatedStoreEntries: options.validatedStoreEntries,
|
|
91
|
+
validatingStoreEntries: options.validatingStoreEntries,
|
|
92
|
+
});
|
|
93
|
+
return createContext({ generationSet, control, signal: options.signal });
|
|
94
|
+
}
|
|
95
|
+
export async function resolvePartialCatalogOperationContext(options = {}) {
|
|
96
|
+
const env = options.env ?? process.env;
|
|
97
|
+
const control = await readCatalogGenerationControlSnapshot({
|
|
98
|
+
env,
|
|
99
|
+
configSnapshot: options.configSnapshot,
|
|
100
|
+
});
|
|
101
|
+
const sourceIds = selectedSourceIds(control.configSnapshot, options.sourceIds);
|
|
102
|
+
const results = await Promise.all(sourceIds.map(async (sourceId) => {
|
|
203
103
|
try {
|
|
204
|
-
const
|
|
205
|
-
...options,
|
|
104
|
+
const generationSet = await resolveCatalogGenerationSet({
|
|
206
105
|
sourceIds: [sourceId],
|
|
207
|
-
configSnapshot,
|
|
208
106
|
env,
|
|
209
|
-
|
|
107
|
+
controlSnapshot: control,
|
|
108
|
+
validatedStoreEntries: options.validatedStoreEntries,
|
|
109
|
+
validatingStoreEntries: options.validatingStoreEntries,
|
|
210
110
|
});
|
|
211
|
-
return { sourceId, context };
|
|
111
|
+
return { sourceId, context: await createContext({ generationSet, control, signal: options.signal }) };
|
|
212
112
|
}
|
|
213
113
|
catch (error) {
|
|
214
114
|
if (options.signal?.aborted)
|
|
215
115
|
throw error;
|
|
216
|
-
|
|
217
|
-
&& bootstrapFailure.sourceId === sourceId
|
|
218
|
-
? bootstrapFailure
|
|
219
|
-
: error;
|
|
220
|
-
return { sourceId, error: failure };
|
|
116
|
+
return { sourceId, error: error };
|
|
221
117
|
}
|
|
222
118
|
}));
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
const
|
|
226
|
-
|
|
227
|
-
const primarySourceId = configSnapshot.config.sources.find((source) => source.primary).id;
|
|
228
|
-
const generationSetDigest = calculateCatalogGenerationSetDigest(primarySourceId, sources);
|
|
119
|
+
const sources = results.flatMap((result) => result.context?.generationSet.sources ?? [])
|
|
120
|
+
.sort((left, right) => left.sourceId.localeCompare(right.sourceId));
|
|
121
|
+
const primarySourceId = control.configSnapshot.config.sources.find((source) => source.primary).id;
|
|
122
|
+
const generationSetDigest = calculateCatalogGenerationSetDigest(control.configSnapshot.digest, primarySourceId, sources);
|
|
229
123
|
return {
|
|
230
|
-
generationSet: {
|
|
124
|
+
generationSet: {
|
|
125
|
+
generationSetDigest,
|
|
126
|
+
configDigest: control.configSnapshot.digest,
|
|
127
|
+
primarySourceId,
|
|
128
|
+
sources,
|
|
129
|
+
},
|
|
231
130
|
generationSetDigest,
|
|
232
131
|
catalog: {
|
|
233
|
-
sources:
|
|
234
|
-
?
|
|
235
|
-
: { sourceId:
|
|
132
|
+
sources: results.map((result) => result.context
|
|
133
|
+
? result.context.catalog.sources[0]
|
|
134
|
+
: { sourceId: result.sourceId, error: result.error }),
|
|
236
135
|
primarySourceId,
|
|
237
|
-
configDigest: configSnapshot.digest,
|
|
136
|
+
configDigest: control.configSnapshot.digest,
|
|
238
137
|
compositeDigest: generationSetDigest,
|
|
239
138
|
},
|
|
240
139
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog-operation-context.js","sourceRoot":"","sources":["../../../src/utils/catalog-operation-context.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EACL,mCAAmC,EACnC,2BAA2B,GAC5B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"catalog-operation-context.js","sourceRoot":"","sources":["../../../src/utils/catalog-operation-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,6 @@ export function sanitizeCatalogSourceErrorMessage(message, env = process.env, se
|
|
|
43
43
|
output = replaceRoot(output, root, '[catalog-source]');
|
|
44
44
|
}
|
|
45
45
|
for (const [root, replacement] of [
|
|
46
|
-
[path.join(awHome, 'catalog-cache'), '[catalog-state]'],
|
|
47
46
|
[path.join(path.dirname(awHome), '.aw-local-marketplace-staging'), '[catalog-staging]'],
|
|
48
47
|
[awHome, '[aw-state]'],
|
|
49
48
|
]) {
|
|
@@ -59,9 +58,7 @@ export function sanitizeCatalogSourceErrorMessage(message, env = process.env, se
|
|
|
59
58
|
].filter((value) => Boolean(value)))) {
|
|
60
59
|
output = replaceRoot(output, tempRoot, '[temporary]');
|
|
61
60
|
}
|
|
62
|
-
return output
|
|
63
|
-
.replace(/\.(?:materialize|path)-[^/\\\s"']+\.tmp/gu, '[catalog-materialization]')
|
|
64
|
-
.replace(/catalog-cache/gu, '[catalog-state]');
|
|
61
|
+
return output.replace(/\.(?:materialize|path)-[^/\\\s"']+\.tmp/gu, '[catalog-materialization]');
|
|
65
62
|
}
|
|
66
63
|
export function catalogSourceErrorCode(error) {
|
|
67
64
|
const code = error.code;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog-public-error.js","sourceRoot":"","sources":["../../../src/utils/catalog-public-error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,kBAAkB,GAAG,+BAA+B,CAAC;AAI3D,MAAM,OAAO,iCAAkC,SAAQ,KAAK;IACjD,QAAQ,CAAS;IACjB,IAAI,CAAwC;IAC5C,oBAAoB,CAAW;IAC/B,mBAAmB,CAAW;IAC9B,qBAAqB,CAAW;IAEzC,YAAY,OAKX;QACC,KAAK,CAAC,mBAAmB,OAAO,CAAC,QAAQ,2CAA2C,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/H,IAAI,CAAC,IAAI,GAAG,mCAAmC,CAAC;QAChD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC;QACtC,IAAI,CAAC,oBAAoB,GAAG,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAC9D,IAAI,CAAC,mBAAmB,GAAG,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAC5D,IAAI,CAAC,qBAAqB,GAAG,CAAC,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAClE,CAAC;CACF;AAED,SAAS,YAAY,CAAC,KAAa;IACjC,OAAO,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,WAAW,CAAC,OAAe,EAAE,IAAY,EAAE,WAAmB;IACrE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC;QACvB,UAAU;QACV,UAAU,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC;QAChC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACzF,CAAC,CAAC;IACH,IAAI,MAAM,GAAG,OAAO,CAAC;IACrB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC;IAC/E,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC/C,OAAe,EACf,MAAyB,OAAO,CAAC,GAAG,EACpC,iBAAoC,EAAE;IAEtC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IAChD,IAAI,MAAM,GAAG,OAAO,CAAC;IACrB,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;QAClC,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE;YAAE,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;IACjF,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI;QAChC,CAAC,IAAI,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"catalog-public-error.js","sourceRoot":"","sources":["../../../src/utils/catalog-public-error.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,8 @@ export interface CatalogRuntimeExportResolution {
|
|
|
10
10
|
source: string;
|
|
11
11
|
sourcePath: string;
|
|
12
12
|
sourceDigest: string;
|
|
13
|
+
requiredCapabilities: string[];
|
|
14
|
+
capabilitySetDigest: string;
|
|
13
15
|
canonicalSource: CanonicalRuntimeSourceIdentity;
|
|
14
16
|
supportedPlatforms: ReadonlySet<PlatformName>;
|
|
15
17
|
virtual: boolean;
|
|
@@ -26,5 +28,6 @@ export declare function resolveRuntimeExportSource(options: {
|
|
|
26
28
|
plugin: PluginMeta;
|
|
27
29
|
name: string;
|
|
28
30
|
source: string;
|
|
31
|
+
requiredCapabilities: readonly unknown[];
|
|
29
32
|
}): Promise<CatalogRuntimeExportResolution>;
|
|
30
33
|
export declare function createCatalogRuntimeImportResolver(plugins: readonly PluginMeta[]): CatalogRuntimeImportResolver;
|