rman 2.19.0 → 2.19.1

package/builtins/platforms/node/services/publish.service.d.ts

@@ -13,6 +13,8 @@ export declare namespace PublishService {
         /** A package with uncommitted local changes is excluded (status `'skip'`) instead of aborting
          *  the whole plan (status `'error'`) - same as `version`'s own option. Default false. */
         ignoreDirty?: boolean;
+        /** Which packages are the npm target's (`shipsTo`) - every one the filters keep when omitted. */
+        shipsHere?: (pkg: Package) => boolean;
         /** Registry to check against (and, in `applyPlan`, publish to) - `.npmrc`'s own configured
          *  registry is used when omitted. */
         registry?: string;

package/builtins/platforms/node/services/publish.service.js

@@ -195,7 +195,7 @@ export var PublishService;
     PublishService.registryLabel = registryLabel;
     async function getPlan(repository, options = {}, deps = {}) {
         const git = new GitHelper({ cwd: repository.dirname });
-        const packages = filterPackages(repository.getPackages({ toposort: true }), options);
+        const packages = filterPackages(repository.getPackages({ toposort: true }), options).filter(pkg => options.shipsHere?.(pkg) ?? true);
         const dirtyFiles = await git.listDirtyFiles({ absolute: true });
         const isDirty = (pkg) => dirtyFiles.some(f => !path.relative(pkg.dirname, f).startsWith('..'));
         /** Per package, not per run: `resolveRegistry` reads the package's own `publishConfig.registry`

package/builtins/publish-targets/npm/npm-publish-target.d.ts

@@ -1,5 +1,5 @@
 import type { Package } from '../../../core/classes/package.js';
-import type { PublishTarget } from '../../../core/interfaces/publish-target.js';
+import { type PublishTarget } from '../../../core/interfaces/publish-target.js';
 import { PublishService } from '../../platforms/node/services/publish.service.js';
 /** The name this target answers to in `publish.target` and `--target`. */
 export declare const NPM_TARGET = "npm";

package/builtins/publish-targets/npm/npm-publish-target.js

@@ -1,3 +1,4 @@
+import { shipsTo } from '../../../core/interfaces/publish-target.js';
 import { CiService } from '../../platforms/node/services/ci.service.js';
 import { PublishService } from '../../platforms/node/services/publish.service.js';
 /** The name this target answers to in `publish.target` and `--target`. */
@@ -105,6 +106,9 @@ export class NpmPublishTarget {
     planOptions(ctx) {
         return {
             ...ctx.options,
+            /** `publish` drops the rest from the plan anyway; asked here too so a docker-only package
+             *  costs no `npm view`. */
+            shipsHere: pkg => shipsTo(pkg, this),
             registry: ctx.args.registry,
             userconfig: ctx.args.userconfig,
             /** Read at *plan* time too, not only where the publish command is built: the plan is what

package/commands/publish.command.js

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import readline from 'node:readline/promises';
 import colors from 'ansi-colors';
-import { unknownTargets } from '../core/interfaces/publish-target.js';
+import { shipsTo, unknownTargets } from '../core/interfaces/publish-target.js';
 import { registerCommand } from '../interfaces/rman-config.interface.js';
 import { assertAllowedBranch, branchGuardOptions, readBranchGuardOptions } from '../utils/branch-guard.js';
 import { packageFilterOptions, readPackageFilterOptions } from '../utils/package-filter.js';
@@ -121,8 +121,14 @@ const publishCommand = registerCommand(app => {
             };
             assertDeclaredTargetsExist(app, repository.getPackages());
             const plans = new Map();
-            for (const target of selected)
-                plans.set(target, await target.getPlan(ctx));
+            /** A target's plan keeps only the packages that ship to it, whatever the target itself
+             *  filtered - see `shipsTo`. Asked here, once for every target, because leaving it to each
+             *  one let them disagree: the npm target never asked, so a package declaring
+             *  `publish.target: ['docker']` was planned for npm too while `rman list` and the docker
+             *  target called it docker-only (panates/rman#40). */
+            for (const target of selected) {
+                plans.set(target, (await target.getPlan(ctx)).filter(entry => shipsTo(entry.package, target)));
+            }
             if (args.json) {
                 console.log(JSON.stringify(jsonPlan(plans), undefined, 2));
             }

package/constants.js

@@ -1 +1 @@
-export const version = '2.19.0';
+export const version = '2.19.1';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rman",
   "description": "Repository manager",
-  "version": "2.19.0",
+  "version": "2.19.1",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {