@ws-test-realm/admin-kit 0.1.10 → 0.1.11

package/lib/deploy-remotes.js

@@ -4,13 +4,31 @@ const { packIntoJar } = require("./pack-into-jar");
 const { loadOrder, partitionByKind } = require("./build-modules");
 const { findMatches } = require("./jar-glob");
 const { loadDeployContext, resolveTarget } = require("./target-resolution");
+const { promotePeerDeps, syncFederationWorkspace } = require("./federation-peers");
 
 function copyTypes(distLib, hostFederationDir) {
+  // Preserve any existing node_modules dir under the staged location —
+  // npm's workspace install populated it and the next syncFederationWorkspace
+  // run will reconcile. Replacing it on every type-copy would force a
+  // fresh per-lib install instead of letting npm hoist across siblings.
+  const preservedNodeModules = path.join(hostFederationDir, "node_modules");
+  let cached = null;
+  if (fs.existsSync(preservedNodeModules)) {
+    cached = preservedNodeModules + `.preserve-${process.pid}`;
+    fs.renameSync(preservedNodeModules, cached);
+  }
   if (fs.existsSync(hostFederationDir)) {
     fs.rmSync(hostFederationDir, { recursive: true, force: true });
   }
   fs.mkdirSync(hostFederationDir, { recursive: true });
   fs.cpSync(distLib, hostFederationDir, { recursive: true });
+  if (cached) {
+    fs.renameSync(cached, preservedNodeModules);
+  }
+  // Promote peerDependencies → dependencies in the staged package.json so
+  // npm's workspace install actually installs them. The producer's source
+  // package.json is untouched; this only affects the host-staged copy.
+  promotePeerDeps(hostFederationDir);
 }
 
 // Copy the federation artifact (dist/admin-remotes/<id>/) to the ext target
@@ -154,6 +172,21 @@ function deployRemotes({ workspaceDir, restrictTo = [], withDeps = false }) {
   }
 
   console.log(`\nDeployed ${results.length} module(s).`);
+
+  // Now that the .federation/<id>/ dirs are fresh, run a single workspace
+  // install at .federation/ to populate node_modules. npm hoists shared
+  // versions to .federation/node_modules/ and only nests on per-lib version
+  // conflicts. Consumers' TypeScript walks up from .federation/<id>/ and
+  // resolves transitive types without consumer-side dep management.
+  try {
+    syncFederationWorkspace(ctx.adminDir);
+  } catch (e) {
+    console.warn(
+      `\x1b[33mWarning:\x1b[0m federation peer install failed: ${e.message}`
+    );
+    console.warn(`  Consumer workspaces may fail to type-check federated libs.`);
+  }
+
   return { results };
 }
 

package/lib/federation-peers.js

@@ -0,0 +1,80 @@
+const fs = require("fs");
+const path = require("path");
+const { execSync } = require("child_process");
+
+// Mirror a federation lib's peerDependencies into its dependencies in the
+// STAGED package.json under <adminDir>/.federation/<id>/. ng-packagr emits
+// peerDependencies — the canonical contract for a published library — but
+// for our publish-less federation we want npm to actually INSTALL those
+// peers (so consuming workspaces' TypeScript can resolve their types via
+// walk-up from .federation/<id>/). Promoting peer → dep in the staged copy
+// only doesn't touch the producer's source.
+function promotePeerDeps(libDir) {
+  const pkgPath = path.join(libDir, "package.json");
+  if (!fs.existsSync(pkgPath)) return false;
+  const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+  if (!pkg.peerDependencies || !Object.keys(pkg.peerDependencies).length) {
+    return false;
+  }
+  pkg.dependencies = Object.assign({}, pkg.dependencies, pkg.peerDependencies);
+  fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
+  return true;
+}
+
+// Reconcile the entire .federation/ dir as an npm workspace root. Lists
+// every lib subdir as a workspace, then runs `npm install` once — npm
+// hoists shared peer versions to .federation/node_modules/ and nests only
+// where individual libs disagree, automatically scoping conflicts the way
+// npm normally would.
+//
+// Idempotent. Re-runs at the end of every deploy.
+function syncFederationWorkspace(adminDir) {
+  const federationDir = path.join(adminDir, ".federation");
+  if (!fs.existsSync(federationDir)) return { installed: false };
+
+  const libs = listFederationLibs(federationDir);
+  if (!libs.length) return { installed: false };
+
+  writeWorkspaceManifest(federationDir, libs);
+
+  console.log(
+    `\n=== federation peers: install (${libs.length} workspace${libs.length === 1 ? "" : "s"}) ===`
+  );
+  console.log(`  at ${federationDir}`);
+  execSync("npm install --no-package-lock --no-audit --no-fund", {
+    cwd: federationDir,
+    stdio: "inherit",
+  });
+  return { installed: true, libs };
+}
+
+function listFederationLibs(federationDir) {
+  return fs
+    .readdirSync(federationDir, { withFileTypes: true })
+    .filter((e) => e.isDirectory())
+    .map((e) => e.name)
+    .filter((name) => {
+      if (name === "node_modules") return false;
+      return fs.existsSync(path.join(federationDir, name, "package.json"));
+    })
+    .sort();
+}
+
+function writeWorkspaceManifest(federationDir, libs) {
+  const pkg = {
+    name: "ws-federation-host",
+    private: true,
+    version: "0.0.0",
+    workspaces: libs.map((id) => `./${id}`),
+  };
+  fs.writeFileSync(
+    path.join(federationDir, "package.json"),
+    JSON.stringify(pkg, null, 2) + "\n"
+  );
+}
+
+module.exports = {
+  promotePeerDeps,
+  syncFederationWorkspace,
+  listFederationLibs,
+};

