Skip to content

Commit

Permalink
chore: normalize import paths
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesdabbs committed Oct 26, 2023
1 parent 72b320e commit 3026dd7
Show file tree
Hide file tree
Showing 52 changed files with 114 additions and 161 deletions.
2 changes: 1 addition & 1 deletion packages/viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@types/unist": "^2.0.9",
"cypress": "^12.17.4",
"svelte": "^3.59.2",
"svelte-check": "^1.6.0",
"svelte-check": "^3.5.2",
"svelte-preprocess": "^5.0.4",
"tslib": "^2.6.2"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Dev/Explore.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import context from '../../context'
import context from '@/context'
import Log from './Log.svelte'
const { spaces, properties, theorems, traits } = context()
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Dev/Log.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import context from '../../context'
import context from '@/context'
const { spaces, properties, theorems, traits } = context()
Expand Down
6 changes: 3 additions & 3 deletions packages/viewer/src/components/Dev/Remote.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { build } from '../../constants'
import context from '../../context'
import { state } from '../../stores/sync'
import { build } from '@/constants'
import context from '@/context'
import { state } from '@/stores/sync'
import Sync from './Sync.svelte'
Expand Down
11 changes: 5 additions & 6 deletions packages/viewer/src/components/Dev/Sync.svelte
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<script lang="ts">
import context from '../../context'
import context from '@/context'
import Age from '../Shared/Age.svelte'
import { Repeat } from '../Shared/Icons'
import { Age, Icons } from '../Shared'
const { sync } = context()
Expand All @@ -11,16 +10,16 @@

