fixup! feat(yarn-plugin-ignore): Yarn plugin implementing the ignore: protocol

Author: tido64

docsite/yarn.lock

@@ -5,7 +5,7 @@ __metadata:
   version: 8
   cacheKey: 10c0
 
-"@algolia/autocomplete-core@ignore:::locator=%40rnx-kit%2Fdocsite%40workspace%3A.":
+"@algolia/autocomplete-core@ignore:":
   version: 0.0.0-use.local
   resolution: "@algolia/autocomplete-core@ignore:"
   languageName: node
@@ -1800,7 +1800,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@docsearch/react@ignore:::locator=%40rnx-kit%2Fdocsite%40workspace%3A.":
+"@docsearch/react@ignore:":
   version: 0.0.0-use.local
   resolution: "@docsearch/react@ignore:"
   languageName: node
@@ -4381,13 +4381,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"algoliasearch-helper@ignore:::locator=%40rnx-kit%2Fdocsite%40workspace%3A.":
+"algoliasearch-helper@ignore:":
   version: 0.0.0-use.local
   resolution: "algoliasearch-helper@ignore:"
   languageName: node
   linkType: soft
 
-"algoliasearch@ignore:::locator=%40rnx-kit%2Fdocsite%40workspace%3A.":
+"algoliasearch@ignore:":
   version: 0.0.0-use.local
   resolution: "algoliasearch@ignore:"
   languageName: node
@@ -9344,7 +9344,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-gyp@ignore:::locator=%40rnx-kit%2Fdocsite%40workspace%3A.":
+"node-gyp@ignore:":
   version: 0.0.0-use.local
   resolution: "node-gyp@ignore:"
   languageName: node

incubator/yarn-plugin-ignore/dist/yarn-plugin-ignore.cjs

