@torpor/view 0.0.2 → 0.0.3

package/src/compile/types/nodes/ParentNode.ts

@@ -1,7 +1,7 @@
-import type NodeType from "./NodeType";
-import type TemplateNode from "./TemplateNode";
+import { type NodeType } from "./NodeType";
+import { type TemplateNode } from "./TemplateNode";
 
-export default interface ParentNode extends TemplateNode {
+export type ParentNode = TemplateNode & {
 	type: NodeType;
 	children: TemplateNode[];
-}
+};

package/src/compile/types/nodes/RootNode.ts

@@ -1,11 +1,11 @@
-import type Fragment from "./Fragment";
-import type ParentNode from "./ParentNode";
-import type TemplateNode from "./TemplateNode";
+import { type Fragment } from "./Fragment";
+import { type ParentNode } from "./ParentNode";
+import { type TemplateNode } from "./TemplateNode";
 
-export default interface RootNode extends ParentNode {
+export type RootNode = ParentNode & {
 	type: "root";
 	children: TemplateNode[];
 
 	// This gets set when building
 	fragment?: Fragment;
-}
+};

package/src/compile/types/nodes/TemplateNode.ts

@@ -1,6 +1,6 @@
-import type NodeType from "./NodeType";
+import { type NodeType } from "./NodeType";
 
