opkg 0.5.0 → 0.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +49 -8
- package/dist/commands/add.js +11 -276
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/init.js +73 -145
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/install.js +26 -668
- package/dist/commands/install.js.map +1 -1
- package/dist/commands/pack.js +10 -137
- package/dist/commands/pack.js.map +1 -1
- package/dist/commands/push.js +14 -8
- package/dist/commands/push.js.map +1 -1
- package/dist/commands/save.js +12 -167
- package/dist/commands/save.js.map +1 -1
- package/dist/commands/status.js +2 -2
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/uninstall.js +5 -5
- package/dist/commands/uninstall.js.map +1 -1
- package/dist/constants/index.js +18 -45
- package/dist/constants/index.js.map +1 -1
- package/dist/constants/workspace.js +9 -0
- package/dist/constants/workspace.js.map +1 -0
- package/dist/core/add/add-conflict-handler.js +68 -0
- package/dist/core/add/add-conflict-handler.js.map +1 -0
- package/dist/core/add/add-pipeline.js +137 -0
- package/dist/core/add/add-pipeline.js.map +1 -0
- package/dist/core/add/package-index-updater.js +62 -33
- package/dist/core/add/package-index-updater.js.map +1 -1
- package/dist/core/add/platform-path-transformer.js +47 -0
- package/dist/core/add/platform-path-transformer.js.map +1 -0
- package/dist/core/add/source-collector.js +57 -0
- package/dist/core/add/source-collector.js.map +1 -0
- package/dist/core/dependency-resolver.js +3 -1
- package/dist/core/dependency-resolver.js.map +1 -1
- package/dist/core/directory.js +2 -2
- package/dist/core/directory.js.map +1 -1
- package/dist/core/discovery/file-discovery.js +55 -54
- package/dist/core/discovery/file-discovery.js.map +1 -1
- package/dist/core/discovery/platform-files-discovery.js +32 -17
- package/dist/core/discovery/platform-files-discovery.js.map +1 -1
- package/dist/core/install/bulk-install-pipeline.js +199 -0
- package/dist/core/install/bulk-install-pipeline.js.map +1 -0
- package/dist/core/install/canonical-plan.js +123 -0
- package/dist/core/install/canonical-plan.js.map +1 -0
- package/dist/core/install/dry-run.js +2 -2
- package/dist/core/install/dry-run.js.map +1 -1
- package/dist/core/install/index.js +3 -0
- package/dist/core/install/index.js.map +1 -0
- package/dist/core/install/install-errors.js +41 -0
- package/dist/core/install/install-errors.js.map +1 -0
- package/dist/core/install/install-flow.js +2 -5
- package/dist/core/install/install-flow.js.map +1 -1
- package/dist/core/install/install-pipeline.js +228 -0
- package/dist/core/install/install-pipeline.js.map +1 -0
- package/dist/core/install/install-reporting.js +99 -0
- package/dist/core/install/install-reporting.js.map +1 -0
- package/dist/core/install/platform-resolution.js +6 -6
- package/dist/core/install/platform-resolution.js.map +1 -1
- package/dist/core/install/remote-flow.js +67 -1
- package/dist/core/install/remote-flow.js.map +1 -1
- package/dist/core/openpackage.js +16 -8
- package/dist/core/openpackage.js.map +1 -1
- package/dist/core/package-context.js +246 -0
- package/dist/core/package-context.js.map +1 -0
- package/dist/core/package.js +3 -2
- package/dist/core/package.js.map +1 -1
- package/dist/core/platforms.js +126 -217
- package/dist/core/platforms.js.map +1 -1
- package/dist/core/registry/registry-rename.js +2 -1
- package/dist/core/registry/registry-rename.js.map +1 -1
- package/dist/core/registry.js +10 -3
- package/dist/core/registry.js.map +1 -1
- package/dist/core/remote-pull.js +2 -1
- package/dist/core/remote-pull.js.map +1 -1
- package/dist/core/save/constants.js +4 -0
- package/dist/core/save/constants.js.map +1 -1
- package/dist/core/save/name-resolution.js +31 -0
- package/dist/core/save/name-resolution.js.map +1 -0
- package/dist/core/save/package-detection.js +147 -0
- package/dist/core/save/package-detection.js.map +1 -0
- package/dist/core/save/package-saver.js +46 -43
- package/dist/core/save/package-saver.js.map +1 -1
- package/dist/core/save/package-yml-generator.js +50 -71
- package/dist/core/save/package-yml-generator.js.map +1 -1
- package/dist/core/save/root-save-candidates.js.map +1 -1
- package/dist/core/save/save-candidate-loader.js +89 -0
- package/dist/core/save/save-candidate-loader.js.map +1 -0
- package/dist/core/save/save-conflict-resolution.js +72 -410
- package/dist/core/save/save-conflict-resolution.js.map +1 -1
- package/dist/core/save/save-conflict-resolver.js +277 -0
- package/dist/core/save/save-conflict-resolver.js.map +1 -0
- package/dist/core/save/save-pipeline.js +151 -0
- package/dist/core/save/save-pipeline.js.map +1 -0
- package/dist/core/save/save-types.js +2 -0
- package/dist/core/save/save-types.js.map +1 -0
- package/dist/core/save/save-yml-resolution.js +77 -39
- package/dist/core/save/save-yml-resolution.js.map +1 -1
- package/dist/core/save/workspace-rename.js +6 -6
- package/dist/core/save/workspace-rename.js.map +1 -1
- package/dist/core/scoping/package-scoping.js +13 -1
- package/dist/core/scoping/package-scoping.js.map +1 -1
- package/dist/core/status/status-file-discovery.js +12 -30
- package/dist/core/status/status-file-discovery.js.map +1 -1
- package/dist/core/sync/platform-sync.js +7 -4
- package/dist/core/sync/platform-sync.js.map +1 -1
- package/dist/core/sync/root-files-sync.js +59 -1
- package/dist/core/sync/root-files-sync.js.map +1 -1
- package/dist/core/uninstall/uninstall-file-discovery.js +1 -2
- package/dist/core/uninstall/uninstall-file-discovery.js.map +1 -1
- package/dist/types/index.js.map +1 -1
- package/dist/utils/file-processing.js +5 -58
- package/dist/utils/file-processing.js.map +1 -1
- package/dist/utils/index-based-installer.js +15 -33
- package/dist/utils/index-based-installer.js.map +1 -1
- package/dist/utils/install-file-discovery.js +3 -3
- package/dist/utils/install-file-discovery.js.map +1 -1
- package/dist/utils/install-orchestrator.js +21 -21
- package/dist/utils/install-orchestrator.js.map +1 -1
- package/dist/utils/jsonc.js +44 -0
- package/dist/utils/jsonc.js.map +1 -0
- package/dist/utils/package-copy.js +199 -0
- package/dist/utils/package-copy.js.map +1 -0
- package/dist/utils/package-filters.js +125 -0
- package/dist/utils/package-filters.js.map +1 -0
- package/dist/utils/package-index-yml.js +15 -10
- package/dist/utils/package-index-yml.js.map +1 -1
- package/dist/utils/package-installation.js +4 -113
- package/dist/utils/package-installation.js.map +1 -1
- package/dist/utils/package-local-files.js +2 -35
- package/dist/utils/package-local-files.js.map +1 -1
- package/dist/utils/package-management.js +59 -37
- package/dist/utils/package-management.js.map +1 -1
- package/dist/utils/package-yml.js +24 -0
- package/dist/utils/package-yml.js.map +1 -1
- package/dist/utils/path-normalization.js +8 -53
- package/dist/utils/path-normalization.js.map +1 -1
- package/dist/utils/paths.js +17 -9
- package/dist/utils/paths.js.map +1 -1
- package/dist/utils/platform-file.js +16 -59
- package/dist/utils/platform-file.js.map +1 -1
- package/dist/utils/platform-mapper.js +29 -41
- package/dist/utils/platform-mapper.js.map +1 -1
- package/dist/utils/platform-specific-paths.js.map +1 -1
- package/dist/utils/platform-utils.js +28 -139
- package/dist/utils/platform-utils.js.map +1 -1
- package/dist/utils/platform-yaml-merge.js +13 -6
- package/dist/utils/platform-yaml-merge.js.map +1 -1
- package/dist/utils/registry-entry-filter.js +38 -24
- package/dist/utils/registry-entry-filter.js.map +1 -1
- package/dist/utils/registry-paths.js +10 -0
- package/dist/utils/registry-paths.js.map +1 -0
- package/dist/utils/root-file-installer.js +19 -0
- package/dist/utils/root-file-installer.js.map +1 -1
- package/dist/utils/root-file-registry.js.map +1 -1
- package/package.json +3 -2
- package/platforms.jsonc +178 -0
- package/specs/package/README.md +60 -0
- package/specs/package/nested-packages-and-parent-packages.md +79 -0
- package/specs/package/package-index-yml.md +171 -0
- package/specs/package/package-root-layout.md +78 -0
- package/specs/package/registry-payload-and-copy.md +77 -0
- package/specs/package/universal-content.md +144 -0
- package/specs/platforms.md +193 -0
- package/specs/save/README.md +40 -0
- package/specs/save/save-conflict-resolution.md +146 -0
- package/specs/save/save-file-discovery.md +101 -0
- package/specs/save/save-frontmatter-overrides.md +81 -0
- package/specs/save/save-modes-inputs.md +53 -0
- package/specs/save/save-naming-scoping.md +93 -0
- package/specs/save/save-package-detection.md +60 -0
- package/specs/save/save-registry-sync.md +126 -0
- package/dist/commands/release.js +0 -33
- package/dist/commands/release.js.map +0 -1
- package/dist/commands/tag.js +0 -311
- package/dist/commands/tag.js.map +0 -1
- package/dist/commands/update.js +0 -30
- package/dist/commands/update.js.map +0 -1
- package/dist/core/add/formula-index-updater.js +0 -290
- package/dist/core/add/formula-index-updater.js.map +0 -1
- package/dist/core/discovery/ai-files-discovery.js +0 -2
- package/dist/core/discovery/ai-files-discovery.js.map +0 -1
- package/dist/core/discovery/formula-files-discovery.js +0 -14
- package/dist/core/discovery/formula-files-discovery.js.map +0 -1
- package/dist/core/discovery/index-files-discovery.js +0 -91
- package/dist/core/discovery/index-files-discovery.js.map +0 -1
- package/dist/core/discovery/md-files-discovery.js +0 -82
- package/dist/core/discovery/md-files-discovery.js.map +0 -1
- package/dist/core/discovery/package-files-discovery.js +0 -14
- package/dist/core/discovery/package-files-discovery.js.map +0 -1
- package/dist/core/discovery/platform-discovery.js +0 -84
- package/dist/core/discovery/platform-discovery.js.map +0 -1
- package/dist/core/discovery/root-files-discovery.js +0 -2
- package/dist/core/discovery/root-files-discovery.js.map +0 -1
- package/dist/core/formula.js +0 -170
- package/dist/core/formula.js.map +0 -1
- package/dist/core/git-registry.js +0 -46
- package/dist/core/git-registry.js.map +0 -1
- package/dist/core/groundzero.js +0 -277
- package/dist/core/groundzero.js.map +0 -1
- package/dist/core/install/scenario.js +0 -11
- package/dist/core/install/scenario.js.map +0 -1
- package/dist/core/package-sync.js +0 -219
- package/dist/core/package-sync.js.map +0 -1
- package/dist/core/save/formula-file-generator.js +0 -167
- package/dist/core/save/formula-file-generator.js.map +0 -1
- package/dist/core/save/formula-saver.js +0 -52
- package/dist/core/save/formula-saver.js.map +0 -1
- package/dist/core/save/formula-yml-generator.js +0 -89
- package/dist/core/save/formula-yml-generator.js.map +0 -1
- package/dist/core/save/formula-yml-versioning.js +0 -108
- package/dist/core/save/formula-yml-versioning.js.map +0 -1
- package/dist/core/save/generic-file-sync.js +0 -38
- package/dist/core/save/generic-file-sync.js.map +0 -1
- package/dist/core/save/md-files-sync.js +0 -33
- package/dist/core/save/md-files-sync.js.map +0 -1
- package/dist/core/save/package-yml-versioning.js +0 -108
- package/dist/core/save/package-yml-versioning.js.map +0 -1
- package/dist/core/save/platform-sync.js +0 -95
- package/dist/core/save/platform-sync.js.map +0 -1
- package/dist/core/save/root-files-sync.js +0 -140
- package/dist/core/save/root-files-sync.js.map +0 -1
- package/dist/core/save/save-candidate-types.js +0 -2
- package/dist/core/save/save-candidate-types.js.map +0 -1
- package/dist/core/save/save-conflict-types.js +0 -2
- package/dist/core/save/save-conflict-types.js.map +0 -1
- package/dist/core/save/save-file-discovery.js +0 -5
- package/dist/core/save/save-file-discovery.js.map +0 -1
- package/dist/core/status-file-discovery.js +0 -175
- package/dist/core/status-file-discovery.js.map +0 -1
- package/dist/utils/discovery/file-processing.js +0 -156
- package/dist/utils/discovery/file-processing.js.map +0 -1
- package/dist/utils/discovery/formula-discovery.js +0 -211
- package/dist/utils/discovery/formula-discovery.js.map +0 -1
- package/dist/utils/discovery/platform-discovery.js +0 -2
- package/dist/utils/discovery/platform-discovery.js.map +0 -1
- package/dist/utils/formula-discovery.js +0 -102
- package/dist/utils/formula-discovery.js.map +0 -1
- package/dist/utils/formula-index-yml.js +0 -122
- package/dist/utils/formula-index-yml.js.map +0 -1
- package/dist/utils/formula-installation.js +0 -110
- package/dist/utils/formula-installation.js.map +0 -1
- package/dist/utils/formula-local-files.js +0 -38
- package/dist/utils/formula-local-files.js.map +0 -1
- package/dist/utils/formula-management.js +0 -191
- package/dist/utils/formula-management.js.map +0 -1
- package/dist/utils/formula-name.js +0 -97
- package/dist/utils/formula-name.js.map +0 -1
- package/dist/utils/formula-versioning.js +0 -109
- package/dist/utils/formula-versioning.js.map +0 -1
- package/dist/utils/formula-yml.js +0 -82
- package/dist/utils/formula-yml.js.map +0 -1
- package/dist/utils/git.js +0 -54
- package/dist/utils/git.js.map +0 -1
- package/dist/utils/id-based-discovery.js +0 -126
- package/dist/utils/id-based-discovery.js.map +0 -1
- package/dist/utils/id-based-installer.js +0 -249
- package/dist/utils/id-based-installer.js.map +0 -1
- package/dist/utils/index-yml-based-installer.js +0 -375
- package/dist/utils/index-yml-based-installer.js.map +0 -1
- package/dist/utils/index-yml.js +0 -124
- package/dist/utils/index-yml.js.map +0 -1
- package/dist/utils/md-frontmatter.js +0 -3
- package/dist/utils/md-frontmatter.js.map +0 -1
- package/dist/utils/package-link-yml.js +0 -92
- package/dist/utils/package-link-yml.js.map +0 -1
- package/dist/utils/platform-discovery.js +0 -2
- package/dist/utils/platform-discovery.js.map +0 -1
- package/dist/utils/platform-frontmatter-split.js +0 -15
- package/dist/utils/platform-frontmatter-split.js.map +0 -1
- package/dist/utils/timestamp-encoder.js +0 -13
- package/dist/utils/timestamp-encoder.js.map +0 -1
- package/dist/utils/wip-versioning.js +0 -24
- package/dist/utils/wip-versioning.js.map +0 -1
|
@@ -0,0 +1,277 @@
|
|
|
1
|
+
import { join } from 'path';
|
|
2
|
+
import { exists } from '../../utils/fs.js';
|
|
3
|
+
import { DIR_PATTERNS, FILE_PATTERNS } from '../../constants/index.js';
|
|
4
|
+
import { logger } from '../../utils/logger.js';
|
|
5
|
+
import { safePrompts, promptPlatformSpecificSelection, getContentPreview } from '../../utils/prompts.js';
|
|
6
|
+
import { createPlatformSpecificRegistryPath } from '../../utils/platform-specific-paths.js';
|
|
7
|
+
import { getOverrideRelativePath } from './save-yml-resolution.js';
|
|
8
|
+
export function buildCandidateGroups(localCandidates, workspaceCandidates) {
|
|
9
|
+
const map = new Map();
|
|
10
|
+
for (const candidate of localCandidates) {
|
|
11
|
+
const group = ensureGroup(map, candidate.registryPath);
|
|
12
|
+
group.local = candidate;
|
|
13
|
+
}
|
|
14
|
+
for (const candidate of workspaceCandidates) {
|
|
15
|
+
const group = ensureGroup(map, candidate.registryPath);
|
|
16
|
+
group.workspace.push(candidate);
|
|
17
|
+
}
|
|
18
|
+
return Array.from(map.values());
|
|
19
|
+
}
|
|
20
|
+
export async function pruneWorkspaceCandidatesWithLocalPlatformVariants(packageDir, groups) {
|
|
21
|
+
for (const group of groups) {
|
|
22
|
+
if (!group.local) {
|
|
23
|
+
continue;
|
|
24
|
+
}
|
|
25
|
+
const filtered = [];
|
|
26
|
+
const isUniversalSubdirPath = group.registryPath.startsWith(`${DIR_PATTERNS.OPENPACKAGE}/`);
|
|
27
|
+
for (const candidate of group.workspace) {
|
|
28
|
+
const platform = candidate.platform;
|
|
29
|
+
if (!platform || platform === 'ai') {
|
|
30
|
+
filtered.push(candidate);
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
33
|
+
const platformRegistryPath = createPlatformSpecificRegistryPath(group.registryPath, platform);
|
|
34
|
+
if (!platformRegistryPath) {
|
|
35
|
+
filtered.push(candidate);
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
const platformFullPath = join(packageDir, platformRegistryPath);
|
|
39
|
+
const hasPlatformFile = await exists(platformFullPath);
|
|
40
|
+
let hasPlatformOverride = false;
|
|
41
|
+
let overrideRelative = null;
|
|
42
|
+
if (group.registryPath.endsWith(FILE_PATTERNS.MD_FILES)) {
|
|
43
|
+
overrideRelative = getOverrideRelativePath(group.registryPath, platform);
|
|
44
|
+
if (overrideRelative) {
|
|
45
|
+
const overrideFullPath = join(packageDir, overrideRelative);
|
|
46
|
+
hasPlatformOverride = await exists(overrideFullPath);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
// For universal subdir content (e.g. .openpackage/agents/foo.md), we should not
|
|
50
|
+
// suppress workspace candidates just because a YAML override exists; overrides
|
|
51
|
+
// are frontmatter-only. We still want body conflicts from workspace to be seen.
|
|
52
|
+
//
|
|
53
|
+
// We only prune due to overrides for non-universal paths; for universal paths,
|
|
54
|
+
// we only prune when there is an actual platform-specific file.
|
|
55
|
+
const shouldPrune = hasPlatformFile || (!isUniversalSubdirPath && hasPlatformOverride);
|
|
56
|
+
if (shouldPrune) {
|
|
57
|
+
const reason = hasPlatformFile
|
|
58
|
+
? platformRegistryPath
|
|
59
|
+
: overrideRelative;
|
|
60
|
+
logger.debug(`Skipping workspace candidate ${candidate.displayPath} for ${group.registryPath} ` +
|
|
61
|
+
`because local platform-specific data (${reason}) already exists`);
|
|
62
|
+
continue;
|
|
63
|
+
}
|
|
64
|
+
filtered.push(candidate);
|
|
65
|
+
}
|
|
66
|
+
group.workspace = filtered;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
export async function resolveRootGroup(group, force) {
|
|
70
|
+
const orderedCandidates = [];
|
|
71
|
+
if (group.local) {
|
|
72
|
+
orderedCandidates.push(group.local);
|
|
73
|
+
}
|
|
74
|
+
if (group.workspace.length > 0) {
|
|
75
|
+
const sortedWorkspace = [...group.workspace].sort((a, b) => {
|
|
76
|
+
if (b.mtime !== a.mtime) {
|
|
77
|
+
return b.mtime - a.mtime;
|
|
78
|
+
}
|
|
79
|
+
return a.displayPath.localeCompare(b.displayPath);
|
|
80
|
+
});
|
|
81
|
+
orderedCandidates.push(...sortedWorkspace);
|
|
82
|
+
}
|
|
83
|
+
if (orderedCandidates.length === 0) {
|
|
84
|
+
return undefined;
|
|
85
|
+
}
|
|
86
|
+
const uniqueCandidates = dedupeByHash(orderedCandidates);
|
|
87
|
+
if (uniqueCandidates.length === 1) {
|
|
88
|
+
return {
|
|
89
|
+
selection: uniqueCandidates[0],
|
|
90
|
+
platformSpecific: []
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
if (group.local) {
|
|
94
|
+
const localCandidate = group.local;
|
|
95
|
+
const differsFromAnyWorkspace = group.workspace.some(w => w.contentHash !== localCandidate.contentHash);
|
|
96
|
+
if (differsFromAnyWorkspace) {
|
|
97
|
+
const latestWorkspaceMtime = group.workspace.length > 0 ? Math.max(...group.workspace.map(w => w.mtime)) : 0;
|
|
98
|
+
if (localCandidate.mtime >= latestWorkspaceMtime) {
|
|
99
|
+
return {
|
|
100
|
+
selection: localCandidate,
|
|
101
|
+
platformSpecific: []
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
if (force) {
|
|
105
|
+
logger.info(`Force-selected local version for ${group.registryPath}`);
|
|
106
|
+
return {
|
|
107
|
+
selection: localCandidate,
|
|
108
|
+
platformSpecific: []
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
return await promptForCandidate(group.registryPath, uniqueCandidates);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
if (force) {
|
|
115
|
+
const selected = pickLatestByMtime(uniqueCandidates);
|
|
116
|
+
logger.info(`Force-selected ${selected.displayPath} for ${group.registryPath}`);
|
|
117
|
+
return {
|
|
118
|
+
selection: selected,
|
|
119
|
+
platformSpecific: []
|
|
120
|
+
};
|
|
121
|
+
}
|
|
122
|
+
return await promptForCandidate(group.registryPath, uniqueCandidates);
|
|
123
|
+
}
|
|
124
|
+
export async function resolveGroup(group, force) {
|
|
125
|
+
const orderedCandidates = [];
|
|
126
|
+
if (group.local) {
|
|
127
|
+
orderedCandidates.push(group.local);
|
|
128
|
+
}
|
|
129
|
+
if (group.workspace.length > 0) {
|
|
130
|
+
const sortedWorkspace = [...group.workspace].sort((a, b) => {
|
|
131
|
+
if (b.mtime !== a.mtime) {
|
|
132
|
+
return b.mtime - a.mtime;
|
|
133
|
+
}
|
|
134
|
+
return a.displayPath.localeCompare(b.displayPath);
|
|
135
|
+
});
|
|
136
|
+
orderedCandidates.push(...sortedWorkspace);
|
|
137
|
+
}
|
|
138
|
+
if (orderedCandidates.length === 0) {
|
|
139
|
+
return undefined;
|
|
140
|
+
}
|
|
141
|
+
const uniqueCandidates = dedupeByHash(orderedCandidates);
|
|
142
|
+
if (uniqueCandidates.length === 1) {
|
|
143
|
+
return {
|
|
144
|
+
selection: uniqueCandidates[0],
|
|
145
|
+
platformSpecific: []
|
|
146
|
+
};
|
|
147
|
+
}
|
|
148
|
+
if (group.local) {
|
|
149
|
+
const localCandidate = group.local;
|
|
150
|
+
const differsFromAnyWorkspace = group.workspace.some(w => w.contentHash !== localCandidate.contentHash);
|
|
151
|
+
if (differsFromAnyWorkspace) {
|
|
152
|
+
const latestWorkspaceMtime = group.workspace.length > 0
|
|
153
|
+
? Math.max(...group.workspace.map(w => w.mtime))
|
|
154
|
+
: 0;
|
|
155
|
+
if (localCandidate.mtime >= latestWorkspaceMtime) {
|
|
156
|
+
return {
|
|
157
|
+
selection: localCandidate,
|
|
158
|
+
platformSpecific: []
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
if (!force) {
|
|
162
|
+
return await promptForCandidate(group.registryPath, uniqueCandidates);
|
|
163
|
+
}
|
|
164
|
+
logger.info(`Force-selected local version for ${group.registryPath}`);
|
|
165
|
+
return {
|
|
166
|
+
selection: localCandidate,
|
|
167
|
+
platformSpecific: []
|
|
168
|
+
};
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
if (force) {
|
|
172
|
+
const selected = pickLatestByMtime(uniqueCandidates);
|
|
173
|
+
logger.info(`Force-selected ${selected.displayPath} for ${group.registryPath}`);
|
|
174
|
+
return {
|
|
175
|
+
selection: selected,
|
|
176
|
+
platformSpecific: []
|
|
177
|
+
};
|
|
178
|
+
}
|
|
179
|
+
return await promptForCandidate(group.registryPath, uniqueCandidates);
|
|
180
|
+
}
|
|
181
|
+
function ensureGroup(map, registryPath) {
|
|
182
|
+
let group = map.get(registryPath);
|
|
183
|
+
if (!group) {
|
|
184
|
+
group = {
|
|
185
|
+
registryPath,
|
|
186
|
+
workspace: []
|
|
187
|
+
};
|
|
188
|
+
map.set(registryPath, group);
|
|
189
|
+
}
|
|
190
|
+
return group;
|
|
191
|
+
}
|
|
192
|
+
function dedupeByHash(candidates) {
|
|
193
|
+
const seen = new Set();
|
|
194
|
+
const unique = [];
|
|
195
|
+
for (const candidate of candidates) {
|
|
196
|
+
if (seen.has(candidate.contentHash)) {
|
|
197
|
+
continue;
|
|
198
|
+
}
|
|
199
|
+
seen.add(candidate.contentHash);
|
|
200
|
+
unique.push(candidate);
|
|
201
|
+
}
|
|
202
|
+
return unique;
|
|
203
|
+
}
|
|
204
|
+
function pickLatestByMtime(candidates) {
|
|
205
|
+
let best = candidates[0];
|
|
206
|
+
for (let i = 1; i < candidates.length; i += 1) {
|
|
207
|
+
const current = candidates[i];
|
|
208
|
+
if (current.mtime > best.mtime) {
|
|
209
|
+
best = current;
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
return best;
|
|
213
|
+
}
|
|
214
|
+
async function promptForCandidate(registryPath, candidates) {
|
|
215
|
+
console.log(`\n⚠️ Conflict detected for ${registryPath}:`);
|
|
216
|
+
candidates.forEach(candidate => {
|
|
217
|
+
console.log(` • ${formatCandidateLabel(candidate)}`);
|
|
218
|
+
});
|
|
219
|
+
const platformEligibleWorkspace = candidates.filter(candidate => candidate.source === 'workspace' && candidate.platform && candidate.platform !== 'ai');
|
|
220
|
+
let markedPlatformSpecific = [];
|
|
221
|
+
if (platformEligibleWorkspace.length > 0) {
|
|
222
|
+
const options = await Promise.all(platformEligibleWorkspace.map(async (candidate) => ({
|
|
223
|
+
platform: candidate.platform ?? 'workspace',
|
|
224
|
+
sourcePath: candidate.fullPath,
|
|
225
|
+
preview: await getContentPreview(candidate.fullPath),
|
|
226
|
+
registryPath: candidate.displayPath
|
|
227
|
+
})));
|
|
228
|
+
const indices = await promptPlatformSpecificSelection(options, 'Select workspace files to mark as platform-specific:', 'Unselected files remain candidates for universal content');
|
|
229
|
+
const markedIndexSet = new Set(indices);
|
|
230
|
+
markedPlatformSpecific = platformEligibleWorkspace.filter((_, idx) => markedIndexSet.has(idx));
|
|
231
|
+
}
|
|
232
|
+
const markedSet = new Set(markedPlatformSpecific);
|
|
233
|
+
const local = candidates.find(candidate => candidate.source === 'local');
|
|
234
|
+
const remainingWorkspace = candidates.filter(candidate => candidate.source === 'workspace' && !markedSet.has(candidate));
|
|
235
|
+
const universalChoices = [...(local ? [local] : []), ...remainingWorkspace];
|
|
236
|
+
const resolvePlatformSpecific = (selection) => {
|
|
237
|
+
if (!markedSet.has(selection)) {
|
|
238
|
+
return markedPlatformSpecific;
|
|
239
|
+
}
|
|
240
|
+
return markedPlatformSpecific.filter(candidate => candidate !== selection);
|
|
241
|
+
};
|
|
242
|
+
if (universalChoices.length === 0) {
|
|
243
|
+
const fallbackSelection = candidates[0];
|
|
244
|
+
return {
|
|
245
|
+
selection: fallbackSelection,
|
|
246
|
+
platformSpecific: resolvePlatformSpecific(fallbackSelection)
|
|
247
|
+
};
|
|
248
|
+
}
|
|
249
|
+
if (universalChoices.length === 1) {
|
|
250
|
+
const selection = universalChoices[0];
|
|
251
|
+
return {
|
|
252
|
+
selection,
|
|
253
|
+
platformSpecific: resolvePlatformSpecific(selection)
|
|
254
|
+
};
|
|
255
|
+
}
|
|
256
|
+
const response = await safePrompts({
|
|
257
|
+
type: 'select',
|
|
258
|
+
name: 'selectedIndex',
|
|
259
|
+
message: `Choose universal content to save for ${registryPath}:`,
|
|
260
|
+
choices: universalChoices.map((candidate, index) => ({
|
|
261
|
+
title: formatCandidateLabel(candidate),
|
|
262
|
+
value: index
|
|
263
|
+
})),
|
|
264
|
+
hint: 'Use arrow keys to compare options and press Enter to select'
|
|
265
|
+
});
|
|
266
|
+
const selectedIndex = response.selectedIndex;
|
|
267
|
+
const selection = universalChoices[selectedIndex];
|
|
268
|
+
return {
|
|
269
|
+
selection,
|
|
270
|
+
platformSpecific: resolvePlatformSpecific(selection)
|
|
271
|
+
};
|
|
272
|
+
}
|
|
273
|
+
function formatCandidateLabel(candidate) {
|
|
274
|
+
const prefix = candidate.source === 'local' ? 'Package' : 'Workspace';
|
|
275
|
+
return `${prefix}: ${candidate.displayPath}`;
|
|
276
|
+
}
|
|
277
|
+
//# sourceMappingURL=save-conflict-resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"save-conflict-resolver.js","sourceRoot":"","sources":["../../../src/core/save/save-conflict-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
import { PACKAGE_PATHS } from '../../constants/index.js';
|
|
2
|
+
import { ensureRegistryDirectories } from '../directory.js';
|
|
3
|
+
import { logger } from '../../utils/logger.js';
|
|
4
|
+
import { addPackageToYml, createWorkspacePackageYml } from '../../utils/package-management.js';
|
|
5
|
+
import { performPlatformSync } from '../sync/platform-sync.js';
|
|
6
|
+
import { LOG_PREFIXES, ERROR_MESSAGES, MODE_LABELS } from './constants.js';
|
|
7
|
+
import { isPackageTransitivelyCovered } from '../../utils/dependency-coverage.js';
|
|
8
|
+
import { readPackageIndex, writePackageIndex } from '../../utils/package-index-yml.js';
|
|
9
|
+
import { createWorkspaceHash, createWorkspaceTag } from '../../utils/version-generator.js';
|
|
10
|
+
import { computeWipVersion, computePackTargetVersion } from './save-versioning.js';
|
|
11
|
+
import { savePackageToRegistry } from './package-saver.js';
|
|
12
|
+
import { packageVersionExists } from '../../utils/package-versioning.js';
|
|
13
|
+
import { deleteWorkspaceWipCopies } from './workspace-wip-cleanup.js';
|
|
14
|
+
import { writePackageYml } from '../../utils/package-yml.js';
|
|
15
|
+
import { formatRegistryPathForDisplay } from '../../utils/registry-paths.js';
|
|
16
|
+
import { resolveWorkspaceNames } from './name-resolution.js';
|
|
17
|
+
import { resolvePackageFilesWithConflicts } from './save-conflict-resolution.js';
|
|
18
|
+
import { detectPackageContext, getNoPackageDetectedMessage, getPackageYmlPath, getPackageFilesDir, getPackageRootDir } from '../package-context.js';
|
|
19
|
+
import { applyWorkspacePackageRename } from './workspace-rename.js';
|
|
20
|
+
export async function runSavePipeline(packageName, options) {
|
|
21
|
+
const cwd = process.cwd();
|
|
22
|
+
const { mode, force, rename } = options;
|
|
23
|
+
const { op, opCap } = MODE_LABELS[mode];
|
|
24
|
+
// Use unified detection
|
|
25
|
+
const detectedContext = await detectPackageContext(cwd, packageName);
|
|
26
|
+
if (!detectedContext) {
|
|
27
|
+
return { success: false, error: getNoPackageDetectedMessage(packageName) };
|
|
28
|
+
}
|
|
29
|
+
await createWorkspacePackageYml(cwd);
|
|
30
|
+
await ensureRegistryDirectories();
|
|
31
|
+
const packageInput = packageName ?? detectedContext.config.name;
|
|
32
|
+
const nameResolution = await resolveWorkspaceNames(packageInput, rename, mode);
|
|
33
|
+
if (nameResolution.renameReason === 'scoping' && nameResolution.needsRename) {
|
|
34
|
+
console.log(`✓ Using scoped package name '${nameResolution.finalName}' for ${op} operation`);
|
|
35
|
+
}
|
|
36
|
+
// Build PackageContext directly
|
|
37
|
+
let packageContext = { ...detectedContext };
|
|
38
|
+
if (nameResolution.needsRename) {
|
|
39
|
+
await applyWorkspacePackageRename(cwd, packageContext, nameResolution.finalName);
|
|
40
|
+
// For root packages, packageYmlPath stays the same
|
|
41
|
+
// For nested packages, it moves to the new name's location
|
|
42
|
+
const updatedPackageYmlPath = packageContext.location === 'root'
|
|
43
|
+
? packageContext.packageYmlPath
|
|
44
|
+
: getPackageYmlPath(cwd, 'nested', nameResolution.finalName);
|
|
45
|
+
const updatedPackageFilesDir = packageContext.location === 'root'
|
|
46
|
+
? packageContext.packageFilesDir
|
|
47
|
+
: getPackageFilesDir(cwd, 'nested', nameResolution.finalName);
|
|
48
|
+
const updatedPackageRootDir = packageContext.location === 'root'
|
|
49
|
+
? packageContext.packageRootDir
|
|
50
|
+
: getPackageRootDir(cwd, 'nested', nameResolution.finalName);
|
|
51
|
+
packageContext = {
|
|
52
|
+
...packageContext,
|
|
53
|
+
name: nameResolution.finalName,
|
|
54
|
+
packageYmlPath: updatedPackageYmlPath,
|
|
55
|
+
packageFilesDir: updatedPackageFilesDir,
|
|
56
|
+
packageRootDir: updatedPackageRootDir,
|
|
57
|
+
config: { ...packageContext.config, name: nameResolution.finalName }
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
const indexRecord = await readPackageIndex(cwd, packageContext.config.name, packageContext.location);
|
|
61
|
+
const workspaceHash = createWorkspaceHash(cwd);
|
|
62
|
+
const workspaceTag = createWorkspaceTag(cwd);
|
|
63
|
+
let targetVersion;
|
|
64
|
+
let shouldBumpPackageYml = false;
|
|
65
|
+
let nextStable;
|
|
66
|
+
if (mode === 'wip') {
|
|
67
|
+
const wipInfo = computeWipVersion(packageContext.config.version, indexRecord?.workspace?.version, cwd);
|
|
68
|
+
if (wipInfo.resetMessage)
|
|
69
|
+
console.log(wipInfo.resetMessage);
|
|
70
|
+
targetVersion = wipInfo.wipVersion;
|
|
71
|
+
shouldBumpPackageYml = wipInfo.shouldBumpPackageYml;
|
|
72
|
+
nextStable = wipInfo.nextStable;
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
const packInfo = computePackTargetVersion(packageContext.config.version, indexRecord?.workspace?.version);
|
|
76
|
+
if (packInfo.resetMessage)
|
|
77
|
+
console.log(packInfo.resetMessage);
|
|
78
|
+
targetVersion = packInfo.targetVersion;
|
|
79
|
+
}
|
|
80
|
+
if (mode === 'wip' && shouldBumpPackageYml && nextStable) {
|
|
81
|
+
try {
|
|
82
|
+
const bumpedConfig = { ...packageContext.config, version: nextStable };
|
|
83
|
+
await writePackageYml(packageContext.packageYmlPath, bumpedConfig);
|
|
84
|
+
packageContext = { ...packageContext, config: bumpedConfig, version: nextStable };
|
|
85
|
+
console.log(`✓ Updated package.yml.version to ${nextStable} for the next cycle`);
|
|
86
|
+
}
|
|
87
|
+
catch (error) {
|
|
88
|
+
logger.warn(`Failed to auto-bump package.yml before save: ${String(error)}`);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
if (mode === 'stable' && !force) {
|
|
92
|
+
const exists = await packageVersionExists(packageContext.config.name, targetVersion);
|
|
93
|
+
if (exists) {
|
|
94
|
+
throw new Error(ERROR_MESSAGES.VERSION_EXISTS.replace('%s', targetVersion));
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
const effectiveConfig = { ...packageContext.config, version: targetVersion };
|
|
98
|
+
const packageFiles = (await resolvePackageFilesWithConflicts(packageContext, { force })).filter(file => file.path !== PACKAGE_PATHS.INDEX_RELATIVE);
|
|
99
|
+
const registrySave = await savePackageToRegistry({ ...packageContext, config: effectiveConfig }, packageFiles);
|
|
100
|
+
if (!registrySave.success) {
|
|
101
|
+
return { success: false, error: registrySave.error || `${opCap} operation failed` };
|
|
102
|
+
}
|
|
103
|
+
await deleteWorkspaceWipCopies(effectiveConfig.name, workspaceTag, mode === 'wip' ? { keepVersion: targetVersion } : undefined);
|
|
104
|
+
const syncResult = await performPlatformSync(cwd, effectiveConfig.name, effectiveConfig.version, packageFiles, {
|
|
105
|
+
force,
|
|
106
|
+
conflictStrategy: force ? 'overwrite' : 'ask',
|
|
107
|
+
skipRootSync: packageContext.location === 'root',
|
|
108
|
+
packageLocation: packageContext.location
|
|
109
|
+
});
|
|
110
|
+
if (packageContext.location !== 'root') {
|
|
111
|
+
const covered = await isPackageTransitivelyCovered(cwd, effectiveConfig.name);
|
|
112
|
+
if (!covered) {
|
|
113
|
+
await addPackageToYml(cwd, effectiveConfig.name, effectiveConfig.version, false, undefined, true);
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
logger.debug(`Skipping addition of ${effectiveConfig.name} to package.yml; already covered transitively.`);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
if (mode === 'stable' && indexRecord) {
|
|
120
|
+
await writePackageIndex({
|
|
121
|
+
...indexRecord,
|
|
122
|
+
workspace: { hash: workspaceHash, version: effectiveConfig.version }
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
printSummary(packageContext, effectiveConfig.version, packageFiles, syncResult);
|
|
126
|
+
return {
|
|
127
|
+
success: true,
|
|
128
|
+
data: { config: effectiveConfig, packageFiles, syncResult }
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
function printSummary(packageContext, version, packageFiles, syncResult) {
|
|
132
|
+
const name = packageContext.config.name;
|
|
133
|
+
const type = packageContext.location === 'root' ? 'root package' : 'package';
|
|
134
|
+
console.log(`${LOG_PREFIXES.SAVED} ${name}@${version} (${type}, ${packageFiles.length} files):`);
|
|
135
|
+
if (packageFiles.length > 0) {
|
|
136
|
+
for (const path of [...packageFiles.map(f => f.path)].sort()) {
|
|
137
|
+
console.log(` ├── ${formatRegistryPathForDisplay(path)}`);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
const printList = (label, files) => {
|
|
141
|
+
if (files.length === 0)
|
|
142
|
+
return;
|
|
143
|
+
console.log(`✓ Platform sync ${label} ${files.length} files:`);
|
|
144
|
+
for (const f of [...files].sort())
|
|
145
|
+
console.log(` ├── ${f}`);
|
|
146
|
+
};
|
|
147
|
+
printList('created', syncResult.created);
|
|
148
|
+
printList('updated', syncResult.updated);
|
|
149
|
+
printList('removed', syncResult.deleted ?? []);
|
|
150
|
+
}
|
|
151
|
+
//# sourceMappingURL=save-pipeline.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"save-pipeline.js","sourceRoot":"","sources":["../../../src/core/save/save-pipeline.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC/F,OAAO,EAAE,mBAAmB,EAAsB,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,4BAA4B,EAAE,MAAM,oCAAoC,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAY,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,gCAAgC,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EACL,oBAAoB,EACpB,2BAA2B,EAC3B,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EAElB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAgBpE,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,WAA+B,EAC/B,OAA4B;IAE5B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACxC,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IAExC,wBAAwB;IACxB,MAAM,eAAe,GAAG,MAAM,oBAAoB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IACrE,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,2BAA2B,CAAC,WAAW,CAAC,EAAE,CAAC;IAC7E,CAAC;IAED,MAAM,yBAAyB,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,yBAAyB,EAAE,CAAC;IAElC,MAAM,YAAY,GAAG,WAAW,IAAI,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC;IAChE,MAAM,cAAc,GAAG,MAAM,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAE/E,IAAI,cAAc,CAAC,YAAY,KAAK,SAAS,IAAI,cAAc,CAAC,WAAW,EAAE,CAAC;QAC5E,OAAO,CAAC,GAAG,CAAC,gCAAgC,cAAc,CAAC,SAAS,SAAS,EAAE,YAAY,CAAC,CAAC;IAC/F,CAAC;IAED,gCAAgC;IAChC,IAAI,cAAc,GAAmB,EAAE,GAAG,eAAe,EAAE,CAAC;IAE5D,IAAI,cAAc,CAAC,WAAW,EAAE,CAAC;QAC/B,MAAM,2BAA2B,CAAC,GAAG,EAAE,cAAc,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;QAEjF,mDAAmD;QACnD,2DAA2D;QAC3D,MAAM,qBAAqB,GAAG,cAAc,CAAC,QAAQ,KAAK,MAAM;YAC9D,CAAC,CAAC,cAAc,CAAC,cAAc;YAC/B,CAAC,CAAC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;QAE/D,MAAM,sBAAsB,GAAG,cAAc,CAAC,QAAQ,KAAK,MAAM;YAC/D,CAAC,CAAC,cAAc,CAAC,eAAe;YAChC,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;QAEhE,MAAM,qBAAqB,GAAG,cAAc,CAAC,QAAQ,KAAK,MAAM;YAC9D,CAAC,CAAC,cAAc,CAAC,cAAc;YAC/B,CAAC,CAAC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;QAE/D,cAAc,GAAG;YACf,GAAG,cAAc;YACjB,IAAI,EAAE,cAAc,CAAC,SAAS;YAC9B,cAAc,EAAE,qBAAqB;YACrC,eAAe,EAAE,sBAAsB;YACvC,cAAc,EAAE,qBAAqB;YACrC,MAAM,EAAE,EAAE,GAAG,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,cAAc,CAAC,SAAS,EAAE;SACrE,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACrG,MAAM,aAAa,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAE7C,IAAI,aAAqB,CAAC;IAC1B,IAAI,oBAAoB,GAAG,KAAK,CAAC;IACjC,IAAI,UAA8B,CAAC;IAEnC,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QACnB,MAAM,OAAO,GAAG,iBAAiB,CAC/B,cAAc,CAAC,MAAM,CAAC,OAAO,EAC7B,WAAW,EAAE,SAAS,EAAE,OAAO,EAC/B,GAAG,CACJ,CAAC;QACF,IAAI,OAAO,CAAC,YAAY;YAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC5D,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC;QACnC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC;QACpD,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAClC,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,wBAAwB,CACvC,cAAc,CAAC,MAAM,CAAC,OAAO,EAC7B,WAAW,EAAE,SAAS,EAAE,OAAO,CAChC,CAAC;QACF,IAAI,QAAQ,CAAC,YAAY;YAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC9D,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;IACzC,CAAC;IAED,IAAI,IAAI,KAAK,KAAK,IAAI,oBAAoB,IAAI,UAAU,EAAE,CAAC;QACzD,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,EAAE,GAAG,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;YACvE,MAAM,eAAe,CAAC,cAAc,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;YACnE,cAAc,GAAG,EAAE,GAAG,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;YAClF,OAAO,CAAC,GAAG,CAAC,oCAAoC,UAAU,qBAAqB,CAAC,CAAC;QACnF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,gDAAgD,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAED,IAAI,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACrF,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC;IAED,MAAM,eAAe,GAAG,EAAE,GAAG,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;IAC7E,MAAM,YAAY,GAAG,CAAC,MAAM,gCAAgC,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAC7F,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,cAAc,CACnD,CAAC;IAEF,MAAM,YAAY,GAAG,MAAM,qBAAqB,CAC9C,EAAE,GAAG,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,EAC9C,YAAY,CACb,CAAC;IACF,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC1B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,IAAI,GAAG,KAAK,mBAAmB,EAAE,CAAC;IACtF,CAAC;IAED,MAAM,wBAAwB,CAC5B,eAAe,CAAC,IAAI,EACpB,YAAY,EACZ,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,SAAS,CAC5D,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAC1C,GAAG,EACH,eAAe,CAAC,IAAI,EACpB,eAAe,CAAC,OAAO,EACvB,YAAY,EACZ;QACE,KAAK;QACL,gBAAgB,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK;QAC7C,YAAY,EAAE,cAAc,CAAC,QAAQ,KAAK,MAAM;QAChD,eAAe,EAAE,cAAc,CAAC,QAAQ;KACzC,CACF,CAAC;IAEF,IAAI,cAAc,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,MAAM,4BAA4B,CAAC,GAAG,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC;QAC9E,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,eAAe,CAAC,GAAG,EAAE,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QACpG,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,KAAK,CAAC,wBAAwB,eAAe,CAAC,IAAI,gDAAgD,CAAC,CAAC;QAC7G,CAAC;IACH,CAAC;IAED,IAAI,IAAI,KAAK,QAAQ,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,iBAAiB,CAAC;YACtB,GAAG,WAAW;YACd,SAAS,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,CAAC,OAAO,EAAE;SACrE,CAAC,CAAC;IACL,CAAC;IAED,YAAY,CAAC,cAAc,EAAE,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAEhF,OAAO;QACL,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,UAAU,EAAE;KAC5D,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CACnB,cAA8B,EAC9B,OAAe,EACf,YAA2B,EAC3B,UAA8B;IAE9B,MAAM,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC;IACxC,MAAM,IAAI,GAAG,cAAc,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;IAE7E,OAAO,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,IAAI,KAAK,YAAY,CAAC,MAAM,UAAU,CAAC,CAAC;IAEjG,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7D,OAAO,CAAC,GAAG,CAAC,UAAU,4BAA4B,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,CAAC,KAAa,EAAE,KAAe,EAAE,EAAE;QACnD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAC/B,OAAO,CAAC,GAAG,CAAC,mBAAmB,KAAK,IAAI,KAAK,CAAC,MAAM,SAAS,CAAC,CAAC;QAC/D,KAAK,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,EAAE;YAAE,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAChE,CAAC,CAAC;IAEF,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACzC,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IACzC,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;AACjD,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"save-types.js","sourceRoot":"","sources":["../../../src/core/save/save-types.ts"],"names":[],"mappings":""}
|