@solidjs/universal 2.0.0-experimental.1 → 2.0.0-experimental.4

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2023 Ryan Carniato
+Copyright (c) 2016-2025 Ryan Carniato
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/dev.cjs

@@ -64,7 +64,7 @@ function createRenderer({
       doNotUnwrap
     });
     if (doNotUnwrap && typeof value === "function") return value;
-    if (multi && value != null && !Array.isArray(value)) value = [value];
+    if (multi && !Array.isArray(value)) value = [value != null ? value : ""];
     if (Array.isArray(value)) {
       for (let i = 0, len = value.length; i < len; i++) {
         const item = value[i],

package/dist/dev.js

@@ -1,4 +1,12 @@
-import { createRoot, merge, createRenderEffect, createMemo, createComponent, untrack, flatten } from 'solid-js';
+import {
+  createRoot,
+  merge,
+  createRenderEffect,
+  createMemo,
+  createComponent,
+  untrack,
+  flatten
+} from "solid-js";
 
 function createRenderer({
   createElement,
@@ -17,9 +25,14 @@ function createRenderer({
     if (multi && !initial) initial = [];
     if (typeof accessor !== "function") {
       accessor = normalize(accessor, multi, true);
-      if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
+      if (typeof accessor !== "function")
+        return insertExpression(parent, accessor, initial, marker);
     }
-    createRenderEffect(() => normalize(accessor, multi), (value, current) => insertExpression(parent, value, current, marker), initial);
+    createRenderEffect(
+      () => normalize(accessor, multi),
+      (value, current) => insertExpression(parent, value, current, marker),
+      initial
+    );
   }
   function insertExpression(parent, value, current, marker) {
     if (value === current) return;
@@ -45,7 +58,7 @@ function createRenderer({
         } else if (current == null) {
           appendNodes(parent, value);
         } else {
-          reconcileArrays(parent, multi && current || [getFirstChild(parent)], value);
+          reconcileArrays(parent, (multi && current) || [getFirstChild(parent)], value);
         }
       }
     } else {
@@ -62,7 +75,7 @@ function createRenderer({
       doNotUnwrap
     });
     if (doNotUnwrap && typeof value === "function") return value;
-    if (multi && value != null && !Array.isArray(value)) value = [value];
+    if (multi && !Array.isArray(value)) value = [value != null ? value : ""];
     if (Array.isArray(value)) {
       for (let i = 0, len = value.length; i < len; i++) {
         const item = value[i],
@@ -91,7 +104,8 @@ function createRenderer({
         bEnd--;
       }
       if (aEnd === aStart) {
-        const node = bEnd < bLength ? bStart ? getNextSibling(b[bStart - 1]) : b[bEnd - bStart] : after;
+        const node =
+          bEnd < bLength ? (bStart ? getNextSibling(b[bStart - 1]) : b[bEnd - bStart]) : after;
         while (bStart < bEnd) insertNode(parentNode, b[bStart++], node);
       } else if (bEnd === bStart) {
         while (aStart < aEnd) {
@@ -131,7 +145,7 @@ function createRenderer({
   function cleanChildren(parent, current, marker, replacement) {
     if (marker === undefined) {
       let removed;
-      while (removed = getFirstChild(parent)) removeNode(parent, removed);
+      while ((removed = getFirstChild(parent))) removeNode(parent, removed);
       replacement && insertNode(parent, replacement);
       return "";
     }
@@ -141,7 +155,11 @@ function createRenderer({
         const el = current[i];
         if (replacement !== el) {
           const isParent = getParentNode(el) === parent;
-          if (replacement && !inserted && !i) isParent ? replaceNode(parent, replacement, el) : insertNode(parent, replacement, marker);else isParent && removeNode(parent, el);
+          if (replacement && !inserted && !i)
+            isParent
+              ? replaceNode(parent, replacement, el)
+              : insertNode(parent, replacement, marker);
+          else isParent && removeNode(parent, el);
         } else inserted = true;
       }
     } else if (replacement) insertNode(parent, replacement, marker);
@@ -157,28 +175,37 @@ function createRenderer({
     const prevProps = {};
     props || (props = {});
     if (!skipChildren) {
-      createRenderEffect(() => normalize(props.children), value => {
-        insertExpression(node, value, prevProps.children);
-        prevProps.children = value;
-      });
+      createRenderEffect(
+        () => normalize(props.children),
+        value => {
+          insertExpression(node, value, prevProps.children);
+          prevProps.children = value;
+        }
+      );
     }
-    createRenderEffect(() => props.ref && props.ref(node), () => ({}));
-    createRenderEffect(() => {
-      const newProps = {};
-      for (const prop in props) {
-        if (prop === "children" || prop === "ref") continue;
-        const value = props[prop];
-        if (value === prevProps[prop]) continue;
-        newProps[prop] = value;
-      }
-      return newProps;
-    }, props => {
-      for (const prop in props) {
-        const value = props[prop];
-        setProperty(node, prop, value, prevProps[prop]);
-        prevProps[prop] = value;
+    createRenderEffect(
+      () => props.ref && props.ref(node),
+      () => ({})
+    );
+    createRenderEffect(
+      () => {
+        const newProps = {};
+        for (const prop in props) {
+          if (prop === "children" || prop === "ref") continue;
+          const value = props[prop];
+          if (value === prevProps[prop]) continue;
+          newProps[prop] = value;
+        }
+        return newProps;
+      },
+      props => {
+        for (const prop in props) {
+          const value = props[prop];
+          setProperty(node, prop, value, prevProps[prop]);
+          prevProps[prop] = value;
+        }
       }
-    });
+    );
     return prevProps;
   }
   return {

package/dist/universal.cjs

@@ -64,7 +64,7 @@ function createRenderer({
       doNotUnwrap
     });
     if (doNotUnwrap && typeof value === "function") return value;
-    if (multi && value != null && !Array.isArray(value)) value = [value];
+    if (multi && !Array.isArray(value)) value = [value != null ? value : ""];
     if (Array.isArray(value)) {
       for (let i = 0, len = value.length; i < len; i++) {
         const item = value[i],

package/dist/universal.js

@@ -1,4 +1,12 @@
-import { createRoot, merge, createRenderEffect, createMemo, createComponent, untrack, flatten } from 'solid-js';
+import {
+  createRoot,
+  merge,
+  createRenderEffect,
+  createMemo,
+  createComponent,
+  untrack,
+  flatten
+} from "solid-js";
 
 function createRenderer({
   createElement,
@@ -17,9 +25,14 @@ function createRenderer({
     if (multi && !initial) initial = [];
     if (typeof accessor !== "function") {
       accessor = normalize(accessor, multi, true);
-      if (typeof accessor !== "function") return insertExpression(parent, accessor, initial, marker);
+      if (typeof accessor !== "function")
+        return insertExpression(parent, accessor, initial, marker);
     }
-    createRenderEffect(() => normalize(accessor, multi), (value, current) => insertExpression(parent, value, current, marker), initial);
+    createRenderEffect(
+      () => normalize(accessor, multi),
+      (value, current) => insertExpression(parent, value, current, marker),
+      initial
+    );
   }
   function insertExpression(parent, value, current, marker) {
     if (value === current) return;
@@ -45,7 +58,7 @@ function createRenderer({
         } else if (current == null) {
           appendNodes(parent, value);
         } else {
-          reconcileArrays(parent, multi && current || [getFirstChild(parent)], value);
+          reconcileArrays(parent, (multi && current) || [getFirstChild(parent)], value);
         }
       }
     } else {
@@ -62,7 +75,7 @@ function createRenderer({
       doNotUnwrap
     });
     if (doNotUnwrap && typeof value === "function") return value;
-    if (multi && value != null && !Array.isArray(value)) value = [value];
+    if (multi && !Array.isArray(value)) value = [value != null ? value : ""];
     if (Array.isArray(value)) {
       for (let i = 0, len = value.length; i < len; i++) {
         const item = value[i],
@@ -91,7 +104,8 @@ function createRenderer({
         bEnd--;
       }
       if (aEnd === aStart) {
-        const node = bEnd < bLength ? bStart ? getNextSibling(b[bStart - 1]) : b[bEnd - bStart] : after;
+        const node =
+          bEnd < bLength ? (bStart ? getNextSibling(b[bStart - 1]) : b[bEnd - bStart]) : after;
         while (bStart < bEnd) insertNode(parentNode, b[bStart++], node);
       } else if (bEnd === bStart) {
         while (aStart < aEnd) {
@@ -131,7 +145,7 @@ function createRenderer({
   function cleanChildren(parent, current, marker, replacement) {
     if (marker === undefined) {
       let removed;
-      while (removed = getFirstChild(parent)) removeNode(parent, removed);
+      while ((removed = getFirstChild(parent))) removeNode(parent, removed);
       replacement && insertNode(parent, replacement);
       return "";
     }
@@ -141,7 +155,11 @@ function createRenderer({
         const el = current[i];
         if (replacement !== el) {
           const isParent = getParentNode(el) === parent;
-          if (replacement && !inserted && !i) isParent ? replaceNode(parent, replacement, el) : insertNode(parent, replacement, marker);else isParent && removeNode(parent, el);
+          if (replacement && !inserted && !i)
+            isParent
+              ? replaceNode(parent, replacement, el)
+              : insertNode(parent, replacement, marker);
+          else isParent && removeNode(parent, el);
         } else inserted = true;
       }
     } else if (replacement) insertNode(parent, replacement, marker);
@@ -157,28 +175,37 @@ function createRenderer({
     const prevProps = {};
     props || (props = {});
     if (!skipChildren) {
-      createRenderEffect(() => normalize(props.children), value => {
-        insertExpression(node, value, prevProps.children);
-        prevProps.children = value;
-      });
+      createRenderEffect(
+        () => normalize(props.children),
+        value => {
+          insertExpression(node, value, prevProps.children);
+          prevProps.children = value;
+        }
+      );
     }
-    createRenderEffect(() => props.ref && props.ref(node), () => ({}));
-    createRenderEffect(() => {
-      const newProps = {};
-      for (const prop in props) {
-        if (prop === "children" || prop === "ref") continue;
-        const value = props[prop];
-        if (value === prevProps[prop]) continue;
-        newProps[prop] = value;
-      }
-      return newProps;
-    }, props => {
-      for (const prop in props) {
-        const value = props[prop];
-        setProperty(node, prop, value, prevProps[prop]);
-        prevProps[prop] = value;
+    createRenderEffect(
+      () => props.ref && props.ref(node),
+      () => ({})
+    );
+    createRenderEffect(
+      () => {
+        const newProps = {};
+        for (const prop in props) {
+          if (prop === "children" || prop === "ref") continue;
+          const value = props[prop];
+          if (value === prevProps[prop]) continue;
+          newProps[prop] = value;
+        }
+        return newProps;
+      },
+      props => {
+        for (const prop in props) {
+          const value = props[prop];
+          setProperty(node, prop, value, prevProps[prop]);
+          prevProps[prop] = value;
+        }
       }
-    });
+    );
     return prevProps;
   }
   return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@solidjs/universal",
   "description": "Solid's universal runtime for creating custom renderers",
-  "version": "2.0.0-experimental.1",
+  "version": "2.0.0-experimental.4",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -37,10 +37,10 @@
     "./types/*": "./types/*"
   },
   "peerDependencies": {
-    "solid-js": "^2.0.0-experimental.1"
+    "solid-js": "^2.0.0-experimental.4"
   },
   "devDependencies": {
-    "solid-js": "2.0.0-experimental.1"
+    "solid-js": "2.0.0-experimental.4"
   },
   "scripts": {
     "build": "npm-run-all -nl build:*",

package/types/index.d.ts

@@ -1,29 +0,0 @@
-export interface RendererOptions<NodeType> {
-  createElement(tag: string): NodeType;
-  createTextNode(value: string): NodeType;
-  replaceText(textNode: NodeType, value: string): void;
-  isTextNode(node: NodeType): boolean;
-  setProperty<T>(node: NodeType, name: string, value: T, prev?: T): void;
-  insertNode(parent: NodeType, node: NodeType, anchor?: NodeType): void;
-  removeNode(parent: NodeType, node: NodeType): void;
-  getParentNode(node: NodeType): NodeType | undefined;
-  getFirstChild(node: NodeType): NodeType | undefined;
-  getNextSibling(node: NodeType): NodeType | undefined;
-}
-
-export interface Renderer<NodeType> {
-  render(code: () => NodeType, node: NodeType): () => void;
-  effect<T>(fn: (prev?: T) => T, effect: (value: T, prev?: T) => void, init?: T): void;
-  memo<T>(fn: () => T, equal: boolean): () => T;
-  createComponent<T>(Comp: (props: T) => NodeType, props: T): NodeType;
-  createElement(tag: string): NodeType;
-  createTextNode(value: string): NodeType;
-  insertNode(parent: NodeType, node: NodeType, anchor?: NodeType): void;
-  insert<T>(parent: any, accessor: (() => T) | T, marker?: any | null): NodeType;
-  spread<T>(node: any, accessor: (() => T) | T, skipChildren?: Boolean): void;
-  setProp<T>(node: NodeType, name: string, value: T, prev?: T): T;
-  mergeProps(...sources: unknown[]): unknown;
-  use<A, T>(fn: (element: NodeType, arg: A) => T, element: NodeType, arg: A): T;
-}
-
-export function createRenderer<NodeType>(options: RendererOptions<NodeType>): Renderer<NodeType>;