submodule-version 3.2.7 → 3.3.0

package/src/sv.ts

@@ -5,6 +5,7 @@ import {
   PubGrub,
   IOverride,
   TDependencies,
+  TIsCandidateCompatible,
   TPubGrubResult,
 } from './PubGrub';
 import { EntryStore } from './entryStore';
@@ -126,14 +127,20 @@ export class SV {
 
   private explicitModulesDir?: string;
 
+  private isCandidateCompatible?: TIsCandidateCompatible;
+
   constructor (
     projectDir: string,
     modulesDir?: string,
-    options: { githubToken?: string } = {},
+    options: {
+      githubToken?: string,
+      isCandidateCompatible?: TIsCandidateCompatible,
+    } = {},
   ) {
     RunOptions.cwd = projectDir;
     RunOptions.modulesDir = modulesDir || DEFAULT_MODULES_DIR;
     this.explicitModulesDir = modulesDir;
+    this.isCandidateCompatible = options.isCandidateCompatible;
     git.api.setToken(options.githubToken);
   }
 
@@ -167,7 +174,7 @@ export class SV {
   private resolveDeps = async (
     rootDeps: TDependencies,
   ): Promise<TPubGrubResult> => {
-    const resolver = new PubGrub(this.store);
+    const resolver = new PubGrub(this.store, this.isCandidateCompatible);
 
     try {
       return await resolver.resolve(rootDeps);
@@ -602,7 +609,7 @@ export class SV {
 
     const tags = await git.local.tagsAtHead(dir);
 
-    return versionUtil.latest(tags) || null;
+    return versionUtil.sort(tags)[0] || null;
   };
 
   // eslint-disable-next-line class-methods-use-this
@@ -675,29 +682,37 @@ export class SV {
       await git.local.addRemote(dir, repoUrl);
     }
 
+    const versions = await git.local.listTags(dir);
     const currentTag = await this.currentVersion(module);
-    const latestKnown = await this.latestVersion(module);
+    const latestKnown = versionUtil.latest(versions) || '0.0.0';
+    const fromOldVersion = !!currentTag && currentTag !== latestKnown;
 
-    if (currentTag && latestKnown && currentTag !== latestKnown) {
-      throw new GitError('GIT_NOT_LATEST_VERSION');
-    }
+    const next = fromOldVersion
+      ? versionUtil.nextPatchVersion(currentTag, versions)
+      : versionUtil.bump(latestKnown, bump);
 
-    await git.local.ensureBranch(dir);
+    if (fromOldVersion) {
+      /* Старую стабильную линию не смешиваем с основной веткой: имя ветки
+       * совпадает с автоматически рассчитанной prerelease-версией. */
+      await git.local.createBranch(dir, next);
+    } else {
+      await git.local.ensureBranch(dir);
 
-    if (await git.local.isRemoteAhead(dir)) {
-      await git.local.pullRebaseAutostash(dir);
-    }
+      if (await git.local.isRemoteAhead(dir)) {
+        await git.local.pullRebaseAutostash(dir);
+      }
 
-    const dirty = await git.local.hasChanges(dir);
-    const headTag = await this.currentVersion(module);
+      const dirty = await git.local.hasChanges(dir);
+      const headTag = await this.currentVersion(module);
 
-    if (!dirty && headTag) {
-      await git.local.push(dir, headTag);
+      if (!dirty && headTag) {
+        await git.local.push(dir, headTag);
+        this.store.clear();
 
-      return headTag;
+        return headTag;
+      }
     }
 
-    const next = versionUtil.bump(await this.latestVersion(module), bump);
     const pkg = await pkgJSONManager.read(module);
 
     if (pkg) {
@@ -711,6 +726,9 @@ export class SV {
 
     await git.local.addTag(dir, next);
     await git.local.push(dir, next);
+    /* publish меняет набор доступных тегов вне EntryStore. Следующий put
+     * обязан загрузить новый каталог, а не получить snapshot до публикации. */
+    this.store.clear();
 
     return next;
   };

package/src/versionUtil/__tests__/versionUtil.test.ts

@@ -59,4 +59,20 @@ describe('versionUtil.bump', () => {
   ] as const)('bumps %s', (kind, expected) => {
     expect(versionUtil.bump('1.2.3', kind)).toBe(expected);
   });
+
+  it('increments the patch branch suffix for a non-latest release', () => {
+    expect(versionUtil.nextPatchVersion('1.0.2', [
+      '2.0.0',
+      '1.0.2-patch.1',
+      '1.0.2-patch.3',
+      '1.0.1-patch.9',
+    ])).toBe('1.0.2-patch.4');
+  });
+
+  it('continues the same patch line from a patch tag', () => {
+    expect(versionUtil.nextPatchVersion('1.0.2-patch.4', [
+      '2.0.0',
+      '1.0.2-patch.4',
+    ])).toBe('1.0.2-patch.5');
+  });
 });

package/src/versionUtil/versionUtil.ts

@@ -86,6 +86,29 @@ const bump = (
   return next;
 };
 
+/* Публикация с не последнего тега образует отдельную patch-линейку:
+ * 1.0.2 -> 1.0.2-patch.1, затем автоматически .2, .3 и т.д. */
+const nextPatchVersion = (version: string, versions: string[]): string => {
+  const parsed = semver.parse(version);
+
+  if (!parsed) throw new Error(`Invalid semantic version: ${version}`);
+
+  const base = `${parsed.major}.${parsed.minor}.${parsed.patch}`;
+  const prefix = `${base}-patch.`;
+
+  const numbers = versions.flatMap(candidate => {
+    if (!candidate.startsWith(prefix)) return [];
+
+    const value = candidate.slice(prefix.length);
+
+    return /^\d+$/.test(value) ? [Number(value)] : [];
+  });
+
+  const next = (numbers.length ? Math.max(...numbers) : 0) + 1;
+
+  return `${prefix}${next}`;
+};
+
 export const versionUtil = {
   normalizeConstraint,
   validate,
@@ -100,4 +123,5 @@ export const versionUtil = {
   intersects,
   isSubset,
   bump,
+  nextPatchVersion,
 };