solid-js 1.9.9 → 1.9.10

package/dist/dev.cjs

@@ -1412,8 +1412,9 @@ function mergeProps(...sources) {
   return target;
 }
 function splitProps(props, ...keys) {
+  const len = keys.length;
   if (SUPPORTS_PROXY && $PROXY in props) {
-    const blocked = new Set(keys.length > 1 ? keys.flat() : keys[0]);
+    const blocked = len > 1 ? keys.flat() : keys[0];
     const res = keys.map(k => {
       return new Proxy({
         get(property) {
@@ -1429,36 +1430,34 @@ function splitProps(props, ...keys) {
     });
     res.push(new Proxy({
       get(property) {
-        return blocked.has(property) ? undefined : props[property];
+        return blocked.includes(property) ? undefined : props[property];
       },
       has(property) {
-        return blocked.has(property) ? false : property in props;
+        return blocked.includes(property) ? false : property in props;
       },
       keys() {
-        return Object.keys(props).filter(k => !blocked.has(k));
+        return Object.keys(props).filter(k => !blocked.includes(k));
       }
     }, propTraps));
     return res;
   }
-  const otherObject = {};
-  const objects = keys.map(() => ({}));
+  const objects = [];
+  for (let i = 0; i <= len; i++) {
+    objects[i] = {};
+  }
   for (const propName of Object.getOwnPropertyNames(props)) {
-    const desc = Object.getOwnPropertyDescriptor(props, propName);
-    const isDefaultDesc = !desc.get && !desc.set && desc.enumerable && desc.writable && desc.configurable;
-    let blocked = false;
-    let objectIndex = 0;
-    for (const k of keys) {
-      if (k.includes(propName)) {
-        blocked = true;
-        isDefaultDesc ? objects[objectIndex][propName] = desc.value : Object.defineProperty(objects[objectIndex], propName, desc);
+    let keyIndex = len;
+    for (let i = 0; i < keys.length; i++) {
+      if (keys[i].includes(propName)) {
+        keyIndex = i;
+        break;
       }
-      ++objectIndex;
-    }
-    if (!blocked) {
-      isDefaultDesc ? otherObject[propName] = desc.value : Object.defineProperty(otherObject, propName, desc);
     }
+    const desc = Object.getOwnPropertyDescriptor(props, propName);
+    const isDefaultDesc = !desc.get && !desc.set && desc.enumerable && desc.writable && desc.configurable;
+    isDefaultDesc ? objects[keyIndex][propName] = desc.value : Object.defineProperty(objects[keyIndex], propName, desc);
   }
-  return [...objects, otherObject];
+  return objects;
 }
 function lazy(fn) {
   let comp;

package/dist/dev.js

@@ -1410,8 +1410,9 @@ function mergeProps(...sources) {
   return target;
 }
 function splitProps(props, ...keys) {
+  const len = keys.length;
   if (SUPPORTS_PROXY && $PROXY in props) {
-    const blocked = new Set(keys.length > 1 ? keys.flat() : keys[0]);
+    const blocked = len > 1 ? keys.flat() : keys[0];
     const res = keys.map(k => {
       return new Proxy({
         get(property) {
@@ -1427,36 +1428,34 @@ function splitProps(props, ...keys) {
     });
     res.push(new Proxy({
       get(property) {
-        return blocked.has(property) ? undefined : props[property];
+        return blocked.includes(property) ? undefined : props[property];
       },
       has(property) {
-        return blocked.has(property) ? false : property in props;
+        return blocked.includes(property) ? false : property in props;
       },
       keys() {
-        return Object.keys(props).filter(k => !blocked.has(k));
+        return Object.keys(props).filter(k => !blocked.includes(k));
       }
     }, propTraps));
     return res;
   }
-  const otherObject = {};
-  const objects = keys.map(() => ({}));
+  const objects = [];
+  for (let i = 0; i <= len; i++) {
+    objects[i] = {};
+  }
   for (const propName of Object.getOwnPropertyNames(props)) {
-    const desc = Object.getOwnPropertyDescriptor(props, propName);
-    const isDefaultDesc = !desc.get && !desc.set && desc.enumerable && desc.writable && desc.configurable;
-    let blocked = false;
-    let objectIndex = 0;
-    for (const k of keys) {
-      if (k.includes(propName)) {
-        blocked = true;
-        isDefaultDesc ? objects[objectIndex][propName] = desc.value : Object.defineProperty(objects[objectIndex], propName, desc);
+    let keyIndex = len;
+    for (let i = 0; i < keys.length; i++) {
+      if (keys[i].includes(propName)) {
+        keyIndex = i;
+        break;
       }
-      ++objectIndex;
-    }
-    if (!blocked) {
-      isDefaultDesc ? otherObject[propName] = desc.value : Object.defineProperty(otherObject, propName, desc);
     }
+    const desc = Object.getOwnPropertyDescriptor(props, propName);
+    const isDefaultDesc = !desc.get && !desc.set && desc.enumerable && desc.writable && desc.configurable;
+    isDefaultDesc ? objects[keyIndex][propName] = desc.value : Object.defineProperty(objects[keyIndex], propName, desc);
   }
-  return [...objects, otherObject];
+  return objects;
 }
 function lazy(fn) {
   let comp;

package/dist/server.cjs

@@ -529,34 +529,48 @@ function createResource(source, fetcher, options = {}) {
   if (sharedConfig.context.async && options.ssrLoadFrom !== "initial") {
     resource = sharedConfig.context.resources[id] || (sharedConfig.context.resources[id] = {});
     if (resource.ref) {
-      if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error) resource.ref[1].refetch();
+      if (!resource.data && !resource.ref[0]._loading && !resource.ref[0].error) resource.ref[1].refetch();
       return resource.ref;
     }
   }
-  const read = () => {
+  const prepareResource = () => {
     if (error) throw error;
     const resolved = options.ssrLoadFrom !== "initial" && sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
     if (!resolved && resourceContext) resourceContext.push(id);
-    if (!resolved && read.loading) {
+    if (!resolved && read._loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
         ctx.resources.set(id, read);
         contexts.add(ctx);
       }
     }
-    return resolved ? sharedConfig.context.resources[id].data : value;
+    return resolved;
+  };
+  const read = () => {
+    return prepareResource() ? sharedConfig.context.resources[id].data : value;
+  };
+  const loading = () => {
+    prepareResource();
+    return read._loading;
   };
-  read.loading = false;
+  read._loading = false;
   read.error = undefined;
   read.state = "initialValue" in options ? "ready" : "unresolved";
-  Object.defineProperty(read, "latest", {
-    get() {
-      return read();
+  Object.defineProperties(read, {
+    latest: {
+      get() {
+        return read();
+      }
+    },
+    loading: {
+      get() {
+        return loading();
+      }
     }
   });
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = !!(typeof source === "function" ? source() : source);
+    if (!ctx.async) return read._loading = !!(typeof source === "function" ? source() : source);
     if (ctx.resources && id in ctx.resources && "data" in ctx.resources[id]) {
       value = ctx.resources[id].data;
       return;
@@ -576,17 +590,17 @@ function createResource(source, fetcher, options = {}) {
       });
     }
     if (p != undefined && typeof p === "object" && "then" in p) {
-      read.loading = true;
+      read._loading = true;
       read.state = "pending";
       p = p.then(res => {
-        read.loading = false;
+        read._loading = false;
         read.state = "ready";
         ctx.resources[id].data = res;
         p = null;
         notifySuspense(contexts);
         return res;
       }).catch(err => {
-        read.loading = false;
+        read._loading = false;
         read.state = "errored";
         read.error = error = castError(err);
         p = null;
@@ -627,7 +641,7 @@ function lazy(fn) {
     if (p.resolved) return p.resolved(props);
     const ctx = useContext(SuspenseContext);
     const track = {
-      loading: true,
+      _loading: true,
       error: undefined
     };
     if (ctx) {
@@ -636,7 +650,7 @@ function lazy(fn) {
     }
     if (sharedConfig.context.async) {
       sharedConfig.context.block(p.then(() => {
-        track.loading = false;
+        track._loading = false;
         notifySuspense(contexts);
       }));
     }
@@ -647,7 +661,7 @@ function lazy(fn) {
 }
 function suspenseComplete(c) {
   for (const r of c.resources.values()) {
-    if (r.loading) return false;
+    if (r._loading) return false;
   }
   return true;
 }

package/dist/server.js

@@ -527,34 +527,48 @@ function createResource(source, fetcher, options = {}) {
   if (sharedConfig.context.async && options.ssrLoadFrom !== "initial") {
     resource = sharedConfig.context.resources[id] || (sharedConfig.context.resources[id] = {});
     if (resource.ref) {
-      if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error) resource.ref[1].refetch();
+      if (!resource.data && !resource.ref[0]._loading && !resource.ref[0].error) resource.ref[1].refetch();
       return resource.ref;
     }
   }
-  const read = () => {
+  const prepareResource = () => {
     if (error) throw error;
     const resolved = options.ssrLoadFrom !== "initial" && sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
     if (!resolved && resourceContext) resourceContext.push(id);
-    if (!resolved && read.loading) {
+    if (!resolved && read._loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
         ctx.resources.set(id, read);
         contexts.add(ctx);
       }
     }
-    return resolved ? sharedConfig.context.resources[id].data : value;
+    return resolved;
+  };
+  const read = () => {
+    return prepareResource() ? sharedConfig.context.resources[id].data : value;
+  };
+  const loading = () => {
+    prepareResource();
+    return read._loading;
   };
-  read.loading = false;
+  read._loading = false;
   read.error = undefined;
   read.state = "initialValue" in options ? "ready" : "unresolved";
-  Object.defineProperty(read, "latest", {
-    get() {
-      return read();
+  Object.defineProperties(read, {
+    latest: {
+      get() {
+        return read();
+      }
+    },
+    loading: {
+      get() {
+        return loading();
+      }
     }
   });
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = !!(typeof source === "function" ? source() : source);
+    if (!ctx.async) return read._loading = !!(typeof source === "function" ? source() : source);
     if (ctx.resources && id in ctx.resources && "data" in ctx.resources[id]) {
       value = ctx.resources[id].data;
       return;
@@ -574,17 +588,17 @@ function createResource(source, fetcher, options = {}) {
       });
     }
     if (p != undefined && typeof p === "object" && "then" in p) {
-      read.loading = true;
+      read._loading = true;
       read.state = "pending";
       p = p.then(res => {
-        read.loading = false;
+        read._loading = false;
         read.state = "ready";
         ctx.resources[id].data = res;
         p = null;
         notifySuspense(contexts);
         return res;
       }).catch(err => {
-        read.loading = false;
+        read._loading = false;
         read.state = "errored";
         read.error = error = castError(err);
         p = null;
@@ -625,7 +639,7 @@ function lazy(fn) {
     if (p.resolved) return p.resolved(props);
     const ctx = useContext(SuspenseContext);
     const track = {
-      loading: true,
+      _loading: true,
       error: undefined
     };
     if (ctx) {
@@ -634,7 +648,7 @@ function lazy(fn) {
     }
     if (sharedConfig.context.async) {
       sharedConfig.context.block(p.then(() => {
-        track.loading = false;
+        track._loading = false;
         notifySuspense(contexts);
       }));
     }
@@ -645,7 +659,7 @@ function lazy(fn) {
 }
 function suspenseComplete(c) {
   for (const r of c.resources.values()) {
-    if (r.loading) return false;
+    if (r._loading) return false;
   }
   return true;
 }

package/dist/solid.cjs

@@ -1358,8 +1358,9 @@ function mergeProps(...sources) {
   return target;
 }
 function splitProps(props, ...keys) {
+  const len = keys.length;
   if (SUPPORTS_PROXY && $PROXY in props) {
-    const blocked = new Set(keys.length > 1 ? keys.flat() : keys[0]);
+    const blocked = len > 1 ? keys.flat() : keys[0];
     const res = keys.map(k => {
       return new Proxy({
         get(property) {
@@ -1375,36 +1376,34 @@ function splitProps(props, ...keys) {
     });
     res.push(new Proxy({
       get(property) {
-        return blocked.has(property) ? undefined : props[property];
+        return blocked.includes(property) ? undefined : props[property];
       },
       has(property) {
-        return blocked.has(property) ? false : property in props;
+        return blocked.includes(property) ? false : property in props;
       },
       keys() {
-        return Object.keys(props).filter(k => !blocked.has(k));
+        return Object.keys(props).filter(k => !blocked.includes(k));
       }
     }, propTraps));
     return res;
   }
-  const otherObject = {};
-  const objects = keys.map(() => ({}));
+  const objects = [];
+  for (let i = 0; i <= len; i++) {
+    objects[i] = {};
+  }
   for (const propName of Object.getOwnPropertyNames(props)) {
-    const desc = Object.getOwnPropertyDescriptor(props, propName);
-    const isDefaultDesc = !desc.get && !desc.set && desc.enumerable && desc.writable && desc.configurable;
-    let blocked = false;
-    let objectIndex = 0;
-    for (const k of keys) {
-      if (k.includes(propName)) {
-        blocked = true;
-        isDefaultDesc ? objects[objectIndex][propName] = desc.value : Object.defineProperty(objects[objectIndex], propName, desc);
+    let keyIndex = len;
+    for (let i = 0; i < keys.length; i++) {
+      if (keys[i].includes(propName)) {
+        keyIndex = i;
+        break;
       }
-      ++objectIndex;
-    }
-    if (!blocked) {
-      isDefaultDesc ? otherObject[propName] = desc.value : Object.defineProperty(otherObject, propName, desc);
     }
+    const desc = Object.getOwnPropertyDescriptor(props, propName);
+    const isDefaultDesc = !desc.get && !desc.set && desc.enumerable && desc.writable && desc.configurable;
+    isDefaultDesc ? objects[keyIndex][propName] = desc.value : Object.defineProperty(objects[keyIndex], propName, desc);
   }
-  return [...objects, otherObject];
+  return objects;
 }
 function lazy(fn) {
   let comp;

package/dist/solid.js

@@ -1356,8 +1356,9 @@ function mergeProps(...sources) {
   return target;
 }
 function splitProps(props, ...keys) {
+  const len = keys.length;
   if (SUPPORTS_PROXY && $PROXY in props) {
-    const blocked = new Set(keys.length > 1 ? keys.flat() : keys[0]);
+    const blocked = len > 1 ? keys.flat() : keys[0];
     const res = keys.map(k => {
       return new Proxy({
         get(property) {
@@ -1373,36 +1374,34 @@ function splitProps(props, ...keys) {
     });
     res.push(new Proxy({
       get(property) {
-        return blocked.has(property) ? undefined : props[property];
+        return blocked.includes(property) ? undefined : props[property];
       },
       has(property) {
-        return blocked.has(property) ? false : property in props;
+        return blocked.includes(property) ? false : property in props;
       },
       keys() {
-        return Object.keys(props).filter(k => !blocked.has(k));
+        return Object.keys(props).filter(k => !blocked.includes(k));
       }
     }, propTraps));
     return res;
   }
-  const otherObject = {};
-  const objects = keys.map(() => ({}));
+  const objects = [];
+  for (let i = 0; i <= len; i++) {
+    objects[i] = {};
+  }
   for (const propName of Object.getOwnPropertyNames(props)) {
-    const desc = Object.getOwnPropertyDescriptor(props, propName);
-    const isDefaultDesc = !desc.get && !desc.set && desc.enumerable && desc.writable && desc.configurable;
-    let blocked = false;
-    let objectIndex = 0;
-    for (const k of keys) {
-      if (k.includes(propName)) {
-        blocked = true;
-        isDefaultDesc ? objects[objectIndex][propName] = desc.value : Object.defineProperty(objects[objectIndex], propName, desc);
+    let keyIndex = len;
+    for (let i = 0; i < keys.length; i++) {
+      if (keys[i].includes(propName)) {
+        keyIndex = i;
+        break;
       }
-      ++objectIndex;
-    }
-    if (!blocked) {
-      isDefaultDesc ? otherObject[propName] = desc.value : Object.defineProperty(otherObject, propName, desc);
     }
+    const desc = Object.getOwnPropertyDescriptor(props, propName);
+    const isDefaultDesc = !desc.get && !desc.set && desc.enumerable && desc.writable && desc.configurable;
+    isDefaultDesc ? objects[keyIndex][propName] = desc.value : Object.defineProperty(objects[keyIndex], propName, desc);
   }
-  return [...objects, otherObject];
+  return objects;
 }
 function lazy(fn) {
   let comp;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.9.9",
+  "version": "1.9.10",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -220,10 +220,10 @@
   },
   "scripts": {
     "build": "npm-run-all -nl build:*",
-    "build:clean": "rimraf dist/ coverage/ store/dist/ web/dist/ h/dist/ h/jsx-runtime/dist html/dist/",
+    "build:clean": "rimraf dist/ coverage/ store/dist/ web/dist/ web/storage/dist h/dist/ h/jsx-runtime/dist html/dist/ universal/dist/",
     "build:js": "rollup -c",
     "types": "npm-run-all -nl types:*",
-    "types:clean": "rimraf types/ store/types/ web/types/ h/types/ h/jsx-runtime/types html/types/",
+    "types:clean": "rimraf types/ store/types/ web/types/ web/storage/types/ h/types/ h/jsx-runtime/types html/types/ universal/types/ src/jsx.d.ts h/jsx-runtime/src/jsx.d.ts",
     "types:copy": "ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./src/jsx.d.ts && ncp ../../node_modules/dom-expressions/src/jsx-h.d.ts ./h/jsx-runtime/src/jsx.d.ts",
     "types:src": "tsc --project ./tsconfig.build.json && ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./types/jsx.d.ts",
     "types:web": "tsc --project ./web/tsconfig.build.json",

package/types/reactive/signal.d.ts

@@ -428,7 +428,7 @@ export interface OnOptions {
  * });
  * ```
  *
- * @description https://docs.solidjs.com/reference/reactive-utilities/on
+ * @description https://docs.solidjs.com/reference/reactive-utilities/on-util
  */
 export declare function on<S, Next extends Prev, Prev = Next>(deps: AccessorArray<S> | Accessor<S>, fn: OnEffectFunction<S, undefined | NoInfer<Prev>, Next>, options?: OnOptions & {
     defer?: false;
@@ -571,7 +571,7 @@ export declare function writeSignal(node: SignalState<any> | Memo<any>, value: a
  *
  * * If the error is thrown again inside the error handler, it will trigger the next available parent handler
  *
- * @description https://www.solidjs.com/docs/latest/api#onerror | https://docs.solidjs.com/reference/reactive-utilities/catch-error
+ * @description https://docs.solidjs.com/reference/reactive-utilities/catch-error
  */
 export declare function onError(fn: (err: Error) => void): void;
 export {};

package/types/render/flow.d.ts

@@ -29,7 +29,7 @@ export declare function For<T extends readonly any[], U extends JSX.Element>(pro
  * ```
  * If you have a list with changing indices, better use `<For>`.
  *
- * @description https://docs.solidjs.com/reference/components/index
+ * @description https://docs.solidjs.com/reference/components/index-component
  */
 export declare function Index<T extends readonly any[], U extends JSX.Element>(props: {
     each: T | undefined | null | false;

package/types/server/rendering.d.ts

@@ -85,7 +85,7 @@ export interface Resource<T> {
 }
 type SuspenseContextType = {
     resources: Map<string, {
-        loading: boolean;
+        _loading: boolean;
         error: any;
     }>;
     completed: () => void;

package/web/dist/server.cjs

@@ -143,13 +143,16 @@ function createSerializer({
   onData,
   onDone,
   scopeId,
-  onError
+  onError,
+  plugins: customPlugins
 }) {
+  const defaultPlugins = [web.AbortSignalPlugin,
+  web.CustomEventPlugin, web.DOMExceptionPlugin, web.EventPlugin,
+  web.FormDataPlugin, web.HeadersPlugin, web.ReadableStreamPlugin, web.RequestPlugin, web.ResponsePlugin, web.URLSearchParamsPlugin, web.URLPlugin];
+  const allPlugins = customPlugins ? [...customPlugins, ...defaultPlugins] : defaultPlugins;
   return new seroval.Serializer({
     scopeId,
-    plugins: [web.AbortSignalPlugin,
-    web.CustomEventPlugin, web.DOMExceptionPlugin, web.EventPlugin,
-    web.FormDataPlugin, web.HeadersPlugin, web.ReadableStreamPlugin, web.RequestPlugin, web.ResponsePlugin, web.URLSearchParamsPlugin, web.URLPlugin],
+    plugins: allPlugins,
     globalIdentifier: GLOBAL_IDENTIFIER,
     disabledFeatures: ES2017FLAG,
     onData,
@@ -170,6 +173,7 @@ function renderToString(code, options = {}) {
   let scripts = "";
   const serializer = createSerializer({
     scopeId: renderId,
+    plugins: options.plugins,
     onData(script) {
       if (!scripts) {
         scripts = getLocalHeaderScript(renderId);
@@ -250,6 +254,7 @@ function renderToStream(code, options = {}) {
   };
   const serializer = createSerializer({
     scopeId: options.renderId,
+    plugins: options.plugins,
     onData: pushTask,
     onDone,
     onError: options.onError
@@ -535,7 +540,7 @@ function ssrAttribute(key, value, isBoolean) {
 }
 function ssrHydrationKey() {
   const hk = getHydrationKey();
-  return hk ? ` data-hk=${hk}` : "";
+  return hk ? ` data-hk="${hk}"` : "";
 }
 function escape(s, attr) {
   const t = typeof s;

package/web/dist/server.js

@@ -142,13 +142,16 @@ function createSerializer({
   onData,
   onDone,
   scopeId,
-  onError
+  onError,
+  plugins: customPlugins
 }) {
+  const defaultPlugins = [AbortSignalPlugin,
+  CustomEventPlugin, DOMExceptionPlugin, EventPlugin,
+  FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin];
+  const allPlugins = customPlugins ? [...customPlugins, ...defaultPlugins] : defaultPlugins;
   return new Serializer({
     scopeId,
-    plugins: [AbortSignalPlugin,
-    CustomEventPlugin, DOMExceptionPlugin, EventPlugin,
-    FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin],
+    plugins: allPlugins,
     globalIdentifier: GLOBAL_IDENTIFIER,
     disabledFeatures: ES2017FLAG,
     onData,
@@ -169,6 +172,7 @@ function renderToString(code, options = {}) {
   let scripts = "";
   const serializer = createSerializer({
     scopeId: renderId,
+    plugins: options.plugins,
     onData(script) {
       if (!scripts) {
         scripts = getLocalHeaderScript(renderId);
@@ -249,6 +253,7 @@ function renderToStream(code, options = {}) {
   };
   const serializer = createSerializer({
     scopeId: options.renderId,
+    plugins: options.plugins,
     onData: pushTask,
     onDone,
     onError: options.onError
@@ -534,7 +539,7 @@ function ssrAttribute(key, value, isBoolean) {
 }
 function ssrHydrationKey() {
   const hk = getHydrationKey();
-  return hk ? ` data-hk=${hk}` : "";
+  return hk ? ` data-hk="${hk}"` : "";
 }
 function escape(s, attr) {
   const t = typeof s;