Skip to content

Commit

Permalink
refactor(core): rename some symbols
Browse files Browse the repository at this point in the history
  • Loading branch information
JamieMason committed Jun 4, 2023
1 parent 87be648 commit 2801b67
Show file tree
Hide file tree
Showing 72 changed files with 578 additions and 561 deletions.
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
'src/**/*.ts',
'!src/bin.ts',
'!src/bin*/index.ts',
'!src/lib/disk.ts',
'!src/lib/effects.ts',
'!src/lib/log.ts',
'!src/option.ts',
],
Expand Down
14 changes: 11 additions & 3 deletions src/bin-fix-mismatches/fix-mismatches-cli.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
import { pipe } from 'tightrope/fn/pipe';
import type { CliConfig } from '../config/types';
import { getContext } from '../get-context';
import type { Disk } from '../lib/disk';
import type { Effects } from '../lib/effects';
import { exitIfInvalid } from '../lib/exit-if-invalid';
import { writeIfChanged } from '../lib/write-if-changed';
import { fixMismatches } from './fix-mismatches';

export function fixMismatchesCli(input: Partial<CliConfig>, disk: Disk): void {
pipe(getContext(input, disk), fixMismatches, writeIfChanged, exitIfInvalid);
export function fixMismatchesCli(
input: Partial<CliConfig>,
effects: Effects,
): void {
pipe(
getContext(input, effects),
fixMismatches,
writeIfChanged,
exitIfInvalid,
);
}
10 changes: 5 additions & 5 deletions src/bin-fix-mismatches/fix-mismatches.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ export function fixMismatches(ctx: Context): Context {
let shouldPruneEmpty = false;

versionGroups.forEach((versionGroup) => {
versionGroup.inspect().forEach((outcome) => {
if (!outcome.isValid) {
outcome.instances.forEach((instance) => {
switch (outcome.status) {
versionGroup.inspect().forEach((report) => {
if (!report.isValid) {
report.instances.forEach((instance) => {
switch (report.status) {
case 'HIGHEST_SEMVER_MISMATCH':
case 'LOWEST_SEMVER_MISMATCH':
case 'PINNED_MISMATCH':
case 'SNAPPED_TO_MISMATCH':
case 'WORKSPACE_MISMATCH': {
instance.setVersion(outcome.expectedVersion);
instance.setVersion(report.expectedVersion);
break;
}
case 'BANNED': {
Expand Down
4 changes: 2 additions & 2 deletions src/bin-fix-mismatches/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import chalk from 'chalk';
import { program } from 'commander';
import { disk } from '../lib/disk';
import { effects } from '../lib/effects';
import { showHelpOnError } from '../lib/show-help-on-error';
import { option } from '../option';
import { fixMismatchesCli } from './fix-mismatches-cli';
Expand Down Expand Up @@ -68,5 +68,5 @@ fixMismatchesCli(
source: program.opts().source,
types: program.opts().types,
},
disk,
effects,
);
6 changes: 3 additions & 3 deletions src/bin-format/format-cli.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { pipe } from 'tightrope/fn/pipe';
import type { CliConfig } from '../config/types';
import { getContext } from '../get-context';
import type { Disk } from '../lib/disk';
import type { Effects } from '../lib/effects';
import { writeIfChanged } from '../lib/write-if-changed';
import { format } from './format';

export function formatCli(input: Partial<CliConfig>, disk: Disk): void {
pipe(getContext(input, disk), format, writeIfChanged);
export function formatCli(input: Partial<CliConfig>, effects: Effects): void {
pipe(getContext(input, effects), format, writeIfChanged);
}
4 changes: 2 additions & 2 deletions src/bin-format/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import chalk from 'chalk';
import { program } from 'commander';
import { disk } from '../lib/disk';
import { effects } from '../lib/effects';
import { showHelpOnError } from '../lib/show-help-on-error';
import { option } from '../option';
import { formatCli } from './format-cli';
Expand Down Expand Up @@ -56,5 +56,5 @@ formatCli(
indent: program.opts().indent,
source: program.opts().source,
},
disk,
effects,
);
4 changes: 2 additions & 2 deletions src/bin-lint-semver-ranges/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import chalk from 'chalk';
import { program } from 'commander';
import { disk } from '../lib/disk';
import { effects } from '../lib/effects';
import { showHelpOnError } from '../lib/show-help-on-error';
import { option } from '../option';
import { lintSemverRangesCli } from './lint-semver-ranges-cli';
Expand Down Expand Up @@ -77,5 +77,5 @@ lintSemverRangesCli(
source: program.opts().source,
types: program.opts().types,
},
disk,
effects,
);
6 changes: 3 additions & 3 deletions src/bin-lint-semver-ranges/lint-semver-ranges-cli.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { pipe } from 'tightrope/fn/pipe';
import type { CliConfig } from '../config/types';
import { getContext } from '../get-context';
import type { Disk } from '../lib/disk';
import type { Effects } from '../lib/effects';
import { exitIfInvalid } from '../lib/exit-if-invalid';
import { lintSemverRanges } from './lint-semver-ranges';

export function lintSemverRangesCli(
input: Partial<CliConfig>,
disk: Disk,
effects: Effects,
): void {
pipe(getContext(input, disk), lintSemverRanges, exitIfInvalid);
pipe(getContext(input, effects), lintSemverRanges, exitIfInvalid);
}
4 changes: 2 additions & 2 deletions src/bin-lint/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import chalk from 'chalk';
import { program } from 'commander';
import { disk } from '../lib/disk';
import { effects } from '../lib/effects';
import { showHelpOnError } from '../lib/show-help-on-error';
import { option } from '../option';
import { lintCli } from './lint-cli';
Expand Down Expand Up @@ -39,5 +39,5 @@ lintCli(
{
configPath: program.opts().config,
},
disk,
effects,
);
6 changes: 3 additions & 3 deletions src/bin-lint/lint-cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import { lintSemverRanges } from '../bin-lint-semver-ranges/lint-semver-ranges';
import { listMismatches } from '../bin-list-mismatches/list-mismatches';
import type { CliConfig } from '../config/types';
import { getContext } from '../get-context';
import type { Disk } from '../lib/disk';
import type { Effects } from '../lib/effects';
import { exitIfInvalid } from '../lib/exit-if-invalid';

export function lintCli(input: Partial<CliConfig>, disk: Disk): void {
export function lintCli(input: Partial<CliConfig>, effects: Effects): void {
pipe(
getContext(input, disk),
getContext(input, effects),
listMismatches,
lintSemverRanges,
exitIfInvalid,
Expand Down
4 changes: 2 additions & 2 deletions src/bin-list-mismatches/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import chalk from 'chalk';
import { program } from 'commander';
import { disk } from '../lib/disk';
import { effects } from '../lib/effects';
import { showHelpOnError } from '../lib/show-help-on-error';
import { option } from '../option';
import { listMismatchesCli } from './list-mismatches-cli';
Expand Down Expand Up @@ -60,5 +60,5 @@ listMismatchesCli(
source: program.opts().source,
types: program.opts().types,
},
disk,
effects,
);
9 changes: 6 additions & 3 deletions src/bin-list-mismatches/list-mismatches-cli.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import { pipe } from 'tightrope/fn/pipe';
import type { CliConfig } from '../config/types';
import { getContext } from '../get-context';
import type { Disk } from '../lib/disk';
import type { Effects } from '../lib/effects';
import { exitIfInvalid } from '../lib/exit-if-invalid';
import { listMismatches } from './list-mismatches';

export function listMismatchesCli(input: Partial<CliConfig>, disk: Disk): void {
pipe(getContext(input, disk), listMismatches, exitIfInvalid);
export function listMismatchesCli(
input: Partial<CliConfig>,
effects: Effects,
): void {
pipe(getContext(input, effects), listMismatches, exitIfInvalid);
}
4 changes: 2 additions & 2 deletions src/bin-list/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import chalk from 'chalk';
import { program } from 'commander';
import { disk } from '../lib/disk';
import { effects } from '../lib/effects';
import { showHelpOnError } from '../lib/show-help-on-error';
import { option } from '../option';
import { listCli } from './list-cli';
Expand Down Expand Up @@ -56,5 +56,5 @@ listCli(
source: program.opts().source,
types: program.opts().types,
},
disk,
effects,
);
6 changes: 3 additions & 3 deletions src/bin-list/list-cli.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { pipe } from 'tightrope/fn/pipe';
import type { CliConfig } from '../config/types';
import { getContext } from '../get-context';
import type { Disk } from '../lib/disk';
import type { Effects } from '../lib/effects';
import { exitIfInvalid } from '../lib/exit-if-invalid';
import { list } from './list';

export function listCli(input: Partial<CliConfig>, disk: Disk): void {
pipe(getContext(input, disk), list, exitIfInvalid);
export function listCli(input: Partial<CliConfig>, effects: Effects): void {
pipe(getContext(input, effects), list, exitIfInvalid);
}
4 changes: 2 additions & 2 deletions src/bin-prompt/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import chalk from 'chalk';
import { program } from 'commander';
import { disk } from '../lib/disk';
import { effects } from '../lib/effects';
import { showHelpOnError } from '../lib/show-help-on-error';
import { option } from '../option';
import { promptCli } from './prompt-cli';
Expand Down Expand Up @@ -58,5 +58,5 @@ promptCli(
source: program.opts().source,
types: program.opts().types,
},
disk,
effects,
);
10 changes: 5 additions & 5 deletions src/bin-prompt/prompt-cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import type { CliConfig } from '../config/types';
import { getContext } from '../get-context';
import { getVersionGroups } from '../get-version-groups';
import { getUniqueVersions } from '../get-version-groups/lib/get-unique-versions';
import type { Disk } from '../lib/disk';
import type { Effects } from '../lib/effects';
import { sortByName } from '../lib/sort-by-name';
import { writeIfChanged } from '../lib/write-if-changed';

export async function promptCli(
input: Partial<CliConfig>,
disk: Disk,
effects: Effects,
): Promise<void> {
const ctx = getContext(input, disk);
const ctx = getContext(input, effects);
const versionGroups = getVersionGroups(ctx);

for (const versionGroup of versionGroups) {
Expand All @@ -23,15 +23,15 @@ export async function promptCli(
case 'UNSUPPORTED_MISMATCH': {
const OTHER = chalk.dim('Other');
const SKIP = chalk.dim('Skip this dependency');
const chosenVersion = await disk.askForChoice({
const chosenVersion = await effects.askForChoice({
message: chalk`${report.name} {dim Choose a version to replace the others}`,
choices: [...getUniqueVersions(report.instances), OTHER, SKIP],
});

if (chosenVersion === SKIP) {
continue;
} else if (chosenVersion === OTHER) {
const newVersion = await disk.askForInput({
const newVersion = await effects.askForInput({
message: chalk`${report.name} {dim Enter a new version to replace the others}`,
});
report.instances.forEach((instance) => {
Expand Down
4 changes: 2 additions & 2 deletions src/bin-set-semver-ranges/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import chalk from 'chalk';
import { program } from 'commander';
import { disk } from '../lib/disk';
import { effects } from '../lib/effects';
import { showHelpOnError } from '../lib/show-help-on-error';
import { option } from '../option';
import { setSemverRangesCli } from './set-semver-ranges-cli';
Expand Down Expand Up @@ -81,5 +81,5 @@ setSemverRangesCli(
source: program.opts().source,
types: program.opts().types,
},
disk,
effects,
);
6 changes: 3 additions & 3 deletions src/bin-set-semver-ranges/set-semver-ranges-cli.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { pipe } from 'tightrope/fn/pipe';
import type { CliConfig } from '../config/types';
import { getContext } from '../get-context';
import type { Disk } from '../lib/disk';
import type { Effects } from '../lib/effects';
import { writeIfChanged } from '../lib/write-if-changed';
import { setSemverRanges } from './set-semver-ranges';

export function setSemverRangesCli(
input: Partial<CliConfig>,
disk: Disk,
effects: Effects,
): void {
pipe(getContext(input, disk), setSemverRanges, writeIfChanged);
pipe(getContext(input, effects), setSemverRanges, writeIfChanged);
}

0 comments on commit 2801b67

Please sign in to comment.