package/lib/purge-remotes.js

@@ -3,6 +3,7 @@ const path = require("path");
 const { purgeJar } = require("./purge-jar");
 const { loadOrder, partitionByKind } = require("./build-modules");
 const { loadDeployContext, resolveTarget } = require("./target-resolution");
+const { syncFederationWorkspace } = require("./federation-peers");
 
 // Per-remote purge action. Returns a structured action record.
 function purgeOne({ workspaceDir, id, ctx }) {
@@ -120,6 +121,20 @@ function purgeRemotes({
   }
 
   reportActions({ actions, skipped, errors });
+
+  // Removed federation type dirs ⇒ workspaces list is stale; resync so
+  // the remaining libs stay correctly installed (and orphaned ones stop
+  // claiming workspace slots).
+  if (actions.some((a) => a.typesRemoved)) {
+    try {
+      syncFederationWorkspace(ctx.adminDir);
+    } catch (e) {
+      console.warn(
+        `\x1b[33mWarning:\x1b[0m federation peer resync failed: ${e.message}`
+      );
+    }
+  }
+
   return { actions, skipped, errors };
 }
 

package/lib/wire-host.js

@@ -53,6 +53,16 @@ function rebuildFederationTsconfig(workspaceDir) {
     federationTarget = path.join(hostDir, ".federation", "*");
     paths["@ws-remote/*"] = [federationTarget];
   }
+  // Catch-all fallback: any unresolved import resolves against this
+  // workspace's own node_modules. Required for cross-workspace federation
+  // siblings (e.g. @ws-remote/ws-framework) whose .d.ts files reference
+  // transitive deps (@angular/material/form-field, etc.) — TS walks up
+  // from the .d.ts file's location to find node_modules, but federation
+  // remotes live under <wpmRoot>/admin/.federation/ outside any consumer
+  // workspace's tree. This catch-all lets TS fall back to the consumer's
+  // node_modules regardless of where the .d.ts lives. Must come AFTER
+  // specific paths so they win on prefix match.
+  paths["*"] = ["./node_modules/*"];
   // tsconfig.federation.json is the leaf of the extends chain. Its single
   // responsibility now is to combine the workspace-local `paths` with the
   // canonical compiler options from @ws-test-realm/devkit/tsconfig.base.json.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ws-test-realm/admin-kit",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Workflow CLI + scaffolding for Wiresphere admin-modules workspaces. Ships `ws-init-workspace` (init/merge into a project, stamps @wiresphere/shared's `getOverrides()` into the workspace's npm overrides block), `ws-modules` (build/pack/deploy driver), `ws-generate-module`/`ws-drop-module`, `ws-wire-host`, `ws-wire-pom`, `ws-sync-paths`, and `ws-pack-remote`. Depends on @wiresphere/devkit (toolchain BOM, peerDeps); pairs with @wiresphere/shared (runtime BOM + MF share map + overrides manifest). Requires npm 9+ for overrides + peerDep resolution to coexist cleanly.",
   "license": "Artistic-2.0",
   "publishConfig": {