opkg 0.6.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 +35 -15
- package/dist/commands/duplicate.js +5 -2
- package/dist/commands/duplicate.js.map +1 -1
- package/dist/commands/init.js +4 -1
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/install.js +8 -7
- 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/pull.js +5 -299
- package/dist/commands/pull.js.map +1 -1
- package/dist/commands/push.js +5 -245
- package/dist/commands/push.js.map +1 -1
- package/dist/commands/save.js +20 -4
- 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 +19 -6
- 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/constants/index.js +1 -0
- package/dist/constants/index.js.map +1 -1
- package/dist/core/add/package-index-updater.js +4 -3
- package/dist/core/add/package-index-updater.js.map +1 -1
- 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 +21 -10
- 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 +14 -8
- package/dist/core/directory.js.map +1 -1
- package/dist/core/install/bulk-install-pipeline.js +2 -1
- package/dist/core/install/bulk-install-pipeline.js.map +1 -1
- package/dist/core/install/canonical-plan.js +11 -5
- package/dist/core/install/canonical-plan.js.map +1 -1
- package/dist/core/install/download-keys.js +2 -2
- package/dist/core/install/download-keys.js.map +1 -1
- package/dist/core/install/install-flow.js +6 -4
- package/dist/core/install/install-flow.js.map +1 -1
- package/dist/core/install/install-pipeline.js +74 -6
- package/dist/core/install/install-pipeline.js.map +1 -1
- package/dist/core/install/remote-flow.js +17 -6
- 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 +6 -6
- package/dist/core/openpackage.js.map +1 -1
- package/dist/core/package.js +71 -8
- package/dist/core/package.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.js +4 -2
- package/dist/core/registry.js.map +1 -1
- package/dist/core/remote-pull.js +163 -35
- package/dist/core/remote-pull.js.map +1 -1
- package/dist/core/save/package-saver.js +37 -1
- package/dist/core/save/package-saver.js.map +1 -1
- package/dist/core/save/package-yml-generator.js +5 -4
- package/dist/core/save/package-yml-generator.js.map +1 -1
- package/dist/core/save/save-pipeline.js +17 -6
- package/dist/core/save/save-pipeline.js.map +1 -1
- package/dist/core/save/save-single-file.js +124 -0
- package/dist/core/save/save-single-file.js.map +1 -0
- package/dist/core/scoping/package-scoping.js +1 -1
- package/dist/core/scoping/package-scoping.js.map +1 -1
- package/dist/core/token-store.js +73 -0
- package/dist/core/token-store.js.map +1 -0
- 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/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 +25 -2
- package/dist/utils/index-based-installer.js.map +1 -1
- package/dist/utils/install-file-discovery.js +17 -23
- package/dist/utils/install-file-discovery.js.map +1 -1
- package/dist/utils/manifest-paths.js +27 -0
- package/dist/utils/manifest-paths.js.map +1 -0
- package/dist/utils/package-management.js +139 -45
- 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 +17 -12
- package/dist/utils/package-yml.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 +2 -2
- package/dist/utils/registry-entry-filter.js.map +1 -1
- package/dist/utils/registry-paths.js +38 -0
- package/dist/utils/registry-paths.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 +2 -2
- 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/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/save-modes-inputs.md +3 -1
- package/specs/save-pack.md +1 -0
|
@@ -4,6 +4,7 @@ import { getLocalPackageYmlPath } from '../../utils/paths.js';
|
|
|
4
4
|
import { parsePackageYml } from '../../utils/package-yml.js';
|
|
5
5
|
import { createCaretRange, parseVersionRange } from '../../utils/version-ranges.js';
|
|
6
6
|
import { arePackageNamesEquivalent } from '../../utils/package-name.js';
|
|
7
|
+
import { UNVERSIONED } from '../../constants/index.js';
|
|
7
8
|
export async function determineCanonicalInstallPlan(args) {
|
|
8
9
|
const normalizedCliSpec = args.cliSpec?.trim() || undefined;
|
|
9
10
|
const existing = await findCanonicalDependency(args.cwd, args.packageName);
|
|
@@ -20,6 +21,7 @@ export async function determineCanonicalInstallPlan(args) {
|
|
|
20
21
|
dependencyState: 'existing',
|
|
21
22
|
canonicalRange: existing.range,
|
|
22
23
|
canonicalTarget: existing.target,
|
|
24
|
+
dependencyInclude: existing.include,
|
|
23
25
|
persistDecision: { type: 'none' },
|
|
24
26
|
compatibilityMessage: `Using version range from package.yml (${existing.range}); CLI spec '${cliConstraint.displayRange}' is compatible.`
|
|
25
27
|
};
|
|
@@ -29,6 +31,7 @@ export async function determineCanonicalInstallPlan(args) {
|
|
|
29
31
|
dependencyState: 'existing',
|
|
30
32
|
canonicalRange: existing.range,
|
|
31
33
|
canonicalTarget: existing.target,
|
|
34
|
+
dependencyInclude: existing.include,
|
|
32
35
|
persistDecision: { type: 'none' }
|
|
33
36
|
};
|
|
34
37
|
}
|
|
@@ -78,12 +81,10 @@ function locateDependencyInArray(deps, packageName, target) {
|
|
|
78
81
|
if (!entry) {
|
|
79
82
|
return null;
|
|
80
83
|
}
|
|
81
|
-
if (!entry.version || !entry.version.trim()) {
|
|
82
|
-
throw new Error(`Dependency '${packageName}' in .openpackage/package.yml must declare a version range. Edit the file and try again.`);
|
|
83
|
-
}
|
|
84
84
|
return {
|
|
85
|
-
range: entry.version.trim(),
|
|
86
|
-
target
|
|
85
|
+
range: entry.version && entry.version.trim() ? entry.version.trim() : '*',
|
|
86
|
+
target,
|
|
87
|
+
include: entry.include && entry.include.length > 0 ? [...entry.include] : undefined
|
|
87
88
|
};
|
|
88
89
|
}
|
|
89
90
|
function parseConstraintOrThrow(source, raw, packageName) {
|
|
@@ -117,6 +118,11 @@ export function resolvePersistRange(decision, selectedVersion) {
|
|
|
117
118
|
if (decision.type === 'explicit') {
|
|
118
119
|
return { range: decision.range, target: decision.target };
|
|
119
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
|
+
}
|
|
120
126
|
const derivedRange = createCaretRange(selectedVersion);
|
|
121
127
|
return { range: derivedRange, target: decision.target };
|
|
122
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canonical-plan.js","sourceRoot":"","sources":["../../../src/core/install/canonical-plan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACpF,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"canonical-plan.js","sourceRoot":"","sources":["../../../src/core/install/canonical-plan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACpF,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AA+BvD,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,IAAuB;IACzE,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC;IAC5D,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAE3E,MAAM,MAAM,GAAqB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC;IAE5E,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAEhG,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,aAAa,GAAG,sBAAsB,CAAC,KAAK,EAAE,iBAAiB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACzF,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,aAAa,EAAE,mBAAmB,CAAC,aAAa,CAAC,EAAE,CAAC;gBACnF,MAAM,2BAA2B,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;YAClG,CAAC;YAED,OAAO;gBACL,cAAc,EAAE,mBAAmB,CAAC,aAAa;gBACjD,eAAe,EAAE,UAAU;gBAC3B,cAAc,EAAE,QAAQ,CAAC,KAAK;gBAC9B,eAAe,EAAE,QAAQ,CAAC,MAAM;gBAChC,iBAAiB,EAAE,QAAQ,CAAC,OAAO;gBACnC,eAAe,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;gBACjC,oBAAoB,EAAE,yCAAyC,QAAQ,CAAC,KAAK,gBAAgB,aAAa,CAAC,YAAY,kBAAkB;aAC1I,CAAC;QACJ,CAAC;QAED,OAAO;YACL,cAAc,EAAE,mBAAmB,CAAC,aAAa;YACjD,eAAe,EAAE,UAAU;YAC3B,cAAc,EAAE,QAAQ,CAAC,KAAK;YAC9B,eAAe,EAAE,QAAQ,CAAC,MAAM;YAChC,iBAAiB,EAAE,QAAQ,CAAC,OAAO;YACnC,eAAe,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;SAClC,CAAC;IACJ,CAAC;IAED,IAAI,iBAAiB,EAAE,CAAC;QACtB,MAAM,aAAa,GAAG,sBAAsB,CAAC,KAAK,EAAE,iBAAiB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACzF,OAAO;YACL,cAAc,EAAE,aAAa,CAAC,aAAa;YAC3C,eAAe,EAAE,OAAO;YACxB,eAAe,EAAE;gBACf,IAAI,EAAE,UAAU;gBAChB,MAAM;gBACN,KAAK,EAAE,aAAa,CAAC,YAAY;aAClC;SACF,CAAC;IACJ,CAAC;IAED,OAAO;QACL,cAAc,EAAE,GAAG;QACnB,eAAe,EAAE,OAAO;QACxB,eAAe,EAAE;YACf,IAAI,EAAE,QAAQ;YACd,MAAM;YACN,IAAI,EAAE,gBAAgB;SACvB;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,GAAW,EACX,WAAmB;IAEnB,MAAM,cAAc,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC;IACnD,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,cAAc,CAAC,CAAC;QACrD,MAAM,KAAK,GACT,uBAAuB,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,CAAC;YACjE,uBAAuB,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;QAC/E,OAAO,KAAK,CAAC;IACf,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACtE,MAAM,IAAI,KAAK,CAAC,mBAAmB,cAAc,KAAK,MAAM,EAAE,CAAC,CAAC;IAClE,CAAC;AACH,CAAC;AAED,SAAS,uBAAuB,CAC9B,IAA4B,EAC5B,WAAmB,EACnB,MAAwB;IAExB,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IACjF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,KAAK,EAAE,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG;QACzE,MAAM;QACN,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;KACpF,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,MAAyB,EAAE,GAAW,EAAE,WAAmB;IACzF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACtC,OAAO,EAAE,aAAa,EAAE,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;IACxE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACb,yBAAyB,GAAG,2BAA2B,WAAW,MAAM,OAAO,uCAAuC,CACvH,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,KAAK,CACb,eAAe,WAAW,sDAAsD,GAAG,MAAM,OAAO,gCAAgC,CACjI,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,SAAiB,EAAE,SAAiB;IACzD,IAAI,CAAC;QACH,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,2BAA2B,CAAC,WAAmB,EAAE,OAAe,EAAE,cAAsB;IAC/F,OAAO,IAAI,KAAK,CACd,cAAc,WAAW,IAAI,OAAO,6CAA6C,WAAW,iBAAiB,cAAc,8EAA8E,CAC1M,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,QAAyB,EACzB,eAAuB;IAEvB,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACjC,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;IAC5D,CAAC;IAED,+EAA+E;IAC/E,qCAAqC;IACrC,IAAI,eAAe,KAAK,WAAW,EAAE,CAAC;QACpC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;IACzD,CAAC;IAED,MAAM,YAAY,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACvD,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;AAC1D,CAAC"}
|
|
@@ -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"}
|
|
@@ -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,7 +173,7 @@ 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
|
|
@@ -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,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;
|
|
1
|
+
{"version":3,"file":"install-flow.js","sourceRoot":"","sources":["../../../src/core/install/install-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,12 +8,14 @@ import { pullMissingDependenciesIfNeeded } from './remote-flow.js';
|
|
|
8
8
|
import { handleDryRunMode } from './dry-run.js';
|
|
9
9
|
import { displayInstallationResults, formatSelectionSummary } from './install-reporting.js';
|
|
10
10
|
import { buildNoVersionFoundError } from './install-errors.js';
|
|
11
|
-
import { createWorkspacePackageYml, addPackageToYml, writeLocalPackageFromRegistry } from '../../utils/package-management.js';
|
|
11
|
+
import { createWorkspacePackageYml, addPackageToYml, writeLocalPackageFromRegistry, writePartialLocalPackageFromRegistry, updatePackageDependencyInclude } from '../../utils/package-management.js';
|
|
12
12
|
import { resolvePlatforms } from './platform-resolution.js';
|
|
13
13
|
import { getLocalPackageYmlPath, getInstallRootDir, isRootPackage } from '../../utils/paths.js';
|
|
14
14
|
import { exists } from '../../utils/fs.js';
|
|
15
15
|
import { logger } from '../../utils/logger.js';
|
|
16
16
|
import { PackageNotFoundError } from '../../utils/errors.js';
|
|
17
|
+
import { safePrompts } from '../../utils/prompts.js';
|
|
18
|
+
import { normalizeRegistryPath } from '../../utils/registry-entry-filter.js';
|
|
17
19
|
export function determineResolutionMode(options) {
|
|
18
20
|
if (options.resolutionMode) {
|
|
19
21
|
return options.resolutionMode;
|
|
@@ -26,6 +28,40 @@ export function determineResolutionMode(options) {
|
|
|
26
28
|
}
|
|
27
29
|
return 'default';
|
|
28
30
|
}
|
|
31
|
+
function dedupeRegistryPaths(paths) {
|
|
32
|
+
return Array.from(new Set(paths.map(p => normalizeRegistryPath(p))));
|
|
33
|
+
}
|
|
34
|
+
async function resolveInstallIntent(args) {
|
|
35
|
+
const { packageName, dependencyState, existingInclude, normalizedRegistryPath, dryRun, canPrompt } = args;
|
|
36
|
+
// Path-based request
|
|
37
|
+
if (normalizedRegistryPath) {
|
|
38
|
+
if (dependencyState === 'existing' && !existingInclude) {
|
|
39
|
+
throw new Error(`${packageName} is already a full dependency. To install a subset, uninstall the package first and re-install subset.`);
|
|
40
|
+
}
|
|
41
|
+
const base = existingInclude ?? [];
|
|
42
|
+
const next = dedupeRegistryPaths([...base, normalizedRegistryPath]);
|
|
43
|
+
return { installPaths: next, persistInclude: next };
|
|
44
|
+
}
|
|
45
|
+
// Existing partial dependency, no path provided
|
|
46
|
+
if (existingInclude) {
|
|
47
|
+
if (!dryRun && canPrompt) {
|
|
48
|
+
const prompt = await safePrompts({
|
|
49
|
+
type: 'confirm',
|
|
50
|
+
name: 'confirmFull',
|
|
51
|
+
message: `Switch ${packageName} to full install? This will reinstall with full package content.`,
|
|
52
|
+
initial: false
|
|
53
|
+
});
|
|
54
|
+
const switchToFull = Boolean(prompt.confirmFull);
|
|
55
|
+
if (switchToFull) {
|
|
56
|
+
return { installPaths: undefined, persistInclude: null };
|
|
57
|
+
}
|
|
58
|
+
return { installPaths: existingInclude, persistInclude: existingInclude };
|
|
59
|
+
}
|
|
60
|
+
return { installPaths: existingInclude, persistInclude: existingInclude };
|
|
61
|
+
}
|
|
62
|
+
// Default full install
|
|
63
|
+
return { installPaths: undefined, persistInclude: undefined };
|
|
64
|
+
}
|
|
29
65
|
export async function runInstallPipeline(options) {
|
|
30
66
|
const cwd = process.cwd();
|
|
31
67
|
const resolutionMode = determineResolutionMode(options);
|
|
@@ -45,7 +81,7 @@ export async function runInstallPipeline(options) {
|
|
|
45
81
|
totalPackages: 0,
|
|
46
82
|
installed: 0,
|
|
47
83
|
skipped: 1,
|
|
48
|
-
|
|
84
|
+
totalOpenPackageFiles: 0
|
|
49
85
|
}
|
|
50
86
|
};
|
|
51
87
|
}
|
|
@@ -60,6 +96,20 @@ export async function runInstallPipeline(options) {
|
|
|
60
96
|
if (canonicalPlan.compatibilityMessage) {
|
|
61
97
|
console.log(`ℹ️ ${canonicalPlan.compatibilityMessage}`);
|
|
62
98
|
}
|
|
99
|
+
const normalizedRegistryPath = options.registryPath
|
|
100
|
+
? normalizeRegistryPath(options.registryPath)
|
|
101
|
+
: undefined;
|
|
102
|
+
const existingInclude = canonicalPlan.dependencyInclude && canonicalPlan.dependencyInclude.length > 0
|
|
103
|
+
? dedupeRegistryPaths(canonicalPlan.dependencyInclude)
|
|
104
|
+
: undefined;
|
|
105
|
+
const { installPaths, persistInclude } = await resolveInstallIntent({
|
|
106
|
+
packageName: options.packageName,
|
|
107
|
+
dependencyState: canonicalPlan.dependencyState,
|
|
108
|
+
existingInclude,
|
|
109
|
+
normalizedRegistryPath,
|
|
110
|
+
dryRun,
|
|
111
|
+
canPrompt: Boolean(process.stdin.isTTY && process.stdout.isTTY)
|
|
112
|
+
});
|
|
63
113
|
const selectionOptions = options.stable ? { preferStable: true } : undefined;
|
|
64
114
|
const preselection = await selectInstallVersionUnified({
|
|
65
115
|
packageName: options.packageName,
|
|
@@ -176,7 +226,7 @@ export async function runInstallPipeline(options) {
|
|
|
176
226
|
totalPackages: 0,
|
|
177
227
|
installed: 0,
|
|
178
228
|
skipped: 1,
|
|
179
|
-
|
|
229
|
+
totalOpenPackageFiles: 0
|
|
180
230
|
}
|
|
181
231
|
};
|
|
182
232
|
}
|
|
@@ -192,22 +242,40 @@ export async function runInstallPipeline(options) {
|
|
|
192
242
|
? options.resolvedPlatforms
|
|
193
243
|
: await resolvePlatforms(cwd, specifiedPlatforms, { interactive: canPromptForPlatforms });
|
|
194
244
|
const createdDirs = await createPlatformDirectories(cwd, finalPlatforms);
|
|
245
|
+
const fileFilters = installPaths && installPaths.length > 0 ? { [options.packageName]: installPaths } : undefined;
|
|
195
246
|
const installationOutcome = await performIndexBasedInstallationPhases({
|
|
196
247
|
cwd,
|
|
197
248
|
packages: finalResolvedPackages,
|
|
198
249
|
platforms: finalPlatforms,
|
|
199
250
|
conflictResult,
|
|
200
251
|
options,
|
|
201
|
-
targetDir: options.targetDir
|
|
252
|
+
targetDir: options.targetDir,
|
|
253
|
+
fileFilters
|
|
202
254
|
});
|
|
203
255
|
for (const resolved of finalResolvedPackages) {
|
|
256
|
+
const partialPaths = fileFilters?.[resolved.name];
|
|
257
|
+
if (partialPaths && partialPaths.length > 0) {
|
|
258
|
+
await writePartialLocalPackageFromRegistry(cwd, resolved.name, resolved.version, partialPaths);
|
|
259
|
+
continue;
|
|
260
|
+
}
|
|
204
261
|
await writeLocalPackageFromRegistry(cwd, resolved.name, resolved.version);
|
|
205
262
|
}
|
|
206
263
|
const mainPackage = finalResolvedPackages.find(pkg => pkg.isRoot);
|
|
207
264
|
if (packageYmlExists && mainPackage) {
|
|
208
265
|
const persistTarget = resolvePersistRange(canonicalPlan.persistDecision, mainPackage.version);
|
|
266
|
+
const includeTarget = persistInclude === undefined
|
|
267
|
+
? undefined
|
|
268
|
+
: persistInclude === null
|
|
269
|
+
? null
|
|
270
|
+
: dedupeRegistryPaths(persistInclude);
|
|
271
|
+
const targetDependencyArray = persistTarget?.target ??
|
|
272
|
+
canonicalPlan.canonicalTarget ??
|
|
273
|
+
((options.dev ?? false) ? 'dev-packages' : 'packages');
|
|
209
274
|
if (persistTarget) {
|
|
210
|
-
await addPackageToYml(cwd, options.packageName, mainPackage.version,
|
|
275
|
+
await addPackageToYml(cwd, options.packageName, mainPackage.version, targetDependencyArray === 'dev-packages', persistTarget.range, true, includeTarget ?? undefined);
|
|
276
|
+
}
|
|
277
|
+
else if (includeTarget !== undefined) {
|
|
278
|
+
await updatePackageDependencyInclude(cwd, options.packageName, targetDependencyArray, includeTarget);
|
|
211
279
|
}
|
|
212
280
|
}
|
|
213
281
|
displayInstallationResults(options.packageName, finalResolvedPackages, { platforms: finalPlatforms, created: createdDirs }, options, mainPackage, installationOutcome.allAddedFiles, installationOutcome.allUpdatedFiles, installationOutcome.rootFileResults, missingPackages, remoteOutcomes);
|
|
@@ -220,7 +288,7 @@ export async function runInstallPipeline(options) {
|
|
|
220
288
|
totalPackages: finalResolvedPackages.length,
|
|
221
289
|
installed: installationOutcome.installedCount,
|
|
222
290
|
skipped: installationOutcome.skippedCount,
|
|
223
|
-
|
|
291
|
+
totalOpenPackageFiles: installationOutcome.totalOpenPackageFiles
|
|
224
292
|
},
|
|
225
293
|
warnings: warnings.length > 0 ? Array.from(new Set(warnings)) : undefined
|
|
226
294
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-pipeline.js","sourceRoot":"","sources":["../../../src/core/install/install-pipeline.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"install-pipeline.js","sourceRoot":"","sources":["../../../src/core/install/install-pipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { fetchRemotePackageMetadata, pullDownloadsBatchFromRemote, aggregateRecursiveDownloads,
|
|
2
|
-
import {
|
|
1
|
+
import { fetchRemotePackageMetadata, pullDownloadsBatchFromRemote, aggregateRecursiveDownloads, parseDownloadIdentifier, isPartialDownload } from '../remote-pull.js';
|
|
2
|
+
import { packageManager } from '../package.js';
|
|
3
3
|
import { getVersionInfoFromDependencyTree } from '../../utils/install-helpers.js';
|
|
4
4
|
import { promptOverwriteConfirmation } from '../../utils/prompts.js';
|
|
5
5
|
import { Spinner } from '../../utils/spinner.js';
|
|
@@ -181,16 +181,27 @@ export async function pullMissingDependenciesIfNeeded(context) {
|
|
|
181
181
|
/**
|
|
182
182
|
* Plan which downloads to pull for a package based on remote metadata
|
|
183
183
|
*/
|
|
184
|
-
export async function planRemoteDownloadsForPackage(metadata, opts) {
|
|
185
|
-
const { forceRemote, dryRun } = opts;
|
|
184
|
+
export async function planRemoteDownloadsForPackage(metadata, opts = {}) {
|
|
185
|
+
const { forceRemote = true, dryRun = false } = opts;
|
|
186
186
|
const aggregatedDownloads = aggregateRecursiveDownloads([metadata.response]);
|
|
187
187
|
const downloadKeys = new Set();
|
|
188
188
|
const warnings = [];
|
|
189
189
|
for (const download of aggregatedDownloads) {
|
|
190
190
|
try {
|
|
191
|
-
const {
|
|
191
|
+
const { packageName: downloadName, version: downloadVersion } = parseDownloadIdentifier(download.name);
|
|
192
192
|
const key = createDownloadKey(downloadName, downloadVersion);
|
|
193
|
-
const
|
|
193
|
+
const isPartial = isPartialDownload(download);
|
|
194
|
+
const localState = await packageManager.getPackageVersionState(downloadName, downloadVersion);
|
|
195
|
+
const existsLocally = localState.exists;
|
|
196
|
+
if (isPartial) {
|
|
197
|
+
if (existsLocally && !localState.isPartial) {
|
|
198
|
+
const skipMessage = `${key} already exists locally as a full package; skipping partial pull`;
|
|
199
|
+
warnings.push(skipMessage);
|
|
200
|
+
continue;
|
|
201
|
+
}
|
|
202
|
+
downloadKeys.add(key);
|
|
203
|
+
continue;
|
|
204
|
+
}
|
|
194
205
|
if (forceRemote) {
|
|
195
206
|
let shouldDownload = true;
|
|
196
207
|
if (existsLocally) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-flow.js","sourceRoot":"","sources":["../../../src/core/install/remote-flow.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"remote-flow.js","sourceRoot":"","sources":["../../../src/core/install/remote-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { selectVersionWithWipPolicy } from '../../utils/version-ranges.js';
|
|
|
6
6
|
import { isScopedName } from '../scoping/package-scoping.js';
|
|
7
7
|
import { Spinner } from '../../utils/spinner.js';
|
|
8
8
|
import { extractRemoteErrorReason } from '../../utils/error-reasons.js';
|
|
9
|
+
import { UNVERSIONED } from '../../constants/index.js';
|
|
9
10
|
export class RemoteResolutionRequiredError extends Error {
|
|
10
11
|
constructor(message, details) {
|
|
11
12
|
super(message);
|
|
@@ -238,8 +239,9 @@ function extractVersionsFromRemoteResponse(response) {
|
|
|
238
239
|
collected.add(normalized);
|
|
239
240
|
}
|
|
240
241
|
}
|
|
241
|
-
if (response.version
|
|
242
|
-
|
|
242
|
+
if (response.version) {
|
|
243
|
+
const normalizedVersion = response.version.version ?? UNVERSIONED;
|
|
244
|
+
collected.add(normalizedVersion);
|
|
243
245
|
}
|
|
244
246
|
return Array.from(collected);
|
|
245
247
|
}
|
|
@@ -249,8 +251,13 @@ function extractVersionString(candidate) {
|
|
|
249
251
|
}
|
|
250
252
|
if (candidate && typeof candidate === 'object') {
|
|
251
253
|
const value = candidate.version;
|
|
252
|
-
if (
|
|
253
|
-
return
|
|
254
|
+
if (value === undefined || value === null) {
|
|
255
|
+
return UNVERSIONED;
|
|
256
|
+
}
|
|
257
|
+
if (typeof value === 'string') {
|
|
258
|
+
if (semver.valid(value)) {
|
|
259
|
+
return value;
|
|
260
|
+
}
|
|
254
261
|
}
|
|
255
262
|
}
|
|
256
263
|
return null;
|
|
@@ -262,15 +269,25 @@ function normalizeAndSortVersions(versions) {
|
|
|
262
269
|
continue;
|
|
263
270
|
}
|
|
264
271
|
const trimmed = version.trim();
|
|
265
|
-
if (!trimmed
|
|
272
|
+
if (!trimmed) {
|
|
273
|
+
continue;
|
|
274
|
+
}
|
|
275
|
+
if (!semver.valid(trimmed)) {
|
|
266
276
|
continue;
|
|
267
277
|
}
|
|
268
278
|
normalized.add(trimmed);
|
|
269
279
|
}
|
|
270
|
-
|
|
280
|
+
const sorted = Array.from(normalized).sort(semver.rcompare);
|
|
281
|
+
return sorted;
|
|
271
282
|
}
|
|
272
283
|
function mergeAndSortVersions(left, right) {
|
|
273
|
-
const merged = new Set(
|
|
274
|
-
|
|
284
|
+
const merged = new Set();
|
|
285
|
+
for (const version of [...left, ...right]) {
|
|
286
|
+
if (semver.valid(version)) {
|
|
287
|
+
merged.add(version);
|
|
288
|
+
}
|
|
289
|
+
}
|
|
290
|
+
const sorted = Array.from(merged).sort(semver.rcompare);
|
|
291
|
+
return sorted;
|
|
275
292
|
}
|
|
276
293
|
//# sourceMappingURL=version-selection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-selection.js","sourceRoot":"","sources":["../../../src/core/install/version-selection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EACL,0BAA0B,EAE3B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EACL,0BAA0B,EAG3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"version-selection.js","sourceRoot":"","sources":["../../../src/core/install/version-selection.ts"],"names":[],"mappings":"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"}
|
package/dist/core/openpackage.js
CHANGED
|
@@ -27,17 +27,17 @@ async function findPackageConfigFile(directoryPath) {
|
|
|
27
27
|
*/
|
|
28
28
|
export async function getInstalledPackageVersion(packageName, targetDir) {
|
|
29
29
|
const openpackagePath = join(targetDir, DEFAULT_INSTALL_ROOT);
|
|
30
|
-
const
|
|
31
|
-
if (!(await exists(
|
|
30
|
+
const packageOpenPackagePath = join(openpackagePath, packageName);
|
|
31
|
+
if (!(await exists(packageOpenPackagePath))) {
|
|
32
32
|
return null;
|
|
33
33
|
}
|
|
34
|
-
const configPath = await findPackageConfigFile(
|
|
34
|
+
const configPath = await findPackageConfigFile(packageOpenPackagePath);
|
|
35
35
|
if (!configPath) {
|
|
36
36
|
return null;
|
|
37
37
|
}
|
|
38
38
|
try {
|
|
39
39
|
const config = await parsePackageYml(configPath);
|
|
40
|
-
return config.version;
|
|
40
|
+
return config.version ?? null;
|
|
41
41
|
}
|
|
42
42
|
catch (error) {
|
|
43
43
|
logger.warn(`Failed to parse package config for ${packageName}: ${error}`);
|
|
@@ -78,7 +78,7 @@ export async function findPackageDirectory(openpackagePath, packageName) {
|
|
|
78
78
|
/**
|
|
79
79
|
* Scan openpackage directory for all available packages
|
|
80
80
|
*/
|
|
81
|
-
export async function
|
|
81
|
+
export async function scanOpenPackagePackages(openpackagePath) {
|
|
82
82
|
const packages = new Map();
|
|
83
83
|
if (!(await exists(openpackagePath)) || !(await isDirectory(openpackagePath))) {
|
|
84
84
|
logger.debug('Install root directory not found or not a directory', { openpackagePath });
|
|
@@ -217,7 +217,7 @@ export async function gatherRootVersionConstraints(cwd) {
|
|
|
217
217
|
/**
|
|
218
218
|
* Get package configuration
|
|
219
219
|
*/
|
|
220
|
-
export async function
|
|
220
|
+
export async function getOpenPackagePackageConfig(openpackagePath, packageName) {
|
|
221
221
|
const packagePath = await findPackageDirectory(openpackagePath, packageName);
|
|
222
222
|
if (!packagePath) {
|
|
223
223
|
return null;
|