{#if state.kind === 'fetching'}
<button type="button" class="btn" disabled>
<Repeat rotate={true} />
<Icons.Repeat rotate={true} />
</button>
{:else if state.kind === 'fetched'}
<button type="button" class="btn" on:click={sync.sync}>
<Repeat />
<Icons.Repeat />
</button>
<Age date={state.at} />
{:else if state.kind === 'error'}
<button type="button" class="btn" on:click={sync.sync}>
<Repeat />
<Icons.Repeat />
</button>
Error
<code>{state.error}</code>
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Properties/List.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { derived, type Readable } from 'svelte/store'
import { list } from '../../stores'
import { list } from '@/stores'
import { Filter, Link, Title, Typeset } from '../Shared'
import type { Collection, Property } from 'src/models'
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Properties/Spaces.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import { Related } from '../Traits'
import type { Property, Space, Trait, Traits } from '../../models'
import type { Property, Space, Trait, Traits } from '@/models'
export let property: Property
Expand Down
4 changes: 2 additions & 2 deletions packages/viewer/src/components/Properties/Theorems.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { Table as Theorems } from '../Theorems'
import type { Property } from '../../models'
import context from '../../context'
import type { Property } from '@/models'
import context from '@/context'
export let property: Property
Expand Down
5 changes: 4 additions & 1 deletion packages/viewer/src/components/Search/Examples.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
{#each examples as { label, search } (label)}
<article>
<h5>{label}</h5>
<pre class="example" on:click={() => select(search)}>{search}</pre>
<pre
class="example"
on:click={() => select(search)}
on:keydown={() => select(search)}>{search}</pre>
</article>
{/each}
6 changes: 3 additions & 3 deletions packages/viewer/src/components/Search/Results.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import context from '../../context'
import { search } from '../../stores'
import type { Formula, Property, Space } from '../../models'
import context from '@/context'
import { search } from '@/stores'
import type { Formula, Property, Space } from '@/models'
import Found from './Results/Found.svelte'
import NotFound from './Results/NotFound.svelte'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { Formula } from '../../Shared'
import { Table as Theorems } from '../../Theorems'
import type { Formula as F, Property, Theorem } from '../../../models'
import { Formula } from '@/components/Shared'
import { Table as Theorems } from '@/components/Theorems'
import type { Formula as F, Property, Theorem } from '@/models'
export let formula: F<Property>
export let proof: Theorem[] | 'tautology'
Expand Down
6 changes: 3 additions & 3 deletions packages/viewer/src/components/Search/Results/Found.svelte
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script lang="ts">
import { formula as F } from '@pi-base/core'
import { Formula } from '../../Shared'
import { Table } from '../../Traits'
import type { Property, Space } from '../../../models'
import { Formula } from '@/components/Shared'
import { Table } from '@/components/Traits'
import type { Property, Space } from '@/models'
export let text: string | undefined
export let formula: F.Formula<Property> | undefined
Expand Down
8 changes: 4 additions & 4 deletions packages/viewer/src/components/Search/Results/NotFound.svelte
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script lang="ts">
import context from '../../../context'
import { Formula } from '../../Shared'
import type { Formula as F, Property } from '../../../models'
import { disprove } from '../../../stores/deduction'
import context from '@/context'
import { Formula } from '@/components/Shared'
import type { Formula as F, Property } from '@/models'
import { disprove } from '@/stores/deduction'
import Disprovable from './Disprovable.svelte'
export let text: string | undefined
Expand Down
4 changes: 2 additions & 2 deletions packages/viewer/src/components/Search/Search.svelte
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script lang="ts">
import { writable } from 'svelte/store'
import type { Formula, Property } from '../../models'
import urlSearchParam from '../../stores/urlSearchParam'
import type { Formula, Property } from '@/models'
import urlSearchParam from '@/stores/urlSearchParam'
import Examples from './Examples.svelte'
import FormulaInput from '../Shared/Formula/Input'
import Results from './Results.svelte'
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Shared/Formula.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import type { Formula, Property } from '../../models'
import type { Formula, Property } from '@/models'
import Atom from './Formula/Atom.svelte'
import Compound from './Formula/Compound.svelte'
Expand Down
5 changes: 2 additions & 3 deletions packages/viewer/src/components/Shared/Formula/Atom.svelte
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<script lang="ts">
import type { Atom } from '@pi-base/core'
import Link from '../Link'
import Typeset from '../Typeset.svelte'
import type { Property } from '../../../models'
import { Link, Typeset } from '@/components/Shared'
import type { Property } from '@/models'
export let value: Atom<Property>
export let link: boolean = true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import type { And, Or } from '@pi-base/core'
import type { Property } from '../../../models'
import type { Property } from '@/models'
import Formula from '../Formula.svelte'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script lang="ts">
import type { Writable } from 'svelte/store'
import context from '../../../../context'
import type { Formula, Property } from '../../../../models'
import context from '@/context'
import type { Formula, Property } from '@/models'
import { create } from './store'
import Suggestions from './Suggestions.svelte'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import type { Property } from '../../../../models'
import Typeset from '../../Typeset.svelte'
import type { Property } from '@/models'
import { Typeset } from '@/components/Shared'
export let suggestions: Property[]
export let selected: number | undefined
Expand All @@ -13,7 +13,9 @@
<li
class="list-group-item {i === selected ? 'active' : ''}"
on:mouseover={() => onHover(i)}
on:focus={() => onHover(i)}
on:click={() => onClick(i)}
on:keydown={() => onClick(i)}
>
<Typeset body={property.name} />
</li>
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Shared/Id.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { Id } from '../../models'
import { Id } from '@/models'
export let uid: string
export let trim = true
Expand Down
4 changes: 2 additions & 2 deletions packages/viewer/src/components/Shared/Link/Property.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import Typeset from '../Typeset.svelte'
import { Id } from '../../../models'
import { Typeset } from '@/components/Shared'
import { Id } from '@/models'
export let property: { id: number; name: string }
</script>
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Shared/Link/Space.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import Typeset from '../Typeset.svelte'
import { Id } from '../../../models'
import { Id } from '@/models'
export let space: { id: number; name: string }
</script>
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Shared/Link/Theorem.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import { Id } from '../../../models'
import { Id } from '@/models'
export let theorem: { id: number }
</script>
Expand Down
3 changes: 1 addition & 2 deletions packages/viewer/src/components/Shared/Link/Trait.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script lang="ts">
import type { Property, Space } from '../../../models'
import { Id } from '../../../models'
import { type Property, type Space, Id } from '@/models'
export let property: Property
export let space: Space
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Shared/NotFound.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import { onMount } from 'svelte'
import context from '../../context'
import context from '@/context'
const { errorHandler } = context()
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Shared/Reference.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import { Ref } from '@pi-base/core'
import { format } from '../../parser/externalLinks'
import { format } from '@/parser/externalLinks'
export let reference: Ref.Ref
Expand Down
5 changes: 1 addition & 4 deletions packages/viewer/src/components/Shared/Tabs.svelte
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<script lang="ts">
<script lang="ts" generics="Tab extends string">
import { capitalize } from '@/util'
type T = $$Generic
type Tab = T & string
export let tabs: readonly Tab[]
export let tab: Tab
export let rel: string | undefined = undefined
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Shared/Typeset.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { onMount } from 'svelte'
import { goto } from '$app/navigation'
import context from '../../context'
import context from '@/context'
export let body: string
export let truncated = false
Expand Down
4 changes: 2 additions & 2 deletions packages/viewer/src/components/Spaces/Counterexamples.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import context from '../../context'
import type { Space } from '../../models'
import context from '@/context'
import type { Space } from '@/models'
import { Typeset } from '../Shared'
import { Table } from '../Theorems'
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Spaces/List.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { derived, type Readable } from 'svelte/store'
import { list } from '../../stores'
import { list } from '@/stores'
import { Filter, Link, Title, Typeset } from '../Shared'
import type { Collection, Space } from 'src/models'
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Spaces/Properties.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import { Related } from '../Traits'
import type { Property, Space, Trait, Traits } from '../../models'
import type { Property, Space, Trait, Traits } from '@/models'
export let space: Space
Expand Down
4 changes: 2 additions & 2 deletions packages/viewer/src/components/Theorems/Converse.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import context from '../../context'
import type { Space, Theorem } from '../../models'
import context from '@/context'
import type { Space, Theorem } from '@/models'
import { Table as Traits } from '../Traits'
import Name from './Name.svelte'
import Theorems from './Table.svelte'
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Theorems/List.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import { derived, type Readable } from 'svelte/store'
import { list } from '../../stores'
import { list } from '@/stores'
import { Filter, Formula, Link, Title, Typeset } from '../Shared'
import type { Theorems } from 'src/models'
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Theorems/Name.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import type Theorem from '../../models/Theorem'
import type Theorem from '@/models/Theorem'
import { Formula } from '../Shared'
export let theorem: Theorem
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Theorems/Table.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import type { Theorem } from '../../models'
import type { Theorem } from '@/models'
import { Formula, Link } from '../Shared'
export let theorems: Theorem[] = []
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Traits/Proof.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { Link } from '../Shared'
import { Table as Theorems } from '../Theorems'
import Value from './Value.svelte'
import type { Property, Space, Theorem, Trait } from '../../models'
import type { Property, Space, Theorem, Trait } from '@/models'
export let space: Space
export let theorems: Theorem[]
Expand Down
7 changes: 3 additions & 4 deletions packages/viewer/src/components/Traits/Related.svelte
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<script lang="ts">
import Fuse from 'fuse.js'
import { Icons, Link } from '../Shared'
import { Icons, Link, Typeset } from '../Shared'
import { Value } from '../Traits'
import context from '../../context'
import type { Property, Space, Trait, Traits } from '../../models'
import Typeset from '../Shared/Typeset.svelte'
import context from '@/context'
import type { Property, Space, Trait, Traits } from '@/models'
export let mode: 'spaces' | 'properties'
export let related: (traits: Traits) => [Space, Property, Trait][]
Expand Down
2 changes: 1 addition & 1 deletion packages/viewer/src/components/Traits/Show.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Title,
Typeset,
} from '../Shared'
import context from '../../context'
import context from '@/context'
import Proof from './Proof.svelte'
import { Robot } from '../Shared/Icons'
Expand Down
4 changes: 2 additions & 2 deletions packages/viewer/src/components/Traits/Table.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import context from '../../context'
import type { Property, Space } from '../../models'
import context from '@/context'
import type { Property, Space } from '@/models'
import { Link } from '../Shared'
import Value from './Value.svelte'
Expand Down
Loading

0 comments on commit 3026dd7

Please sign in to comment.