@@ -98,6 +98,7 @@ var plugin = (() => {
 
   // src/IgnoreResolver.ts
   var import_core = __require("@yarnpkg/core");
+  var import_node_assert = __require("assert");
   var IgnoreResolver = class {
     supportsDescriptor(descriptor) {
       return descriptor.range.startsWith(IGNORE_PROTOCOL);
@@ -108,38 +109,32 @@ var plugin = (() => {
     shouldPersistResolution() {
       return false;
     }
-    bindDescriptor(descriptor, fromLocator) {
-      return import_core.structUtils.bindDescriptor(descriptor, {
-        locator: import_core.structUtils.stringifyLocator(fromLocator)
-      });
+    bindDescriptor(descriptor, _fromLocator) {
+      return descriptor;
     }
     getResolutionDependencies() {
       return {};
     }
     async getCandidates(descriptor, _dependencies, _opts) {
       return [import_core.structUtils.makeLocator(descriptor, IGNORE_PROTOCOL)];
     }
-    async getSatisfying(descriptor, dependencies, locators, opts) {
-      const [locator] = await this.getCandidates(descriptor, dependencies, opts);
-      return {
-        locators: locators.filter(
-          (candidate) => candidate.locatorHash === locator.locatorHash
-        ),
-        sorted: false
-      };
+    async getSatisfying(_descriptor, _dependencies, locators, _opts) {
+      (0, import_node_assert.equal)(locators.length, 1, "Expected a single locator candidate");
+      return { locators, sorted: true };
     }
     async resolve(locator, opts) {
+      const manifest = new import_core.Manifest();
       return {
         ...locator,
         version: "0.0.0",
         languageName: opts.project.configuration.get("defaultLanguageName"),
         linkType: import_core.LinkType.SOFT,
         conditions: null,
-        dependencies: /* @__PURE__ */ new Map(),
-        peerDependencies: /* @__PURE__ */ new Map(),
-        dependenciesMeta: /* @__PURE__ */ new Map(),
-        peerDependenciesMeta: /* @__PURE__ */ new Map(),
-        bin: /* @__PURE__ */ new Map()
+        dependencies: manifest.dependencies,
+        peerDependencies: manifest.peerDependencies,
+        dependenciesMeta: manifest.dependenciesMeta,
+        peerDependenciesMeta: manifest.peerDependenciesMeta,
+        bin: manifest.bin
       };
     }
   };

incubator/yarn-plugin-ignore/src/IgnoreResolver.ts

@@ -5,7 +5,8 @@ import type {
   Resolver,
   ResolveOptions,
 } from "@yarnpkg/core";
-import { LinkType, structUtils } from "@yarnpkg/core";
+import { LinkType, Manifest, structUtils } from "@yarnpkg/core";
+import { equal } from "node:assert";
 import { IGNORE_PROTOCOL } from "./constants.ts";
 
 export class IgnoreResolver implements Resolver {
@@ -21,10 +22,8 @@ export class IgnoreResolver implements Resolver {
     return false;
   }
 
-  bindDescriptor(descriptor: Descriptor, fromLocator: Locator): Descriptor {
-    return structUtils.bindDescriptor(descriptor, {
-      locator: structUtils.stringifyLocator(fromLocator),
-    });
+  bindDescriptor(descriptor: Descriptor, _fromLocator: Locator): Descriptor {
+    return descriptor;
   }
 
   getResolutionDependencies(): Record<string, Descriptor> {
@@ -40,21 +39,17 @@ export class IgnoreResolver implements Resolver {
   }
 
   async getSatisfying(
-    descriptor: Descriptor,
-    dependencies: Record<string, Package>,
+    _descriptor: Descriptor,
+    _dependencies: Record<string, Package>,
     locators: Locator[],
-    opts: ResolveOptions
+    _opts: ResolveOptions
   ): Promise<{ locators: Locator[]; sorted: boolean }> {
-    const [locator] = await this.getCandidates(descriptor, dependencies, opts);
-    return {
-      locators: locators.filter(
-        (candidate) => candidate.locatorHash === locator.locatorHash
-      ),
-      sorted: false,
-    };
+    equal(locators.length, 1, "Expected a single locator candidate");
+    return { locators, sorted: true };
   }
 
   async resolve(locator: Locator, opts: ResolveOptions): Promise<Package> {
+    const manifest = new Manifest();
     return {
       ...locator,
 
@@ -65,13 +60,13 @@ export class IgnoreResolver implements Resolver {
 
       conditions: null,
 
-      dependencies: new Map(),
-      peerDependencies: new Map(),
+      dependencies: manifest.dependencies,
+      peerDependencies: manifest.peerDependencies,
 
-      dependenciesMeta: new Map(),
-      peerDependenciesMeta: new Map(),
+      dependenciesMeta: manifest.dependenciesMeta,
+      peerDependenciesMeta: manifest.peerDependenciesMeta,
 
-      bin: new Map(),
+      bin: manifest.bin,
     };
   }
 }

incubator/yarn-plugin-ignore/test/IgnoreResolver.test.ts

@@ -25,10 +25,7 @@ describe("IgnoreResolver", () => {
 
     equal(scope, locator.scope);
     equal(name, locator.name);
-    equal(
-      range,
-      `${IGNORE_PROTOCOL}::locator=%40${scope}%2F${name}%40ignore%3A`
-    );
+    equal(range, IGNORE_PROTOCOL);
   });
 
   it("returns no dependencies", () => {

incubator/yarn-plugin-ignore/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "extends": "@rnx-kit/tsconfig/tsconfig.node.json",
   "compilerOptions": {
-    "rootDir": "src"
+    "noEmit": true
   },
   "include": ["src"]
 }

yarn.lock

@@ -14291,7 +14291,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-gyp@ignore:::locator=rnx-kit%40workspace%3A.":
+"node-gyp@ignore:":
   version: 0.0.0-use.local
   resolution: "node-gyp@ignore:"
   languageName: node