From fd419f88c1068452779bcc11869d8e4aff6cee48 Mon Sep 17 00:00:00 2001 From: clover caruso Date: Sun, 22 Mar 2026 23:08:51 -0700 Subject: [PATCH] chore(lib): woops --- lib/Events.ts | 6 +- lib/Lru.test.ts | 2 +- lib/Lru.ts | 4 +- lib/assert.ts | 2 +- lib/async.ts | 4 +- lib/deno.json | 7 +-- lib/error.ts | 2 +- lib/examples/progress-log-stream.ts | 6 +- lib/examples/progress-stdout-stream.ts | 6 +- lib/log.test.ts | 76 +++++++++++++------------- lib/log.ts | 2 +- lib/log/stack.ts | 4 +- lib/mime.test.ts | 2 +- lib/package.json | 4 ++ lib/progress.test.ts | 10 ++-- lib/progress.ts | 20 +++---- lib/queue.ts | 2 +- lib/render.ts | 2 +- lib/render/jsx-runtime.ts | 4 +- lib/render/meta.test.tsx | 2 +- lib/render/meta.ts | 4 +- lib/stream.test.ts | 2 +- lib/stream.ts | 4 +- lib/string.test.ts | 2 +- lib/string/ansi.test.ts | 2 +- lib/string/ansi.ts | 4 +- lib/subprocess/ffmpeg.ts | 6 +- lib/testing.ts | 10 ++-- 28 files changed, 101 insertions(+), 100 deletions(-) diff --git a/lib/Events.ts b/lib/Events.ts index 84ca9f55942a7b421027700d2a48c09922003d31..0ad6b86143d7cfc027a49fb25b2e50f5948377e8 100644 --- a/lib/Events.ts +++ b/lib/Events.ts @@ -102,6 +102,6 @@ export namespace Events { export type Handler = (...args: Args) => void; } -import * as ts from "@clo/lib/ts"; -import * as async from "@clo/lib/async"; -import { UNWRAP } from "@clo/lib/assert"; +import * as ts from "./ts.ts"; +import * as async from "./async.ts"; +import { UNWRAP } from "./assert.ts"; diff --git a/lib/Lru.test.ts b/lib/Lru.test.ts index c3c76b94a3887167ce0e1f4f81db147294b8f041..54984fdf5c1b49cca5cb7abfd090b55eff727d0b 100644 --- a/lib/Lru.test.ts +++ b/lib/Lru.test.ts @@ -151,4 +151,4 @@ test("revival", () => { import assert from "node:assert"; import { test } from "vitest"; -import { Lru } from "@clo/lib/Lru"; +import { Lru } from "./Lru.ts"; diff --git a/lib/Lru.ts b/lib/Lru.ts index 3ea544b6aa90b323de25e3a1e5b463edaa78b4ba..4cb35d4cac1139eb80477beb3b0135fa16c27c12 100644 --- a/lib/Lru.ts +++ b/lib/Lru.ts @@ -278,5 +278,5 @@ export declare namespace Lru { const none: unique symbol = Symbol(); type none = typeof none; -import { ASSERT, UNWRAP } from "@clo/lib/assert"; -import * as ts from "@clo/lib/ts"; +import { ASSERT, UNWRAP } from "./assert.ts"; +import * as ts from "./ts.ts"; diff --git a/lib/assert.ts b/lib/assert.ts index d101b6beb73edc539ac9d0065051e8967322d75c..b7a9fe63cfa16051f28b2182b38baf3df807b351 100644 --- a/lib/assert.ts +++ b/lib/assert.ts @@ -43,4 +43,4 @@ function inspect(object: unknown) { } } -import * as node from "@clo/lib/node"; +import * as node from "./node.ts"; diff --git a/lib/async.ts b/lib/async.ts index fc6bdfeb8186d3ab64da97e949a5cf02fafe657b..060125c7a5f7561376ad3927b414876554e31f53 100644 --- a/lib/async.ts +++ b/lib/async.ts @@ -255,5 +255,5 @@ export function delay(ms: number): Cancelable { ); } -import { ASSERT } from "@clo/lib/assert"; -import * as ts from "@clo/lib/ts"; +import { ASSERT } from "./assert.ts"; +import * as ts from "./ts.ts"; diff --git a/lib/deno.json b/lib/deno.json index b21b3f81b9d74913e2a23207879d0fd929d1b77e..d55bce2931fcb9412c4586b61714bf62d521a7cf 100644 --- a/lib/deno.json +++ b/lib/deno.json @@ -27,14 +27,13 @@ "./testing": "./testing.ts", "./ts": "./ts.ts" }, + "imports": { + "@clo/lib/*": "./*.ts" + }, "compilerOptions": { "jsx": "react-jsx", "jsxImportSource": "@clo/lib/render" }, - "imports": { - "@clo/lib/render/jsx-runtime": "./render/jsx-runtime", - "@clo/lib/render/jsx-dev-runtime": "./render/jsx-runtime" - }, "exclude": [ "readme.npm.md", "package.json", diff --git a/lib/error.ts b/lib/error.ts index 69f577c8adb3dd44e1b73a9f451a59b7593c3e91..026cb489617e0e2ed13fdcfe90aaf91df720e3e6 100644 --- a/lib/error.ts +++ b/lib/error.ts @@ -51,4 +51,4 @@ export function rethrowWithMetadata( throw error; } -import type * as node from "@clo/lib/node"; +import type * as node from "./node.ts"; diff --git a/lib/examples/progress-log-stream.ts b/lib/examples/progress-log-stream.ts index a1fbd45e12fa276e5fa7c0e25a249822e7549fd6..f82629d3028d6a9f4a80b82ecbf7276e9dabf4ce 100644 --- a/lib/examples/progress-log-stream.ts +++ b/lib/examples/progress-log-stream.ts @@ -62,6 +62,6 @@ async.delay(500).then(async () => { })(); }); -import * as async from "@clo/lib/async"; -import * as progress from "@clo/lib/progress"; -import * as log from "@clo/lib/log"; +import * as async from "../async.ts"; +import * as progress from "../progress.ts"; +import * as log from "../log.ts"; diff --git a/lib/examples/progress-stdout-stream.ts b/lib/examples/progress-stdout-stream.ts index 8b7b283e4490126baeb77a5eb7a1dc59381d1696..7d88366cabf9658a7833be2ad048e8a76b53b9f1 100644 --- a/lib/examples/progress-stdout-stream.ts +++ b/lib/examples/progress-stdout-stream.ts @@ -34,6 +34,6 @@ async.delay(1000).then(async () => { const root = progress.start("generation"); }); -import * as async from "@clo/lib/async"; -import * as progress from "@clo/lib/progress"; -import * as log from "@clo/lib/log"; +import * as async from "../async.ts"; +import * as progress from "../progress.ts"; +import * as log from "../log.ts"; diff --git a/lib/log.test.ts b/lib/log.test.ts index 7a7bef386a6c633740d437924411d57ba69358b0..dc500dd0e4a31ffd3c9348fff17491414f7c4449 100644 --- a/lib/log.test.ts +++ b/lib/log.test.ts @@ -7,16 +7,16 @@ log satisfies log.Scope; describe("log widgets", () => { test("write buffering", () => { const host = new testing.MockScreen(); - host.write("hello world "); - host.write("and so on\n"); + host.writeOutput("hello world "); + host.writeOutput("and so on\n"); host.expectFrame(0, { stdout: "hello world and so on\n", }); - host.write("more logs\n"); + host.writeOutput("more logs\n"); host.expectFrame(0, { stdout: "more logs\n", }); - host.write("abc def"); + host.writeOutput("abc def"); { using lock = host.getDrawLock("long"); host.expectFrame(null, { @@ -27,8 +27,8 @@ describe("log widgets", () => { host.expectFrame(null, { stdout: "" }); { const lock = host.getDrawLock("long"); - host.write("abc def "); - host.write("hijk"); + host.writeOutput("abc def "); + host.writeOutput("hijk"); lock.release("cursor-start-of-line"); host.expectFrame(0, { stdout: "abc def hijk", @@ -40,15 +40,14 @@ describe("log widgets", () => { test("widget partial line", () => { const host = new testing.MockScreen(); - const wd1: log.Widget = { format: (now) => `t=${now}` }; - const w1 = host.startWidget(wd1); + const w1 = host.startWidget({ format: ({ now }) => `t=${now}` }); host.expectFrame(0, { stderr: testing.MockScreen.sync([ "t=0\n", ]), }); host.expectNone(); - host.write("partial line"); + host.writeOutput("partial line"); host.expectFrame(0, { merged: testing.MockScreen.sync([ ansi.cursorUp(1), @@ -65,7 +64,7 @@ describe("log widgets", () => { "t=0\n", ]), }); - host.write(" and more\n"); + host.writeOutput(" and more\n"); // partial line // t=0 // [C] @@ -86,8 +85,7 @@ describe("log widgets", () => { test("widget partial line 2", () => { const host = new testing.MockScreen(); - const wd1: log.Widget = { format: (now) => `abc\ndefg` }; - const w1 = host.startWidget(wd1); + const w1 = host.startWidget({ format: () => `abc\ndefg` }); host.expectFrame(0, { stderr: testing.MockScreen.sync([ "abc\ndefg\n", @@ -96,7 +94,7 @@ describe("log widgets", () => { // abc // defg host.expectNone(); - host.write("partial line"); + host.writeOutput("partial line"); // abc // defg // [c] @@ -111,7 +109,7 @@ describe("log widgets", () => { "\ndefg\n", ]), }); - host.write(" and more\na"); + host.writeOutput(" and more\na"); // partial line[T] // abc // defg @@ -137,7 +135,7 @@ describe("log widgets", () => { const host = new testing.MockScreen(); using _ = host.startWidget({ - format: (now) => `line one ${now}\nline two`, + format: ({ now }) => `line one ${now}\nline two`, }); host.expectFrame(0, { @@ -146,7 +144,7 @@ describe("log widgets", () => { ]), }); - host.write("info: line of log\n"); + host.writeOutput("info: line of log\n"); host.expectFrame(0, { merged: testing.MockScreen.sync([ ansi.cursorUp(2), @@ -156,8 +154,8 @@ describe("log widgets", () => { ]), }); - host.write("warn: line of log\n"); - host.write("error: line of log\n"); + host.writeOutput("warn: line of log\n"); + host.writeOutput("error: line of log\n"); host.expectFrame(0, { merged: testing.MockScreen.sync([ ansi.cursorUp(1), @@ -176,7 +174,7 @@ describe("log widgets", () => { const host = new testing.MockScreen(); using _ = host.startWidget({ - format: (now) => `line one ${now}\nline two`, + format: ({now}) => `line one ${now}\nline two`, }); host.expectFrame(0, { @@ -185,7 +183,7 @@ describe("log widgets", () => { ]), }); - host.write("info: line of log\n"); + host.writeOutput("info: line of log\n"); host.expectFrame(0, { merged: testing.MockScreen.sync([ ansi.cursorUp(2), @@ -196,7 +194,7 @@ describe("log widgets", () => { }); { - host.write("warn: line of log\n"); + host.writeOutput("warn: line of log\n"); host.expectWithoutConsume(0); const lock = host.getDrawLock("short"); // info: line of log @@ -219,7 +217,7 @@ describe("log widgets", () => { // [C] const lock2 = host.getDrawLock("long"); host.expectNone(); - host.write("error: line of log\n"); + host.writeOutput("error: line of log\n"); host.expectNone(); lock2.release("cursor-start-of-line"); host.expectNone(); @@ -272,7 +270,7 @@ describe("log widgets", () => { const host = new testing.MockScreen(); using _ = host.startWidget({ - format: (now) => `line one ${now}\nline two`, + format: ({ now }) => `line one ${now}\nline two`, }); host.expectFrame(0, { @@ -281,7 +279,7 @@ describe("log widgets", () => { ]), }); - host.write("info: line of log\n"); + host.writeOutput("info: line of log\n"); host.expectFrame(0, { merged: testing.MockScreen.sync([ ansi.cursorUp(2), @@ -291,7 +289,7 @@ describe("log widgets", () => { ]), }); - host.write("warn: line of log\n"); + host.writeOutput("warn: line of log\n"); host.expectWithoutConsume(0); const lock = host.getDrawLock("short"); // info: line of log @@ -363,7 +361,7 @@ describe("log widgets", () => { const host = new testing.MockScreen(); using _ = host.startWidget({ - format: (now) => `line one ${now}\nline two`, + format: ({now}) => `line one ${now}\nline two`, }); host.expectFrame(0, { @@ -372,7 +370,7 @@ describe("log widgets", () => { ]), }); - host.write("info: line of log\n"); + host.writeOutput("info: line of log\n"); host.expectFrame(0, { merged: testing.MockScreen.sync([ ansi.cursorUp(2), @@ -382,7 +380,7 @@ describe("log widgets", () => { ]), }); - host.write("warn: line of log\n"); + host.writeOutput("warn: line of log\n"); host.expectWithoutConsume(0); const lock = host.getDrawLock("long"); // info: line of log @@ -406,8 +404,8 @@ describe("log widgets", () => { // [C] const lock2 = host.getDrawLock("long"); host.expectNone(); - // now we will pretend the environment writes "hello " without - // a newline. without extra write calls, it has to save and + // now we will pretend the environment writeOutput "hello " without + // a newline. without extra writeOutput calls, it has to save and // restore the cursor perfectly. when multiple locks are held, // it's a bit ambiguous, so the implementation takes the slow path // if any releases are uncertain of the terminal state. @@ -457,11 +455,11 @@ describe("log widgets", () => { test("widget expires", () => { const host = new testing.MockScreen(); - host.write("log line 1\n"); - host.write("log line 2\n"); + host.writeOutput("log line 1\n"); + host.writeOutput("log line 2\n"); using _ = host.startWidget({ - format: (now) => + format: ({now}) => now > 1000 ? null : `widget line one ${now}\nwidget line two`, fps: 1, }); @@ -494,10 +492,10 @@ describe("log widgets", () => { test("widget expires partial line output", () => { const host = new testing.MockScreen(); - host.write("log line;"); + host.writeOutput("log line;"); using _ = host.startWidget({ - format: (now) => + format: ({now}) => now > 500 ? null : `widget line one ${now}\nwidget line two`, fps: 1, }); @@ -510,7 +508,7 @@ describe("log widgets", () => { "widget line one 0\nwidget line two\n", ]), }); - host.write(" rest of line\n"); + host.writeOutput(" rest of line\n"); host.expectFrame(1000, { stdout: " rest of line\n", merged: testing.MockScreen.sync([ @@ -527,6 +525,6 @@ describe("log widgets", () => { }); import { describe, test } from "vitest"; -import * as ansi from "@clo/lib/string/ansi"; -import * as log from "@clo/lib/log"; -import * as testing from "@clo/lib/testing"; +import * as ansi from "./string/ansi.ts"; +import * as log from "./log.ts"; +import * as testing from "./testing.ts"; diff --git a/lib/log.ts b/lib/log.ts index 66ced07a197059544854e6dccf3a8d3f3fbd33af..a68a56e719ca3c65ece5a9d69921fd2d708b57c4 100644 --- a/lib/log.ts +++ b/lib/log.ts @@ -1203,7 +1203,7 @@ export type MessageFormatFunction = ( colors: boolean, ) => string; -import * as ansi from "@clo/lib/string/ansi"; +import * as ansi from "./string/ansi.ts"; import * as async from "./async.ts"; import * as node from "./node.ts"; import * as stack from "./log/stack.ts"; diff --git a/lib/log/stack.ts b/lib/log/stack.ts index fd02458ee505706a7bd330bff5c60d27392c6f6c..a51e6871f693ad3fb62050ad5b424e8a2f4ce528 100644 --- a/lib/log/stack.ts +++ b/lib/log/stack.ts @@ -428,5 +428,5 @@ const regexFunctionName = /((.*".+"[^@]*)?[^@]*)(?:@)/; const regexV8Stack = /^\s*at .*(\S+:\d+|\(native\))/m; const regexLocation = /(.+?)(?::(\d+))?(?::(\d+))?$/; -import * as ansi from "@clo/lib/string/ansi"; -import * as node from "@clo/lib/node"; +import * as ansi from "../string/ansi.ts"; +import * as node from "../node.ts"; diff --git a/lib/mime.test.ts b/lib/mime.test.ts index 8d132ab5ba075c7991a367cd94a2cd536c09f8f9..b96c0f0319d355a7a4786db2996e58b4e377f910 100644 --- a/lib/mime.test.ts +++ b/lib/mime.test.ts @@ -25,4 +25,4 @@ test("for", () => { import { test } from "vitest"; import assert from "node:assert"; -import * as mime from "@clo/lib/mime"; +import * as mime from "./mime.ts"; diff --git a/lib/package.json b/lib/package.json index 2023d4878e016bd85b3c6ac274dcb4d6f5de49ee..9fa59c20b92f6b8e824a67e9a17549a8f3fc0767 100644 --- a/lib/package.json +++ b/lib/package.json @@ -1,5 +1,9 @@ { "name": "@clo/lib", "type": "module", + "dependencies": { + "@types/node": "^24.0.0", + "@clo/lib": "file:." + }, "exports": { "./*": "./*.ts" } } diff --git a/lib/progress.test.ts b/lib/progress.test.ts index c117963d74cf56ec87837e6c2c36765806c4fcae..6c4f3cf5edaa479aca9a77e512eb64ef4a899fae 100644 --- a/lib/progress.test.ts +++ b/lib/progress.test.ts @@ -235,10 +235,10 @@ function cleanProgressEvent(event: progress.StreamEvent) { type EncodedKey = typeof progress.internals.EncodedKey; -import * as progress from "@clo/lib/progress"; +import * as progress from "./progress.ts"; import { describe, test, vi } from "vitest"; import assert from "node:assert/strict"; -import * as stream from "@clo/lib/stream"; -import * as testing from "@clo/lib/testing"; -import * as ansi from "@clo/lib/string/ansi"; -import { UNWRAP } from "@clo/lib/assert"; +import * as stream from "./stream.ts"; +import * as testing from "./testing.ts"; +import * as ansi from "./string/ansi.ts"; +import { UNWRAP } from "./assert.ts"; diff --git a/lib/progress.ts b/lib/progress.ts index b5ef9dbf6282e7344c68bd6ee753bcefc11579f0..5b91f0396f245baabfefada795b1fed60eb900bb 100644 --- a/lib/progress.ts +++ b/lib/progress.ts @@ -1768,13 +1768,13 @@ export const internals: { EncodedKey: 0 as EncodedKey, }))(); -import * as ansi from "@clo/lib/string/ansi"; -import * as async from "@clo/lib/async"; -import * as bytes from "@clo/lib/bytes"; -import * as log from "@clo/lib/log"; -import * as stack from "@clo/lib/log/stack"; -import * as stream from "@clo/lib/stream"; -import * as string from "@clo/lib/string"; -import * as ts from "@clo/lib/ts"; -import { ASSERT, UNWRAP } from "@clo/lib/assert"; -import { Events } from "@clo/lib/Events"; +import * as ansi from "./string/ansi.ts"; +import * as async from "./async.ts"; +import * as bytes from "./bytes.ts"; +import * as log from "./log.ts"; +import * as stack from "./log/stack.ts"; +import * as stream from "./stream.ts"; +import * as string from "./string.ts"; +import * as ts from "./ts.ts"; +import { ASSERT, UNWRAP } from "./assert.ts"; +import { Events } from "./Events.ts"; diff --git a/lib/queue.ts b/lib/queue.ts index 8d6395f748202790034bed9264d85d1f760edd01..2432fdec4f4b7b840442863421ee49bb835de15b 100644 --- a/lib/queue.ts +++ b/lib/queue.ts @@ -176,4 +176,4 @@ function insertSorted(arr: T[], item: T) { declare var navigator: { hardwareConcurrency: number }; const global = new PriorityQueue(navigator.hardwareConcurrency); -import { UNWRAP } from "@clo/lib/assert"; +import { UNWRAP } from "./assert.ts"; diff --git a/lib/render.ts b/lib/render.ts index 917acad5e3af237031a3107d537d20542d2b7380..514c34a20a5a8ccd3a9c6a4ac5cea9fbb11f2a24 100644 --- a/lib/render.ts +++ b/lib/render.ts @@ -476,4 +476,4 @@ const kRaw = Symbol("Raw"); /** secret key to facilitate {@linkcode init} with a `ContextValue[]` */ const kContext: unique symbol = Symbol(); -import { ASSERT, UNWRAP } from "@clo/lib/assert"; +import { ASSERT, UNWRAP } from "./assert.ts"; diff --git a/lib/render/jsx-runtime.ts b/lib/render/jsx-runtime.ts index 9fbb9c2281ebf8d8e9c128088f4d27342678a2bd..e355f8e25970fa9b7ebd7cba3bd844255fc86ad5 100644 --- a/lib/render/jsx-runtime.ts +++ b/lib/render/jsx-runtime.ts @@ -77,5 +77,5 @@ export declare namespace ts { export type ElementClass = ReturnType; } -import * as render from "@clo/lib/render"; -import { ASSERT } from "@clo/lib/assert"; +import * as render from "../render.ts"; +import { ASSERT } from "../assert.ts"; diff --git a/lib/render/meta.test.tsx b/lib/render/meta.test.tsx index 021cf613941161e1f8de93aeb64f161d00166fa9..06ce22066abb489a5275679df616324502cebdec 100644 --- a/lib/render/meta.test.tsx +++ b/lib/render/meta.test.tsx @@ -46,4 +46,4 @@ test("automatic embed with '{}'", () => import { test } from "vitest"; import assert from "node:assert"; -import * as meta from "@clo/lib/render/meta"; +import * as meta from "./meta.ts"; diff --git a/lib/render/meta.ts b/lib/render/meta.ts index 03c8d49075088ec5568c7de890b786fa864ccbf5..7815c28e1794af01ce769aa9c443acd12c713313 100644 --- a/lib/render/meta.ts +++ b/lib/render/meta.ts @@ -253,5 +253,5 @@ function attr(value: string) { return render.quoteIfNeeded(esc(value)); } -import { escapeHtmlContent as esc } from "@clo/lib/render"; -import * as render from "@clo/lib/render"; +import { escapeHtmlContent as esc } from "../render.ts"; +import * as render from "../render.ts"; diff --git a/lib/stream.test.ts b/lib/stream.test.ts index a10587b8ced355c4de9e3a82ef6a0a0b9fd940bb..634085a5c53c3b933eaa076bfc8c1d661f010cf1 100644 --- a/lib/stream.test.ts +++ b/lib/stream.test.ts @@ -227,4 +227,4 @@ describe("BufferedReader", () => { import { describe, test } from "vitest"; import { strict as assert } from "node:assert"; -import * as stream from "@clo/lib/stream"; +import * as stream from "./stream.ts"; diff --git a/lib/stream.ts b/lib/stream.ts index 456350684d124c4b47cd52b41de14445975e4811..04233e5aeb123d5efed46f64e9e9704ca31e8458 100644 --- a/lib/stream.ts +++ b/lib/stream.ts @@ -472,5 +472,5 @@ export function readWritePair(): [ return [reader, unbuffered]; } -import * as string from "@clo/lib/string"; -import { ASSERT, UNWRAP } from "@clo/lib/assert"; +import * as string from "./string.ts"; +import { ASSERT, UNWRAP } from "./assert.ts"; diff --git a/lib/string.test.ts b/lib/string.test.ts index e3fb8ffd469d6c4bc11d03eba036915357ccd1b0..e2c36ebf50ac45a770f50f6cddbfd7fabfa9b8d4 100644 --- a/lib/string.test.ts +++ b/lib/string.test.ts @@ -48,4 +48,4 @@ test.todo("formatByteSize", () => { import { test } from "vitest"; import assert from "node:assert"; -import * as string from "@clo/lib/string"; +import * as string from "./string.ts"; diff --git a/lib/string/ansi.test.ts b/lib/string/ansi.test.ts index ebefba627dc9da62294fd4b7bb7d8f31c4d54d50..e820afe47adddd1e7545c9e8da57923590290413 100644 --- a/lib/string/ansi.test.ts +++ b/lib/string/ansi.test.ts @@ -21,4 +21,4 @@ test("trimForTerminal", () => { import { test } from "vitest"; import assert from "node:assert"; -import * as ansi from "@clo/lib/string/ansi"; +import * as ansi from "./ansi.ts"; diff --git a/lib/string/ansi.ts b/lib/string/ansi.ts index ebbdb97f50d063ee0ed56fd2b2642b339389a507..9ee0c24289321dcccbb5f28c50c35602a781cba2 100644 --- a/lib/string/ansi.ts +++ b/lib/string/ansi.ts @@ -407,5 +407,5 @@ function segmentWidth(segment: string) { ); } -import * as self from "@clo/lib/string/ansi"; -import { UNWRAP } from "@clo/lib/assert"; +import * as self from "./ansi.ts"; +import { UNWRAP } from "../assert.ts"; diff --git a/lib/subprocess/ffmpeg.ts b/lib/subprocess/ffmpeg.ts index aeaa6a4d1725765e34b3adfce9160a7df905936c..71fcd878d4521fab64b52586fe296c53567c537f 100644 --- a/lib/subprocess/ffmpeg.ts +++ b/lib/subprocess/ffmpeg.ts @@ -195,6 +195,6 @@ import * as readline from "node:readline"; import * as process from "node:process"; import events from "node:events"; import * as path from "node:path"; -import * as subprocess from "@clo/lib/subprocess"; -import type * as progress from "@clo/lib/progress"; -import * as string from "@clo/lib/string"; +import * as subprocess from "../subprocess.ts"; +import type * as progress from "../progress.ts"; +import * as string from "../string.ts"; diff --git a/lib/testing.ts b/lib/testing.ts index 846da954184659f40b624e513f5afe408fffdd60..26466c7f74e0c90a588ac5e6c9a932d873813013 100644 --- a/lib/testing.ts +++ b/lib/testing.ts @@ -334,8 +334,8 @@ export class MockScreen implements Disposable, log.WidgetHost { } } -import * as ansi from "@clo/lib/string/ansi"; -import { ASSERT, UNWRAP } from "@clo/lib/assert"; -import * as log from "@clo/lib/log"; -import * as async from "@clo/lib/async"; -import * as stack from "@clo/lib/log/stack"; +import * as ansi from "./string/ansi.ts"; +import { ASSERT, UNWRAP } from "./assert.ts"; +import * as log from "./log.ts"; +import * as async from "./async.ts"; +import * as stack from "./log/stack.ts"; -- 2.54.0