refactor: factor out isWantedDepPrefSame to extend in a future commit by gluxon · Pull Request #8125 · pnpm/pnpm

gluxon · 2024-05-24T00:09:42Z

Copying a commit out from #8020 to merge into the main branch. This small refactor should be a no-op and not change pnpm's behavior.

gluxon · 2024-05-24T05:33:29Z

pkg-manager/core/src/install/index.ts

+    function isWantedDepPrefSame (_alias: string, prevPref: string | undefined, nextPref: string): boolean {
+      return prevPref === nextPref
+    }


In #8020, this becomes:

pnpm/pkg-manager/core/src/install/index.ts

Lines 630 to 650 in ca6b6f8

function isWantedDepPrefSame (alias: string, prevPref: string | undefined, nextPref: string): boolean {

if (prevPref !== nextPref) {

return false

}

// When pnpm catalogs are used, the specifiers can be the same (e.g.

// "catalog:default"), but the wanted versions for the dependency can be

// different after resolution if the catalog config was just edited.

const catalogName = parseCatalogProtocol(prevPref)

// If there's no catalog name, the catalog protocol was not used and we

// can assume the pref is the same since prevPref and nextPref match.

if (catalogName === null) {

return true

}

const prevCatalogEntrySpec = ctx.wantedLockfile.catalogs?.[catalogName]?.[alias]?.specifier

const nextCatalogEntrySpec = ctx.catalogs[catalogName]?.[alias]

return prevCatalogEntrySpec === nextCatalogEntrySpec

}

…pnpm#8125)

zkochan · 2024-06-04T00:10:02Z

This is a needless change without the catalogs feature. I don't think we should merge it.

gluxon · 2024-06-05T06:30:49Z

This is a needless change without the catalogs feature. I don't think we should merge it.

That's a fair point. I'll point this PR onto the catalogs branch.

…#8125)

