Future proof architecture

.github/bin/repo-map.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -euo pipefail
 
 # Builds a JSON map of the sub-repos name and directory relative to the "src/" dir
 # for use in splitting monorepo packages via GitHub Actions.
@@ -19,7 +20,7 @@
 # ]
 
 # Check if $GITHUB_WORKSPACE is defined
-if [ -z "$GITHUB_WORKSPACE" ]; then
+if [ -z "${GITHUB_WORKSPACE:-}" ]; then
     # If not defined, assign a specific relative path
     root=$( git rev-parse --show-toplevel )
 else
@@ -30,8 +31,13 @@ fi
 # Use jq to generate the JSON array directly without line breaks
 packages_json=$(find "$root/src" -mindepth 2 -maxdepth 2 \( -name composer.json -o -name package.json \) -print0 |
     while IFS= read -r -d $'\0' file; do
+        # Each directory is one split package; Composer owns mixed PHP/npm packages.
+        if [[ "$(basename "$file")" == "package.json" && -f "$(dirname "$file")/composer.json" ]]; then
+            continue
+        fi
+
         # Extract the package name and directory
-        package_name=$(jq -r '.name' < "$file" | sed -E 's/^@?stellarwp\///')
+        package_name=$(jq -r '.name' < "$file" | sed -E 's/^@?stellarwp\///') || exit "$?"
         relative_directory=$(realpath --relative-to="$root/src" "$(dirname "$file")")
 
         # Build the JSON object for each package

.github/workflows/check-for-required-files.yml

@@ -20,7 +20,6 @@ jobs:
           # Find all subdirectories in src/ and look for required files
           for folder in */; do
             file_paths=(
-              "$folder.github/workflows/close-pull-request.yml"
               "$folder/.gitattributes"
               "$folder/.gitignore"
             )

.github/workflows/monorepo-split.yml

@@ -24,7 +24,9 @@ jobs:
       # Dynamically build an array of JSON objects that each contain "name" and "directory" properties.
       - name: Set repo matrix
         id: set-matrix
-        run: echo "matrix=$(./.github/bin/repo-map.sh)" >> "$GITHUB_OUTPUT"
+        run: |
+          matrix=$(./.github/bin/repo-map.sh)
+          echo "matrix=$matrix" >> "$GITHUB_OUTPUT"
 
   split:
     needs: list-repos

.github/workflows/tests.yml

@@ -133,7 +133,7 @@ jobs:
           composer run coverage:phpcov-install
           composer run coverage:prepare
           "${SLIC_BIN}" pcov on --yes
-          "${SLIC_BIN}" run unit --coverage coverage/unit.cov --ext DotReporter
+          "${SLIC_BIN}" composer run test:coverage:unit -- --ext DotReporter
           "${SLIC_BIN}" run feature --coverage coverage/feature.cov --ext DotReporter
           "${SLIC_BIN}" run redis --coverage coverage/redis.cov --ext DotReporter
           "${SLIC_BIN}" run integration --coverage coverage/integration.cov --ext DotReporter

README.md

@@ -157,7 +157,7 @@ composer run foundation -- package:create <Package>
 
 The package argument can be a new package component such as `WPCli`, an existing package directory, short package name, or Composer package name, for example `Log`, `foundation-log`, or `stellarwp/foundation-log`.
 
-If the package does not exist yet, the command asks whether to create the local scaffold in `src/<Package>` and asks for the Composer package name with a default such as `stellarwp/foundation-wpcli`. The scaffold includes the required `composer.json`, `README.md`, `.gitattributes`, `.gitignore`, and `close-pull-request.yml` files. After scaffolding, the command runs `composer monorepo merge` so the root `composer.json` includes the new package.
+If the package does not exist yet, the command asks whether to create the local scaffold in `src/<Package>` and asks for the Composer package name with a default such as `stellarwp/foundation-wpcli`. The scaffold includes the required `composer.json`, `README.md`, `.gitattributes`, and `.gitignore` files. After scaffolding, the command runs `composer monorepo merge` so the root `composer.json` includes the new package.
 
 The command runs as a dry run by default. It validates the required split package files, prints the target repository name and description, and shows the GitHub CLI commands it will run.
 
@@ -171,7 +171,7 @@ The command runs as a dry run by default. It validates the required split packag
 composer run foundation -- package:create <Package> --apply
 ```
 
-The command creates the `stellarwp/foundation-<package>` repository with the standard `[READ ONLY]` description and disables issues, wiki, projects, and pull requests. The package's `close-pull-request.yml` workflow is still included as a fallback guard for read-only split repositories.
+The command creates the `stellarwp/foundation-<package>` repository with the standard `[READ ONLY]` description and disables issues, wiki, projects, and pull requests.
 
 #### Generating WP-CLI Commands
 

codeception.dist.yml

@@ -4,6 +4,7 @@ coverage:
   enabled: true
   include:
     - src/*
+    - dev/Cli/*
 paths:
   tests: tests
   log: tests/_output

composer.json

@@ -17,6 +17,7 @@
         "lucatume/di52": ">=4.1",
         "monolog/monolog": "^2.11",
         "nikic/php-parser": ">=5.0 <6.0",
+        "psr/container": ">=1.1",
         "psr/log": ">=1.0",
         "stellarwp/container-contract": "^1.1",
         "symfony/console": ">=5.4",
@@ -72,6 +73,7 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "StellarWP\\Foundation\\Dev\\": "dev/",
             "StellarWP\\Foundation\\Tests\\Feature\\": "tests/Feature/",
             "StellarWP\\Foundation\\Tests\\Integration\\": "tests/integration/",
             "StellarWP\\Foundation\\Tests\\Redis\\": "tests/redis/",
@@ -96,7 +98,7 @@
         }
     },
     "scripts": {
-        "foundation": "@php src/Cli/bin/foundation",
+        "foundation": "@php dev/bin/foundation",
         "monorepo": "@php vendor/bin/monorepo-builder",
         "test": "@php vendor/bin/phpunit -c phpunit.xml.dist --colors=always -d memory_limit=2G",
         "test:unit": "@test --testsuite Unit",
@@ -109,6 +111,7 @@
         "test:wpunit": "slic run wpunit",
         "test:wpcli": "slic run wpcli",
         "test:coverage": "@test:coverage:split",
+        "test:coverage:unit": "@php -d pcov.directory=. vendor/bin/codecept -c codeception.slic.yml run unit --coverage coverage/unit.cov",
         "test:coverage-html": "@test:coverage-html:split",
         "test:clean": "rm -f clover.xml tests/_output/coverage/*.cov && rm -rf ./coverage",
         "coverage:phpcov-install": [
@@ -121,13 +124,13 @@
         "test:coverage:split": [
             "@coverage:phpcov-install",
             "@coverage:prepare",
-            "slic pcov on --yes && slic run unit --coverage coverage/unit.cov && slic run feature --coverage coverage/feature.cov && slic run redis --coverage coverage/redis.cov && slic run integration --coverage coverage/integration.cov && slic run wpunit --coverage coverage/wpunit.cov && slic run wpcli --coverage coverage/wpcli.cov; rc=$?; slic pcov off; exit $rc",
+            "slic pcov on --yes && slic composer run test:coverage:unit && slic run feature --coverage coverage/feature.cov && slic run redis --coverage coverage/redis.cov && slic run integration --coverage coverage/integration.cov && slic run wpunit --coverage coverage/wpunit.cov && slic run wpcli --coverage coverage/wpcli.cov; rc=$?; slic pcov off; exit $rc",
             "slic composer run coverage:merge"
         ],
         "test:coverage-html:split": [
             "@coverage:phpcov-install",
             "@coverage:prepare",
-            "slic pcov on --yes && slic run unit --coverage coverage/unit.cov && slic run feature --coverage coverage/feature.cov && slic run redis --coverage coverage/redis.cov && slic run integration --coverage coverage/integration.cov && slic run wpunit --coverage coverage/wpunit.cov && slic run wpcli --coverage coverage/wpcli.cov; rc=$?; slic pcov off; exit $rc",
+            "slic pcov on --yes && slic composer run test:coverage:unit && slic run feature --coverage coverage/feature.cov && slic run redis --coverage coverage/redis.cov && slic run integration --coverage coverage/integration.cov && slic run wpunit --coverage coverage/wpunit.cov && slic run wpcli --coverage coverage/wpcli.cov; rc=$?; slic pcov off; exit $rc",
             "slic composer run coverage:merge-html"
         ],
         "analyze": "@php vendor/bin/phpstan analyse --ansi --memory-limit 2G",
@@ -148,6 +151,7 @@
         "test:wpunit": "Run the WordPress-loaded wpunit suite through SLIC.",
         "test:wpcli": "Run the shared WP-CLI command suite through SLIC.",
         "test:coverage": "Generate merged Clover coverage from split SLIC suite artifacts.",
+        "test:coverage:unit": "Collect unit coverage for src and dev/Cli. Run through SLIC with PCOV enabled.",
         "test:coverage-html": "Generate merged Clover and HTML coverage from split SLIC suite artifacts.",
         "test:clean": "Remove generated test coverage reports and serialized coverage artifacts.",
         "coverage:phpcov-install": "Download the pinned phpcov PHAR used to merge split coverage artifacts.",

src/Cli/Commands/Package/Contracts/PackageRepositoryCreator.php → dev/Cli/Commands/Package/Contracts/PackageRepositoryCreator.php

@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace StellarWP\Foundation\Cli\Commands\Package\Contracts;
+namespace StellarWP\Foundation\Dev\Cli\Commands\Package\Contracts;
 
-use StellarWP\Foundation\Cli\Commands\Package\PackageRepositoryPlan;
+use StellarWP\Foundation\Dev\Cli\Commands\Package\PackageRepositoryPlan;
 
 /**
  * Creates or configures the external repository for a Foundation split package.

src/Cli/Commands/Package/CreateCommand.php → dev/Cli/Commands/Package/CreateCommand.php

@@ -1,11 +1,11 @@
 <?php declare(strict_types=1);
 
-namespace StellarWP\Foundation\Cli\Commands\Package;
+namespace StellarWP\Foundation\Dev\Cli\Commands\Package;
 
 use RuntimeException;
-use StellarWP\Foundation\Cli\Commands\Package\Contracts\PackageRepositoryCreator;
 use StellarWP\Foundation\Cli\Process\Contracts\ProcessRunner;
 use StellarWP\Foundation\Cli\Process\ShellCommand;
+use StellarWP\Foundation\Dev\Cli\Commands\Package\Contracts\PackageRepositoryCreator;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputArgument;
@@ -38,7 +38,7 @@ public function __construct(
 
 	protected function configure(): void {
 		$this->setDescription('Create and configure a read-only GitHub sub-repository for a Foundation split package.')
-			->addArgument('package', InputArgument::REQUIRED, 'Package directory, package short name, or Composer package name.')
+			->addArgument('package', InputArgument::REQUIRED, 'Package directory, short name, repository name, or full Composer or npm package name.')
 			->addOption('apply', null, InputOption::VALUE_NONE, 'Run the generated GitHub actions. Without this option, the command is a dry run.');
 	}
 

src/Cli/Commands/Package/GitHubPackageRepositoryCreator.php → dev/Cli/Commands/Package/GitHubPackageRepositoryCreator.php

@@ -1,11 +1,11 @@
 <?php declare(strict_types=1);
 
-namespace StellarWP\Foundation\Cli\Commands\Package;
+namespace StellarWP\Foundation\Dev\Cli\Commands\Package;
 
 use RuntimeException;
-use StellarWP\Foundation\Cli\Commands\Package\Contracts\PackageRepositoryCreator;
 use StellarWP\Foundation\Cli\Process\Contracts\ProcessRunner;
 use StellarWP\Foundation\Cli\Process\ShellCommand;
+use StellarWP\Foundation\Dev\Cli\Commands\Package\Contracts\PackageRepositoryCreator;
 
 /**
  * GitHub CLI implementation for creating Foundation split repositories.

src/Cli/Commands/Package/Package.php → dev/Cli/Commands/Package/Package.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace StellarWP\Foundation\Cli\Commands\Package;
+namespace StellarWP\Foundation\Dev\Cli\Commands\Package;
 
 /**
  * Resolved Foundation split package metadata from the monorepo.
@@ -15,11 +15,14 @@ public function __construct(
 		public string $component,
 		public string $directory,
 		public string $path,
-		public string $composerPath
+		public string $manifestPath
 	) {
 	}
 
+	/**
+	 * Return the split repository name for a Composer or npm package.
+	 */
 	public function repoName(): string {
-		return str_replace('stellarwp/', '', $this->name);
+		return str_replace(['@stellarwp/', 'stellarwp/'], '', $this->name);
 	}
 }

src/Cli/Commands/Package/PackageFilesValidator.php → dev/Cli/Commands/Package/PackageFilesValidator.php

@@ -1,33 +1,33 @@
 <?php declare(strict_types=1);
 
-namespace StellarWP\Foundation\Cli\Commands\Package;
+namespace StellarWP\Foundation\Dev\Cli\Commands\Package;
 
 /**
  * Validates that a split package has the files required for repository creation.
  *
- * Use this before creating the external repository so missing package metadata,
- * read-only warnings, or pull-request closing workflow files are caught early.
+ * Use this before creating the external repository to identify missing package
+ * manifests, README files, and Git configuration files.
  */
 final class PackageFilesValidator
 {
 	/**
 	 * @var list<string>
 	 */
 	private const array REQUIRED_FILES = [
-		'composer.json',
 		'README.md',
 		'.gitattributes',
 		'.gitignore',
-		'.github/workflows/close-pull-request.yml',
 	];
 
 	/**
+	 * List the missing manifest and shared split repository files.
+	 *
 	 * @return list<string>
 	 */
 	public function missingFiles(Package $package): array {
 		$missingFiles = [];
 
-		foreach (self::REQUIRED_FILES as $requiredFile) {
+		foreach ([basename($package->manifestPath), ...self::REQUIRED_FILES] as $requiredFile) {
 			if (! file_exists($package->path . '/' . $requiredFile)) {
 				$missingFiles[] = $requiredFile;
 			}

src/Cli/Commands/Package/PackageRepositoryPlan.php → dev/Cli/Commands/Package/PackageRepositoryPlan.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace StellarWP\Foundation\Cli\Commands\Package;
+namespace StellarWP\Foundation\Dev\Cli\Commands\Package;
 
 /**
  * Repository creation plan derived from a resolved Foundation package.

src/Cli/Commands/Package/PackageRepositoryPlanFactory.php → dev/Cli/Commands/Package/PackageRepositoryPlanFactory.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace StellarWP\Foundation\Cli\Commands\Package;
+namespace StellarWP\Foundation\Dev\Cli\Commands\Package;
 
 /**
  * Builds the standard GitHub repository plan for a Foundation split package.

src/Cli/Commands/Package/PackageResolver.php → dev/Cli/Commands/Package/PackageResolver.php

@@ -1,14 +1,15 @@
 <?php declare(strict_types=1);
 
-namespace StellarWP\Foundation\Cli\Commands\Package;
+namespace StellarWP\Foundation\Dev\Cli\Commands\Package;
 
+use JsonException;
 use RuntimeException;
 
 /**
  * Finds Foundation split packages from user-friendly command input.
  *
  * Use this in package commands that accept a directory name, short package name,
- * repository name, or full Composer package name and need the matching package.
+ * repository name, or full Composer or npm package name and need the matching package.
  */
 final readonly class PackageResolver
 {
@@ -17,6 +18,12 @@ public function __construct(
 	) {
 	}
 
+	/**
+	 * Resolve an existing split package by its name or directory.
+	 *
+	 * @throws RuntimeException When no Foundation package matches the input.
+	 * @throws JsonException    When a package manifest contains invalid JSON.
+	 */
 	public function resolve(string $input): Package {
 		$normalizedInput = $this->normalizeInput($input);
 
@@ -33,15 +40,21 @@ public function resolve(string $input): Package {
 	 * @return list<Package>
 	 */
 	private function packages(): array {
-		$composerPaths = glob($this->rootPath . '/src/*/composer.json') ?: [];
+		$manifestPaths = glob($this->rootPath . '/src/*/{composer,package}.json', GLOB_BRACE) ?: [];
 		$packages      = [];
 
-		foreach ($composerPaths as $composerPath) {
-			$packagePath = dirname($composerPath);
-			$composer    = json_decode((string) file_get_contents($composerPath), true, 512, JSON_THROW_ON_ERROR);
-			$name        = $composer['name'] ?? '';
+		foreach ($manifestPaths as $manifestPath) {
+			$packagePath = dirname($manifestPath);
+
+			// A Composer package may also have an npm manifest for frontend tooling.
+			if (basename($manifestPath) === 'package.json' && is_file($packagePath . '/composer.json')) {
+				continue;
+			}
+
+			$manifest = json_decode((string) file_get_contents($manifestPath), true, 512, JSON_THROW_ON_ERROR);
+			$name     = $manifest['name'] ?? '';
 
-			if (! is_string($name) || ! str_starts_with($name, 'stellarwp/foundation-')) {
+			if (! is_string($name) || ! preg_match('#^@?stellarwp/foundation-#', $name)) {
 				continue;
 			}
 
@@ -50,7 +63,7 @@ private function packages(): array {
 				component: basename($packagePath),
 				directory: 'src/' . basename($packagePath),
 				path: $packagePath,
-				composerPath: $composerPath
+				manifestPath: $manifestPath
 			);
 		}
 
@@ -59,6 +72,9 @@ private function packages(): array {
 
 	private function matches(Package $package, string $input): bool {
 		return in_array($input, [
+			$this->normalizeInput($package->directory),
+			$this->normalizeInput('./' . $package->directory),
+			$this->normalizeInput($package->path),
 			$this->normalizeInput($package->component),
 			$this->normalizeInput($package->name),
 			$this->normalizeInput($package->repoName()),
@@ -67,6 +83,6 @@ private function matches(Package $package, string $input): bool {
 	}
 
 	private function normalizeInput(string $input): string {
-		return strtolower(trim($input));
+		return strtolower(rtrim(trim($input), '/'));
 	}
 }

src/Cli/Commands/Package/PackageScaffold.php → dev/Cli/Commands/Package/PackageScaffold.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace StellarWP\Foundation\Cli\Commands\Package;
+namespace StellarWP\Foundation\Dev\Cli\Commands\Package;
 
 /**
  * Result of creating or completing a Foundation split package scaffold.