@riebeckite/test 0.0.20 → 0.0.22

package/dist/e2e/index.js

@@ -317,8 +317,42 @@ function createLogger(label = "e2e") {
 // e2e/pack.ts
 import fs3 from "node:fs";
 import path4 from "node:path";
+function packageLevels(repoRoot, packages) {
+  const byName = new Map(packages.map((pkg) => [pkg.name, pkg]));
+  const dependencies = /* @__PURE__ */ new Map();
+  for (const pkg of packages) {
+    const manifest = JSON.parse(
+      fs3.readFileSync(
+        path4.join(repoRoot, pkg.directory, "package.json"),
+        "utf8"
+      )
+    );
+    dependencies.set(
+      pkg.name,
+      Object.keys(manifest.dependencies ?? {}).filter(
+        (name) => byName.has(name)
+      )
+    );
+  }
+  const remaining = new Set(byName.keys());
+  const levels = [];
+  while (remaining.size > 0) {
+    const level = packages.filter(
+      (pkg) => remaining.has(pkg.name) && (dependencies.get(pkg.name) ?? []).every(
+        (dependency) => !remaining.has(dependency)
+      )
+    );
+    if (level.length === 0) {
+      throw new Error("Workspace package dependency cycle");
+    }
+    levels.push(level);
+    for (const pkg of level) remaining.delete(pkg.name);
+  }
+  return levels;
+}
 async function packPackages(tarballDir, options) {
   const { repoRoot, packages, logger, concurrency = 4 } = options;
+  const levels = packageLevels(repoRoot, packages);
   logger.step(
     `packing ${packages.length} packages with pnpm pack (concurrency ${concurrency})`
   );
@@ -344,28 +378,30 @@ async function packPackages(tarballDir, options) {
     console.log(`  packed ${pkg.name} -> ${path4.basename(tarball)}`);
     return { pkg, version: manifest.version, tarball };
   };
-  const results = new Array(packages.length);
-  let nextIndex = 0;
-  const worker = async () => {
-    while (nextIndex < packages.length) {
-      const index = nextIndex;
-      nextIndex += 1;
-      const pkg = packages[index];
-      if (pkg === void 0) continue;
-      results[index] = await packOne(pkg);
-    }
-  };
-  const batch = await Promise.allSettled(
-    Array.from(
-      { length: Math.min(concurrency, packages.length) },
-      () => worker()
-    )
-  );
-  const failure = batch.find(
-    (result) => result.status === "rejected"
-  );
-  if (failure) {
-    throw failure.reason;
+  const results = [];
+  for (const level of levels) {
+    const levelResults = new Array(level.length);
+    let nextIndex = 0;
+    const worker = async () => {
+      while (nextIndex < level.length) {
+        const index = nextIndex;
+        nextIndex += 1;
+        const pkg = level[index];
+        if (pkg === void 0) continue;
+        levelResults[index] = await packOne(pkg);
+      }
+    };
+    const batch = await Promise.allSettled(
+      Array.from(
+        { length: Math.min(concurrency, level.length) },
+        () => worker()
+      )
+    );
+    const failure = batch.find(
+      (result) => result.status === "rejected"
+    );
+    if (failure) throw failure.reason;
+    results.push(...levelResults);
   }
   const packed = /* @__PURE__ */ new Map();
   for (const result of results) {

package/dist/e2e/pack.d.ts

@@ -22,9 +22,4 @@ export interface PackPackagesOptions {
     concurrency?: number;
     logger: Logger;
 }
-/**
- * Pack every package with `pnpm pack` into `tarballDir`, using a
- * limited-concurrency pool. Returns a map from package name to its tarball and
- * version. The first failure rejects the returned promise.
- */
 export declare function packPackages(tarballDir: string, options: PackPackagesOptions): Promise<PackedPackages>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riebeckite/test",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.js",