* feat: create new @pnpm/catalogs.types package (#8026) * feat: read catalog configs from workspace manifest (#8123) * refactor: move InvalidWorkspaceManifestError to its own file * feat: read catalogs config from workspace manifest * chore: add changeset for new catalog config parsing * feat: create new `@pnpm/catalogs.protocol-parser` package (#8124) This works around a problem with pnpm's CI setup not compiling packages that are not dependencies of the main pnpm package before running these tests. #8027 (comment) * refactor: factor out isWantedDepPrefSame to extend in a future commit (#8125) * feat: create new `@pnpm/catalogs.config` package (#8220) * refactor: remove single default catalog check This check will happen in `@pnpm/catalogs.config` instead. * feat: create new @pnpm/catalogs.config package * fix: work around CI setup not compiling orphan packages before testing This works around a problem with pnpm's CI setup not compiling packages that are not dependencies of the main pnpm package before running these tests. #8027 (comment) * feat: create new `@pnpm/catalogs.resolver` package (#8219) * feat: create new @pnpm/catalogs.resolver package * fix: work around CI setup not compiling orphan packages before testing This works around a problem with pnpm's CI setup not compiling packages that are not dependencies of the main pnpm package before running these tests. #8027 (comment) * feat: implement catalog protocol for publish (#8225) * feat: implement catalog protocol for install (#8221) * feat: add catalogs to @pnpm/config * refactor: factor out resolveDependenciesOfImporterDependency function * feat: implement catalog resolver and replace prefs * revert: work around CI setup not compiling orphan packages before testing * feat: record catalog lookup snapshots through propagated metadata * feat: update projects when catalogs config changes * test: add catalog protocol install tests * refactor: remove filter-packages-from-dir dependency from core tests (#8244) * refactor: remove filter-packages-from-dir dependency from core tests * test: refactor * test: refactor --------- Co-authored-by: Zoltan Kochan <z@kochan.io> --------- Co-authored-by: Zoltan Kochan <z@kochan.io>

refactor: factor out isWantedDepPrefSame to extend in a future commit

9c66437

gluxon force-pushed the gluxon/factor-out-isWantedPrefSame branch from d2b2146 to 9c66437 Compare May 24, 2024 03:35

gluxon commented May 24, 2024

View reviewed changes

gluxon marked this pull request as ready for review May 24, 2024 05:33

gluxon requested a review from zkochan as a code owner May 24, 2024 05:33

gluxon added a commit to gluxon/pnpm that referenced this pull request May 24, 2024

refactor: factor out isWantedDepPrefSame to extend in a future commit (…

7dc20ff

…pnpm#8125)

gluxon added a commit to gluxon/pnpm that referenced this pull request May 24, 2024

refactor: factor out isWantedDepPrefSame to extend in a future commit (…

633281b

…pnpm#8125)

gluxon added a commit to gluxon/pnpm that referenced this pull request May 25, 2024

refactor: factor out isWantedDepPrefSame to extend in a future commit (…

ed51756

…pnpm#8125)

gluxon added a commit to gluxon/pnpm that referenced this pull request May 26, 2024

refactor: factor out isWantedDepPrefSame to extend in a future commit (…

2a99f43

…pnpm#8125)

gluxon added a commit to gluxon/pnpm that referenced this pull request May 26, 2024

refactor: factor out isWantedDepPrefSame to extend in a future commit (…

8c04f79

…pnpm#8125)

gluxon added a commit to gluxon/pnpm that referenced this pull request May 26, 2024

refactor: factor out isWantedDepPrefSame to extend in a future commit (…

b114073

…pnpm#8125)

gluxon added a commit to gluxon/pnpm that referenced this pull request May 26, 2024

refactor: factor out isWantedDepPrefSame to extend in a future commit (…

07d4485

…pnpm#8125)

gluxon changed the base branch from main to catalogs June 5, 2024 06:30

zkochan merged commit 4fcf925 into catalogs Jun 5, 2024

zkochan deleted the gluxon/factor-out-isWantedPrefSame branch June 5, 2024 12:37

gluxon mentioned this pull request Jun 16, 2024

feat: catalogs #8122

Merged

gluxon added a commit that referenced this pull request Jun 16, 2024

refactor: factor out isWantedDepPrefSame to extend in a future commit (…

9501f25

…#8125)

gluxon added a commit that referenced this pull request Jun 17, 2024

refactor: factor out isWantedDepPrefSame to extend in a future commit (…

30ad51d

…#8125)

gluxon added a commit that referenced this pull request Jun 17, 2024

refactor: factor out isWantedDepPrefSame to extend in a future commit (…

a20161d

…#8125)

gluxon mentioned this pull request Jun 26, 2024

Catalogs Tracking Issue #7072

Open

18 tasks

gluxon added a commit that referenced this pull request Jun 27, 2024

refactor: factor out isWantedDepPrefSame to extend in a future commit (…

6b94860

…#8125)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

refactor: factor out isWantedDepPrefSame to extend in a future commit#8125

refactor: factor out isWantedDepPrefSame to extend in a future commit#8125
zkochan merged 1 commit intocatalogsfrom
gluxon/factor-out-isWantedPrefSame

gluxon commented May 24, 2024 •

edited

Loading

Uh oh!

gluxon May 24, 2024

Uh oh!

zkochan commented Jun 4, 2024

Uh oh!

gluxon commented Jun 5, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	function isWantedDepPrefSame (alias: string, prevPref: string \| undefined, nextPref: string): boolean {
	if (prevPref !== nextPref) {
	return false
	}

	// When pnpm catalogs are used, the specifiers can be the same (e.g.
	// "catalog:default"), but the wanted versions for the dependency can be
	// different after resolution if the catalog config was just edited.
	const catalogName = parseCatalogProtocol(prevPref)

	// If there's no catalog name, the catalog protocol was not used and we
	// can assume the pref is the same since prevPref and nextPref match.
	if (catalogName === null) {
	return true
	}

	const prevCatalogEntrySpec = ctx.wantedLockfile.catalogs?.[catalogName]?.[alias]?.specifier
	const nextCatalogEntrySpec = ctx.catalogs[catalogName]?.[alias]

	return prevCatalogEntrySpec === nextCatalogEntrySpec
	}

Uh oh!

Conversation

gluxon commented May 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gluxon May 24, 2024

Choose a reason for hiding this comment

Uh oh!

zkochan commented Jun 4, 2024

Uh oh!

gluxon commented Jun 5, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

gluxon commented May 24, 2024 •

edited

Loading