@ws-test-realm/admin-kit 0.2.1-ng16 → 0.2.3-ng16

package/lib/build-modules.js

@@ -39,14 +39,34 @@ function partitionByKind(workspaceDir, names) {
   return { remotes, libraries };
 }
 
+// For each project in topo order, run two builds when applicable:
+//   1. build-lib (ng-packagr) — emits the typed library output at dist/<name>/
+//   2. build (native-federation) — emits the runtime artifact at dist/<name>-remote/
+//
+// The lib pass must complete before any sibling's federation pass starts,
+// because the sibling compiles against the lib's `.d.ts` files. Topo order
+// gives us that for free at the project level; per-project we just sequence
+// the two passes.
+//
+// If a project's angular.json lacks `architect.build-lib` (legacy single-build
+// project), the lib pass is skipped silently — the federation pass alone runs.
 function buildLibs({ workspaceDir, restrictTo = [], withDeps = false }) {
-  const { order } = loadOrder({ workspaceDir, restrictTo, withDeps });
+  const { order, angularJson } = loadOrder({ workspaceDir, restrictTo, withDeps });
 
   console.log(`\n=== Build order ===`);
   order.forEach((n, i) => console.log(`  ${i + 1}. ${n}`));
 
   for (const name of order) {
-    console.log(`\n=== ng build ${name} ===`);
+    const architect =
+      (angularJson.projects[name] && angularJson.projects[name].architect) || {};
+    if (architect["build-lib"]) {
+      console.log(`\n=== ng run ${name}:build-lib (lib pass) ===`);
+      execSync(`npx ng run ${name}:build-lib`, {
+        cwd: workspaceDir,
+        stdio: "inherit",
+      });
+    }
+    console.log(`\n=== ng build ${name} (federation pass) ===`);
     execSync(`npx ng build ${name}`, {
       cwd: workspaceDir,
       stdio: "inherit",

package/lib/deploy-remotes.js

@@ -7,12 +7,15 @@ const { loadDeployContext, resolveTarget } = require("./target-resolution");
 const { emitDescriptor } = require("./emit-descriptor");
 const { readIdentity } = require("./identity");
 
-// Resolve the build output for a native-federation remote. The Angular
-// application builder (esbuild) emits to `dist/<id>/browser/` by default;
-// older builder configurations may still write to `dist/<id>/`. Probe both
-// and return whichever contains `remoteEntry.json`.
+// Resolve the federation-pass output for a remote. Under the dual-build
+// convention `dist/<id>-remote/` is the canonical output (kept separate from
+// the lib pass at `dist/<id>/` so ng-packagr's typed output doesn't collide
+// with the bundler's). Older single-build configurations wrote to
+// `dist/<id>/browser/` (application builder) or `dist/<id>/` (browser-esbuild
+// with no nested `browser/`); kept as fallbacks for back-compat.
 function resolveBuildOutput(workspaceDir, id) {
   const candidates = [
+    path.join(workspaceDir, "dist", `${id}-remote`),
     path.join(workspaceDir, "dist", id, "browser"),
     path.join(workspaceDir, "dist", id),
   ];

package/lib/generate-module.js

@@ -51,11 +51,26 @@ function copyAndSubstitute(src, dest, tokens) {
   }
 }
 
-// Register the project as a native-federation application in angular.json.
-// `build` is the @angular-architects/native-federation:build target, which
-// post-processes the underlying esbuild app target (`esbuild`) to emit
-// remoteEntry.json + shared/exposed chunk bundles next to the application
-// bundle. Names match the federation.config.js `name` derivation.
+// Register the project as a dual-build admin module in angular.json. Three
+// architect targets per project:
+//
+//   build-lib  → @angular-devkit/build-angular:ng-packagr. Produces the typed
+//                library at dist/<name>/ (with .d.ts + package.json + fesm2015).
+//                Consumed at COMPILE time by sibling projects in this workspace
+//                (and by the host) via tsconfig.federation.json `paths`.
+//
+//   build      → @angular-architects/native-federation:build. Wraps the
+//                `esbuild` target and emits remoteEntry.json + chunks at
+//                dist/<name>-remote/. Deployed to the fiddle; consumed at
+//                RUNTIME via the host's initFederation + import map.
+//
+//   esbuild    → @angular-devkit/build-angular:browser-esbuild. The bundle
+//                target the native-federation builder wraps. Output dir
+//                dist/<name>-remote/ keeps it separate from the lib output.
+//
+// Every module is dual-build by default — any project could grow a type-level
+// consumer (pluggable slots, base components), and the dual invariant
+// guarantees the typed surface is always there.
 function registerInAngularJson(workspaceDir, name) {
   const angularJsonPath = path.join(workspaceDir, "angular.json");
   const angular = JSON.parse(fs.readFileSync(angularJsonPath, "utf8"));
@@ -67,20 +82,42 @@ function registerInAngularJson(workspaceDir, name) {
     sourceRoot: `projects/${name}/src`,
     prefix: "ws",
     architect: {
+      "build-lib": {
+        builder: "@angular-devkit/build-angular:ng-packagr",
+        options: { project: `projects/${name}/ng-package.json` },
+        configurations: {
+          production: {
+            tsConfig: `projects/${name}/tsconfig.lib.prod.json`,
+          },
+          development: { tsConfig: `projects/${name}/tsconfig.lib.json` },
+        },
+        defaultConfiguration: "production",
+      },
       build: {
         builder: "@angular-architects/native-federation:build",
         options: { target: `${name}:esbuild` },
+        configurations: {
+          production: { target: `${name}:esbuild:production` },
+          development: { target: `${name}:esbuild:development` },
+        },
+        defaultConfiguration: "production",
       },
       esbuild: {
-        builder: "@angular-devkit/build-angular:application",
+        builder: "@angular-devkit/build-angular:browser-esbuild",
         options: {
-          outputPath: `dist/${name}`,
+          outputPath: `dist/${name}-remote`,
           index: `projects/${name}/src/index.html`,
-          browser: `projects/${name}/src/main.ts`,
-          polyfills: [`projects/${name}/src/polyfills.ts`],
+          main: `projects/${name}/src/main.ts`,
+          polyfills: [],
           tsConfig: `projects/${name}/tsconfig.app.json`,
-          assets: [`projects/${name}/src/assets`],
+          styles: [],
+          scripts: [],
+        },
+        configurations: {
+          production: { optimization: true, sourceMap: false },
+          development: { optimization: false, sourceMap: true },
         },
+        defaultConfiguration: "production",
       },
     },
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ws-test-realm/admin-kit",
-  "version": "0.2.1-ng16",
+  "version": "0.2.3-ng16",
   "description": "Workflow CLI + scaffolding for Wiresphere admin-modules workspaces (Angular 16 + native-federation line). Ships `ws-init-workspace`, `ws-modules` (build+deploy driver), `ws-generate-module`/`ws-drop-module`, `ws-wire-host`, `ws-wire-pom`, `ws-sync-paths`, and `ws-purge`. Depends on @ws-test-realm/devkit (toolchain BOM) + @ws-test-realm/shared (runtime BOM + native-federation share map).",
   "license": "Artistic-2.0",
   "publishConfig": {
@@ -26,8 +26,8 @@
   ],
   "dependencies": {
     "@angular-architects/native-federation": "^16.0.0",
-    "@ws-test-realm/devkit": "file:/Users/ph/projects/ws-admin-aux/devkit",
-    "@ws-test-realm/shared": "file:/Users/ph/projects/ws-admin-aux/shared",
+    "@ws-test-realm/devkit": "^0.4.0-ng16",
+    "@ws-test-realm/shared": "^0.4.1-ng16",
     "adm-zip": "^0.5.10",
     "fast-xml-parser": "^4.3.0"
   }

package/template/package.json

@@ -17,11 +17,11 @@
 	},
 	"prettier": "@ws-test-realm/devkit/prettier.config.js",
 	"dependencies": {
-		"@ws-test-realm/shared": "^0.4.0-ng16",
+		"@ws-test-realm/shared": "^0.4.1-ng16",
 		"@ws-test-realm/ws-core": "^0.1.0-ng16"
 	},
 	"devDependencies": {
-		"@ws-test-realm/admin-kit": "^0.2.0-ng16",
+		"@ws-test-realm/admin-kit": "^0.2.3-ng16",
 		"@ws-test-realm/devkit": "^0.4.0-ng16"
 	}
 }

package/template-module/federation.config.js

@@ -1,11 +1,19 @@
-const { withNativeFederation } = require('@angular-architects/native-federation/config');
-const { sharedDescriptors } = require('@ws-test-realm/shared');
+const { withNativeFederation, share } = require('@angular-architects/native-federation/config');
+const { sharedDescriptors, WORKSPACE_LIBS } = require('@ws-test-realm/shared');
 
 module.exports = withNativeFederation({
 	name: '__camelName__Module',
 	exposes: {
-		'./Module': './src/public-api.ts',
+		// Thin re-export shim so the exposed chunk delegates to the singleton
+		// shared chunk for this package (declared in `shared` below). Without
+		// the shim, esbuild would inline the whole library here and decorator
+		// side effects would fire a second time on remote load.
+		'./Module': './src/exposed-module.ts',
 	},
-	shared: sharedDescriptors(),
+	// share() expands includeSecondaries against each package's exports field.
+	// withNativeFederation's own share() invocation is commented out upstream.
+	// Self-share this package so siblings consuming it via bare specifiers
+	// resolve to the same singleton chunk at runtime.
+	shared: { ...share(sharedDescriptors()), __name__: WORKSPACE_LIBS },
 	skip: ['rxjs/ajax', 'rxjs/fetch', 'rxjs/testing', 'rxjs/webSocket'],
 });

package/template-module/ng-package.json

@@ -0,0 +1,8 @@
+{
+	"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+	"dest": "../../dist/__name__",
+	"assets": ["./assets"],
+	"lib": {
+		"entryFile": "src/public-api.ts"
+	}
+}

package/template-module/package.json

@@ -1,6 +1,8 @@
 {
 	"name": "__name__",
 	"version": "0.0.1",
+	"module": "../../dist/__name__/fesm2022/__name__.mjs",
+	"sideEffects": false,
 	"peerDependencies": {
 		"@angular/common": "16.2.12",
 		"@angular/core": "16.2.12",

package/template-module/src/exposed-module.ts

@@ -0,0 +1 @@
+export * from '__name__';

package/template-module/tsconfig.lib.json

@@ -0,0 +1,14 @@
+{
+	"extends": "../../tsconfig.json",
+	"compilerOptions": {
+		"outDir": "../../out-tsc/lib",
+		"target": "es2022",
+		"useDefineForClassFields": false,
+		"declaration": true,
+		"declarationMap": true,
+		"inlineSources": true,
+		"types": [],
+		"lib": ["dom", "es2022"]
+	},
+	"exclude": ["src/test.ts", "**/*.spec.ts"]
+}

package/template-module/tsconfig.lib.prod.json

@@ -0,0 +1,9 @@
+{
+	"extends": "./tsconfig.lib.json",
+	"compilerOptions": {
+		"declarationMap": false
+	},
+	"angularCompilerOptions": {
+		"compilationMode": "partial"
+	}
+}