wip

src/config/configLoad.ts

@@ -1,7 +1,6 @@
 import * as fs from 'node:fs/promises';
 import path from 'node:path';
 import stripJsonComments from 'strip-json-comments';
-import { z } from 'zod';
 import { RepomixError, rethrowValidationErrorIfZodError } from '../shared/errorHandle.js';
 import { logger } from '../shared/logger.js';
 import {

src/core/file/fileCollect.ts

@@ -1,22 +1,12 @@
 import pc from 'picocolors';
-import { Piscina } from 'piscina';
 import { logger } from '../../shared/logger.js';
-import { getWorkerThreadCount } from '../../shared/processConcurrency.js';
+import { initPiscina } from '../../shared/processConcurrency.js';
 import type { RepomixProgressCallback } from '../../shared/types.js';
 import type { RawFile } from './fileTypes.js';
 import type { FileCollectTask } from './workers/fileCollectWorker.js';
 
 const initTaskRunner = (numOfTasks: number) => {
-  const { minThreads, maxThreads } = getWorkerThreadCount(numOfTasks);
-  logger.trace(`Initializing worker pool with min=${minThreads}, max=${maxThreads} threads`);
-
-  const pool = new Piscina({
-    filename: new URL('./workers/fileCollectWorker.js', import.meta.url).href,
-    minThreads,
-    maxThreads,
-    idleTimeout: 5000,
-  });
-
+  const pool = initPiscina(numOfTasks, new URL('./workers/fileCollectWorker.js', import.meta.url).href);
   return (task: FileCollectTask) => pool.run(task);
 };
 

src/core/file/fileProcess.ts

@@ -1,23 +1,13 @@
 import pc from 'picocolors';
-import { Piscina } from 'piscina';
 import type { RepomixConfigMerged } from '../../config/configSchema.js';
 import { logger } from '../../shared/logger.js';
-import { getWorkerThreadCount } from '../../shared/processConcurrency.js';
+import { initPiscina } from '../../shared/processConcurrency.js';
 import type { RepomixProgressCallback } from '../../shared/types.js';
 import type { ProcessedFile, RawFile } from './fileTypes.js';
 import type { FileProcessTask } from './workers/fileProcessWorker.js';
 
 const initTaskRunner = (numOfTasks: number) => {
-  const { minThreads, maxThreads } = getWorkerThreadCount(numOfTasks);
-  logger.trace(`Initializing worker pool with min=${minThreads}, max=${maxThreads} threads`);
-
-  const pool = new Piscina({
-    filename: new URL('./workers/fileProcessWorker.js', import.meta.url).href,
-    minThreads,
-    maxThreads,
-    idleTimeout: 5000,
-  });
-
+  const pool = initPiscina(numOfTasks, new URL('./workers/fileProcessWorker.js', import.meta.url).href);
   return (task: FileProcessTask) => pool.run(task);
 };
 

src/core/metrics/calculateAllFileMetrics.ts

@@ -1,24 +1,14 @@
 import pc from 'picocolors';
-import { Piscina } from 'piscina';
 import type { TiktokenEncoding } from 'tiktoken';
 import { logger } from '../../shared/logger.js';
-import { getWorkerThreadCount } from '../../shared/processConcurrency.js';
+import { initPiscina } from '../../shared/processConcurrency.js';
 import type { RepomixProgressCallback } from '../../shared/types.js';
 import type { ProcessedFile } from '../file/fileTypes.js';
 import type { FileMetricsTask } from './workers/fileMetricsWorker.js';
 import type { FileMetrics } from './workers/types.js';
 
 const initTaskRunner = (numOfTasks: number) => {
-  const { minThreads, maxThreads } = getWorkerThreadCount(numOfTasks);
-  logger.trace(`Initializing worker pool with min=${minThreads}, max=${maxThreads} threads`);
-
-  const pool = new Piscina({
-    filename: new URL('./workers/fileMetricsWorker.js', import.meta.url).href,
-    minThreads,
-    maxThreads,
-    idleTimeout: 5000,
-  });
-
+  const pool = initPiscina(numOfTasks, new URL('./workers/fileMetricsWorker.js', import.meta.url).href);
   return (task: FileMetricsTask) => pool.run(task);
 };
 

src/core/metrics/calculateOutputMetrics.ts

@@ -1,19 +1,10 @@
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { Piscina } from 'piscina';
 import type { TiktokenEncoding } from 'tiktoken';
 import { logger } from '../../shared/logger.js';
+import { initPiscina } from '../../shared/processConcurrency.js';
 import type { OutputMetricsTask } from './workers/outputMetricsWorker.js';
 
 const initTaskRunner = () => {
-  const pool = new Piscina({
-    filename: new URL('./workers/outputMetricsWorker.js', import.meta.url).href,
-    // Set minThreads and maxThreads to 1
-    minThreads: 1,
-    maxThreads: 1,
-    idleTimeout: 5000,
-  });
-
+  const pool = initPiscina(1, new URL('./workers/outputMetricsWorker.js', import.meta.url).href);
   return (task: OutputMetricsTask) => pool.run(task);
 };
 

src/core/security/securityCheck.ts

@@ -1,9 +1,6 @@
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
 import pc from 'picocolors';
-import { Piscina } from 'piscina';
 import { logger } from '../../shared/logger.js';
-import { getWorkerThreadCount } from '../../shared/processConcurrency.js';
+import { initPiscina } from '../../shared/processConcurrency.js';
 import type { RepomixProgressCallback } from '../../shared/types.js';
 import type { RawFile } from '../file/fileTypes.js';
 import type { SecurityCheckTask } from './workers/securityCheckWorker.js';
@@ -14,16 +11,7 @@ export interface SuspiciousFileResult {
 }
 
 const initTaskRunner = (numOfTasks: number) => {
-  const { minThreads, maxThreads } = getWorkerThreadCount(numOfTasks);
-  logger.trace(`Initializing worker pool with min=${minThreads}, max=${maxThreads} threads`);
-
-  const pool = new Piscina({
-    filename: new URL('./workers/securityCheckWorker.js', import.meta.url).href,
-    minThreads,
-    maxThreads,
-    idleTimeout: 5000,
-  });
-
+  const pool = initPiscina(numOfTasks, new URL('./workers/securityCheckWorker.js', import.meta.url).href);
   return (task: SecurityCheckTask) => pool.run(task);
 };
 

src/core/security/workers/securityCheckWorker.ts

@@ -1,6 +1,6 @@
 import { lintSource } from '@secretlint/core';
 import { creator } from '@secretlint/secretlint-rule-preset-recommend';
-import type { SecretLintCoreConfig, SecretLintCoreResult } from '@secretlint/types';
+import type { SecretLintCoreConfig } from '@secretlint/types';
 import { logger } from '../../../shared/logger.js';
 
 export interface SecurityCheckTask {

src/shared/processConcurrency.ts

@@ -1,4 +1,6 @@
 import os from 'node:os';
+import { Piscina } from 'piscina';
+import { logger } from './logger.js';
 
 export const getProcessConcurrency = (): number => {
   return typeof os.availableParallelism === 'function' ? os.availableParallelism() : os.cpus().length;
@@ -17,3 +19,18 @@ export const getWorkerThreadCount = (numOfTasks: number): { minThreads: number;
     maxThreads,
   };
 };
+
+export const initPiscina = (numOfTasks: number, workerPath: string): Piscina => {
+  const { minThreads, maxThreads } = getWorkerThreadCount(numOfTasks);
+
+  logger.trace(
+    `Initializing worker pool with min=${minThreads}, max=${maxThreads} threads. Worker path: ${workerPath}`,
+  );
+
+  return new Piscina({
+    filename: workerPath,
+    minThreads,
+    maxThreads,
+    idleTimeout: 5000,
+  });
+};

tests/cli/actions/remoteAction.test.ts

@@ -8,7 +8,6 @@ import {
   isValidRemoteValue,
   runRemoteAction,
 } from '../../../src/cli/actions/remoteAction.js';
-import type { SuspiciousFileResult } from '../../../src/core/security/securityCheck.js';
 import { createMockConfig } from '../../testing/testUtils.js';
 
 vi.mock('node:fs/promises', async (importOriginal) => {

tests/cli/cliPrint.test.ts

@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, test, vi } from 'vitest';
 import { printCompletion, printSecurityCheck, printSummary, printTopFiles } from '../../src/cli/cliPrint.js';
 import type { SuspiciousFileResult } from '../../src/core/security/securityCheck.js';
 import { logger } from '../../src/shared/logger.js';
-import { createMockConfig, isWindows } from '../testing/testUtils.js';
+import { createMockConfig } from '../testing/testUtils.js';
 
 vi.mock('../../src/shared/logger');
 vi.mock('picocolors', () => ({

tests/config/configSchema.test.ts

@@ -1,6 +1,5 @@
-import { outro } from '@clack/prompts';
 import { describe, expect, it } from 'vitest';
-import { custom, z } from 'zod';
+import { z } from 'zod';
 import {
   repomixConfigBaseSchema,
   repomixConfigCliSchema,

tests/core/metrics/calculateAllFileMetrics.test.ts

@@ -1,10 +1,8 @@
 import { describe, expect, it, vi } from 'vitest';
 import type { ProcessedFile } from '../../../src/core/file/fileTypes.js';
 import { calculateAllFileMetrics } from '../../../src/core/metrics/calculateAllFileMetrics.js';
-import {
-  type FileMetricsTask,
-  calculateIndividualFileMetrics,
-} from '../../../src/core/metrics/workers/fileMetricsWorker.js';
+import type { FileMetricsTask } from '../../../src/core/metrics/workers/fileMetricsWorker.js';
+import fileMetricsWorker from '../../../src/core/metrics/workers/fileMetricsWorker.js';
 import type { RepomixProgressCallback } from '../../../src/shared/types.js';
 
 vi.mock('../../shared/processConcurrency', () => ({
@@ -13,7 +11,7 @@ vi.mock('../../shared/processConcurrency', () => ({
 
 const mockInitTaskRunner = (numOfTasks: number) => {
   return async (task: FileMetricsTask) => {
-    return await calculateIndividualFileMetrics(task.file, task.encoding);
+    return await fileMetricsWorker(task);
   };
 };
 

tests/core/packager/copyToClipboardIfEnabled.test.ts

@@ -1,5 +1,4 @@
 import clipboard from 'clipboardy';
-import { logger } from 'handlebars';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import type { RepomixConfigMerged } from '../../../src/config/configSchema.js';
 import { copyToClipboardIfEnabled } from '../../../src/core/packager/copyToClipboardIfEnabled.js';

website/compose.yml

@@ -1,5 +1,5 @@
 # Run website in development mode
-# $ docker-compose -f website/compose.yml up --build
+# $ docker compose -f website/compose.yml up --build
 
 services:
   client:

website/server/src/utils/cache.ts

@@ -1,5 +1,5 @@
 import pako from 'pako';
-import type { PackOptions, PackResult } from '../types.js';
+import type { PackOptions } from '../types.js';
 
 interface CacheEntry<T> {
   value: Uint8Array; // Compressed data