submodule-version 2.3.2 → 3.0.0

package/runner/handleErrors/handleBuildGraphError.ts

@@ -1,49 +0,0 @@
-import { GraphError } from '../../src/buildGraph';
-import { log } from '../log';
-import chalk from 'chalk';
-
-export const handleBuildGraphError = (error: Error) => {
-  if (!(error instanceof GraphError)) return;
-
-  const { message: errorMessage, details } = error;
-
-  if (errorMessage === 'NOT_A_NPM') {
-    log.error('Not a npm project');
-  }
-
-  if (errorMessage === 'UNKNOWN_VERSION') {
-    const { name, version, parent } = details;
-    const stV = chalk.bgRed.bold.white(` ${version} `);
-    const stName = chalk.red.bold(name);
-    const stParent = chalk.green.bold(parent);
-
-    log.error('Unknown version', stV, 'for', stName, 'in', stParent);
-  }
-
-  if (errorMessage === 'VERSION_CONFLICT') {
-    const { parents, name } = details;
-
-    const longestVersion = Object.values(parents ?? {}).reduce((len, v) => (
-      v.length > len ? v.length : len
-    ), 0);
-
-    const formattedName = chalk.green.bold(name);
-    const baseMsg = `${chalk.red('Confilict')} for ${formattedName}:`;
-
-    const conflictMsg = Object.entries(parents ?? {})
-      .reduce((msg, [pName, v]) => {
-        const formatedV = chalk.bold.red(
-          String(v).padEnd(longestVersion, ' '),
-        );
-
-        return [
-          ...msg,
-          `  - Version ${formatedV} used in ${chalk.green.bold(pName)}`,
-        ];
-      }, [baseMsg]);
-
-    log.error(conflictMsg.join('\n'));
-  }
-
-  log.error(errorMessage);
-};

package/runner/handleErrors/handleGitError.ts

@@ -1,28 +0,0 @@
-import { GitError } from '../../src/git';
-import { log } from '../log';
-
-export const handleGitError = (error: Error) => {
-  if (!(error instanceof GitError)) return;
-
-  const { message: errorMessage } = error;
-
-  if (errorMessage === 'GIT_NOT_A_REPO') {
-    log.error('Is not a git repo');
-  }
-
-  if (errorMessage === 'GIT_MODULE_CHECKOUT_FAILED') {
-    log.error('Checkout failded');
-  }
-
-  if (errorMessage === 'GIT_REPO_URL_REQUIRED') {
-    log.error('Module is not published yet - pass --repo-url for the first publish');
-  }
-
-  if (errorMessage === 'GIT_NOT_LATEST_VERSION') {
-    log.error('Publish is only possible from the latest version');
-  }
-
-  if (errorMessage === 'GIT_SYNC_CONFLICT') {
-    log.error('Sync with remote failed - resolve conflicts manually');
-  }
-};

package/runner/handleErrors/handleInstallError.ts

@@ -1,26 +0,0 @@
-import chalk from 'chalk';
-import { versionUtil } from "../../src/versionUtil";
-import { log } from '../log';
-import { git } from '../../src/git';
-
-export const handleInstallError = async (error: Error, gitUrl: string) => {
-  const { message } = error;
-  const { url, version, name } = git.parseUrl(gitUrl);
-
-  if (message === 'NOT_A_GIT_URL') {
-    return log.error(chalk.red.bold(url), '- is not a git url!');
-  }
-
-  if (message === 'REQUESTED_VERSION_NOT_EXISTS') {
-    const versions = await git.listVersions(name);
-    const latestVersion = versionUtil.latest(versions);
-    const requestedVersion = version || latestVersion;
-    const styledName = `Package ${chalk.bold.green(name)}`;
-    const styledVer = chalk.bgRed.bold.white(` ${requestedVersion} `);
-    const errMsg = `does not contain version ${styledVer}.`;
-    const styledVList = chalk.bold.green(versions.join(', '));
-    const helpMsg = `Use one from [${styledVList}]`;
-
-    return log.error(styledName, errMsg, helpMsg);
-  }
-};

package/src/__tests__/versionUtil.test.ts

