From 53c7dd328b7581ec10245fbe044fafedf42e928f Mon Sep 17 00:00:00 2001 From: Matt Godbolt Date: Sun, 1 Feb 2026 20:50:46 -0600 Subject: [PATCH] Configure Biome import organiser with grouped imports (#8431) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enable Biome's `organizeImports` with groups matching the original ESLint `import/order` configuration: 1. **Node builtins** (`node:fs`, `path`, etc.) 2. *(blank line)* 3. **Third-party packages** (`express`, `@sentry/node`, etc.) 4. *(blank line)* 5. **Local/relative imports** (`../foo.js`, `./bar.js`, aliases) This resolves the inconsistency where Biome wasn't enforcing import grouping, meaning new files would lose the blank-line separation that the old ESLint config enforced. ### Impact - **354 files** updated out of 738 checked (~48%) - **+188 / -240 lines** (net -52) — almost entirely single blank line additions/removals between import groups - No import reordering; purely group separator consistency Fixes #7373 🤖 Generated by LLM (Claude, via OpenClaw) --- biome.json | 18 ++++++++++++++++++ lib/app/cli.ts | 1 + lib/app/config.ts | 1 + lib/app/controllers.ts | 1 + lib/app/main.interfaces.ts | 1 + lib/app/routes-setup.ts | 1 + lib/app/server-listening.ts | 1 + lib/app/server.interfaces.ts | 1 + lib/app/static-assets.ts | 1 + lib/app/url-handlers.ts | 1 + lib/artifact-utils.ts | 1 - lib/asm-docs/index.ts | 1 - lib/aws.ts | 1 - lib/base-compiler.ts | 1 + lib/buildenvsetup/base.ts | 1 - lib/buildenvsetup/ceconan-circle.ts | 1 - lib/buildenvsetup/ceconan-rust.ts | 1 - lib/buildenvsetup/ceconan.ts | 2 +- lib/buildenvsetup/index.ts | 1 - lib/cache/base.ts | 1 - lib/cache/from-config.ts | 1 - lib/cache/in-memory.ts | 1 - lib/cache/multi.ts | 1 - lib/cache/null.ts | 1 - lib/cache/on-disk.ts | 2 +- lib/cache/s3.ts | 4 ++-- lib/cfg/cfg-parsers/clang.ts | 1 - lib/cfg/cfg-parsers/index.ts | 1 - lib/cfg/cfg-parsers/llvm-ir.ts | 1 - lib/cfg/cfg-parsers/oat.ts | 1 - lib/cfg/cfg.ts | 1 - lib/cfg/instruction-sets/arm.ts | 1 - lib/cfg/instruction-sets/index.ts | 1 - lib/cfg/instruction-sets/llvm-ir.ts | 1 - lib/cfg/instruction-sets/python.ts | 1 - lib/compilation-env.ts | 3 +-- lib/compiler-arguments.ts | 2 +- lib/compiler-finder.ts | 2 +- lib/compilers/argument-parsers.ts | 2 +- lib/compilers/assembly.ts | 1 - lib/compilers/c2rust.ts | 1 + lib/compilers/c3c.ts | 1 + lib/compilers/carbon.ts | 1 + lib/compilers/cc65.ts | 1 + lib/compilers/circle.ts | 1 - lib/compilers/circt.ts | 1 - lib/compilers/clangcl.ts | 1 - lib/compilers/clojure.ts | 2 ++ lib/compilers/crystal.ts | 1 - lib/compilers/d8.ts | 2 +- lib/compilers/dart.ts | 1 - lib/compilers/dex2oat.ts | 1 + lib/compilers/dmd.ts | 1 - lib/compilers/dosbox-compiler.ts | 1 + lib/compilers/dotnet.ts | 1 + lib/compilers/elixir.ts | 1 - lib/compilers/elixirasm.ts | 1 - lib/compilers/erlang.ts | 1 - lib/compilers/erlangasm.ts | 1 - lib/compilers/fortran.ts | 1 - lib/compilers/gcc.ts | 1 + lib/compilers/gccrs.ts | 1 - lib/compilers/glsl.ts | 1 - lib/compilers/gnucobol.ts | 1 - lib/compilers/golang.ts | 2 +- lib/compilers/haskell.ts | 1 - lib/compilers/helion.ts | 1 - lib/compilers/index.ts | 1 - lib/compilers/ispc.ts | 2 +- lib/compilers/java.ts | 2 +- lib/compilers/julia.ts | 1 - lib/compilers/kotlin.ts | 1 - lib/compilers/ldc.ts | 2 +- lib/compilers/lfortran.ts | 1 - lib/compilers/llc.ts | 1 - lib/compilers/llvm-mca.ts | 1 - lib/compilers/llvm-mos.ts | 1 - lib/compilers/madpascal.ts | 1 - lib/compilers/micropython.ts | 2 ++ lib/compilers/mlir.ts | 1 - lib/compilers/mojo.ts | 1 + lib/compilers/mrustc.ts | 1 - lib/compilers/nasm.ts | 1 - lib/compilers/nim.ts | 2 +- lib/compilers/numba.ts | 1 - lib/compilers/nvcc.ts | 1 - lib/compilers/nvrtc.ts | 1 - lib/compilers/ocaml.ts | 1 - lib/compilers/opt.ts | 1 - lib/compilers/osaca.ts | 1 - lib/compilers/pascal-win.ts | 1 - lib/compilers/pascal.ts | 2 +- lib/compilers/perl.ts | 1 - lib/compilers/ptxas.ts | 1 - lib/compilers/python.ts | 1 - lib/compilers/r8.ts | 3 ++- lib/compilers/ruby.ts | 1 - lib/compilers/rust.ts | 1 + lib/compilers/rustc-cg-gcc.ts | 1 - lib/compilers/scala.ts | 1 - lib/compilers/sdcc.ts | 1 - lib/compilers/solidity-zksync.ts | 1 - lib/compilers/solidity.ts | 1 - lib/compilers/sway.ts | 1 + lib/compilers/swift.ts | 1 - lib/compilers/tablegen.ts | 1 - lib/compilers/tendra.ts | 1 - lib/compilers/toit.ts | 1 - lib/compilers/triton.ts | 1 + lib/compilers/turboc.ts | 1 - lib/compilers/typescript-native.ts | 1 - lib/compilers/wasmtime.ts | 1 - lib/compilers/win32-mingw-clang.ts | 1 - lib/compilers/win32-mingw-gcc.ts | 1 - lib/compilers/win32-vc6.ts | 1 - lib/compilers/wine-vc.ts | 1 - lib/compilers/wsl-vc.ts | 1 - lib/compilers/ylc.ts | 1 - lib/compilers/z88dk.ts | 1 - lib/compilers/zigcc.ts | 1 - lib/compilers/zigcxx.ts | 1 - lib/demangler/base.ts | 1 - lib/demangler/index.ts | 1 - lib/demangler/llvm.ts | 1 - lib/demangler/nvhpc.ts | 1 - lib/demangler/pascal.ts | 1 - lib/demangler/tic2000.ts | 1 - lib/demangler/win32-llvm.ts | 1 - lib/demangler/win32.ts | 1 - lib/exec.ts | 2 ++ lib/execution/base-execution-env.ts | 1 - lib/execution/dotnet-execution-env.ts | 1 - lib/execution/events-websocket.ts | 1 + lib/execution/execution-query.ts | 1 - lib/execution/execution-triple.ts | 1 - lib/execution/index.ts | 1 - lib/execution/remote-execution-env.ts | 1 - lib/execution/sqs-execution-queue.ts | 1 - lib/external-parsers/base.ts | 1 - lib/external-parsers/index.ts | 1 - lib/external-parsers/plain.ts | 1 + lib/formatters/base.ts | 1 - lib/formatters/clang-format.ts | 1 - lib/formatters/dartformat.ts | 1 - lib/formatters/gofmt.ts | 1 - lib/formatters/index.ts | 1 - lib/formatters/rustfmt.ts | 1 - lib/formatters/vfmt.ts | 1 - lib/formatting-service.ts | 1 - lib/handlers/api.ts | 1 - .../api/assembly-documentation-controller.ts | 2 +- lib/handlers/api/formatting-controller.ts | 1 - lib/handlers/api/healthcheck-controller.ts | 1 - lib/handlers/api/site-template-controller.ts | 1 - lib/handlers/api/source-controller.ts | 2 +- lib/handlers/compile.ts | 2 +- lib/handlers/route-api.ts | 1 - lib/llvm-ast.ts | 1 - lib/llvm-ir.ts | 1 - lib/logger.ts | 1 - lib/objdumper/index.ts | 1 - lib/options-handler.ts | 1 + lib/parsers/asm-parser-beebasm.ts | 1 - lib/parsers/asm-parser-cc65.ts | 1 - lib/parsers/asm-parser-cpp.ts | 1 - lib/parsers/asm-parser-dart.ts | 1 - lib/parsers/asm-parser-dotnet.ts | 1 - lib/parsers/asm-parser-ewavr.ts | 1 - lib/parsers/asm-parser-hexagon.ts | 1 - lib/parsers/asm-parser-mads.ts | 1 - lib/parsers/asm-parser-mlir.ts | 1 - lib/parsers/asm-parser-msp430.ts | 1 - lib/parsers/asm-parser-odin.ts | 1 - lib/parsers/asm-parser-orca.ts | 1 - lib/parsers/asm-parser-ptx.ts | 1 - lib/parsers/asm-parser-sass.ts | 1 - lib/parsers/asm-parser-spirv.ts | 1 - lib/parsers/asm-parser-tic2000.ts | 1 - lib/parsers/asm-parser-turboc.ts | 1 - lib/parsers/asm-parser-vc.ts | 1 - lib/parsers/asm-parser-vc6.ts | 1 - lib/parsers/asm-parser-z88dk.ts | 1 - lib/parsers/asm-parser.ts | 1 - lib/parsers/asm-raw.ts | 1 - lib/properties.ts | 1 - lib/runtime-tools/heaptrack-wrapper.ts | 1 - lib/s3-handler.ts | 1 - lib/sentry.ts | 1 - lib/shortener/index.ts | 1 - lib/stats.ts | 1 - lib/storage/index.ts | 1 - lib/storage/local.ts | 2 +- lib/storage/remote.ts | 1 - lib/storage/s3.ts | 1 - lib/temp.ts | 1 + lib/tooling/bloaty-tool.ts | 1 - lib/tooling/bronto-refactor-tool.ts | 2 +- lib/tooling/clang-format-tool.ts | 1 - lib/tooling/clang-query-tool.ts | 1 - lib/tooling/clang-tidy-tool.ts | 1 - lib/tooling/clippy-tool.ts | 1 - lib/tooling/compiler-dropin-tool.ts | 2 +- lib/tooling/index.ts | 1 - lib/tooling/llvm-cov-tool.ts | 1 - lib/tooling/llvm-dwarfdump-tool.ts | 1 - lib/tooling/llvm-mca-tool.ts | 1 - lib/tooling/microsoft-analysis-tool.ts | 1 - lib/tooling/miri-tool.ts | 1 - lib/tooling/nm-tool.ts | 1 - lib/tooling/osaca-tool.ts | 1 - lib/tooling/pahole-tool.ts | 1 - lib/tooling/pvs-studio-tool.ts | 1 - lib/tooling/readelf-tool.ts | 1 - lib/tooling/rustfmt-tool.ts | 1 - lib/tooling/sonar-tool.ts | 1 - lib/tooling/strings-tool.ts | 1 - lib/tooling/x86to6502-tool.ts | 1 - lib/utils.ts | 1 + shared/url-serialization.ts | 1 + static/ansi-to-html.ts | 1 + static/artifact-handler.ts | 2 ++ static/bootstrap-utils.ts | 1 + static/colour.ts | 1 + static/compiler-service.ts | 1 + static/components.ts | 1 + static/event-map.ts | 1 + static/formatter-registry.ts | 1 + static/graph-layout-core.ts | 1 + static/history.ts | 1 + static/hub.ts | 1 + static/line-colouring.ts | 1 + static/modes/carbon-mode.ts | 1 - static/modes/cpp-for-opencl-mode.ts | 2 -- static/modes/cppcircle-mode.ts | 3 +-- static/modes/cppfront-mode.ts | 3 +-- static/modes/cppp-mode.ts | 2 -- static/modes/cppx-blue-mode.ts | 3 +-- static/modes/cuda-mode.ts | 3 +-- static/modes/glsl-mode.ts | 2 -- static/modes/hlsl-mode.ts | 2 -- static/modes/hylo-mode.ts | 1 - static/modes/ispc-mode.ts | 2 -- static/modes/nc-mode.ts | 2 -- static/modes/openclc-mode.ts | 2 -- static/modes/ptx-mode.ts | 1 - static/modes/rust-mode.ts | 2 -- static/modes/slang-mode.ts | 1 - static/multifile-service.ts | 1 + static/panes/ast-view.ts | 1 + static/panes/cfg-view.ts | 1 + static/panes/clangir-view.ts | 1 + static/panes/clojuremacroexp-view.ts | 1 + static/panes/compiler.ts | 2 ++ static/panes/conformance-view.ts | 1 + static/panes/device-view.ts | 1 + static/panes/diff.ts | 1 + static/panes/editor.ts | 4 ++++ static/panes/executor.ts | 1 + static/panes/explain-view-utils.ts | 1 + static/panes/explain-view.ts | 1 + static/panes/flags-view.ts | 1 + static/panes/gccdump-view.ts | 1 + static/panes/gnatdebug-view.ts | 1 + static/panes/gnatdebugtree-view.ts | 1 + static/panes/haskellcmm-view.ts | 1 + static/panes/haskellcore-view.ts | 1 + static/panes/haskellstg-view.ts | 1 + static/panes/opt-pipeline.ts | 1 + static/panes/opt-view.ts | 1 + static/panes/output.ts | 1 + static/panes/pane.ts | 1 + static/panes/pp-view.ts | 1 + static/panes/rusthir-view.ts | 1 + static/panes/rustmacroexp-view.ts | 1 + static/panes/rustmir-view.ts | 1 + static/panes/stack-usage-view.ts | 1 + static/panes/tool-input-view.ts | 1 + static/panes/tool.ts | 1 + static/panes/tree.ts | 1 + static/panes/yul-view.ts | 1 + static/print-view.ts | 1 - static/sentry.ts | 1 + static/settings.ts | 1 + static/sharing.ts | 1 + static/tests/components-tests.ts | 1 + static/tests/remote-utils-tests.ts | 1 + static/tests/url-tests.ts | 1 + static/themes.ts | 1 + static/url.ts | 1 + static/utils.ts | 1 + static/widgets/compiler-overrides.ts | 1 + static/widgets/compiler-picker-popup.ts | 1 + static/widgets/compiler-picker.ts | 1 + static/widgets/compiler-version-info.ts | 1 + static/widgets/fontscale.ts | 2 ++ static/widgets/history-widget.ts | 1 + static/widgets/libs-widget.ts | 1 + static/widgets/load-save.ts | 1 + static/widgets/pane-renaming.ts | 1 + static/widgets/runtime-tools.ts | 1 + static/widgets/site-templates-widget.ts | 1 + static/widgets/timing-info-widget.ts | 1 + test/analysis-tests.ts | 1 - test/android-tests.ts | 1 - test/app/cli-tests.ts | 2 ++ test/app/compiler-discovery-tests.ts | 2 ++ test/app/config-tests.ts | 1 + test/app/main-tests.ts | 2 ++ test/app/rendering-tests.ts | 1 + test/app/server-config-tests.ts | 1 + test/app/server-listening-tests.ts | 1 + test/app/server-tests.ts | 1 + test/app/static-assets-tests.ts | 1 + test/app/temp-dir-tests.ts | 1 + test/app/url-handlers-tests.ts | 1 + test/asm-parser-subclass-integration-tests.ts | 1 + test/asm-parser-tests.ts | 1 + test/asm-tests.ts | 1 - test/assert-tests.ts | 1 + test/aws-tests.ts | 1 + test/cache-tests.ts | 1 - test/cfg-tests.ts | 1 - test/checks.ts | 1 + test/clojure-tests.ts | 1 - test/compilation-env-tests.ts | 1 + test/compiler-finder-tests.ts | 1 + test/compilers/clang-tests.ts | 1 + test/compilers/gcc-tests.ts | 1 + test/d-tests.ts | 1 - test/filter-tests.ts | 1 - test/handlers/noscript-tests.ts | 1 + test/handlers/route-api-test.ts | 2 ++ test/java-tests.ts | 1 - test/label-processor-tests.ts | 1 + test/library-tests.ts | 2 +- test/llvm-ir-tests.ts | 1 - test/nim-tests.ts | 1 - test/numba-tests.ts | 1 - test/objdumper-tests.ts | 1 - test/odin-tests.ts | 1 - test/options-handler.ts | 1 - test/packager-tests.ts | 1 - test/pascal-tests.ts | 2 +- test/ppci-tests.ts | 1 - test/runtime-tools/heaptrack-wrapper-tests.ts | 1 + test/sponsors-test.ts | 1 - test/statenormalisation-tests.ts | 1 + test/symbol-store-tests.ts | 1 + test/temp-tests.ts | 1 + test/tool-tests.ts | 1 + test/url-serialization.ts | 1 + test/utils-tests.ts | 1 - test/utils.ts | 1 + test/vc-asm-parser-tests.ts | 1 + test/win-path-tests.ts | 1 - 355 files changed, 188 insertions(+), 240 deletions(-) diff --git a/biome.json b/biome.json index 07025a755..f78772c5d 100644 --- a/biome.json +++ b/biome.json @@ -81,6 +81,24 @@ "quoteStyle": "single" } }, + "assist": { + "actions": { + "source": { + "organizeImports": { + "level": "on", + "options": { + "groups": [ + ":NODE:", + ":BLANK_LINE:", + [":PACKAGE:", ":PACKAGE_WITH_PROTOCOL:", ":URL:"], + ":BLANK_LINE:", + [":ALIAS:", ":PATH:"] + ] + } + } + } + } + }, "json": { "formatter": { "indentWidth": 2 diff --git a/lib/app/cli.ts b/lib/app/cli.ts index f0d0d5793..144ce6fbf 100644 --- a/lib/app/cli.ts +++ b/lib/app/cli.ts @@ -25,6 +25,7 @@ import child_process from 'node:child_process'; import * as fs from 'node:fs'; import path from 'node:path'; + import {Command} from 'commander'; import {AppArguments} from '../app.interfaces.js'; diff --git a/lib/app/config.ts b/lib/app/config.ts index 305c4af59..3483b34ec 100644 --- a/lib/app/config.ts +++ b/lib/app/config.ts @@ -25,6 +25,7 @@ import os from 'node:os'; import path from 'node:path'; import process from 'node:process'; + import PromClient from 'prom-client'; import urljoin from 'url-join'; diff --git a/lib/app/controllers.ts b/lib/app/controllers.ts index 22ccc82d3..d5461694c 100644 --- a/lib/app/controllers.ts +++ b/lib/app/controllers.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import express from 'express'; + import {CompilationQueue} from '../compilation-queue.js'; import {FormattingService} from '../formatting-service.js'; import {AssemblyDocumentationController} from '../handlers/api/assembly-documentation-controller.js'; diff --git a/lib/app/main.interfaces.ts b/lib/app/main.interfaces.ts index 3ea60f1e3..5cd06f5f0 100644 --- a/lib/app/main.interfaces.ts +++ b/lib/app/main.interfaces.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import type {Express} from 'express'; + import type {AppArguments} from '../app.interfaces.js'; import type {PropertyGetter} from '../properties.interfaces.js'; import type {AppConfiguration} from './config.interfaces.js'; diff --git a/lib/app/routes-setup.ts b/lib/app/routes-setup.ts index 419ca59b4..8908e793c 100644 --- a/lib/app/routes-setup.ts +++ b/lib/app/routes-setup.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import type {Router} from 'express'; + import type {AppArguments} from '../app.interfaces.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {CompileHandler} from '../handlers/compile.js'; diff --git a/lib/app/server-listening.ts b/lib/app/server-listening.ts index b15566195..3c05b52b9 100644 --- a/lib/app/server-listening.ts +++ b/lib/app/server-listening.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import process from 'node:process'; + import express from 'express'; import PromClient from 'prom-client'; import systemdSocket from 'systemd-socket'; diff --git a/lib/app/server.interfaces.ts b/lib/app/server.interfaces.ts index fc6b0b750..c7ff5c8da 100644 --- a/lib/app/server.interfaces.ts +++ b/lib/app/server.interfaces.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import type {Express, Request, Response, Router} from 'express'; + import type {GoldenLayoutRootStruct} from '../clientstate-normalizer.js'; import type {HttpController} from '../handlers/api/controller.interfaces.js'; import type {ShortLinkMetaData} from '../handlers/handler.interfaces.js'; diff --git a/lib/app/static-assets.ts b/lib/app/static-assets.ts index e5ae16fd6..cbf4211e1 100644 --- a/lib/app/static-assets.ts +++ b/lib/app/static-assets.ts @@ -24,6 +24,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import type {Router} from 'express'; import express from 'express'; import urljoin from 'url-join'; diff --git a/lib/app/url-handlers.ts b/lib/app/url-handlers.ts index 8e680ee4c..b31db0f0f 100644 --- a/lib/app/url-handlers.ts +++ b/lib/app/url-handlers.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import url from 'node:url'; + import type {NextFunction, Request, Response} from 'express'; import {unwrapString} from '../assert.js'; diff --git a/lib/artifact-utils.ts b/lib/artifact-utils.ts index eceffb7e7..038aaf225 100644 --- a/lib/artifact-utils.ts +++ b/lib/artifact-utils.ts @@ -27,7 +27,6 @@ import path from 'node:path'; import {BufferOkFunc, BuildResult, CompilationResult} from '../types/compilation/compilation.interfaces.js'; import {Artifact, ArtifactType} from '../types/tool.interfaces.js'; - import {HeaptrackWrapper} from './runtime-tools/heaptrack-wrapper.js'; import * as utils from './utils.js'; diff --git a/lib/asm-docs/index.ts b/lib/asm-docs/index.ts index 868750cae..7ef168551 100644 --- a/lib/asm-docs/index.ts +++ b/lib/asm-docs/index.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {makeKeyedTypeGetter} from '../keyed-type.js'; - import * as all from './_all.js'; export * from './_all.js'; diff --git a/lib/aws.ts b/lib/aws.ts index 377a87057..822a467aa 100644 --- a/lib/aws.ts +++ b/lib/aws.ts @@ -25,7 +25,6 @@ import {EC2, Instance} from '@aws-sdk/client-ec2'; import {SSM} from '@aws-sdk/client-ssm'; import {fromNodeProviderChain} from '@aws-sdk/credential-providers'; - import {AwsCredentialIdentityProvider} from '@smithy/types/dist-types/identity/awsCredentialIdentity.js'; import {unwrap} from './assert.js'; diff --git a/lib/base-compiler.ts b/lib/base-compiler.ts index a52d635c1..0fdea76ef 100644 --- a/lib/base-compiler.ts +++ b/lib/base-compiler.ts @@ -29,6 +29,7 @@ import path from 'node:path'; import * as PromClient from 'prom-client'; import _ from 'underscore'; import {parseAllDocuments} from 'yaml'; + import {splitArguments, unique} from '../shared/common-utils.js'; import {OptRemark} from '../static/panes/opt-view.interfaces.js'; import {PPOptions} from '../static/panes/pp-view.interfaces.js'; diff --git a/lib/buildenvsetup/base.ts b/lib/buildenvsetup/base.ts index c19dc86b4..2b8347ae3 100644 --- a/lib/buildenvsetup/base.ts +++ b/lib/buildenvsetup/base.ts @@ -34,7 +34,6 @@ import {CompilationEnvironment} from '../compilation-env.js'; import {logger} from '../logger.js'; import {VersionInfo} from '../options-handler.js'; import * as utils from '../utils.js'; - import type {BuildEnvDownloadInfo} from './buildenv.interfaces.js'; export type ExecCompilerCachedFunc = ( diff --git a/lib/buildenvsetup/ceconan-circle.ts b/lib/buildenvsetup/ceconan-circle.ts index 22dabf18e..a4a488be4 100644 --- a/lib/buildenvsetup/ceconan-circle.ts +++ b/lib/buildenvsetup/ceconan-circle.ts @@ -25,7 +25,6 @@ import {CacheKey} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {BuildEnvSetupCeConanDirect, ConanBuildProperties} from './ceconan.js'; export class BuildEnvSetupCeConanCircleDirect extends BuildEnvSetupCeConanDirect { diff --git a/lib/buildenvsetup/ceconan-rust.ts b/lib/buildenvsetup/ceconan-rust.ts index eeaea8d59..53935a42c 100644 --- a/lib/buildenvsetup/ceconan-rust.ts +++ b/lib/buildenvsetup/ceconan-rust.ts @@ -30,7 +30,6 @@ import {CacheKey} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {VersionInfo} from '../options-handler.js'; - import {ExecCompilerCachedFunc} from './base.js'; import {BuildEnvSetupCeConanDirect} from './ceconan.js'; diff --git a/lib/buildenvsetup/ceconan.ts b/lib/buildenvsetup/ceconan.ts index b82cc25af..38152405d 100644 --- a/lib/buildenvsetup/ceconan.ts +++ b/lib/buildenvsetup/ceconan.ts @@ -27,6 +27,7 @@ import os from 'node:os'; import path from 'node:path'; import {Readable} from 'node:stream'; import zlib from 'node:zlib'; + import tar from 'tar-stream'; import _ from 'underscore'; @@ -36,7 +37,6 @@ import {CompilationEnvironment} from '../compilation-env.js'; import {logger} from '../logger.js'; import {VersionInfo} from '../options-handler.js'; import * as utils from '../utils.js'; - import {BuildEnvSetupBase} from './base.js'; import type {BuildEnvDownloadInfo} from './buildenv.interfaces.js'; diff --git a/lib/buildenvsetup/index.ts b/lib/buildenvsetup/index.ts index 9b70a6b29..34f270e90 100644 --- a/lib/buildenvsetup/index.ts +++ b/lib/buildenvsetup/index.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {makeKeyedTypeGetter} from '../keyed-type.js'; - import * as all from './_all.js'; export * from './_all.js'; diff --git a/lib/cache/base.ts b/lib/cache/base.ts index 814ccdd30..bb38011ed 100644 --- a/lib/cache/base.ts +++ b/lib/cache/base.ts @@ -29,7 +29,6 @@ import {Counter} from 'prom-client'; import type {CacheableValue, GetResult} from '../../types/cache.interfaces.js'; import {logger} from '../logger.js'; import {getHash} from '../utils.js'; - import {Cache, CacheStats} from './base.interfaces.js'; const HashVersion = 'Compiler Explorer Cache Version 1'; diff --git a/lib/cache/from-config.ts b/lib/cache/from-config.ts index 93e50e9a0..fcf7991e4 100644 --- a/lib/cache/from-config.ts +++ b/lib/cache/from-config.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {logger} from '../logger.js'; - import {Cache} from './base.interfaces.js'; import {InMemoryCache} from './in-memory.js'; import {MultiCache} from './multi.js'; diff --git a/lib/cache/in-memory.ts b/lib/cache/in-memory.ts index ae2d69fec..68b30c3be 100644 --- a/lib/cache/in-memory.ts +++ b/lib/cache/in-memory.ts @@ -27,7 +27,6 @@ import {Buffer} from 'buffer'; import {LRUCache} from 'lru-cache'; import type {GetResult} from '../../types/cache.interfaces.js'; - import {BaseCache} from './base.js'; export class InMemoryCache extends BaseCache { diff --git a/lib/cache/multi.ts b/lib/cache/multi.ts index 75cb90661..556b98ff5 100644 --- a/lib/cache/multi.ts +++ b/lib/cache/multi.ts @@ -26,7 +26,6 @@ import {Buffer} from 'buffer'; import type {GetResult} from '../../types/cache.interfaces.js'; import {unwrap} from '../assert.js'; - import {BaseCache} from './base.js'; // A write-through multiple cache. diff --git a/lib/cache/null.ts b/lib/cache/null.ts index 11a644ca8..3c77fec9b 100644 --- a/lib/cache/null.ts +++ b/lib/cache/null.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import type {GetResult} from '../../types/cache.interfaces.js'; - import {BaseCache} from './base.js'; export class NullCache extends BaseCache { diff --git a/lib/cache/on-disk.ts b/lib/cache/on-disk.ts index f77b1ed8b..c4b998c04 100644 --- a/lib/cache/on-disk.ts +++ b/lib/cache/on-disk.ts @@ -26,11 +26,11 @@ import crypto from 'node:crypto'; import fs from 'node:fs'; import path from 'node:path'; import {Buffer} from 'buffer'; + import {LRUCache} from 'lru-cache'; import type {GetResult} from '../../types/cache.interfaces.js'; import {logger} from '../logger.js'; - import {BaseCache} from './base.js'; // With thanks to https://gist.github.com/kethinov/6658166 diff --git a/lib/cache/s3.ts b/lib/cache/s3.ts index dbb1a291e..c8b98ea78 100644 --- a/lib/cache/s3.ts +++ b/lib/cache/s3.ts @@ -22,15 +22,15 @@ // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // POSSIBILITY OF SUCH DAMAGE. -import {StorageClass} from '@aws-sdk/client-s3'; import {Buffer} from 'buffer'; +import {StorageClass} from '@aws-sdk/client-s3'; + import type {GetResult} from '../../types/cache.interfaces.js'; import {logger} from '../logger.js'; import type {S3HandlerOptions} from '../s3-handler.interfaces.js'; import {S3Bucket} from '../s3-handler.js'; import {SentryCapture} from '../sentry.js'; - import {BaseCache} from './base.js'; function messageFor(e: any) { diff --git a/lib/cfg/cfg-parsers/clang.ts b/lib/cfg/cfg-parsers/clang.ts index d6b0f859f..7e93678c7 100644 --- a/lib/cfg/cfg-parsers/clang.ts +++ b/lib/cfg/cfg-parsers/clang.ts @@ -25,7 +25,6 @@ import _ from 'underscore'; import type {ResultLine} from '../../../types/resultline/resultline.interfaces.js'; - import {BaseCFGParser} from './base.js'; export class ClangCFGParser extends BaseCFGParser { diff --git a/lib/cfg/cfg-parsers/index.ts b/lib/cfg/cfg-parsers/index.ts index 533109b3e..d63b53779 100644 --- a/lib/cfg/cfg-parsers/index.ts +++ b/lib/cfg/cfg-parsers/index.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {makeDefaultedKeyedTypeGetter} from '../../keyed-type.js'; - import * as all from './_all.js'; import {BaseCFGParser} from './base.js'; diff --git a/lib/cfg/cfg-parsers/llvm-ir.ts b/lib/cfg/cfg-parsers/llvm-ir.ts index f343c6afd..0b70a62f5 100644 --- a/lib/cfg/cfg-parsers/llvm-ir.ts +++ b/lib/cfg/cfg-parsers/llvm-ir.ts @@ -25,7 +25,6 @@ import {assert, unwrap} from '../../assert.js'; import {SentryCapture} from '../../sentry.js'; import {BaseInstructionSetInfo} from '../instruction-sets/base.js'; - import {AssemblyLine, BaseCFGParser, Edge, Node, Range} from './base.js'; export type BBRange = { diff --git a/lib/cfg/cfg-parsers/oat.ts b/lib/cfg/cfg-parsers/oat.ts index 749c2fdb8..019c4a2a4 100644 --- a/lib/cfg/cfg-parsers/oat.ts +++ b/lib/cfg/cfg-parsers/oat.ts @@ -27,7 +27,6 @@ import _ from 'underscore'; import {EdgeColor} from '../../../types/compilation/cfg.interfaces.js'; import {logger} from '../../logger.js'; import {BaseInstructionSetInfo, InstructionType} from '../instruction-sets/base.js'; - import {AssemblyLine, BaseCFGParser, BBRange, CanonicalBB, Edge, Range} from './base.js'; // This currently only covers the default arm64 output. To support dex2oat's diff --git a/lib/cfg/cfg.ts b/lib/cfg/cfg.ts index 4c7c597fa..fd962a43d 100644 --- a/lib/cfg/cfg.ts +++ b/lib/cfg/cfg.ts @@ -24,7 +24,6 @@ import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import type {CompilerInfo} from '../../types/compiler.interfaces.js'; - import {AssemblyLine, BaseCFGParser, Edge, getParserByKey, Node} from './cfg-parsers/index.js'; import {OatCFGParser} from './cfg-parsers/oat.js'; import {getInstructionSetByKey} from './instruction-sets/index.js'; diff --git a/lib/cfg/instruction-sets/arm.ts b/lib/cfg/instruction-sets/arm.ts index 2f6c105a4..33b8686b0 100644 --- a/lib/cfg/instruction-sets/arm.ts +++ b/lib/cfg/instruction-sets/arm.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {InstructionSet} from '../../../types/instructionsets.js'; - import {BaseInstructionSetInfo, InstructionType} from './base.js'; export class ArmInstructionSetInfo extends BaseInstructionSetInfo { diff --git a/lib/cfg/instruction-sets/index.ts b/lib/cfg/instruction-sets/index.ts index 7faf06ae7..ae4427ff5 100644 --- a/lib/cfg/instruction-sets/index.ts +++ b/lib/cfg/instruction-sets/index.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {makeDefaultedKeyedTypeGetter} from '../../keyed-type.js'; - import * as all from './_all.js'; import {BaseInstructionSetInfo} from './base.js'; diff --git a/lib/cfg/instruction-sets/llvm-ir.ts b/lib/cfg/instruction-sets/llvm-ir.ts index 970f8140f..1aa476c4a 100644 --- a/lib/cfg/instruction-sets/llvm-ir.ts +++ b/lib/cfg/instruction-sets/llvm-ir.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {InstructionSet} from '../../../types/instructionsets.js'; - import {BaseInstructionSetInfo, InstructionType} from './base.js'; export class LlvmIrInstructionSetInfo extends BaseInstructionSetInfo { diff --git a/lib/cfg/instruction-sets/python.ts b/lib/cfg/instruction-sets/python.ts index dbcbe5624..df124de4f 100644 --- a/lib/cfg/instruction-sets/python.ts +++ b/lib/cfg/instruction-sets/python.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {InstructionSet} from '../../../types/instructionsets.js'; - import {BaseInstructionSetInfo, InstructionType} from './base.js'; export class PythonInstructionSetInfo extends BaseInstructionSetInfo { diff --git a/lib/compilation-env.ts b/lib/compilation-env.ts index 2e769c3a8..95b8e3d11 100644 --- a/lib/compilation-env.ts +++ b/lib/compilation-env.ts @@ -23,13 +23,12 @@ // POSSIBILITY OF SUCH DAMAGE. import child_process from 'node:child_process'; - import fs from 'node:fs/promises'; + import _ from 'underscore'; import type {CacheableValue} from '../types/cache.interfaces.js'; import {CompilerOverrideOptions} from '../types/compilation/compiler-overrides.interfaces.js'; - import {LanguageKey} from '../types/languages.interfaces.js'; import {unwrap} from './assert.js'; import {BaseCompiler} from './base-compiler.js'; diff --git a/lib/compiler-arguments.ts b/lib/compiler-arguments.ts index 0dc8a3a17..791d0d97d 100644 --- a/lib/compiler-arguments.ts +++ b/lib/compiler-arguments.ts @@ -24,10 +24,10 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import _ from 'underscore'; import type {ICompilerArguments, PossibleArguments} from '../types/compiler-arguments.interfaces.js'; - import {unwrap} from './assert.js'; import {logger} from './logger.js'; import type {PropertyGetter} from './properties.interfaces.js'; diff --git a/lib/compiler-finder.ts b/lib/compiler-finder.ts index 733411414..6d3ad764b 100644 --- a/lib/compiler-finder.ts +++ b/lib/compiler-finder.ts @@ -27,6 +27,7 @@ import http from 'node:http'; import https from 'node:https'; import path from 'node:path'; import {promisify} from 'node:util'; + import _ from 'underscore'; import urljoin from 'url-join'; @@ -36,7 +37,6 @@ import {InstructionSet, InstructionSetsList} from '../types/instructionsets.js'; import type {Language, LanguageKey} from '../types/languages.interfaces.js'; import {Tool, ToolInfo} from '../types/tool.interfaces.js'; import {AppArguments} from './app.interfaces.js'; - import {assert, unwrap, unwrapString} from './assert.js'; import {CompileHandler} from './handlers/compile.js'; import {logger} from './logger.js'; diff --git a/lib/compilers/argument-parsers.ts b/lib/compilers/argument-parsers.ts index a0c1e38b9..643f1c94d 100644 --- a/lib/compilers/argument-parsers.ts +++ b/lib/compilers/argument-parsers.ts @@ -24,6 +24,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import * as Sentry from '@sentry/node'; import _ from 'underscore'; @@ -34,7 +35,6 @@ import {BaseCompiler} from '../base-compiler.js'; import {logger} from '../logger.js'; import * as props from '../properties.js'; import * as utils from '../utils.js'; - import {JuliaCompiler} from './julia.js'; export class BaseParser { diff --git a/lib/compilers/assembly.ts b/lib/compilers/assembly.ts index bc890b08d..9702dbba0 100644 --- a/lib/compilers/assembly.ts +++ b/lib/compilers/assembly.ts @@ -40,7 +40,6 @@ import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {AsmRaw} from '../parsers/asm-raw.js'; import {fileExists} from '../utils.js'; - import {BaseParser} from './argument-parsers.js'; export class AssemblyCompiler extends BaseCompiler { diff --git a/lib/compilers/c2rust.ts b/lib/compilers/c2rust.ts index 73557f456..18cffad40 100644 --- a/lib/compilers/c2rust.ts +++ b/lib/compilers/c2rust.ts @@ -1,4 +1,5 @@ import path from 'node:path'; + import {ParsedAsmResult} from '../../types/asmresult/asmresult.interfaces.js'; import {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; diff --git a/lib/compilers/c3c.ts b/lib/compilers/c3c.ts index c342f66a9..860160e25 100644 --- a/lib/compilers/c3c.ts +++ b/lib/compilers/c3c.ts @@ -1,6 +1,7 @@ import path from 'node:path'; import Semver from 'semver'; + import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; diff --git a/lib/compilers/carbon.ts b/lib/compilers/carbon.ts index 9e38a8b8b..1b27941f2 100644 --- a/lib/compilers/carbon.ts +++ b/lib/compilers/carbon.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import fs from 'node:fs/promises'; + import type {ParsedAsmResult} from '../../types/asmresult/asmresult.interfaces.js'; import {CompilationResult, ExecutionOptionsWithEnv} from '../../types/compilation/compilation.interfaces.js'; import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/lib/compilers/cc65.ts b/lib/compilers/cc65.ts index a025d065b..ed62383b3 100644 --- a/lib/compilers/cc65.ts +++ b/lib/compilers/cc65.ts @@ -24,6 +24,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import _ from 'underscore'; import type {CompilationResult, ExecutionOptions} from '../../types/compilation/compilation.interfaces.js'; diff --git a/lib/compilers/circle.ts b/lib/compilers/circle.ts index 857c722d5..db425b641 100644 --- a/lib/compilers/circle.ts +++ b/lib/compilers/circle.ts @@ -27,7 +27,6 @@ import path from 'node:path'; import {ExecutionOptionsWithEnv} from '../../types/compilation/compilation.interfaces.js'; import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; - import {CircleParser} from './argument-parsers.js'; export class CircleCompiler extends BaseCompiler { diff --git a/lib/compilers/circt.ts b/lib/compilers/circt.ts index 1f9e638f9..14ff05406 100644 --- a/lib/compilers/circt.ts +++ b/lib/compilers/circt.ts @@ -27,7 +27,6 @@ import path from 'node:path'; import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {BaseParser} from './argument-parsers.js'; export class CIRCTCompiler extends BaseCompiler { diff --git a/lib/compilers/clangcl.ts b/lib/compilers/clangcl.ts index b706bc9bc..71868f431 100644 --- a/lib/compilers/clangcl.ts +++ b/lib/compilers/clangcl.ts @@ -29,7 +29,6 @@ import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {unwrap} from '../assert.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {Win32Compiler} from './win32.js'; export class ClangCLCompiler extends Win32Compiler { diff --git a/lib/compilers/clojure.ts b/lib/compilers/clojure.ts index 54935bf34..438c0ad3d 100644 --- a/lib/compilers/clojure.ts +++ b/lib/compilers/clojure.ts @@ -24,7 +24,9 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import _ from 'underscore'; + import type {CompilationResult, ExecutionOptionsWithEnv} from '../../types/compilation/compilation.interfaces.js'; import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; diff --git a/lib/compilers/crystal.ts b/lib/compilers/crystal.ts index 4f460303d..274fe8aee 100644 --- a/lib/compilers/crystal.ts +++ b/lib/compilers/crystal.ts @@ -33,7 +33,6 @@ import {unwrap} from '../assert.js'; import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {CrystalAsmParser} from '../parsers/asm-parser-crystal.js'; - import {CrystalParser} from './argument-parsers.js'; export class CrystalCompiler extends BaseCompiler { diff --git a/lib/compilers/d8.ts b/lib/compilers/d8.ts index 7d482ef18..cc10e7588 100644 --- a/lib/compilers/d8.ts +++ b/lib/compilers/d8.ts @@ -24,6 +24,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import _ from 'underscore'; import type {ParsedAsmResult, ParsedAsmResultLine} from '../../types/asmresult/asmresult.interfaces.js'; @@ -35,7 +36,6 @@ import {unwrap} from '../assert.js'; import {BaseCompiler, SimpleOutputFilenameCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {logger} from '../logger.js'; - import * as utils from '../utils.js'; import {JavaCompiler} from './java.js'; import {KotlinCompiler} from './kotlin.js'; diff --git a/lib/compilers/dart.ts b/lib/compilers/dart.ts index f06145356..f38b08620 100644 --- a/lib/compilers/dart.ts +++ b/lib/compilers/dart.ts @@ -35,7 +35,6 @@ import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {DartAsmParser} from '../parsers/asm-parser-dart.js'; import * as utils from '../utils.js'; - import {BaseParser} from './argument-parsers.js'; export class DartCompiler extends BaseCompiler { diff --git a/lib/compilers/dex2oat.ts b/lib/compilers/dex2oat.ts index d87e5447c..29e9bfa40 100644 --- a/lib/compilers/dex2oat.ts +++ b/lib/compilers/dex2oat.ts @@ -24,6 +24,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import _ from 'underscore'; import type {ParsedAsmResult, ParsedAsmResultLine} from '../../types/asmresult/asmresult.interfaces.js'; diff --git a/lib/compilers/dmd.ts b/lib/compilers/dmd.ts index a61540ba9..86820b5a8 100644 --- a/lib/compilers/dmd.ts +++ b/lib/compilers/dmd.ts @@ -29,7 +29,6 @@ import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {ClangParser} from './argument-parsers.js'; export class DMDCompiler extends BaseCompiler { diff --git a/lib/compilers/dosbox-compiler.ts b/lib/compilers/dosbox-compiler.ts index 3f7d6266f..65c8144e0 100644 --- a/lib/compilers/dosbox-compiler.ts +++ b/lib/compilers/dosbox-compiler.ts @@ -24,6 +24,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import type {ExecutionOptionsWithEnv, FiledataPair} from '../../types/compilation/compilation.interfaces.js'; import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import {UnprocessedExecResult} from '../../types/execution/execution.interfaces.js'; diff --git a/lib/compilers/dotnet.ts b/lib/compilers/dotnet.ts index dcd3f5a44..0dca14df1 100644 --- a/lib/compilers/dotnet.ts +++ b/lib/compilers/dotnet.ts @@ -24,6 +24,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import type { CompilationResult, ExecutionOptions, diff --git a/lib/compilers/elixir.ts b/lib/compilers/elixir.ts index 0e8ff2b71..028c2b180 100644 --- a/lib/compilers/elixir.ts +++ b/lib/compilers/elixir.ts @@ -26,7 +26,6 @@ import path from 'node:path'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; - import {ElixirParser} from './argument-parsers.js'; export class ElixirCompiler extends BaseCompiler { diff --git a/lib/compilers/elixirasm.ts b/lib/compilers/elixirasm.ts index 8cca68315..5d3ae805f 100644 --- a/lib/compilers/elixirasm.ts +++ b/lib/compilers/elixirasm.ts @@ -26,7 +26,6 @@ import path from 'node:path'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; - import {ElixirParser} from './argument-parsers.js'; export class ElixirAsmCompiler extends BaseCompiler { diff --git a/lib/compilers/erlang.ts b/lib/compilers/erlang.ts index df94d7c6b..8dbc5a959 100644 --- a/lib/compilers/erlang.ts +++ b/lib/compilers/erlang.ts @@ -26,7 +26,6 @@ import path from 'node:path'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; - import {ErlangParser} from './argument-parsers.js'; export class ErlangCompiler extends BaseCompiler { diff --git a/lib/compilers/erlangasm.ts b/lib/compilers/erlangasm.ts index 37ead8514..992597842 100644 --- a/lib/compilers/erlangasm.ts +++ b/lib/compilers/erlangasm.ts @@ -26,7 +26,6 @@ import path from 'node:path'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; - import {ErlangParser} from './argument-parsers.js'; export class ErlangAsmCompiler extends BaseCompiler { diff --git a/lib/compilers/fortran.ts b/lib/compilers/fortran.ts index 30342c436..8d65803ec 100644 --- a/lib/compilers/fortran.ts +++ b/lib/compilers/fortran.ts @@ -29,7 +29,6 @@ import type {CompilationResult, ExecutionOptionsWithEnv} from '../../types/compi import {SelectedLibraryVersion} from '../../types/libraries/libraries.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; import * as utils from '../utils.js'; - import {GccFortranParser} from './argument-parsers.js'; export class FortranCompiler extends BaseCompiler { diff --git a/lib/compilers/gcc.ts b/lib/compilers/gcc.ts index b1183a064..48cfb19b1 100644 --- a/lib/compilers/gcc.ts +++ b/lib/compilers/gcc.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import path from 'node:path'; + import {OptRemark} from '../../static/panes/opt-view.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; import * as utils from '../utils.js'; diff --git a/lib/compilers/gccrs.ts b/lib/compilers/gccrs.ts index 7e974638a..25c40c45e 100644 --- a/lib/compilers/gccrs.ts +++ b/lib/compilers/gccrs.ts @@ -25,7 +25,6 @@ import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {GCCCompiler} from './gcc.js'; export class GCCRSCompiler extends GCCCompiler { diff --git a/lib/compilers/glsl.ts b/lib/compilers/glsl.ts index ea4357143..5f49fa436 100644 --- a/lib/compilers/glsl.ts +++ b/lib/compilers/glsl.ts @@ -30,7 +30,6 @@ import {BaseCompiler} from '../base-compiler.js'; import {logger} from '../logger.js'; import {SPIRVAsmParser} from '../parsers/asm-parser-spirv.js'; import * as utils from '../utils.js'; - import {GlslangParser} from './argument-parsers.js'; export class GLSLCompiler extends BaseCompiler { diff --git a/lib/compilers/gnucobol.ts b/lib/compilers/gnucobol.ts index 18468d874..279bd919e 100644 --- a/lib/compilers/gnucobol.ts +++ b/lib/compilers/gnucobol.ts @@ -30,7 +30,6 @@ import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.in import {SelectedLibraryVersion} from '../../types/libraries/libraries.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {GnuCobolParser} from './argument-parsers.js'; export class GnuCobolCompiler extends BaseCompiler { diff --git a/lib/compilers/golang.ts b/lib/compilers/golang.ts index a71f9b0e3..569fcf826 100644 --- a/lib/compilers/golang.ts +++ b/lib/compilers/golang.ts @@ -26,6 +26,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; import _ from 'underscore'; + import type {ExecutionOptionsWithEnv} from '../../types/compilation/compilation.interfaces.js'; import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; @@ -34,7 +35,6 @@ import {unwrap} from '../assert.js'; import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import * as utils from '../utils.js'; - import {GolangParser} from './argument-parsers.js'; // Each arch has a list of jump instructions in diff --git a/lib/compilers/haskell.ts b/lib/compilers/haskell.ts index e2216eab5..a902716eb 100644 --- a/lib/compilers/haskell.ts +++ b/lib/compilers/haskell.ts @@ -29,7 +29,6 @@ import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.in import {SelectedLibraryVersion} from '../../types/libraries/libraries.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {GHCParser} from './argument-parsers.js'; export class HaskellCompiler extends BaseCompiler { diff --git a/lib/compilers/helion.ts b/lib/compilers/helion.ts index 5990b821d..a68379081 100644 --- a/lib/compilers/helion.ts +++ b/lib/compilers/helion.ts @@ -27,7 +27,6 @@ import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.in import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {resolvePathFromAppRoot} from '../utils.js'; - import {BaseParser} from './argument-parsers.js'; export class HelionCompiler extends BaseCompiler { diff --git a/lib/compilers/index.ts b/lib/compilers/index.ts index 813356aae..f5b4a392d 100644 --- a/lib/compilers/index.ts +++ b/lib/compilers/index.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {makeKeyedTypeGetter} from '../keyed-type.js'; - import * as all from './_all.js'; export * from './_all.js'; diff --git a/lib/compilers/ispc.ts b/lib/compilers/ispc.ts index a95a30704..f8fea8b3b 100644 --- a/lib/compilers/ispc.ts +++ b/lib/compilers/ispc.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import fs from 'node:fs/promises'; + import Semver from 'semver'; import { @@ -41,7 +42,6 @@ import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import * as utils from '../utils.js'; import {asSafeVer} from '../utils.js'; - import {ISPCParser} from './argument-parsers.js'; export class ISPCCompiler extends BaseCompiler { diff --git a/lib/compilers/java.ts b/lib/compilers/java.ts index 9b51a7450..65e0c5de1 100644 --- a/lib/compilers/java.ts +++ b/lib/compilers/java.ts @@ -24,6 +24,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import Semver from 'semver'; import _ from 'underscore'; @@ -43,7 +44,6 @@ import {BaseCompiler, SimpleOutputFilenameCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {logger} from '../logger.js'; import * as utils from '../utils.js'; - import {JavaParser} from './argument-parsers.js'; export class JavaCompiler extends BaseCompiler implements SimpleOutputFilenameCompiler { diff --git a/lib/compilers/julia.ts b/lib/compilers/julia.ts index 0826fad05..f9258b77d 100644 --- a/lib/compilers/julia.ts +++ b/lib/compilers/julia.ts @@ -31,7 +31,6 @@ import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.in import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import * as utils from '../utils.js'; - import {JuliaParser} from './argument-parsers.js'; export class JuliaCompiler extends BaseCompiler { diff --git a/lib/compilers/kotlin.ts b/lib/compilers/kotlin.ts index 1ce32d8e3..633f9e77e 100644 --- a/lib/compilers/kotlin.ts +++ b/lib/compilers/kotlin.ts @@ -38,7 +38,6 @@ import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.in import {assert} from '../assert.js'; import {SimpleOutputFilenameCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {KotlinParser} from './argument-parsers.js'; import {JavaCompiler} from './java.js'; diff --git a/lib/compilers/ldc.ts b/lib/compilers/ldc.ts index 9ac57167a..9d9f8b6e3 100644 --- a/lib/compilers/ldc.ts +++ b/lib/compilers/ldc.ts @@ -24,6 +24,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import semverParser from 'semver'; import type {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; @@ -35,7 +36,6 @@ import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {logger} from '../logger.js'; import * as utils from '../utils.js'; - import {LDCParser} from './argument-parsers.js'; export class LDCCompiler extends BaseCompiler { diff --git a/lib/compilers/lfortran.ts b/lib/compilers/lfortran.ts index 88854ce29..e42f00307 100644 --- a/lib/compilers/lfortran.ts +++ b/lib/compilers/lfortran.ts @@ -26,7 +26,6 @@ import type {CompilationResult, ExecutionOptionsWithEnv} from '../../types/compi import {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {FortranCompiler} from './fortran.js'; export class LFortranCompiler extends FortranCompiler { diff --git a/lib/compilers/llc.ts b/lib/compilers/llc.ts index 2f3c673c0..e0fa32234 100644 --- a/lib/compilers/llc.ts +++ b/lib/compilers/llc.ts @@ -26,7 +26,6 @@ import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {ClangParser} from './argument-parsers.js'; export class LLCCompiler extends BaseCompiler { diff --git a/lib/compilers/llvm-mca.ts b/lib/compilers/llvm-mca.ts index 9d9071b69..01a198799 100644 --- a/lib/compilers/llvm-mca.ts +++ b/lib/compilers/llvm-mca.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; - import {AnalysisTool} from './analysis-tool.js'; import {ClangParser} from './argument-parsers.js'; diff --git a/lib/compilers/llvm-mos.ts b/lib/compilers/llvm-mos.ts index d807f5291..458e4b7d0 100644 --- a/lib/compilers/llvm-mos.ts +++ b/lib/compilers/llvm-mos.ts @@ -32,7 +32,6 @@ import {addArtifactToResult} from '../artifact-utils.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {ParsedRequest} from '../handlers/compile.js'; import * as utils from '../utils.js'; - import {ClangCompiler} from './clang.js'; export class LLVMMOSCompiler extends ClangCompiler { diff --git a/lib/compilers/madpascal.ts b/lib/compilers/madpascal.ts index cd0c15e86..affaee87f 100644 --- a/lib/compilers/madpascal.ts +++ b/lib/compilers/madpascal.ts @@ -34,7 +34,6 @@ import {BaseCompiler, c_value_placeholder} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {MadsAsmParser} from '../parsers/asm-parser-mads.js'; import * as utils from '../utils.js'; - import {MadpascalParser} from './argument-parsers.js'; export class MadPascalCompiler extends BaseCompiler { diff --git a/lib/compilers/micropython.ts b/lib/compilers/micropython.ts index 4609348fa..265e01810 100644 --- a/lib/compilers/micropython.ts +++ b/lib/compilers/micropython.ts @@ -1,5 +1,7 @@ import path from 'node:path'; + import Semver from 'semver'; + import {splitArguments} from '../../shared/common-utils.js'; import type { ActiveTool, diff --git a/lib/compilers/mlir.ts b/lib/compilers/mlir.ts index 22c18329d..22b3541d9 100644 --- a/lib/compilers/mlir.ts +++ b/lib/compilers/mlir.ts @@ -28,7 +28,6 @@ import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {BaseParser} from './argument-parsers.js'; function isMlirTranslate(compilerInfo: PreliminaryCompilerInfo): boolean { diff --git a/lib/compilers/mojo.ts b/lib/compilers/mojo.ts index c13dd82b2..b9196959f 100644 --- a/lib/compilers/mojo.ts +++ b/lib/compilers/mojo.ts @@ -24,6 +24,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; import {changeExtension} from '../utils.js'; diff --git a/lib/compilers/mrustc.ts b/lib/compilers/mrustc.ts index accf14788..52a9e6c4f 100644 --- a/lib/compilers/mrustc.ts +++ b/lib/compilers/mrustc.ts @@ -27,7 +27,6 @@ import path from 'node:path'; import type {ExecutionOptionsWithEnv} from '../../types/compilation/compilation.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; - import {MrustcParser} from './argument-parsers.js'; export class MrustcCompiler extends BaseCompiler { diff --git a/lib/compilers/nasm.ts b/lib/compilers/nasm.ts index 675668e33..b53f16a9d 100644 --- a/lib/compilers/nasm.ts +++ b/lib/compilers/nasm.ts @@ -25,7 +25,6 @@ import type {ConfiguredOverrides} from '../../types/compilation/compiler-overrides.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {SelectedLibraryVersion} from '../../types/libraries/libraries.interfaces.js'; - import {AssemblyCompiler} from './assembly.js'; export class NasmCompiler extends AssemblyCompiler { diff --git a/lib/compilers/nim.ts b/lib/compilers/nim.ts index 6a4cd159c..4b62c96ac 100644 --- a/lib/compilers/nim.ts +++ b/lib/compilers/nim.ts @@ -24,6 +24,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import _ from 'underscore'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; @@ -33,7 +34,6 @@ import {unwrap} from '../assert.js'; import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import * as utils from '../utils.js'; - import {NimParser} from './argument-parsers.js'; const NimCommands = ['compile', 'compileToC', 'c', 'compileToCpp', 'cpp', 'cc', 'compileToOC', 'objc', 'js', 'check']; diff --git a/lib/compilers/numba.ts b/lib/compilers/numba.ts index 882d73d9c..e14ab9390 100644 --- a/lib/compilers/numba.ts +++ b/lib/compilers/numba.ts @@ -28,7 +28,6 @@ import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {AsmParser} from '../parsers/asm-parser.js'; import {resolvePathFromAppRoot} from '../utils.js'; - import {BaseParser} from './argument-parsers.js'; export class NumbaCompiler extends BaseCompiler { diff --git a/lib/compilers/nvcc.ts b/lib/compilers/nvcc.ts index 4646eb3e9..4674d616d 100644 --- a/lib/compilers/nvcc.ts +++ b/lib/compilers/nvcc.ts @@ -37,7 +37,6 @@ import {CompilationEnvironment} from '../compilation-env.js'; import {PTXAsmParser} from '../parsers/asm-parser-ptx.js'; import {SassAsmParser} from '../parsers/asm-parser-sass.js'; import {asSafeVer} from '../utils.js'; - import {ClangParser} from './argument-parsers.js'; export class NvccCompiler extends BaseCompiler { diff --git a/lib/compilers/nvrtc.ts b/lib/compilers/nvrtc.ts index 52028d9e6..40052a59b 100644 --- a/lib/compilers/nvrtc.ts +++ b/lib/compilers/nvrtc.ts @@ -33,7 +33,6 @@ import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {PTXAsmParser} from '../parsers/asm-parser-ptx.js'; import {asSafeVer} from '../utils.js'; - import {ClangParser} from './argument-parsers.js'; export class NvrtcCompiler extends BaseCompiler { diff --git a/lib/compilers/ocaml.ts b/lib/compilers/ocaml.ts index c57ec6184..679698fc2 100644 --- a/lib/compilers/ocaml.ts +++ b/lib/compilers/ocaml.ts @@ -26,7 +26,6 @@ import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {PascalParser} from './argument-parsers.js'; export class OCamlCompiler extends BaseCompiler { diff --git a/lib/compilers/opt.ts b/lib/compilers/opt.ts index 23bfcb00a..2ad0b0a7f 100644 --- a/lib/compilers/opt.ts +++ b/lib/compilers/opt.ts @@ -26,7 +26,6 @@ import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {ClangParser} from './argument-parsers.js'; export class OptCompiler extends BaseCompiler { diff --git a/lib/compilers/osaca.ts b/lib/compilers/osaca.ts index d9b549f2a..c60dff3c0 100644 --- a/lib/compilers/osaca.ts +++ b/lib/compilers/osaca.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; - import {AnalysisTool} from './analysis-tool.js'; import {BaseParser} from './argument-parsers.js'; diff --git a/lib/compilers/pascal-win.ts b/lib/compilers/pascal-win.ts index 46768f413..2289632dd 100644 --- a/lib/compilers/pascal-win.ts +++ b/lib/compilers/pascal-win.ts @@ -38,7 +38,6 @@ import {CompilationEnvironment} from '../compilation-env.js'; import {MapFileReaderDelphi} from '../mapfiles/map-file-delphi.js'; import {PELabelReconstructor} from '../pe32-support.js'; import * as utils from '../utils.js'; - import * as pascalUtils from './pascal-utils.js'; export class PascalWinCompiler extends BaseCompiler { diff --git a/lib/compilers/pascal.ts b/lib/compilers/pascal.ts index 0d66a261c..c1981ca3c 100644 --- a/lib/compilers/pascal.ts +++ b/lib/compilers/pascal.ts @@ -24,6 +24,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import _ from 'underscore'; import type { @@ -38,7 +39,6 @@ import {unwrap} from '../assert.js'; import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import * as utils from '../utils.js'; - import {PascalParser} from './argument-parsers.js'; import * as pascalUtils from './pascal-utils.js'; diff --git a/lib/compilers/perl.ts b/lib/compilers/perl.ts index 8e5bdeccd..7c52377b2 100644 --- a/lib/compilers/perl.ts +++ b/lib/compilers/perl.ts @@ -29,7 +29,6 @@ import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.in import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {resolvePathFromAppRoot} from '../utils.js'; - import {BaseParser} from './argument-parsers.js'; export class PerlCompiler extends BaseCompiler { diff --git a/lib/compilers/ptxas.ts b/lib/compilers/ptxas.ts index 7b0c0134a..23462d118 100644 --- a/lib/compilers/ptxas.ts +++ b/lib/compilers/ptxas.ts @@ -32,7 +32,6 @@ import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {SassAsmParser} from '../parsers/asm-parser-sass.js'; import * as utils from '../utils.js'; - import {BaseParser} from './argument-parsers.js'; export class PtxAssembler extends BaseCompiler { diff --git a/lib/compilers/python.ts b/lib/compilers/python.ts index 23d80dd7d..0c7980366 100644 --- a/lib/compilers/python.ts +++ b/lib/compilers/python.ts @@ -29,7 +29,6 @@ import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.in import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {resolvePathFromAppRoot} from '../utils.js'; - import {BaseParser} from './argument-parsers.js'; export class PythonCompiler extends BaseCompiler { diff --git a/lib/compilers/r8.ts b/lib/compilers/r8.ts index 15e3bb0be..01a6241da 100644 --- a/lib/compilers/r8.ts +++ b/lib/compilers/r8.ts @@ -24,7 +24,9 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import _ from 'underscore'; + import {CompilationResult, ExecutionOptionsWithEnv} from '../../types/compilation/compilation.interfaces.js'; import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; @@ -33,7 +35,6 @@ import {SimpleOutputFilenameCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {logger} from '../logger.js'; import * as utils from '../utils.js'; - import {D8Compiler} from './d8.js'; import {JavaCompiler} from './java.js'; import {KotlinCompiler} from './kotlin.js'; diff --git a/lib/compilers/ruby.ts b/lib/compilers/ruby.ts index f4019ed7c..4068bf337 100644 --- a/lib/compilers/ruby.ts +++ b/lib/compilers/ruby.ts @@ -29,7 +29,6 @@ import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.in import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {resolvePathFromAppRoot} from '../utils.js'; - import {BaseParser} from './argument-parsers.js'; export class RubyCompiler extends BaseCompiler { diff --git a/lib/compilers/rust.ts b/lib/compilers/rust.ts index 7e174db97..2005f3e75 100644 --- a/lib/compilers/rust.ts +++ b/lib/compilers/rust.ts @@ -24,6 +24,7 @@ import {readdirSync} from 'node:fs'; import path from 'node:path'; + import {SemVer} from 'semver'; import _ from 'underscore'; diff --git a/lib/compilers/rustc-cg-gcc.ts b/lib/compilers/rustc-cg-gcc.ts index 05b68568f..c523bc3ed 100644 --- a/lib/compilers/rustc-cg-gcc.ts +++ b/lib/compilers/rustc-cg-gcc.ts @@ -28,7 +28,6 @@ import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {SelectedLibraryVersion} from '../../types/libraries/libraries.interfaces.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {RustCompiler} from './rust.js'; export class RustcCgGCCCompiler extends RustCompiler { diff --git a/lib/compilers/scala.ts b/lib/compilers/scala.ts index 36ec155be..08bea898b 100644 --- a/lib/compilers/scala.ts +++ b/lib/compilers/scala.ts @@ -28,7 +28,6 @@ import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {asSafeVer} from '../utils.js'; - import {ScalaParser} from './argument-parsers.js'; import {JavaCompiler} from './java.js'; diff --git a/lib/compilers/sdcc.ts b/lib/compilers/sdcc.ts index c465d483c..c5643ee05 100644 --- a/lib/compilers/sdcc.ts +++ b/lib/compilers/sdcc.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; - import {GCCCompiler} from './gcc.js'; export class SdccCompiler extends GCCCompiler { diff --git a/lib/compilers/solidity-zksync.ts b/lib/compilers/solidity-zksync.ts index e1af9c31a..d6de57601 100644 --- a/lib/compilers/solidity-zksync.ts +++ b/lib/compilers/solidity-zksync.ts @@ -25,7 +25,6 @@ import path from 'node:path'; import {BaseCompiler} from '../base-compiler.js'; - import {ZksolcParser} from './argument-parsers.js'; export class SolidityZKsyncCompiler extends BaseCompiler { diff --git a/lib/compilers/solidity.ts b/lib/compilers/solidity.ts index bda907f2f..9dd90d716 100644 --- a/lib/compilers/solidity.ts +++ b/lib/compilers/solidity.ts @@ -29,7 +29,6 @@ import Semver from 'semver'; import {BaseCompiler} from '../base-compiler.js'; import {asSafeVer} from '../utils.js'; - import {ClangParser} from './argument-parsers.js'; export class SolidityCompiler extends BaseCompiler { diff --git a/lib/compilers/sway.ts b/lib/compilers/sway.ts index e83da3549..2e88a9504 100644 --- a/lib/compilers/sway.ts +++ b/lib/compilers/sway.ts @@ -24,6 +24,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import {CompilationResult, ExecutionOptionsWithEnv} from '../../types/compilation/compilation.interfaces.js'; import {LLVMIrBackendOptions} from '../../types/compilation/ir.interfaces.js'; import {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/lib/compilers/swift.ts b/lib/compilers/swift.ts index 284f3db82..ea9c5f58b 100644 --- a/lib/compilers/swift.ts +++ b/lib/compilers/swift.ts @@ -27,7 +27,6 @@ import path from 'node:path'; import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {SwiftParser} from './argument-parsers.js'; export class SwiftCompiler extends BaseCompiler { diff --git a/lib/compilers/tablegen.ts b/lib/compilers/tablegen.ts index 4ea02fde0..14d8071aa 100644 --- a/lib/compilers/tablegen.ts +++ b/lib/compilers/tablegen.ts @@ -1,7 +1,6 @@ import {CompilerOverrideType} from '../../types/compilation/compiler-overrides.interfaces.js'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; - import {TableGenParser} from './argument-parsers.js'; export class TableGenCompiler extends BaseCompiler { diff --git a/lib/compilers/tendra.ts b/lib/compilers/tendra.ts index 509b50c3a..3b1406a33 100644 --- a/lib/compilers/tendra.ts +++ b/lib/compilers/tendra.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; - import {TendraParser} from './argument-parsers.js'; import {GCCCompiler} from './gcc.js'; diff --git a/lib/compilers/toit.ts b/lib/compilers/toit.ts index 19a73bd6d..52434529f 100644 --- a/lib/compilers/toit.ts +++ b/lib/compilers/toit.ts @@ -27,7 +27,6 @@ import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.in import {SelectedLibraryVersion} from '../../types/libraries/libraries.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; - import {ToitParser} from './argument-parsers.js'; export class ToitCompiler extends BaseCompiler { diff --git a/lib/compilers/triton.ts b/lib/compilers/triton.ts index dd91b09df..8d7f162f3 100644 --- a/lib/compilers/triton.ts +++ b/lib/compilers/triton.ts @@ -24,6 +24,7 @@ import * as fs from 'node:fs/promises'; import Path from 'node:path'; + import type {CompilationInfo, CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import type { OptPipelineBackendOptions, diff --git a/lib/compilers/turboc.ts b/lib/compilers/turboc.ts index 80c6e6ca4..46c190455 100644 --- a/lib/compilers/turboc.ts +++ b/lib/compilers/turboc.ts @@ -26,7 +26,6 @@ import path from 'node:path'; import {SelectedLibraryVersion} from '../../types/libraries/libraries.interfaces.js'; import {logger} from '../logger.js'; - import {TurboCParser} from './argument-parsers.js'; import {DosboxCompiler} from './dosbox-compiler.js'; diff --git a/lib/compilers/typescript-native.ts b/lib/compilers/typescript-native.ts index 4c31e6326..bcfe03965 100644 --- a/lib/compilers/typescript-native.ts +++ b/lib/compilers/typescript-native.ts @@ -34,7 +34,6 @@ import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.in import {BaseCompiler} from '../base-compiler.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {asSafeVer, changeExtension} from '../utils.js'; - import {TypeScriptNativeParser} from './argument-parsers.js'; export class TypeScriptNativeCompiler extends BaseCompiler { diff --git a/lib/compilers/wasmtime.ts b/lib/compilers/wasmtime.ts index 95d744c0a..e1f8521cf 100644 --- a/lib/compilers/wasmtime.ts +++ b/lib/compilers/wasmtime.ts @@ -26,7 +26,6 @@ import path from 'node:path'; import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; - import {WasmtimeParser} from './argument-parsers.js'; export class WasmtimeCompiler extends BaseCompiler { diff --git a/lib/compilers/win32-mingw-clang.ts b/lib/compilers/win32-mingw-clang.ts index 146ab6bba..2f0e9088f 100644 --- a/lib/compilers/win32-mingw-clang.ts +++ b/lib/compilers/win32-mingw-clang.ts @@ -28,7 +28,6 @@ import {BuildResult, BypassCache, CacheKey, CompilationResult} from '../../types import {ExecutableExecutionOptions} from '../../types/execution/execution.interfaces.js'; import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {copyNeededDlls} from '../binaries/win-utils.js'; - import {ClangCompiler} from './clang.js'; export class Win32MingWClang extends ClangCompiler { diff --git a/lib/compilers/win32-mingw-gcc.ts b/lib/compilers/win32-mingw-gcc.ts index c2c8e2c48..6d449838e 100644 --- a/lib/compilers/win32-mingw-gcc.ts +++ b/lib/compilers/win32-mingw-gcc.ts @@ -28,7 +28,6 @@ import {BuildResult, BypassCache, CacheKey, CompilationResult} from '../../types import {ExecutableExecutionOptions} from '../../types/execution/execution.interfaces.js'; import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {copyNeededDlls} from '../binaries/win-utils.js'; - import {GCCCompiler} from './gcc.js'; export class Win32MingWGcc extends GCCCompiler { diff --git a/lib/compilers/win32-vc6.ts b/lib/compilers/win32-vc6.ts index 5ebc05697..30260113a 100644 --- a/lib/compilers/win32-vc6.ts +++ b/lib/compilers/win32-vc6.ts @@ -25,7 +25,6 @@ import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {Vc6AsmParser} from '../parsers/asm-parser-vc6.js'; - import {VCParser} from './argument-parsers.js'; import {Win32Compiler} from './win32.js'; diff --git a/lib/compilers/wine-vc.ts b/lib/compilers/wine-vc.ts index 10b88f068..c2f44eb0d 100644 --- a/lib/compilers/wine-vc.ts +++ b/lib/compilers/wine-vc.ts @@ -32,7 +32,6 @@ import {CompilationEnvironment} from '../compilation-env.js'; import {MapFileReaderVS} from '../mapfiles/map-file-vs.js'; import {VcAsmParser} from '../parsers/asm-parser-vc.js'; import {PELabelReconstructor} from '../pe32-support.js'; - import {VCParser} from './argument-parsers.js'; export class WineVcCompiler extends BaseCompiler { diff --git a/lib/compilers/wsl-vc.ts b/lib/compilers/wsl-vc.ts index 93557cc3d..3363ae7ed 100644 --- a/lib/compilers/wsl-vc.ts +++ b/lib/compilers/wsl-vc.ts @@ -33,7 +33,6 @@ import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js'; import {unwrap} from '../assert.js'; import {CompilationEnvironment} from '../compilation-env.js'; import {VcAsmParser} from '../parsers/asm-parser-vc.js'; - import {Win32VcCompiler} from './win32-vc.js'; export class WslVcCompiler extends Win32VcCompiler { diff --git a/lib/compilers/ylc.ts b/lib/compilers/ylc.ts index b9176dd6d..ab25bf50f 100644 --- a/lib/compilers/ylc.ts +++ b/lib/compilers/ylc.ts @@ -6,7 +6,6 @@ import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfa import {SelectedLibraryVersion} from '../../types/libraries/libraries.interfaces.js'; import {unwrap} from '../assert.js'; import {BaseCompiler} from '../base-compiler.js'; - import {BaseParser} from './argument-parsers.js'; export class YLCCompiler extends BaseCompiler { diff --git a/lib/compilers/z88dk.ts b/lib/compilers/z88dk.ts index b0b99093d..c0ce63793 100644 --- a/lib/compilers/z88dk.ts +++ b/lib/compilers/z88dk.ts @@ -34,7 +34,6 @@ import {CompilationEnvironment} from '../compilation-env.js'; import {logger} from '../logger.js'; import {AsmParserZ88dk} from '../parsers/asm-parser-z88dk.js'; import * as utils from '../utils.js'; - import {Z88dkParser} from './argument-parsers.js'; export class z88dkCompiler extends BaseCompiler { diff --git a/lib/compilers/zigcc.ts b/lib/compilers/zigcc.ts index 1608fcb66..ea87d9c1a 100644 --- a/lib/compilers/zigcc.ts +++ b/lib/compilers/zigcc.ts @@ -26,7 +26,6 @@ import Semver from 'semver'; import type {CompilerOutputOptions, ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {asSafeVer} from '../utils.js'; - import {ClangCompiler} from './clang.js'; export class ZigCC extends ClangCompiler { diff --git a/lib/compilers/zigcxx.ts b/lib/compilers/zigcxx.ts index 0b1428b13..cfc0b7d46 100644 --- a/lib/compilers/zigcxx.ts +++ b/lib/compilers/zigcxx.ts @@ -26,7 +26,6 @@ import Semver from 'semver'; import type {CompilerOutputOptions, ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {asSafeVer} from '../utils.js'; - import {ZigCxxParser} from './argument-parsers.js'; import {ClangCompiler} from './clang.js'; diff --git a/lib/demangler/base.ts b/lib/demangler/base.ts index 56d9d1021..bd5d72eb5 100644 --- a/lib/demangler/base.ts +++ b/lib/demangler/base.ts @@ -31,7 +31,6 @@ import {logger} from '../logger.js'; import {AsmRegex} from '../parsers/asmregex.js'; import {SymbolStore} from '../symbol-store.js'; import * as utils from '../utils.js'; - import {PrefixTree} from './prefix-tree.js'; export class BaseDemangler extends AsmRegex { diff --git a/lib/demangler/index.ts b/lib/demangler/index.ts index 592dff6e9..086058c8f 100644 --- a/lib/demangler/index.ts +++ b/lib/demangler/index.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {makeKeyedTypeGetter} from '../keyed-type.js'; - import * as all from './_all.js'; export * from './_all.js'; diff --git a/lib/demangler/llvm.ts b/lib/demangler/llvm.ts index 7a6232ef2..2094d8113 100644 --- a/lib/demangler/llvm.ts +++ b/lib/demangler/llvm.ts @@ -28,7 +28,6 @@ import {ResultLine} from '../../types/resultline/resultline.interfaces.js'; import {logger} from '../logger.js'; import {SymbolStore} from '../symbol-store.js'; import * as utils from '../utils.js'; - import {BaseDemangler} from './base.js'; import {PrefixTree} from './prefix-tree.js'; diff --git a/lib/demangler/nvhpc.ts b/lib/demangler/nvhpc.ts index c6400373f..b001c60e1 100644 --- a/lib/demangler/nvhpc.ts +++ b/lib/demangler/nvhpc.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {BaseCompiler} from '../base-compiler.js'; - import {BaseDemangler} from './base.js'; import {LLVMIRDemangler} from './llvm.js'; diff --git a/lib/demangler/pascal.ts b/lib/demangler/pascal.ts index 04e0107a2..db516afa6 100644 --- a/lib/demangler/pascal.ts +++ b/lib/demangler/pascal.ts @@ -26,7 +26,6 @@ import type {ParsedAsmResult} from '../../types/asmresult/asmresult.interfaces.j import type {ExecutionOptions} from '../../types/compilation/compilation.interfaces.js'; import {BaseCompiler} from '../base-compiler.js'; import {SymbolStore} from '../symbol-store.js'; - import {BaseDemangler} from './base.js'; export class PascalDemangler extends BaseDemangler { diff --git a/lib/demangler/tic2000.ts b/lib/demangler/tic2000.ts index 9549d9948..8f5b25351 100644 --- a/lib/demangler/tic2000.ts +++ b/lib/demangler/tic2000.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {BaseCompiler} from '../base-compiler.js'; - import {CppDemangler} from './cpp.js'; export class TiC2000Demangler extends CppDemangler { diff --git a/lib/demangler/win32-llvm.ts b/lib/demangler/win32-llvm.ts index ec35eaa6c..657f00f0d 100644 --- a/lib/demangler/win32-llvm.ts +++ b/lib/demangler/win32-llvm.ts @@ -24,7 +24,6 @@ import {unwrap} from '../assert.js'; import * as utils from '../utils.js'; - import {Win32Demangler} from './win32.js'; export class LLVMWin32Demangler extends Win32Demangler { diff --git a/lib/demangler/win32.ts b/lib/demangler/win32.ts index 78b78f77b..d6dad38d9 100644 --- a/lib/demangler/win32.ts +++ b/lib/demangler/win32.ts @@ -28,7 +28,6 @@ import {assert, unwrap} from '../assert.js'; import {BaseCompiler} from '../base-compiler.js'; import {logger} from '../logger.js'; import * as utils from '../utils.js'; - import {CppDemangler} from './cpp.js'; export class Win32Demangler extends CppDemangler { diff --git a/lib/exec.ts b/lib/exec.ts index 9e76ad790..2edff18a1 100644 --- a/lib/exec.ts +++ b/lib/exec.ts @@ -28,9 +28,11 @@ import os from 'node:os'; import path from 'node:path'; import {Stream} from 'node:stream'; import buffer from 'buffer'; + import treeKill from 'tree-kill'; import _ from 'underscore'; import which from 'which'; + import {splitArguments} from '../shared/common-utils.js'; import type {ExecutionOptions} from '../types/compilation/compilation.interfaces.js'; import type {FilenameTransformFunc, UnprocessedExecResult} from '../types/execution/execution.interfaces.js'; diff --git a/lib/execution/base-execution-env.ts b/lib/execution/base-execution-env.ts index 81352d88e..b95fa8c0b 100644 --- a/lib/execution/base-execution-env.ts +++ b/lib/execution/base-execution-env.ts @@ -50,7 +50,6 @@ import {propsFor} from '../properties.js'; import {HeaptrackWrapper} from '../runtime-tools/heaptrack-wrapper.js'; import * as temp from '../temp.js'; import * as utils from '../utils.js'; - import {ExecutablePackageCacheMiss, IExecutionEnvironment} from './execution-env.interfaces.js'; export class LocalExecutionEnvironment implements IExecutionEnvironment { diff --git a/lib/execution/dotnet-execution-env.ts b/lib/execution/dotnet-execution-env.ts index 4254c5ecb..236578dd8 100644 --- a/lib/execution/dotnet-execution-env.ts +++ b/lib/execution/dotnet-execution-env.ts @@ -26,7 +26,6 @@ import path from 'node:path'; import {BasicExecutionResult, ExecutableExecutionOptions} from '../../types/execution/execution.interfaces.js'; import * as utils from '../utils.js'; - import {LocalExecutionEnvironment} from './base-execution-env.js'; export const AssemblyName = 'CompilerExplorer'; diff --git a/lib/execution/events-websocket.ts b/lib/execution/events-websocket.ts index f6e88becf..340a3b132 100644 --- a/lib/execution/events-websocket.ts +++ b/lib/execution/events-websocket.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import {WebSocket} from 'ws'; + import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {BasicExecutionResult} from '../../types/execution/execution.interfaces.js'; import {logger} from '../logger.js'; diff --git a/lib/execution/execution-query.ts b/lib/execution/execution-query.ts index 0b7667608..ebb644c8f 100644 --- a/lib/execution/execution-query.ts +++ b/lib/execution/execution-query.ts @@ -26,7 +26,6 @@ import {BuildResult} from '../../types/compilation/compilation.interfaces.js'; import {BinaryInfoLinux} from '../binaries/binary-utils.js'; import {logger} from '../logger.js'; import {PropertyGetter} from '../properties.interfaces.js'; - import {BaseExecutionTriple, ExecutionSpecialty} from './base-execution-triple.js'; async function retrieveAllRemoteExecutionArchs(ceProps: PropertyGetter, envs: string[]): Promise { diff --git a/lib/execution/execution-triple.ts b/lib/execution/execution-triple.ts index b0f19c504..0f4fad3d7 100644 --- a/lib/execution/execution-triple.ts +++ b/lib/execution/execution-triple.ts @@ -28,7 +28,6 @@ import {InstructionSet} from '../../types/instructionsets.js'; import {OSType} from '../binaries/binary-utils.js'; import {logger} from '../logger.js'; import * as utils from '../utils.js'; - import {BaseExecutionTriple, ExecutionSpecialty} from './base-execution-triple.js'; let _host_specialty = ExecutionSpecialty.cpu; diff --git a/lib/execution/index.ts b/lib/execution/index.ts index 5506f58d5..7cffdbe61 100644 --- a/lib/execution/index.ts +++ b/lib/execution/index.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {makeKeyedTypeGetter} from '../keyed-type.js'; - import * as all from './_all.js'; export * from './_all.js'; diff --git a/lib/execution/remote-execution-env.ts b/lib/execution/remote-execution-env.ts index ef884ab55..f88d3c3be 100644 --- a/lib/execution/remote-execution-env.ts +++ b/lib/execution/remote-execution-env.ts @@ -29,7 +29,6 @@ import {BasicExecutionResult, ExecutableExecutionOptions} from '../../types/exec import {CompilationEnvironment} from '../compilation-env.js'; import {logger} from '../logger.js'; import * as utils from '../utils.js'; - import {BaseExecutionTriple} from './base-execution-triple.js'; import {EventsWsWaiter} from './events-websocket.js'; import {IExecutionEnvironment} from './execution-env.interfaces.js'; diff --git a/lib/execution/sqs-execution-queue.ts b/lib/execution/sqs-execution-queue.ts index b8844c969..2a82d7a8f 100644 --- a/lib/execution/sqs-execution-queue.ts +++ b/lib/execution/sqs-execution-queue.ts @@ -30,7 +30,6 @@ import {CompilationEnvironment} from '../compilation-env.js'; import {logger} from '../logger.js'; import {PropertyGetter} from '../properties.interfaces.js'; import {getHash} from '../utils.js'; - import {LocalExecutionEnvironment} from './_all.js'; import {BaseExecutionTriple} from './base-execution-triple.js'; import {PersistentEventsSender} from './events-websocket.js'; diff --git a/lib/external-parsers/base.ts b/lib/external-parsers/base.ts index 8e7ab0f92..c67939802 100644 --- a/lib/external-parsers/base.ts +++ b/lib/external-parsers/base.ts @@ -8,7 +8,6 @@ import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.in import {CompilationEnvironment} from '../compilation-env.js'; import {logger} from '../logger.js'; import {maskRootdir} from '../utils.js'; - import {IExternalParser} from './external-parser.interface.js'; const starterScriptName = 'dump-and-parse.sh'; diff --git a/lib/external-parsers/index.ts b/lib/external-parsers/index.ts index 3ef75b61a..19e1adf4a 100644 --- a/lib/external-parsers/index.ts +++ b/lib/external-parsers/index.ts @@ -1,5 +1,4 @@ import {makeKeyedTypeGetter} from '../keyed-type.js'; - import * as all from './_all.js'; export * from './_all.js'; diff --git a/lib/external-parsers/plain.ts b/lib/external-parsers/plain.ts index 3519ec4ab..800d9bb0f 100644 --- a/lib/external-parsers/plain.ts +++ b/lib/external-parsers/plain.ts @@ -1,5 +1,6 @@ import fs from 'node:fs'; import path from 'node:path'; + import type {ParsedAsmResult} from '../../types/asmresult/asmresult.interfaces.js'; import {ExecutionOptions} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/lib/formatters/base.ts b/lib/formatters/base.ts index 6095668b9..2d1d83049 100644 --- a/lib/formatters/base.ts +++ b/lib/formatters/base.ts @@ -24,7 +24,6 @@ import type {UnprocessedExecResult} from '../../types/execution/execution.interfaces.js'; import * as exec from '../exec.js'; - import type {FormatOptions, FormatterInfo} from './base.interfaces.js'; export abstract class BaseFormatter { diff --git a/lib/formatters/clang-format.ts b/lib/formatters/clang-format.ts index e472a7891..eb9b68625 100644 --- a/lib/formatters/clang-format.ts +++ b/lib/formatters/clang-format.ts @@ -24,7 +24,6 @@ import type {UnprocessedExecResult} from '../../types/execution/execution.interfaces.js'; import * as exec from '../exec.js'; - import type {FormatOptions} from './base.interfaces.js'; import {BaseFormatter} from './base.js'; diff --git a/lib/formatters/dartformat.ts b/lib/formatters/dartformat.ts index 1fc3b613b..6fd39fe10 100644 --- a/lib/formatters/dartformat.ts +++ b/lib/formatters/dartformat.ts @@ -24,7 +24,6 @@ import type {UnprocessedExecResult} from '../../types/execution/execution.interfaces.js'; import * as exec from '../exec.js'; - import type {FormatOptions} from './base.interfaces.js'; import {BaseFormatter} from './base.js'; diff --git a/lib/formatters/gofmt.ts b/lib/formatters/gofmt.ts index 7679c2ddd..13262f6ca 100644 --- a/lib/formatters/gofmt.ts +++ b/lib/formatters/gofmt.ts @@ -24,7 +24,6 @@ import type {UnprocessedExecResult} from '../../types/execution/execution.interfaces.js'; import * as exec from '../exec.js'; - import type {FormatOptions} from './base.interfaces.js'; import {BaseFormatter} from './base.js'; diff --git a/lib/formatters/index.ts b/lib/formatters/index.ts index 7e96dcc99..17def62c1 100644 --- a/lib/formatters/index.ts +++ b/lib/formatters/index.ts @@ -24,7 +24,6 @@ import type {Keyable} from '../keyed-type.interfaces.js'; import {makeKeyedTypeGetter} from '../keyed-type.js'; - import * as all from './_all.js'; import type {FormatterInfo} from './base.interfaces.js'; import {BaseFormatter} from './base.js'; diff --git a/lib/formatters/rustfmt.ts b/lib/formatters/rustfmt.ts index 2dfe61261..258b69e4f 100644 --- a/lib/formatters/rustfmt.ts +++ b/lib/formatters/rustfmt.ts @@ -24,7 +24,6 @@ import type {UnprocessedExecResult} from '../../types/execution/execution.interfaces.js'; import * as exec from '../exec.js'; - import type {FormatOptions} from './base.interfaces.js'; import {BaseFormatter} from './base.js'; diff --git a/lib/formatters/vfmt.ts b/lib/formatters/vfmt.ts index c0138fe60..0445e6d8a 100644 --- a/lib/formatters/vfmt.ts +++ b/lib/formatters/vfmt.ts @@ -24,7 +24,6 @@ import {UnprocessedExecResult} from '../../types/execution/execution.interfaces.js'; import * as exec from '../exec.js'; - import {FormatOptions} from './base.interfaces.js'; import {BaseFormatter} from './base.js'; diff --git a/lib/formatting-service.ts b/lib/formatting-service.ts index 95ab61493..44646a2f5 100644 --- a/lib/formatting-service.ts +++ b/lib/formatting-service.ts @@ -25,7 +25,6 @@ import _ from 'underscore'; import {UnprocessedExecResult} from '../types/execution/execution.interfaces.js'; - import * as exec from './exec.js'; import {FormatOptions} from './formatters/base.interfaces.js'; import {BaseFormatter, getFormatterTypeByKey} from './formatters/index.js'; diff --git a/lib/handlers/api.ts b/lib/handlers/api.ts index 09f808b2e..fce1a1e03 100644 --- a/lib/handlers/api.ts +++ b/lib/handlers/api.ts @@ -39,7 +39,6 @@ import {PropertyGetter} from '../properties.interfaces.js'; import {SentryCapture} from '../sentry.js'; import {BaseShortener, getShortenerTypeByKey} from '../shortener/index.js'; import {StorageBase} from '../storage/index.js'; - import {CompileHandler} from './compile.js'; function methodNotAllowed(req: express.Request, res: express.Response) { diff --git a/lib/handlers/api/assembly-documentation-controller.ts b/lib/handlers/api/assembly-documentation-controller.ts index 3d1ce6860..6dfa0ac36 100644 --- a/lib/handlers/api/assembly-documentation-controller.ts +++ b/lib/handlers/api/assembly-documentation-controller.ts @@ -23,10 +23,10 @@ // POSSIBILITY OF SUCH DAMAGE. import express from 'express'; + import {getDocumentationProviderTypeByKey} from '../../asm-docs/index.js'; import {unwrapString} from '../../assert.js'; import {cached, cors} from '../middleware.js'; - import {HttpController} from './controller.interfaces.js'; export class AssemblyDocumentationController implements HttpController { diff --git a/lib/handlers/api/formatting-controller.ts b/lib/handlers/api/formatting-controller.ts index f96fda04e..b54584d74 100644 --- a/lib/handlers/api/formatting-controller.ts +++ b/lib/handlers/api/formatting-controller.ts @@ -27,7 +27,6 @@ import express from 'express'; import {unwrapString} from '../../assert.js'; import {FormattingService} from '../../formatting-service.js'; import {cached, cors, jsonOnly} from '../middleware.js'; - import {HttpController} from './controller.interfaces.js'; export class FormattingController implements HttpController { diff --git a/lib/handlers/api/healthcheck-controller.ts b/lib/handlers/api/healthcheck-controller.ts index 666dd4c86..3b590ef73 100644 --- a/lib/handlers/api/healthcheck-controller.ts +++ b/lib/handlers/api/healthcheck-controller.ts @@ -30,7 +30,6 @@ import {CompilationQueue} from '../../compilation-queue.js'; import {logger} from '../../logger.js'; import {SentryCapture} from '../../sentry.js'; import {ICompileHandler} from '../compile.interfaces.js'; - import {HttpController} from './controller.interfaces.js'; export class HealthcheckController implements HttpController { diff --git a/lib/handlers/api/site-template-controller.ts b/lib/handlers/api/site-template-controller.ts index 9724fe35c..cf1a8dd4a 100644 --- a/lib/handlers/api/site-template-controller.ts +++ b/lib/handlers/api/site-template-controller.ts @@ -27,7 +27,6 @@ import express from 'express'; import {SiteTemplateConfiguration} from '../../../types/features/site-templates.interfaces.js'; import {getSiteTemplates} from '../../site-templates.js'; import {cached, cors} from '../middleware.js'; - import {HttpController} from './controller.interfaces.js'; export class SiteTemplateController implements HttpController { diff --git a/lib/handlers/api/source-controller.ts b/lib/handlers/api/source-controller.ts index dc129512a..a4c79e56c 100644 --- a/lib/handlers/api/source-controller.ts +++ b/lib/handlers/api/source-controller.ts @@ -24,10 +24,10 @@ import express from 'express'; import _ from 'underscore'; + import {Source} from '../../../types/source.interfaces.js'; import {unwrapString} from '../../assert.js'; import {cached, cors} from '../middleware.js'; - import {HttpController} from './controller.interfaces.js'; export class SourceController implements HttpController { diff --git a/lib/handlers/compile.ts b/lib/handlers/compile.ts index d959414a1..80b1f6285 100644 --- a/lib/handlers/compile.ts +++ b/lib/handlers/compile.ts @@ -25,6 +25,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; import process from 'node:process'; + import * as Sentry from '@sentry/node'; import express from 'express'; import Server from 'http-proxy'; @@ -59,7 +60,6 @@ import {SentryCapture} from '../sentry.js'; import {KnownBuildMethod} from '../stats.js'; import * as temp from '../temp.js'; import * as utils from '../utils.js'; - import { CompileRequestJsonBody, CompileRequestQueryArgs, diff --git a/lib/handlers/route-api.ts b/lib/handlers/route-api.ts index a8fda78aa..4299f6e1a 100644 --- a/lib/handlers/route-api.ts +++ b/lib/handlers/route-api.ts @@ -35,7 +35,6 @@ import {SentryCapture} from '../sentry.js'; import {ExpandedShortLink} from '../storage/base.js'; import {StorageBase} from '../storage/index.js'; import * as utils from '../utils.js'; - import {ApiHandler} from './api.js'; import {HandlerConfig, ShortLinkMetaData} from './handler.interfaces.js'; import {cached, csp} from './middleware.js'; diff --git a/lib/llvm-ast.ts b/lib/llvm-ast.ts index 682cc617f..fb9995bc3 100644 --- a/lib/llvm-ast.ts +++ b/lib/llvm-ast.ts @@ -24,7 +24,6 @@ import type {CompilationResult} from '../types/compilation/compilation.interfaces.js'; import type {ResultLine} from '../types/resultline/resultline.interfaces.js'; - import type {PropertyGetter} from './properties.interfaces.js'; type Point = { diff --git a/lib/llvm-ir.ts b/lib/llvm-ir.ts index f0dcd3d52..cac726ab1 100644 --- a/lib/llvm-ir.ts +++ b/lib/llvm-ir.ts @@ -26,7 +26,6 @@ import {isString} from '../shared/common-utils.js'; import type {IRResultLine, ParsedAsmResult} from '../types/asmresult/asmresult.interfaces.js'; import {LLVMIrBackendOptions} from '../types/compilation/ir.interfaces.js'; import {ParseFiltersAndOutputOptions} from '../types/features/filters.interfaces.js'; - import {LLVMIRDemangler} from './demangler/llvm.js'; import {PropertyGetter} from './properties.interfaces.js'; import * as utils from './utils.js'; diff --git a/lib/logger.ts b/lib/logger.ts index d89bae997..e43199d1c 100644 --- a/lib/logger.ts +++ b/lib/logger.ts @@ -28,7 +28,6 @@ import {Writable} from 'node:stream'; import {LEVEL, MESSAGE} from 'triple-beam'; import winston from 'winston'; import LokiTransport from 'winston-loki'; - import {Papertrail} from 'winston-papertrail'; import TransportStream, {TransportStreamOptions} from 'winston-transport'; /** diff --git a/lib/objdumper/index.ts b/lib/objdumper/index.ts index 0dff15429..921310c9c 100644 --- a/lib/objdumper/index.ts +++ b/lib/objdumper/index.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {makeKeyedTypeGetter} from '../keyed-type.js'; - import * as all from './_all.js'; export * from './_all.js'; diff --git a/lib/options-handler.ts b/lib/options-handler.ts index 7e25f0df1..9b5799858 100755 --- a/lib/options-handler.ts +++ b/lib/options-handler.ts @@ -25,6 +25,7 @@ import fs from 'node:fs'; import https from 'node:https'; import path from 'node:path'; + import semverParser from 'semver'; import _ from 'underscore'; import urlJoin from 'url-join'; diff --git a/lib/parsers/asm-parser-beebasm.ts b/lib/parsers/asm-parser-beebasm.ts index b97a233ac..6138ef261 100644 --- a/lib/parsers/asm-parser-beebasm.ts +++ b/lib/parsers/asm-parser-beebasm.ts @@ -3,7 +3,6 @@ import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfa import {assert} from '../assert.js'; import {PropertyGetter} from '../properties.interfaces.js'; import * as utils from '../utils.js'; - import {AsmParser} from './asm-parser.js'; export class AsmParserBeebAsm extends AsmParser { diff --git a/lib/parsers/asm-parser-cc65.ts b/lib/parsers/asm-parser-cc65.ts index 1d3069380..2675f64eb 100644 --- a/lib/parsers/asm-parser-cc65.ts +++ b/lib/parsers/asm-parser-cc65.ts @@ -25,7 +25,6 @@ import {AsmResultLabel, ParsedAsmResult, ParsedAsmResultLine} from '../../types/asmresult/asmresult.interfaces.js'; import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {PropertyGetter} from '../properties.interfaces.js'; - import {AsmParser} from './asm-parser.js'; export class CC65AsmParser extends AsmParser { diff --git a/lib/parsers/asm-parser-cpp.ts b/lib/parsers/asm-parser-cpp.ts index 88a26db5e..e4e5092cb 100644 --- a/lib/parsers/asm-parser-cpp.ts +++ b/lib/parsers/asm-parser-cpp.ts @@ -25,7 +25,6 @@ import {ParsedAsmResult} from '../../types/asmresult/asmresult.interfaces.js'; import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import * as utils from '../utils.js'; - import {IAsmParser} from './asm-parser.interfaces.js'; type InlineLabel = {name: string; range: {startCol: number; endCol: number}}; diff --git a/lib/parsers/asm-parser-dart.ts b/lib/parsers/asm-parser-dart.ts index b0107d2d4..d324adee4 100644 --- a/lib/parsers/asm-parser-dart.ts +++ b/lib/parsers/asm-parser-dart.ts @@ -31,7 +31,6 @@ import { import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {assert} from '../assert.js'; import * as utils from '../utils.js'; - import {AsmParser} from './asm-parser.js'; import {AsmRegex} from './asmregex.js'; diff --git a/lib/parsers/asm-parser-dotnet.ts b/lib/parsers/asm-parser-dotnet.ts index 4d14e7316..cb1e51580 100644 --- a/lib/parsers/asm-parser-dotnet.ts +++ b/lib/parsers/asm-parser-dotnet.ts @@ -25,7 +25,6 @@ import {ParsedAsmResult} from '../../types/asmresult/asmresult.interfaces.js'; import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import * as utils from '../utils.js'; - import {IAsmParser} from './asm-parser.interfaces.js'; type InlineLabel = {name: string; range: {startCol: number; endCol: number}}; diff --git a/lib/parsers/asm-parser-ewavr.ts b/lib/parsers/asm-parser-ewavr.ts index 434c2a153..85be1c894 100644 --- a/lib/parsers/asm-parser-ewavr.ts +++ b/lib/parsers/asm-parser-ewavr.ts @@ -28,7 +28,6 @@ import {assert} from '../assert.js'; import {logger} from '../logger.js'; import {PropertyGetter} from '../properties.interfaces.js'; import * as utils from '../utils.js'; - import {AsmParser} from './asm-parser.js'; import {AsmRegex} from './asmregex.js'; diff --git a/lib/parsers/asm-parser-hexagon.ts b/lib/parsers/asm-parser-hexagon.ts index 8d89abf38..2bbbe3a6b 100644 --- a/lib/parsers/asm-parser-hexagon.ts +++ b/lib/parsers/asm-parser-hexagon.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {PropertyGetter} from '../properties.interfaces.js'; - import {AsmParser} from './asm-parser.js'; export class HexagonAsmParser extends AsmParser { diff --git a/lib/parsers/asm-parser-mads.ts b/lib/parsers/asm-parser-mads.ts index d87f3b48c..a62bc3dbd 100644 --- a/lib/parsers/asm-parser-mads.ts +++ b/lib/parsers/asm-parser-mads.ts @@ -32,7 +32,6 @@ import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfa import {assert} from '../assert.js'; import {PropertyGetter} from '../properties.interfaces.js'; import * as utils from '../utils.js'; - import {AsmParser, ParsingContext} from './asm-parser.js'; import {AsmRegex} from './asmregex.js'; diff --git a/lib/parsers/asm-parser-mlir.ts b/lib/parsers/asm-parser-mlir.ts index 14feca001..a9ba0c549 100644 --- a/lib/parsers/asm-parser-mlir.ts +++ b/lib/parsers/asm-parser-mlir.ts @@ -25,7 +25,6 @@ import {AsmResultSource, ParsedAsmResult, ParsedAsmResultLine} from '../../types/asmresult/asmresult.interfaces.js'; import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import * as utils from '../utils.js'; - import {AsmParser} from './asm-parser.js'; export class MlirAsmParser extends AsmParser { diff --git a/lib/parsers/asm-parser-msp430.ts b/lib/parsers/asm-parser-msp430.ts index 961eb26fe..36d351904 100644 --- a/lib/parsers/asm-parser-msp430.ts +++ b/lib/parsers/asm-parser-msp430.ts @@ -24,7 +24,6 @@ import {ParsedAsmResult} from '../../types/asmresult/asmresult.interfaces.js'; import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; - import {AsmParser} from './asm-parser.js'; export class AsmParserMsp430 extends AsmParser { diff --git a/lib/parsers/asm-parser-odin.ts b/lib/parsers/asm-parser-odin.ts index a6a97dca5..bf35e1631 100644 --- a/lib/parsers/asm-parser-odin.ts +++ b/lib/parsers/asm-parser-odin.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {PropertyGetter} from '../properties.interfaces.js'; - import {AsmParser} from './asm-parser.js'; export class OdinAsmParser extends AsmParser { diff --git a/lib/parsers/asm-parser-orca.ts b/lib/parsers/asm-parser-orca.ts index 40e3cf708..9e2b31228 100644 --- a/lib/parsers/asm-parser-orca.ts +++ b/lib/parsers/asm-parser-orca.ts @@ -25,7 +25,6 @@ import {AsmResultLabel, ParsedAsmResultLine} from '../../types/asmresult/asmresult.interfaces.js'; import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {PropertyGetter} from '../properties.interfaces.js'; - import {AsmParser} from './asm-parser.js'; export class ORCAAsmParser extends AsmParser { diff --git a/lib/parsers/asm-parser-ptx.ts b/lib/parsers/asm-parser-ptx.ts index 197147e82..105deb57c 100644 --- a/lib/parsers/asm-parser-ptx.ts +++ b/lib/parsers/asm-parser-ptx.ts @@ -26,7 +26,6 @@ import {AsmResultSource, ParsedAsmResult, ParsedAsmResultLine} from '../../types import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {PropertyGetter} from '../properties.interfaces.js'; import * as utils from '../utils.js'; - import {AsmParser} from './asm-parser.js'; export class PTXAsmParser extends AsmParser { diff --git a/lib/parsers/asm-parser-sass.ts b/lib/parsers/asm-parser-sass.ts index bece2cf47..751ab7bfa 100644 --- a/lib/parsers/asm-parser-sass.ts +++ b/lib/parsers/asm-parser-sass.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {PropertyGetter} from '../properties.interfaces.js'; - import {AsmParser} from './asm-parser.js'; export class SassAsmParser extends AsmParser { diff --git a/lib/parsers/asm-parser-spirv.ts b/lib/parsers/asm-parser-spirv.ts index bfdf85225..32d79b6ee 100644 --- a/lib/parsers/asm-parser-spirv.ts +++ b/lib/parsers/asm-parser-spirv.ts @@ -25,7 +25,6 @@ import {AsmResultLabel, ParsedAsmResult, ParsedAsmResultLine} from '../../types/asmresult/asmresult.interfaces.js'; import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import * as utils from '../utils.js'; - import {AsmParser} from './asm-parser.js'; export class SPIRVAsmParser extends AsmParser { diff --git a/lib/parsers/asm-parser-tic2000.ts b/lib/parsers/asm-parser-tic2000.ts index 95e7ba0bb..bb7892e22 100644 --- a/lib/parsers/asm-parser-tic2000.ts +++ b/lib/parsers/asm-parser-tic2000.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {PropertyGetter} from '../properties.interfaces.js'; - import {AsmParser} from './asm-parser.js'; export class TiC2000AsmParser extends AsmParser { diff --git a/lib/parsers/asm-parser-turboc.ts b/lib/parsers/asm-parser-turboc.ts index de30577a3..75b8df481 100644 --- a/lib/parsers/asm-parser-turboc.ts +++ b/lib/parsers/asm-parser-turboc.ts @@ -26,7 +26,6 @@ import {AsmResultSource, ParsedAsmResult, ParsedAsmResultLine} from '../../types import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {PropertyGetter} from '../properties.interfaces.js'; import * as utils from '../utils.js'; - import {AsmParser} from './asm-parser.js'; export class TurboCAsmParser extends AsmParser { diff --git a/lib/parsers/asm-parser-vc.ts b/lib/parsers/asm-parser-vc.ts index 4a254ecbd..0f366f238 100644 --- a/lib/parsers/asm-parser-vc.ts +++ b/lib/parsers/asm-parser-vc.ts @@ -28,7 +28,6 @@ import {assert} from '../assert.js'; import {logger} from '../logger.js'; import {PropertyGetter} from '../properties.interfaces.js'; import * as utils from '../utils.js'; - import {AsmParser} from './asm-parser.js'; import {AsmRegex} from './asmregex.js'; diff --git a/lib/parsers/asm-parser-vc6.ts b/lib/parsers/asm-parser-vc6.ts index 3b0e9c082..1cfee721e 100644 --- a/lib/parsers/asm-parser-vc6.ts +++ b/lib/parsers/asm-parser-vc6.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {PropertyGetter} from '../properties.interfaces.js'; - import {VcAsmParser} from './asm-parser-vc.js'; export class Vc6AsmParser extends VcAsmParser { diff --git a/lib/parsers/asm-parser-z88dk.ts b/lib/parsers/asm-parser-z88dk.ts index f1b8fcf30..fe6d82874 100644 --- a/lib/parsers/asm-parser-z88dk.ts +++ b/lib/parsers/asm-parser-z88dk.ts @@ -8,7 +8,6 @@ import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfa import {assert} from '../assert.js'; import {PropertyGetter} from '../properties.interfaces.js'; import * as utils from '../utils.js'; - import {AsmParser} from './asm-parser.js'; import {AsmRegex} from './asmregex.js'; diff --git a/lib/parsers/asm-parser.ts b/lib/parsers/asm-parser.ts index 663d8dee3..a2447211b 100644 --- a/lib/parsers/asm-parser.ts +++ b/lib/parsers/asm-parser.ts @@ -33,7 +33,6 @@ import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfa import {assert} from '../assert.js'; import {PropertyGetter} from '../properties.interfaces.js'; import * as utils from '../utils.js'; - import {IAsmParser} from './asm-parser.interfaces.js'; import {AsmRegex} from './asmregex.js'; import {LabelContext, LabelProcessor} from './label-processor.js'; diff --git a/lib/parsers/asm-raw.ts b/lib/parsers/asm-raw.ts index 0dcecd89a..cd85681f6 100644 --- a/lib/parsers/asm-raw.ts +++ b/lib/parsers/asm-raw.ts @@ -24,7 +24,6 @@ import {AsmResultLink, ParsedAsmResult, ParsedAsmResultLine} from '../../types/asmresult/asmresult.interfaces.js'; import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; - import {AsmRegex} from './asmregex.js'; export class AsmRaw extends AsmRegex { diff --git a/lib/properties.ts b/lib/properties.ts index bd1f26772..441dae13d 100644 --- a/lib/properties.ts +++ b/lib/properties.ts @@ -29,7 +29,6 @@ import _ from 'underscore'; import {isString} from '../shared/common-utils.js'; import type {LanguageKey} from '../types/languages.interfaces.js'; - import {logger} from './logger.js'; import type {PropertyGetter, PropertyValue, Widen} from './properties.interfaces.js'; import {toProperty} from './utils.js'; diff --git a/lib/runtime-tools/heaptrack-wrapper.ts b/lib/runtime-tools/heaptrack-wrapper.ts index dde556eb5..08dfa9426 100644 --- a/lib/runtime-tools/heaptrack-wrapper.ts +++ b/lib/runtime-tools/heaptrack-wrapper.ts @@ -39,7 +39,6 @@ import {CompilationEnvironment} from '../compilation-env.js'; import {executeDirect} from '../exec.js'; import {logger} from '../logger.js'; import {PropertyGetter} from '../properties.interfaces.js'; - import {BaseRuntimeTool} from './base-runtime-tool.js'; const O_NONBLOCK = fsConstants.O_NONBLOCK; diff --git a/lib/s3-handler.ts b/lib/s3-handler.ts index e4aa10737..bd42af0dc 100644 --- a/lib/s3-handler.ts +++ b/lib/s3-handler.ts @@ -25,7 +25,6 @@ import {NoSuchKey, S3} from '@aws-sdk/client-s3'; import type {GetResult} from '../types/cache.interfaces.js'; - import {awsCredentials} from './aws.js'; import type {S3HandlerOptions} from './s3-handler.interfaces.js'; diff --git a/lib/sentry.ts b/lib/sentry.ts index 7c096a5e8..f815642ac 100644 --- a/lib/sentry.ts +++ b/lib/sentry.ts @@ -25,7 +25,6 @@ import * as Sentry from '@sentry/node'; import {parse} from '../shared/stacktrace.js'; - import {logger} from './logger.js'; import {PropertyGetter} from './properties.interfaces.js'; diff --git a/lib/shortener/index.ts b/lib/shortener/index.ts index 7ff6fb4cd..710380dce 100644 --- a/lib/shortener/index.ts +++ b/lib/shortener/index.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {makeKeyedTypeGetter} from '../keyed-type.js'; - import * as all from './_all.js'; export * from './_all.js'; diff --git a/lib/stats.ts b/lib/stats.ts index a785f7c99..5ba252485 100644 --- a/lib/stats.ts +++ b/lib/stats.ts @@ -29,7 +29,6 @@ import {FiledataPair} from '../types/compilation/compilation.interfaces.js'; import {CompilerOverrideOptions} from '../types/compilation/compiler-overrides.interfaces.js'; import {ConfiguredRuntimeTool} from '../types/execution/execution.interfaces.js'; import {SelectedLibraryVersion} from '../types/libraries/libraries.interfaces.js'; - import {ParsedRequest} from './handlers/compile.js'; import {logger} from './logger.js'; import {PropertyGetter} from './properties.interfaces.js'; diff --git a/lib/storage/index.ts b/lib/storage/index.ts index 8b0c26d89..38c6d2245 100644 --- a/lib/storage/index.ts +++ b/lib/storage/index.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {makeKeyedTypeGetter} from '../keyed-type.js'; - import * as all from './_all.js'; export * from './_all.js'; diff --git a/lib/storage/local.ts b/lib/storage/local.ts index 02749d205..6b85c9457 100644 --- a/lib/storage/local.ts +++ b/lib/storage/local.ts @@ -25,11 +25,11 @@ import fsSync from 'node:fs'; import fs from 'node:fs/promises'; import path from 'node:path'; + import _ from 'underscore'; import {logger} from '../logger.js'; import {CompilerProps} from '../properties.js'; - import {ExpandedShortLink, StorageBase, StoredObject} from './base.js'; const MIN_STORED_ID_LENGTH = 6; diff --git a/lib/storage/remote.ts b/lib/storage/remote.ts index 0a4358571..da2fe4f7e 100644 --- a/lib/storage/remote.ts +++ b/lib/storage/remote.ts @@ -26,7 +26,6 @@ import * as express from 'express'; import {logger} from '../logger.js'; import {CompilerProps} from '../properties.js'; - import {ExpandedShortLink, StorageBase} from './base.js'; export class StorageRemote extends StorageBase { diff --git a/lib/storage/s3.ts b/lib/storage/s3.ts index 340948384..95cdbd61c 100644 --- a/lib/storage/s3.ts +++ b/lib/storage/s3.ts @@ -35,7 +35,6 @@ import {PropertyGetter} from '../properties.interfaces.js'; import {CompilerProps} from '../properties.js'; import {S3Bucket} from '../s3-handler.js'; import {anonymizeIp} from '../utils.js'; - import {ExpandedShortLink, StorageBase, StoredObject} from './base.js'; /* diff --git a/lib/temp.ts b/lib/temp.ts index ac0e4306d..1e61344bb 100644 --- a/lib/temp.ts +++ b/lib/temp.ts @@ -25,6 +25,7 @@ import fs from 'node:fs'; import os from 'node:os'; import path from 'node:path'; + import {logger} from './logger.js'; import * as utils from './utils.js'; diff --git a/lib/tooling/bloaty-tool.ts b/lib/tooling/bloaty-tool.ts index f325f43ca..b3a11d6b0 100644 --- a/lib/tooling/bloaty-tool.ts +++ b/lib/tooling/bloaty-tool.ts @@ -24,7 +24,6 @@ import {CompilationInfo} from '../../types/compilation/compilation.interfaces.js'; import {fileExists} from '../utils.js'; - import {BaseTool} from './base-tool.js'; export class BloatyTool extends BaseTool { diff --git a/lib/tooling/bronto-refactor-tool.ts b/lib/tooling/bronto-refactor-tool.ts index 6ae02808c..5e065eb04 100644 --- a/lib/tooling/bronto-refactor-tool.ts +++ b/lib/tooling/bronto-refactor-tool.ts @@ -23,11 +23,11 @@ // POSSIBILITY OF SUCH DAMAGE. import path from 'node:path'; + import {splitArguments} from '../../shared/common-utils.js'; import {CompilationInfo} from '../../types/compilation/compilation.interfaces.js'; import {ToolInfo} from '../../types/tool.interfaces.js'; import {OptionsHandlerLibrary} from '../options-handler.js'; - import {ToolEnv} from './base-tool.interface.js'; import {BaseTool} from './base-tool.js'; diff --git a/lib/tooling/clang-format-tool.ts b/lib/tooling/clang-format-tool.ts index 4fa162922..c5b21820f 100644 --- a/lib/tooling/clang-format-tool.ts +++ b/lib/tooling/clang-format-tool.ts @@ -27,7 +27,6 @@ import path from 'node:path'; import {CompilationInfo} from '../../types/compilation/compilation.interfaces.js'; import {ToolInfo} from '../../types/tool.interfaces.js'; - import {ToolEnv} from './base-tool.interface.js'; import {BaseTool} from './base-tool.js'; diff --git a/lib/tooling/clang-query-tool.ts b/lib/tooling/clang-query-tool.ts index 5e3cf5f66..b75246d87 100644 --- a/lib/tooling/clang-query-tool.ts +++ b/lib/tooling/clang-query-tool.ts @@ -27,7 +27,6 @@ import path from 'node:path'; import {CompilationInfo} from '../../types/compilation/compilation.interfaces.js'; import {ToolInfo} from '../../types/tool.interfaces.js'; - import {ToolEnv} from './base-tool.interface.js'; import {BaseTool} from './base-tool.js'; diff --git a/lib/tooling/clang-tidy-tool.ts b/lib/tooling/clang-tidy-tool.ts index 106bb797a..ee2671320 100644 --- a/lib/tooling/clang-tidy-tool.ts +++ b/lib/tooling/clang-tidy-tool.ts @@ -29,7 +29,6 @@ import {splitArguments} from '../../shared/common-utils.js'; import {CompilationInfo} from '../../types/compilation/compilation.interfaces.js'; import {ToolInfo} from '../../types/tool.interfaces.js'; import {OptionsHandlerLibrary} from '../options-handler.js'; - import {ToolEnv} from './base-tool.interface.js'; import {BaseTool} from './base-tool.js'; diff --git a/lib/tooling/clippy-tool.ts b/lib/tooling/clippy-tool.ts index 4fcd0883a..7013acfa4 100644 --- a/lib/tooling/clippy-tool.ts +++ b/lib/tooling/clippy-tool.ts @@ -29,7 +29,6 @@ import type {ResultLine} from '../../types/resultline/resultline.interfaces.js'; import {assert} from '../assert.js'; import type {OptionsHandlerLibrary} from '../options-handler.js'; import {parseRustOutput} from '../utils.js'; - import {BaseTool} from './base-tool.js'; export class ClippyTool extends BaseTool { diff --git a/lib/tooling/compiler-dropin-tool.ts b/lib/tooling/compiler-dropin-tool.ts index be1ace3b3..1491db4fe 100644 --- a/lib/tooling/compiler-dropin-tool.ts +++ b/lib/tooling/compiler-dropin-tool.ts @@ -23,12 +23,12 @@ // POSSIBILITY OF SUCH DAMAGE. import path from 'node:path'; + import {splitArguments} from '../../shared/common-utils.js'; import {CompilationInfo} from '../../types/compilation/compilation.interfaces.js'; import {ToolInfo, ToolResult} from '../../types/tool.interfaces.js'; import {OptionsHandlerLibrary} from '../options-handler.js'; import {getToolchainPath} from '../toolchain-utils.js'; - import {ToolEnv} from './base-tool.interface.js'; import {BaseTool} from './base-tool.js'; diff --git a/lib/tooling/index.ts b/lib/tooling/index.ts index bf88ff5a3..cac91103e 100644 --- a/lib/tooling/index.ts +++ b/lib/tooling/index.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {makeKeyedTypeGetter} from '../keyed-type.js'; - import * as all from './_all.js'; export * from './_all.js'; diff --git a/lib/tooling/llvm-cov-tool.ts b/lib/tooling/llvm-cov-tool.ts index 6b83bd860..860fbbdac 100644 --- a/lib/tooling/llvm-cov-tool.ts +++ b/lib/tooling/llvm-cov-tool.ts @@ -25,7 +25,6 @@ import path from 'node:path'; import {CompilationInfo, ExecutionOptions} from '../../types/compilation/compilation.interfaces.js'; - import {BaseTool} from './base-tool.js'; export class LLVMCovTool extends BaseTool { diff --git a/lib/tooling/llvm-dwarfdump-tool.ts b/lib/tooling/llvm-dwarfdump-tool.ts index 51c6d3f0f..cbb96b7e7 100644 --- a/lib/tooling/llvm-dwarfdump-tool.ts +++ b/lib/tooling/llvm-dwarfdump-tool.ts @@ -24,7 +24,6 @@ import {CompilationInfo} from '../../types/compilation/compilation.interfaces.js'; import {fileExists} from '../utils.js'; - import {BaseTool} from './base-tool.js'; export class LLVMDWARFDumpTool extends BaseTool { diff --git a/lib/tooling/llvm-mca-tool.ts b/lib/tooling/llvm-mca-tool.ts index 9528f7bc0..c0fa6ef79 100644 --- a/lib/tooling/llvm-mca-tool.ts +++ b/lib/tooling/llvm-mca-tool.ts @@ -28,7 +28,6 @@ import fs from 'node:fs/promises'; import {CompilationInfo} from '../../types/compilation/compilation.interfaces.js'; import {InstructionSets} from '../instructionsets.js'; import * as utils from '../utils.js'; - import {BaseTool} from './base-tool.js'; export class LLVMMcaTool extends BaseTool { diff --git a/lib/tooling/microsoft-analysis-tool.ts b/lib/tooling/microsoft-analysis-tool.ts index 3ff172746..377a67c80 100644 --- a/lib/tooling/microsoft-analysis-tool.ts +++ b/lib/tooling/microsoft-analysis-tool.ts @@ -30,7 +30,6 @@ import {ToolInfo} from '../../types/tool.interfaces.js'; import {unwrap} from '../assert.js'; import {logger} from '../logger.js'; import {OptionsHandlerLibrary} from '../options-handler.js'; - import {ToolEnv} from './base-tool.interface.js'; import {BaseTool} from './base-tool.js'; diff --git a/lib/tooling/miri-tool.ts b/lib/tooling/miri-tool.ts index 267825ae0..447157f9f 100644 --- a/lib/tooling/miri-tool.ts +++ b/lib/tooling/miri-tool.ts @@ -24,7 +24,6 @@ import type {ResultLine} from '../../types/resultline/resultline.interfaces.js'; import {parseRustOutput} from '../utils.js'; - import {BaseTool} from './base-tool.js'; export class MiriTool extends BaseTool { diff --git a/lib/tooling/nm-tool.ts b/lib/tooling/nm-tool.ts index a1296f9bd..efb99d953 100644 --- a/lib/tooling/nm-tool.ts +++ b/lib/tooling/nm-tool.ts @@ -24,7 +24,6 @@ import {CompilationInfo} from '../../types/compilation/compilation.interfaces.js'; import {fileExists} from '../utils.js'; - import {BaseTool} from './base-tool.js'; export class NmTool extends BaseTool { diff --git a/lib/tooling/osaca-tool.ts b/lib/tooling/osaca-tool.ts index 295376a11..da7c378fd 100644 --- a/lib/tooling/osaca-tool.ts +++ b/lib/tooling/osaca-tool.ts @@ -29,7 +29,6 @@ import {CompilationInfo} from '../../types/compilation/compilation.interfaces.js import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js'; import {IAsmParser} from '../parsers/asm-parser.interfaces.js'; import * as utils from '../utils.js'; - import {BaseTool} from './base-tool.js'; export class OSACATool extends BaseTool { diff --git a/lib/tooling/pahole-tool.ts b/lib/tooling/pahole-tool.ts index da37ad0b2..e1364cc4f 100644 --- a/lib/tooling/pahole-tool.ts +++ b/lib/tooling/pahole-tool.ts @@ -24,7 +24,6 @@ import {CompilationInfo} from '../../types/compilation/compilation.interfaces.js'; import * as utils from '../utils.js'; - import {BaseTool} from './base-tool.js'; export class PaholeTool extends BaseTool { diff --git a/lib/tooling/pvs-studio-tool.ts b/lib/tooling/pvs-studio-tool.ts index 93fa26e10..b111b98f2 100644 --- a/lib/tooling/pvs-studio-tool.ts +++ b/lib/tooling/pvs-studio-tool.ts @@ -32,7 +32,6 @@ import {assert} from '../assert.js'; import * as exec from '../exec.js'; import {logger} from '../logger.js'; import * as utils from '../utils.js'; - import {ToolEnv} from './base-tool.interface.js'; import {BaseTool} from './base-tool.js'; diff --git a/lib/tooling/readelf-tool.ts b/lib/tooling/readelf-tool.ts index a9c1fe95b..b1a5f32f9 100644 --- a/lib/tooling/readelf-tool.ts +++ b/lib/tooling/readelf-tool.ts @@ -24,7 +24,6 @@ import {CompilationInfo} from '../../types/compilation/compilation.interfaces.js'; import {fileExists} from '../utils.js'; - import {BaseTool} from './base-tool.js'; export class ReadElfTool extends BaseTool { diff --git a/lib/tooling/rustfmt-tool.ts b/lib/tooling/rustfmt-tool.ts index 92ac1f2f5..d2f3edf52 100644 --- a/lib/tooling/rustfmt-tool.ts +++ b/lib/tooling/rustfmt-tool.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import {UnprocessedExecResult} from '../../types/execution/execution.interfaces.js'; - import {BaseTool} from './base-tool.js'; export class RustFmtTool extends BaseTool { diff --git a/lib/tooling/sonar-tool.ts b/lib/tooling/sonar-tool.ts index 8849b9b49..ca3104bc3 100644 --- a/lib/tooling/sonar-tool.ts +++ b/lib/tooling/sonar-tool.ts @@ -36,7 +36,6 @@ import type { import type {Artifact, ToolInfo, ToolResult} from '../../types/tool.interfaces.js'; import {OptionsHandlerLibrary} from '../options-handler.js'; import * as utils from '../utils.js'; - import {ToolEnv} from './base-tool.interface.js'; import {BaseTool} from './base-tool.js'; diff --git a/lib/tooling/strings-tool.ts b/lib/tooling/strings-tool.ts index 0e1b032ff..94766edfb 100644 --- a/lib/tooling/strings-tool.ts +++ b/lib/tooling/strings-tool.ts @@ -24,7 +24,6 @@ import {CompilationInfo} from '../../types/compilation/compilation.interfaces.js'; import {fileExists} from '../utils.js'; - import {BaseTool} from './base-tool.js'; export class StringsTool extends BaseTool { diff --git a/lib/tooling/x86to6502-tool.ts b/lib/tooling/x86to6502-tool.ts index eba47f326..cdd463717 100644 --- a/lib/tooling/x86to6502-tool.ts +++ b/lib/tooling/x86to6502-tool.ts @@ -27,7 +27,6 @@ import {CompilationInfo} from '../../types/compilation/compilation.interfaces.js import {ToolResult} from '../../types/tool.interfaces.js'; import {AsmParser} from '../parsers/asm-parser.js'; import * as utils from '../utils.js'; - import {BaseTool} from './base-tool.js'; export class x86to6502Tool extends BaseTool { diff --git a/lib/utils.ts b/lib/utils.ts index 9bb759376..688f2832c 100644 --- a/lib/utils.ts +++ b/lib/utils.ts @@ -28,6 +28,7 @@ import os from 'node:os'; import path from 'node:path'; import {fileURLToPath} from 'node:url'; import {Buffer} from 'buffer'; + import {ComponentConfig, ItemConfigType} from 'golden-layout'; import semverParser from 'semver'; import _ from 'underscore'; diff --git a/shared/url-serialization.ts b/shared/url-serialization.ts index 7bc017adb..34a72cae1 100644 --- a/shared/url-serialization.ts +++ b/shared/url-serialization.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import lzstring from 'lz-string'; + import * as rison from './rison.js'; /** diff --git a/static/ansi-to-html.ts b/static/ansi-to-html.ts index c53380cac..d87c20699 100644 --- a/static/ansi-to-html.ts +++ b/static/ansi-to-html.ts @@ -26,6 +26,7 @@ // Converted to typescript by MarkusJx import _ from 'underscore'; + import {assert, unwrap} from '../shared/assert.js'; import {escapeHTML, isString} from '../shared/common-utils.js'; import {AnsiToHtmlOptions, ColorCodes} from './ansi-to-html.interfaces.js'; diff --git a/static/artifact-handler.ts b/static/artifact-handler.ts index ffa9723b9..ae37de3c8 100644 --- a/static/artifact-handler.ts +++ b/static/artifact-handler.ts @@ -23,7 +23,9 @@ // POSSIBILITY OF SUCH DAMAGE. import {Buffer} from 'buffer'; + import $ from 'jquery'; + import {assert, unwrap} from '../shared/assert.js'; import {CompilationResult} from '../types/compilation/compilation.interfaces.js'; import {Artifact, ArtifactType} from '../types/tool.interfaces.js'; diff --git a/static/bootstrap-utils.ts b/static/bootstrap-utils.ts index 8313ed9c2..3060bd157 100644 --- a/static/bootstrap-utils.ts +++ b/static/bootstrap-utils.ts @@ -39,6 +39,7 @@ import $ from 'jquery'; import 'bootstrap'; + import {Dropdown, Modal, Popover, Toast} from 'bootstrap'; // Private event listener tracking map diff --git a/static/colour.ts b/static/colour.ts index 0313c47b4..98df9e4a3 100644 --- a/static/colour.ts +++ b/static/colour.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import * as monaco from 'monaco-editor'; + import {Themes} from './themes.js'; export type ColourScheme = diff --git a/static/compiler-service.ts b/static/compiler-service.ts index 18f52238b..df2b65dff 100644 --- a/static/compiler-service.ts +++ b/static/compiler-service.ts @@ -26,6 +26,7 @@ import {EventEmitter} from 'golden-layout'; import $ from 'jquery'; import {LRUCache} from 'lru-cache'; import _ from 'underscore'; + import {ResultLine} from '../types/resultline/resultline.interfaces.js'; import {options} from './options.js'; diff --git a/static/components.ts b/static/components.ts index b91991e24..6d7312665 100644 --- a/static/components.ts +++ b/static/components.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import GoldenLayout from 'golden-layout'; + import {ConfiguredOverrides} from '../types/compilation/compiler-overrides.interfaces.js'; import {ConfiguredRuntimeTools} from '../types/execution/execution.interfaces.js'; import {ParseFiltersAndOutputOptions} from '../types/features/filters.interfaces.js'; diff --git a/static/event-map.ts b/static/event-map.ts index a83b7992d..138e82d80 100644 --- a/static/event-map.ts +++ b/static/event-map.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import * as monaco from 'monaco-editor'; + import {ClangirBackendOptions} from '../types/compilation/clangir.interfaces.js'; import {CompilationResult} from '../types/compilation/compilation.interfaces.js'; import {LLVMIrBackendOptions} from '../types/compilation/ir.interfaces.js'; diff --git a/static/formatter-registry.ts b/static/formatter-registry.ts index c056eafd0..c9c3c3783 100644 --- a/static/formatter-registry.ts +++ b/static/formatter-registry.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import * as monaco from 'monaco-editor'; + import {unwrap} from '../shared/assert.js'; import {getFormattedCode} from './api/api.js'; import {FormattingRequest} from './api/formatting.interfaces.js'; diff --git a/static/graph-layout-core.ts b/static/graph-layout-core.ts index 017dcefb5..0b56fea08 100644 --- a/static/graph-layout-core.ts +++ b/static/graph-layout-core.ts @@ -24,6 +24,7 @@ import IntervalTree from '@flatten-js/interval-tree'; import cloneDeep from 'lodash.clonedeep'; + import {AnnotatedCfgDescriptor, AnnotatedNodeDescriptor, EdgeColor} from '../types/compilation/cfg.interfaces.js'; import {zip} from './utils.js'; diff --git a/static/history.ts b/static/history.ts index 451b196bd..3e9723bb9 100644 --- a/static/history.ts +++ b/static/history.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import _ from 'underscore'; + import {localStorage} from './local.js'; import {SharingBase} from './sharing.js'; diff --git a/static/hub.ts b/static/hub.ts index af0a88723..15f66e0f7 100644 --- a/static/hub.ts +++ b/static/hub.ts @@ -24,6 +24,7 @@ import GoldenLayout, {ContentItem} from 'golden-layout'; import _ from 'underscore'; + import {LanguageKey} from '../types/languages.interfaces.js'; import {CompilerService} from './compiler-service.js'; import { diff --git a/static/line-colouring.ts b/static/line-colouring.ts index 71f58ef58..1ee6cf93a 100644 --- a/static/line-colouring.ts +++ b/static/line-colouring.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import _ from 'underscore'; + import {ResultLine} from '../types/resultline/resultline.interfaces.js'; import {MultifileService} from './multifile-service.js'; diff --git a/static/modes/carbon-mode.ts b/static/modes/carbon-mode.ts index 628399f23..a3d52ea3f 100644 --- a/static/modes/carbon-mode.ts +++ b/static/modes/carbon-mode.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import * as monaco from 'monaco-editor'; - import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp'; function definition(): monaco.languages.IMonarchLanguage { diff --git a/static/modes/cpp-for-opencl-mode.ts b/static/modes/cpp-for-opencl-mode.ts index a362b6d62..91023f760 100644 --- a/static/modes/cpp-for-opencl-mode.ts +++ b/static/modes/cpp-for-opencl-mode.ts @@ -23,9 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; - import * as monaco from 'monaco-editor'; - import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp'; import cppp from './cppp-mode.js'; diff --git a/static/modes/cppcircle-mode.ts b/static/modes/cppcircle-mode.ts index 402b32c6e..6610c3417 100644 --- a/static/modes/cppcircle-mode.ts +++ b/static/modes/cppcircle-mode.ts @@ -23,10 +23,9 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; - import * as monaco from 'monaco-editor'; - import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp'; + import cppp from './cppp-mode.js'; // circle is c++ with a few extra '@'-prefixed keywords. diff --git a/static/modes/cppfront-mode.ts b/static/modes/cppfront-mode.ts index c9d09277b..7f8efa36b 100644 --- a/static/modes/cppfront-mode.ts +++ b/static/modes/cppfront-mode.ts @@ -23,10 +23,9 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; - import * as monaco from 'monaco-editor'; - import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp'; + import cppp from './cppp-mode.js'; function definition(): monaco.languages.IMonarchLanguage { diff --git a/static/modes/cppp-mode.ts b/static/modes/cppp-mode.ts index 34eb510de..87ce79adf 100644 --- a/static/modes/cppp-mode.ts +++ b/static/modes/cppp-mode.ts @@ -23,9 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; - import * as monaco from 'monaco-editor'; - import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp'; // We need to create a new definition for cpp so we can remove invalid keywords diff --git a/static/modes/cppx-blue-mode.ts b/static/modes/cppx-blue-mode.ts index bee7d5e27..fb3dd7872 100644 --- a/static/modes/cppx-blue-mode.ts +++ b/static/modes/cppx-blue-mode.ts @@ -23,10 +23,9 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; - import * as monaco from 'monaco-editor'; - import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp'; + import cppp from './cppp-mode.js'; function definition(): monaco.languages.IMonarchLanguage { diff --git a/static/modes/cuda-mode.ts b/static/modes/cuda-mode.ts index f28edbb30..e63df2405 100644 --- a/static/modes/cuda-mode.ts +++ b/static/modes/cuda-mode.ts @@ -23,10 +23,9 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; - import * as monaco from 'monaco-editor'; - import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp'; + import cppp from './cppp-mode.js'; // We need to create a new definition for cpp so we can remove invalid keywords diff --git a/static/modes/glsl-mode.ts b/static/modes/glsl-mode.ts index a91053296..9a27e79c0 100644 --- a/static/modes/glsl-mode.ts +++ b/static/modes/glsl-mode.ts @@ -23,9 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; - import * as monaco from 'monaco-editor'; - import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp'; function definition(): monaco.languages.IMonarchLanguage { diff --git a/static/modes/hlsl-mode.ts b/static/modes/hlsl-mode.ts index d08dcfcc3..817822efe 100644 --- a/static/modes/hlsl-mode.ts +++ b/static/modes/hlsl-mode.ts @@ -23,9 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; - import * as monaco from 'monaco-editor'; - import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp'; function definition(): monaco.languages.IMonarchLanguage { diff --git a/static/modes/hylo-mode.ts b/static/modes/hylo-mode.ts index 0da536907..fa986fa9e 100644 --- a/static/modes/hylo-mode.ts +++ b/static/modes/hylo-mode.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import * as monaco from 'monaco-editor'; - import * as swift from 'monaco-editor/esm/vs/basic-languages/swift/swift'; function definition(): monaco.languages.IMonarchLanguage { diff --git a/static/modes/ispc-mode.ts b/static/modes/ispc-mode.ts index 2c7b506de..c8d72f965 100644 --- a/static/modes/ispc-mode.ts +++ b/static/modes/ispc-mode.ts @@ -23,9 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; - import * as monaco from 'monaco-editor'; - import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp'; function definition(): monaco.languages.IMonarchLanguage { diff --git a/static/modes/nc-mode.ts b/static/modes/nc-mode.ts index 6b23a5240..25457cd09 100644 --- a/static/modes/nc-mode.ts +++ b/static/modes/nc-mode.ts @@ -23,9 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; - import * as monaco from 'monaco-editor'; - import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp'; // We need to ensure we use proper keywords for the Monaco Editor matcher. Note how diff --git a/static/modes/openclc-mode.ts b/static/modes/openclc-mode.ts index 7aefb5171..47282b4ab 100644 --- a/static/modes/openclc-mode.ts +++ b/static/modes/openclc-mode.ts @@ -23,9 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; - import * as monaco from 'monaco-editor'; - import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp'; import nc from './nc-mode.js'; diff --git a/static/modes/ptx-mode.ts b/static/modes/ptx-mode.ts index a3ea824f6..c5257d8a9 100644 --- a/static/modes/ptx-mode.ts +++ b/static/modes/ptx-mode.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; - import * as monaco from 'monaco-editor'; import asm from './asm-mode.js'; diff --git a/static/modes/rust-mode.ts b/static/modes/rust-mode.ts index 89796eda6..5aef50412 100644 --- a/static/modes/rust-mode.ts +++ b/static/modes/rust-mode.ts @@ -23,9 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; - import * as monaco from 'monaco-editor'; - import * as rust from 'monaco-editor/esm/vs/basic-languages/rust/rust'; // We need to patch the existing rust definition to fix hexadecimal literal highlighting diff --git a/static/modes/slang-mode.ts b/static/modes/slang-mode.ts index e5239546c..439796f31 100644 --- a/static/modes/slang-mode.ts +++ b/static/modes/slang-mode.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; - import * as monaco from 'monaco-editor'; // eslint-disable-next-line @typescript-eslint/ban-ts-comment import * as cpp from 'monaco-editor/esm/vs/basic-languages/cpp/cpp'; diff --git a/static/multifile-service.ts b/static/multifile-service.ts index 292e1785c..f5dd2bb4d 100644 --- a/static/multifile-service.ts +++ b/static/multifile-service.ts @@ -25,6 +25,7 @@ import JSZip from 'jszip'; import path from 'path-browserify'; import _ from 'underscore'; + import {unwrap} from '../shared/assert.js'; import {FiledataPair} from '../types/compilation/compilation.interfaces.js'; import {LanguageKey} from '../types/languages.interfaces.js'; diff --git a/static/panes/ast-view.ts b/static/panes/ast-view.ts index dfcd807ce..63486c2a8 100644 --- a/static/panes/ast-view.ts +++ b/static/panes/ast-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {unwrap} from '../../shared/assert.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/static/panes/cfg-view.ts b/static/panes/cfg-view.ts index eb26aa269..d5da4126a 100644 --- a/static/panes/cfg-view.ts +++ b/static/panes/cfg-view.ts @@ -28,6 +28,7 @@ import $ from 'jquery'; import * as monaco from 'monaco-editor'; import TomSelect from 'tom-select'; import _ from 'underscore'; + import {assert, unwrap} from '../../shared/assert.js'; import {escapeHTML} from '../../shared/common-utils.js'; import { diff --git a/static/panes/clangir-view.ts b/static/panes/clangir-view.ts index 795b2ac48..196f915ef 100644 --- a/static/panes/clangir-view.ts +++ b/static/panes/clangir-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {ClangirBackendOptions} from '../../types/compilation/clangir.interfaces.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/static/panes/clojuremacroexp-view.ts b/static/panes/clojuremacroexp-view.ts index ae788845c..c1bb942ba 100644 --- a/static/panes/clojuremacroexp-view.ts +++ b/static/panes/clojuremacroexp-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; import {Hub} from '../hub.js'; diff --git a/static/panes/compiler.ts b/static/panes/compiler.ts index 370b54e6d..5bb7b2341 100644 --- a/static/panes/compiler.ts +++ b/static/panes/compiler.ts @@ -28,6 +28,7 @@ import {LRUCache} from 'lru-cache'; import * as monaco from 'monaco-editor'; import {editor} from 'monaco-editor'; import _ from 'underscore'; + import {AssemblyInstructionInfo} from '../../types/assembly-docs.interfaces.js'; import { ActiveTool, @@ -72,6 +73,7 @@ import {PPOptions} from './pp-view.interfaces.js'; import IEditorMouseEvent = editor.IEditorMouseEvent; import fileSaver from 'file-saver'; + import {unwrap, unwrapString} from '../../shared/assert.js'; import {escapeHTML, splitArguments} from '../../shared/common-utils.js'; import {ClangirBackendOptions} from '../../types/compilation/clangir.interfaces.js'; diff --git a/static/panes/conformance-view.ts b/static/panes/conformance-view.ts index 6b1aa3c70..3c97c3573 100644 --- a/static/panes/conformance-view.ts +++ b/static/panes/conformance-view.ts @@ -25,6 +25,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import _ from 'underscore'; + import {unwrapString} from '../../shared/assert.js'; import {escapeHTML, unique} from '../../shared/common-utils.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; diff --git a/static/panes/device-view.ts b/static/panes/device-view.ts index 9e3ea23fe..a806e7e0e 100644 --- a/static/panes/device-view.ts +++ b/static/panes/device-view.ts @@ -27,6 +27,7 @@ import $ from 'jquery'; import * as monaco from 'monaco-editor'; import TomSelect from 'tom-select'; import _ from 'underscore'; + import {assert} from '../../shared/assert.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/static/panes/diff.ts b/static/panes/diff.ts index 7b190f515..59a00b122 100644 --- a/static/panes/diff.ts +++ b/static/panes/diff.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import TomSelect from 'tom-select'; + import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; import {ResultLine} from '../../types/resultline/resultline.interfaces.js'; diff --git a/static/panes/editor.ts b/static/panes/editor.ts index 64b97f465..45dcd0bc2 100644 --- a/static/panes/editor.ts +++ b/static/panes/editor.ts @@ -23,12 +23,14 @@ // POSSIBILITY OF SUCH DAMAGE. import {Buffer} from 'buffer'; + import $ from 'jquery'; import * as monaco from 'monaco-editor'; import {editor} from 'monaco-editor'; import * as monacoVim from 'monaco-vim'; import TomSelect from 'tom-select'; import _ from 'underscore'; + import * as BootstrapUtils from '../bootstrap-utils.js'; import * as colour from '../colour.js'; import * as Components from '../components.js'; @@ -41,8 +43,10 @@ import {Alert} from '../widgets/alert.js'; import * as loadSaveLib from '../widgets/load-save.js'; import '../formatter-registry'; import '../modes/_all'; + import {Container} from 'golden-layout'; import type {escape_html} from 'tom-select/dist/types/utils.js'; + import {assert, unwrap} from '../../shared/assert.js'; import {escapeHTML, isString} from '../../shared/common-utils.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; diff --git a/static/panes/executor.ts b/static/panes/executor.ts index a7b5c69c2..91a19d5b0 100644 --- a/static/panes/executor.ts +++ b/static/panes/executor.ts @@ -25,6 +25,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import _ from 'underscore'; + import {escapeHTML} from '../../shared/common-utils.js'; import { BypassCache, diff --git a/static/panes/explain-view-utils.ts b/static/panes/explain-view-utils.ts index db9aa7c0a..28aadad11 100644 --- a/static/panes/explain-view-utils.ts +++ b/static/panes/explain-view-utils.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import {marked} from 'marked'; + import {capitaliseFirst} from '../../shared/common-utils.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/static/panes/explain-view.ts b/static/panes/explain-view.ts index b533868cf..89700e865 100644 --- a/static/panes/explain-view.ts +++ b/static/panes/explain-view.ts @@ -25,6 +25,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import {LRUCache} from 'lru-cache'; + import {capitaliseFirst} from '../../shared/common-utils.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/static/panes/flags-view.ts b/static/panes/flags-view.ts index 5505646bb..0d077222e 100644 --- a/static/panes/flags-view.ts +++ b/static/panes/flags-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; import {Hub} from '../hub.js'; diff --git a/static/panes/gccdump-view.ts b/static/panes/gccdump-view.ts index 2c2c11148..23c536464 100644 --- a/static/panes/gccdump-view.ts +++ b/static/panes/gccdump-view.ts @@ -28,6 +28,7 @@ import $ from 'jquery'; import * as monaco from 'monaco-editor'; import TomSelect from 'tom-select'; import _ from 'underscore'; + import {assert, unwrap} from '../../shared/assert.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/static/panes/gnatdebug-view.ts b/static/panes/gnatdebug-view.ts index 82363dbfd..9b305533d 100644 --- a/static/panes/gnatdebug-view.ts +++ b/static/panes/gnatdebug-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {unwrap} from '../../shared/assert.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/static/panes/gnatdebugtree-view.ts b/static/panes/gnatdebugtree-view.ts index cad9fdd51..2b29085b5 100644 --- a/static/panes/gnatdebugtree-view.ts +++ b/static/panes/gnatdebugtree-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {unwrap} from '../../shared/assert.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/static/panes/haskellcmm-view.ts b/static/panes/haskellcmm-view.ts index 15a1e80e6..0019c0b86 100644 --- a/static/panes/haskellcmm-view.ts +++ b/static/panes/haskellcmm-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; import {Hub} from '../hub.js'; diff --git a/static/panes/haskellcore-view.ts b/static/panes/haskellcore-view.ts index 9399eb008..1ab48f348 100644 --- a/static/panes/haskellcore-view.ts +++ b/static/panes/haskellcore-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; import {Hub} from '../hub.js'; diff --git a/static/panes/haskellstg-view.ts b/static/panes/haskellstg-view.ts index 82705e129..fd008ce0c 100644 --- a/static/panes/haskellstg-view.ts +++ b/static/panes/haskellstg-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; import {Hub} from '../hub.js'; diff --git a/static/panes/opt-pipeline.ts b/static/panes/opt-pipeline.ts index 0d91d7219..b7616d5b8 100644 --- a/static/panes/opt-pipeline.ts +++ b/static/panes/opt-pipeline.ts @@ -29,6 +29,7 @@ import * as monaco from 'monaco-editor'; import scrollIntoView from 'scroll-into-view-if-needed'; import TomSelect from 'tom-select'; import _ from 'underscore'; + import {unwrap, unwrapString} from '../../shared/assert.js'; import {escapeHTML} from '../../shared/common-utils.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; diff --git a/static/panes/opt-view.ts b/static/panes/opt-view.ts index bd64c13c3..db8165830 100644 --- a/static/panes/opt-view.ts +++ b/static/panes/opt-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {unwrap} from '../../shared/assert.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/static/panes/output.ts b/static/panes/output.ts index 39b4ec59b..2e0331b0b 100644 --- a/static/panes/output.ts +++ b/static/panes/output.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {escapeHTML} from '../../shared/common-utils.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/static/panes/pane.ts b/static/panes/pane.ts index 1fd42c896..7483a7638 100644 --- a/static/panes/pane.ts +++ b/static/panes/pane.ts @@ -25,6 +25,7 @@ import {Container} from 'golden-layout'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {unwrap} from '../../shared/assert.js'; import {escapeHTML} from '../../shared/common-utils.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; diff --git a/static/panes/pp-view.ts b/static/panes/pp-view.ts index 7ebe756bc..0a52bc47b 100644 --- a/static/panes/pp-view.ts +++ b/static/panes/pp-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {unwrap} from '../../shared/assert.js'; import {CompilationResult, PPOutput} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/static/panes/rusthir-view.ts b/static/panes/rusthir-view.ts index fddf35d23..631118ace 100644 --- a/static/panes/rusthir-view.ts +++ b/static/panes/rusthir-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; import {Hub} from '../hub.js'; diff --git a/static/panes/rustmacroexp-view.ts b/static/panes/rustmacroexp-view.ts index 3cacd1431..d3027d06b 100644 --- a/static/panes/rustmacroexp-view.ts +++ b/static/panes/rustmacroexp-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; import {Hub} from '../hub.js'; diff --git a/static/panes/rustmir-view.ts b/static/panes/rustmir-view.ts index 26da50445..ceb41ab0e 100644 --- a/static/panes/rustmir-view.ts +++ b/static/panes/rustmir-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; import {Hub} from '../hub.js'; diff --git a/static/panes/stack-usage-view.ts b/static/panes/stack-usage-view.ts index 80abe8a7e..4bd3b4c04 100644 --- a/static/panes/stack-usage-view.ts +++ b/static/panes/stack-usage-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {unwrap} from '../../shared/assert.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/static/panes/tool-input-view.ts b/static/panes/tool-input-view.ts index eb4ad5073..9a170ce1b 100644 --- a/static/panes/tool-input-view.ts +++ b/static/panes/tool-input-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; import {ToolState} from '../components.interfaces.js'; diff --git a/static/panes/tool.ts b/static/panes/tool.ts index ff0da9bf3..9d1ce2afe 100644 --- a/static/panes/tool.ts +++ b/static/panes/tool.ts @@ -27,6 +27,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {unwrap, unwrapString} from '../../shared/assert.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/static/panes/tree.ts b/static/panes/tree.ts index e7ae0b916..9139c8bff 100644 --- a/static/panes/tree.ts +++ b/static/panes/tree.ts @@ -27,6 +27,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import TomSelect from 'tom-select'; import _ from 'underscore'; + import {assert, unwrap, unwrapString} from '../../shared/assert.js'; import {escapeHTML} from '../../shared/common-utils.js'; import {LanguageKey} from '../../types/languages.interfaces.js'; diff --git a/static/panes/yul-view.ts b/static/panes/yul-view.ts index 51487cd75..4191a2236 100644 --- a/static/panes/yul-view.ts +++ b/static/panes/yul-view.ts @@ -26,6 +26,7 @@ import {Container} from 'golden-layout'; import $ from 'jquery'; import * as monaco from 'monaco-editor'; import _ from 'underscore'; + import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; import {YulBackendOptions} from '../../types/compilation/yul.interfaces.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/static/print-view.ts b/static/print-view.ts index 1d73824e7..c248edcc5 100644 --- a/static/print-view.ts +++ b/static/print-view.ts @@ -23,7 +23,6 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; - import * as monaco from 'monaco-editor'; import {unwrap} from '../shared/assert.js'; diff --git a/static/sentry.ts b/static/sentry.ts index ee8f563c0..5d2dfd0ef 100644 --- a/static/sentry.ts +++ b/static/sentry.ts @@ -24,6 +24,7 @@ import * as Sentry from '@sentry/browser'; import GoldenLayout from 'golden-layout'; + import {parse} from '../shared/stacktrace.js'; import {serialiseState} from '../shared/url-serialization.js'; import {options} from './options.js'; diff --git a/static/settings.ts b/static/settings.ts index 06696af31..f66babc89 100644 --- a/static/settings.ts +++ b/static/settings.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; + import {assert, unwrapString} from '../shared/assert.js'; import {isString, keys} from '../shared/common-utils.js'; import {LanguageKey} from '../types/languages.interfaces.js'; diff --git a/static/sharing.ts b/static/sharing.ts index a3330a6f4..6250c71a3 100644 --- a/static/sharing.ts +++ b/static/sharing.ts @@ -27,6 +27,7 @@ import ClipboardJS from 'clipboard'; import GoldenLayout from 'golden-layout'; import $ from 'jquery'; import _ from 'underscore'; + import {unwrap} from '../shared/assert.js'; import {serialiseState} from '../shared/url-serialization.js'; import * as BootstrapUtils from './bootstrap-utils.js'; diff --git a/static/tests/components-tests.ts b/static/tests/components-tests.ts index 5c6c11cca..08d96b573 100644 --- a/static/tests/components-tests.ts +++ b/static/tests/components-tests.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import {describe, expect, it} from 'vitest'; + import { COMPILER_COMPONENT_NAME, DIFF_VIEW_COMPONENT_NAME, diff --git a/static/tests/remote-utils-tests.ts b/static/tests/remote-utils-tests.ts index 7c70e07d4..0e908d1b5 100644 --- a/static/tests/remote-utils-tests.ts +++ b/static/tests/remote-utils-tests.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import {describe, expect, it} from 'vitest'; + import {getRemoteId} from '../../shared/remote-utils.js'; import {UrlTestCases} from '../../shared/url-testcases.js'; diff --git a/static/tests/url-tests.ts b/static/tests/url-tests.ts index c4255863a..41cae35ee 100644 --- a/static/tests/url-tests.ts +++ b/static/tests/url-tests.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import {describe, expect, it} from 'vitest'; + import {deserialiseState} from '../url.js'; describe('Historical URL Backward Compatibility', () => { diff --git a/static/themes.ts b/static/themes.ts index 98479a5d9..05553a44b 100644 --- a/static/themes.ts +++ b/static/themes.ts @@ -25,6 +25,7 @@ import GoldenLayout from 'golden-layout'; import $ from 'jquery'; import {editor} from 'monaco-editor'; + import {isString} from '../shared/common-utils.js'; import {options} from './options.js'; import {SiteSettings} from './settings.js'; diff --git a/static/url.ts b/static/url.ts index 71fbc3a93..d48dab3ae 100644 --- a/static/url.ts +++ b/static/url.ts @@ -24,6 +24,7 @@ import lzstring from 'lz-string'; import _ from 'underscore'; + import * as urlSerialization from '../shared/url-serialization.js'; import * as Components from './components.js'; diff --git a/static/utils.ts b/static/utils.ts index fda5d8b6f..63e73ebea 100644 --- a/static/utils.ts +++ b/static/utils.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import bigInt from 'big-integer'; + import {addDigitSeparator} from '../shared/common-utils.js'; /** diff --git a/static/widgets/compiler-overrides.ts b/static/widgets/compiler-overrides.ts index 983f15a1b..aba840a49 100644 --- a/static/widgets/compiler-overrides.ts +++ b/static/widgets/compiler-overrides.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; + import {assert, unwrap} from '../../shared/assert.js'; import { CompilerOverrideType, diff --git a/static/widgets/compiler-picker-popup.ts b/static/widgets/compiler-picker-popup.ts index 41614f4e3..0d2998b43 100644 --- a/static/widgets/compiler-picker-popup.ts +++ b/static/widgets/compiler-picker-popup.ts @@ -24,6 +24,7 @@ import * as sifter from '@orchidjs/sifter'; import $ from 'jquery'; + import {unwrap, unwrapString} from '../../shared/assert.js'; import {escapeHTML, intersection, remove, unique} from '../../shared/common-utils.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; diff --git a/static/widgets/compiler-picker.ts b/static/widgets/compiler-picker.ts index 3c591b671..654b40888 100644 --- a/static/widgets/compiler-picker.ts +++ b/static/widgets/compiler-picker.ts @@ -24,6 +24,7 @@ import $ from 'jquery'; import TomSelect from 'tom-select'; + import {unwrap} from '../../shared/assert.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; import {CompilerService} from '../compiler-service.js'; diff --git a/static/widgets/compiler-version-info.ts b/static/widgets/compiler-version-info.ts index bc3ddd7e4..cbe8d5ea4 100644 --- a/static/widgets/compiler-version-info.ts +++ b/static/widgets/compiler-version-info.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; + import {escapeHTML} from '../../shared/common-utils.js'; import * as BootstrapUtils from '../bootstrap-utils.js'; import {options} from '../options.js'; diff --git a/static/widgets/fontscale.ts b/static/widgets/fontscale.ts index 893867638..6b06f5cdf 100644 --- a/static/widgets/fontscale.ts +++ b/static/widgets/fontscale.ts @@ -23,8 +23,10 @@ // POSSIBILITY OF SUCH DAMAGE. import EventEmitter from 'events'; + import $ from 'jquery'; import {editor} from 'monaco-editor'; + import {options} from '../options.js'; import {Settings} from '../settings.js'; diff --git a/static/widgets/history-widget.ts b/static/widgets/history-widget.ts index f6e1b36bf..64192b335 100644 --- a/static/widgets/history-widget.ts +++ b/static/widgets/history-widget.ts @@ -25,6 +25,7 @@ import $ from 'jquery'; import {editor} from 'monaco-editor'; import {pluck} from 'underscore'; + import {unwrap} from '../../shared/assert.js'; import * as BootstrapUtils from '../bootstrap-utils.js'; import {EditorSource, HistoryEntry, sortedList} from '../history.js'; diff --git a/static/widgets/libs-widget.ts b/static/widgets/libs-widget.ts index 62d7fba30..b45ddc28b 100644 --- a/static/widgets/libs-widget.ts +++ b/static/widgets/libs-widget.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; + import {unwrapString} from '../../shared/assert.js'; import * as BootstrapUtils from '../bootstrap-utils.js'; import {localStorage} from '../local.js'; diff --git a/static/widgets/load-save.ts b/static/widgets/load-save.ts index 93c82584b..6591ad3a6 100644 --- a/static/widgets/load-save.ts +++ b/static/widgets/load-save.ts @@ -25,6 +25,7 @@ import {saveAs} from 'file-saver'; import $ from 'jquery'; import _ from 'underscore'; + import {unwrap, unwrapString} from '../../shared/assert.js'; import {escapeHTML} from '../../shared/common-utils.js'; import {Language} from '../../types/languages.interfaces.js'; diff --git a/static/widgets/pane-renaming.ts b/static/widgets/pane-renaming.ts index adae64eee..9aff5428c 100644 --- a/static/widgets/pane-renaming.ts +++ b/static/widgets/pane-renaming.ts @@ -24,6 +24,7 @@ import {Tab} from 'golden-layout'; import $ from 'jquery'; + import {Hub} from '../hub.js'; import {Alert} from './alert.js'; diff --git a/static/widgets/runtime-tools.ts b/static/widgets/runtime-tools.ts index 45d664acf..29f574615 100644 --- a/static/widgets/runtime-tools.ts +++ b/static/widgets/runtime-tools.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import $ from 'jquery'; + import {assert} from '../../shared/assert.js'; import {CompilerInfo} from '../../types/compiler.interfaces.js'; import { diff --git a/static/widgets/site-templates-widget.ts b/static/widgets/site-templates-widget.ts index 95056e3be..c7f68de2e 100644 --- a/static/widgets/site-templates-widget.ts +++ b/static/widgets/site-templates-widget.ts @@ -24,6 +24,7 @@ import GoldenLayout from 'golden-layout'; import $ from 'jquery'; + import {assert, unwrap, unwrapString} from '../../shared/assert.js'; import {escapeHTML} from '../../shared/common-utils.js'; import {serialiseState} from '../../shared/url-serialization.js'; diff --git a/static/widgets/timing-info-widget.ts b/static/widgets/timing-info-widget.ts index 295900d76..1d525ad14 100644 --- a/static/widgets/timing-info-widget.ts +++ b/static/widgets/timing-info-widget.ts @@ -24,6 +24,7 @@ import {Chart, ChartData, defaults} from 'chart.js'; import $ from 'jquery'; + import {unwrap} from '../../shared/assert.js'; import {isString} from '../../shared/common-utils.js'; import {CompilationResult} from '../../types/compilation/compilation.interfaces.js'; diff --git a/test/analysis-tests.ts b/test/analysis-tests.ts index bfbe78996..561e56bb8 100644 --- a/test/analysis-tests.ts +++ b/test/analysis-tests.ts @@ -29,7 +29,6 @@ import {AnalysisTool, LLVMmcaTool} from '../lib/compilers/index.js'; import {ToolEnv} from '../lib/tooling/base-tool.interface.js'; import {LLVMMcaTool as LLVMMcaTooling} from '../lib/tooling/llvm-mca-tool.js'; import {ToolInfo} from '../types/tool.interfaces.js'; - import { makeCompilationEnvironment, makeFakeCompilerInfo, diff --git a/test/android-tests.ts b/test/android-tests.ts index 11824cec2..19bf5d917 100644 --- a/test/android-tests.ts +++ b/test/android-tests.ts @@ -31,7 +31,6 @@ import {Dex2OatCompiler} from '../lib/compilers/index.js'; import * as utils from '../lib/utils.js'; import {ParsedAsmResultLine} from '../types/asmresult/asmresult.interfaces.js'; import {CompilerInfo} from '../types/compiler.interfaces.js'; - import {makeCompilationEnvironment} from './utils.js'; const languages = { diff --git a/test/app/cli-tests.ts b/test/app/cli-tests.ts index 5cbd694ff..a0f407736 100644 --- a/test/app/cli-tests.ts +++ b/test/app/cli-tests.ts @@ -26,7 +26,9 @@ import child_process from 'node:child_process'; import fs from 'node:fs'; import os from 'node:os'; import path from 'node:path'; + import {afterEach, beforeEach, describe, expect, it, MockInstance, vi} from 'vitest'; + import { CompilerExplorerOptions, convertOptionsToAppArguments, diff --git a/test/app/compiler-discovery-tests.ts b/test/app/compiler-discovery-tests.ts index a14d78ae9..990125acf 100644 --- a/test/app/compiler-discovery-tests.ts +++ b/test/app/compiler-discovery-tests.ts @@ -24,7 +24,9 @@ import fs from 'node:fs/promises'; import process from 'node:process'; + import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest'; + import { discoverCompilers, findAndValidateCompilers, diff --git a/test/app/config-tests.ts b/test/app/config-tests.ts index 4ca64a583..6906c41c0 100644 --- a/test/app/config-tests.ts +++ b/test/app/config-tests.ts @@ -58,6 +58,7 @@ function createMockAppArgs(overrides: Partial = {}): AppArguments } import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest'; + import { createPropertyHierarchy, filterLanguages, diff --git a/test/app/main-tests.ts b/test/app/main-tests.ts index af3b5f7d1..88c33a34a 100644 --- a/test/app/main-tests.ts +++ b/test/app/main-tests.ts @@ -23,8 +23,10 @@ // POSSIBILITY OF SUCH DAMAGE. import fs from 'node:fs/promises'; + import express from 'express'; import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest'; + import {initialiseApplication} from '../../lib/app/main.js'; import * as server from '../../lib/app/server.js'; import {AppArguments} from '../../lib/app.interfaces.js'; diff --git a/test/app/rendering-tests.ts b/test/app/rendering-tests.ts index 02d0b7726..4168c4d5c 100644 --- a/test/app/rendering-tests.ts +++ b/test/app/rendering-tests.ts @@ -24,6 +24,7 @@ import express, {type NextFunction, type Request, type Response} from 'express'; import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest'; + import {createRenderHandlers} from '../../lib/app/rendering.js'; import {PugRequireHandler, ServerDependencies, ServerOptions} from '../../lib/app/server.interfaces.js'; import {AppArguments} from '../../lib/app.interfaces.js'; diff --git a/test/app/server-config-tests.ts b/test/app/server-config-tests.ts index a60ce6bfd..3770f9823 100644 --- a/test/app/server-config-tests.ts +++ b/test/app/server-config-tests.ts @@ -26,6 +26,7 @@ import * as Sentry from '@sentry/node'; import type {NextFunction, Request, Response, Router} from 'express'; import type {Express} from 'express-serve-static-core'; import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest'; + import {ServerOptions} from '../../lib/app/server.interfaces.js'; import {setupBaseServerConfig} from '../../lib/app/server-config.js'; import * as logger from '../../lib/logger.js'; diff --git a/test/app/server-listening-tests.ts b/test/app/server-listening-tests.ts index 3908b009a..a2415b1a1 100644 --- a/test/app/server-listening-tests.ts +++ b/test/app/server-listening-tests.ts @@ -65,6 +65,7 @@ function createMockWebServer(): express.Express { import express from 'express'; import systemdSocket from 'systemd-socket'; import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest'; + import {startListening} from '../../lib/app/server.js'; // TODO import type {AppArguments} from '../../lib/app.interfaces.js'; import * as logger from '../../lib/logger.js'; diff --git a/test/app/server-tests.ts b/test/app/server-tests.ts index ccec7ff75..45b73d272 100644 --- a/test/app/server-tests.ts +++ b/test/app/server-tests.ts @@ -57,6 +57,7 @@ function createMockAppArgs(overrides: Partial = {}): AppArguments import express, {type Request, type Response} from 'express'; import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest'; + import type {ServerDependencies, ServerOptions} from '../../lib/app/server.interfaces.js'; import {setupWebServer} from '../../lib/app/server.js'; // TODO import type {AppArguments} from '../../lib/app.interfaces.js'; diff --git a/test/app/static-assets-tests.ts b/test/app/static-assets-tests.ts index 1fb108f8d..99155b342 100644 --- a/test/app/static-assets-tests.ts +++ b/test/app/static-assets-tests.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import {describe, expect, it, vi} from 'vitest'; + import {createDefaultPugRequireHandler, getFaviconFilename} from '../../lib/app/static-assets.js'; // Mock the logger diff --git a/test/app/temp-dir-tests.ts b/test/app/temp-dir-tests.ts index 39626f2e6..31b05ae11 100644 --- a/test/app/temp-dir-tests.ts +++ b/test/app/temp-dir-tests.ts @@ -24,6 +24,7 @@ import child_process from 'node:child_process'; import process from 'node:process'; + import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest'; import {setupTempDir} from '../../lib/app/temp-dir.js'; diff --git a/test/app/url-handlers-tests.ts b/test/app/url-handlers-tests.ts index ac27cd142..330a7c98c 100644 --- a/test/app/url-handlers-tests.ts +++ b/test/app/url-handlers-tests.ts @@ -24,6 +24,7 @@ import type {Request, Response} from 'express'; import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest'; + import {isMobileViewer, LegacyGoogleUrlHandler} from '../../lib/app/url-handlers.js'; describe('Url Handlers', () => { diff --git a/test/asm-parser-subclass-integration-tests.ts b/test/asm-parser-subclass-integration-tests.ts index 47502254b..d0062b9d4 100644 --- a/test/asm-parser-subclass-integration-tests.ts +++ b/test/asm-parser-subclass-integration-tests.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import {describe, expect, it} from 'vitest'; + import {AsmParser} from '../lib/parsers/asm-parser.js'; import {AsmEWAVRParser} from '../lib/parsers/asm-parser-ewavr.js'; import {SPIRVAsmParser} from '../lib/parsers/asm-parser-spirv.js'; diff --git a/test/asm-parser-tests.ts b/test/asm-parser-tests.ts index 436dba34c..50a9cce08 100644 --- a/test/asm-parser-tests.ts +++ b/test/asm-parser-tests.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import {describe, expect, it} from 'vitest'; + import {AsmParser} from '../lib/parsers/asm-parser.js'; import {MlirAsmParser} from '../lib/parsers/asm-parser-mlir.js'; import {PolkaVMAsmParser} from '../lib/parsers/asm-parser-polkavm.js'; diff --git a/test/asm-tests.ts b/test/asm-tests.ts index 790eeeec0..957a9574b 100644 --- a/test/asm-tests.ts +++ b/test/asm-tests.ts @@ -29,7 +29,6 @@ import {AsmParser} from '../lib/parsers/asm-parser.js'; import {VcAsmParser} from '../lib/parsers/asm-parser-vc.js'; import {AsmParserZ88dk} from '../lib/parsers/asm-parser-z88dk.js'; import {AsmRegex} from '../lib/parsers/asmregex.js'; - import {makeFakeParseFiltersAndOutputOptions} from './utils.js'; describe('ASM CL parser', () => { diff --git a/test/assert-tests.ts b/test/assert-tests.ts index ab17b690a..fa11e4dae 100644 --- a/test/assert-tests.ts +++ b/test/assert-tests.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import path from 'node:path'; + import {beforeEach, describe, expect, it} from 'vitest'; import {assert, check_path, removeFileProtocol, setBaseDirectory, unwrap, unwrapString} from '../lib/assert.js'; diff --git a/test/aws-tests.ts b/test/aws-tests.ts index 79de56960..a12406b1c 100644 --- a/test/aws-tests.ts +++ b/test/aws-tests.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import './utils.js'; + import {DescribeInstancesCommand, EC2, Instance} from '@aws-sdk/client-ec2'; import {GetParametersCommand, SSM} from '@aws-sdk/client-ssm'; import {mockClient} from 'aws-sdk-client-mock'; diff --git a/test/cache-tests.ts b/test/cache-tests.ts index 0bd8865ff..0f1e2a479 100644 --- a/test/cache-tests.ts +++ b/test/cache-tests.ts @@ -38,7 +38,6 @@ import {MultiCache} from '../lib/cache/multi.js'; import {NullCache} from '../lib/cache/null.js'; import {OnDiskCache} from '../lib/cache/on-disk.js'; import {S3Cache} from '../lib/cache/s3.js'; - import {newTempDir} from './utils.js'; function basicTests(factory: () => BaseCache) { diff --git a/test/cfg-tests.ts b/test/cfg-tests.ts index d5c2fa62b..283081929 100644 --- a/test/cfg-tests.ts +++ b/test/cfg-tests.ts @@ -29,7 +29,6 @@ import path from 'node:path'; import {describe, expect, it} from 'vitest'; import {generateStructure} from '../lib/cfg/cfg.js'; - import {CompilerInfo} from '../types/compiler.interfaces.js'; import {makeFakeCompilerInfo, resolvePathFromTestRoot} from './utils.js'; diff --git a/test/checks.ts b/test/checks.ts index e45ae1442..63fd6c46a 100644 --- a/test/checks.ts +++ b/test/checks.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import fs from 'node:fs'; + import _ from 'underscore'; import {afterAll, beforeAll, describe, expect, it} from 'vitest'; diff --git a/test/clojure-tests.ts b/test/clojure-tests.ts index 3e41fb58f..7960d0f71 100644 --- a/test/clojure-tests.ts +++ b/test/clojure-tests.ts @@ -27,7 +27,6 @@ import {beforeAll, describe, expect, it} from 'vitest'; import {CompilationEnvironment} from '../lib/compilation-env.js'; import {ClojureCompiler} from '../lib/compilers/index.js'; import {CompilerInfo} from '../types/compiler.interfaces.js'; - import {makeCompilationEnvironment} from './utils.js'; const languages = { diff --git a/test/compilation-env-tests.ts b/test/compilation-env-tests.ts index fdc5630d9..21085eabf 100644 --- a/test/compilation-env-tests.ts +++ b/test/compilation-env-tests.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import './utils.js'; + import {beforeAll, describe, expect, it} from 'vitest'; import {CompilationEnvironment} from '../lib/compilation-env.js'; diff --git a/test/compiler-finder-tests.ts b/test/compiler-finder-tests.ts index 6774327b6..5cc86c4ba 100644 --- a/test/compiler-finder-tests.ts +++ b/test/compiler-finder-tests.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import './utils.js'; + import {beforeAll, describe, expect, it} from 'vitest'; import {CompilerFinder} from '../lib/compiler-finder.js'; diff --git a/test/compilers/clang-tests.ts b/test/compilers/clang-tests.ts index a921f9fd6..d33e45b46 100644 --- a/test/compilers/clang-tests.ts +++ b/test/compilers/clang-tests.ts @@ -24,6 +24,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import {describe, expect, it} from 'vitest'; import {ClangCompiler} from '../../lib/compilers/index.js'; diff --git a/test/compilers/gcc-tests.ts b/test/compilers/gcc-tests.ts index 692e9b817..3a9b2f188 100644 --- a/test/compilers/gcc-tests.ts +++ b/test/compilers/gcc-tests.ts @@ -1,5 +1,6 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import {describe, expect, it} from 'vitest'; import {GCCCompiler} from '../../lib/compilers/index.js'; diff --git a/test/d-tests.ts b/test/d-tests.ts index ffaf6e363..a588239a3 100644 --- a/test/d-tests.ts +++ b/test/d-tests.ts @@ -28,7 +28,6 @@ import {CompilationEnvironment} from '../lib/compilation-env.js'; import {DMDCompiler} from '../lib/compilers/dmd.js'; import {LDCCompiler} from '../lib/compilers/ldc.js'; import {LanguageKey} from '../types/languages.interfaces.js'; - import {makeCompilationEnvironment, makeFakeCompilerInfo} from './utils.js'; const languages = { diff --git a/test/filter-tests.ts b/test/filter-tests.ts index cb6be7301..8e02d7791 100644 --- a/test/filter-tests.ts +++ b/test/filter-tests.ts @@ -28,7 +28,6 @@ import path from 'node:path'; import {describe, expect, it} from 'vitest'; import {ParseFiltersAndOutputOptions} from '../types/features/filters.interfaces.js'; - import {processAsm, resolvePathFromTestRoot, skipExpensiveTests} from './utils.js'; const casesRoot = resolvePathFromTestRoot('filters-cases'); diff --git a/test/handlers/noscript-tests.ts b/test/handlers/noscript-tests.ts index 55163970c..ddc9987f2 100644 --- a/test/handlers/noscript-tests.ts +++ b/test/handlers/noscript-tests.ts @@ -25,6 +25,7 @@ import express from 'express'; import request from 'supertest'; import {beforeAll, describe, expect, it} from 'vitest'; + import {NoScriptHandler} from '../../lib/handlers/noscript.js'; import type {ClientOptionsHandler} from '../../lib/options-handler.js'; import type {StorageBase} from '../../lib/storage/index.js'; diff --git a/test/handlers/route-api-test.ts b/test/handlers/route-api-test.ts index ea14e673d..6ff4b480c 100644 --- a/test/handlers/route-api-test.ts +++ b/test/handlers/route-api-test.ts @@ -23,9 +23,11 @@ // POSSIBILITY OF SUCH DAMAGE. import zlib from 'node:zlib'; + import express from 'express'; import request from 'supertest'; import {beforeAll, describe, expect, it} from 'vitest'; + import {GoldenLayoutRootStruct} from '../../lib/clientstate-normalizer.js'; import {HandlerConfig, ShortLinkMetaData} from '../../lib/handlers/handler.interfaces.js'; import {extractJsonFromBufferAndInflateIfRequired, RouteAPI} from '../../lib/handlers/route-api.js'; diff --git a/test/java-tests.ts b/test/java-tests.ts index 8e8ce946d..db7586204 100644 --- a/test/java-tests.ts +++ b/test/java-tests.ts @@ -31,7 +31,6 @@ import {JavaCompiler} from '../lib/compilers/index.js'; import * as utils from '../lib/utils.js'; import {ParsedAsmResultLine} from '../types/asmresult/asmresult.interfaces.js'; import {CompilerInfo} from '../types/compiler.interfaces.js'; - import {makeCompilationEnvironment} from './utils.js'; const languages = { diff --git a/test/label-processor-tests.ts b/test/label-processor-tests.ts index 1bbe4a8d5..89a0afe71 100644 --- a/test/label-processor-tests.ts +++ b/test/label-processor-tests.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import {describe, expect, it} from 'vitest'; + import {LabelContext, LabelProcessor} from '../lib/parsers/label-processor.js'; import {ParsedAsmResultLine} from '../types/asmresult/asmresult.interfaces.js'; diff --git a/test/library-tests.ts b/test/library-tests.ts index 27b922f16..fe9db376f 100644 --- a/test/library-tests.ts +++ b/test/library-tests.ts @@ -19,6 +19,7 @@ import fs from 'node:fs/promises'; import path from 'node:path'; + import {beforeAll, describe, expect, it} from 'vitest'; import {BaseCompiler} from '../lib/base-compiler.js'; @@ -27,7 +28,6 @@ import {CompilationEnvironment} from '../lib/compilation-env.js'; import {FortranCompiler} from '../lib/compilers/fortran.js'; import {ClientOptionsType, OptionsHandlerLibrary} from '../lib/options-handler.js'; import {CompilerInfo} from '../types/compiler.interfaces.js'; - import {makeCompilationEnvironment} from './utils.js'; const languages = { diff --git a/test/llvm-ir-tests.ts b/test/llvm-ir-tests.ts index 7dc37e590..342bb0aee 100644 --- a/test/llvm-ir-tests.ts +++ b/test/llvm-ir-tests.ts @@ -26,7 +26,6 @@ import {beforeAll, describe, expect, it} from 'vitest'; import {LLCCompiler} from '../lib/compilers/llc.js'; import {OptCompiler} from '../lib/compilers/opt.js'; - import {makeCompilationEnvironment} from './utils.js'; const languages = { diff --git a/test/nim-tests.ts b/test/nim-tests.ts index 1b8a6d190..528de0feb 100644 --- a/test/nim-tests.ts +++ b/test/nim-tests.ts @@ -30,7 +30,6 @@ import {unwrap} from '../lib/assert.js'; import {CompilationEnvironment} from '../lib/compilation-env.js'; import {NimCompiler} from '../lib/compilers/nim.js'; import {LanguageKey} from '../types/languages.interfaces.js'; - import {makeCompilationEnvironment, makeFakeCompilerInfo} from './utils.js'; const languages = { diff --git a/test/numba-tests.ts b/test/numba-tests.ts index 2406fb6eb..4df7a139d 100644 --- a/test/numba-tests.ts +++ b/test/numba-tests.ts @@ -29,7 +29,6 @@ import {BaseParser} from '../lib/compilers/argument-parsers.js'; import {decode_symbols, NumbaCompiler} from '../lib/compilers/numba.js'; import type {AsmResultSource} from '../types/asmresult/asmresult.interfaces.js'; import type {LanguageKey} from '../types/languages.interfaces.js'; - import {makeCompilationEnvironment, makeFakeCompilerInfo} from './utils.js'; describe('Numba', () => { diff --git a/test/objdumper-tests.ts b/test/objdumper-tests.ts index e60f9a07d..fb2462fb7 100644 --- a/test/objdumper-tests.ts +++ b/test/objdumper-tests.ts @@ -25,7 +25,6 @@ import {describe, expect, it} from 'vitest'; import {DefaultObjdumper} from '../lib/objdumper/default.js'; - import type {ExecutionOptions} from '../types/compilation/compilation.interfaces.js'; import type {UnprocessedExecResult} from '../types/execution/execution.interfaces.js'; diff --git a/test/odin-tests.ts b/test/odin-tests.ts index be9888f86..cf720903a 100644 --- a/test/odin-tests.ts +++ b/test/odin-tests.ts @@ -30,7 +30,6 @@ import {CompilationEnvironment} from '../lib/compilation-env.js'; import {OdinCompiler} from '../lib/compilers/odin.js'; import {CompilerOutputOptions} from '../types/features/filters.interfaces.js'; import {LanguageKey} from '../types/languages.interfaces.js'; - import {makeCompilationEnvironment, makeFakeCompilerInfo} from './utils.js'; const languages = { diff --git a/test/options-handler.ts b/test/options-handler.ts index ea3288624..a771749cb 100644 --- a/test/options-handler.ts +++ b/test/options-handler.ts @@ -38,7 +38,6 @@ import {getRemoteId} from '../shared/remote-utils.js'; import {UrlTestCases} from '../shared/url-testcases.js'; import {CompilerInfo} from '../types/compiler.interfaces.js'; import {LanguageKey} from '../types/languages.interfaces.js'; - import {makeFakeCompilerInfo} from './utils.js'; const languages = { diff --git a/test/packager-tests.ts b/test/packager-tests.ts index de443b907..0631fd629 100644 --- a/test/packager-tests.ts +++ b/test/packager-tests.ts @@ -28,7 +28,6 @@ import path from 'node:path'; import {describe, expect, it} from 'vitest'; import {Packager} from '../lib/packager.js'; - import {newTempDir} from './utils.js'; async function writeTestFile(filepath: string) { diff --git a/test/pascal-tests.ts b/test/pascal-tests.ts index 9349ae8ca..90d43f474 100644 --- a/test/pascal-tests.ts +++ b/test/pascal-tests.ts @@ -26,12 +26,12 @@ import fs from 'node:fs/promises'; import path from 'node:path'; import {beforeAll, describe, expect, it} from 'vitest'; + import {FPCCompiler} from '../lib/compilers/pascal.js'; import * as pascalUtils from '../lib/compilers/pascal-utils.js'; import {PascalWinCompiler} from '../lib/compilers/pascal-win.js'; import {PascalDemangler} from '../lib/demangler/index.js'; import * as utils from '../lib/utils.js'; - import {FiledataPair} from '../types/compilation/compilation.interfaces.js'; import {makeCompilationEnvironment} from './utils.js'; diff --git a/test/ppci-tests.ts b/test/ppci-tests.ts index 35f01bcc2..9c9fe25cd 100644 --- a/test/ppci-tests.ts +++ b/test/ppci-tests.ts @@ -27,7 +27,6 @@ import {beforeAll, describe, expect, it} from 'vitest'; import {CompilationEnvironment} from '../lib/compilation-env.js'; import {PPCICompiler} from '../lib/compilers/ppci.js'; import {LanguageKey} from '../types/languages.interfaces.js'; - import {makeCompilationEnvironment, makeFakeCompilerInfo} from './utils.js'; const languages = { diff --git a/test/runtime-tools/heaptrack-wrapper-tests.ts b/test/runtime-tools/heaptrack-wrapper-tests.ts index dce86e3ae..d8e7587be 100644 --- a/test/runtime-tools/heaptrack-wrapper-tests.ts +++ b/test/runtime-tools/heaptrack-wrapper-tests.ts @@ -27,6 +27,7 @@ import * as fs from 'node:fs'; import * as net from 'node:net'; import * as os from 'node:os'; import * as path from 'node:path'; + import {describe, it} from 'vitest'; describe('HeaptrackWrapper FD behavior tests', () => { diff --git a/test/sponsors-test.ts b/test/sponsors-test.ts index 4aeb7d5b6..b7c883ca2 100644 --- a/test/sponsors-test.ts +++ b/test/sponsors-test.ts @@ -28,7 +28,6 @@ import {describe, expect, it} from 'vitest'; import {Sponsor} from '../lib/sponsors.interfaces.js'; import {loadSponsorsFromString, makeIconSets, parse} from '../lib/sponsors.js'; - import {resolvePathFromTestRoot} from './utils.js'; describe('Sponsors', () => { diff --git a/test/statenormalisation-tests.ts b/test/statenormalisation-tests.ts index aed4e6ab6..6e34d16a2 100644 --- a/test/statenormalisation-tests.ts +++ b/test/statenormalisation-tests.ts @@ -25,6 +25,7 @@ import fs from 'node:fs'; import {describe, expect, it} from 'vitest'; + import {ClientState} from '../lib/clientstate.js'; import {ClientStateGoldenifier, ClientStateNormalizer} from '../lib/clientstate-normalizer.js'; diff --git a/test/symbol-store-tests.ts b/test/symbol-store-tests.ts index 10f9980c4..649f4b0ce 100644 --- a/test/symbol-store-tests.ts +++ b/test/symbol-store-tests.ts @@ -25,6 +25,7 @@ import {describe, expect, it} from 'vitest'; import './utils.js'; + import {SymbolStore} from '../lib/symbol-store.js'; describe('SymbolStore', () => { diff --git a/test/temp-tests.ts b/test/temp-tests.ts index a26aec5d9..cc111bc1c 100644 --- a/test/temp-tests.ts +++ b/test/temp-tests.ts @@ -27,6 +27,7 @@ import os from 'node:os'; import path from 'node:path'; import {afterEach, describe, expect, it} from 'vitest'; + import * as temp from '../lib/temp.js'; import * as utils from '../lib/utils.js'; diff --git a/test/tool-tests.ts b/test/tool-tests.ts index 5eb5e1362..a26c56918 100644 --- a/test/tool-tests.ts +++ b/test/tool-tests.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import path from 'node:path'; + import {describe, expect, it} from 'vitest'; import { diff --git a/test/url-serialization.ts b/test/url-serialization.ts index d2b1ea9fe..b7afd40a8 100644 --- a/test/url-serialization.ts +++ b/test/url-serialization.ts @@ -1,4 +1,5 @@ import {describe, expect, it} from 'vitest'; + import * as urlSerialization from '../shared/url-serialization.js'; describe('URL Serialization', () => { diff --git a/test/utils-tests.ts b/test/utils-tests.ts index c24399970..aeca89ebc 100644 --- a/test/utils-tests.ts +++ b/test/utils-tests.ts @@ -24,7 +24,6 @@ import fs from 'node:fs/promises'; import path from 'node:path'; - import {fileURLToPath} from 'node:url'; import {describe, expect, it} from 'vitest'; diff --git a/test/utils.ts b/test/utils.ts index c64e5a7ac..9b5aac339 100644 --- a/test/utils.ts +++ b/test/utils.ts @@ -27,6 +27,7 @@ import path from 'node:path'; import {fileURLToPath} from 'node:url'; import {afterEach, expect, onTestFinished} from 'vitest'; + import * as temp from '../lib/temp.js'; // Check if expensive tests should be skipped (e.g., during pre-commit hooks) diff --git a/test/vc-asm-parser-tests.ts b/test/vc-asm-parser-tests.ts index b6fb10f5b..b017dea00 100644 --- a/test/vc-asm-parser-tests.ts +++ b/test/vc-asm-parser-tests.ts @@ -23,6 +23,7 @@ // POSSIBILITY OF SUCH DAMAGE. import {beforeEach, describe, expect, it} from 'vitest'; + import {AsmParser} from '../lib/parsers/asm-parser.js'; import {VcAsmParser} from '../lib/parsers/asm-parser-vc.js'; diff --git a/test/win-path-tests.ts b/test/win-path-tests.ts index 24ef33889..d71965cfd 100644 --- a/test/win-path-tests.ts +++ b/test/win-path-tests.ts @@ -30,7 +30,6 @@ import {CompilationEnvironment} from '../lib/compilation-env.js'; import {WineVcCompiler} from '../lib/compilers/wine-vc.js'; import {WslVcCompiler} from '../lib/compilers/wsl-vc.js'; import {LanguageKey} from '../types/languages.interfaces.js'; - import {makeCompilationEnvironment, makeFakeCompilerInfo} from './utils.js'; const languages = {