diff --git a/typescript/packages/common-cli/deno.json b/typescript/packages/common-cli/deno.json index 52ec0523b..1c851f8fb 100644 --- a/typescript/packages/common-cli/deno.json +++ b/typescript/packages/common-cli/deno.json @@ -5,5 +5,8 @@ "memorydemo": "deno run --allow-read --allow-env --allow-net memory_demo.ts", "test": "deno test", "charmdemo": "deno run --allow-read --allow-env --allow-net charm_demo.ts" + }, + "imports": { + "open": "https://deno.land/x/open@v0.0.6/index.ts" } } diff --git a/typescript/packages/common-cli/gcal.ts b/typescript/packages/common-cli/gcal.ts index 16145d473..0fbe1f326 100644 --- a/typescript/packages/common-cli/gcal.ts +++ b/typescript/packages/common-cli/gcal.ts @@ -1,9 +1,7 @@ -import { OAuth2Client } from "jsr:@cmd-johnson/oauth2-client@^2.0.0"; -import { serve } from "https://deno.land/std@0.216.0/http/server.ts"; -import { open } from "https://deno.land/x/open@v0.0.6/index.ts"; +import { OAuth2Client } from "@cmd-johnson/oauth2-client"; +import { load } from "@std/dotenv"; import { getAccessToken } from "./google.ts"; -import { load } from "https://deno.land/std@0.216.0/dotenv/mod.ts"; const env = await load({ envPath: "./.env", // you can also specify multiple possible paths: diff --git a/typescript/packages/common-cli/google-importer.ts b/typescript/packages/common-cli/google-importer.ts index 8a19e1142..f7ca810e2 100644 --- a/typescript/packages/common-cli/google-importer.ts +++ b/typescript/packages/common-cli/google-importer.ts @@ -1,5 +1,5 @@ // Load .env file -import { parseArgs } from "jsr:@std/cli/parse-args"; +import { parseArgs } from "@std/cli/parse-args"; import { CharmManager, setBobbyServerUrl, storage } from "@commontools/charm"; import { Cell, getEntityId, isStream } from "@commontools/runner"; import { Charm } from "@commontools/charm"; @@ -11,9 +11,13 @@ function showHelp() { console.log("Usage: deno run main.ts [options]"); console.log(""); console.log("Options:"); - console.log(" --space= Space to watch (default: common-knowledge)"); + console.log( + " --space= Space to watch (default: common-knowledge)", + ); console.log(" --charmId= Specific charm ID to watch"); - console.log(" --interval= Update interval in seconds (default: 30)"); + console.log( + " --interval= Update interval in seconds (default: 30)", + ); console.log(" --help Show this help message"); console.log(" --version Show version information"); Deno.exit(0); @@ -31,7 +35,8 @@ const { space, charmId, interval } = flags; // Configuration const CHECK_INTERVAL = parseInt(interval as string) * 1000; -const toolshedUrl = Deno.env.get("TOOLSHED_API_URL") ?? "https://toolshed.saga-castor.ts.net/"; +const toolshedUrl = Deno.env.get("TOOLSHED_API_URL") ?? + "https://toolshed.saga-castor.ts.net/"; // Initialize storage and Bobby server storage.setRemoteStorage(new URL(toolshedUrl)); @@ -90,7 +95,10 @@ async function refreshAuthToken(auth: Cell, charm: Cell) { authCellId.space = space as string; log(charm, `token expired, refreshing: ${authCellId}`); - const refresh_url = new URL("/api/integrations/google-oauth/refresh", toolshedUrl); + const refresh_url = new URL( + "/api/integrations/google-oauth/refresh", + toolshedUrl, + ); const refresh_response = await fetch(refresh_url, { method: "POST", body: JSON.stringify({ authCellId }), @@ -149,7 +157,9 @@ async function watchCharm(charmId: string | undefined) { } function getId(charmId: string | Cell | undefined): string | undefined { - const realCharmId = typeof charmId === "string" ? charmId : getEntityId(charmId)?.["/"]; + const realCharmId = typeof charmId === "string" + ? charmId + : getEntityId(charmId)?.["/"]; if (!realCharmId) { log(undefined, "charmId not found", JSON.stringify(charmId)); return undefined; diff --git a/typescript/packages/common-cli/google.ts b/typescript/packages/common-cli/google.ts index 78c095edf..6f1035ec3 100644 --- a/typescript/packages/common-cli/google.ts +++ b/typescript/packages/common-cli/google.ts @@ -1,11 +1,11 @@ -import { serve } from "https://deno.land/std@0.216.0/http/server.ts"; -import { open } from "https://deno.land/x/open@v0.0.6/index.ts"; -import { OAuth2Client } from "jsr:@cmd-johnson/oauth2-client@^2.0.0"; +import { open } from "open"; +import { OAuth2Client } from "@cmd-johnson/oauth2-client"; export async function getAccessToken(client: OAuth2Client) { let authCode: string | null = null; const controller = new AbortController(); - const server = serve( + const server = Deno.serve( + { port: 8080, signal: controller.signal }, (req) => { const url = new URL(req.url); if (url.searchParams.has("code")) { @@ -17,7 +17,6 @@ export async function getAccessToken(client: OAuth2Client) { } return new Response("Waiting for authentication..."); }, - { port: 8080, signal: controller.signal }, ); const { uri, codeVerifier } = await client.code.getAuthorizationUri(); diff --git a/typescript/packages/common-cli/main.ts b/typescript/packages/common-cli/main.ts index f280099e7..3837807bb 100644 --- a/typescript/packages/common-cli/main.ts +++ b/typescript/packages/common-cli/main.ts @@ -1,5 +1,5 @@ // Load .env file -import { parseArgs } from "https://deno.land/std@0.224.0/cli/parse_args.ts"; +import { parseArgs } from "@std/cli/parse-args"; import { CharmManager, compileRecipe, diff --git a/typescript/packages/common-cli/notes.ts b/typescript/packages/common-cli/notes.ts index 57f0d9f1f..bb014f3af 100644 --- a/typescript/packages/common-cli/notes.ts +++ b/typescript/packages/common-cli/notes.ts @@ -1,5 +1,5 @@ -import { walk } from "https://deno.land/std@0.216.0/fs/walk.ts"; -import { debounce } from "https://deno.land/std@0.216.0/async/debounce.ts"; +import { walk } from "@std/fs"; +import { debounce } from "@std/async/debounce"; export interface NoteChange { path: string; diff --git a/typescript/packages/common-cli/write-to-authcell.ts b/typescript/packages/common-cli/write-to-authcell.ts index 40ac41347..aaf0f4ce0 100644 --- a/typescript/packages/common-cli/write-to-authcell.ts +++ b/typescript/packages/common-cli/write-to-authcell.ts @@ -2,11 +2,12 @@ import { CharmManager, compileRecipe, createStorage } from "@commontools/charm"; import { getEntityId, idle } from "@commontools/runner"; import { fetchInboxEmails } from "./gmail.ts"; -import { parse } from "https://deno.land/std/flags/mod.ts"; +import { parseArgs } from "@std/cli/parse-args"; import { getCellFromDocLink } from "@commontools/runner"; -const TOOLSHED_API_URL = Deno.env.get("TOOLSHED_API_URL") || "https://toolshed.saga-castor.ts.net"; +const TOOLSHED_API_URL = Deno.env.get("TOOLSHED_API_URL") || + "https://toolshed.saga-castor.ts.net"; async function main( recipeSrc: string, @@ -20,7 +21,9 @@ async function main( url: new URL(TOOLSHED_API_URL), }); - const cellId = { "/": "baedreiajxdvqjxmgpfzjix4h6vd4pl77unvet2k3acfvhb6ottafl7gpua" }; + const cellId = { + "/": "baedreiajxdvqjxmgpfzjix4h6vd4pl77unvet2k3acfvhb6ottafl7gpua", + }; await storage.syncCell(cellId, true); const authCellEntity = { @@ -74,7 +77,7 @@ async function main( // console.log({ emails }); } -const flags = parse(Deno.args, { +const flags = parseArgs(Deno.args, { string: ["replica", "cause", "data"], default: { replica: "common-knowledge", @@ -90,7 +93,9 @@ let jsonData: unknown; if (!filename) { console.error("No typescript recipe file provided"); - console.error("Usage: deno run -A main.ts [--replica=name] [--cause=id]"); + console.error( + "Usage: deno run -A main.ts [--replica=name] [--cause=id]", + ); Deno.exit(1); } diff --git a/typescript/packages/common-memory/deno.ts b/typescript/packages/common-memory/deno.ts index 9a331a714..3804594ef 100644 --- a/typescript/packages/common-memory/deno.ts +++ b/typescript/packages/common-memory/deno.ts @@ -1,6 +1,6 @@ import * as Provider from "./provider.ts"; import * as Socket from "./socket.ts"; -import * as Path from "jsr:@std/path"; +import * as Path from "@std/path"; import * as UCAN from "./ucan.ts"; import * as Receipt from "./receipt.ts"; diff --git a/typescript/packages/common-memory/memory.ts b/typescript/packages/common-memory/memory.ts index 261e62a06..f64c912d2 100644 --- a/typescript/packages/common-memory/memory.ts +++ b/typescript/packages/common-memory/memory.ts @@ -1,6 +1,6 @@ import * as Space from "./space.ts"; import * as Error from "./error.ts"; -import * as FS from "jsr:@std/fs"; +import * as FS from "@std/fs"; import { AsyncResult, ConnectionError, diff --git a/typescript/packages/common-memory/migrate.ts b/typescript/packages/common-memory/migrate.ts index 77d3597b1..66855ea4a 100644 --- a/typescript/packages/common-memory/migrate.ts +++ b/typescript/packages/common-memory/migrate.ts @@ -2,7 +2,7 @@ import { Database, SqliteError, Transaction as DBTransaction, -} from "jsr:@db/sqlite"; +} from "@db/sqlite"; const MIGRATIONS = new URL("./migrations/", import.meta.url); diff --git a/typescript/packages/common-memory/space.ts b/typescript/packages/common-memory/space.ts index c9c1c63f4..e0ead2e5a 100644 --- a/typescript/packages/common-memory/space.ts +++ b/typescript/packages/common-memory/space.ts @@ -2,7 +2,7 @@ import { Database, SqliteError, Transaction as DBTransaction, -} from "jsr:@db/sqlite"; +} from "@db/sqlite"; import { fromString, refer } from "./reference.ts"; import { unclaimed } from "./fact.ts"; import { from as toChanges, set } from "./changes.ts"; diff --git a/typescript/packages/common-memory/test/access-test.ts b/typescript/packages/common-memory/test/access-test.ts index b054c2417..c5e6e1c6f 100644 --- a/typescript/packages/common-memory/test/access-test.ts +++ b/typescript/packages/common-memory/test/access-test.ts @@ -1,4 +1,4 @@ -import { assert, assertEquals, assertMatch } from "jsr:@std/assert"; +import { assert, assertEquals, assertMatch } from "@std/assert"; import { alice, bob, mallory, space } from "./principal.ts"; import * as Access from "../access.ts"; import { refer } from "../reference.ts"; diff --git a/typescript/packages/common-memory/test/consumer-test.ts b/typescript/packages/common-memory/test/consumer-test.ts index 99ab1bcc9..c6fd74058 100644 --- a/typescript/packages/common-memory/test/consumer-test.ts +++ b/typescript/packages/common-memory/test/consumer-test.ts @@ -3,7 +3,7 @@ import { assertEquals, assertMatch, assertObjectMatch, -} from "jsr:@std/assert"; +} from "@std/assert"; import * as Fact from "../fact.ts"; import * as Transaction from "../transaction.ts"; import * as Changes from "../changes.ts"; diff --git a/typescript/packages/common-memory/test/memory-test.ts b/typescript/packages/common-memory/test/memory-test.ts index 64620e5c2..00a790cb8 100644 --- a/typescript/packages/common-memory/test/memory-test.ts +++ b/typescript/packages/common-memory/test/memory-test.ts @@ -1,4 +1,4 @@ -import { assert, assertEquals, assertMatch } from "jsr:@std/assert"; +import { assert, assertEquals, assertMatch } from "@std/assert"; import * as Memory from "../memory.ts"; import * as Fact from "../fact.ts"; import * as Transaction from "../transaction.ts"; diff --git a/typescript/packages/common-memory/test/space-test.ts b/typescript/packages/common-memory/test/space-test.ts index 666f39d8f..34e28cdc2 100644 --- a/typescript/packages/common-memory/test/space-test.ts +++ b/typescript/packages/common-memory/test/space-test.ts @@ -1,4 +1,4 @@ -import { assert, assertEquals, assertMatch } from "jsr:@std/assert"; +import { assert, assertEquals, assertMatch } from "@std/assert"; import * as Space from "../space.ts"; import * as Changes from "../changes.ts"; import * as Commit from "../commit.ts"; diff --git a/typescript/packages/common-memory/test/stress-debug.ts b/typescript/packages/common-memory/test/stress-debug.ts index d0dad67d5..dfd7d9c9b 100644 --- a/typescript/packages/common-memory/test/stress-debug.ts +++ b/typescript/packages/common-memory/test/stress-debug.ts @@ -3,7 +3,7 @@ import { assertEquals, AssertionError, assertMatch, -} from "jsr:@std/assert"; +} from "@std/assert"; import * as Provider from "../provider.ts"; import * as Transaction from "../transaction.ts"; import * as Changes from "../changes.ts"; diff --git a/typescript/packages/deno-web-test/browser.ts b/typescript/packages/deno-web-test/browser.ts index 19edbfd0e..58e357077 100644 --- a/typescript/packages/deno-web-test/browser.ts +++ b/typescript/packages/deno-web-test/browser.ts @@ -1,4 +1,4 @@ -import { Browser, ConsoleEvent, launch, Page } from "jsr:@astral/astral"; +import { Browser, ConsoleEvent, launch, Page } from "@astral/astral"; import { Manifest } from "./manifest.ts"; import { tsToJs, wait } from "./utils.ts"; import { TestResult } from "./interface.ts"; diff --git a/typescript/packages/deno-web-test/cli.ts b/typescript/packages/deno-web-test/cli.ts index 8e35a4665..60ea1ab56 100644 --- a/typescript/packages/deno-web-test/cli.ts +++ b/typescript/packages/deno-web-test/cli.ts @@ -1,4 +1,4 @@ -import { parseArgs } from "jsr:@std/cli/parse-args"; +import { parseArgs } from "@std/cli/parse-args"; import { TestServer } from "./server.ts"; import { Manifest } from "./manifest.ts"; import { buildTestDir } from "./utils.ts"; diff --git a/typescript/packages/deno.json b/typescript/packages/deno.json index b5b729a45..baae6e08c 100644 --- a/typescript/packages/deno.json +++ b/typescript/packages/deno.json @@ -33,7 +33,7 @@ ], "rules": { "tags": ["recommended"], - "include": ["ban-untagged-todo"], + "include": ["ban-untagged-todo", "no-external-import"], "exclude": ["no-unused-vars", "no-explicit-any"] } }, @@ -48,6 +48,7 @@ "ai": "npm:ai@^4.1.5", "@astral/astral": "jsr:@astral/astral", "@cfworker/json-schema": "npm:@cfworker/json-schema@^4.1.0", + "@cmd-johnson/oauth2-client": "jsr:@cmd-johnson/oauth2-client@^2.0.0", "@codemirror/lang-javascript": "npm:@codemirror/lang-javascript@^6.2.2", "@codemirror/lang-markdown": "npm:@codemirror/lang-markdown@^6.3.2", "@hono/hono": "npm:hono@^4.7.0", @@ -58,13 +59,16 @@ "react": "npm:react@^18.3.1", "@scure/bip39": "npm:@scure/bip39@^1.5.4", "@std/assert": "jsr:@std/assert@^1", - "@std/crypto": "jsr:@std/crypto@^1.0.3", + "@std/async": "jsr:@std/async@^1", + "@std/cli": "jsr:@std/cli@^1", + "@std/crypto": "jsr:@std/crypto@^1", "@std/dotenv": "jsr:@std/dotenv@^0.225.3", - "@std/encoding": "jsr:@std/encoding@^1.0.5", - "@std/expect": "jsr:@std/expect", - "@std/fs": "jsr:@std/fs@^1.0.9", - "@std/path": "jsr:@std/path@^1.0.8", - "@std/testing": "jsr:@std/testing", + "@std/encoding": "jsr:@std/encoding@^1", + "@std/expect": "jsr:@std/expect@^1", + "@std/fs": "jsr:@std/fs@^1", + "@std/http": "jsr:@std/http@^1", + "@std/path": "jsr:@std/path@^1", + "@std/testing": "jsr:@std/testing@^1", "@vercel/otel": "npm:@vercel/otel@^1.10.1", "typescript": "npm:typescript", "@web/test-runner": "npm:@web/test-runner", diff --git a/typescript/packages/deno.lock b/typescript/packages/deno.lock index e533fe995..ff52942a1 100644 --- a/typescript/packages/deno.lock +++ b/typescript/packages/deno.lock @@ -18,21 +18,21 @@ "jsr:@std/async@^1.0.9": "1.0.10", "jsr:@std/bytes@^1.0.2": "1.0.4", "jsr:@std/cli@*": "1.0.13", + "jsr:@std/cli@1": "1.0.13", "jsr:@std/cli@^1.0.12": "1.0.13", - "jsr:@std/crypto@^1.0.3": "1.0.4", - "jsr:@std/data-structures@^1.0.6": "1.0.6", "jsr:@std/dotenv@~0.225.3": "0.225.3", "jsr:@std/encoding@0.221": "0.221.0", "jsr:@std/encoding@^1.0.5": "1.0.7", "jsr:@std/encoding@^1.0.6": "1.0.6", "jsr:@std/encoding@^1.0.7": "1.0.7", - "jsr:@std/expect@*": "1.0.13", + "jsr:@std/expect@1": "1.0.13", "jsr:@std/fmt@0.221": "0.221.0", "jsr:@std/fmt@1.0.3": "1.0.3", "jsr:@std/fmt@^1.0.5": "1.0.5", "jsr:@std/fs@*": "1.0.11", "jsr:@std/fs@0.221": "0.221.0", "jsr:@std/fs@1": "1.0.11", + "jsr:@std/fs@^1.0.10": "1.0.11", "jsr:@std/fs@^1.0.9": "1.0.11", "jsr:@std/html@^1.0.3": "1.0.3", "jsr:@std/http@*": "1.0.13", @@ -47,7 +47,7 @@ "jsr:@std/path@^1.0.6": "1.0.8", "jsr:@std/path@^1.0.8": "1.0.8", "jsr:@std/streams@^1.0.9": "1.0.9", - "jsr:@std/testing@*": "1.0.9", + "jsr:@std/testing@1": "1.0.9", "jsr:@zip-js/zip-js@^2.7.52": "2.7.57", "npm:@ai-sdk/amazon-bedrock@^1.1.6": "1.1.6_zod@3.24.1", "npm:@ai-sdk/anthropic@^1.1.6": "1.1.6_zod@3.24.1", @@ -218,12 +218,6 @@ "@std/cli@1.0.13": { "integrity": "5db2d95ab2dca3bca9fb6ad3c19908c314e93d6391c8b026725e4892d4615a69" }, - "@std/crypto@1.0.4": { - "integrity": "cee245c453bd5366207f4d8aa25ea3e9c86cecad2be3fefcaa6cb17203d79340" - }, - "@std/data-structures@1.0.6": { - "integrity": "76a7fd8080c66604c0496220a791860492ab21a04a63a969c0b9a0609bbbb760" - }, "@std/dotenv@0.225.3": { "integrity": "a95e5b812c27b0854c52acbae215856d9cce9d4bbf774d938c51d212711e8d4a" }, @@ -315,11 +309,7 @@ "integrity": "9bdd4ac07cb13e7594ac30e90f6ceef7254ac83a9aeaa089be0008f33aab5cd4", "dependencies": [ "jsr:@std/assert@^1.0.10", - "jsr:@std/async@^1.0.9", - "jsr:@std/data-structures", - "jsr:@std/fs@^1.0.9", - "jsr:@std/internal", - "jsr:@std/path@^1.0.8" + "jsr:@std/internal" ] }, "@zip-js/zip-js@2.7.57": { @@ -7209,14 +7199,18 @@ "workspace": { "dependencies": [ "jsr:@astral/astral@*", + "jsr:@cmd-johnson/oauth2-client@2", "jsr:@std/assert@1", - "jsr:@std/crypto@^1.0.3", + "jsr:@std/async@1", + "jsr:@std/cli@1", + "jsr:@std/crypto@1", "jsr:@std/dotenv@~0.225.3", - "jsr:@std/encoding@^1.0.5", - "jsr:@std/expect@*", - "jsr:@std/fs@^1.0.9", - "jsr:@std/path@^1.0.8", - "jsr:@std/testing@*", + "jsr:@std/encoding@1", + "jsr:@std/expect@1", + "jsr:@std/fs@1", + "jsr:@std/http@1", + "jsr:@std/path@1", + "jsr:@std/testing@1", "npm:@cfworker/json-schema@^4.1.0", "npm:@codemirror/lang-javascript@^6.2.2", "npm:@codemirror/lang-markdown@^6.3.2", @@ -7235,6 +7229,12 @@ "npm:zod@^3.24.1" ], "members": { + "common-cli": { + "dependencies": [ + "jsr:@cmd-johnson/oauth2-client@2", + "jsr:@std/dotenv@~0.225.3" + ] + }, "common-identity": { "dependencies": [ "npm:@scure/bip39@^1.5.4" diff --git a/typescript/packages/scripts/test-all.ts b/typescript/packages/scripts/test-all.ts index 68082943b..1aadd0f4f 100755 --- a/typescript/packages/scripts/test-all.ts +++ b/typescript/packages/scripts/test-all.ts @@ -1,5 +1,5 @@ #!/usr/bin/env -S deno run --allow-read --allow-run -import * as path from "jsr:@std/path"; +import * as path from "@std/path"; const decoder = new TextDecoder(); const workspaceCwd = Deno.cwd(); diff --git a/typescript/packages/toolshed/env.ts b/typescript/packages/toolshed/env.ts index 9973e6a00..fecac55c6 100644 --- a/typescript/packages/toolshed/env.ts +++ b/typescript/packages/toolshed/env.ts @@ -1,5 +1,5 @@ import { z } from "zod"; -import * as Path from "jsr:@std/path"; +import * as Path from "@std/path"; // NOTE: This is where we define the environment variable types and defaults. const EnvSchema = z.object({ diff --git a/typescript/packages/toolshed/routes/ai/llm/cache.ts b/typescript/packages/toolshed/routes/ai/llm/cache.ts index f704c5360..c556d82fa 100644 --- a/typescript/packages/toolshed/routes/ai/llm/cache.ts +++ b/typescript/packages/toolshed/routes/ai/llm/cache.ts @@ -1,4 +1,4 @@ -import { ensureDir } from "https://deno.land/std/fs/mod.ts"; +import { ensureDir } from "@std/fs"; import { colors, timestamp } from "./cli.ts"; import env from "@/env.ts"; diff --git a/typescript/packages/toolshed/routes/integrations/google-oauth/google-oauth.utils.ts b/typescript/packages/toolshed/routes/integrations/google-oauth/google-oauth.utils.ts index 5ee54857d..8c1498d50 100644 --- a/typescript/packages/toolshed/routes/integrations/google-oauth/google-oauth.utils.ts +++ b/typescript/packages/toolshed/routes/integrations/google-oauth/google-oauth.utils.ts @@ -1,4 +1,4 @@ -import { OAuth2Client } from "jsr:@cmd-johnson/oauth2-client@^2.0.0"; +import { OAuth2Client } from "@cmd-johnson/oauth2-client"; import env from "@/env.ts"; import { storage } from "@commontools/charm"; import {