@@ -1,96 +0,0 @@
-import { versionUtil } from '../versionUtil';
-
-describe('Latest', () => {
-  it('Single version', () => {
-    const v = versionUtil.latest(['1.0.0']);
-
-    expect(v).toBe('1.0.0');
-  });
-
-  it('Path versions', () => {
-    const v = versionUtil.latest(['^1.0.0', '^1.0.1']);
-
-    expect(v).toBe('1.0.1');
-  });
-
-  it('Minor versions', () => {
-    const v = versionUtil.latest(['^1.1.0', '^1.0.23']);
-
-    expect(v).toBe('1.1.0');
-  });
-
-  it('Major versions', () => {
-    const v = versionUtil.latest(['^2.0.0', '^1.10.23']);
-
-    expect(v).toBe('2.0.0');
-  });
-});
-
-describe('Validate', () => {
-  it('Pass', () => {
-    expect(versionUtil.validate('')).toBe(false);
-    expect(versionUtil.validate('123')).toBe(false);
-    expect(versionUtil.validate('1.2.3')).toBe(true);
-    expect(versionUtil.validate('1.2.3', true)).toBe(true);
-    expect(versionUtil.validate('^1.2.3', true)).toBe(true);
-    expect(versionUtil.validate('^1.2.3')).toBe(false);
-    expect(versionUtil.validate('*')).toBe(false);
-    expect(versionUtil.validate('*', true)).toBe(true);
-  });
-});
-
-describe('Compare', () => {
-  it('Major mode', () => {
-    expect(versionUtil.compare([1, 2, 3], [1, 3, 4], 0)).toBe(true);
-    expect(versionUtil.compare([1, 3, 3], [1, 2, 4], 0)).toBe(false);
-    expect(versionUtil.compare([1, 2, 3], [1, 2, 4], 1)).toBe(true);
-    expect(versionUtil.compare([1, 2, 4], [1, 2, 3], 1)).toBe(false);
-    // Higher minor allows lower patch: 0.3.0 fits ^0.2.6
-    expect(versionUtil.compare([0, 2, 6], [0, 3, 0], 0)).toBe(true);
-    expect(versionUtil.compare([0, 2, 6], [0, 2, 5], 0)).toBe(false);
-    expect(versionUtil.compare([0, 2, 6], [0, 2, 6], 0)).toBe(true);
-    expect(versionUtil.compare([0, 2, 6], [1, 3, 0], 0)).toBe(false);
-  });
-
-  it('Minor mode', () => {
-    expect(versionUtil.compare([1, 2, 3], [1, 2, 4], 1)).toBe(true);
-    expect(versionUtil.compare([1, 2, 4], [1, 2, 3], 1)).toBe(false);
-  });
-
-  it('Path mode', () => {
-    expect(versionUtil.compare([1, 2, 3], [1, 2, 3], 2)).toBe(true);
-    expect(versionUtil.compare([1, 2, 4], [1, 2, 3], 2)).toBe(false);
-    expect(versionUtil.compare([1, 2, 3], [1, 2, 4], 2)).toBe(false);
-  });
-});
-
-describe('Pick', () => {
-  it('Caret range includes higher minors', () => {
-    const versions = ['0.2.5', '0.2.6', '0.2.8', '0.3.0', '1.0.0'];
-
-    expect(versionUtil.pick(versions, '^0.2.6')).toEqual(['0.2.6', '0.2.8', '0.3.0']);
-  });
-
-  it('Tilde range keeps minor pinned', () => {
-    const versions = ['1.2.3', '1.2.10', '1.3.0'];
-
-    expect(versionUtil.pick(versions, '~1.2.3')).toEqual(['1.2.3', '1.2.10']);
-  });
-});
-
-describe('Bump', () => {
-  it('Release', () => {
-    expect(versionUtil.bump('0.0.0', 'release')).toBe('0.0.1');
-    expect(versionUtil.bump('1.2.3', 'release')).toBe('1.2.4');
-  });
-
-  it('Minor', () => {
-    expect(versionUtil.bump('0.0.0', 'minor')).toBe('0.1.0');
-    expect(versionUtil.bump('1.2.3', 'minor')).toBe('1.3.0');
-  });
-
-  it('Major', () => {
-    expect(versionUtil.bump('0.0.0', 'major')).toBe('1.0.0');
-    expect(versionUtil.bump('1.2.3', 'major')).toBe('2.0.0');
-  });
-});

