refactor: Move files to appropriate directory

src/command/span.test.ts

@@ -1,9 +1,12 @@
 import { waitForSpan } from "@/command/span";
 import { EchoedFatalError } from "@/echoedFatalError";
-import { deleteServerPortFromEnv, setServerPortToEnv } from "@/env";
+import {
+  deleteServerPortFromEnv,
+  setServerPortToEnv,
+} from "@/integration/common/util/env";
+import { setTraceIdToResponse } from "@/integration/common/util/fetchResponse";
 import { WaitForSpanEventResponse } from "@/server/parameter/waitForSpanParameter";
 import { buildJsonSpan } from "@/testUtil/type/jsonSpan";
-import { setTraceIdToResponse } from "@/traceLoggingFetch";
 import { HexString } from "@/type/hexString";
 import fetchMock from "jest-fetch-mock";
 

src/command/span.ts

@@ -5,8 +5,8 @@ import {
 import { Compare } from "@/command/compare";
 import { Span } from "@/command/spanType";
 import { EchoedFatalError } from "@/echoedFatalError";
-import { getServerPortFromEnv } from "@/env";
-import { getTraceIdFromResponse } from "@/traceLoggingFetch";
+import { getServerPortFromEnv } from "@/integration/common/util/env";
+import { getTraceIdFromResponse } from "@/integration/common/util/fetchResponse";
 
 export type WaitOption = {
   timeoutMs?: number;

src/integration/common/commonFetchRunner.ts

@@ -1,6 +1,6 @@
 import { FetchRequestInfo } from "@/fileLog/testActionLogger";
+import { setTraceIdToResponse } from "@/integration/common/util/fetchResponse";
 import { ECHOED_USER_AGENT, USER_AGENT_HEADER_KEY } from "@/server/request";
-import { setTraceIdToResponse } from "@/traceLoggingFetch";
 import { HexString } from "@/type/hexString";
 import { readBodyInit, readStreamFully } from "@/util/stream";
 import { generateTraceparent } from "@/util/traceparent";

src/integration/common/util/reporter.ts

@@ -1,11 +1,11 @@
-import { AnsiGreen, AnsiRed, AnsiReset } from "@/ansi";
 import { Config } from "@/config/config";
 import { CoverageCollector } from "@/coverage/coverageCollector";
 import { CoverageResult } from "@/coverage/coverageResult";
 import { IFile } from "@/fs/IFile";
 import { Logger } from "@/logger";
 import { TestResult } from "@/report/testResult";
 import { OtelSpan } from "@/type/otelSpan";
+import { AnsiGreen, AnsiRed, AnsiReset } from "@/util/ansi";
 
 export function logFileCreated(outFile: IFile): void {
   Logger.log(

src/integration/cypress/reporter/cypressReporter.ts

@@ -1,8 +1,11 @@
 import { ECHOED_CONFIG_FILE_NAME } from "@/config/config";
-import { getServerPortFromEnv, setServerPortToEnv } from "@/env";
 import { buildFsContainerForApp } from "@/fs/fsContainer";
 import { LocalFile } from "@/fs/localFile";
 import { loadConfig } from "@/integration/common/util/config";
+import {
+  getServerPortFromEnv,
+  setServerPortToEnv,
+} from "@/integration/common/util/env";
 import { Reporter } from "@/integration/cypress/reporter/reporter";
 import { buildRandomHexBytes } from "@/util/random";
 import { MochaOptions, Runner, Test, reporters } from "mocha";

src/fetchPatch.test.ts → src/integration/jest/internal/util/fetchPatch.test.ts

@@ -1,5 +1,5 @@
-import { patchFetch } from "@/fetchPatch";
 import { TRACEPARENT_HEADER_KEY } from "@/integration/common/commonFetchRunner";
+import { patchFetch } from "@/integration/jest/internal/util/fetchPatch";
 import { Logger } from "@/logger";
 import { MockFileLogger } from "@/testUtil/fileLog/mockFileLogger";
 import { DummyFetcher } from "@/testUtil/global/dummyFetcher";

src/integration/jest/nodeEnvironment/environment.ts

@@ -1,8 +1,11 @@
-import { patchFetch, restoreFetch } from "@/fetchPatch";
 import { FileLogger } from "@/fileLog/fileLogger";
 import { IFileLogger } from "@/fileLog/iFileLogger";
 import { FileSpace } from "@/fileSpace/fileSpace";
 import { IDirectory } from "@/fs/iDirectory";
+import {
+  patchFetch,
+  restoreFetch,
+} from "@/integration/jest/internal/util/fetchPatch";
 import type { Global } from "@jest/types";
 
 export class Environment {

src/integration/jest/nodeEnvironment/jestNodeEnvironment.ts

@@ -1,6 +1,6 @@
 import { EchoedFatalError } from "@/echoedFatalError";
-import { getTmpDirFromEnv } from "@/env";
 import { buildFsContainerForApp } from "@/fs/fsContainer";
+import { getTmpDirFromEnv } from "@/integration/common/util/env";
 import { Environment } from "@/integration/jest/nodeEnvironment/environment";
 import type {
   EnvironmentContext,

src/integration/jest/reporter/reporter.ts

@@ -1,8 +1,11 @@
 import { Config } from "@/config/config";
 import { EchoedFatalError } from "@/echoedFatalError";
-import { setServerPortToEnv, setTmpDirToEnv } from "@/env";
 import { FileSpace } from "@/fileSpace/fileSpace";
 import { FsContainer } from "@/fs/fsContainer";
+import {
+  setServerPortToEnv,
+  setTmpDirToEnv,
+} from "@/integration/common/util/env";
 import {
   analyzeCoverage,
   logFileCreated,

src/integration/playwright/command/span.test.ts

@@ -1,5 +1,8 @@
 import { EchoedFatalError } from "@/echoedFatalError";
-import { deleteServerPortFromEnv, setServerPortToEnv } from "@/env";
+import {
+  deleteServerPortFromEnv,
+  setServerPortToEnv,
+} from "@/integration/common/util/env";
 import {
   waitForSpanCreatedIn,
   waitForSpanFromPlaywrightFetch,

src/integration/playwright/command/span.ts

@@ -5,7 +5,7 @@ import {
 import { SpanFilterOption, WaitOption } from "@/command/span";
 import { Span } from "@/command/spanType";
 import { EchoedFatalError } from "@/echoedFatalError";
-import { getServerPortFromEnv } from "@/env";
+import { getServerPortFromEnv } from "@/integration/common/util/env";
 import { getTraceIdFromAPIResponse } from "@/integration/playwright/internal/util/apiResponse";
 import { getLastTraceIdFromContext } from "@/integration/playwright/internal/util/browserContext";
 import { HexString } from "@/type/hexString";

src/integration/playwright/globalSetup/setupRunner.test.ts

@@ -1,7 +1,10 @@
 import { Config } from "@/config/config";
 import { PropagationTestConfig } from "@/config/propagationTestConfig";
-import { deleteTmpDirFromEnv, getTmpDirFromEnv } from "@/env";
 import { FsContainer } from "@/fs/fsContainer";
+import {
+  deleteTmpDirFromEnv,
+  getTmpDirFromEnv,
+} from "@/integration/common/util/env";
 import { SetupRunner } from "@/integration/playwright/globalSetup/setupRunner";
 import { Logger } from "@/logger";
 import { MockFile } from "@/testUtil/fs/mockFile";

src/integration/playwright/globalSetup/setupRunner.ts

@@ -1,7 +1,10 @@
 import { Config } from "@/config/config";
-import { setServerPortToEnv, setTmpDirToEnv } from "@/env";
 import { FileSpace } from "@/fileSpace/fileSpace";
 import { FsContainer } from "@/fs/fsContainer";
+import {
+  setServerPortToEnv,
+  setTmpDirToEnv,
+} from "@/integration/common/util/env";
 import { Server } from "@/server/server";
 import os from "os";
 import path from "path";

src/integration/playwright/internal/hook/globalFetchRunner.test.ts

@@ -1,10 +1,10 @@
 import { TestActionLogger } from "@/fileLog/testActionLogger";
 import { GlobalFetch } from "@/integration/common/commonFetchRunner";
+import { getTraceIdFromResponse } from "@/integration/common/util/fetchResponse";
 import { GlobalFetchRunner } from "@/integration/playwright/internal/hook/globalFetchRunner";
 import { MockFileLogger } from "@/testUtil/fileLog/mockFileLogger";
 import { DummyFetcher } from "@/testUtil/global/dummyFetcher";
 import { buildPlaywrightTestInfo } from "@/testUtil/playwright/testInfo";
-import { getTraceIdFromResponse } from "@/traceLoggingFetch";
 import { FetchFinishedLog, FetchStartedLog } from "@/type/log";
 
 describe("GlobalFetchRunner", () => {

src/integration/playwright/internal/util/fileSpace.ts

@@ -1,7 +1,7 @@
 import { EchoedFatalError } from "@/echoedFatalError";
-import { getTmpDirFromEnv } from "@/env";
 import { FileSpace } from "@/fileSpace/fileSpace";
 import { buildFsContainerForApp } from "@/fs/fsContainer";
+import { getTmpDirFromEnv } from "@/integration/common/util/env";
 
 export const getFileSpace = (): FileSpace => {
   const tmpDirPath = getTmpDirFromEnv();

src/integration/playwright/reporter/playwrightReporter.ts

@@ -1,9 +1,9 @@
 import { Config, ECHOED_CONFIG_FILE_NAME } from "@/config/config";
 import { EchoedFatalError } from "@/echoedFatalError";
-import { getTmpDirFromEnv } from "@/env";
 import { FileSpace } from "@/fileSpace/fileSpace";
 import { FsContainer, buildFsContainerForApp } from "@/fs/fsContainer";
 import { LocalFile } from "@/fs/localFile";
+import { getTmpDirFromEnv } from "@/integration/common/util/env";
 import { Reporter } from "@/integration/playwright/reporter/reporter";
 import { Logger } from "@/logger";
 import { ReportFile } from "@/report/reportFile";

src/logger.ts

@@ -1,4 +1,4 @@
-import { AnsiGray, AnsiRed, AnsiReset, AnsiYellow } from "@/ansi";
+import { AnsiGray, AnsiRed, AnsiReset, AnsiYellow } from "@/util/ansi";
 
 const tag = "[Echoed]";
 const tagSpace = " ".repeat(tag.length);

src/report/testCaseResult.ts

@@ -1,4 +1,4 @@
-import { FetchInfo } from "@/fetchInfo";
+import { FetchInfo } from "@/report/fetchInfo";
 import { TestCase } from "@/type/testCase";
 
 export class TestCaseResult {

src/report/testResult.ts

@@ -1,10 +1,10 @@
 import { Config } from "@/config/config";
 import { PropagationTestConfig } from "@/config/propagationTestConfig";
-import { FetchInfo } from "@/fetchInfo";
 import { IFile } from "@/fs/IFile";
 import { IDirectory } from "@/fs/iDirectory";
 import { opentelemetry } from "@/generated/otelpbj";
 import { Logger } from "@/logger";
+import { FetchInfo } from "@/report/fetchInfo";
 import { TestCaseResult } from "@/report/testCaseResult";
 import {
   FetchFailedLog,

src/scenario/gen/jest/runner/waitForSpan.test.ts

@@ -1,9 +1,12 @@
-import { deleteServerPortFromEnv, setServerPortToEnv } from "@/env";
+import {
+  deleteServerPortFromEnv,
+  setServerPortToEnv,
+} from "@/integration/common/util/env";
+import { setTraceIdToResponse } from "@/integration/common/util/fetchResponse";
 import { waitForSpan } from "@/scenario/gen/jest/runner/waitForSpan";
 import { WaitForSpanEventResponse } from "@/server/parameter/waitForSpanParameter";
 import { buildEchoedActContext } from "@/testUtil/scenario/context";
 import { buildJsonSpan } from "@/testUtil/type/jsonSpan";
-import { setTraceIdToResponse } from "@/traceLoggingFetch";
 import { HexString } from "@/type/hexString";
 import { toBase64String } from "@/util/byte";
 import fetchMock from "jest-fetch-mock";