opkg 0.5.0 → 0.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +82 -21
- package/dist/commands/add.js +11 -276
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/duplicate.js +5 -2
- package/dist/commands/duplicate.js.map +1 -1
- package/dist/commands/init.js +76 -145
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/install.js +30 -671
- package/dist/commands/install.js.map +1 -1
- package/dist/commands/list.js +9 -3
- package/dist/commands/list.js.map +1 -1
- package/dist/commands/login.js +58 -0
- package/dist/commands/login.js.map +1 -0
- package/dist/commands/logout.js +28 -0
- package/dist/commands/logout.js.map +1 -0
- package/dist/commands/pack.js +10 -137
- package/dist/commands/pack.js.map +1 -1
- package/dist/commands/pull.js +5 -299
- package/dist/commands/pull.js.map +1 -1
- package/dist/commands/push.js +5 -239
- package/dist/commands/push.js.map +1 -1
- package/dist/commands/save.js +29 -168
- package/dist/commands/save.js.map +1 -1
- package/dist/commands/show.js +18 -5
- package/dist/commands/show.js.map +1 -1
- package/dist/commands/status.js +21 -8
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/tui.js +61 -0
- package/dist/commands/tui.js.map +1 -0
- package/dist/commands/uninstall.js +5 -5
- package/dist/commands/uninstall.js.map +1 -1
- package/dist/constants/index.js +19 -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 +66 -36
- 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/api-keys.js +6 -2
- package/dist/core/api-keys.js.map +1 -1
- package/dist/core/auth.js +25 -40
- package/dist/core/auth.js.map +1 -1
- package/dist/core/config.js +11 -3
- package/dist/core/config.js.map +1 -1
- package/dist/core/dependency-resolver.js +24 -11
- package/dist/core/dependency-resolver.js.map +1 -1
- package/dist/core/device-auth.js +81 -0
- package/dist/core/device-auth.js.map +1 -0
- package/dist/core/directory.js +15 -9
- 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 +200 -0
- package/dist/core/install/bulk-install-pipeline.js.map +1 -0
- package/dist/core/install/canonical-plan.js +129 -0
- package/dist/core/install/canonical-plan.js.map +1 -0
- package/dist/core/install/download-keys.js +2 -2
- package/dist/core/install/download-keys.js.map +1 -1
- 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 +8 -9
- package/dist/core/install/install-flow.js.map +1 -1
- package/dist/core/install/install-pipeline.js +296 -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 +84 -7
- package/dist/core/install/remote-flow.js.map +1 -1
- package/dist/core/install/version-selection.js +25 -8
- package/dist/core/install/version-selection.js.map +1 -1
- package/dist/core/openpackage.js +22 -14
- 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 +73 -9
- 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/profiles.js +60 -3
- package/dist/core/profiles.js.map +1 -1
- package/dist/core/pull/pull-errors.js +62 -0
- package/dist/core/pull/pull-errors.js.map +1 -0
- package/dist/core/pull/pull-options.js +2 -0
- package/dist/core/pull/pull-options.js.map +1 -0
- package/dist/core/pull/pull-output.js +50 -0
- package/dist/core/pull/pull-output.js.map +1 -0
- package/dist/core/pull/pull-pipeline.js +141 -0
- package/dist/core/pull/pull-pipeline.js.map +1 -0
- package/dist/core/pull/pull-strategies.js +103 -0
- package/dist/core/pull/pull-strategies.js.map +1 -0
- package/dist/core/pull/pull-types.js +2 -0
- package/dist/core/pull/pull-types.js.map +1 -0
- package/dist/core/push/push-context.js +95 -0
- package/dist/core/push/push-context.js.map +1 -0
- package/dist/core/push/push-errors.js +133 -0
- package/dist/core/push/push-errors.js.map +1 -0
- package/dist/core/push/push-output.js +44 -0
- package/dist/core/push/push-output.js.map +1 -0
- package/dist/core/push/push-pipeline.js +74 -0
- package/dist/core/push/push-pipeline.js.map +1 -0
- package/dist/core/push/push-single-file.js +56 -0
- package/dist/core/push/push-single-file.js.map +1 -0
- package/dist/core/push/push-types.js +2 -0
- package/dist/core/push/push-types.js.map +1 -0
- package/dist/core/push/push-upload.js +68 -0
- package/dist/core/push/push-upload.js.map +1 -0
- package/dist/core/registry/registry-rename.js +2 -1
- package/dist/core/registry/registry-rename.js.map +1 -1
- package/dist/core/registry.js +14 -5
- package/dist/core/registry.js.map +1 -1
- package/dist/core/remote-pull.js +165 -36
- 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 +82 -43
- package/dist/core/save/package-saver.js.map +1 -1
- package/dist/core/save/package-yml-generator.js +51 -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 +162 -0
- package/dist/core/save/save-pipeline.js.map +1 -0
- package/dist/core/save/save-single-file.js +124 -0
- package/dist/core/save/save-single-file.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 +14 -2
- 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/token-store.js +73 -0
- package/dist/core/token-store.js.map +1 -0
- package/dist/core/uninstall/uninstall-file-discovery.js +1 -2
- package/dist/core/uninstall/uninstall-file-discovery.js.map +1 -1
- package/dist/index.js +4 -0
- package/dist/index.js.map +1 -1
- package/dist/tui/app.js +95 -0
- package/dist/tui/app.js.map +1 -0
- package/dist/tui/components/package-list.js +73 -0
- package/dist/tui/components/package-list.js.map +1 -0
- package/dist/tui/controller.js +365 -0
- package/dist/tui/controller.js.map +1 -0
- package/dist/tui/index.js +12 -0
- package/dist/tui/index.js.map +1 -0
- package/dist/tui/services/file-index.js +64 -0
- package/dist/tui/services/file-index.js.map +1 -0
- package/dist/tui/services/packages.js +18 -0
- package/dist/tui/services/packages.js.map +1 -0
- package/dist/tui/services/save.js +21 -0
- package/dist/tui/services/save.js.map +1 -0
- package/dist/tui/state/app-state.js +15 -0
- package/dist/tui/state/app-state.js.map +1 -0
- package/dist/tui/state.js +17 -0
- package/dist/tui/state.js.map +1 -0
- package/dist/tui/types.js +2 -0
- package/dist/tui/types.js.map +1 -0
- package/dist/tui/views/add-file-modal.js +129 -0
- package/dist/tui/views/add-file-modal.js.map +1 -0
- package/dist/tui/views/file-preview.js +44 -0
- package/dist/tui/views/file-preview.js.map +1 -0
- package/dist/tui/views/list-packages.js +73 -0
- package/dist/tui/views/list-packages.js.map +1 -0
- package/dist/tui/views/main-menu.js +29 -0
- package/dist/tui/views/main-menu.js.map +1 -0
- package/dist/tui/views/manage-view.js +81 -0
- package/dist/tui/views/manage-view.js.map +1 -0
- package/dist/tui/views/package-hub.js +120 -0
- package/dist/tui/views/package-hub.js.map +1 -0
- package/dist/tui/views/placeholder.js +24 -0
- package/dist/tui/views/placeholder.js.map +1 -0
- package/dist/types/index.js.map +1 -1
- package/dist/utils/bun-bootstrap.js +72 -0
- package/dist/utils/bun-bootstrap.js.map +1 -0
- package/dist/utils/file-processing.js +5 -58
- package/dist/utils/file-processing.js.map +1 -1
- package/dist/utils/formatters.js +3 -1
- package/dist/utils/formatters.js.map +1 -1
- package/dist/utils/http-client.js +27 -5
- package/dist/utils/http-client.js.map +1 -1
- package/dist/utils/index-based-installer.js +40 -35
- package/dist/utils/index-based-installer.js.map +1 -1
- package/dist/utils/install-file-discovery.js +18 -24
- 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/manifest-paths.js +27 -0
- package/dist/utils/manifest-paths.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 +191 -75
- package/dist/utils/package-management.js.map +1 -1
- package/dist/utils/package-merge.js +48 -0
- package/dist/utils/package-merge.js.map +1 -0
- package/dist/utils/package-name.js +29 -0
- package/dist/utils/package-name.js.map +1 -1
- package/dist/utils/package-versioning.js +16 -4
- package/dist/utils/package-versioning.js.map +1 -1
- package/dist/utils/package-yml.js +41 -12
- 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/prompts.js +0 -31
- package/dist/utils/prompts.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 +48 -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/dist/utils/tarball.js +6 -2
- package/dist/utils/tarball.js.map +1 -1
- package/dist/utils/version-ranges.js +11 -8
- package/dist/utils/version-ranges.js.map +1 -1
- package/package.json +3 -2
- package/platforms.jsonc +178 -0
- package/specs/auth/auth-device-flow.md +70 -0
- package/specs/install/install-behavior.md +30 -0
- package/specs/install/package-yml-canonical.md +21 -1
- package/specs/install/version-resolution.md +9 -7
- package/specs/login/login-device-flow.md +70 -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/push/push-behavior.md +38 -10
- package/specs/push/push-errors-and-hints.md +19 -6
- package/specs/push/push-remote-upload.md +3 -0
- package/specs/push/push-scoping.md +14 -22
- package/specs/push/push-version-selection.md +18 -16
- 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 +55 -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/specs/save-pack.md +1 -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,200 @@
|
|
|
1
|
+
import { ensureRegistryDirectories, listPackageVersions } from '../directory.js';
|
|
2
|
+
import { createWorkspacePackageYml } from '../../utils/package-management.js';
|
|
3
|
+
import { getLocalPackageYmlPath } from '../../utils/paths.js';
|
|
4
|
+
import { parsePackageYml } from '../../utils/package-yml.js';
|
|
5
|
+
import { withOperationErrorHandling } from '../../utils/error-handling.js';
|
|
6
|
+
import { UserCancellationError } from '../../utils/errors.js';
|
|
7
|
+
import { extractPackagesFromConfig } from '../../utils/install-helpers.js';
|
|
8
|
+
import { isRootPackage } from '../../utils/paths.js';
|
|
9
|
+
import { logger } from '../../utils/logger.js';
|
|
10
|
+
import { normalizePlatforms } from '../../utils/platform-mapper.js';
|
|
11
|
+
import { resolvePlatforms } from './platform-resolution.js';
|
|
12
|
+
import { runInstallPipeline } from './install-pipeline.js';
|
|
13
|
+
import { displayInstallationSummary } from './install-reporting.js';
|
|
14
|
+
import { planConflictsForPackage } from '../../utils/index-based-installer.js';
|
|
15
|
+
import { safePrompts } from '../../utils/prompts.js';
|
|
16
|
+
import { resolveVersionRange, isExactVersion } from '../../utils/version-ranges.js';
|
|
17
|
+
export async function runBulkInstallPipeline(options) {
|
|
18
|
+
const cwd = process.cwd();
|
|
19
|
+
const targetDir = '.';
|
|
20
|
+
await ensureRegistryDirectories();
|
|
21
|
+
await createWorkspacePackageYml(cwd);
|
|
22
|
+
const packageYmlPath = getLocalPackageYmlPath(cwd);
|
|
23
|
+
const cwdConfig = await withOperationErrorHandling(() => parsePackageYml(packageYmlPath), 'parse package.yml', packageYmlPath);
|
|
24
|
+
const allPackages = extractPackagesFromConfig(cwdConfig);
|
|
25
|
+
const packagesToInstall = [];
|
|
26
|
+
const skippedRootPackages = [];
|
|
27
|
+
for (const pkg of allPackages) {
|
|
28
|
+
if (await isRootPackage(cwd, pkg.name)) {
|
|
29
|
+
skippedRootPackages.push(pkg);
|
|
30
|
+
console.log(`⚠️ Skipping ${pkg.name} - it matches your project's root package name`);
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
packagesToInstall.push(pkg);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
if (packagesToInstall.length === 0) {
|
|
37
|
+
if (skippedRootPackages.length > 0) {
|
|
38
|
+
console.log('✓ All packages in package.yml were skipped (matched root package)');
|
|
39
|
+
console.log('\nTips:');
|
|
40
|
+
console.log('• Root packages cannot be installed as dependencies');
|
|
41
|
+
console.log('• Use "opkg install <package-name>" to install external packages');
|
|
42
|
+
console.log('• Use "opkg save" to create a WIP copy of your root package in the registry');
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
console.log('⚠️ No packages found in package.yml');
|
|
46
|
+
console.log('\nTips:');
|
|
47
|
+
console.log('• Add packages to the "packages" array in package.yml');
|
|
48
|
+
console.log('• Add development packages to the "dev-packages" array in package.yml');
|
|
49
|
+
console.log('• Use "opkg install <package-name>" to install a specific package');
|
|
50
|
+
}
|
|
51
|
+
return { success: true, data: { installed: 0, skipped: skippedRootPackages.length } };
|
|
52
|
+
}
|
|
53
|
+
console.log(`✓ Installing ${packagesToInstall.length} packages from package.yml:`);
|
|
54
|
+
packagesToInstall.forEach(pkg => {
|
|
55
|
+
const prefix = pkg.isDev ? '[dev] ' : '';
|
|
56
|
+
const label = pkg.version ? `${pkg.name}@${pkg.version}` : pkg.name;
|
|
57
|
+
console.log(` • ${prefix}${label}`);
|
|
58
|
+
});
|
|
59
|
+
if (skippedRootPackages.length > 0) {
|
|
60
|
+
console.log(` • ${skippedRootPackages.length} packages skipped (matched root package)`);
|
|
61
|
+
}
|
|
62
|
+
console.log('');
|
|
63
|
+
const interactive = Boolean(process.stdin.isTTY && process.stdout.isTTY);
|
|
64
|
+
const normalizedPlatforms = normalizePlatforms(options.platforms);
|
|
65
|
+
const resolvedPlatforms = await resolvePlatforms(cwd, normalizedPlatforms, { interactive });
|
|
66
|
+
let totalInstalled = 0;
|
|
67
|
+
let totalSkipped = 0;
|
|
68
|
+
const results = [];
|
|
69
|
+
const aggregateWarnings = new Set();
|
|
70
|
+
for (const pkg of packagesToInstall) {
|
|
71
|
+
try {
|
|
72
|
+
const label = pkg.version ? `${pkg.name}@${pkg.version}` : pkg.name;
|
|
73
|
+
const baseConflictDecisions = options.conflictDecisions
|
|
74
|
+
? { ...options.conflictDecisions }
|
|
75
|
+
: undefined;
|
|
76
|
+
const installOptions = {
|
|
77
|
+
...options,
|
|
78
|
+
dev: pkg.isDev,
|
|
79
|
+
resolvedPlatforms,
|
|
80
|
+
conflictDecisions: baseConflictDecisions
|
|
81
|
+
};
|
|
82
|
+
let conflictPlanningVersion = pkg.version;
|
|
83
|
+
if (pkg.version && !isExactVersion(pkg.version)) {
|
|
84
|
+
try {
|
|
85
|
+
const localVersions = await listPackageVersions(pkg.name);
|
|
86
|
+
conflictPlanningVersion = resolveVersionRange(pkg.version, localVersions) ?? undefined;
|
|
87
|
+
}
|
|
88
|
+
catch {
|
|
89
|
+
conflictPlanningVersion = undefined;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
if (conflictPlanningVersion) {
|
|
93
|
+
try {
|
|
94
|
+
const conflicts = await planConflictsForPackage(cwd, pkg.name, conflictPlanningVersion, resolvedPlatforms);
|
|
95
|
+
if (conflicts.length > 0) {
|
|
96
|
+
const shouldPrompt = interactive &&
|
|
97
|
+
(!installOptions.conflictStrategy || installOptions.conflictStrategy === 'ask');
|
|
98
|
+
if (shouldPrompt) {
|
|
99
|
+
console.log(`\n⚠️ Detected ${conflicts.length} potential file conflict${conflicts.length === 1 ? '' : 's'} for ${label}.`);
|
|
100
|
+
const preview = conflicts.slice(0, 5);
|
|
101
|
+
for (const conflict of preview) {
|
|
102
|
+
const ownerInfo = conflict.ownerPackage ? `owned by ${conflict.ownerPackage}` : 'already exists locally';
|
|
103
|
+
console.log(` • ${conflict.relPath} (${ownerInfo})`);
|
|
104
|
+
}
|
|
105
|
+
if (conflicts.length > preview.length) {
|
|
106
|
+
console.log(` • ... and ${conflicts.length - preview.length} more`);
|
|
107
|
+
}
|
|
108
|
+
const selection = await safePrompts({
|
|
109
|
+
type: 'select',
|
|
110
|
+
name: 'strategy',
|
|
111
|
+
message: `Choose conflict handling for ${label}:`,
|
|
112
|
+
choices: [
|
|
113
|
+
{ title: 'Keep both (rename existing files)', value: 'keep-both' },
|
|
114
|
+
{ title: 'Overwrite existing files', value: 'overwrite' },
|
|
115
|
+
{ title: 'Skip conflicting files', value: 'skip' },
|
|
116
|
+
{ title: 'Review individually', value: 'ask' }
|
|
117
|
+
],
|
|
118
|
+
initial: installOptions.conflictStrategy === 'ask' ? 3 : 0
|
|
119
|
+
});
|
|
120
|
+
const chosenStrategy = selection.strategy;
|
|
121
|
+
installOptions.conflictStrategy = chosenStrategy;
|
|
122
|
+
if (chosenStrategy === 'ask') {
|
|
123
|
+
const decisions = {};
|
|
124
|
+
for (const conflict of conflicts) {
|
|
125
|
+
const detail = await safePrompts({
|
|
126
|
+
type: 'select',
|
|
127
|
+
name: 'decision',
|
|
128
|
+
message: `${conflict.relPath}${conflict.ownerPackage ? ` (owned by ${conflict.ownerPackage})` : ''}:`,
|
|
129
|
+
choices: [
|
|
130
|
+
{ title: 'Keep both (rename existing)', value: 'keep-both' },
|
|
131
|
+
{ title: 'Overwrite existing', value: 'overwrite' },
|
|
132
|
+
{ title: 'Skip (keep existing)', value: 'skip' }
|
|
133
|
+
],
|
|
134
|
+
initial: 0
|
|
135
|
+
});
|
|
136
|
+
const decisionValue = detail.decision;
|
|
137
|
+
decisions[conflict.relPath] = decisionValue;
|
|
138
|
+
}
|
|
139
|
+
installOptions.conflictDecisions = decisions;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
else if (!interactive && (!installOptions.conflictStrategy || installOptions.conflictStrategy === 'ask')) {
|
|
143
|
+
logger.warn(`Detected ${conflicts.length} potential conflict${conflicts.length === 1 ? '' : 's'} for ${label}, but running in non-interactive mode. Conflicting files will be skipped unless '--conflicts' is provided.`);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
catch (planError) {
|
|
148
|
+
logger.warn(`Failed to evaluate conflicts for ${label}: ${planError}`);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
console.log(`\n🔧 Installing ${pkg.isDev ? '[dev] ' : ''}${label}...`);
|
|
152
|
+
const result = await runInstallPipeline({
|
|
153
|
+
...installOptions,
|
|
154
|
+
packageName: pkg.name,
|
|
155
|
+
version: pkg.version,
|
|
156
|
+
targetDir
|
|
157
|
+
});
|
|
158
|
+
if (result.success) {
|
|
159
|
+
totalInstalled++;
|
|
160
|
+
results.push({ name: pkg.name, success: true });
|
|
161
|
+
console.log(`✓ Successfully installed ${pkg.name}`);
|
|
162
|
+
if (result.warnings && result.warnings.length > 0) {
|
|
163
|
+
result.warnings.forEach(warning => aggregateWarnings.add(warning));
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
else {
|
|
167
|
+
totalSkipped++;
|
|
168
|
+
results.push({ name: pkg.name, success: false, error: result.error });
|
|
169
|
+
console.log(`❌ Failed to install ${pkg.name}: ${result.error}`);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
catch (error) {
|
|
173
|
+
if (error instanceof UserCancellationError) {
|
|
174
|
+
throw error;
|
|
175
|
+
}
|
|
176
|
+
totalSkipped++;
|
|
177
|
+
results.push({ name: pkg.name, success: false, error: String(error) });
|
|
178
|
+
console.log(`❌ Failed to install ${pkg.name}: ${error}`);
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
displayInstallationSummary(totalInstalled, totalSkipped, packagesToInstall.length, results);
|
|
182
|
+
if (aggregateWarnings.size > 0) {
|
|
183
|
+
console.log('\n⚠️ Warnings during installation:');
|
|
184
|
+
aggregateWarnings.forEach(warning => {
|
|
185
|
+
console.log(` • ${warning}`);
|
|
186
|
+
});
|
|
187
|
+
}
|
|
188
|
+
const allSuccessful = totalSkipped === 0;
|
|
189
|
+
return {
|
|
190
|
+
success: allSuccessful,
|
|
191
|
+
data: {
|
|
192
|
+
installed: totalInstalled,
|
|
193
|
+
skipped: totalSkipped,
|
|
194
|
+
results
|
|
195
|
+
},
|
|
196
|
+
error: allSuccessful ? undefined : `${totalSkipped} packages failed to install`,
|
|
197
|
+
warnings: totalSkipped > 0 ? [`${totalSkipped} packages failed to install`] : undefined
|
|
198
|
+
};
|
|
199
|
+
}
|
|
200
|
+
//# sourceMappingURL=bulk-install-pipeline.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bulk-install-pipeline.js","sourceRoot":"","sources":["../../../src/core/install/bulk-install-pipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
import * as semver from 'semver';
|
|
2
|
+
import { exists } from '../../utils/fs.js';
|
|
3
|
+
import { getLocalPackageYmlPath } from '../../utils/paths.js';
|
|
4
|
+
import { parsePackageYml } from '../../utils/package-yml.js';
|
|
5
|
+
import { createCaretRange, parseVersionRange } from '../../utils/version-ranges.js';
|
|
6
|
+
import { arePackageNamesEquivalent } from '../../utils/package-name.js';
|
|
7
|
+
import { UNVERSIONED } from '../../constants/index.js';
|
|
8
|
+
export async function determineCanonicalInstallPlan(args) {
|
|
9
|
+
const normalizedCliSpec = args.cliSpec?.trim() || undefined;
|
|
10
|
+
const existing = await findCanonicalDependency(args.cwd, args.packageName);
|
|
11
|
+
const target = args.devFlag ? 'dev-packages' : 'packages';
|
|
12
|
+
if (existing) {
|
|
13
|
+
const canonicalConstraint = parseConstraintOrThrow('package', existing.range, args.packageName);
|
|
14
|
+
if (normalizedCliSpec) {
|
|
15
|
+
const cliConstraint = parseConstraintOrThrow('cli', normalizedCliSpec, args.packageName);
|
|
16
|
+
if (!isRangeSubset(cliConstraint.resolverRange, canonicalConstraint.resolverRange)) {
|
|
17
|
+
throw buildCanonicalConflictError(args.packageName, cliConstraint.displayRange, existing.range);
|
|
18
|
+
}
|
|
19
|
+
return {
|
|
20
|
+
effectiveRange: canonicalConstraint.resolverRange,
|
|
21
|
+
dependencyState: 'existing',
|
|
22
|
+
canonicalRange: existing.range,
|
|
23
|
+
canonicalTarget: existing.target,
|
|
24
|
+
dependencyInclude: existing.include,
|
|
25
|
+
persistDecision: { type: 'none' },
|
|
26
|
+
compatibilityMessage: `Using version range from package.yml (${existing.range}); CLI spec '${cliConstraint.displayRange}' is compatible.`
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
return {
|
|
30
|
+
effectiveRange: canonicalConstraint.resolverRange,
|
|
31
|
+
dependencyState: 'existing',
|
|
32
|
+
canonicalRange: existing.range,
|
|
33
|
+
canonicalTarget: existing.target,
|
|
34
|
+
dependencyInclude: existing.include,
|
|
35
|
+
persistDecision: { type: 'none' }
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
if (normalizedCliSpec) {
|
|
39
|
+
const cliConstraint = parseConstraintOrThrow('cli', normalizedCliSpec, args.packageName);
|
|
40
|
+
return {
|
|
41
|
+
effectiveRange: cliConstraint.resolverRange,
|
|
42
|
+
dependencyState: 'fresh',
|
|
43
|
+
persistDecision: {
|
|
44
|
+
type: 'explicit',
|
|
45
|
+
target,
|
|
46
|
+
range: cliConstraint.displayRange
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
return {
|
|
51
|
+
effectiveRange: '*',
|
|
52
|
+
dependencyState: 'fresh',
|
|
53
|
+
persistDecision: {
|
|
54
|
+
type: 'derive',
|
|
55
|
+
target,
|
|
56
|
+
mode: 'caret-or-exact'
|
|
57
|
+
}
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
export async function findCanonicalDependency(cwd, packageName) {
|
|
61
|
+
const packageYmlPath = getLocalPackageYmlPath(cwd);
|
|
62
|
+
if (!(await exists(packageYmlPath))) {
|
|
63
|
+
return null;
|
|
64
|
+
}
|
|
65
|
+
try {
|
|
66
|
+
const config = await parsePackageYml(packageYmlPath);
|
|
67
|
+
const match = locateDependencyInArray(config.packages, packageName, 'packages') ||
|
|
68
|
+
locateDependencyInArray(config['dev-packages'], packageName, 'dev-packages');
|
|
69
|
+
return match;
|
|
70
|
+
}
|
|
71
|
+
catch (error) {
|
|
72
|
+
const detail = error instanceof Error ? error.message : String(error);
|
|
73
|
+
throw new Error(`Failed to parse ${packageYmlPath}: ${detail}`);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
function locateDependencyInArray(deps, packageName, target) {
|
|
77
|
+
if (!deps) {
|
|
78
|
+
return null;
|
|
79
|
+
}
|
|
80
|
+
const entry = deps.find(dep => arePackageNamesEquivalent(dep.name, packageName));
|
|
81
|
+
if (!entry) {
|
|
82
|
+
return null;
|
|
83
|
+
}
|
|
84
|
+
return {
|
|
85
|
+
range: entry.version && entry.version.trim() ? entry.version.trim() : '*',
|
|
86
|
+
target,
|
|
87
|
+
include: entry.include && entry.include.length > 0 ? [...entry.include] : undefined
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
function parseConstraintOrThrow(source, raw, packageName) {
|
|
91
|
+
try {
|
|
92
|
+
const parsed = parseVersionRange(raw);
|
|
93
|
+
return { resolverRange: parsed.range, displayRange: parsed.original };
|
|
94
|
+
}
|
|
95
|
+
catch (error) {
|
|
96
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
97
|
+
if (source === 'cli') {
|
|
98
|
+
throw new Error(`Invalid version spec '${raw}' provided via CLI for '${packageName}'. ${message}. Adjust the CLI input and try again.`);
|
|
99
|
+
}
|
|
100
|
+
throw new Error(`Dependency '${packageName}' in .openpackage/package.yml has invalid version '${raw}'. ${message}. Edit the file and try again.`);
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
function isRangeSubset(candidate, canonical) {
|
|
104
|
+
try {
|
|
105
|
+
return semver.subset(candidate, canonical, { includePrerelease: true });
|
|
106
|
+
}
|
|
107
|
+
catch {
|
|
108
|
+
return false;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
function buildCanonicalConflictError(packageName, cliSpec, canonicalRange) {
|
|
112
|
+
return new Error(`Requested '${packageName}@${cliSpec}', but .openpackage/package.yml declares '${packageName}' with range '${canonicalRange}'. Edit package.yml to change the dependency line, then re-run opkg install.`);
|
|
113
|
+
}
|
|
114
|
+
export function resolvePersistRange(decision, selectedVersion) {
|
|
115
|
+
if (decision.type === 'none') {
|
|
116
|
+
return null;
|
|
117
|
+
}
|
|
118
|
+
if (decision.type === 'explicit') {
|
|
119
|
+
return { range: decision.range, target: decision.target };
|
|
120
|
+
}
|
|
121
|
+
// For unversioned selections, persist the literal marker instead of attempting
|
|
122
|
+
// to construct a semver caret range.
|
|
123
|
+
if (selectedVersion === UNVERSIONED) {
|
|
124
|
+
return { range: UNVERSIONED, target: decision.target };
|
|
125
|
+
}
|
|
126
|
+
const derivedRange = createCaretRange(selectedVersion);
|
|
127
|
+
return { range: derivedRange, target: decision.target };
|
|
128
|
+
}
|
|
129
|
+
//# sourceMappingURL=canonical-plan.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"canonical-plan.js","sourceRoot":"","sources":["../../../src/core/install/canonical-plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { hasPackageVersion } from '../directory.js';
|
|
2
|
-
import {
|
|
2
|
+
import { parseDownloadIdentifier } from '../remote-pull.js';
|
|
3
3
|
import { logger } from '../../utils/logger.js';
|
|
4
4
|
/**
|
|
5
5
|
* Create a unique key for a download based on name and version
|
|
@@ -17,7 +17,7 @@ export async function computeMissingDownloadKeys(downloads) {
|
|
|
17
17
|
continue;
|
|
18
18
|
}
|
|
19
19
|
try {
|
|
20
|
-
const { name, version } =
|
|
20
|
+
const { packageName: name, version } = parseDownloadIdentifier(download.name);
|
|
21
21
|
if (!version) {
|
|
22
22
|
continue;
|
|
23
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download-keys.js","sourceRoot":"","sources":["../../../src/core/install/download-keys.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"download-keys.js","sourceRoot":"","sources":["../../../src/core/install/download-keys.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAY,EAAE,OAAe;IAC7D,OAAO,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC;AAC9B,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,SAAgC;IAC/E,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IAEtC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;YACpB,SAAS;QACX,CAAC;QAED,IAAI,CAAC;YACH,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,uBAAuB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC9E,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,SAAS;YACX,CAAC;YAED,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC7D,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,WAAW,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CONFLICT_RESOLUTION } from '../../constants/index.js';
|
|
2
|
-
import {
|
|
2
|
+
import { installWorkspaceFiles } from '../../utils/install-orchestrator.js';
|
|
3
3
|
/**
|
|
4
4
|
* Handle dry run mode for package installation
|
|
5
5
|
*/
|
|
@@ -23,7 +23,7 @@ export async function handleDryRunMode(resolvedPackages, packageName, targetDir,
|
|
|
23
23
|
console.log(`✓ Would skip ${resolved.name}@${resolved.version} (same or newer version already installed)`);
|
|
24
24
|
continue;
|
|
25
25
|
}
|
|
26
|
-
const dryRunResult = await
|
|
26
|
+
const dryRunResult = await installWorkspaceFiles(resolved.name, targetDir, options, resolved.version, true);
|
|
27
27
|
if (dryRunResult.skipped) {
|
|
28
28
|
console.log(`✓ Would skip ${resolved.name}@${resolved.version} (same or newer version already installed)`);
|
|
29
29
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dry-run.js","sourceRoot":"","sources":["../../../src/core/install/dry-run.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dry-run.js","sourceRoot":"","sources":["../../../src/core/install/dry-run.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,gBAAmC,EACnC,WAAmB,EACnB,SAAiB,EACjB,OAAuB,EACvB,gBAAyB;IAEzB,OAAO,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;IAE9D,MAAM,WAAW,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACzD,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,YAAY,WAAW,CAAC,IAAI,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QACpE,IAAI,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YACzC,OAAO,CAAC,GAAG,CAAC,gBAAgB,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC;IAED,qCAAqC;IACrC,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE,CAAC;QACxC,IAAI,QAAQ,CAAC,kBAAkB,KAAK,mBAAmB,CAAC,OAAO,EAAE,CAAC;YAChE,OAAO,CAAC,GAAG,CAAC,gBAAgB,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,OAAO,iCAAiC,CAAC,CAAC;YAChG,SAAS;QACX,CAAC;QAED,IAAI,QAAQ,CAAC,kBAAkB,KAAK,mBAAmB,CAAC,IAAI,EAAE,CAAC;YAC7D,OAAO,CAAC,GAAG,CAAC,gBAAgB,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,OAAO,4CAA4C,CAAC,CAAC;YAC3G,SAAS;QACX,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,qBAAqB,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAE5G,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,gBAAgB,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,OAAO,4CAA4C,CAAC,CAAC;YAC3G,SAAS;QACX,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,wBAAwB,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,YAAY,CAAC,cAAc,QAAQ,CAAC,CAAC;QAEtH,IAAI,YAAY,CAAC,WAAW,EAAE,CAAC;YAC7B,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAED,0BAA0B;IAC1B,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,CAAC,GAAG,CAAC,8CAA8C,WAAW,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC5H,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAC;IACpF,CAAC;IAED,OAAO;QACL,OAAO,EAAE,IAAI;QACb,IAAI,EAAE;YACJ,MAAM,EAAE,IAAI;YACZ,gBAAgB;YAChB,aAAa,EAAE,gBAAgB,CAAC,MAAM;SACvC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/install/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
export function buildNoVersionFoundError(packageName, constraint, selection, mode) {
|
|
2
|
+
const stableList = formatVersionList(selection.availableStable);
|
|
3
|
+
const prereleaseList = formatVersionList(selection.availablePrerelease);
|
|
4
|
+
const suggestions = [
|
|
5
|
+
'Edit .openpackage/package.yml or adjust the CLI range, then retry.',
|
|
6
|
+
'Use opkg save/pack to create a compatible version in the local registry.'
|
|
7
|
+
];
|
|
8
|
+
if (mode === 'local-only') {
|
|
9
|
+
suggestions.push('Re-run without --local to include remote versions in resolution.');
|
|
10
|
+
}
|
|
11
|
+
const message = [
|
|
12
|
+
`No version of '${packageName}' satisfies '${constraint}'.`,
|
|
13
|
+
`Available stable versions: ${stableList}`,
|
|
14
|
+
`Available WIP/pre-release versions: ${prereleaseList}`,
|
|
15
|
+
'Suggested next steps:',
|
|
16
|
+
...suggestions.map(suggestion => ` • ${suggestion}`)
|
|
17
|
+
].join('\n');
|
|
18
|
+
return new Error(message);
|
|
19
|
+
}
|
|
20
|
+
export function formatVersionList(versions) {
|
|
21
|
+
if (!versions || versions.length === 0) {
|
|
22
|
+
return 'none';
|
|
23
|
+
}
|
|
24
|
+
return versions.join(', ');
|
|
25
|
+
}
|
|
26
|
+
export function mapReasonLabelToOutcome(reasonLabel) {
|
|
27
|
+
switch (reasonLabel) {
|
|
28
|
+
case 'not found in remote registry':
|
|
29
|
+
case 'not found in registry':
|
|
30
|
+
return 'not-found';
|
|
31
|
+
case 'access denied':
|
|
32
|
+
return 'access-denied';
|
|
33
|
+
case 'network error':
|
|
34
|
+
return 'network';
|
|
35
|
+
case 'integrity check failed':
|
|
36
|
+
return 'integrity';
|
|
37
|
+
default:
|
|
38
|
+
return 'unknown';
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=install-errors.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"install-errors.js","sourceRoot":"","sources":["../../../src/core/install/install-errors.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,wBAAwB,CACtC,WAAmB,EACnB,UAAkB,EAClB,SAAqD,EACrD,IAA2B;IAE3B,MAAM,UAAU,GAAG,iBAAiB,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IAChE,MAAM,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG;QAClB,oEAAoE;QACpE,0EAA0E;KAC3E,CAAC;IAEF,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;QAC1B,WAAW,CAAC,IAAI,CAAC,kEAAkE,CAAC,CAAC;IACvF,CAAC;IAED,MAAM,OAAO,GAAG;QACd,kBAAkB,WAAW,gBAAgB,UAAU,IAAI;QAC3D,8BAA8B,UAAU,EAAE;QAC1C,uCAAuC,cAAc,EAAE;QACvD,uBAAuB;QACvB,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,UAAU,EAAE,CAAC;KACtD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,QAAkB;IAClD,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,WAAmB;IAEnB,QAAQ,WAAW,EAAE,CAAC;QACpB,KAAK,8BAA8B,CAAC;QACpC,KAAK,uBAAuB;YAC1B,OAAO,WAAW,CAAC;QACrB,KAAK,eAAe;YAClB,OAAO,eAAe,CAAC;QACzB,KAAK,eAAe;YAClB,OAAO,SAAS,CAAC;QACnB,KAAK,wBAAwB;YAC3B,OAAO,WAAW,CAAC;QACrB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC"}
|
|
@@ -6,7 +6,7 @@ import { resolveDependencies } from '../dependency-resolver.js';
|
|
|
6
6
|
import { logger } from '../../utils/logger.js';
|
|
7
7
|
import { VersionConflictError, UserCancellationError } from '../../utils/errors.js';
|
|
8
8
|
import { normalizePlatforms } from '../../utils/platform-mapper.js';
|
|
9
|
-
import {
|
|
9
|
+
import { createWorkspacePackageYml } from '../../utils/package-management.js';
|
|
10
10
|
import { checkAndHandleAllPackageConflicts } from '../../utils/install-conflict-handler.js';
|
|
11
11
|
import { discoverAndCategorizeFiles } from '../../utils/install-file-discovery.js';
|
|
12
12
|
import { installRootFilesFromMap } from '../../utils/root-file-installer.js';
|
|
@@ -27,7 +27,7 @@ export class VersionResolutionAbortError extends Error {
|
|
|
27
27
|
*/
|
|
28
28
|
export async function prepareInstallEnvironment(cwd, options) {
|
|
29
29
|
await ensureRegistryDirectories();
|
|
30
|
-
await
|
|
30
|
+
await createWorkspacePackageYml(cwd);
|
|
31
31
|
const specifiedPlatforms = normalizePlatforms(options.platforms);
|
|
32
32
|
if (specifiedPlatforms && specifiedPlatforms.length > 0 && !options.dryRun) {
|
|
33
33
|
const earlyPlatforms = await resolvePlatforms(cwd, specifiedPlatforms, { interactive: false });
|
|
@@ -108,7 +108,7 @@ export async function processConflictResolution(resolvedPackages, options) {
|
|
|
108
108
|
* Perform the index-based installation process
|
|
109
109
|
*/
|
|
110
110
|
export async function performIndexBasedInstallationPhases(params) {
|
|
111
|
-
const { cwd, packages, platforms, conflictResult, options, targetDir } = params;
|
|
111
|
+
const { cwd, packages, platforms, conflictResult, options, targetDir, fileFilters } = params;
|
|
112
112
|
// Install each package using index-based installer
|
|
113
113
|
let totalInstalled = 0;
|
|
114
114
|
let totalUpdated = 0;
|
|
@@ -120,7 +120,8 @@ export async function performIndexBasedInstallationPhases(params) {
|
|
|
120
120
|
for (const resolved of packages) {
|
|
121
121
|
try {
|
|
122
122
|
logger.debug(`Installing ${resolved.name}@${resolved.version} using index-based installer`);
|
|
123
|
-
const
|
|
123
|
+
const filtersForPackage = fileFilters?.[resolved.name];
|
|
124
|
+
const installResult = await installPackageByIndex(cwd, resolved.name, resolved.version, platforms, options, filtersForPackage);
|
|
124
125
|
totalInstalled += installResult.installed;
|
|
125
126
|
totalUpdated += installResult.updated;
|
|
126
127
|
totalDeleted += installResult.deleted;
|
|
@@ -148,7 +149,8 @@ export async function performIndexBasedInstallationPhases(params) {
|
|
|
148
149
|
};
|
|
149
150
|
for (const resolved of packages) {
|
|
150
151
|
try {
|
|
151
|
-
const
|
|
152
|
+
const filtersForPackage = fileFilters?.[resolved.name];
|
|
153
|
+
const categorized = await discoverAndCategorizeFiles(resolved.name, resolved.version, platforms, filtersForPackage);
|
|
152
154
|
const installResult = await installRootFilesFromMap(cwd, resolved.name, categorized.rootFiles, platforms);
|
|
153
155
|
installResult.installed.forEach(file => rootFileResults.installed.add(file));
|
|
154
156
|
installResult.updated.forEach(file => rootFileResults.updated.add(file));
|
|
@@ -171,16 +173,13 @@ export async function performIndexBasedInstallationPhases(params) {
|
|
|
171
173
|
updated: Array.from(rootFileResults.updated),
|
|
172
174
|
skipped: Array.from(rootFileResults.skipped)
|
|
173
175
|
},
|
|
174
|
-
|
|
176
|
+
totalOpenPackageFiles: totalInstalled + totalUpdated
|
|
175
177
|
};
|
|
176
178
|
}
|
|
177
179
|
// Helper functions
|
|
178
180
|
function formatPackageLabel(packageName, version) {
|
|
179
181
|
return version ? `${packageName}@${version}` : packageName;
|
|
180
182
|
}
|
|
181
|
-
function getAIDir(cwd) {
|
|
182
|
-
return `${cwd}/ai`;
|
|
183
|
-
}
|
|
184
183
|
// Import the resolvePlatforms function from the platform-resolution file
|
|
185
184
|
import { resolvePlatforms } from './platform-resolution.js';
|
|
186
185
|
//# sourceMappingURL=install-flow.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-flow.js","sourceRoot":"","sources":["../../../src/core/install/install-flow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,yBAAyB,
|
|
1
|
+
{"version":3,"file":"install-flow.js","sourceRoot":"","sources":["../../../src/core/install/install-flow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,yBAAyB,EAAiB,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,8BAA8B,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,iCAAiC,EAAE,MAAM,yCAAyC,CAAC;AAC5F,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAA2B,MAAM,sCAAsC,CAAC;AACtG,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAShE,MAAM,OAAO,2BAA4B,SAAQ,KAAK;IACpD,YAAmB,WAAmB;QACpC,KAAK,CAAC,iCAAiC,WAAW,EAAE,CAAC,CAAC;QADrC,gBAAW,GAAX,WAAW,CAAQ;QAEpC,IAAI,CAAC,IAAI,GAAG,6BAA6B,CAAC;IAC5C,CAAC;CACF;AAqCD;;GAEG;AACH;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,GAAW,EACX,OAAuB;IAEvB,MAAM,yBAAyB,EAAE,CAAC;IAClC,MAAM,yBAAyB,CAAC,GAAG,CAAC,CAAC;IAErC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEjE,IAAI,kBAAkB,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QAC3E,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/F,MAAM,yBAAyB,CAAC,GAAG,EAAE,cAA4B,CAAC,CAAC;IACrE,CAAC;IAED,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAChC,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,WAAmB,EACnB,GAAW,EACX,OAA2B,EAC3B,OAAuB;IAEvB,MAAM,iBAAiB,GAAG,MAAM,8BAA8B,CAAC,GAAG,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,MAAM,4BAA4B,CAAC,GAAG,CAAC,CAAC;IAChE,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC;IAC/C,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE3C,MAAM,eAAe,GAAG;QACtB,IAAI,EAAE,OAAO,CAAC,cAAc,IAAI,SAAS;QACzC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,OAAO,CAAC,MAAM,IAAI,KAAK;QACrC,SAAS,EAAE,CAAC,OAAe,EAAE,EAAE;YAC7B,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;KACF,CAAC;IAEF,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;QAC/B,OAAO,MAAM,mBAAmB,CAC9B,WAAW,EACX,GAAG,EACH,IAAI,EACJ,IAAI,GAAG,EAAE,EACT,IAAI,GAAG,EAAE,EACT,OAAO,EACP,IAAI,GAAG,EAAE,EACT,iBAAiB,EACjB,aAAa,EACb,eAAe,CAChB,CAAC;IACJ,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,aAAa,EAAE,CAAC;QACrC,OAAO;YACL,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,QAAQ,EAAE,gBAAgB,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS;YAC9E,cAAc,EAAE,MAAM,CAAC,cAAc;SACtC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,oBAAoB,EAAE,CAAC;YAC1C,MAAM,eAAe,GAAS,KAAa,CAAC,OAAO,IAAI,EAAE,CAAC;YAC1D,MAAM,YAAY,GAAG,eAAe,CAAC,WAAW,IAAI,eAAe,CAAC,GAAG,IAAI,WAAW,CAAC;YACvF,MAAM,SAAS,GAAa,eAAe,CAAC,iBAAiB,IAAI,EAAE,CAAC;YAEpE,IAAI,aAAa,GAAkB,IAAI,CAAC;YACxC,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBAClB,aAAa,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;YAClF,CAAC;iBAAM,CAAC;gBACN,aAAa,GAAG,MAAM,sBAAsB,CAAC,YAAY,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;YACtF,CAAC;YAED,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,IAAI,2BAA2B,CAAC,YAAY,CAAC,CAAC;YACtD,CAAC;YAED,aAAa,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;YACjD,MAAM,WAAW,GAAG,MAAM,aAAa,EAAE,CAAC;YAC1C,OAAO;gBACL,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,eAAe,EAAE,WAAW,CAAC,eAAe;gBAC5C,QAAQ,EAAE,gBAAgB,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC9E,cAAc,EAAE,WAAW,CAAC,cAAc;aAC3C,CAAC;QACJ,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,gBAAmC,EACnC,OAAuB;IAEvB,MAAM,cAAc,GAAG,MAAM,iCAAiC,CAAC,gBAAuB,EAAE,OAAO,CAAC,CAAC;IAEjG,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QAClC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAEjH,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,CAAC;AACnD,CAAC;AAGD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,mCAAmC,CAAC,MAAgC;IACxF,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAE7F,mDAAmD;IACnD,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,MAAM,eAAe,GAAa,EAAE,CAAC;IACrC,MAAM,eAAe,GAAa,EAAE,CAAC;IAErC,KAAK,MAAM,QAAQ,IAAI,QAAQ,EAAE,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,CAAC,KAAK,CAAC,cAAc,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,OAAO,8BAA8B,CAAC,CAAC;YAE5F,MAAM,iBAAiB,GAAG,WAAW,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACvD,MAAM,aAAa,GAAuB,MAAM,qBAAqB,CACnE,GAAG,EACH,QAAQ,CAAC,IAAI,EACb,QAAQ,CAAC,OAAO,EAChB,SAAS,EACT,OAAO,EACP,iBAAiB,CAClB,CAAC;YAEF,cAAc,IAAI,aAAa,CAAC,SAAS,CAAC;YAC1C,YAAY,IAAI,aAAa,CAAC,OAAO,CAAC;YACtC,YAAY,IAAI,aAAa,CAAC,OAAO,CAAC;YACtC,YAAY,IAAI,aAAa,CAAC,OAAO,CAAC;YAEtC,aAAa,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC;YACpD,eAAe,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;YACpD,eAAe,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;YAEpD,IAAI,aAAa,CAAC,SAAS,GAAG,CAAC,IAAI,aAAa,CAAC,OAAO,GAAG,CAAC,IAAI,aAAa,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;gBAC1F,MAAM,CAAC,IAAI,CAAC,2BAA2B,QAAQ,CAAC,IAAI,KAAK,aAAa,CAAC,SAAS,eAAe,aAAa,CAAC,OAAO,aAAa,aAAa,CAAC,OAAO,UAAU,CAAC,CAAC;YACpK,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,qBAAqB,EAAE,CAAC;gBAC3C,MAAM,KAAK,CAAC,CAAC,+BAA+B;YAC9C,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,kCAAkC,QAAQ,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC;YAC1E,YAAY,EAAE,CAAC;QACjB,CAAC;IACH,CAAC;IAED,+BAA+B;IAC/B,MAAM,eAAe,GAAG;QACtB,SAAS,EAAE,IAAI,GAAG,EAAU;QAC5B,OAAO,EAAE,IAAI,GAAG,EAAU;QAC1B,OAAO,EAAE,IAAI,GAAG,EAAU;KAC3B,CAAC;IAEF,KAAK,MAAM,QAAQ,IAAI,QAAQ,EAAE,CAAC;QAChC,IAAI,CAAC;YACH,MAAM,iBAAiB,GAAG,WAAW,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACvD,MAAM,WAAW,GAAG,MAAM,0BAA0B,CAClD,QAAQ,CAAC,IAAI,EACb,QAAQ,CAAC,OAAO,EAChB,SAAS,EACT,iBAAiB,CAClB,CAAC;YACF,MAAM,aAAa,GAAG,MAAM,uBAAuB,CACjD,GAAG,EACH,QAAQ,CAAC,IAAI,EACb,WAAW,CAAC,SAAS,EACrB,SAAS,CACV,CAAC;YAEF,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;YAC7E,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;YACzE,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,qBAAqB,EAAE,CAAC;gBAC3C,MAAM,KAAK,CAAC,CAAC,+BAA+B;YAC9C,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,gCAAgC,QAAQ,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC;IAED,OAAO;QACL,cAAc,EAAE,cAAc;QAC9B,YAAY,EAAE,YAAY;QAC1B,aAAa;QACb,eAAe;QACf,eAAe,EAAE;YACf,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC;YAChD,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;YAC5C,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;SAC7C;QACD,qBAAqB,EAAE,cAAc,GAAG,YAAY;KACrD,CAAC;AACJ,CAAC;AAED,mBAAmB;AACnB,SAAS,kBAAkB,CAAC,WAAmB,EAAE,OAAgB;IAC/D,OAAO,OAAO,CAAC,CAAC,CAAC,GAAG,WAAW,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;AAC7D,CAAC;AAED,yEAAyE;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC"}
|