From a5d68d458220f5765f1c1afa5f1915822cc80687 Mon Sep 17 00:00:00 2001 From: Casey Brooks Date: Fri, 13 Mar 2026 16:18:56 +0000 Subject: [PATCH] fix: rewrite relative import extensions --- src/contracts/api.ts | 2 +- src/contracts/auth.ts | 2 +- src/contracts/workload.grpc.ts | 2 +- src/index.ts | 32 +++++++++++++++---------------- src/lib/container.handle.ts | 4 ++-- src/lib/container.mounts.ts | 2 +- src/lib/container.service.ts | 14 +++++++------- src/lib/containerRegistry.port.ts | 2 +- src/lib/dockerClient.port.ts | 4 ++-- src/service/grpc/server.ts | 12 ++++++------ src/service/main.ts | 8 ++++---- tsconfig.json | 1 + 12 files changed, 43 insertions(+), 42 deletions(-) diff --git a/src/contracts/api.ts b/src/contracts/api.ts index 22e83b4..d5acc83 100644 --- a/src/contracts/api.ts +++ b/src/contracts/api.ts @@ -1,4 +1,4 @@ -import type { ContainerInspectInfo, ContainerOpts, ExecOptions, ExecResult, Platform } from '../lib/types'; +import type { ContainerInspectInfo, ContainerOpts, ExecOptions, ExecResult, Platform } from '../lib/types.ts'; export type ErrorPayload = { error: { diff --git a/src/contracts/auth.ts b/src/contracts/auth.ts index 8dbebc5..0ffbdc0 100644 --- a/src/contracts/auth.ts +++ b/src/contracts/auth.ts @@ -1,5 +1,5 @@ import crypto from 'node:crypto'; -import { canonicalJsonStringify } from './json'; +import { canonicalJsonStringify } from './json.ts'; export type SignatureHeaders = { timestamp: string; diff --git a/src/contracts/workload.grpc.ts b/src/contracts/workload.grpc.ts index 7483269..0d721de 100644 --- a/src/contracts/workload.grpc.ts +++ b/src/contracts/workload.grpc.ts @@ -12,7 +12,7 @@ import { VolumeSpec, VolumeSpecSchema, } from '../proto/gen/agynio/api/runner/v1/runner_pb.js'; -import type { ContainerOpts, Platform, SidecarOpts } from '../lib/types'; +import type { ContainerOpts, Platform, SidecarOpts } from '../lib/types.ts'; const PROP_AUTO_REMOVE = 'auto_remove'; const PROP_NETWORK_MODE = 'network_mode'; diff --git a/src/index.ts b/src/index.ts index fdc27a2..433a1ff 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,16 +1,16 @@ -export * from './lib/container.service'; -export * from './lib/container.handle'; -export * from './lib/container.mounts'; -export * from './lib/containerStream.util'; -export * from './lib/containerRegistry.port'; -export * from './lib/dockerClient.port'; -export * from './lib/execTimeout'; -export * from './lib/types'; -export * from './contracts/auth'; -export * from './contracts/json'; -export * from './contracts/api'; -export * from './contracts/workload.grpc'; -export { createRunnerGrpcServer } from './service/grpc/server'; -export type { RunnerGrpcOptions } from './service/grpc/server'; -export { loadRunnerConfig } from './service/config'; -export type { RunnerConfig } from './service/config'; +export * from './lib/container.service.ts'; +export * from './lib/container.handle.ts'; +export * from './lib/container.mounts.ts'; +export * from './lib/containerStream.util.ts'; +export * from './lib/containerRegistry.port.ts'; +export * from './lib/dockerClient.port.ts'; +export * from './lib/execTimeout.ts'; +export * from './lib/types.ts'; +export * from './contracts/auth.ts'; +export * from './contracts/json.ts'; +export * from './contracts/api.ts'; +export * from './contracts/workload.grpc.ts'; +export { createRunnerGrpcServer } from './service/grpc/server.ts'; +export type { RunnerGrpcOptions } from './service/grpc/server.ts'; +export { loadRunnerConfig } from './service/config.ts'; +export type { RunnerConfig } from './service/config.ts'; diff --git a/src/lib/container.handle.ts b/src/lib/container.handle.ts index b0964b2..519454b 100644 --- a/src/lib/container.handle.ts +++ b/src/lib/container.handle.ts @@ -1,5 +1,5 @@ -import type { DockerClientPort } from './dockerClient.port'; -import type { ExecOptions } from './types'; +import type { DockerClientPort } from './dockerClient.port.ts'; +import type { ExecOptions } from './types.ts'; /** * Lightweight entity wrapper representing a running (or created) container. diff --git a/src/lib/container.mounts.ts b/src/lib/container.mounts.ts index 8bdb827..8349d1a 100644 --- a/src/lib/container.mounts.ts +++ b/src/lib/container.mounts.ts @@ -1,4 +1,4 @@ -import type { ContainerInspectInfo } from './types'; +import type { ContainerInspectInfo } from './types.ts'; export interface ContainerMount { source: string; diff --git a/src/lib/container.service.ts b/src/lib/container.service.ts index acace42..c043f21 100644 --- a/src/lib/container.service.ts +++ b/src/lib/container.service.ts @@ -1,12 +1,12 @@ import { Injectable, Logger } from '@nestjs/common'; import Docker, { ContainerCreateOptions, Exec, type GetEventsOptions } from 'dockerode'; import { PassThrough, Writable } from 'node:stream'; -import { ContainerHandle } from './container.handle'; -import { mapInspectMounts } from './container.mounts'; -import { createUtf8Collector, demuxDockerMultiplex } from './containerStream.util'; -import { ExecIdleTimeoutError, ExecTimeoutError, isExecIdleTimeoutError, isExecTimeoutError } from './execTimeout'; -import type { ContainerRegistryPort } from './containerRegistry.port'; -import type { DockerClientPort } from './dockerClient.port'; +import { ContainerHandle } from './container.handle.ts'; +import { mapInspectMounts } from './container.mounts.ts'; +import { createUtf8Collector, demuxDockerMultiplex } from './containerStream.util.ts'; +import { ExecIdleTimeoutError, ExecTimeoutError, isExecIdleTimeoutError, isExecTimeoutError } from './execTimeout.ts'; +import type { ContainerRegistryPort } from './containerRegistry.port.ts'; +import type { DockerClientPort } from './dockerClient.port.ts'; import { ContainerOpts, ExecOptions, @@ -18,7 +18,7 @@ import { Platform, PLATFORM_LABEL, type ContainerInspectInfo, -} from './types'; +} from './types.ts'; const INTERACTIVE_EXEC_CLOSE_CAPTURE_LIMIT = 256 * 1024; // 256 KiB of characters (~512 KiB memory) diff --git a/src/lib/containerRegistry.port.ts b/src/lib/containerRegistry.port.ts index a0490a7..afd1caa 100644 --- a/src/lib/containerRegistry.port.ts +++ b/src/lib/containerRegistry.port.ts @@ -1,4 +1,4 @@ -import type { ContainerMount } from './container.mounts'; +import type { ContainerMount } from './container.mounts.ts'; export type RegisterContainerStartInput = { containerId: string; diff --git a/src/lib/dockerClient.port.ts b/src/lib/dockerClient.port.ts index bcced5b..be05dd6 100644 --- a/src/lib/dockerClient.port.ts +++ b/src/lib/dockerClient.port.ts @@ -1,4 +1,4 @@ -import type { ContainerHandle } from './container.handle'; +import type { ContainerHandle } from './container.handle.ts'; import type { ContainerInspectInfo, ContainerOpts, @@ -9,7 +9,7 @@ import type { LogsStreamOptions, LogsStreamSession, Platform, -} from './types'; +} from './types.ts'; export type DockerEventFilters = Record>; diff --git a/src/service/grpc/server.ts b/src/service/grpc/server.ts index 1969610..07e2070 100644 --- a/src/service/grpc/server.ts +++ b/src/service/grpc/server.ts @@ -89,12 +89,12 @@ import { } from '../../proto/grpc.js'; import { timestampFromDate } from '@bufbuild/protobuf/wkt'; import { create } from '@bufbuild/protobuf'; -import type { ContainerService, InteractiveExecSession, LogsStreamSession, NonceCache } from '../..'; -import type { ContainerHandle } from '../../lib/container.handle'; -import { verifyAuthHeaders } from '../..'; -import type { RunnerConfig } from '../config'; -import { createDockerEventsParser } from '../dockerEvents.parser'; -import { startWorkloadRequestToContainerOpts } from '../../contracts/workload.grpc'; +import type { ContainerService, InteractiveExecSession, LogsStreamSession, NonceCache } from '../../index.ts'; +import type { ContainerHandle } from '../../lib/container.handle.ts'; +import { verifyAuthHeaders } from '../../index.ts'; +import type { RunnerConfig } from '../config.ts'; +import { createDockerEventsParser } from '../dockerEvents.parser.ts'; +import { startWorkloadRequestToContainerOpts } from '../../contracts/workload.grpc.ts'; type ExecStream = ServerDuplexStream; diff --git a/src/service/main.ts b/src/service/main.ts index d7e70ef..329fc4e 100644 --- a/src/service/main.ts +++ b/src/service/main.ts @@ -1,9 +1,9 @@ -import './env'; +import './env.ts'; import { ServerCredentials } from '@grpc/grpc-js'; -import { ContainerService, NonceCache } from '..'; -import { loadRunnerConfig } from './config'; -import { createRunnerGrpcServer } from './grpc/server'; +import { ContainerService, NonceCache } from '../index.ts'; +import { loadRunnerConfig } from './config.ts'; +import { createRunnerGrpcServer } from './grpc/server.ts'; async function bootstrap(): Promise { try { diff --git a/tsconfig.json b/tsconfig.json index 5df4541..7d0b8e7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,6 +9,7 @@ "target": "ES2022", "module": "ESNext", "moduleResolution": "Bundler", + "rewriteRelativeImportExtensions": true, "rootDir": "src", "outDir": "dist", "tsBuildInfoFile": "./dist/tsconfig.tsbuildinfo",