-export default interface TemplateNode {
+export type TemplateNode = {
 	type: NodeType;
 
 	// This gets set when building
@@ -12,4 +12,4 @@ export default interface TemplateNode {
 	// Nodes with anchors need to be hydrated immediately (while we have the
 	// correct anchor node) rather than at the end of the fragment
 	handled?: boolean;
-}
+};

package/src/compile/types/nodes/TextNode.ts

@@ -1,7 +1,7 @@
-import type TemplateNode from "./TemplateNode";
+import { type TemplateNode } from "./TemplateNode";
 
-export default interface TextNode extends TemplateNode {
+export type TextNode = TemplateNode & {
 	type: "text";
 	content: string;
 	//reactive: boolean;
-}
+};

package/src/compile/types/nodes/isControlNode.ts

@@ -1,5 +1,5 @@
-import type ControlNode from "./ControlNode";
-import type TemplateNode from "./TemplateNode";
+import { type ControlNode } from "./ControlNode";
+import { type TemplateNode } from "./TemplateNode";
 
 export default function isControlNode(node: TemplateNode): node is ControlNode {
 	return node.type === "control";

package/src/compile/types/nodes/isElementNode.ts

@@ -1,5 +1,5 @@
-import type ElementNode from "./ElementNode";
-import type TemplateNode from "./TemplateNode";
+import { type ElementNode } from "./ElementNode";
+import { type TemplateNode } from "./TemplateNode";
 
 export default function isElementNode(node: TemplateNode): node is ElementNode {
 	return node.type === "element";

package/src/compile/types/nodes/isParentNode.ts

@@ -1,5 +1,5 @@
-import type ParentNode from "./ParentNode";
-import type TemplateNode from "./TemplateNode";
+import { type ParentNode } from "./ParentNode";
+import { type TemplateNode } from "./TemplateNode";
 
 export default function isParentNode(node: TemplateNode): node is ParentNode {
 	return "children" in node;

package/src/compile/types/nodes/isSpaceNode.ts

@@ -1,6 +1,6 @@
 import isSpace from "../../parse/utils/isSpace";
-import type TemplateNode from "./TemplateNode";
-import type TextNode from "./TextNode";
+import { type TemplateNode } from "./TemplateNode";
+import { type TextNode } from "./TextNode";
 import isTextNode from "./isTextNode";
 
 export default function isSpaceNode(node: TemplateNode): node is TextNode {

package/src/compile/types/nodes/isSpecialNode.ts

@@ -1,5 +1,5 @@
-import type ElementNode from "./ElementNode";
-import type TemplateNode from "./TemplateNode";
+import { type ElementNode } from "./ElementNode";
+import { type TemplateNode } from "./TemplateNode";
 
 export default function isSpecialNode(node: TemplateNode): node is ElementNode {
 	return node.type === "special";

package/src/compile/types/nodes/isTextNode.ts

@@ -1,5 +1,5 @@
-import type TemplateNode from "./TemplateNode";
-import type TextNode from "./TextNode";
+import { type TemplateNode } from "./TemplateNode";
+import { type TextNode } from "./TextNode";
 
 export default function isTextNode(node: TemplateNode): node is TextNode {
 	return node.type === "text";

package/src/compile/types/styles/Attribute.ts

@@ -1,4 +1,4 @@
-export default interface Attribute {
+export type Attribute = {
 	name: string;
 	value: string;
-}
+};

package/src/compile/types/styles/Style.ts

@@ -1,7 +1,7 @@
-import StyleBlock from "./StyleBlock";
+import { type StyleBlock } from "./StyleBlock";
 
-export default interface Style {
+export type Style = {
 	global: boolean;
 	blocks: StyleBlock[];
 	hash: string;
-}
+};

package/src/compile/types/styles/StyleBlock.ts

@@ -1,7 +1,7 @@
-import Attribute from "./Attribute";
+import { type Attribute } from "./Attribute";
 
-export default interface StyleBlock {
+export type StyleBlock = {
 	selector: string;
 	attributes: Attribute[];
 	children: StyleBlock[];
-}
+};

package/src/compile/utils/Builder.ts

@@ -27,7 +27,6 @@ export default class Builder {
 					this.#space -= 1;
 				}
 
-				let gotText = false;
 				// Add indentation
 				this.#text += "\t".repeat(Math.max(0, this.#space));
 				// Add from text until the next newline or the end of text

package/src/compile.ts

@@ -1,8 +1,8 @@
 import build from "./compile/build";
 import buildType from "./compile/buildType";
 import parse from "./compile/parse";
-import type Component from "./types/Component";
-import type Template from "./types/Template";
+import { type Component } from "./types/Component";
+import { type Template } from "./types/Template";
 
 // Parsing and building
 export { parse, build, buildType };

package/src/debug/printNode.ts

@@ -14,13 +14,13 @@ export default function printNode(node: Node | null | undefined) {
 		} else if (node.nodeType === 3) {
 			// Text
 			let txt = node as Text;
-			let p = `'${txt.textContent}'`;
+			let p = "txt";
 			if (node.parentNode) p += `[${Array.from(node.parentNode.childNodes).indexOf(txt)}]`;
 			paths.push(p);
 		} else if (node.nodeType === 8) {
 			// Comment
 			let com = node as Comment;
-			let p = `<!${com.data}>`;
+			let p = "cmt";
 			if (node.parentNode) p += `[${Array.from(node.parentNode.childNodes).indexOf(com)}]`;
 			paths.push(p);
 		} else if (node.nodeType === 9) {

package/src/index.ts

@@ -26,11 +26,11 @@ import t_run_branch from "./render/runControlBranch";
 import t_run_list from "./render/runList";
 import t_attribute from "./render/setAttribute";
 import t_dynamic from "./render/setDynamicElement";
-import type Component from "./types/Component";
-import type ListItem from "./types/ListItem";
-import type ServerComponent from "./types/ServerComponent";
-import type ServerSlotRender from "./types/ServerSlotRender";
-import type SlotRender from "./types/SlotRender";
+import { type Component } from "./types/Component";
+import { type ListItem } from "./types/ListItem";
+import { type ServerComponent } from "./types/ServerComponent";
+import { type ServerSlotRender } from "./types/ServerSlotRender";
+import { type SlotRender } from "./types/SlotRender";
 
 // Mount and hydrate
 export { mount, hydrate };

package/src/render/$mount.ts

@@ -1,4 +1,4 @@
-import type Cleanup from "../types/Cleanup";
+import { type Cleanup } from "../types/Cleanup";
 import context from "./context";
 
 /**

package/src/render/$run.ts

@@ -1,5 +1,5 @@
-import type Cleanup from "../types/Cleanup";
-import type Effect from "../types/Effect";
+import { type Cleanup } from "../types/Cleanup";
+import { type Effect } from "../types/Effect";
 import runEffect from "../watch/runEffect";
 import context from "./context";
 

package/src/render/$serverMount.ts

@@ -1,3 +1,3 @@
-import type Cleanup from "../types/Cleanup";
+import { type Cleanup } from "../types/Cleanup";
 
-export default function $serverMount(fn: () => Cleanup | void) {}
+export default function $serverMount(_: () => Cleanup | void) {}

package/src/render/$serverRun.ts

@@ -1,3 +1,3 @@
-import type Cleanup from "../types/Cleanup";
+import { type Cleanup } from "../types/Cleanup";
 
-export default function $serverRun(fn: () => Cleanup | void) {}
+export default function $serverRun(_: () => Cleanup | void) {}

package/src/render/$watch.ts

@@ -1,5 +1,5 @@
-import type ProxyData from "../types/ProxyData";
-import type WatchOptions from "../types/WatchOptions";
+import { type ProxyData } from "../types/ProxyData";
+import { type WatchOptions } from "../types/WatchOptions";
 import proxyGet from "../watch/proxyGet";
 import proxySet from "../watch/proxySet";
 import { proxyDataSymbol } from "../watch/symbols";

package/src/render/addAnimation.ts

@@ -1,4 +1,4 @@
-import type Animation from "../types/Animation";
+import { type Animation } from "../types/Animation";
 import context from "./context";
 
 export default function addAnimation(el: HTMLElement, entry?: Animation, exit?: Animation) {

package/src/render/addFragment.ts

@@ -1,5 +1,5 @@
 import animate from "../motion/animate";
-import $run from "../render/$run";
+import $run from "./$run";
 import context from "./context";
 
 export default function addFragment(

package/src/render/applyProps.ts

@@ -1,4 +1,4 @@
-import $run from "../render/$run";
+import $run from "./$run";
 
 export default function applyProps(
 	el: Element,

package/src/render/clearRange.ts

@@ -1,4 +1,4 @@
-import type Range from "../types/Range";
+import { type Range } from "../types/Range";
 import removeEffect from "../watch/removeEffect";
 import context from "./context";
 

package/src/render/context.ts

@@ -1,7 +1,7 @@
-import type Animation from "../types/Animation";
-import type Cleanup from "../types/Cleanup";
-import type Effect from "../types/Effect";
-import type Range from "../types/Range";
+import { type Animation } from "../types/Animation";
+import { type Cleanup } from "../types/Cleanup";
+import { type Effect } from "../types/Effect";
+import { type Range } from "../types/Range";
 
 /**
  * The global context for setting up effects and updating subscriptions.
@@ -43,7 +43,7 @@ interface Context {
 
 	/** The node that is actively being hydrated. */
 	hydrationNode: ChildNode | null;
-	//hn: Node | null;
+	//hn: ChildNode | null;
 }
 
 const context: Context = {

package/src/render/flushMountEffects.ts

@@ -1,4 +1,4 @@
-import $run from "../render/$run";
+import $run from "./$run";
 import context from "./context";
 
 export default function flushMountEffects() {

package/src/render/getFragment.ts

@@ -1,5 +1,3 @@
-import context from "./context";
-
 export default function getFragment(
 	document: Document,
 	array: DocumentFragment[],

package/src/render/hydrate.ts

@@ -1,5 +1,5 @@
-import type Component from "../types/Component";
-import type SlotRender from "../types/SlotRender";
+import { type Component } from "../types/Component";
+import { type SlotRender } from "../types/SlotRender";
 import context from "./context";
 
 /**

package/src/render/hydrateRoot.ts

@@ -1,5 +1,5 @@
-import type Component from "../types/Component";
-import type SlotRender from "../types/SlotRender";
+import { type Component } from "../types/Component";
+import { type SlotRender } from "../types/SlotRender";
 import context from "./context";
 
 /**

package/src/render/mount.ts

@@ -1,5 +1,5 @@
-import type Component from "../types/Component";
-import type SlotRender from "../types/SlotRender";
+import { type Component } from "../types/Component";
+import { type SlotRender } from "../types/SlotRender";
 
 /**
  * Mounts a component into a DOM node

package/src/render/moveRange.ts

@@ -1,4 +1,4 @@
-import type Range from "../types/Range";
+import { type Range } from "../types/Range";
 
 export default function moveRange(parent: Node, range: Range, before: ChildNode | null) {
 	const endNode = range.endNode || range.startNode;

package/src/render/newListItem.ts

@@ -1,4 +1,4 @@
-import type ListItem from "../types/ListItem";
+import { type ListItem } from "../types/ListItem";
 
 export default function newListItem(data: Record<PropertyKey, any>, key?: any): ListItem {
 	return {

package/src/render/newRange.ts

@@ -1,4 +1,4 @@
-import type Range from "../types/Range";
+import { type Range } from "../types/Range";
 
 export default function newRange(): Range {
 	return {

package/src/render/popRange.ts

@@ -1,4 +1,4 @@
-import type Range from "../types/Range";
+import { type Range } from "../types/Range";
 import context from "./context";
 
 export default function popRange(oldRange: Range | null) {

package/src/render/pushRange.ts

@@ -1,4 +1,4 @@
-import type Range from "../types/Range";
+import { type Range } from "../types/Range";
 import context from "./context";
 
 export default function pushRange(range: Range, toParent = false): Range | null {

package/src/render/runControl.ts

@@ -1,5 +1,5 @@
-import $run from "../render/$run";
-import type Range from "../types/Range";
+import { type Range } from "../types/Range";
+import $run from "./$run";
 import context from "./context";
 import popRange from "./popRange";
 import pushRange from "./pushRange";

package/src/render/runControlBranch.ts

@@ -1,4 +1,4 @@
-import type Range from "../types/Range";
+import { type Range } from "../types/Range";
 import clearRange from "./clearRange";
 import newRange from "./newRange";
 import popRange from "./popRange";

package/src/render/runList.ts

@@ -1,6 +1,6 @@
-import $run from "../render/$run";
-import type ListItem from "../types/ListItem";
-import type Range from "../types/Range";
+import { type ListItem } from "../types/ListItem";
+import { type Range } from "../types/Range";
+import $run from "./$run";
 import context from "./context";
 import popRange from "./popRange";
 import pushRange from "./pushRange";

package/src/render/runListItems.ts

@@ -1,6 +1,5 @@
 // Adapted from https://github.com/snabbdom/snabbdom
 // With changes from https://github.com/luwes/js-diff-benchmark
-
 /*
  * The MIT License (MIT)
  *
@@ -24,9 +23,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import $watch from "../render/$watch";
-import type ListItem from "../types/ListItem";
-import type Range from "../types/Range";
+import { type ListItem } from "../types/ListItem";
+import { type Range } from "../types/Range";
+import $watch from "./$watch";
 import clearRange from "./clearRange";
 import context from "./context";
 import moveRange from "./moveRange";

package/src/ssr.ts

@@ -6,7 +6,7 @@ import t_attr from "./render/formatAttributeText";
 import t_fmt from "./render/formatText";
 import t_class from "./render/getClasses";
 import t_style from "./render/getStyles";
-import type ServerSlotRender from "./types/ServerSlotRender";
+import { type ServerSlotRender } from "./types/ServerSlotRender";
 
 export { $watch, $unwrap, $run, $mount, t_fmt, t_attr, t_class, t_style };
 

package/src/types/Animation.ts

@@ -1,4 +1,4 @@
-export default interface Animation {
+export interface Animation {
 	keyframes: Keyframe[] | PropertyIndexedKeyframes;
 	options?: number | KeyframeAnimationOptions;
 }

package/src/types/BuildOptions.ts

@@ -1,4 +1,4 @@
-export default interface BuildOptions {
+export type BuildOptions = {
 	/**
 	 * Whether to create the component for server side rendering
 	 */
@@ -14,4 +14,4 @@ export default interface BuildOptions {
 	 * For internal testing and benchmarking
 	 */
 	renderFolder?: string;
-}
+};

package/src/types/Cleanup.ts

@@ -2,6 +2,4 @@
  * A function that may be returned from an effect, and is run before the effect
  * is run or destroyed
  */
-type Cleanup = () => void;
-
-export default Cleanup;
+export type Cleanup = () => void;

package/src/types/Component.ts

@@ -1,14 +1,12 @@
-import type SlotRender from "./SlotRender";
+import { type SlotRender } from "./SlotRender";
 
 /**
  * A component that can be mounted or hydrated
  */
-type Component = (
+export type Component = (
 	$parent: ParentNode,
 	$anchor: Node | null,
 	$props?: Record<PropertyKey, any>,
 	$context?: Record<PropertyKey, any>,
 	$slots?: Record<string, SlotRender>,
 ) => void;
-
-export default Component;

package/src/types/Effect.ts

@@ -1,10 +1,10 @@
-import type Cleanup from "./Cleanup";
-import type ProxyPropData from "./ProxyPropData";
+import { type Cleanup } from "./Cleanup";
+import { type ProxyPropData } from "./ProxyPropData";
 
 /**
  * An effect that is run and re-run when the properties it depends on change.
  */
-export default interface Effect {
+export type Effect = {
 	run: () => Cleanup | void;
 	cleanup: Cleanup | null;
 
@@ -15,4 +15,4 @@ export default interface Effect {
 	props: ProxyPropData[] | null;
 
 	active: boolean;
-}
+};

package/src/types/ListItem.ts

@@ -1,6 +1,6 @@
-import type Range from "./Range";
+import { type Range } from "./Range";
 
-export default interface ListItem extends Range {
+export type ListItem = Range & {
 	data: Record<string, any>;
 	key: any;
-}
+};

package/src/types/ProxyData.ts

@@ -1,8 +1,8 @@
-import type ProxyPropData from "./ProxyPropData";
+import { type ProxyPropData } from "./ProxyPropData";
 
-export default interface ProxyData {
+export type ProxyData = {
 	target: Record<PropertyKey, any>;
 	isArray: boolean;
 	shallow: boolean;
 	propData: Map<PropertyKey, ProxyPropData | null>;
-}
+};

package/src/types/ProxyPropData.ts

@@ -1,11 +1,11 @@
-import type Effect from "./Effect";
+import { type Effect } from "./Effect";
 
 /**
  * State data for a property in a proxy.
  */
-export default interface ProxyPropState {
+export type ProxyPropData = {
 	/**
 	 * The effects that are triggered when this property is changed.
 	 */
 	effects: Effect[] | null;
-}
+};

package/src/types/Range.ts

@@ -1,6 +1,6 @@
-import type Effect from "./Effect";
+import { type Effect } from "./Effect";
 
-export default interface Range {
+export type Range = {
 	startNode: ChildNode | null;
 	endNode: ChildNode | null;
 
@@ -22,4 +22,4 @@ export default interface Range {
 	 * awaited or canceled before it is removed
 	 */
 	animations: Set<Animation> | null;
-}
+};

package/src/types/ServerComponent.ts

@@ -1,12 +1,10 @@
-import type ServerSlotRender from "./ServerSlotRender";
+import { type ServerSlotRender } from "./ServerSlotRender";
 
 /**
  * A component that generates HTML
  */
-type ServerComponent = (
+export type ServerComponent = (
 	$props?: Record<string, any>,
 	$context?: Record<string, any>,
 	$slots?: Record<string, ServerSlotRender>,
 ) => string;
-
-export default ServerComponent;

package/src/types/ServerSlotRender.ts

@@ -1,3 +1,4 @@
-type ServerSlotRender = ($props?: Record<string, any>, $context?: Record<string, any>) => void;
-
-export default ServerSlotRender;
+export type ServerSlotRender = (
+	$props?: Record<PropertyKey, any>,
+	$context?: Record<PropertyKey, any>,
+) => void;

package/src/types/SlotRender.ts

@@ -1,8 +1,6 @@
-type SlotRender = (
+export type SlotRender = (
 	parent: ParentNode,
 	anchor: Node | null,
-	$props?: Record<string, any>,
-	$context?: Record<string, any>,
+	$props?: Record<PropertyKey, any>,
+	$context?: Record<PropertyKey, any>,
 ) => void;
-
-export default SlotRender;

package/src/types/Template.ts

@@ -1,11 +1,11 @@
-import type Import from "../compile/types/Import";
-import TemplateComponent from "./TemplateComponent";
+import { type Import } from "../compile/types/Import";
+import { type TemplateComponent } from "./TemplateComponent";
 
 /**
  * The template for a component file, consisting of parts like script, markup and styles
  */
-export default interface Template {
+export type Template = {
 	imports: Import[];
 	script: string;
 	components: TemplateComponent[];
-}
+};