submodule-version 3.2.7 → 3.3.0

package/dist/src/versionUtil/versionUtil.js

@@ -52,6 +52,23 @@ const bump = (version, kind) => {
         throw new Error(`Invalid semantic version: ${version}`);
     return next;
 };
+/* Публикация с не последнего тега образует отдельную patch-линейку:
+ * 1.0.2 -> 1.0.2-patch.1, затем автоматически .2, .3 и т.д. */
+const nextPatchVersion = (version, versions) => {
+    const parsed = semver_1.default.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}`;
+};
 exports.versionUtil = {
     normalizeConstraint,
     validate,
@@ -66,5 +83,6 @@ exports.versionUtil = {
     intersects,
     isSubset,
     bump,
+    nextPatchVersion,
 };
 //# sourceMappingURL=versionUtil.js.map

package/dist/src/versionUtil/versionUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"versionUtil.js","sourceRoot":"","sources":["../../../src/versionUtil/versionUtil.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"versionUtil.js","sourceRoot":"","sources":["../../../src/versionUtil/versionUtil.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "submodule-version",
   "description": "Git <S>ubmodule <V>ersioning tool",
-  "version": "3.2.7",
+  "version": "3.3.0",
   "repository": "github:guljeny/submodule-version",
   "main": "dist/src/index.js",
   "bin": {

package/src/PubGrub/PubGrub.ts

@@ -7,6 +7,7 @@ import {
   IIncompatibility,
   IPackageEntry,
   IRequirement,
+  TIsCandidateCompatible,
   ITerm,
   IVersionConflict,
   TConflict,
@@ -83,7 +84,12 @@ export class PubGrub {
 
   private incompatibilityKeys = new Set<string>();
 
-  constructor (private source: IEntrySource = entryStore) {}
+  private compatibleVersions = new Map<string, string[]>();
+
+  constructor (
+    private source: IEntrySource = entryStore,
+    private isCandidateCompatible?: TIsCandidateCompatible,
+  ) {}
 
   public resolve = async (
     rootDependencies: TDependencies,
@@ -93,6 +99,7 @@ export class PubGrub {
     this.partialState = null;
     this.incompatibilities = [];
     this.incompatibilityKeys = new Set();
+    this.compatibleVersions = new Map();
 
     const state: ISolverState = {
       selected: new Map([[ROOT, ROOT_VERSION]]),
@@ -170,8 +177,10 @@ export class PubGrub {
           .filter(requirement => requirement.positive)
           .map(requirement => requirement.range);
 
-        version = versionUtil.latest(Object.keys(entry.versions), ranges)
-          || versionUtil.latest(Object.keys(entry.versions));
+        const versions = this.versionsOf(entry);
+
+        version = versionUtil.latest(versions, ranges)
+          || versionUtil.latest(versions);
       }
 
       if (!version) return [];
@@ -225,7 +234,7 @@ export class PubGrub {
       const conflict = this.versionConflict(
         choice.name,
         choice.requirements,
-        Object.keys(choice.entry.versions),
+        this.versionsOf(choice.entry),
       );
 
       this.learn(state, conflict);
@@ -267,7 +276,7 @@ export class PubGrub {
       conflict: lastConflict || this.versionConflict(
         choice.name,
         choice.requirements,
-        Object.keys(choice.entry.versions),
+        this.versionsOf(choice.entry),
       ),
     };
   };
@@ -355,7 +364,8 @@ export class PubGrub {
   };
 
   private candidates = (name: string, state: ISolverState): string[] => {
-    const versions = Object.keys(this.entries.get(name)?.versions || {});
+    const entry = this.entries.get(name);
+    const versions = entry ? this.versionsOf(entry) : [];
     const requirements = state.requirements.get(name) || [];
 
     return versionUtil.sort(versions).filter(version => (
@@ -367,6 +377,25 @@ export class PubGrub {
     ));
   };
 
+  private versionsOf = (entry: IPackageEntry): string[] => {
+    const cached = this.compatibleVersions.get(entry.name);
+
+    if (cached) return cached;
+
+    const versions = Object.keys(entry.versions).filter(version => (
+      !this.isCandidateCompatible || this.isCandidateCompatible({
+        name: entry.name,
+        url: entry.url,
+        version,
+        packageJson: entry.manifests?.[version] ?? null,
+      })
+    ));
+
+    this.compatibleVersions.set(entry.name, versions);
+
+    return versions;
+  };
+
   private addDependencies = async (
     state: ISolverState,
     entry: IPackageEntry,
@@ -479,7 +508,7 @@ export class PubGrub {
     return this.versionConflict(
       name,
       state.requirements.get(name) || [],
-      Object.keys(this.entries.get(name)?.versions || {}),
+      this.entries.has(name) ? this.versionsOf(this.entries.get(name)!) : [],
     );
   };
 
@@ -556,7 +585,7 @@ export class PubGrub {
       return this.versionConflict(
         name,
         requirements,
-        Object.keys(this.entries.get(name)?.versions || {}),
+        this.entries.has(name) ? this.versionsOf(this.entries.get(name)!) : [],
       );
     }
 

package/src/PubGrub/__tests__/PubGrub.test.ts

@@ -123,6 +123,17 @@ const SelfCycle = defineModule('SelfCycle', {
   '1.0.0': { SelfCycle: '*' },
 });
 
+const CandidateA = {
+  ...defineModule('CandidateA', {
+    '1.0.0': {},
+    '2.0.0': {},
+  }),
+  manifests: {
+    '1.0.0': { compatible: true },
+    '2.0.0': { compatible: false },
+  },
+};
+
 const ALL_MODULES = [
   A,
   B,
@@ -152,6 +163,7 @@ const ALL_MODULES = [
   CycleB,
   CycleC,
   SelfCycle,
+  CandidateA,
 ];
 
 const source = (modules: IPackageEntry[]) => {
@@ -277,6 +289,36 @@ describe('PubGrub resolution', () => {
 
     expect(selected(result)).toEqual({ FallbackA: '1.0.0' });
   });
+
+  it('selects the highest candidate accepted by the host', async () => {
+    const fixture = source(ALL_MODULES);
+
+    const resolver = new PubGrub(
+      fixture.store,
+      candidate => (candidate.packageJson as any)?.compatible !== false,
+    );
+
+    const result = await resolver.resolve({ [CandidateA.url]: '*' });
+
+    expect(selected(result)).toEqual({ CandidateA: '1.0.0' });
+    expect(result.CandidateA.versions).toEqual({
+      '1.0.0': {},
+      '2.0.0': {},
+    });
+  });
+
+  it('reports a conflict when the host rejects every candidate', async () => {
+    const fixture = source(ALL_MODULES);
+    const resolver = new PubGrub(fixture.store, () => false);
+
+    await expect(resolver.resolve({ [CandidateA.url]: '*' }))
+      .rejects.toMatchObject({
+        error: 'VERSION_CONFLICT',
+        details: { name: 'CandidateA', versions: [] },
+      });
+
+    expect(resolver.getResolution()).toEqual({});
+  });
 });
 
 describe('PubGrub errors', () => {

package/src/PubGrub/index.ts

@@ -1,5 +1,6 @@
 export { PubGrub, pubGrub } from './PubGrub';
 export type {
+  ICandidate,
   IEntrySource,
   IIncompatibility,
   IOverride,
@@ -8,5 +9,6 @@ export type {
   IResolvedPackage,
   ITerm,
   TDependencies,
+  TIsCandidateCompatible,
   TPubGrubResult,
 } from './types';

package/src/PubGrub/types.ts

@@ -1,9 +1,19 @@
 export type TDependencies = Record<string, string>;
 
+export interface ICandidate {
+  name: string;
+  url: string;
+  version: string;
+  packageJson: unknown | null;
+}
+
+export type TIsCandidateCompatible = (candidate: ICandidate) => boolean;
+
 export interface IPackageEntry {
   name: string;
   url: string;
   versions: Record<string, TDependencies>;
+  manifests?: Record<string, unknown | null>;
 }
 
 export interface IResolvedPackage extends IPackageEntry {

package/src/__tests__/entryStore.test.ts

@@ -59,6 +59,10 @@ describe('entryStore.fetch', () => {
         '1.0.0': { B: '^1.0.0' },
         '2.0.0': { C: '^2.0.0' },
       },
+      manifests: {
+        '1.0.0': { sv: { [url('B')]: '^1.0.0' } },
+        '2.0.0': { sv: { [url('C')]: '^2.0.0' } },
+      },
     });
 
     expect(fetchVersionsMock).toHaveBeenCalledTimes(1);
@@ -163,6 +167,7 @@ describe('entryStore.simulate', () => {
       name: 'B',
       url: url('B'),
       versions: { '2.0.0': {} },
+      manifests: { '2.0.0': {} },
     });
   });
 
@@ -277,12 +282,22 @@ describe('entryStore local overlay', () => {
     ]);
     isGitRepoMock.mockResolvedValueOnce(true);
     tagsAtHeadMock.mockResolvedValueOnce(['1.0.0']);
-    readPkgMock.mockResolvedValueOnce({ sv: { [url('B')]: '^0.2.0' } });
+    readPkgMock.mockResolvedValueOnce({
+      ewaApi: '2-*',
+      sv: { [url('B')]: '^0.2.0' },
+    });
 
     const entry = await entryStore.fetch(url('A'));
 
     expect(entry.versions['1.0.0']).toEqual({ B: '^0.2.0' });
     expect(entry.versions['2.0.0']).toEqual({ C: '^2.0.0' });
+    expect(entry.manifests?.['1.0.0']).toEqual({
+      ewaApi: '2-*',
+      sv: { [url('B')]: '^0.2.0' },
+    });
+    expect(entry.manifests?.['2.0.0']).toEqual({
+      sv: { [url('C')]: '^2.0.0' },
+    });
     expect(entryStore.urlOf('B')).toBe(url('B'));
   });
 

package/src/__tests__/publish.integration.test.ts

@@ -0,0 +1,86 @@
+import { execFileSync } from 'child_process';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { SV } from '../sv';
+
+const git = (cwd: string, args: string[]): string => execFileSync(
+  'git',
+  args,
+  { cwd, encoding: 'utf8' },
+).trim();
+
+const writePackage = (dir: string, version: string): void => {
+  fs.writeFileSync(
+    path.join(dir, 'package.json'),
+    `${JSON.stringify({ name: 'fixture', version }, null, 2)}\n`,
+  );
+};
+
+describe('SV.publish git integration', () => {
+  it(
+    'pushes an automatic patch.4 branch and tag from an old version',
+    async () => {
+    const fixture = fs.mkdtempSync(path.join(os.tmpdir(), 'sv-publish-'));
+    const remote = path.join(fixture, 'remote.git');
+    const project = path.join(fixture, 'project');
+
+    try {
+      fs.mkdirSync(project);
+      git(fixture, ['init', '--bare', remote]);
+      git(project, ['init', '-b', 'main']);
+      git(project, ['config', 'user.name', 'SV Test']);
+      git(project, ['config', 'user.email', 'sv@example.test']);
+      git(project, ['remote', 'add', 'origin', remote]);
+
+      writePackage(project, '1.0.2');
+      git(project, ['add', 'package.json']);
+      git(project, ['commit', '-m', 'version 1.0.2']);
+      git(project, ['tag', '1.0.2']);
+      git(project, ['tag', '1.0.2-patch.1']);
+      git(project, ['tag', '1.0.2-patch.2']);
+      git(project, ['tag', '1.0.2-patch.3']);
+
+      writePackage(project, '2.0.0');
+      git(project, ['add', 'package.json']);
+      git(project, ['commit', '-m', 'version 2.0.0']);
+      git(project, ['tag', '2.0.0']);
+      git(project, ['push', '-u', 'origin', 'main']);
+      git(project, ['push', 'origin', '--tags']);
+
+      git(project, ['checkout', '--detach', '1.0.2']);
+      fs.writeFileSync(path.join(project, 'fix.txt'), 'backport\n');
+
+      const version = await new SV(project).publish({
+        /* bump игнорируется, потому что HEAD находится на старом теге. */
+        bump: 'major',
+        message: 'backport fix',
+      });
+
+      expect(version).toBe('1.0.2-patch.4');
+      expect(git(project, ['branch', '--show-current']))
+        .toBe('1.0.2-patch.4');
+      expect(git(project, ['tag', '--points-at', 'HEAD']))
+        .toContain('1.0.2-patch.4');
+      expect(JSON.parse(
+        fs.readFileSync(path.join(project, 'package.json'), 'utf8'),
+      ).version).toBe('1.0.2-patch.4');
+      expect(git(project, [
+        'ls-remote',
+        '--heads',
+        'origin',
+        '1.0.2-patch.4',
+      ])).toContain('refs/heads/1.0.2-patch.4');
+      expect(git(project, [
+        'ls-remote',
+        '--tags',
+        'origin',
+        '1.0.2-patch.4',
+      ])).toContain('refs/tags/1.0.2-patch.4');
+    } finally {
+      fs.rmSync(fixture, { recursive: true, force: true });
+    }
+    },
+    20000,
+  );
+});

package/src/__tests__/sv.test.ts

@@ -29,6 +29,19 @@ jest.mock('../git', () => {
         currentVersion: jest.fn(async () => null),
         listVersions: jest.fn(async () => []),
         getRemote: jest.fn(async () => null),
+        tagsAtHead: jest.fn(async () => []),
+        listTags: jest.fn(async () => []),
+        hasChanges: jest.fn(async () => false),
+        hasUnpushedCommits: jest.fn(async () => false),
+        ensureBranch: jest.fn(async () => undefined),
+        createBranch: jest.fn(async () => undefined),
+        isRemoteAhead: jest.fn(async () => false),
+        pullRebaseAutostash: jest.fn(async () => undefined),
+        commitAll: jest.fn(async () => undefined),
+        addTag: jest.fn(async () => undefined),
+        push: jest.fn(async () => undefined),
+        init: jest.fn(async () => undefined),
+        addRemote: jest.fn(async () => undefined),
       },
       api: {
         setToken: jest.fn(),
@@ -85,6 +98,11 @@ beforeEach(() => {
   localMock.isGitRepo.mockResolvedValue(true);
   localMock.currentVersion.mockResolvedValue(null);
   localMock.listVersions.mockResolvedValue([]);
+  localMock.tagsAtHead.mockResolvedValue([]);
+  localMock.listTags.mockResolvedValue([]);
+  localMock.hasChanges.mockResolvedValue(false);
+  localMock.hasUnpushedCommits.mockResolvedValue(false);
+  localMock.isRemoteAhead.mockResolvedValue(false);
 });
 
 afterEach(() => {
@@ -141,6 +159,21 @@ describe('SV.init', () => {
     expect(sv.listVersions()).toEqual({ A: ['1.2.0'] });
   });
 
+  it('passes the candidate compatibility callback to PubGrub', async () => {
+    const isCandidateCompatible = jest.fn(() => true);
+
+    readMock.mockResolvedValue({ sv: {} });
+
+    const sv = new SV('/project', undefined, { isCandidateCompatible });
+
+    await sv.init();
+
+    expect(PubGrubMock).toHaveBeenCalledWith(
+      expect.anything(),
+      isCandidateCompatible,
+    );
+  });
+
   it('guards result before init', () => {
     expect(() => new SV('/project').getResolution()).toThrow(
       expect.objectContaining({ error: 'NOT_INITIALIZED' }),
@@ -776,3 +809,88 @@ describe('SV.listVersions', () => {
     );
   });
 });
+
+describe('SV.publish', () => {
+  it(
+    'publishes an old version on the next automatic patch branch',
+    async () => {
+    const versions = [
+      '2.0.0',
+      '1.0.2',
+      '1.0.2-patch.1',
+      '1.0.2-patch.3',
+    ];
+
+    localMock.getRemote.mockResolvedValue(url('A'));
+    localMock.tagsAtHead.mockResolvedValue(['1.0.2']);
+    localMock.listTags.mockResolvedValue(versions);
+    localMock.hasChanges.mockResolvedValue(true);
+    readMock.mockResolvedValue({ version: '1.0.2', sv: {} });
+    const sv = new SV('/project');
+    const clear = jest.spyOn((sv as any).store, 'clear');
+
+    await expect(sv.publish({
+      module: 'A',
+      /* Старый релиз игнорирует выбранный bump. */
+      bump: 'major',
+      message: 'backport fix',
+    })).resolves.toBe('1.0.2-patch.4');
+
+    expect(localMock.createBranch).toHaveBeenCalledWith(
+      'modules/A',
+      '1.0.2-patch.4',
+    );
+    expect(localMock.ensureBranch).not.toHaveBeenCalled();
+    expect(writeMock).toHaveBeenCalledWith({
+      version: '1.0.2-patch.4',
+      sv: {},
+    }, 'A');
+    expect(localMock.commitAll).toHaveBeenCalledWith(
+      'modules/A',
+      'backport fix',
+    );
+    expect(localMock.addTag).toHaveBeenCalledWith(
+      'modules/A',
+      '1.0.2-patch.4',
+    );
+    expect(localMock.push).toHaveBeenCalledWith(
+      'modules/A',
+      '1.0.2-patch.4',
+    );
+    expect(clear).toHaveBeenCalledTimes(1);
+    },
+  );
+
+  it(
+    'continues a patch line and commits the generated version',
+    async () => {
+    localMock.getRemote.mockResolvedValue(url('A'));
+    localMock.tagsAtHead.mockResolvedValue(['1.0.2-patch.4']);
+    localMock.listTags.mockResolvedValue([
+      '2.0.0',
+      '1.0.2',
+      '1.0.2-patch.4',
+    ]);
+    localMock.hasChanges.mockResolvedValue(true);
+    readMock.mockResolvedValue({ version: '1.0.2-patch.4' });
+    const sv = new SV('/project');
+
+    await expect(sv.publish({
+      module: 'A',
+      bump: 'release',
+    })).resolves.toBe('1.0.2-patch.5');
+
+    expect(localMock.createBranch).toHaveBeenCalledWith(
+      'modules/A',
+      '1.0.2-patch.5',
+    );
+    expect(writeMock).toHaveBeenCalledWith({
+      version: '1.0.2-patch.5',
+    }, 'A');
+    expect(localMock.commitAll).toHaveBeenCalledWith(
+      'modules/A',
+      'Update',
+    );
+    },
+  );
+});

package/src/entryStore.ts

@@ -94,6 +94,7 @@ export class EntryStore implements IEntrySource {
   private localOverlay = async (
     name: string,
     versions: Record<string, TDependencies>,
+    manifests: Record<string, unknown | null>,
   ): Promise<void> => {
     if (!RunOptions.cwd || !RunOptions.modulesDir) return;
 
@@ -110,19 +111,22 @@ export class EntryStore implements IEntrySource {
     if (!pkg) return;
 
     versions[version] = this.normalizeDependencies(pkg.sv || {});
+    manifests[version] = pkg;
   };
 
   private load = async (url: string, name: string): Promise<IPackageEntry> => {
     const fetched = await git.api.fetchVersions(url);
     const versions: Record<string, TDependencies> = {};
+    const manifests: Record<string, unknown | null> = {};
 
     fetched.forEach(({ version, pkg }) => {
       versions[version] = this.normalizeDependencies(pkg?.sv || {});
+      manifests[version] = pkg;
     });
 
-    await this.localOverlay(name, versions);
+    await this.localOverlay(name, versions, manifests);
 
-    return { name, url, versions };
+    return { name, url, versions, manifests };
   };
 
   private resolveIdentity = (

package/src/git/local/local.ts

@@ -261,6 +261,13 @@ export const local = {
     }
   },
 
+  createBranch: async (dir: string, branch: string): Promise<void> => {
+    await execAsync(
+      `git -C "${dir}" checkout -b ${JSON.stringify(branch)}`,
+      { cwd: RunOptions.cwd },
+    );
+  },
+
   commitAll: async (dir: string, message: string): Promise<void> => {
     await execAsync(
       `git -C "${dir}" add -A`,
@@ -288,7 +295,7 @@ export const local = {
 
     if (tag) {
       await execAsync(
-        `git -C "${dir}" push origin ${tag}`,
+        `git -C "${dir}" push origin refs/tags/${tag}`,
         { cwd: RunOptions.cwd },
       );
     }
@@ -368,7 +375,7 @@ export const local = {
     const module = path.join(RunOptions.modulesDir, name);
     const tags = await local.tagsAtHead(module);
 
-    return versionUtil.latest(tags) || null;
+    return versionUtil.sort(tags)[0] || null;
   },
 
   listTags: async (dir: string): Promise<string[]> => {

package/src/index.ts

@@ -2,6 +2,7 @@ export { SV } from './sv';
 export { versionUtil } from './versionUtil';
 export { PubGrub, pubGrub } from './PubGrub';
 export type {
+  ICandidate,
   IEntrySource,
   IIncompatibility,
   IOverride,
@@ -10,6 +11,7 @@ export type {
   IResolvedPackage,
   ITerm,
   TDependencies,
+  TIsCandidateCompatible,
   TPubGrubResult,
 } from './PubGrub';
 export { EntryStore, entryStore } from './entryStore';