From ee340f62e44f60563e26e6c78db3d7515c7b2daf Mon Sep 17 00:00:00 2001 From: Bernhard Seefeld Date: Tue, 4 Mar 2025 12:18:07 -0800 Subject: [PATCH 1/2] fix linter warnings, including removing deprecated parse --- typescript/packages/common-cli/main.ts | 9 ++++++--- typescript/packages/common-cli/recipes/simpleValue.tsx | 1 - typescript/packages/deno.lock | 3 +-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/typescript/packages/common-cli/main.ts b/typescript/packages/common-cli/main.ts index 1f547040f..d8f73dfb6 100644 --- a/typescript/packages/common-cli/main.ts +++ b/typescript/packages/common-cli/main.ts @@ -1,5 +1,5 @@ // Load .env file -import { parse } from "https://deno.land/std@0.224.0/flags/mod.ts"; +import { parseArgs } from "https://deno.land/std@0.224.0/cli/parse_args.ts"; import { CharmManager, compileRecipe, @@ -9,7 +9,10 @@ import { import { getEntityId, isStream } from "@commontools/runner"; import { Identity } from "@commontools/identity"; -let { space, charmId, recipeFile, cause } = parse(Deno.args); +const { space, charmId, recipeFile, cause } = parseArgs(Deno.args, { + string: ["space", "charmId", "recipeFile", "cause"], + default: {}, +}); const toolshedUrl = Deno.env.get("TOOLSHED_API_URL") ?? "https://toolshed.saga-castor.ts.net/"; @@ -18,8 +21,8 @@ storage.setRemoteStorage(new URL(toolshedUrl)); setBobbyServerUrl(toolshedUrl); async function main() { - console.log("params:", { space, charmId, recipeFile, cause }); const identity = await Identity.fromPassphrase("common-cli"); + console.log("params:", { space, identity, charmId, recipeFile, cause }); const manager = await CharmManager.open({ space: space ?? identity.did(), signer: identity, diff --git a/typescript/packages/common-cli/recipes/simpleValue.tsx b/typescript/packages/common-cli/recipes/simpleValue.tsx index 880cb39fd..8ab5d061c 100644 --- a/typescript/packages/common-cli/recipes/simpleValue.tsx +++ b/typescript/packages/common-cli/recipes/simpleValue.tsx @@ -1,4 +1,3 @@ -// @ts-nocheck import { h } from "@commontools/html"; import { cell, diff --git a/typescript/packages/deno.lock b/typescript/packages/deno.lock index 9219415fd..79591d860 100644 --- a/typescript/packages/deno.lock +++ b/typescript/packages/deno.lock @@ -7251,8 +7251,7 @@ ], "packageJson": { "dependencies": [ - "npm:merkle-reference@^2.0.1", - "npm:multiformats@^13.3.2" + "npm:merkle-reference@^2.0.1" ] } }, From 6620f61ccac184f3f154f9f0973444ed476ffcf6 Mon Sep 17 00:00:00 2001 From: Bernhard Seefeld Date: Tue, 4 Mar 2025 12:19:33 -0800 Subject: [PATCH 2/2] also type case to (so far unenforced) did shape for spaces --- typescript/packages/common-cli/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/typescript/packages/common-cli/main.ts b/typescript/packages/common-cli/main.ts index d8f73dfb6..d5182ff06 100644 --- a/typescript/packages/common-cli/main.ts +++ b/typescript/packages/common-cli/main.ts @@ -24,7 +24,7 @@ async function main() { const identity = await Identity.fromPassphrase("common-cli"); console.log("params:", { space, identity, charmId, recipeFile, cause }); const manager = await CharmManager.open({ - space: space ?? identity.did(), + space: (space as `did:key:${string}`) ?? identity.did(), signer: identity, }); const charms = await manager.getCharms();