package/src/buildGraph/GraphError.ts

@@ -1,12 +0,0 @@
-type TDetails = {
-  name: string;
-  parents?: Record<string, string>;
-  version?: string;
-  parent?: string;
-}
-
-export class GraphError extends Error {
-  constructor (type: string, public details: TDetails) {
-    super(type);
-  }
-}

package/src/buildGraph/buildGraph.ts

@@ -1,150 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { pkgJSONManager } from '../pkgJSONManager';
-import { versionUtil } from '../versionUtil';
-import { git } from '../git';
-import { RunOptions } from '../runOptions';
-import { GraphError } from './GraphError';
-
-type TSV = Record<string, string>;
-
-interface ITreeEntry {
-  meta: {
-    version: string;
-    sv: TSV;
-  };
-  parents: Record<string, string>;
-}
-
-type TBaseTree = Record<string, ITreeEntry>;
-
-export interface IGraphEntry {
-  versions: string[];
-  parents: Record<string, string>;
-  used: string[];
-  allowedVersions: string[];
-  version: string;
-}
-
-export const buildGraph = async (): Promise<Record<string, IGraphEntry>> => {
-  const baseJson = await pkgJSONManager.read();
-  const baseTree: TBaseTree = {};
-
-  if (!baseJson) {
-    throw new Error('NOT_A_NPM');
-  }
-
-  if (!baseJson.sv) {
-    /** There is no dependencies, graph is empty */
-    return {};
-  }
-
-  const recursiveBuilder = async (dependencies: TSV = {}, parent = '*') => {
-    await Promise.all(
-      Object.entries(dependencies).map(async ([url, version]) => {
-        const { name } = git.parseUrl(url);
-        const { cwd, modulesDir } = RunOptions;
-        const moduleDir = path.join(cwd, modulesDir, name);
-        const isInstalled = fs.existsSync(moduleDir);
-
-        if (version && !versionUtil.validate(version, true)) {
-          throw new GraphError('UNKNOWN_VERSION', { name, version, parent });
-        }
-
-        if (!isInstalled) {
-          await git.addSumbmodule(url);
-        }
-
-        const existEntry = baseTree[name] || null;
-
-        const mJson = existEntry
-          ? null
-          : await pkgJSONManager.read(name);
-
-        const meta = {
-          version: existEntry?.meta.version
-                    || mJson?.version
-                    || version
-                    || '*',
-          sv: existEntry?.meta.sv || mJson?.sv || {},
-        };
-
-        const parents = existEntry?.parents || {};
-
-        baseTree[name] = {
-          meta,
-          parents: { ...parents, [parent]: version },
-        };
-
-        await recursiveBuilder(meta.sv, name);
-      }),
-    );
-  };
-
-  await recursiveBuilder(baseJson.sv, baseJson.name);
-
-  const graph = await Promise.all(
-    Object.entries(baseTree).map(async ([name, data]) => {
-      const versions = await git.listVersions(name);
-      const { parents, meta } = data;
-
-      const used = Object.entries(parents).reduce((selective, [, v]) => (
-        versionUtil.pick(selective, v)
-      ), versions);
-
-      const allowedVersions = Object.entries(parents)
-        .filter(([parent]) => parent !== baseJson.name)
-        .reduce((selective, [, v]) => (
-          versionUtil.pick(selective, v)
-        ), versions);
-
-      // No compatible version found and module has version tags
-      if (!used.length && versions.length) {
-        throw new GraphError('VERSION_CONFLICT', { parents, name });
-      }
-
-      /**
-       * Текущая версия — тег, на котором реально стоит HEAD. Сравнивать с
-       * package.json нельзя: его version не обязан совпадать с тегами,
-       * и такое сравнение отрывает HEAD (checkout на тег) при каждом buildGraph
-       * Checkout делаем только на чистой копии без локальной работы:
-       * незакоммиченные изменения или незапушенные коммиты
-       * важнее резолва версий.
-       */
-      const current = await git.currentVersion(name);
-
-      if (!current || !used.includes(current)) {
-        const latest = versionUtil.latest(used);
-
-        const moduleDir = path.join(
-          RunOptions.cwd,
-          RunOptions.modulesDir,
-          name,
-        );
-
-        const [hasChanges, hasUnpushed] = await Promise.all([
-          git.hasChanges(moduleDir),
-          git.hasUnpushedCommits(moduleDir),
-        ]);
-
-        const allChangesDone = !hasChanges && !hasUnpushed;
-
-        if (latest && latest !== current && allChangesDone) {
-          await git.checkout(name, latest);
-        }
-      }
-
-      const version = current || meta.version;
-
-      return {
-        name,
-        data: { versions, parents, used, allowedVersions, version },
-      };
-    }),
-  );
-
-  return graph.reduce((acc, { name, data }) => ({
-    ...acc,
-    [name]: data,
-  }), {} as Record<string, IGraphEntry>);
-};

