workspace-tools 0.18.1 → 0.18.2

package/CHANGELOG.json

@@ -2,7 +2,22 @@
   "name": "workspace-tools",
   "entries": [
     {
-      "date": "Fri, 07 Jan 2022 17:07:14 GMT",
+      "date": "Fri, 07 Jan 2022 18:15:30 GMT",
+      "tag": "workspace-tools_v0.18.2",
+      "version": "0.18.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "riacarmin@microsoft.com",
+            "package": "workspace-tools",
+            "comment": "Makes the output of parseLockFile for npm v7+ lock file compatible with queryLockFile.",
+            "commit": "caf984c0c569579a316c4cec9808a63a744abb09"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 07 Jan 2022 17:07:22 GMT",
       "tag": "workspace-tools_v0.18.1",
       "version": "0.18.1",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,20 @@
 # Change Log - workspace-tools
 
-This log was last generated on Fri, 07 Jan 2022 17:07:14 GMT and should not be manually modified.
+This log was last generated on Fri, 07 Jan 2022 18:15:30 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.18.2
+
+Fri, 07 Jan 2022 18:15:30 GMT
+
+### Patches
+
+- Makes the output of parseLockFile for npm v7+ lock file compatible with queryLockFile. (riacarmin@microsoft.com)
+
 ## 0.18.1
 
-Fri, 07 Jan 2022 17:07:14 GMT
+Fri, 07 Jan 2022 17:07:22 GMT
 
 ### Patches
 

package/lib/__tests__/queryLockFile.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/__tests__/queryLockFile.test.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const setupFixture_1 = require("../helpers/setupFixture");
+const __1 = require("..");
+/**
+ * These tests rely on the "@microsoft/task-scheduler" package and its version as defined in package.json in
+ * fixtures:
+ * - monorepo-npm
+ * - basic-yarn
+ * - monorepo-pnpm
+ *
+ * If making any changes to those fixtures and "@microsoft/task-scheduler" dependency, update the `packageName` and
+ * `packageVersion` constants.
+ */
+const packageName = "@microsoft/task-scheduler";
+const packageVersion = "2.7.1";
+describe("queryLockFile()", () => {
+    // NPM
+    it("retrieves a dependency from a lock generated by npm", async () => {
+        const packageRoot = await (0, setupFixture_1.setupFixture)("monorepo-npm");
+        const parsedLockFile = await (0, __1.parseLockFile)(packageRoot);
+        const result = (0, __1.queryLockFile)(packageName, packageVersion, parsedLockFile);
+        expect(result).toBeDefined();
+        expect(result.version).toBe(packageVersion);
+    });
+    // Yarn
+    it("retrieves a dependency from a lock generated by yarn", async () => {
+        const packageRoot = await (0, setupFixture_1.setupFixture)("basic-yarn");
+        const parsedLockFile = await (0, __1.parseLockFile)(packageRoot);
+        // NOTE: Yarn’s locks include ranges.
+        const result = (0, __1.queryLockFile)(packageName, `^${packageVersion}`, parsedLockFile);
+        expect(result).toBeDefined();
+        expect(result.version).toBe(packageVersion);
+    });
+    // PNPM
+    it("retrieves a dependency from a lock generated by pnpm", async () => {
+        const packageRoot = await (0, setupFixture_1.setupFixture)("monorepo-pnpm");
+        const parsedLockFile = await (0, __1.parseLockFile)(packageRoot);
+        const result = (0, __1.queryLockFile)(packageName, packageVersion, parsedLockFile);
+        expect(result).toBeDefined();
+        expect(result.version).toBe(packageVersion);
+    });
+});

package/lib/lockfile/parseNpmLock.js

@@ -1,11 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseNpmLock = void 0;
+const nameAtVersion_1 = require("./nameAtVersion");
+/**
+ * formatNpmLock reformats the dependencies object, so the key includes the version, similarly to yarn.lock. For
+ * example, `"@microsoft/task-scheduler": { }` will become `"@microsoft/task-scheduler@2.7.1": { }`.
+ */
+const formatNpmLock = (previousValue, currentValue) => {
+    const [key, dependency] = currentValue;
+    previousValue[(0, nameAtVersion_1.nameAtVersion)(key, dependency.version)] = dependency;
+    return previousValue;
+};
 const parseNpmLock = (lock) => {
     var _a;
-    return ({
-        object: (_a = lock.dependencies) !== null && _a !== void 0 ? _a : {},
+    const dependencies = Object.entries((_a = lock.dependencies) !== null && _a !== void 0 ? _a : {}).reduce(formatNpmLock, {});
+    return {
+        object: dependencies,
         type: "success",
-    });
+    };
 };
 exports.parseNpmLock = parseNpmLock;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workspace-tools",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "license": "MIT",
   "repository": {
     "type": "git",