@simpreact/simpreact 0.0.8 → 0.0.9

package/core/createElement.js

@@ -1,15 +1,7 @@
 import { isSimpText } from '../shared/index.js';
+import { SIMP_ELEMENT_CHILD_FLAG_ELEMENT, SIMP_ELEMENT_CHILD_FLAG_EMPTY, SIMP_ELEMENT_CHILD_FLAG_LIST, SIMP_ELEMENT_CHILD_FLAG_TEXT, SIMP_ELEMENT_CHILD_FLAG_UNKNOWN, SIMP_ELEMENT_FLAG_FC, SIMP_ELEMENT_FLAG_FRAGMENT, SIMP_ELEMENT_FLAG_HOST, SIMP_ELEMENT_FLAG_PORTAL, SIMP_ELEMENT_FLAG_TEXT, } from './flags.js';
 import { Fragment } from './fragment.js';
-export const SIMP_ELEMENT_FLAG_HOST = 1;
-export const SIMP_ELEMENT_FLAG_FC = 1 << 1;
-export const SIMP_ELEMENT_FLAG_TEXT = 1 << 2;
-export const SIMP_ELEMENT_FLAG_PORTAL = 1 << 3;
-export const SIMP_ELEMENT_FLAG_FRAGMENT = 1 << 4;
-export const SIMP_ELEMENT_CHILD_FLAG_EMPTY = 1;
-export const SIMP_ELEMENT_CHILD_FLAG_UNKNOWN = 1 << 1;
-export const SIMP_ELEMENT_CHILD_FLAG_ELEMENT = 1 << 2;
-export const SIMP_ELEMENT_CHILD_FLAG_LIST = 1 << 3;
-export const SIMP_ELEMENT_CHILD_FLAG_TEXT = 1 << 4;
+export * from './flags.js';
 export function createElement(type, props) {
     let definedChildren;
     const argLength = arguments.length;
@@ -38,9 +30,9 @@ export function createElement(type, props) {
                     type,
                     props: props || null,
                     children: null,
-                    className: props?.className || null,
+                    className: props?.className ?? props?.class ?? null,
                     reference: null,
-                    store: null,
+                    hostNamespace: null,
                     context: null,
                     ref: props?.ref ? { value: props.ref } : null,
                     unmounted: null,
@@ -63,7 +55,7 @@ export function createElement(type, props) {
                 children: null,
                 className: props?.className || null,
                 reference: null,
-                store: null,
+                hostNamespace: null,
                 context: null,
                 ref: props?.ref ? { value: props.ref } : null,
                 unmounted: null,
@@ -84,7 +76,7 @@ export function createElement(type, props) {
                 children: null,
                 className: null,
                 reference: null,
-                store: null,
+                hostNamespace: null,
                 context: null,
                 ref: null,
                 unmounted: null,
@@ -92,6 +84,9 @@ export function createElement(type, props) {
             };
         }
         default: {
+            if (type !== Fragment) {
+                throw new Error(`Invalid element type: ${String(type)}`);
+            }
             return normalizeChildren({
                 flag: SIMP_ELEMENT_FLAG_FRAGMENT,
                 childFlag: SIMP_ELEMENT_CHILD_FLAG_UNKNOWN,
@@ -102,7 +97,7 @@ export function createElement(type, props) {
                 children: null,
                 className: null,
                 reference: null,
-                store: null,
+                hostNamespace: null,
                 context: null,
                 ref: null,
                 unmounted: null,
@@ -122,7 +117,7 @@ export function createTextElement(text) {
         children: text.toString(),
         className: null,
         reference: null,
-        store: null,
+        hostNamespace: null,
         context: null,
         ref: null,
         unmounted: null,
@@ -170,7 +165,9 @@ function normalizeNode(child, result, currentKey = null, skipIgnoredCheck) {
     }
     const element = child;
     if (element.key != null) {
-        currentKey = `${(currentKey ?? '').slice(0, -2)}${element.key}`;
+        const prefix = currentKey ?? '';
+        const lastDot = prefix.lastIndexOf('.');
+        currentKey = lastDot <= 0 ? String(element.key) : `${prefix.slice(0, lastDot)}${element.key}`;
     }
     element.key = currentKey;
     element.index = result.length;

package/core/flags.js

@@ -0,0 +1,31 @@
+export const SIMP_ELEMENT_FLAG_HOST = 1;
+export const SIMP_ELEMENT_FLAG_FC = 1 << 1;
+export const SIMP_ELEMENT_FLAG_TEXT = 1 << 2;
+export const SIMP_ELEMENT_FLAG_PORTAL = 1 << 3;
+export const SIMP_ELEMENT_FLAG_FRAGMENT = 1 << 4;
+export const SIMP_ELEMENT_CHILD_FLAG_EMPTY = 1;
+export const SIMP_ELEMENT_CHILD_FLAG_UNKNOWN = 1 << 1;
+export const SIMP_ELEMENT_CHILD_FLAG_ELEMENT = 1 << 2;
+export const SIMP_ELEMENT_CHILD_FLAG_LIST = 1 << 3;
+export const SIMP_ELEMENT_CHILD_FLAG_TEXT = 1 << 4;
+export function isFC(element) {
+    return (element.flag & SIMP_ELEMENT_FLAG_FC) !== 0;
+}
+export function isFragment(element) {
+    return (element.flag & SIMP_ELEMENT_FLAG_FRAGMENT) !== 0;
+}
+export function isHost(element) {
+    return (element.flag & SIMP_ELEMENT_FLAG_HOST) !== 0;
+}
+export function isPortal(element) {
+    return (element.flag & SIMP_ELEMENT_FLAG_PORTAL) !== 0;
+}
+export function isText(element) {
+    return (element.flag & SIMP_ELEMENT_FLAG_TEXT) !== 0;
+}
+export function hasListChildren(element) {
+    return element.childFlag === SIMP_ELEMENT_CHILD_FLAG_LIST;
+}
+export function hasElementChild(element) {
+    return element.childFlag === SIMP_ELEMENT_CHILD_FLAG_ELEMENT;
+}

package/core/hostOperations.js

@@ -1,15 +1,7 @@
-import { HOST_OPS_PLACE_ELEMENT_BEFORE_ANCHOR, HOST_OPS_REPLACE_CHILD, } from './processStack.js';
-export function _pushHostOperationPlaceElement(element, meta) {
-    meta.renderRuntime.renderStack.push({
-        node: element,
-        kind: HOST_OPS_PLACE_ELEMENT_BEFORE_ANCHOR,
-        meta,
-    });
+import { acquirePlaceFrame, acquireReplaceFrame } from './processStack.js';
+export function pushHostOperationPlaceElement(element, renderRuntime, parentReference, subtreeRightBoundary) {
+    renderRuntime.renderStack.push(acquirePlaceFrame(renderRuntime, element, parentReference, subtreeRightBoundary));
 }
-export function _pushHostOperationReplaceElement(element, renderRuntime, meta) {
-    renderRuntime.renderStack.push({
-        node: element,
-        kind: HOST_OPS_REPLACE_CHILD,
-        meta,
-    });
+export function pushHostOperationReplaceElement(element, renderRuntime, parentReference, prevElement) {
+    renderRuntime.renderStack.push(acquireReplaceFrame(renderRuntime, element, parentReference, prevElement));
 }

package/core/index.d.ts

@@ -1,7 +1,35 @@
-import type { Nullable, SimpText } from '../shared/index.js';
-import type { HostAdapter } from './hostAdapter.js';
-
-export { HostAdapter } from './hostAdapter.js';
+import type { Maybe, Nullable, SimpText } from '../shared/index.js';
+
+export interface HostAdapter<HostRef = unknown, HostTextRef = unknown, NS = string> {
+  createReference(type: string, namespace?: Maybe<NS>): HostRef;
+  createTextReference(text: string): HostTextRef;
+  mountProps(reference: HostRef, element: SimpElement, renderRuntime: SimpRenderRuntime, namespace?: Maybe<NS>): void;
+  patchProps(
+    reference: HostRef,
+    prevElement: SimpElement,
+    nextElement: SimpElement,
+    renderRuntime: SimpRenderRuntime,
+    namespace?: Maybe<NS>
+  ): void;
+  unmountProps(reference: HostRef, element: SimpElement, renderRuntime: SimpRenderRuntime): void;
+  setClassname(reference: HostRef, className: Maybe<string>, namespace?: Maybe<NS>): void;
+  setTextContent(reference: HostRef, text: string, referenceHasOnlyTextElement?: boolean): void;
+  removeChild(parent: HostRef, child: HostRef | HostTextRef): void;
+  replaceChild(parent: HostRef, replacer: HostRef | HostTextRef, toBeReplaced: HostRef | HostTextRef): void;
+  insertOrAppend(parent: HostRef, child: HostRef | HostTextRef, before: Nullable<HostRef | HostTextRef>): void;
+  clearNode(reference: HostRef | HostTextRef): void;
+  attachElementToReference(
+    element: SimpElement,
+    reference: HostRef | HostTextRef,
+    renderRuntime: SimpRenderRuntime
+  ): void;
+  detachElementFromReference(reference: HostRef | HostTextRef, renderRuntime: SimpRenderRuntime): void;
+  getElementFromReference(reference: HostRef | HostTextRef, renderRuntime: SimpRenderRuntime): Nullable<SimpElement>;
+  getHostNamespaces(
+    element: SimpElement,
+    currentNamespace: Maybe<NS>
+  ): Nullable<{ self: Nullable<NS>; children: Nullable<NS> }>;
+}
 
 export type ComponentType<P = {}> = FunctionalComponent<P>;
 
@@ -57,14 +85,16 @@ export declare function memo<P = {}>(
 export declare function withSyncRerender(runtime: SimpRenderRuntime, callback: () => void): void;
 
 export interface SimpRuntimeFCRenderer {
-  (component: FC, element: SimpElement): SimpNode;
+  (component: FC, element: SimpElement, renderRuntime: SimpRenderRuntime): SimpNode;
 }
 
 export interface SimpRenderRuntime {
   hostAdapter: HostAdapter;
   renderer: SimpRuntimeFCRenderer;
   renderStack: Array<{ node: SimpElement; kind: number; meta: any }>;
-  elementToHostMap: Map<unknown, SimpElement>;
-  currentRenderingFCElement: Nullable<SimpElement>;
-  renderPhase: Nullable<number>;
 }
+
+export declare function createRenderRuntime(
+  hostAdapter: HostAdapter,
+  renderer: SimpRuntimeFCRenderer
+): SimpRenderRuntime;

package/core/index.js

@@ -3,5 +3,6 @@ import { Fragment } from './fragment.js';
 import { memo } from './memo.js';
 import { createPortal } from './portal.js';
 import { withSyncRerender } from './rerender.js';
-export { createElement, Fragment, memo, createPortal, withSyncRerender };
-export default { createElement, Fragment, memo, createPortal, withSyncRerender };
+import { createRenderRuntime } from './runtime.js';
+export { createElement, createRenderRuntime, Fragment, memo, createPortal, withSyncRerender };
+export default { createElement, createRenderRuntime, Fragment, memo, createPortal, withSyncRerender };

package/core/internal.d.ts

@@ -1,16 +1,136 @@
-export * from './createElement.js';
-export * from './fragment.js';
-export * from './hostAdapter.js';
-export * from './lifecycleEventBus.js';
-export * from './memo.js';
-export * from './mounting.js';
-export * from './mountingChildren.js';
-export * from './patching.js';
-export * from './patchingChildren.js';
-export * from './portal.js';
-export * from './processStack.js';
-export * from './ref.js';
-export * from './rerender.js';
-export * from './runtime.js';
-export * from './unmounting.js';
-export * from './unmountingChildren.js';
+import type { Many, Maybe, Nullable } from '../shared/index.js';
+
+export type FC = (props: any) => SimpNode;
+export type Key = string | number | bigint;
+export type SimpNode = SimpElement | string | number | bigint | boolean | Array<SimpNode> | null | undefined;
+
+export interface SimpElement {
+  flag: number;
+  childFlag: number;
+  parent: Nullable<SimpElement>;
+  key: Nullable<Key>;
+  type: Nullable<string | FC>;
+  props: any;
+  children: SimpNode;
+  className: Nullable<string>;
+  reference: unknown;
+  hostNamespace: Nullable<string>;
+  context: any;
+  ref: any;
+  unmounted: Nullable<boolean>;
+  index: number;
+}
+
+export type RefObject<T> = { current: T };
+
+export interface HostAdapter<HostRef = unknown, HostTextRef = unknown, NS = string> {
+  createReference(type: string, namespace?: Maybe<NS>): HostRef;
+  createTextReference(text: string): HostTextRef;
+  mountProps(reference: HostRef, element: SimpElement, renderRuntime: SimpRenderRuntime, namespace?: Maybe<NS>): void;
+  patchProps(
+    reference: HostRef,
+    prevElement: SimpElement,
+    nextElement: SimpElement,
+    renderRuntime: SimpRenderRuntime,
+    namespace?: Maybe<NS>
+  ): void;
+  unmountProps(reference: HostRef, element: SimpElement, renderRuntime: SimpRenderRuntime): void;
+  setClassname(reference: HostRef, className: Maybe<string>, namespace?: Maybe<NS>): void;
+  setTextContent(reference: HostRef, text: string, referenceHasOnlyTextElement?: boolean): void;
+  removeChild(parent: HostRef, child: HostRef | HostTextRef): void;
+  replaceChild(parent: HostRef, replacer: HostRef | HostTextRef, toBeReplaced: HostRef | HostTextRef): void;
+  insertOrAppend(parent: HostRef, child: HostRef | HostTextRef, before: Nullable<HostRef | HostTextRef>): void;
+  clearNode(reference: HostRef | HostTextRef): void;
+  attachElementToReference(
+    element: SimpElement,
+    reference: HostRef | HostTextRef,
+    renderRuntime: SimpRenderRuntime
+  ): void;
+  detachElementFromReference(reference: HostRef | HostTextRef, renderRuntime: SimpRenderRuntime): void;
+  getElementFromReference(reference: HostRef | HostTextRef, renderRuntime: SimpRenderRuntime): Nullable<SimpElement>;
+  getHostNamespaces(
+    element: SimpElement,
+    currentNamespace: Maybe<NS>
+  ): Nullable<{ self: Nullable<NS>; children: Nullable<NS> }>;
+}
+
+export interface SimpRuntimeFCRenderer {
+  (component: FC, element: SimpElement, renderRuntime: SimpRenderRuntime): SimpNode;
+}
+
+export interface SimpRenderFrame {
+  kind: number;
+  node: SimpElement;
+  renderRuntime: SimpRenderRuntime;
+  parentReference: unknown;
+  subtreeRightBoundary: Nullable<SimpElement>;
+  context: unknown;
+  hostNamespace: Maybe<string>;
+  prevElement: SimpElement;
+  children: Nullable<Many<SimpElement>>;
+  placeHolderElement: Nullable<SimpElement>;
+}
+
+export interface SimpRenderRuntime {
+  hostAdapter: HostAdapter;
+  renderer: SimpRuntimeFCRenderer;
+  renderStack: Array<any>;
+  framePool: SimpRenderFrame[];
+  activeRenderElement: SimpElement | null;
+  pendingRerenderFlag: boolean;
+}
+
+export declare function createRenderRuntime(
+  hostAdapter: HostAdapter,
+  renderer: SimpRuntimeFCRenderer
+): SimpRenderRuntime;
+
+export type LifecycleEvent =
+  | { type: 'beforeRender'; element: SimpElement; renderRuntime: SimpRenderRuntime }
+  | { type: 'afterRender'; element: SimpElement; renderRuntime: SimpRenderRuntime }
+  | { type: 'mounted'; element: SimpElement; renderRuntime: SimpRenderRuntime }
+  | { type: 'updated'; element: SimpElement; renderRuntime: SimpRenderRuntime }
+  | { type: 'unmounted'; element: SimpElement; renderRuntime: SimpRenderRuntime }
+  | { type: 'errored'; element: SimpElement; error: any; handled: boolean; renderRuntime: SimpRenderRuntime };
+
+export interface LifecycleEventBus {
+  publish(event: LifecycleEvent): void;
+  subscribe(subscriber: (event: LifecycleEvent) => boolean | void): () => void;
+}
+
+export declare function isFC(element: { flag: number }): boolean;
+export declare function isFragment(element: { flag: number }): boolean;
+export declare function isHost(element: { flag: number }): boolean;
+export declare function isPortal(element: { flag: number }): boolean;
+export declare function isText(element: { flag: number }): boolean;
+export declare function hasListChildren(element: { childFlag: number }): boolean;
+export declare function hasElementChild(element: { childFlag: number }): boolean;
+
+export declare function createElement(type: string | FC, props?: any, ...children: SimpNode[]): SimpElement;
+export declare function Fragment(props: { children?: SimpNode }): SimpElement;
+
+export declare function registerLifecyclePlugin(plugin: (bus: LifecycleEventBus) => void): void;
+
+export declare function mount(
+  element: SimpElement,
+  parentReference: unknown,
+  subtreeRightBoundary: Nullable<SimpElement>,
+  context: unknown,
+  hostNamespace: Maybe<string>,
+  renderRuntime: SimpRenderRuntime
+): void;
+
+export declare function patch(
+  prevElement: SimpElement,
+  nextElement: SimpElement,
+  parentReference: unknown,
+  subtreeRightBoundary: Nullable<SimpElement>,
+  context: unknown,
+  hostNamespace: Maybe<string>,
+  renderRuntime: SimpRenderRuntime
+): void;
+
+export declare function unmount(element: SimpElement, renderRuntime: SimpRenderRuntime): void;
+
+export declare function rerender(element: SimpElement, renderRuntime: SimpRenderRuntime): void;
+export declare function withSyncRerender(renderRuntime: SimpRenderRuntime, callback: () => void): void;

package/core/internal.js

@@ -1,16 +1,8 @@
-export * from './createElement.js';
-export * from './fragment.js';
-export * from './hostAdapter.js';
-export * from './lifecycleEventBus.js';
-export * from './memo.js';
-export * from './mounting.js';
-export * from './mountingChildren.js';
-export * from './patching.js';
-export * from './patchingChildren.js';
-export * from './portal.js';
-export * from './processStack.js';
-export * from './ref.js';
-export * from './rerender.js';
-export * from './runtime.js';
-export * from './unmounting.js';
-export * from './unmountingChildren.js';
+export { createElement, hasElementChild, hasListChildren, isFC, isFragment, isHost, isPortal, isText, } from './createElement.js';
+export { Fragment } from './fragment.js';
+export { registerLifecyclePlugin } from './lifecycleEventBus.js';
+export { mount } from './mounting.js';
+export { patch } from './patching.js';
+export { rerender, withSyncRerender } from './rerender.js';
+export { createRenderRuntime } from './runtime.js';
+export { unmount } from './unmounting.js';

package/core/lifecycleEventBus.js

@@ -1,16 +1,35 @@
-const subscribers = [];
-export const lifecycleEventBus = {
-    publish(event) {
-        for (const subscriber of subscribers) {
-            subscriber(event);
-        }
-    },
-    subscribe(subscriber) {
-        if (subscribers.indexOf(subscriber) === -1) {
-            subscribers.push(subscriber);
-        }
-        return () => {
-            subscribers.splice(subscribers.indexOf(subscriber), 1);
-        };
-    },
-};
+function createBus() {
+    const subscribers = [];
+    return {
+        publish(event) {
+            for (const subscriber of subscribers) {
+                subscriber(event);
+            }
+        },
+        subscribe(subscriber) {
+            if (subscribers.indexOf(subscriber) === -1) {
+                subscribers.push(subscriber);
+            }
+            return () => {
+                const index = subscribers.indexOf(subscriber);
+                if (index !== -1)
+                    subscribers.splice(index, 1);
+            };
+        },
+    };
+}
+const busByRuntime = new WeakMap();
+const plugins = [];
+export function getLifecycleEventBus(runtime) {
+    let bus = busByRuntime.get(runtime);
+    if (!bus) {
+        bus = createBus();
+        for (const plugin of plugins)
+            plugin(bus);
+        busByRuntime.set(runtime, bus);
+    }
+    return bus;
+}
+export function registerLifecyclePlugin(plugin) {
+    plugins.push(plugin);
+}

package/core/memo.js

@@ -1,9 +1,12 @@
 import { shallowEqual } from '../shared/index.js';
+const MEMO_BRAND = Symbol('memo');
 export function memo(Component, compare = shallowEqual) {
     const Memoized = (props => Component(props));
     Memoized._compare = compare;
+    Memoized[MEMO_BRAND] = true;
+    Object.defineProperty(Memoized, 'name', { value: Component.name });
     return Memoized;
 }
 export function isMemo(type) {
-    return !!type._compare;
+    return type?.[MEMO_BRAND] === true;
 }