From 66caaf3d75840d1682c2ccc9d16845b13d54f14b Mon Sep 17 00:00:00 2001 From: Jordan Santell Date: Wed, 5 Mar 2025 11:47:12 -0800 Subject: [PATCH] chore: Fix type check in deno-web-test and common-identity tests. Use proper lit export (js) in common-os-ui. --- typescript/packages/common-identity/deno.json | 2 +- .../common-identity/test/ed25519.test.ts | 4 ++-- .../components/code-editor/os-code-editor.ts | 2 +- .../components/editor/os-rich-text-editor.ts | 2 +- .../common-os-ui/src/components/os-ai-box.ts | 3 +-- .../common-os-ui/src/components/os-ai-icon.ts | 2 +- .../common-os-ui/src/components/os-avatar.ts | 2 +- .../src/components/os-charm-chip.ts | 2 +- .../src/components/os-charm-icon.ts | 2 +- .../src/components/os-charm-row.ts | 2 +- .../common-os-ui/src/components/os-chrome.ts | 2 +- .../common-os-ui/src/components/os-colgrid.ts | 2 +- .../src/components/os-common-import.ts | 2 +- .../src/components/os-container.ts | 2 +- .../common-os-ui/src/components/os-dialog.ts | 4 ++-- .../common-os-ui/src/components/os-fab.ts | 2 +- .../src/components/os-floating-completions.ts | 4 ++-- .../src/components/os-icon-button-plain.ts | 2 +- .../src/components/os-icon-button.ts | 2 +- .../common-os-ui/src/components/os-icon.ts | 2 +- .../common-os-ui/src/components/os-location.ts | 2 +- .../common-os-ui/src/components/os-navpanel.ts | 2 +- .../common-os-ui/src/components/os-navstack.ts | 2 +- .../src/components/os-sidebar-group.ts | 2 +- .../common-os-ui/src/components/os-tab-bar.ts | 2 +- .../common-os-ui/src/components/os-tile.ts | 2 +- typescript/packages/deno-web-test/config.ts | 12 ++++-------- typescript/packages/deno-web-test/deno.json | 2 +- typescript/packages/deno-web-test/runner.ts | 18 +++++++++++------- typescript/packages/deno-web-test/server.ts | 2 +- .../test/project-with-config/mod.ts | 4 ++-- typescript/packages/deno.lock | 6 ------ 32 files changed, 48 insertions(+), 55 deletions(-) diff --git a/typescript/packages/common-identity/deno.json b/typescript/packages/common-identity/deno.json index 8c5b3fe31..4aeea5418 100644 --- a/typescript/packages/common-identity/deno.json +++ b/typescript/packages/common-identity/deno.json @@ -1,7 +1,7 @@ { "name": "@commontools/identity", "tasks": { - "test": "deno run --allow-env --allow-read --allow-write --allow-run --allow-net ../deno-web-test/cli.ts test/*.test.ts" + "test": "deno check . && deno run --allow-env --allow-read --allow-write --allow-run --allow-net ../deno-web-test/cli.ts test/*.test.ts" }, "exports": "./src/index.ts", "imports": { diff --git a/typescript/packages/common-identity/test/ed25519.test.ts b/typescript/packages/common-identity/test/ed25519.test.ts index 8cb328bb3..aad51ea83 100644 --- a/typescript/packages/common-identity/test/ed25519.test.ts +++ b/typescript/packages/common-identity/test/ed25519.test.ts @@ -24,7 +24,7 @@ interface SignerClass { ): Promise>; } interface VerifierClass { - fromDid(did: DID): Promise>; + fromDid(did: ID): Promise>; fromRaw( rawPrivateKey: Uint8Array, ): Promise>; @@ -126,7 +126,7 @@ testBothImpls( Verifier: VerifierClass, ) => { // @see https://w3c-ccg.github.io/did-method-key/#test-vectors - const fixtures: DID[] = [ + const fixtures: DIDKey[] = [ "did:key:z6MkiTBz1ymuepAQ4HEHYSF1H8quG5GLVVQR3djdX3mDooWp", "did:key:z6MkjchhfUsD6mmvni8mCdXHw216Xrm9bQe2mBH1P5RDjVJG", "did:key:z6MknGc3ocHs3zdPiJbnaaqDi58NGb4pk1Sp9WxWufuXSdxf", diff --git a/typescript/packages/common-os-ui/src/components/code-editor/os-code-editor.ts b/typescript/packages/common-os-ui/src/components/code-editor/os-code-editor.ts index db9a7899d..b28735c2c 100644 --- a/typescript/packages/common-os-ui/src/components/code-editor/os-code-editor.ts +++ b/typescript/packages/common-os-ui/src/components/code-editor/os-code-editor.ts @@ -1,5 +1,5 @@ import { css, html, PropertyValues, ReactiveElement, render } from "lit"; -import { customElement, property } from "lit/decorators.ts"; +import { customElement, property } from "lit/decorators.js"; import { basicSetup, EditorView } from "codemirror"; import { Compartment, EditorState, Extension } from "@codemirror/state"; import { LanguageSupport } from "@codemirror/language"; diff --git a/typescript/packages/common-os-ui/src/components/editor/os-rich-text-editor.ts b/typescript/packages/common-os-ui/src/components/editor/os-rich-text-editor.ts index 4ab4fae7b..53799c4bb 100644 --- a/typescript/packages/common-os-ui/src/components/editor/os-rich-text-editor.ts +++ b/typescript/packages/common-os-ui/src/components/editor/os-rich-text-editor.ts @@ -5,7 +5,7 @@ import { Node, Schema } from "prosemirror-model"; import { history } from "prosemirror-history"; import { keymap } from "prosemirror-keymap"; import { baseKeymap } from "prosemirror-commands"; -import { customElement } from "lit/decorators.ts"; +import { customElement } from "lit/decorators.js"; import { base } from "../../shared/styles.ts"; import { editorClassPlugin } from "./prosemirror/editor-class-plugin.ts"; import { updateVerState, verPlugin } from "./prosemirror/ver-plugin.ts"; diff --git a/typescript/packages/common-os-ui/src/components/os-ai-box.ts b/typescript/packages/common-os-ui/src/components/os-ai-box.ts index b6a808dee..349cc2c39 100644 --- a/typescript/packages/common-os-ui/src/components/os-ai-box.ts +++ b/typescript/packages/common-os-ui/src/components/os-ai-box.ts @@ -1,6 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement } from "lit/decorators.ts"; -import { property } from "lit/decorators.ts"; +import { customElement, property } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; @customElement("os-ai-box") diff --git a/typescript/packages/common-os-ui/src/components/os-ai-icon.ts b/typescript/packages/common-os-ui/src/components/os-ai-icon.ts index 031004618..8af5ab5e0 100644 --- a/typescript/packages/common-os-ui/src/components/os-ai-icon.ts +++ b/typescript/packages/common-os-ui/src/components/os-ai-icon.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement } from "lit/decorators.ts"; +import { customElement } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; @customElement("os-ai-icon") diff --git a/typescript/packages/common-os-ui/src/components/os-avatar.ts b/typescript/packages/common-os-ui/src/components/os-avatar.ts index 5773c707b..058460628 100644 --- a/typescript/packages/common-os-ui/src/components/os-avatar.ts +++ b/typescript/packages/common-os-ui/src/components/os-avatar.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement, property } from "lit/decorators.ts"; +import { customElement, property } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; @customElement("os-avatar") diff --git a/typescript/packages/common-os-ui/src/components/os-charm-chip.ts b/typescript/packages/common-os-ui/src/components/os-charm-chip.ts index 43c898a73..06cc95783 100644 --- a/typescript/packages/common-os-ui/src/components/os-charm-chip.ts +++ b/typescript/packages/common-os-ui/src/components/os-charm-chip.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement, property } from "lit/decorators.ts"; +import { customElement, property } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; @customElement("os-charm-chip") diff --git a/typescript/packages/common-os-ui/src/components/os-charm-icon.ts b/typescript/packages/common-os-ui/src/components/os-charm-icon.ts index 6d11ac383..10adfb582 100644 --- a/typescript/packages/common-os-ui/src/components/os-charm-icon.ts +++ b/typescript/packages/common-os-ui/src/components/os-charm-icon.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement, property } from "lit/decorators.ts"; +import { customElement, property } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; /** diff --git a/typescript/packages/common-os-ui/src/components/os-charm-row.ts b/typescript/packages/common-os-ui/src/components/os-charm-row.ts index 80d34db7e..548f31596 100644 --- a/typescript/packages/common-os-ui/src/components/os-charm-row.ts +++ b/typescript/packages/common-os-ui/src/components/os-charm-row.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement, property } from "lit/decorators.ts"; +import { customElement, property } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; @customElement("os-charm-row") diff --git a/typescript/packages/common-os-ui/src/components/os-chrome.ts b/typescript/packages/common-os-ui/src/components/os-chrome.ts index d3dd78e04..de0b21804 100644 --- a/typescript/packages/common-os-ui/src/components/os-chrome.ts +++ b/typescript/packages/common-os-ui/src/components/os-chrome.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement, property } from "lit/decorators.ts"; +import { customElement, property } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; /** diff --git a/typescript/packages/common-os-ui/src/components/os-colgrid.ts b/typescript/packages/common-os-ui/src/components/os-colgrid.ts index 04301d614..bdd9e1fa1 100644 --- a/typescript/packages/common-os-ui/src/components/os-colgrid.ts +++ b/typescript/packages/common-os-ui/src/components/os-colgrid.ts @@ -1,5 +1,5 @@ import { css, html } from "lit"; -import { customElement } from "lit/decorators.ts"; +import { customElement } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; import { breakpointLg, diff --git a/typescript/packages/common-os-ui/src/components/os-common-import.ts b/typescript/packages/common-os-ui/src/components/os-common-import.ts index 58d6067b0..1f0cbea1b 100644 --- a/typescript/packages/common-os-ui/src/components/os-common-import.ts +++ b/typescript/packages/common-os-ui/src/components/os-common-import.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement, state } from "lit/decorators.ts"; +import { customElement, state } from "lit/decorators.js"; @customElement("os-common-import") export class OsCommonImport extends LitElement { diff --git a/typescript/packages/common-os-ui/src/components/os-container.ts b/typescript/packages/common-os-ui/src/components/os-container.ts index d5a75a8bc..8412dc147 100644 --- a/typescript/packages/common-os-ui/src/components/os-container.ts +++ b/typescript/packages/common-os-ui/src/components/os-container.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement } from "lit/decorators.ts"; +import { customElement } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; @customElement("os-container") diff --git a/typescript/packages/common-os-ui/src/components/os-dialog.ts b/typescript/packages/common-os-ui/src/components/os-dialog.ts index 140d878f0..8ba15822d 100644 --- a/typescript/packages/common-os-ui/src/components/os-dialog.ts +++ b/typescript/packages/common-os-ui/src/components/os-dialog.ts @@ -1,7 +1,7 @@ import { css, html, LitElement } from "lit"; -import { customElement, property } from "lit/decorators.ts"; +import { customElement, property } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; -import { classMap } from "lit/directives/class-map.ts"; +import { classMap } from "lit/directives/class-map.js"; @customElement("os-dialog") export class OsDialog extends LitElement { diff --git a/typescript/packages/common-os-ui/src/components/os-fab.ts b/typescript/packages/common-os-ui/src/components/os-fab.ts index b97c23120..4cbddfc42 100644 --- a/typescript/packages/common-os-ui/src/components/os-fab.ts +++ b/typescript/packages/common-os-ui/src/components/os-fab.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement, property, state } from "lit/decorators.ts"; +import { customElement, property, state } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; @customElement("os-fab") diff --git a/typescript/packages/common-os-ui/src/components/os-floating-completions.ts b/typescript/packages/common-os-ui/src/components/os-floating-completions.ts index 4bbb15d3c..d00fe9ce9 100644 --- a/typescript/packages/common-os-ui/src/components/os-floating-completions.ts +++ b/typescript/packages/common-os-ui/src/components/os-floating-completions.ts @@ -1,9 +1,9 @@ import { css, html, LitElement, PropertyValues } from "lit"; -import { customElement, property } from "lit/decorators.ts"; +import { customElement, property } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; import { createRect, positionMenu, Rect } from "../shared/position.ts"; import * as completion from "./editor/completion.ts"; -import { classMap } from "lit/directives/class-map.ts"; +import { classMap } from "lit/directives/class-map.js"; import { clamp } from "../shared/number.ts"; /** Completion clicked */ diff --git a/typescript/packages/common-os-ui/src/components/os-icon-button-plain.ts b/typescript/packages/common-os-ui/src/components/os-icon-button-plain.ts index 51d7fec34..72663fa46 100644 --- a/typescript/packages/common-os-ui/src/components/os-icon-button-plain.ts +++ b/typescript/packages/common-os-ui/src/components/os-icon-button-plain.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement, property } from "lit/decorators.ts"; +import { customElement, property } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; /** diff --git a/typescript/packages/common-os-ui/src/components/os-icon-button.ts b/typescript/packages/common-os-ui/src/components/os-icon-button.ts index a61080e78..60fb40a2c 100644 --- a/typescript/packages/common-os-ui/src/components/os-icon-button.ts +++ b/typescript/packages/common-os-ui/src/components/os-icon-button.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement, property } from "lit/decorators.ts"; +import { customElement, property } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; /** diff --git a/typescript/packages/common-os-ui/src/components/os-icon.ts b/typescript/packages/common-os-ui/src/components/os-icon.ts index b31cfadd9..4b0e5f2ce 100644 --- a/typescript/packages/common-os-ui/src/components/os-icon.ts +++ b/typescript/packages/common-os-ui/src/components/os-icon.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement, property } from "lit/decorators.ts"; +import { customElement, property } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; @customElement("os-icon") diff --git a/typescript/packages/common-os-ui/src/components/os-location.ts b/typescript/packages/common-os-ui/src/components/os-location.ts index 1c31a2528..061aa8e51 100644 --- a/typescript/packages/common-os-ui/src/components/os-location.ts +++ b/typescript/packages/common-os-ui/src/components/os-location.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement, property } from "lit/decorators.ts"; +import { customElement, property } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; /** diff --git a/typescript/packages/common-os-ui/src/components/os-navpanel.ts b/typescript/packages/common-os-ui/src/components/os-navpanel.ts index 7760c51f3..133aef184 100644 --- a/typescript/packages/common-os-ui/src/components/os-navpanel.ts +++ b/typescript/packages/common-os-ui/src/components/os-navpanel.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement } from "lit/decorators.ts"; +import { customElement } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; @customElement("os-navpanel") diff --git a/typescript/packages/common-os-ui/src/components/os-navstack.ts b/typescript/packages/common-os-ui/src/components/os-navstack.ts index 37bfddd57..07719e4ab 100644 --- a/typescript/packages/common-os-ui/src/components/os-navstack.ts +++ b/typescript/packages/common-os-ui/src/components/os-navstack.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement, property } from "lit/decorators.ts"; +import { customElement, property } from "lit/decorators.js"; import { durationMd, easeOutCubicCss, diff --git a/typescript/packages/common-os-ui/src/components/os-sidebar-group.ts b/typescript/packages/common-os-ui/src/components/os-sidebar-group.ts index ca02a7650..108fd1310 100644 --- a/typescript/packages/common-os-ui/src/components/os-sidebar-group.ts +++ b/typescript/packages/common-os-ui/src/components/os-sidebar-group.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement } from "lit/decorators.ts"; +import { customElement } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; @customElement("os-sidebar-group") diff --git a/typescript/packages/common-os-ui/src/components/os-tab-bar.ts b/typescript/packages/common-os-ui/src/components/os-tab-bar.ts index 98a623777..189b35b85 100644 --- a/typescript/packages/common-os-ui/src/components/os-tab-bar.ts +++ b/typescript/packages/common-os-ui/src/components/os-tab-bar.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement, property } from "lit/decorators.ts"; +import { customElement, property } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; interface TabItem { diff --git a/typescript/packages/common-os-ui/src/components/os-tile.ts b/typescript/packages/common-os-ui/src/components/os-tile.ts index 0e5f5e42d..07fc0ba52 100644 --- a/typescript/packages/common-os-ui/src/components/os-tile.ts +++ b/typescript/packages/common-os-ui/src/components/os-tile.ts @@ -1,5 +1,5 @@ import { css, html, LitElement } from "lit"; -import { customElement } from "lit/decorators.ts"; +import { customElement } from "lit/decorators.js"; import { base } from "../shared/styles.ts"; @customElement("os-tile") diff --git a/typescript/packages/deno-web-test/config.ts b/typescript/packages/deno-web-test/config.ts index c174d841c..3d8a67528 100644 --- a/typescript/packages/deno-web-test/config.ts +++ b/typescript/packages/deno-web-test/config.ts @@ -7,8 +7,6 @@ import { exists } from "@std/fs/exists"; export type Config = { // Whether the test runner should run headlessly. Default: true. headless?: boolean; - // Whether devtools should be enabled. Default: false. - devtools?: boolean; // What browser to run. product?: "chrome" | "firefox"; // Arguments to be passed into the browser. @@ -25,12 +23,10 @@ export const applyDefaults = (config: object): Config => { }; export const extractAstralConfig = (config: Config): LaunchOptions => { - const astralConfig = {}; - for (const prop of ["headless", "devtools", "product", "args"]) { - if (prop in config) { - astralConfig[prop] = config[prop]; - } - } + const astralConfig: LaunchOptions = {}; + if ("headless" in config) astralConfig.headless = config.headless; + if ("product" in config) astralConfig.product = config.product; + if ("args" in config) astralConfig.args = config.args; return astralConfig; }; diff --git a/typescript/packages/deno-web-test/deno.json b/typescript/packages/deno-web-test/deno.json index 6ccf1cdc4..4faa055a6 100644 --- a/typescript/packages/deno-web-test/deno.json +++ b/typescript/packages/deno-web-test/deno.json @@ -1,7 +1,7 @@ { "name": "@commontools/deno-web-test", "tasks": { - "test": "deno test --allow-env --allow-read --allow-write --allow-run --allow-net test/*.test.ts" + "test": "deno check . && deno test --allow-env --allow-read --allow-write --allow-run --allow-net test/*.test.ts" }, "exports": { ".": "./mod.ts", diff --git a/typescript/packages/deno-web-test/runner.ts b/typescript/packages/deno-web-test/runner.ts index af722279c..3ed934041 100644 --- a/typescript/packages/deno-web-test/runner.ts +++ b/typescript/packages/deno-web-test/runner.ts @@ -1,3 +1,4 @@ +import { ConsoleEvent } from "@astral/astral"; import { Manifest } from "./manifest.ts"; import { summarize } from "./utils.ts"; import { BrowserController } from "./browser.ts"; @@ -15,7 +16,10 @@ export class Runner { this.reporter = new Reporter(); this.results = []; this.browser = new BrowserController(manifest); - this.browser.addEventListener("console", (e) => this.onConsole(e)); + this.browser.addEventListener( + "console", + (e: Event) => this.onConsole(e as ConsoleEvent), + ); } // Runs all tests in the browser. Return value @@ -62,14 +66,14 @@ export class Runner { onConsole(e: ConsoleEvent) { if (this.manifest.config.pipeConsole) { switch (e.detail.type) { - case "log": - console.log(`deno-web-test: ${e.detail.text}`); - break; - case "warn": - console.warn(`deno-web-test: ${e.detail.text}`); + case "warning": + console.warn(`browser: ${e.detail.text}`); break; + case "log": + case "info": + case "debug": case "error": - console.error(`deno-web-test: ${e.detail.text}`); + console[e.detail.type](`browser: ${e.detail.text}`); break; } } diff --git a/typescript/packages/deno-web-test/server.ts b/typescript/packages/deno-web-test/server.ts index f1594494c..464f8a7dc 100644 --- a/typescript/packages/deno-web-test/server.ts +++ b/typescript/packages/deno-web-test/server.ts @@ -15,7 +15,7 @@ export class TestServer { start(port: number) { this.server = Deno.serve( - { port, hostname: "127.0.0.1", onListen({ path }) {} }, + { port, hostname: "127.0.0.1", onListen() {} }, (req: Request) => serveDir(req, { fsRoot: this.manifest.serverDir, diff --git a/typescript/packages/deno-web-test/test/project-with-config/mod.ts b/typescript/packages/deno-web-test/test/project-with-config/mod.ts index c497dc781..c037bc9c6 100644 --- a/typescript/packages/deno-web-test/test/project-with-config/mod.ts +++ b/typescript/packages/deno-web-test/test/project-with-config/mod.ts @@ -1,7 +1,7 @@ -export const createEd25519Key = async (): CryptoKey => { +export const createEd25519Key = (): Promise => { const dummyKey = new Uint8Array(32); - return await globalThis.crypto.subtle.importKey( + return globalThis.crypto.subtle.importKey( "raw", dummyKey, "ed25519", diff --git a/typescript/packages/deno.lock b/typescript/packages/deno.lock index ff52942a1..4f419bd66 100644 --- a/typescript/packages/deno.lock +++ b/typescript/packages/deno.lock @@ -7229,12 +7229,6 @@ "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"