Move bin: protocol helpers to separate module

webpro-nl · Sep 26, 2023 · 92c6f1b · 92c6f1b
1 parent fedd56d
commit 92c6f1b
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 18 deletions.
diff --git a/src/binaries/index.ts b/src/binaries/index.ts
@@ -2,8 +2,8 @@ import { compact } from '../util/array.js';
 import { getPackageNameFromModuleSpecifier } from '../util/modules.js';
 import { isInternal } from '../util/path.js';
 import { timerify } from '../util/Performance.js';
+import { isBinary } from '../util/protocols.js';
 import { getBinariesFromScript } from './bash-parser.js';
-import { isBinary } from './util.js';
 import type { GetDependenciesFromScripts } from './types.js';
 
 const defaultCwd = process.cwd();

diff --git a/src/binaries/resolvers/c8.ts b/src/binaries/resolvers/c8.ts
@@ -1,5 +1,6 @@
 import parseArgs from 'minimist';
-import { toBinary, argsFrom } from '../util.js';
+import { toBinary } from '../../util/protocols.js';
+import { argsFrom } from '../util.js';
 import type { Resolver } from '../types.js';
 
 export const resolve: Resolver = (binary, args, { fromArgs }) => {

diff --git a/src/binaries/resolvers/dotenv.ts b/src/binaries/resolvers/dotenv.ts
@@ -1,5 +1,6 @@
 import parseArgs from 'minimist';
-import { toBinary, argsFrom } from '../util.js';
+import { toBinary } from '../../util/protocols.js';
+import { argsFrom } from '../util.js';
 import type { Resolver } from '../types.js';
 
 export const resolve: Resolver = (binary, args, { fromArgs }) => {

diff --git a/src/binaries/resolvers/fallback.ts b/src/binaries/resolvers/fallback.ts
@@ -1,6 +1,7 @@
 import parseArgs from 'minimist';
 import { compact } from '../../util/array.js';
-import { toBinary, tryResolveFilePath, tryResolveSpecifiers } from '../util.js';
+import { toBinary } from '../../util/protocols.js';
+import { tryResolveFilePath, tryResolveSpecifiers } from '../util.js';
 import type { Resolver } from '../types.js';
 import type { ParsedArgs } from 'minimist';
 

diff --git a/src/binaries/resolvers/nodemon.ts b/src/binaries/resolvers/nodemon.ts
@@ -1,6 +1,7 @@
 import parseArgs from 'minimist';
 import { compact } from '../../util/array.js';
-import { toBinary, tryResolveFilePath, tryResolveSpecifiers } from '../util.js';
+import { toBinary } from '../../util/protocols.js';
+import { tryResolveFilePath, tryResolveSpecifiers } from '../util.js';
 import type { Resolver } from '../types.js';
 
 export const resolve: Resolver = (binary, args, { cwd, fromArgs }) => {

diff --git a/src/binaries/resolvers/npx.ts b/src/binaries/resolvers/npx.ts
@@ -1,7 +1,8 @@
 import parseArgs from 'minimist';
 import { isInternal } from '../../util/path.js';
+import { toBinary } from '../../util/protocols.js';
 import { getBinariesFromScript } from '../bash-parser.js';
-import { argsFrom, stripVersionFromSpecifier, toBinary } from '../util.js';
+import { argsFrom, stripVersionFromSpecifier } from '../util.js';
 import type { Resolver } from '../types.js';
 
 export const resolve: Resolver = (binary, args, { cwd, fromArgs, manifest }) => {

diff --git a/src/binaries/resolvers/nx.ts b/src/binaries/resolvers/nx.ts
@@ -1,5 +1,5 @@
 import parseArgs from 'minimist';
-import { toBinary } from '../util.js';
+import { toBinary } from '../../util/protocols.js';
 import type { Resolver } from '../types.js';
 
 export const resolve: Resolver = (binary, args, { fromArgs }) => {

diff --git a/src/binaries/resolvers/pnpm.ts b/src/binaries/resolvers/pnpm.ts
@@ -1,5 +1,5 @@
 import parseArgs from 'minimist';
-import { toBinary } from '../util.js';
+import { toBinary } from '../../util/protocols.js';
 import type { Resolver } from '../types.js';
 
 // https://pnpm.io/cli/add

diff --git a/src/binaries/resolvers/rollup.ts b/src/binaries/resolvers/rollup.ts
@@ -1,6 +1,7 @@
 import parseArgs from 'minimist';
 import { compact } from '../../util/array.js';
-import { toBinary, tryResolveSpecifiers } from '../util.js';
+import { toBinary } from '../../util/protocols.js';
+import { tryResolveSpecifiers } from '../util.js';
 import type { Resolver } from '../types.js';
 
 export const resolve: Resolver = (binary, args, { cwd, fromArgs }) => {

diff --git a/src/binaries/resolvers/yarn.ts b/src/binaries/resolvers/yarn.ts
@@ -1,5 +1,5 @@
 import parseArgs from 'minimist';
-import { toBinary } from '../util.js';
+import { toBinary } from '../../util/protocols.js';
 import type { Resolver } from '../types.js';
 
 // https://yarnpkg.com/cli

diff --git a/src/binaries/util.ts b/src/binaries/util.ts
@@ -1,5 +1,6 @@
 import { getPackageNameFromFilePath, getPackageNameFromModuleSpecifier } from '../util/modules.js';
 import { isInNodeModules, join } from '../util/path.js';
+import { toBinary } from '../util/protocols.js';
 import { _tryResolve } from '../util/require.js';
 
 export const tryResolveFilePath = (cwd: string, specifier: string, acceptModuleSpecifier?: boolean) => {
@@ -23,12 +24,6 @@ export const tryResolveFilePath = (cwd: string, specifier: string, acceptModuleS
 export const tryResolveSpecifiers = (cwd: string, specifiers: string[]) =>
   specifiers.map(specifier => tryResolveFilePath(cwd, specifier, true));
 
-export const toBinary = (specifier: string) => specifier.replace(/^(bin:)?/, 'bin:');
-
-export const fromBinary = (specifier: string) => specifier.replace(/^(bin:)?/, '');
-
-export const isBinary = (specifier: string) => specifier.startsWith('bin:');
-
 export const stripVersionFromSpecifier = (specifier: string) => specifier.replace(/(\S+)@.*/, '$1');
 
 const stripNodeModulesFromPath = (command: string) => command.replace(/^(\.\/)?node_modules\//, '');

diff --git a/src/index.ts b/src/index.ts
@@ -1,6 +1,5 @@
 import micromatch from 'micromatch';
 import { _getDependenciesFromScripts } from './binaries/index.js';
-import { fromBinary, isBinary } from './binaries/util.js';
 import { ConfigurationChief } from './ConfigurationChief.js';
 import { ConsoleStreamer } from './ConsoleStreamer.js';
 import { ROOT_WORKSPACE_NAME } from './constants.js';
@@ -19,6 +18,7 @@ import {
   getPackageNameFromModuleSpecifier,
 } from './util/modules.js';
 import { dirname, isInNodeModules, join, isInternal, toAbsolute } from './util/path.js';
+import { fromBinary, isBinary } from './util/protocols.js';
 import { _resolveSpecifier, _tryResolve } from './util/require.js';
 import { _require } from './util/require.js';
 import { loadTSConfig } from './util/tsconfig-loader.js';

diff --git a/src/plugins/lefthook/index.ts b/src/plugins/lefthook/index.ts
@@ -1,6 +1,6 @@
 import { readFileSync } from 'fs';
+import { fromBinary } from '../../util/protocols.js';
 import { _getDependenciesFromScripts } from '../../binaries/index.js';
-import { fromBinary } from '../../binaries/util.js';
 import { getGitHookPaths } from '../../util/git.js';
 import { getValuesByKeyDeep } from '../../util/object.js';
 import { timerify } from '../../util/Performance.js';

diff --git a/src/util/protocols.ts b/src/util/protocols.ts
@@ -0,0 +1,11 @@
+export const toBinary = (specifier: string) => specifier.replace(/^(bin:)?/, 'bin:');
+
+export const fromBinary = (specifier: string) => specifier.replace(/^(bin:)?/, '');
+
+export const isBinary = (specifier: string) => specifier.startsWith('bin:');
+
+export const toEntryPattern = (specifier: string) => specifier.replace(/^(entry:)?/, 'entry:');
+
+export const fromEntryPattern = (specifier: string) => specifier.replace(/^(entry:)?/, '');
+
+export const isEntryPattern = (specifier: string) => specifier.startsWith('entry:');