@e280/quay 0.0.0-7 → 0.0.0-9

package/s/logic/aspects/dropzone.ts

@@ -1,11 +1,12 @@
-import {ShockDragDrop, signal} from "@benev/slate"
+import {loot} from "@e280/sly/loot"
+import {signal} from "@e280/strata"
 
 import {Group} from "../group.js"
 import {CodexItem} from "./codex/parts/codex-item.js"
 
 export class Dropzone {
-	#drag_drop = new ShockDragDrop<CodexItem, CodexItem>({
-		handle_drop: (_e, grabbed, hovering) => this.group.move(grabbed, hovering)
+	#drag_drop = new loot.DragAndDrops<CodexItem, CodexItem>({
+		acceptDrop: (_e, grabbed, hovering) => this.group.move(grabbed, hovering)
 	})
 
 	constructor(private group: Group) {}
@@ -14,37 +15,40 @@ export class Dropzone {
 	#hovering = signal<CodexItem | undefined>(undefined)
 
 	get grabbed() {
-		return this.#drag_drop.grabbed
+		return this.#drag_drop.dragging
 	}
 
 	get hovering() {
-		return this.#drag_drop.hovering ?? this.#hovering.value
+		return this.#drag_drop.hovering ?? this.#hovering()
 	}
 
-	dragenter = (e: DragEvent, target?: CodexItem) => {
+	dragenter = (e: DragEvent, target: CodexItem) => {
 		e.preventDefault()
-		this.#drag_drop.dropzone.dragenter()(e)
-		this.#hovering.value = target
+		this.#drag_drop.dropzone(() => target).dragenter(e)
+		this.#hovering(target)
 	}
 
 	dragleave = (e: DragEvent) => {
-		this.#drag_drop.dropzone.dragleave()(e)
-		this.#hovering.value = undefined
+		const hovering = this.hovering
+		if (hovering)
+			this.#drag_drop.dropzone(() => hovering).dragleave(e)
+		this.#hovering(undefined)
 	}
 
 	dragstart = (e: DragEvent, n: CodexItem) => {
 		e.stopPropagation()
-		this.#drag_drop.dragzone.dragstart(n)(e)
+		this.#drag_drop.dragzone(() => n).dragstart(e)
 	}
 
 	dragover = (e: DragEvent, n: CodexItem) => {
 		e.preventDefault()
-		this.#drag_drop.dropzone.dragover(n)(e)
+		this.#drag_drop.dropzone(() => n).dragover(e)
 	}
 
 	dragend = (e: DragEvent) => {
-		this.#drag_drop.dragzone.dragend()(e)
-		this.#hovering.value = undefined
+		this.#drag_drop.$draggy(undefined)
+		this.#drag_drop.$droppy(undefined)
+		this.#hovering(undefined)
 	}
 
 	drop = (e: DragEvent, target: CodexItem) => {
@@ -60,9 +64,9 @@ export class Dropzone {
 		const parent = this.grabbed?.parent?.id === this.hovering?.id
 
 		if(!same && !child && !parent)
-			this.#drag_drop.dropzone.drop(target)(e)
+			this.#drag_drop.dropzone(() => target).drop(e)
 
-		this.#hovering.value = undefined
+		this.#hovering(undefined)
 	}
 
 	change = (e: DragEvent, targetFolder: CodexItem) => {

package/s/logic/aspects/tree-trail.ts

@@ -1,4 +1,5 @@
-import {signal} from "@benev/slate"
+
+import {signal} from "@e280/strata"
 import {Schema} from "./codex/parts/types.js"
 import {CodexItem} from "./codex/parts/codex-item.js"
 
@@ -6,7 +7,7 @@ export class TreeTrail<Sc extends Schema> {
 	readonly signal = signal<CodexItem<Sc>[]>([])
 
 	constructor(root: CodexItem<Sc>) {
-		this.signal.value = [root]
+		this.signal([root])
 	}
 
 	setTrail(e: Event, item: CodexItem<Sc>) {
@@ -23,11 +24,11 @@ export class TreeTrail<Sc extends Schema> {
 			cur = cur.parent
 		}
 
-		this.signal.value = trail
+		this.signal(trail)
 	}
 
 	get currentFolder() {
-		return this.signal.value.at(-1)?.children ?? []
+		return this.signal().at(-1)?.children ?? []
 	}
 }
 

package/s/logic/brain.ts

@@ -2,6 +2,8 @@
 import {MapG} from "@e280/stz"
 import {Group} from "./group.js"
 
+type RegisteredGroup<G> = G extends Group<infer _Schema> ? G : never
+
 /**
  * Quay's global state
  *  - manages groups
@@ -10,13 +12,13 @@ import {Group} from "./group.js"
 export class Brain {
 	#groups = new MapG<string, Group>()
 
-	setGroup<G extends Group>(name: string, group: G) {
+	setGroup<G>(name: string, group: RegisteredGroup<G>) {
 		this.#groups.set(name, group)
 		return group
 	}
 
-	getGroup<G extends Group>(name: string) {
-		return this.#groups.require(name) as G
+	getGroup<G = Group>(name: string) {
+		return this.#groups.require(name) as RegisteredGroup<G>
 	}
 }
 

package/s/logic/group.ts

@@ -1,5 +1,5 @@
 import {sub} from "@e280/stz"
-import {signal} from "@benev/slate"
+import {signal} from "@e280/strata"
 
 import {Permission} from "./permissions.js"
 import {Dropzone} from "./aspects/dropzone.js"
@@ -26,13 +26,13 @@ export class Group<Sc extends Schema = any> {
 	}
 
 	constructor(public config: GroupConfig<Sc>) {
-		this.selectedFilter.value = config.defaultFilter
-		this.selectedSort.value = config.defaultSort
+		this.selectedFilter(config.defaultFilter)
+		this.selectedSort(config.defaultSort)
 		this.trail = new TreeTrail(config.root)
 	}
 
 	get permissions() {
-		return this.config.permissions as (item: CodexItem) => Permission
+		return this.config.permissions as (item: CodexItem<Sc>) => Permission
 	}
 
 	getFilterFn(filterKey: string): SearchFn<Sc> {
@@ -49,13 +49,13 @@ export class Group<Sc extends Schema = any> {
 	}
 
 	sort(items: CodexItem<Sc>[]): CodexItem<Sc>[] {
-		const sortFn = this.getSortFn(this.selectedSort.value)
+		const sortFn = this.getSortFn(this.selectedSort())
 		return [...items].sort(sortFn)
 	}
 
 	matches(item: CodexItem<Sc>) {
-		const filterFn = this.getFilterFn(this.selectedFilter.value)
-		const searchFn = this.getSearchFn(this.searchText.value)
+		const filterFn = this.getFilterFn(this.selectedFilter())
+		const searchFn = this.getSearchFn(this.searchText())
 		return filterFn(item) && searchFn(item)
 	}
 

package/s/logic/presets/media/group.ts

@@ -1,15 +1,16 @@
 
+import {html} from "lit"
 import {MapG} from "@e280/stz"
-import {Content, html} from "@benev/slate"
+import {Content} from "@e280/sly"
 
-import Quay from "../../../index.js"
 import {Group} from "../../group.js"
+import {Permissions} from "../../permissions.js"
 import {Codex} from "../../aspects/codex/codex.js"
 import {MediaFormat, MediaSchema} from "./schema.js"
 import {GroupConfig, SearchFn, SortFn} from "../../types.js"
 import {CodexItem} from "../../aspects/codex/parts/codex-item.js"
 
-export class MediaGroup extends Group<MediaSchema> implements Group {
+export class MediaGroup extends Group<MediaSchema> {
 	static config = (): GroupConfig<MediaSchema> => {
 		const formatIcons = new MapG<MediaFormat, Content>()
 			.set("audio", html`<sl-icon name=music-note-beamed></sl-icon>`)
@@ -83,7 +84,7 @@ export class MediaGroup extends Group<MediaSchema> implements Group {
 					// // TODO icons
 					// : html`<sl-icon name=${item.taxon.icon}></sl-icon>`
 			},
-			permissions: item => Quay.permissions.all,
+			permissions: item => Permissions.all,
 		}
 	}
 

package/s/logic/presets/media/schema.ts

@@ -1,5 +1,5 @@
 
-import {Content} from "@benev/slate"
+import {Content} from "@e280/sly"
 import {AsSchema} from "../../aspects/codex/parts/types.js"
 
 export type MediaFormat = "video" | "image" | "audio" | "other"

package/s/logic/presets/opfs/schema.ts

@@ -1,5 +1,5 @@
 
-import {Content} from "@benev/slate"
+import {Content} from "@e280/sly"
 import {AsSchema} from "../../aspects/codex/parts/types.js"
 
 export type OpfsSchema = AsSchema<{

package/s/logic/presets/plain/group.ts

@@ -1,7 +1,7 @@
 
-import Quay from "../../../index.js"
 import {Group} from "../../group.js"
 import {PlainSchema} from "./schema.js"
+import {Permissions} from "../../permissions.js"
 import {GroupConfig, SortFn} from "../../types.js"
 import {Codex} from "../../aspects/codex/codex.js"
 
@@ -33,7 +33,7 @@ export class PlainGroup extends Group<PlainSchema> {
 			renderLabel: item => item.id,
 			renderIcon: item => item.taxon.icon,
 			renderPreview: () => null,
-			permissions: item => Quay.permissions.all,
+			permissions: item => Permissions.all,
 		}
 	}
 

package/s/logic/presets/plain/schema.ts

@@ -1,5 +1,5 @@
 
-import {Content} from "@benev/slate"
+import {Content} from "@e280/sly"
 import {AsSchema} from "../../aspects/codex/parts/types.js"
 
 export type PlainSchema = AsSchema<{

package/s/logic/types.ts

@@ -1,9 +1,9 @@
 
+import {Content} from "@e280/sly"
 import {Permission} from "./permissions.js"
 import {Codex} from "./aspects/codex/codex.js"
 import {Schema} from "./aspects/codex/parts/types.js"
 import {CodexItem} from "./aspects/codex/parts/codex-item.js"
-import { Content } from "@benev/slate"
 
 export type SearchFn<Sc extends Schema> = (item: CodexItem<Sc>) => boolean
 export type SortFn<Sc extends Schema> = (a: CodexItem<Sc>, b: CodexItem<Sc>) => number

package/s/tests.test.ts

@@ -1,5 +1,4 @@
 
-import "@benev/slate/x/node.js"
 import {Science} from "@e280/science"
 import cellar from "./cellar/cellar.test.js"
 import media from "./logic/presets/media/store.test.js"

package/x/demo/main.bundle.js

@@ -1,4 +1,4 @@
-import { register } from "@benev/slate";
+import { dom } from "@e280/sly";
 import { brain } from "../dom/context.js";
 import { MediaGroup } from "../logic/presets/media/group.js";
 import { components, setShoelaceDarkTheme } from "../dom/components.js";
@@ -26,5 +26,5 @@ group.on.upload.sub(({ files, target }) => {
     }
 });
 setShoelaceDarkTheme();
-register(components);
+dom.register(components);
 //# sourceMappingURL=main.bundle.js.map

package/x/demo/main.bundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.bundle.js","sourceRoot":"","sources":["../../s/demo/main.bundle.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,MAAM,cAAc,CAAA;AACrC,OAAO,EAAC,KAAK,EAAC,MAAM,mBAAmB,CAAA;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAA;AAE1D,OAAO,EAAC,UAAU,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAA;AAErE,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,UAAU,EAAE,CAAC,CAAA;AACzD,MAAM,EAAC,KAAK,EAAE,IAAI,EAAC,GAAG,KAAK,CAAC,MAAM,CAAA;AAElC,MAAM,UAAU,GAAG,sBAAsB,CAAA;AACzC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,qBAAqB,EAAE,UAAU,EAAC,CAAC,CAAA;AAClG,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAC,CAAC,CAAA;AACxF,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAC,CAAC,CAAA;AAE7F,aAAa;AACb,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAC,KAAK,EAAE,SAAS,EAAC,CAAC,CAAA;AAC1D,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAC,CAAC,CAAA;AACtF,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAC,CAAC,CAAA;AAExF,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;KACd,MAAM,CAAC,QAAQ,CAAC;KAChB,MAAM,CAAC,QAAQ,CAAC;KAChB,MAAM,CAAC,OAAO,CAAC;KACf,MAAM,CAAC,OAAO,CAAC,CAAA;AAEjB,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;AAExC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC,EAAE,EAAE;IACvC,KAAI,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAgB,CAAA;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAC,CAAC,CAAA;QACzE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACpB,CAAC;AACF,CAAC,CAAC,CAAA;AAEF,oBAAoB,EAAE,CAAA;AACtB,QAAQ,CAAC,UAAU,CAAC,CAAA"}
+{"version":3,"file":"main.bundle.js","sourceRoot":"","sources":["../../s/demo/main.bundle.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,WAAW,CAAA;AAC7B,OAAO,EAAC,KAAK,EAAC,MAAM,mBAAmB,CAAA;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAA;AAE1D,OAAO,EAAC,UAAU,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAA;AAErE,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,UAAU,EAAE,CAAC,CAAA;AACzD,MAAM,EAAC,KAAK,EAAE,IAAI,EAAC,GAAG,KAAK,CAAC,MAAM,CAAA;AAElC,MAAM,UAAU,GAAG,sBAAsB,CAAA;AACzC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,qBAAqB,EAAE,UAAU,EAAC,CAAC,CAAA;AAClG,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAC,CAAC,CAAA;AACxF,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAC,CAAC,CAAA;AAE7F,aAAa;AACb,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAC,KAAK,EAAE,SAAS,EAAC,CAAC,CAAA;AAC1D,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAC,CAAC,CAAA;AACtF,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAC,CAAC,CAAA;AAExF,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;KACd,MAAM,CAAC,QAAQ,CAAC;KAChB,MAAM,CAAC,QAAQ,CAAC;KAChB,MAAM,CAAC,OAAO,CAAC;KACf,MAAM,CAAC,OAAO,CAAC,CAAA;AAEjB,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;AAExC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAC,KAAK,EAAE,MAAM,EAAC,EAAE,EAAE;IACvC,KAAI,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAgB,CAAA;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAC,CAAC,CAAA;QACzE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACpB,CAAC;AACF,CAAC,CAAC,CAAA;AAEF,oBAAoB,EAAE,CAAA;AACtB,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA"}