From 6cc21899214296f51e93b70a3f9f67c39ba243d3 Mon Sep 17 00:00:00 2001 From: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Thu, 25 Apr 2024 15:04:51 -0700 Subject: [PATCH] perf: vastly improve load speed - delay render non visable device tabs in the future there are some significant speed gains to be made by limiting calls into the rust VM for data. serialize it all up front. Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com> --- ic10emu/build.rs | 2 +- ic10emu_wasm/src/types.rs | 38 +++++ www/src/ts/app/app.ts | 8 - www/src/ts/app/index.ts | 1 - www/src/ts/app/nav.ts | 8 - www/src/ts/app/save.ts | 5 - www/src/ts/app/share.ts | 5 - www/src/ts/app/welcome.ts | 3 - www/src/ts/components/details.ts | 3 - www/src/ts/editor/index.ts | 7 - www/src/ts/{app => }/icons.ts | 0 www/src/ts/index.ts | 39 ++++- www/src/ts/virtual_machine/controls.ts | 9 -- www/src/ts/virtual_machine/device/card.ts | 141 ++++++++++++------ .../device/{utils.ts => dbutils.ts} | 0 .../ts/virtual_machine/device/device_list.ts | 2 +- www/src/ts/virtual_machine/device/index.ts | 17 --- www/src/ts/virtual_machine/device/template.ts | 9 +- www/src/ts/virtual_machine/registers.ts | 4 - www/src/ts/virtual_machine/stack.ts | 4 - www/src/ts/virtual_machine/ui.ts | 5 - 21 files changed, 177 insertions(+), 133 deletions(-) rename www/src/ts/{app => }/icons.ts (100%) rename www/src/ts/virtual_machine/device/{utils.ts => dbutils.ts} (100%) diff --git a/ic10emu/build.rs b/ic10emu/build.rs index 87da430..5dd8cec 100644 --- a/ic10emu/build.rs +++ b/ic10emu/build.rs @@ -30,7 +30,7 @@ fn write_repr_enum<'a, T: std::io::Write, I, P>( let additional_strum = if use_phf { "#[strum(use_phf)]\n" } else { "" }; write!( writer, - "#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, Hash, EnumString, AsRefStr, EnumProperty, EnumIter, Serialize, Deserialize)]\n\ + "#[derive(Debug, Display, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, EnumString, AsRefStr, EnumProperty, EnumIter, Serialize, Deserialize)]\n\ {additional_strum}\ pub enum {name} {{\n" ) diff --git a/ic10emu_wasm/src/types.rs b/ic10emu_wasm/src/types.rs index bb1dc4a..09f4fb9 100644 --- a/ic10emu_wasm/src/types.rs +++ b/ic10emu_wasm/src/types.rs @@ -1,3 +1,6 @@ +#![allow(non_snake_case)] + +// use std::collections::BTreeMap; use std::collections::HashMap; use serde::{Deserialize, Serialize}; @@ -57,3 +60,38 @@ impl From<&ic10emu::device::Slot> for Slot { include!(concat!(env!("OUT_DIR"), "/ts_types.rs")); +// #[serde_as] +// #[derive(Tsify, Serialize, Deserialize)] +// #[tsify(into_wasm_abi, from_wasm_abi)] +// pub struct DeviceLogicField { +// field_type: FieldType, +// value: f64, +// } +// +// #[serde_as] +// #[derive(Tsify, Serialize, Deserialize)] +// #[tsify(into_wasm_abi, from_wasm_abi)] +// pub struct DeviceSlot { +// typ: SlotType, +// #[serde_as(as = "Vec<(_, _)>")] +// fields: BTreeMap, +// } +// +// +// #[serde_as] +// #[derive(Tsify, Serialize, Deserialize)] +// #[tsify(into_wasm_abi, from_wasm_abi)] +// pub struct DeviceState{ +// name: Option, +// name_hash: Option, +// prefab_name: Option, +// #[serde_as(as = "Vec<(_, _)>")] +// fields: BTreeMap, +// slots: Vec, +// #[serde_as(as = "Vec<(_, _)>")] +// reagents: BTreeMap>, +// connections: Vec, +// ic: Option, +// } + +// serde_with::DisplayFromStr diff --git a/www/src/ts/app/app.ts b/www/src/ts/app/app.ts index 45e82e1..cc5828d 100644 --- a/www/src/ts/app/app.ts +++ b/www/src/ts/app/app.ts @@ -4,14 +4,6 @@ import { BaseElement, defaultCss } from "../components"; import "./nav"; import "./share"; import { ShareSessionDialog } from "./share"; - -import { setBasePath } from "@shoelace-style/shoelace/dist/utilities/base-path.js"; - -// Set the base path to the folder you copied Shoelace's assets to -setBasePath("shoelace"); - -import "@shoelace-style/shoelace/dist/components/split-panel/split-panel.js"; - import "../editor"; import { IC10Editor } from "../editor"; import { Session } from "../session"; diff --git a/www/src/ts/app/index.ts b/www/src/ts/app/index.ts index ec08af3..58308c3 100644 --- a/www/src/ts/app/index.ts +++ b/www/src/ts/app/index.ts @@ -2,5 +2,4 @@ import { App } from "./app"; import { Nav } from "./nav"; import { SaveDialog } from "./save"; import { ShareSessionDialog } from "./share"; -import "./icons"; export { App, Nav, ShareSessionDialog } diff --git a/www/src/ts/app/nav.ts b/www/src/ts/app/nav.ts index 6e27179..aa4a4b8 100644 --- a/www/src/ts/app/nav.ts +++ b/www/src/ts/app/nav.ts @@ -2,14 +2,6 @@ import { HTMLTemplateResult, html, css } from "lit"; import { customElement, property } from "lit/decorators.js"; import { BaseElement, defaultCss } from "components"; -import "@shoelace-style/shoelace/dist/components/icon/icon.js"; -import "@shoelace-style/shoelace/dist/components/icon-button/icon-button.js"; -import "@shoelace-style/shoelace/dist/components/menu/menu.js"; -import "@shoelace-style/shoelace/dist/components/divider/divider.js"; -import "@shoelace-style/shoelace/dist/components/menu-item/menu-item.js"; -import "@shoelace-style/shoelace/dist/components/dropdown/dropdown.js"; -import "@shoelace-style/shoelace/dist/components/relative-time/relative-time.js"; -import "@shoelace-style/shoelace/dist/components/tooltip/tooltip.js"; import SlMenuItem from "@shoelace-style/shoelace/dist/components/menu-item/menu-item.js"; @customElement("app-nav") diff --git a/www/src/ts/app/save.ts b/www/src/ts/app/save.ts index 710814d..51c5754 100644 --- a/www/src/ts/app/save.ts +++ b/www/src/ts/app/save.ts @@ -3,11 +3,6 @@ import { customElement, property, query, state } from "lit/decorators.js"; import { BaseElement, defaultCss } from "components"; import { VMState } from "session"; -import "@shoelace-style/shoelace/dist/components/dialog/dialog.js"; -import "@shoelace-style/shoelace/dist/components/format-date/format-date.js"; -import "@shoelace-style/shoelace/dist/components/relative-time/relative-time.js"; -import "@shoelace-style/shoelace/dist/components/format-bytes/format-bytes.js"; -import "@shoelace-style/shoelace/dist/components/spinner/spinner.js"; import SlInput from "@shoelace-style/shoelace/dist/components/input/input.js"; import { repeat } from "lit/directives/repeat.js"; import SlDialog from "@shoelace-style/shoelace/dist/components/dialog/dialog.js"; diff --git a/www/src/ts/app/share.ts b/www/src/ts/app/share.ts index 4037d91..8c5df5b 100644 --- a/www/src/ts/app/share.ts +++ b/www/src/ts/app/share.ts @@ -2,11 +2,6 @@ import { HTMLTemplateResult, html, css } from "lit"; import { customElement, property, query } from "lit/decorators.js"; import { BaseElement, defaultCss } from "components"; -import "@shoelace-style/shoelace/dist/components/dialog/dialog.js"; -import "@shoelace-style/shoelace/dist/components/input/input.js"; -import "@shoelace-style/shoelace/dist/components/icon/icon.js"; -import "@shoelace-style/shoelace/dist/components/icon-button/icon-button.js"; -import "@shoelace-style/shoelace/dist/components/copy-button/copy-button.js"; import SlDialog from "@shoelace-style/shoelace/dist/components/dialog/dialog.js"; import SlInput from "@shoelace-style/shoelace/dist/components/input/input.js"; diff --git a/www/src/ts/app/welcome.ts b/www/src/ts/app/welcome.ts index 55c0c9a..d2d945c 100644 --- a/www/src/ts/app/welcome.ts +++ b/www/src/ts/app/welcome.ts @@ -5,9 +5,6 @@ import { BaseElement, defaultCss } from "components"; import { SlDialog, SlSwitch } from "@shoelace-style/shoelace"; import { until } from "lit/directives/until.js"; -import "@shoelace-style/shoelace/dist/components/spinner/spinner.js"; -import '@shoelace-style/shoelace/dist/components/switch/switch.js'; - import { marked } from "marked"; import { gfmStyles } from "./gfm-styles"; diff --git a/www/src/ts/components/details.ts b/www/src/ts/components/details.ts index 508cdd4..302c69e 100644 --- a/www/src/ts/components/details.ts +++ b/www/src/ts/components/details.ts @@ -1,9 +1,6 @@ import { html, css, - HTMLTemplateResult, - PropertyValueMap, - CSSResultGroup, } from "lit"; import { customElement, query, state } from "lit/decorators.js"; import { classMap } from "lit/directives/class-map.js"; diff --git a/www/src/ts/editor/index.ts b/www/src/ts/editor/index.ts index 5b282c1..8f65c7c 100644 --- a/www/src/ts/editor/index.ts +++ b/www/src/ts/editor/index.ts @@ -2,13 +2,6 @@ import { ace, Ace, Range, AceLanguageClient, setupLspWorker } from "./ace"; import { LanguageProvider } from "ace-linters/types/language-provider"; -import "@shoelace-style/shoelace/dist/components/dialog/dialog.js"; -import "@shoelace-style/shoelace/dist/components/button-group/button-group.js"; -import "@shoelace-style/shoelace/dist/components/button/button.js"; -import "@shoelace-style/shoelace/dist/components/input/input.js"; -import "@shoelace-style/shoelace/dist/components/radio-button/radio-button.js"; -import "@shoelace-style/shoelace/dist/components/radio-group/radio-group.js"; -import "@shoelace-style/shoelace/dist/components/switch/switch.js"; import SlDialog from "@shoelace-style/shoelace/dist/components/dialog/dialog.js"; import SlRadioGroup from "@shoelace-style/shoelace/dist/components/radio-group/radio-group.js"; import SlInput from "@shoelace-style/shoelace/dist/components/input/input.js"; diff --git a/www/src/ts/app/icons.ts b/www/src/ts/icons.ts similarity index 100% rename from www/src/ts/app/icons.ts rename to www/src/ts/icons.ts diff --git a/www/src/ts/index.ts b/www/src/ts/index.ts index a19527f..07daf7e 100644 --- a/www/src/ts/index.ts +++ b/www/src/ts/index.ts @@ -1,6 +1,43 @@ import "@popperjs/core"; import "../scss/styles.scss"; -import { Dropdown, Modal } from "bootstrap"; +import { setBasePath } from "@shoelace-style/shoelace/dist/utilities/base-path.js"; +setBasePath("shoelace"); +import "./icons"; + +import "@shoelace-style/shoelace/dist/components/split-panel/split-panel.js"; +import "@shoelace-style/shoelace/dist/components/dialog/dialog.js"; +import "@shoelace-style/shoelace/dist/components/drawer/drawer.js"; +import "@shoelace-style/shoelace/dist/components/icon/icon.js"; +import "@shoelace-style/shoelace/dist/components/icon-button/icon-button.js"; +import "@shoelace-style/shoelace/dist/components/copy-button/copy-button.js"; +import "@shoelace-style/shoelace/dist/components/button-group/button-group.js"; +import "@shoelace-style/shoelace/dist/components/button/button.js"; +import '@shoelace-style/shoelace/dist/components/switch/switch.js'; +import "@shoelace-style/shoelace/dist/components/radio-button/radio-button.js"; +import "@shoelace-style/shoelace/dist/components/radio-group/radio-group.js"; +import "@shoelace-style/shoelace/dist/components/menu/menu.js"; +import "@shoelace-style/shoelace/dist/components/menu-item/menu-item.js"; +import "@shoelace-style/shoelace/dist/components/divider/divider.js"; +import "@shoelace-style/shoelace/dist/components/dropdown/dropdown.js"; +import "@shoelace-style/shoelace/dist/components/tooltip/tooltip.js"; +import "@shoelace-style/shoelace/dist/components/input/input.js"; +import "@shoelace-style/shoelace/dist/components/spinner/spinner.js"; +import "@shoelace-style/shoelace/dist/components/card/card.js"; +import "@shoelace-style/shoelace/dist/components/details/details.js"; +import "@shoelace-style/shoelace/dist/components/tab/tab.js"; +import "@shoelace-style/shoelace/dist/components/tab-panel/tab-panel.js"; +import "@shoelace-style/shoelace/dist/components/tab-group/tab-group.js"; +import "@shoelace-style/shoelace/dist/components/select/select.js"; +import "@shoelace-style/shoelace/dist/components/badge/badge.js"; +import "@shoelace-style/shoelace/dist/components/option/option.js"; +import "@shoelace-style/shoelace/dist/components/alert/alert.js"; +import "@shoelace-style/shoelace/dist/components/format-number/format-number.js"; +import "@shoelace-style/shoelace/dist/components/format-date/format-date.js"; +import "@shoelace-style/shoelace/dist/components/format-bytes/format-bytes.js"; +import "@shoelace-style/shoelace/dist/components/relative-time/relative-time.js"; + +import "ace-builds"; +import "ace-builds/esm-resolver"; class DeferedApp { diff --git a/www/src/ts/virtual_machine/controls.ts b/www/src/ts/virtual_machine/controls.ts index f5a3343..c376be2 100644 --- a/www/src/ts/virtual_machine/controls.ts +++ b/www/src/ts/virtual_machine/controls.ts @@ -3,15 +3,6 @@ import { customElement, query } from "lit/decorators.js"; import { BaseElement, defaultCss } from "components"; import { VMActiveICMixin } from "virtual_machine/base_device"; -import "@shoelace-style/shoelace/dist/components/card/card.js"; -import "@shoelace-style/shoelace/dist/components/button-group/button-group.js"; -import "@shoelace-style/shoelace/dist/components/button/button.js"; -import "@shoelace-style/shoelace/dist/components/icon/icon.js"; -import "@shoelace-style/shoelace/dist/components/tooltip/tooltip.js"; -import "@shoelace-style/shoelace/dist/components/divider/divider.js"; -import "@shoelace-style/shoelace/dist/components/select/select.js"; -import "@shoelace-style/shoelace/dist/components/badge/badge.js"; -import "@shoelace-style/shoelace/dist/components/option/option.js"; import SlSelect from "@shoelace-style/shoelace/dist/components/select/select.js"; @customElement("vm-ic-controls") diff --git a/www/src/ts/virtual_machine/device/card.ts b/www/src/ts/virtual_machine/device/card.ts index a936675..4f92367 100644 --- a/www/src/ts/virtual_machine/device/card.ts +++ b/www/src/ts/virtual_machine/device/card.ts @@ -1,13 +1,25 @@ import { html, css, HTMLTemplateResult } from "lit"; -import { customElement, property, query} from "lit/decorators.js"; +import { customElement, property, query, state } from "lit/decorators.js"; import { BaseElement, defaultCss } from "components"; import { VMDeviceDBMixin, VMDeviceMixin } from "virtual_machine/base_device"; import SlSelect from "@shoelace-style/shoelace/dist/components/select/select.component.js"; import { displayNumber, parseIntWithHexOrBinary, parseNumber } from "utils"; -import { LogicType, Slot, SlotLogicType, SlotOccupant, SlotType } from "ic10emu_wasm"; +import { + LogicType, + Slot, + SlotLogicType, + SlotOccupant, + SlotType, +} from "ic10emu_wasm"; import SlInput from "@shoelace-style/shoelace/dist/components/input/input.component.js"; import SlDialog from "@shoelace-style/shoelace/dist/components/dialog/dialog.component.js"; -import "./slot" +import "./slot"; +import { when } from "lit/directives/when.js"; +import { cache } from "lit/directives/cache.js"; +import { until } from "lit/directives/until.js"; +import { repeat } from "lit/directives/repeat.js"; + +export type CardTab = "fields" | "slots" | "reagents" | "networks" | "pins"; @customElement("vm-device-card") export class VMDeviceCard extends VMDeviceDBMixin(VMDeviceMixin(BaseElement)) { @@ -151,8 +163,8 @@ export class VMDeviceCard extends VMDeviceDBMixin(VMDeviceMixin(BaseElement)) { Id - + Name @@ -172,10 +184,10 @@ export class VMDeviceCard extends VMDeviceDBMixin(VMDeviceMixin(BaseElement)) { `; } - renderFields(): HTMLTemplateResult { + renderFields() { const fields = Array.from(this.fields.entries()); const inputIdBase = `vmDeviceCard${this.deviceID}Field`; - return html` + return this.delayRenderTab("fields", html` ${fields.map(([name, field], _index, _fields) => { return html` @@ -184,10 +196,9 @@ export class VMDeviceCard extends VMDeviceDBMixin(VMDeviceMixin(BaseElement)) { ${field.field_type} `; })} - `; + `); } - _onSlotImageErr(e: Event) { console.log("image_err", e); } @@ -195,26 +206,26 @@ export class VMDeviceCard extends VMDeviceDBMixin(VMDeviceMixin(BaseElement)) { static transparentImg = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" as const; - renderSlots(): HTMLTemplateResult { - return html` + async renderSlots() { + return this.delayRenderTab("slots", html`
- ${this.slots.map((_slot, index, _slots) => html` - - - ` )} + ${repeat( + this.slots, + (_slot, index) => index, + (_slot, index) => html` + + + `, + )}
- `; + `); } - renderReagents(): HTMLTemplateResult { - return html``; + renderReagents() { + return this.delayRenderTab("reagents", html``); } - renderNetworks(): HTMLTemplateResult { + renderNetworks() { const vmNetworks = window.VM.vm.networks; const networks = this.connections.map((connection, index, _conns) => { const conn = @@ -231,13 +242,10 @@ export class VMDeviceCard extends VMDeviceDBMixin(VMDeviceMixin(BaseElement)) { `; }); - return html` -
- ${networks} -
- `; + return this.delayRenderTab("networks", html`
${networks}
`); } - renderPins(): HTMLTemplateResult { + + renderPins() { const pins = this.pins; const visibleDevices = window.VM.vm.visibleDevices(this.deviceID); const pinsHtml = pins?.map( @@ -255,29 +263,73 @@ export class VMDeviceCard extends VMDeviceDBMixin(VMDeviceMixin(BaseElement)) { )} `, ); - return html` -
- ${pinsHtml} -
- `; + return this.delayRenderTab("pins", html`
${pinsHtml}
`); + } + + private tabsShown: CardTab[] = ["fields"]; + private tabResolves: { + [key in CardTab]: { + result?: HTMLTemplateResult; + resolver?: (result: HTMLTemplateResult) => void; + }; + } = { + fields: {}, + slots: {}, + reagents: {}, + networks: {}, + pins: {}, + }; + + delayRenderTab( + name: CardTab, + result: HTMLTemplateResult, + ): Promise { + this.tabResolves[name].result = result; + return new Promise((resolve) => { + if (this.tabsShown.includes(name)) { + this.tabResolves[name].resolver = undefined; + resolve(result); + } else { + this.tabResolves[name].resolver = resolve; + } + }); + } + + resolveTab(name: CardTab) { + if ( + typeof this.tabResolves[name].resolver !== "undefined" && + typeof this.tabResolves[name].result !== "undefined" + ) { + this.tabResolves[name].resolver(this.tabResolves[name].result); + this.tabsShown.push(name); + } + } render(): HTMLTemplateResult { return html`
${this.renderHeader()}
- + Fields Slots Reagents Networks Pins - ${this.renderFields()} - ${this.renderSlots()} - ${this.renderReagents()} - ${this.renderNetworks()} - ${this.renderPins()} + + ${until(this.renderFields(), html``)} + + + ${until(this.renderSlots(), html``)} + + + ${until(this.renderReagents(), html``)} + + + ${until(this.renderNetworks(), html``)} + + ${this.renderPins()} @@ -297,6 +349,10 @@ export class VMDeviceCard extends VMDeviceDBMixin(VMDeviceMixin(BaseElement)) { `; } + _handleTabChange(e: CustomEvent<{ name: string }>) { + setTimeout(() => this.resolveTab(e.detail.name as CardTab), 100); + } + @query(".remove-device-dialog") removeDialog: SlDialog; _preventOverlayClose(event: CustomEvent) { @@ -313,7 +369,7 @@ export class VMDeviceCard extends VMDeviceDBMixin(VMDeviceMixin(BaseElement)) { const input = e.target as SlInput; const val = parseIntWithHexOrBinary(input.value); if (!isNaN(val)) { - window.VM.get().then(vm => { + window.VM.get().then((vm) => { if (!vm.changeDeviceId(this.deviceID, val)) { input.value = this.deviceID.toString(); } @@ -326,7 +382,7 @@ export class VMDeviceCard extends VMDeviceDBMixin(VMDeviceMixin(BaseElement)) { _handleChangeName(e: CustomEvent) { const input = e.target as SlInput; const name = input.value.length === 0 ? undefined : input.value; - window.VM.get().then(vm => { + window.VM.get().then((vm) => { if (!vm.setDeviceName(this.deviceID, name)) { input.value = this.name; } @@ -372,4 +428,3 @@ export class VMDeviceCard extends VMDeviceDBMixin(VMDeviceMixin(BaseElement)) { this.updateDevice(); } } - diff --git a/www/src/ts/virtual_machine/device/utils.ts b/www/src/ts/virtual_machine/device/dbutils.ts similarity index 100% rename from www/src/ts/virtual_machine/device/utils.ts rename to www/src/ts/virtual_machine/device/dbutils.ts diff --git a/www/src/ts/virtual_machine/device/device_list.ts b/www/src/ts/virtual_machine/device/device_list.ts index 82bd447..04e0f64 100644 --- a/www/src/ts/virtual_machine/device/device_list.ts +++ b/www/src/ts/virtual_machine/device/device_list.ts @@ -3,7 +3,7 @@ import { customElement, query, state } from "lit/decorators.js"; import { BaseElement, defaultCss } from "components"; import SlInput from "@shoelace-style/shoelace/dist/components/input/input.js"; -import { structuralEqual } from "../../utils"; +import { structuralEqual } from "utils"; import { repeat } from "lit/directives/repeat.js"; import { default as uFuzzy } from "@leeoniya/ufuzzy"; diff --git a/www/src/ts/virtual_machine/device/index.ts b/www/src/ts/virtual_machine/device/index.ts index 6b2fc94..ef53140 100644 --- a/www/src/ts/virtual_machine/device/index.ts +++ b/www/src/ts/virtual_machine/device/index.ts @@ -1,20 +1,3 @@ - -import "@shoelace-style/shoelace/dist/components/card/card.js"; -import "@shoelace-style/shoelace/dist/components/icon/icon.js"; -import "@shoelace-style/shoelace/dist/components/tooltip/tooltip.js"; -import "@shoelace-style/shoelace/dist/components/input/input.js"; -import "@shoelace-style/shoelace/dist/components/details/details.js"; -import "@shoelace-style/shoelace/dist/components/tab/tab.js"; -import "@shoelace-style/shoelace/dist/components/tab-panel/tab-panel.js"; -import "@shoelace-style/shoelace/dist/components/tab-group/tab-group.js"; -import "@shoelace-style/shoelace/dist/components/copy-button/copy-button.js"; -import "@shoelace-style/shoelace/dist/components/select/select.js"; -import "@shoelace-style/shoelace/dist/components/badge/badge.js"; -import "@shoelace-style/shoelace/dist/components/option/option.js"; -import "@shoelace-style/shoelace/dist/components/drawer/drawer.js"; -import "@shoelace-style/shoelace/dist/components/icon/icon.js"; -import "@shoelace-style/shoelace/dist/components/format-number/format-number.js"; - import "./template" import "./card" import "./device_list" diff --git a/www/src/ts/virtual_machine/device/template.ts b/www/src/ts/virtual_machine/device/template.ts index 7000d6b..711cb31 100644 --- a/www/src/ts/virtual_machine/device/template.ts +++ b/www/src/ts/virtual_machine/device/template.ts @@ -1,25 +1,18 @@ - - import type { Connection, DeviceTemplate, LogicField, - LogicFields, LogicType, Slot, SlotTemplate, - SlotOccupant, - SlotOccupantTemplate, - SlotLogicType, ConnectionCableNetwork, - SlotType, } from "ic10emu_wasm"; import { html, css, HTMLTemplateResult } from "lit"; import { customElement, property, query, state } from "lit/decorators.js"; import { BaseElement, defaultCss } from "components"; import type { DeviceDB, DeviceDBEntry } from "virtual_machine/device_db"; -import { connectionFromDeviceDBConnection } from "./utils"; +import { connectionFromDeviceDBConnection } from "./dbutils"; import { displayNumber, parseNumber } from "utils"; import SlInput from "@shoelace-style/shoelace/dist/components/input/input.component.js"; import SlSelect from "@shoelace-style/shoelace/dist/components/select/select.component.js"; diff --git a/www/src/ts/virtual_machine/registers.ts b/www/src/ts/virtual_machine/registers.ts index f83bb96..19aa885 100644 --- a/www/src/ts/virtual_machine/registers.ts +++ b/www/src/ts/virtual_machine/registers.ts @@ -3,10 +3,6 @@ import { customElement } from "lit/decorators.js"; import { BaseElement, defaultCss } from "components"; import { VMActiveICMixin } from "virtual_machine/base_device"; -import "@shoelace-style/shoelace/dist/components/card/card.js"; -import "@shoelace-style/shoelace/dist/components/icon/icon.js"; -import "@shoelace-style/shoelace/dist/components/tooltip/tooltip.js"; -import "@shoelace-style/shoelace/dist/components/input/input.js"; import { RegisterSpec } from "ic10emu_wasm"; import SlInput from "@shoelace-style/shoelace/dist/components/input/input.js"; import { displayNumber, parseNumber } from "utils"; diff --git a/www/src/ts/virtual_machine/stack.ts b/www/src/ts/virtual_machine/stack.ts index 94341a4..68417f2 100644 --- a/www/src/ts/virtual_machine/stack.ts +++ b/www/src/ts/virtual_machine/stack.ts @@ -3,10 +3,6 @@ import { customElement } from "lit/decorators.js"; import { BaseElement, defaultCss } from "components"; import { VMActiveICMixin } from "virtual_machine/base_device"; -import "@shoelace-style/shoelace/dist/components/card/card.js"; -import "@shoelace-style/shoelace/dist/components/icon/icon.js"; -import "@shoelace-style/shoelace/dist/components/tooltip/tooltip.js"; -import "@shoelace-style/shoelace/dist/components/input/input.js"; import SlInput from "@shoelace-style/shoelace/dist/components/input/input.js"; import { displayNumber, parseNumber } from "utils"; diff --git a/www/src/ts/virtual_machine/ui.ts b/www/src/ts/virtual_machine/ui.ts index 288b3c8..1c1b729 100644 --- a/www/src/ts/virtual_machine/ui.ts +++ b/www/src/ts/virtual_machine/ui.ts @@ -1,11 +1,6 @@ import { html, css } from "lit"; import { customElement } from "lit/decorators.js"; import { BaseElement, defaultCss } from "components"; -import "@shoelace-style/shoelace/dist/components/details/details.js"; -import "@shoelace-style/shoelace/dist/components/tab/tab.js"; -import "@shoelace-style/shoelace/dist/components/tab-panel/tab-panel.js"; -import "@shoelace-style/shoelace/dist/components/tab-group/tab-group.js"; -import "@shoelace-style/shoelace/dist/components/alert/alert.js"; import "./controls"; import "./registers";