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
|
@@ -2,7 +2,7 @@ import * as yaml from 'js-yaml';
|
|
|
2
2
|
import * as semver from 'semver';
|
|
3
3
|
import { safePrompts } from '../utils/prompts.js';
|
|
4
4
|
import { packageManager } from './package.js';
|
|
5
|
-
import { getInstalledPackageVersion,
|
|
5
|
+
import { getInstalledPackageVersion, scanOpenPackagePackages } from './openpackage.js';
|
|
6
6
|
import { logger } from '../utils/logger.js';
|
|
7
7
|
import { PackageNotFoundError, VersionConflictError } from '../utils/errors.js';
|
|
8
8
|
import { hasExplicitPrereleaseIntent } from '../utils/version-ranges.js';
|
|
@@ -10,6 +10,8 @@ import { listPackageVersions } from './directory.js';
|
|
|
10
10
|
import { registryManager } from './registry.js';
|
|
11
11
|
import { selectInstallVersionUnified, RemoteVersionLookupError } from './install/version-selection.js';
|
|
12
12
|
import { extractRemoteErrorReason } from '../utils/error-reasons.js';
|
|
13
|
+
import { PACKAGE_PATHS } from '../constants/index.js';
|
|
14
|
+
import { formatVersionLabel } from '../utils/package-versioning.js';
|
|
13
15
|
/**
|
|
14
16
|
* Prompt user for overwrite confirmation
|
|
15
17
|
*/
|
|
@@ -72,15 +74,21 @@ export async function resolveDependencies(packageName, targetDir, isRoot = true,
|
|
|
72
74
|
allRanges.push(...priorRanges);
|
|
73
75
|
}
|
|
74
76
|
}
|
|
75
|
-
const hasConstraints = allRanges.length > 0;
|
|
76
77
|
const dedupedRanges = Array.from(new Set(allRanges));
|
|
77
|
-
const
|
|
78
|
+
const normalizedRanges = dedupedRanges.map(r => r.trim()).filter(Boolean);
|
|
79
|
+
const isWildcardRange = (range) => {
|
|
80
|
+
const normalized = range.toLowerCase();
|
|
81
|
+
return normalized === '*' || normalized === 'latest';
|
|
82
|
+
};
|
|
83
|
+
const constraintRanges = normalizedRanges.filter(range => !isWildcardRange(range));
|
|
84
|
+
const hasConstraints = constraintRanges.length > 0;
|
|
85
|
+
const combinedRangeLabel = hasConstraints ? constraintRanges.join(' & ') : undefined;
|
|
78
86
|
const filterAvailableVersions = (versions) => {
|
|
79
87
|
if (!hasConstraints) {
|
|
80
88
|
return versions;
|
|
81
89
|
}
|
|
82
90
|
return versions.filter(versionCandidate => {
|
|
83
|
-
return
|
|
91
|
+
return constraintRanges.every(range => {
|
|
84
92
|
try {
|
|
85
93
|
return semver.satisfies(versionCandidate, range, { includePrerelease: true });
|
|
86
94
|
}
|
|
@@ -149,10 +157,14 @@ export async function resolveDependencies(packageName, targetDir, isRoot = true,
|
|
|
149
157
|
availableVersions: selectionResult.sources.availableVersions
|
|
150
158
|
});
|
|
151
159
|
}
|
|
152
|
-
|
|
153
|
-
|
|
160
|
+
else {
|
|
161
|
+
missing.add(packageName);
|
|
162
|
+
return buildResolveResult(resolvedPackages, missing, remoteOutcomes);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
resolvedVersion = selectionResult.selectedVersion;
|
|
154
167
|
}
|
|
155
|
-
resolvedVersion = selectionResult.selectedVersion;
|
|
156
168
|
versionRange = combinedRangeLabel;
|
|
157
169
|
resolutionSource =
|
|
158
170
|
selectionResult.resolutionSource ?? (resolutionMode === 'remote-primary' ? 'remote' : 'local');
|
|
@@ -339,7 +351,8 @@ export async function resolveDependencies(packageName, targetDir, isRoot = true,
|
|
|
339
351
|
requiredRange: versionRange // Track the original range
|
|
340
352
|
});
|
|
341
353
|
// 5. Parse dependencies from package's package.yml
|
|
342
|
-
const packageYmlFile = pkg.files.find(f => f.path ===
|
|
354
|
+
const packageYmlFile = pkg.files.find(f => f.path === PACKAGE_PATHS.MANIFEST_RELATIVE) ||
|
|
355
|
+
pkg.files.find(f => f.path === 'package.yml');
|
|
343
356
|
if (packageYmlFile) {
|
|
344
357
|
const config = yaml.load(packageYmlFile.content);
|
|
345
358
|
// 6. Recursively resolve dependencies
|
|
@@ -425,8 +438,8 @@ export function displayDependencyTree(resolvedPackages, silent = false) {
|
|
|
425
438
|
*/
|
|
426
439
|
export async function buildDependencyTree(openpackagePath, protectedPackages) {
|
|
427
440
|
const dependencyTree = new Map();
|
|
428
|
-
// Use the shared
|
|
429
|
-
const packages = await
|
|
441
|
+
// Use the shared scanOpenPackagePackages function
|
|
442
|
+
const packages = await scanOpenPackagePackages(openpackagePath);
|
|
430
443
|
// First pass: collect all packages and their dependencies
|
|
431
444
|
for (const [packageName, pkg] of packages) {
|
|
432
445
|
const dependencies = new Set();
|
|
@@ -440,7 +453,7 @@ export async function buildDependencyTree(openpackagePath, protectedPackages) {
|
|
|
440
453
|
}
|
|
441
454
|
dependencyTree.set(packageName, {
|
|
442
455
|
name: packageName,
|
|
443
|
-
version: pkg.version,
|
|
456
|
+
version: formatVersionLabel(pkg.version),
|
|
444
457
|
dependencies,
|
|
445
458
|
dependents: new Set(),
|
|
446
459
|
isProtected: protectedPackages.has(packageName)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependency-resolver.js","sourceRoot":"","sources":["../../src/core/dependency-resolver.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dependency-resolver.js","sourceRoot":"","sources":["../../src/core/dependency-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import { spawn } from 'child_process';
|
|
2
|
+
import { logger } from '../utils/logger.js';
|
|
3
|
+
import { createHttpClient } from '../utils/http-client.js';
|
|
4
|
+
import { profileManager } from './profiles.js';
|
|
5
|
+
const POLL_SLOWDOWN_SECONDS = 5;
|
|
6
|
+
export async function startDeviceAuthorization() {
|
|
7
|
+
const client = await createHttpClient();
|
|
8
|
+
const response = await client.post('/auth/device/authorize', { clientId: 'opkg-cli', scope: 'openid', deviceName: 'opkg-cli' }, { headers: { 'Content-Type': 'application/json' }, skipAuth: true, timeout: 30000 });
|
|
9
|
+
return {
|
|
10
|
+
deviceCode: response.device_code,
|
|
11
|
+
userCode: response.user_code,
|
|
12
|
+
verificationUri: response.verification_uri,
|
|
13
|
+
verificationUriComplete: response.verification_uri_complete,
|
|
14
|
+
expiresIn: response.expires_in,
|
|
15
|
+
interval: response.interval,
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
export async function pollForDeviceToken(params) {
|
|
19
|
+
const client = await createHttpClient();
|
|
20
|
+
const expiresAt = Date.now() + params.expiresInSeconds * 1000;
|
|
21
|
+
let intervalMs = params.intervalSeconds * 1000;
|
|
22
|
+
while (Date.now() < expiresAt) {
|
|
23
|
+
try {
|
|
24
|
+
const tokenResponse = await client.post('/auth/device/token', { deviceCode: params.deviceCode }, { headers: { 'Content-Type': 'application/json' }, skipAuth: true, timeout: 30000 });
|
|
25
|
+
return {
|
|
26
|
+
apiKey: tokenResponse.apiKey,
|
|
27
|
+
keyPrefix: tokenResponse.keyPrefix,
|
|
28
|
+
expiresAt: tokenResponse.expiresAt,
|
|
29
|
+
userId: tokenResponse.userId,
|
|
30
|
+
username: tokenResponse.username,
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
catch (error) {
|
|
34
|
+
const apiError = error?.apiError?.error;
|
|
35
|
+
const code = apiError || 'authorization_pending';
|
|
36
|
+
if (code === 'authorization_pending') {
|
|
37
|
+
// continue polling
|
|
38
|
+
}
|
|
39
|
+
else if (code === 'slow_down') {
|
|
40
|
+
intervalMs += POLL_SLOWDOWN_SECONDS * 1000;
|
|
41
|
+
}
|
|
42
|
+
else if (code === 'expired_token') {
|
|
43
|
+
throw new Error('Device code expired. Please run "opkg login" again.');
|
|
44
|
+
}
|
|
45
|
+
else if (code === 'access_denied') {
|
|
46
|
+
throw new Error('Access denied. Please restart the login flow.');
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
throw error;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
await wait(intervalMs);
|
|
53
|
+
}
|
|
54
|
+
throw new Error('Device code expired. Please run "opkg login" again.');
|
|
55
|
+
}
|
|
56
|
+
export async function persistTokens(profileName, tokens) {
|
|
57
|
+
await profileManager.setProfileCredentials(profileName, { api_key: tokens.apiKey });
|
|
58
|
+
}
|
|
59
|
+
export function openBrowser(url) {
|
|
60
|
+
const platform = process.platform;
|
|
61
|
+
let command = '';
|
|
62
|
+
if (platform === 'darwin') {
|
|
63
|
+
command = 'open';
|
|
64
|
+
}
|
|
65
|
+
else if (platform === 'win32') {
|
|
66
|
+
command = 'start';
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
command = 'xdg-open';
|
|
70
|
+
}
|
|
71
|
+
try {
|
|
72
|
+
spawn(command, [url], { stdio: 'ignore', detached: true }).unref();
|
|
73
|
+
}
|
|
74
|
+
catch (error) {
|
|
75
|
+
logger.debug('Failed to open browser automatically', { error, url });
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
function wait(ms) {
|
|
79
|
+
return new Promise(resolve => setTimeout(resolve, ms));
|
|
80
|
+
}
|
|
81
|
+
//# sourceMappingURL=device-auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"device-auth.js","sourceRoot":"","sources":["../../src/core/device-auth.ts"],"names":[],"mappings":"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"}
|
package/dist/core/directory.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as os from 'os';
|
|
2
2
|
import * as path from 'path';
|
|
3
3
|
import * as semver from 'semver';
|
|
4
|
-
import {
|
|
4
|
+
import { DIR_PATTERNS, OPENPACKAGE_DIRS, UNVERSIONED } from '../constants/index.js';
|
|
5
5
|
import { ensureDir, exists, listDirectories } from '../utils/fs.js';
|
|
6
6
|
import { logger } from '../utils/logger.js';
|
|
7
7
|
import { normalizePackageName } from '../utils/package-name.js';
|
|
@@ -15,7 +15,7 @@ import { normalizePackageName } from '../utils/package-name.js';
|
|
|
15
15
|
*/
|
|
16
16
|
export function getOpenPackageDirectories() {
|
|
17
17
|
const homeDir = os.homedir();
|
|
18
|
-
const openPackageDir = path.join(homeDir,
|
|
18
|
+
const openPackageDir = path.join(homeDir, DIR_PATTERNS.OPENPACKAGE);
|
|
19
19
|
return {
|
|
20
20
|
config: openPackageDir,
|
|
21
21
|
data: openPackageDir, // Same directory - follows dotfile convention
|
|
@@ -93,9 +93,11 @@ export function getPackagePath(packageName) {
|
|
|
93
93
|
}
|
|
94
94
|
/**
|
|
95
95
|
* Get the path for a specific version of a package
|
|
96
|
+
* If version is undefined, return the unversioned path.
|
|
96
97
|
*/
|
|
97
98
|
export function getPackageVersionPath(packageName, version) {
|
|
98
|
-
|
|
99
|
+
const versionSegment = version ?? UNVERSIONED;
|
|
100
|
+
return path.join(getPackagePath(packageName), versionSegment);
|
|
99
101
|
}
|
|
100
102
|
/**
|
|
101
103
|
* List all versions of a package
|
|
@@ -106,14 +108,18 @@ export async function listPackageVersions(packageName) {
|
|
|
106
108
|
return [];
|
|
107
109
|
}
|
|
108
110
|
const versions = await listDirectories(packagePath);
|
|
109
|
-
|
|
111
|
+
const semverVersions = versions.filter(version => semver.valid(version));
|
|
112
|
+
return semverVersions.sort((a, b) => semver.compare(b, a)); // Latest first
|
|
110
113
|
}
|
|
111
114
|
/**
|
|
112
115
|
* Get the latest version of a package
|
|
113
116
|
*/
|
|
114
117
|
export async function getLatestPackageVersion(packageName) {
|
|
115
118
|
const versions = await listPackageVersions(packageName);
|
|
116
|
-
|
|
119
|
+
if (versions.length === 0) {
|
|
120
|
+
return null;
|
|
121
|
+
}
|
|
122
|
+
return versions[0];
|
|
117
123
|
}
|
|
118
124
|
/**
|
|
119
125
|
* Check if a specific version exists
|
|
@@ -161,8 +167,8 @@ export async function listAllPackages() {
|
|
|
161
167
|
const firstLevelPath = path.join(packages, firstLevel);
|
|
162
168
|
const firstLevelChildren = await listDirectories(firstLevelPath);
|
|
163
169
|
// Unscoped packages: name/<version>
|
|
164
|
-
const
|
|
165
|
-
if (
|
|
170
|
+
const hasValidChildren = firstLevelChildren.some(child => child === UNVERSIONED || semver.valid(child));
|
|
171
|
+
if (hasValidChildren) {
|
|
166
172
|
result.push(firstLevel);
|
|
167
173
|
continue;
|
|
168
174
|
}
|
|
@@ -170,8 +176,8 @@ export async function listAllPackages() {
|
|
|
170
176
|
for (const secondLevel of firstLevelChildren) {
|
|
171
177
|
const secondLevelPath = path.join(firstLevelPath, secondLevel);
|
|
172
178
|
const secondLevelChildren = await listDirectories(secondLevelPath);
|
|
173
|
-
const
|
|
174
|
-
if (
|
|
179
|
+
const hasValidGrandchildren = secondLevelChildren.some(child => child === UNVERSIONED || semver.valid(child));
|
|
180
|
+
if (hasValidGrandchildren) {
|
|
175
181
|
result.push(`${firstLevel}/${secondLevel}`);
|
|
176
182
|
}
|
|
177
183
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"directory.js","sourceRoot":"","sources":["../../src/core/directory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"directory.js","sourceRoot":"","sources":["../../src/core/directory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,62 +1,63 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
1
|
+
import { join } from 'path';
|
|
2
|
+
import { getPlatformDefinition } from '../platforms.js';
|
|
3
|
+
import { mapPlatformFileToUniversal } from '../../utils/platform-mapper.js';
|
|
4
|
+
import { exists, isDirectory, readTextFile } from '../../utils/fs.js';
|
|
5
|
+
import { getFileMtime, findFilesByExtension } from '../../utils/file-processing.js';
|
|
6
|
+
import { calculateFileHash } from '../../utils/hash-utils.js';
|
|
7
|
+
import { logger } from '../../utils/logger.js';
|
|
8
|
+
import { DIR_PATTERNS } from '../../constants/index.js';
|
|
9
|
+
export async function obtainSourceDirAndRegistryPath(file, context = {}) {
|
|
10
|
+
const fallbackPath = context.registryPathPrefix
|
|
11
|
+
? join(context.registryPathPrefix, file.relativePath)
|
|
12
|
+
: file.relativePath;
|
|
13
|
+
if (context.platform) {
|
|
12
14
|
const mapping = mapPlatformFileToUniversal(file.fullPath);
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
registryPath = registryPathPrefix
|
|
19
|
-
? join(registryPathPrefix, file.relativePath)
|
|
20
|
-
: file.relativePath;
|
|
21
|
-
}
|
|
15
|
+
const registryPath = mapping
|
|
16
|
+
? join(DIR_PATTERNS.OPENPACKAGE, mapping.subdir, mapping.relPath)
|
|
17
|
+
: fallbackPath;
|
|
18
|
+
const sourceDir = context.sourceDirLabel ?? getPlatformDefinition(context.platform).rootDir;
|
|
19
|
+
return { sourceDir, registryPath };
|
|
22
20
|
}
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
registryPath
|
|
26
|
-
|
|
27
|
-
: file.relativePath;
|
|
28
|
-
}
|
|
29
|
-
return { sourceDir, registryPath };
|
|
21
|
+
return {
|
|
22
|
+
sourceDir: context.sourceDirLabel ?? (context.registryPathPrefix || 'workspace'),
|
|
23
|
+
registryPath: fallbackPath
|
|
24
|
+
};
|
|
30
25
|
}
|
|
31
|
-
export async function discoverFiles(rootDir, packageName,
|
|
26
|
+
export async function discoverFiles(rootDir, packageName, context) {
|
|
32
27
|
if (!(await exists(rootDir)) || !(await isDirectory(rootDir))) {
|
|
33
28
|
return [];
|
|
34
29
|
}
|
|
35
|
-
const
|
|
36
|
-
|
|
30
|
+
const fileExtensions = context.fileExtensions ?? [];
|
|
31
|
+
const files = await findFilesByExtension(rootDir, fileExtensions, rootDir, {
|
|
32
|
+
excludeDirs: context.excludeDirs
|
|
33
|
+
});
|
|
34
|
+
const processPromises = files.map(async (file) => processFileForDiscovery(file, packageName, context));
|
|
35
|
+
const results = await Promise.all(processPromises);
|
|
36
|
+
return results.filter((result) => result !== null);
|
|
37
|
+
}
|
|
38
|
+
async function processFileForDiscovery(file, packageName, context) {
|
|
39
|
+
try {
|
|
40
|
+
const content = await readTextFile(file.fullPath);
|
|
41
|
+
try {
|
|
42
|
+
const mtime = await getFileMtime(file.fullPath);
|
|
43
|
+
const contentHash = await calculateFileHash(content);
|
|
44
|
+
const { sourceDir, registryPath } = await obtainSourceDirAndRegistryPath(file, context);
|
|
45
|
+
return {
|
|
46
|
+
fullPath: file.fullPath,
|
|
47
|
+
relativePath: file.relativePath,
|
|
48
|
+
sourceDir,
|
|
49
|
+
registryPath,
|
|
50
|
+
mtime,
|
|
51
|
+
contentHash
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
catch (error) {
|
|
55
|
+
logger.warn(`Failed to process file metadata for ${file.relativePath}: ${error}`);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
catch (error) {
|
|
59
|
+
logger.warn(`Failed to read ${file.relativePath}: ${error}`);
|
|
60
|
+
}
|
|
61
|
+
return null;
|
|
37
62
|
}
|
|
38
|
-
/**
|
|
39
|
-
* Discover markdown files in a directory with specified patterns and inclusion rules
|
|
40
|
-
*/
|
|
41
|
-
// export async function discoverFiles(
|
|
42
|
-
// directoryPath: string,
|
|
43
|
-
// packageName: string,
|
|
44
|
-
// platform: Platformish,
|
|
45
|
-
// registryPathPrefix: string = '',
|
|
46
|
-
// ): Promise<DiscoveredFile[]> {
|
|
47
|
-
// if (!(await exists(directoryPath)) || !(await isDirectory(directoryPath))) {
|
|
48
|
-
// return [];
|
|
49
|
-
// }
|
|
50
|
-
// // Find files with the specified patterns
|
|
51
|
-
// const allFiles: Array<{ fullPath: string; relativePath: string }> = [];
|
|
52
|
-
// // Recursive search using findFilesByExtension
|
|
53
|
-
// const files = await findFilesByExtension(directoryPath, filePatterns);
|
|
54
|
-
// allFiles.push(...files);
|
|
55
|
-
// // Process files in parallel using the extracted helper
|
|
56
|
-
// const processPromises = allFiles.map(async (file) =>
|
|
57
|
-
// processMdFileForDiscovery(file, packageName, platform, registryPathPrefix)
|
|
58
|
-
// );
|
|
59
|
-
// const results = await Promise.all(processPromises);
|
|
60
|
-
// return results.filter((result): result is DiscoveredFile => result !== null);
|
|
61
|
-
// }
|
|
62
63
|
//# sourceMappingURL=file-discovery.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-discovery.js","sourceRoot":"","sources":["../../../src/core/discovery/file-discovery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-discovery.js","sourceRoot":"","sources":["../../../src/core/discovery/file-discovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,27 +1,34 @@
|
|
|
1
1
|
import { join } from 'path';
|
|
2
|
-
import { PLATFORM_AI, PLATFORM_DIRS } from '../../constants/index.js';
|
|
3
2
|
import { exists, isDirectory } from '../../utils/fs.js';
|
|
4
|
-
import { getPlatformDefinition, isUniversalSubdirPath } from '../../core/platforms.js';
|
|
5
|
-
// Import the shared type
|
|
6
|
-
import { buildPlatformSearchConfig } from './platform-discovery.js';
|
|
3
|
+
import { getPlatformDefinition, getDetectedPlatforms, isUniversalSubdirPath } from '../../core/platforms.js';
|
|
7
4
|
import { discoverFiles } from './file-discovery.js';
|
|
8
5
|
import { normalizePathForProcessing } from '../../utils/path-normalization.js';
|
|
6
|
+
import { WORKSPACE_DISCOVERY_EXCLUDES } from '../../constants/workspace.js';
|
|
7
|
+
import { DIR_PATTERNS } from '../../constants/index.js';
|
|
9
8
|
/**
|
|
10
9
|
* Process platform subdirectories (rules/commands/agents) within a base directory
|
|
11
10
|
* Common logic shared between different discovery methods
|
|
12
11
|
*/
|
|
13
|
-
async function discoverPlatformFiles(
|
|
14
|
-
|
|
15
|
-
if (config.platform === PLATFORM_AI) {
|
|
16
|
-
return discoverFiles(PLATFORM_DIRS.AI, packageName, config.platform, PLATFORM_DIRS.AI);
|
|
17
|
-
}
|
|
18
|
-
const definition = getPlatformDefinition(config.platform);
|
|
12
|
+
async function discoverPlatformFiles(cwd, platform, packageName) {
|
|
13
|
+
const definition = getPlatformDefinition(platform);
|
|
19
14
|
const allFiles = [];
|
|
20
15
|
// Process each universal subdir that this platform supports
|
|
21
16
|
for (const [subdirName, subdirDef] of Object.entries(definition.subdirs)) {
|
|
22
|
-
|
|
17
|
+
if (!subdirDef) {
|
|
18
|
+
continue;
|
|
19
|
+
}
|
|
20
|
+
const subdirPath = join(cwd, definition.rootDir, subdirDef.path);
|
|
21
|
+
const allowedExts = subdirDef.exts;
|
|
22
|
+
if (allowedExts && allowedExts.length === 0) {
|
|
23
|
+
continue;
|
|
24
|
+
}
|
|
23
25
|
if (await exists(subdirPath) && await isDirectory(subdirPath)) {
|
|
24
|
-
const files = await discoverFiles(subdirPath, packageName,
|
|
26
|
+
const files = await discoverFiles(subdirPath, packageName, {
|
|
27
|
+
platform,
|
|
28
|
+
registryPathPrefix: `${DIR_PATTERNS.OPENPACKAGE}/${subdirName}`,
|
|
29
|
+
sourceDirLabel: platform,
|
|
30
|
+
fileExtensions: allowedExts
|
|
31
|
+
});
|
|
25
32
|
allFiles.push(...files);
|
|
26
33
|
}
|
|
27
34
|
}
|
|
@@ -35,8 +42,6 @@ function dedupeDiscoveredFilesPreferUniversal(files) {
|
|
|
35
42
|
// Normalize registry path to use forward slashes for consistent comparison
|
|
36
43
|
const normalizedPath = normalizePathForProcessing(file.registryPath);
|
|
37
44
|
if (isUniversalSubdirPath(normalizedPath))
|
|
38
|
-
return 3;
|
|
39
|
-
if (normalizedPath.startsWith(`${PLATFORM_DIRS.AI}/`) || normalizedPath === PLATFORM_DIRS.AI)
|
|
40
45
|
return 2;
|
|
41
46
|
return 1;
|
|
42
47
|
};
|
|
@@ -56,15 +61,25 @@ function dedupeDiscoveredFilesPreferUniversal(files) {
|
|
|
56
61
|
/**
|
|
57
62
|
* Unified file discovery function that searches platform-specific directories
|
|
58
63
|
*/
|
|
64
|
+
async function discoverWorkspaceFiles(cwd, packageName) {
|
|
65
|
+
return await discoverFiles(cwd, packageName, {
|
|
66
|
+
registryPathPrefix: '',
|
|
67
|
+
sourceDirLabel: 'workspace',
|
|
68
|
+
excludeDirs: WORKSPACE_DISCOVERY_EXCLUDES,
|
|
69
|
+
fileExtensions: []
|
|
70
|
+
});
|
|
71
|
+
}
|
|
59
72
|
export async function discoverPlatformFilesUnified(cwd, packageName) {
|
|
60
|
-
const
|
|
73
|
+
const detectedPlatforms = await getDetectedPlatforms(cwd);
|
|
61
74
|
const allDiscoveredFiles = [];
|
|
62
75
|
// Process all platform configurations in parallel
|
|
63
|
-
const discoveryPromises =
|
|
64
|
-
return discoverPlatformFiles(
|
|
76
|
+
const discoveryPromises = detectedPlatforms.map(async (platform) => {
|
|
77
|
+
return discoverPlatformFiles(cwd, platform, packageName);
|
|
65
78
|
});
|
|
66
79
|
const discoveredFiles = await Promise.all(discoveryPromises);
|
|
67
80
|
allDiscoveredFiles.push(...discoveredFiles.flat());
|
|
81
|
+
const workspaceDiscovered = await discoverWorkspaceFiles(cwd, packageName);
|
|
82
|
+
allDiscoveredFiles.push(...workspaceDiscovered);
|
|
68
83
|
return dedupeDiscoveredFilesPreferUniversal(allDiscoveredFiles);
|
|
69
84
|
}
|
|
70
85
|
//# sourceMappingURL=platform-files-discovery.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform-files-discovery.js","sourceRoot":"","sources":["../../../src/core/discovery/platform-files-discovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"platform-files-discovery.js","sourceRoot":"","sources":["../../../src/core/discovery/platform-files-discovery.ts"],"names":[],"mappings":"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"}
|