@esportsplus/template 0.32.0 → 0.32.2

package/package.json

@@ -2,12 +2,12 @@
   "author": "ICJR",
   "dependencies": {
     "@esportsplus/queue": "^0.2.0",
-    "@esportsplus/reactivity": "^0.25.2",
+    "@esportsplus/reactivity": "^0.25.12",
     "@esportsplus/utilities": "^0.27.2",
     "serve": "^14.2.5"
   },
   "devDependencies": {
-    "@esportsplus/typescript": "^0.17.3",
+    "@esportsplus/typescript": "^0.18.0",
     "@types/node": "^25.0.3",
     "vite": "^7.3.0",
     "vite-tsconfig-paths": "^6.0.3"
@@ -22,13 +22,13 @@
       "types": "./build/constants.d.ts"
     },
     "./plugins/tsc": {
+      "types": "./build/transformer/plugins/tsc.d.ts",
       "import": "./build/transformer/plugins/tsc.js",
-      "require": "./build/transformer/plugins/tsc.js",
-      "types": "./build/transformer/plugins/tsc.d.ts"
+      "require": "./build/transformer/plugins/tsc.js"
     },
     "./plugins/vite": {
-      "import": "./build/transformer/plugins/vite.js",
-      "types": "./build/transformer/plugins/vite.d.ts"
+      "types": "./build/transformer/plugins/vite.d.ts",
+      "import": "./build/transformer/plugins/vite.js"
     }
   },
   "main": "./build/index.js",
