Fixes tagging when pushing, also pays attention to brand new packages to be deployed (#234)

* publishes new packages if not in registry

* Change files

Author: kenotron

change/beachball-2020-01-14-20-41-35-fixtag.json

@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Fixes tagging and also publish brand new packages if not exists",
+  "packageName": "beachball",
+  "email": "kchau@microsoft.com",
+  "commit": "09a7071c0c71193224e203aaa0f51fa2dfc395c4",
+  "date": "2020-01-15T04:41:35.192Z"
+}

packages/beachball/src/__tests__/publishGit.test.ts

@@ -51,6 +51,7 @@ describe('publish command', () => {
       registry: 'http://localhost:99999/',
       tag: 'latest',
       token: '',
+      new: false,
       yes: true,
       access: 'public',
       package: 'foo',
@@ -93,7 +94,6 @@ describe('publish command', () => {
     gitFailFast(['checkout', '-b', publishBranch], { cwd: repo1.rootPath });
 
     console.log('Bumping version for npm publish');
-    const bumpInfo = gatherBumpInfo(repo1.rootPath);
 
     const options: BeachballOptions = {
       branch: 'origin/master',
@@ -107,6 +107,7 @@ describe('publish command', () => {
       tag: 'latest',
       token: '',
       yes: true,
+      new: false,
       access: 'public',
       package: 'foo',
       changehint: 'Run "beachball change" to create a change file',
@@ -116,6 +117,8 @@ describe('publish command', () => {
       defaultNpmTag: 'latest',
     };
 
+    const bumpInfo = gatherBumpInfo(options);
+
     // 3. Meanwhile, in repo2, also create a new change file
     const repo2 = await repositoryFactory.cloneRepository();
 

packages/beachball/src/__tests__/publishRegistry.test.ts

@@ -54,6 +54,7 @@ describe('publishToRegistry', () => {
       tag: 'latest',
       token: '',
       yes: true,
+      new: false,
       access: 'public',
       package: 'foo',
       changehint: 'Run "beachball change" to create a change file',
@@ -131,6 +132,7 @@ describe('publishToRegistry', () => {
       tag: 'latest',
       token: '',
       yes: true,
+      new: false,
       access: 'public',
       package: 'foopkg',
       changehint: 'Run "beachball change" to create a change file',
@@ -203,6 +205,7 @@ describe('publishToRegistry', () => {
       tag: 'latest',
       token: '',
       yes: true,
+      new: false,
       access: 'public',
       package: 'foopkg',
       changehint: 'Run "beachball change" to create a change file',

packages/beachball/src/bump/bumpInPlace.ts

@@ -5,7 +5,7 @@ import { updateRelatedChangeType } from './updateRelatedChangeType';
 import { bumpPackageInfoVersion } from './bumpPackageInfoVersion';
 import { BeachballOptions } from '../types/BeachballOptions';
 import { setGroupsInBumpInfo } from './setGroupsInBumpInfo';
-import { gatherBumpInfo } from './gatherBumpInfo';
+
 /**
  * Updates BumpInfo according to change types, bump deps, and version groups
  *

packages/beachball/src/bump/gatherBumpInfo.ts

@@ -3,8 +3,10 @@ import { readChangeFiles } from '../changefile/readChangeFiles';
 import { getPackageInfos } from '../monorepo/getPackageInfos';
 import { ChangeSet } from '../types/ChangeInfo';
 import { BumpInfo } from '../types/BumpInfo';
+import { bumpInPlace } from './bumpInPlace';
+import { BeachballOptions } from '../types/BeachballOptions';
 
-export function gatherBumpInfo(cwd: string): BumpInfo {
+function gatherPreBumpInfo(cwd: string): BumpInfo {
   // Collate the changes per package
   const changes = readChangeFiles(cwd);
   const packageChangeTypes = getPackageChangeTypes(changes);
@@ -31,6 +33,13 @@ export function gatherBumpInfo(cwd: string): BumpInfo {
     packageGroups: {},
     changes: filteredChanges,
     modifiedPackages: new Set<string>(),
+    newPackages: new Set<string>(),
     dependents: {},
   };
 }
+
+export function gatherBumpInfo(options: BeachballOptions): BumpInfo {
+  const bumpInfo = gatherPreBumpInfo(options.path);
+  bumpInPlace(bumpInfo, options);
+  return bumpInfo;
+}

packages/beachball/src/bump/performBump.ts

@@ -4,6 +4,7 @@ import fs from 'fs';
 import { BumpInfo } from '../types/BumpInfo';
 import { bumpInPlace } from './bumpInPlace';
 import { BeachballOptions } from '../types/BeachballOptions';
+import { getNewPackages } from '../publish/getNewPackages';
 
 /**
  * Performs the bump, writes to the file system
@@ -15,8 +16,6 @@ import { BeachballOptions } from '../types/BeachballOptions';
  * @param bumpDeps
  */
 export function performBump(bumpInfo: BumpInfo, options: BeachballOptions) {
-  bumpInPlace(bumpInfo, options);
-
   const { modifiedPackages, packageInfos, changes } = bumpInfo;
 
   for (const pkgName of modifiedPackages) {

packages/beachball/src/commands/bump.ts

@@ -3,5 +3,5 @@ import { performBump } from '../bump/performBump';
 import { BeachballOptions } from '../types/BeachballOptions';
 
 export function bump(options: BeachballOptions) {
-  return performBump(gatherBumpInfo(options.path), options);
+  return performBump(gatherBumpInfo(options), options);
 }

packages/beachball/src/commands/publish.ts

@@ -6,6 +6,7 @@ import { getPackageChangeTypes } from '../changefile/getPackageChangeTypes';
 import { readChangeFiles } from '../changefile/readChangeFiles';
 import { bumpAndPush } from '../publish/bumpAndPush';
 import { publishToRegistry } from '../publish/publishToRegistry';
+import { getNewPackages } from '../publish/getNewPackages';
 export async function publish(options: BeachballOptions) {
   const { path: cwd, branch, registry, tag } = options;
   // First, validate that we have changes to publish
@@ -43,7 +44,12 @@ export async function publish(options: BeachballOptions) {
   const publishBranch = 'publish_' + String(new Date().getTime());
   gitFailFast(['checkout', '-b', publishBranch], { cwd });
   console.log('Bumping version for npm publish');
-  const bumpInfo = gatherBumpInfo(cwd);
+  const bumpInfo = gatherBumpInfo(options);
+
+  if (options.new) {
+    bumpInfo.newPackages = new Set<string>(getNewPackages(bumpInfo, options.registry));
+  }
+
   // Step 1. Bump + npm publish
   // npm / yarn publish
   if (options.publish) {

packages/beachball/src/publish/getNewPackages.ts

@@ -0,0 +1,22 @@
+import { BumpInfo } from '../types/BumpInfo';
+import { listPackageVersions } from '../packageManager/listPackageVersions';
+export function getNewPackages(bumpInfo: BumpInfo, registry: string) {
+  const { modifiedPackages, packageInfos } = bumpInfo;
+
+  const newPackages = Object.keys(packageInfos).filter(pkg => !modifiedPackages.has(pkg));
+
+  return newPackages.filter(pkg => {
+    const packageInfo = packageInfos[pkg];
+    // Ignore private packages or change type "none" packages
+    if (packageInfo.private) {
+      return false;
+    }
+
+    const publishedVersions = listPackageVersions(packageInfo.name, registry);
+
+    if (publishedVersions.length === 0) {
+      console.log(`New package detected: ${pkg}`);
+      return true;
+    }
+  });
+}

packages/beachball/src/publish/publishToRegistry.ts

@@ -4,15 +4,20 @@ import { BeachballOptions } from '../types/BeachballOptions';
 import { packagePublish } from '../packageManager/packagePublish';
 import { validatePackageVersions } from './validatePackageVersions';
 import { displayManualRecovery } from './displayManualRecovery';
+import { getNewPackages } from './getNewPackages';
 export function publishToRegistry(bumpInfo: BumpInfo, options: BeachballOptions) {
-  const { path: cwd, registry, tag, token, access } = options;
+  const { registry, tag, token, access } = options;
+  const { modifiedPackages, newPackages } = bumpInfo;
+
   performBump(bumpInfo, options);
+
   if (!validatePackageVersions(bumpInfo, registry)) {
     displayManualRecovery(bumpInfo);
     console.error('No packages have been published');
     process.exit(1);
   }
-  bumpInfo.modifiedPackages.forEach(pkg => {
+
+  [...modifiedPackages, ...newPackages].forEach(pkg => {
     const packageInfo = bumpInfo.packageInfos[pkg];
     const changeType = bumpInfo.packageChangeTypes[pkg];
     if (changeType === 'none') {