package/src/buildGraph/index.ts

@@ -1,2 +0,0 @@
-export { buildGraph } from './buildGraph';
-export { GraphError } from './GraphError';

package/src/versionUtil.ts

@@ -1,97 +0,0 @@
-enum ComapreMode {
-  major = 0,
-  minor = 1,
-  path = 2,
-}
-
-const cleanup = (v: string) => v.replace(/^\^?~?/, '');
-
-const toArray = (v: string): number[] => (
-  cleanup(v).split('.').map(Number)
-);
-
-const mode = (v: string) => {
-  // Minor and path can be vary. Only major should be same
-  if (v.startsWith('^')) return ComapreMode.major;
-  // Path can be vary. Major and minor should be same
-  if (v.startsWith('~')) return ComapreMode.minor;
-
-  // Everything should be same
-  return ComapreMode.path;
-};
-
-const compare = (
-  baseVer: number[],
-  actualVer: number[],
-  compareMode: ComapreMode,
-) => {
-  // Components pinned by the mode must match exactly
-  for (let i = 0; i <= compareMode; i++) {
-    if (baseVer[i] !== actualVer[i]) return false;
-  }
-
-  // The rest must be same or higher, compared from most significant:
-  // a higher minor allows any patch (0.3.0 fits ^0.2.6)
-  for (let i = compareMode + 1; i < 3; i++) {
-    if (actualVer[i] !== baseVer[i]) return actualVer[i] > baseVer[i];
-  }
-
-  return true;
-};
-
-const pick = (allVersions: string[], v: string) => {
-  if (v === '*') return allVersions;
-
-  const vMode = mode(v);
-  const vArr = toArray(v);
-
-  return allVersions.filter(av => {
-    const avArr = toArray(av);
-
-    return compare(vArr, avArr, vMode);
-  });
-};
-
-const validate = (v: string, relative?: boolean) => {
-  if (relative) {
-    if (v === '*') return true;
-
-    return /^[\^$]?\d+\.\d+\.\d+$/.test(v);
-  }
-
-  return /^\d+\.\d+\.\d+$/.test(v);
-};
-
-const latest = (versions: string[]) => (
-  cleanup([...versions].sort((v1, v2) => {
-    const v1Arr = toArray(v1);
-    const v2Arr = toArray(v2);
-
-    return v1Arr.reduce((acc, v1Val, i) => {
-      if (acc !== 0) return acc;
-      const v2Val = v2Arr[i];
-
-      return v2Val - v1Val;
-    }, 0);
-  })[0] || '')
-);
-
-const bump = (
-  version: string,
-  kind: 'release' | 'minor' | 'major',
-): string => {
-  const [major, minor, patch] = toArray(version);
-
-  if (kind === 'major') return `${major + 1}.0.0`;
-  if (kind === 'minor') return `${major}.${minor + 1}.0`;
-
-  return `${major}.${minor}.${patch + 1}`;
-};
-
-export const versionUtil = {
-  compare,
-  pick,
-  validate,
-  latest,
-  bump,
-};