@@ -40,7 +40,7 @@
   },
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.32.0",
+  "version": "0.32.2",
   "scripts": {
     "build": "tsc",
     "build:test": "vite build --config test/vite.config.ts",

package/src/attributes.ts

@@ -1,15 +1,12 @@
 import { effect } from '@esportsplus/reactivity';
 import { isArray, isObject } from '@esportsplus/utilities';
-import { DIRECT_ATTACH_EVENTS, LIFECYCLE_EVENTS, STATE_HYDRATING, STATE_NONE, STATE_WAITING } from './constants';
+import { DIRECT_ATTACH_EVENTS, LIFECYCLE_EVENTS, STATE_HYDRATING, STATE_NONE, STATE_WAITING, STORE } from './constants';
 import { Attributes, Element } from './types';
 import { raf } from './utilities';
 import q from '@esportsplus/queue';
 import event from './event';
 
 
-const STORE = Symbol();
-
-
 type Context = {
     effect?: 0,
     element: Element;

package/src/constants.ts

@@ -1,11 +1,45 @@
-import { fragment } from './utilities';
+import { uid } from '@esportsplus/typescript/transformer';
 
 
 const ARRAY_SLOT = Symbol('template.array.slot');
 
 const CLEANUP = Symbol('template.cleanup');
 
-const EMPTY_FRAGMENT = fragment('');
+
+const COMPILER_ENTRYPOINT = 'html';
+
+const COMPILER_ENTRYPOINT_REACTIVITY = 'reactive';
+
+const COMPILER_NAMESPACE = uid('template');
+
+const enum COMPILER_TYPES {
+    ArraySlot,
+    AttributeSlot,
+    AttributeSpreadSlot,
+    DocumentFragment,
+    Effect,
+    NodeSlot,
+    Primitive,
+    Static,
+    Unknown
+};
+
+const DIRECT_ATTACH_EVENTS = new Set<string>([
+    'onblur',
+    'onerror',
+    'onfocus', 'onfocusin', 'onfocusout',
+    'onload',
+    'onplay', 'onpause', 'onended', 'ontimeupdate',
+    'onreset',
+    'onscroll', 'onsubmit'
+]);
+
+const LIFECYCLE_EVENTS = new Set<string>([
+    'onconnect', 'ondisconnect', 'onrender', 'onresize', 'ontick'
+]);
+
+const PACKAGE = '@esportsplus/template';
+
 
 const SLOT_HTML = '<!--$-->';
 
@@ -21,7 +55,9 @@ const STORE = Symbol('template.store');
 export {
     ARRAY_SLOT,
     CLEANUP,
-    EMPTY_FRAGMENT,
-    SLOT_HTML, STATE_HYDRATING, STATE_NONE, STATE_WAITING, STORE
-};
-export * from './event/constants';
+    COMPILER_ENTRYPOINT, COMPILER_ENTRYPOINT_REACTIVITY, COMPILER_NAMESPACE, COMPILER_TYPES,
+    DIRECT_ATTACH_EVENTS,
+    LIFECYCLE_EVENTS,
+    PACKAGE,
+    SLOT_HTML, STATE_HYDRATING, STATE_NONE, STATE_WAITING, STORE,
+};

package/src/html.ts

@@ -1,16 +1,16 @@
-import { ReactiveArray } from '@esportsplus/reactivity';
+import { Reactive } from '@esportsplus/reactivity';
 import { Attribute, Attributes, Renderable } from '~/types';
 import { ArraySlot } from '~/slot/array';
 
 
-type Values<T> = Attribute | Attributes<any> | ArraySlot<T> | Renderable<T>;
+type Values<T> = ArraySlot<T extends unknown[] ? T : never> | Attribute | Attributes<any> | Renderable<T>;
 
 
 const html = <T>(_literals: TemplateStringsArray, ..._values: (Values<T> | Values<T>[])[]): DocumentFragment => {
     throw new Error('html`` templates must be compiled. Ensure vite-plugin is configured.');
 };
 
-html.reactive = <T>(_arr: ReactiveArray<T>, _template: (value: T) => DocumentFragment): ArraySlot<T> => {
+html.reactive = <T>(_arr: Reactive<T[]>, _template: (value: T) => DocumentFragment): ArraySlot<T[]> => {
     throw new Error('html.reactive() must be compiled. Ensure vite-plugin is configured.');
 };
 

package/src/index.ts

@@ -1,10 +1,12 @@
 import './runtime';
-export { default as attributes } from './attributes';
-export { default as event } from './event';
 export { default as html } from './html';
 export { default as render } from './render';
-export { default as slot } from './slot';
 export { default as svg } from './svg';
+
+// Must be exported for compilation even if not used directly
+export { default as attributes } from './attributes';
+export { default as event } from './event';
+export { default as slot } from './slot';
 export { ArraySlot } from './slot/array';
 export { EffectSlot } from './slot/effect';
 export type { Attributes, Element, Renderable } from './types';

package/src/slot/array.ts

@@ -1,7 +1,7 @@
-import { read, root, set, signal, ReactiveArray } from '@esportsplus/reactivity';
-import { ARRAY_SLOT, EMPTY_FRAGMENT } from '~/constants';
+import { read, root, signal, write, Reactive } from '@esportsplus/reactivity';
+import { ARRAY_SLOT } from '~/constants';
 import { Element, SlotGroup } from '~/types';
-import { clone, marker, raf } from '~/utilities';
+import { clone, fragment, marker, raf } from '~/utilities';
 import { ondisconnect, remove } from './cleanup';
 import html from '~/html';
 
@@ -18,18 +18,21 @@ type ArraySlotOp<T> =
     | { op: 'sort'; order: number[] };
 
 
+const EMPTY_FRAGMENT = fragment('');
+
+
 class ArraySlot<T> {
     private marker: Element;
     private nodes: SlotGroup[] = [];
     private queue: ArraySlotOp<T>[] = [];
     private scheduled = false;
     private signal;
-    private template: (...args: Parameters<(value: T) => ReturnType<typeof html>>) => SlotGroup;
+    private template: (...args: Parameters<(value: Reactive<T[]>[number]) => ReturnType<typeof html>>) => SlotGroup;
 
     readonly fragment: DocumentFragment;
 
 
-    constructor(private array: ReactiveArray<T>, template: ((value: T) => ReturnType<typeof html>)) {
+    constructor(private array: Reactive<T[]>, template: ((value: Reactive<T[]>[number]) => ReturnType<typeof html>)) {
         let fragment = this.fragment = clone(EMPTY_FRAGMENT);
 
         this.marker = marker.cloneNode() as unknown as Element;
@@ -171,7 +174,7 @@ class ArraySlot<T> {
                 }
             });
 
-            set(this.signal, this.nodes.length);
+            write(this.signal, this.nodes.length);
         });
     }
 

package/src/slot/render.ts

@@ -1,10 +1,13 @@
 import { isArray } from '@esportsplus/utilities';
-import { ARRAY_SLOT, EMPTY_FRAGMENT } from '~/constants';
+import { ARRAY_SLOT } from '~/constants';
 import { Element } from '~/types';
-import { clone, text } from '~/utilities';
+import { clone, fragment, text } from '~/utilities';
 import { ArraySlot } from './array';
 
 
+const EMPTY_FRAGMENT = fragment('');
+
+
 export default function render(anchor: Element, value: unknown): Node {
     if (value == null || value === false || value === '') {
         return EMPTY_FRAGMENT;