@solidjs/web 2.0.0-beta.3 → 2.0.0-beta.30

package/frames/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "@solidjs/web/frames",
+  "main": "./dist/server.cjs",
+  "module": "./dist/server.js",
+  "types": "../types/frames/server.d.ts",
+  "type": "module",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "browser": {
+        "import": {
+          "types": "../types/frames/client.d.ts",
+          "default": "./dist/client.js"
+        },
+        "require": {
+          "types": "../types-cjs/frames/client.d.cts",
+          "default": "./dist/client.cjs"
+        }
+      },
+      "import": {
+        "types": "../types/frames/server.d.ts",
+        "default": "./dist/server.js"
+      },
+      "require": {
+        "types": "../types-cjs/frames/server.d.cts",
+        "default": "./dist/server.cjs"
+      }
+    }
+  }
+}

package/package.json

@@ -1,99 +1,348 @@
 {
   "name": "@solidjs/web",
-  "description": "Solid's web runtime for the browser and the server",
-  "version": "2.0.0-beta.3",
+  "description": "Solid's web runtime: client rendering, hydration, SSR, and DOM-specific control flow (Portal, Dynamic).",
+  "version": "2.0.0-beta.30",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
   "repository": {
     "type": "git",
-    "url": "https://github.com/solidjs/solid-web"
+    "url": "git+https://github.com/solidjs/solid.git",
+    "directory": "packages/solid-web"
   },
   "publishConfig": {
     "access": "public"
   },
   "main": "./dist/server.cjs",
   "module": "./dist/server.js",
-  "unpkg": "./dist/web.cjs",
+  "unpkg": "./dist/web.js",
+  "jsdelivr": "./dist/web.js",
   "types": "./types/index.d.ts",
   "type": "module",
   "sideEffects": false,
   "files": [
     "dist",
     "types",
+    "types-cjs",
     "package.json",
     "storage/dist",
     "storage/types",
-    "storage/package.json"
+    "storage/types-cjs",
+    "storage/package.json",
+    "serialization/dist",
+    "serialization/types",
+    "serialization/types-cjs",
+    "serialization/package.json",
+    "server-functions/dist",
+    "server-functions/package.json",
+    "frames/dist",
+    "frames/package.json"
   ],
   "exports": {
     ".": {
       "worker": {
-        "types": "./types/index.d.ts",
-        "import": "./dist/server.js",
-        "require": "./dist/server.cjs"
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/server.js"
+        },
+        "require": {
+          "types": "./types-cjs/index.d.cts",
+          "default": "./dist/server.cjs"
+        }
       },
       "browser": {
         "development": {
+          "import": {
+            "types": "./types/index.d.ts",
+            "default": "./dist/dev.js"
+          },
+          "require": {
+            "types": "./types-cjs/index.d.cts",
+            "default": "./dist/dev.cjs"
+          }
+        },
+        "import": {
           "types": "./types/index.d.ts",
-          "import": "./dist/dev.js",
-          "require": "./dist/dev.cjs"
+          "default": "./dist/web.js"
         },
-        "types": "./types/index.d.ts",
-        "import": "./dist/web.js",
-        "require": "./dist/web.cjs"
+        "require": {
+          "types": "./types-cjs/index.d.cts",
+          "default": "./dist/web.cjs"
+        }
       },
       "deno": {
-        "types": "./types/index.d.ts",
-        "import": "./dist/server.js",
-        "require": "./dist/server.cjs"
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/server.js"
+        },
+        "require": {
+          "types": "./types-cjs/index.d.cts",
+          "default": "./dist/server.cjs"
+        }
       },
       "node": {
-        "types": "./types/index.d.ts",
-        "import": "./dist/server.js",
-        "require": "./dist/server.cjs"
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/server.js"
+        },
+        "require": {
+          "types": "./types-cjs/index.d.cts",
+          "default": "./dist/server.cjs"
+        }
       },
       "development": {
+        "import": {
+          "types": "./types/index.d.ts",
+          "default": "./dist/dev.js"
+        },
+        "require": {
+          "types": "./types-cjs/index.d.cts",
+          "default": "./dist/dev.cjs"
+        }
+      },
+      "import": {
         "types": "./types/index.d.ts",
-        "import": "./dist/dev.js",
-        "require": "./dist/dev.cjs"
+        "default": "./dist/web.js"
+      },
+      "require": {
+        "types": "./types-cjs/index.d.cts",
+        "default": "./dist/web.cjs"
+      }
+    },
+    "./jsx-runtime": {
+      "import": {
+        "types": "./types/jsx.d.ts",
+        "default": "./dist/web.js"
       },
-      "types": "./types/index.d.ts",
-      "import": "./dist/web.js",
-      "require": "./dist/web.cjs"
+      "require": {
+        "types": "./types-cjs/jsx.d.cts",
+        "default": "./dist/web.cjs"
+      }
+    },
+    "./jsx-dev-runtime": {
+      "import": {
+        "types": "./types/jsx.d.ts",
+        "default": "./dist/dev.js"
+      },
+      "require": {
+        "types": "./types-cjs/jsx.d.cts",
+        "default": "./dist/dev.cjs"
+      }
     },
     "./storage": {
-      "types": "./storage/types/index.d.ts",
-      "import": "./storage/dist/storage.js",
-      "require": "./storage/dist/storage.cjs"
+      "import": {
+        "types": "./storage/types/index.d.ts",
+        "default": "./storage/dist/storage.js"
+      },
+      "require": {
+        "types": "./storage/types-cjs/index.d.cts",
+        "default": "./storage/dist/storage.cjs"
+      }
+    },
+    "./serialization": {
+      "import": {
+        "types": "./serialization/types/index.d.ts",
+        "default": "./serialization/dist/serialization.js"
+      },
+      "require": {
+        "types": "./serialization/types-cjs/index.d.cts",
+        "default": "./serialization/dist/serialization.cjs"
+      }
+    },
+    "./server-functions": {
+      "worker": {
+        "import": {
+          "types": "./types/server-functions/server.d.ts",
+          "default": "./server-functions/dist/server.js"
+        },
+        "require": {
+          "types": "./types-cjs/server-functions/server.d.cts",
+          "default": "./server-functions/dist/server.cjs"
+        }
+      },
+      "browser": {
+        "import": {
+          "types": "./types/server-functions/client.d.ts",
+          "default": "./server-functions/dist/client.js"
+        },
+        "require": {
+          "types": "./types-cjs/server-functions/client.d.cts",
+          "default": "./server-functions/dist/client.cjs"
+        }
+      },
+      "deno": {
+        "import": {
+          "types": "./types/server-functions/server.d.ts",
+          "default": "./server-functions/dist/server.js"
+        },
+        "require": {
+          "types": "./types-cjs/server-functions/server.d.cts",
+          "default": "./server-functions/dist/server.cjs"
+        }
+      },
+      "node": {
+        "import": {
+          "types": "./types/server-functions/server.d.ts",
+          "default": "./server-functions/dist/server.js"
+        },
+        "require": {
+          "types": "./types-cjs/server-functions/server.d.cts",
+          "default": "./server-functions/dist/server.cjs"
+        }
+      },
+      "import": {
+        "types": "./types/server-functions/client.d.ts",
+        "default": "./server-functions/dist/client.js"
+      },
+      "require": {
+        "types": "./types-cjs/server-functions/client.d.cts",
+        "default": "./server-functions/dist/client.cjs"
+      }
+    },
+    "./server-functions/server": {
+      "import": {
+        "types": "./types/server-functions/server.d.ts",
+        "default": "./server-functions/dist/server.js"
+      },
+      "require": {
+        "types": "./types-cjs/server-functions/server.d.cts",
+        "default": "./server-functions/dist/server.cjs"
+      }
+    },
+    "./server-functions/client": {
+      "import": {
+        "types": "./types/server-functions/client.d.ts",
+        "default": "./server-functions/dist/client.js"
+      },
+      "require": {
+        "types": "./types-cjs/server-functions/client.d.cts",
+        "default": "./server-functions/dist/client.cjs"
+      }
+    },
+    "./frames": {
+      "worker": {
+        "import": {
+          "types": "./types/frames/server.d.ts",
+          "default": "./frames/dist/server.js"
+        },
+        "require": {
+          "types": "./types-cjs/frames/server.d.cts",
+          "default": "./frames/dist/server.cjs"
+        }
+      },
+      "browser": {
+        "development": {
+          "import": {
+            "types": "./types/frames/client.d.ts",
+            "default": "./frames/dist/client.dev.js"
+          },
+          "require": {
+            "types": "./types-cjs/frames/client.d.cts",
+            "default": "./frames/dist/client.dev.cjs"
+          }
+        },
+        "import": {
+          "types": "./types/frames/client.d.ts",
+          "default": "./frames/dist/client.js"
+        },
+        "require": {
+          "types": "./types-cjs/frames/client.d.cts",
+          "default": "./frames/dist/client.cjs"
+        }
+      },
+      "deno": {
+        "import": {
+          "types": "./types/frames/server.d.ts",
+          "default": "./frames/dist/server.js"
+        },
+        "require": {
+          "types": "./types-cjs/frames/server.d.cts",
+          "default": "./frames/dist/server.cjs"
+        }
+      },
+      "node": {
+        "import": {
+          "types": "./types/frames/server.d.ts",
+          "default": "./frames/dist/server.js"
+        },
+        "require": {
+          "types": "./types-cjs/frames/server.d.cts",
+          "default": "./frames/dist/server.cjs"
+        }
+      },
+      "development": {
+        "import": {
+          "types": "./types/frames/client.d.ts",
+          "default": "./frames/dist/client.dev.js"
+        },
+        "require": {
+          "types": "./types-cjs/frames/client.d.cts",
+          "default": "./frames/dist/client.dev.cjs"
+        }
+      },
+      "import": {
+        "types": "./types/frames/client.d.ts",
+        "default": "./frames/dist/client.js"
+      },
+      "require": {
+        "types": "./types-cjs/frames/client.d.cts",
+        "default": "./frames/dist/client.cjs"
+      }
+    },
+    "./frames/server": {
+      "import": {
+        "types": "./types/frames/server.d.ts",
+        "default": "./frames/dist/server.js"
+      },
+      "require": {
+        "types": "./types-cjs/frames/server.d.cts",
+        "default": "./frames/dist/server.cjs"
+      }
+    },
+    "./frames/client": {
+      "import": {
+        "types": "./types/frames/client.d.ts",
+        "default": "./frames/dist/client.js"
+      },
+      "require": {
+        "types": "./types-cjs/frames/client.d.cts",
+        "default": "./frames/dist/client.cjs"
+      }
     },
-    "./dist/*": "./dist/*",
     "./types/*": "./types/*"
   },
   "dependencies": {
-    "seroval": "^1.1.0",
-    "seroval-plugins": "^1.1.0"
+    "seroval": "~1.5.4",
+    "seroval-plugins": "~1.5.4"
   },
   "peerDependencies": {
-    "solid-js": "^2.0.0-beta.3",
-    "@solidjs/signals": "^0.13.3"
+    "solid-js": "^2.0.0-beta.30"
   },
   "devDependencies": {
-    "solid-js": "2.0.0-beta.3"
+    "solid-js": "2.0.0-beta.30"
   },
   "scripts": {
-    "build": "npm-run-all -nl build:*",
+    "build": "npm-run-all -nl build:clean types:copy-jsx build:js",
     "build:clean": "rimraf dist/",
     "build:js": "rollup -c",
     "link": "symlink-dir . node_modules/@solidjs/web",
-    "types": "npm-run-all -nl types:*",
-    "types:clean": "rimraf types/",
+    "types": "npm-run-all -nl types:clean types:copy-jsx types:web types:copy-web types:web-storage types:copy-server-functions types:web-frames types:copy-serialization types:copy-frames types:cjs",
+    "types:clean": "rimraf types/ types-cjs/ storage/types/ storage/types-cjs/ serialization/types/ serialization/types-cjs/ frames/types/",
+    "types:copy-jsx": "ncp ../../node_modules/@dom-expressions/runtime/src/jsx.d.ts ./src/jsx.d.ts && ncp ../../node_modules/@dom-expressions/runtime/src/jsx-properties.d.ts ./src/jsx-properties.d.ts && dom-expressions-jsx-types --input ./src/jsx.d.ts --element \"SolidElement | Node | ArrayElement\" --import 'import type { Element as SolidElement } from \"solid-js\";'",
     "types:web": "tsc --project ./tsconfig.build.json",
-    "types:copy-web": "ncp ../../node_modules/dom-expressions/src/client.d.ts ./types/client.d.ts && ncp ../../node_modules/dom-expressions/src/server.d.ts ./types/server.d.ts",
+    "types:copy-web": "ncp ../../node_modules/@dom-expressions/runtime/src/client.d.ts ./types/client.d.ts && ncp ../../node_modules/@dom-expressions/runtime/src/server.d.ts ./types/server.d.ts && ncp ../../node_modules/@dom-expressions/runtime/src/serializer.d.ts ./types/serializer.d.ts && ncp ../../node_modules/@dom-expressions/runtime/src/response.d.ts ./types/response.d.ts && ncp ./src/jsx.d.ts ./types/jsx.d.ts && ncp ./src/jsx-properties.d.ts ./types/jsx-properties.d.ts",
     "types:web-storage": "tsc --project ./storage/tsconfig.build.json",
+    "types:web-frames": "tsc --project ./frames/tsconfig.build.json",
+    "types:copy-serialization": "node -e \"fs.mkdirSync('./serialization/types', { recursive: true }); fs.copyFileSync('../../node_modules/@dom-expressions/runtime/src/serializer.d.ts', './serialization/types/index.d.ts');\"",
+    "types:copy-server-functions": "node -e \"fs.mkdirSync('./types/server-functions', { recursive: true }); for (const f of ['shared', 'flash', 'client', 'server']) fs.copyFileSync('../../node_modules/@dom-expressions/runtime/src/server-functions/' + f + '.d.ts', './types/server-functions/' + f + '.d.ts');\"",
+    "types:copy-frames": "node -e \"fs.mkdirSync('./types/frames', { recursive: true }); for (const f of ['frame-client', 'frame-transport', 'frame-sink', 'serializer']) fs.copyFileSync('../../node_modules/@dom-expressions/runtime/src/' + f + '.d.ts', './types/frames/' + f + '.d.ts'); for (const f of ['client', 'server']) fs.writeFileSync('./types/frames/' + f + '.d.ts', fs.readFileSync('./frames/types/' + f + '.d.ts', 'utf8').replaceAll('@dom-expressions/runtime/src/', './'));\"",
+    "types:cjs": "node ../../scripts/sync-dual-types.mjs ./types ./types-cjs ./storage/types ./storage/types-cjs ./serialization/types ./serialization/types-cjs",
     "test": "vitest run && vitest run --config vite.config.server.mjs && vitest run --config vite.config.hydrate.mjs",
     "test:server": "vitest run --config vite.config.server.mjs",
     "coverage": "vitest run --coverage",
-    "test-types": "tsc --project tsconfig.test.json"
+    "bench": "vitest bench --run",
+    "bench:server": "vitest bench --run --config vite.config.server-bench.mjs",
+    "test-types": "npm-run-all -nl types test-types:tsc",
+    "test-types:tsc": "tsc --project tsconfig.test.json"
   }
 }

package/serialization/dist/serialization.cjs

@@ -0,0 +1,169 @@
+'use strict';
+
+var seroval = require('seroval');
+var web = require('seroval-plugins/web');
+
+const DEFAULT_DISABLED_FEATURES = seroval.Feature.AggregateError | seroval.Feature.BigIntTypedArray;
+const serializeOnlyDisabledFeatures = () => process.env.NODE_ENV === "development" ? 0 : seroval.Feature.ErrorPrototypeStack;
+const HYDRATION_GLOBAL = "_$HY.r";
+const DEFAULT_WEB_PLUGINS = Object.freeze([web.AbortSignalPlugin,
+web.CustomEventPlugin, web.DOMExceptionPlugin, web.EventPlugin,
+web.FormDataPlugin, web.HeadersPlugin, web.ReadableStreamPlugin, web.RequestPlugin, web.ResponsePlugin, web.URLSearchParamsPlugin, web.URLPlugin]);
+function resolveSerializerPlugins(customPlugins) {
+  return customPlugins ? [...customPlugins, ...DEFAULT_WEB_PLUGINS] : [...DEFAULT_WEB_PLUGINS];
+}
+function createSerializer(options) {
+  return new seroval.Serializer({
+    ...options,
+    plugins: resolveSerializerPlugins(options.plugins),
+    disabledFeatures: (options.disabledFeatures === undefined ? DEFAULT_DISABLED_FEATURES : options.disabledFeatures) | serializeOnlyDisabledFeatures()
+  });
+}
+function createHydrationSerializer({
+  onData,
+  onDone,
+  scopeId,
+  onError,
+  plugins
+}) {
+  return createSerializer({
+    scopeId,
+    plugins,
+    globalIdentifier: HYDRATION_GLOBAL,
+    onData,
+    onDone,
+    onError
+  });
+}
+function getLocalHeaderScript(id) {
+  return seroval.getCrossReferenceHeader(id) + ";";
+}
+const JSON_CODEC_DISABLED_FEATURES = seroval.Feature.RegExp;
+const JSON_CODEC_DEPTH_LIMIT = 64;
+function resolveCodecOptions({
+  plugins,
+  disabledFeatures,
+  depthLimit
+} = {}) {
+  return {
+    plugins: resolveSerializerPlugins(plugins),
+    disabledFeatures: disabledFeatures === undefined ? JSON_CODEC_DISABLED_FEATURES : disabledFeatures,
+    depthLimit: depthLimit === undefined ? JSON_CODEC_DEPTH_LIMIT : depthLimit
+  };
+}
+function serializeJSON(value, {
+  onParse,
+  onDone,
+  onError,
+  ...codecOptions
+}) {
+  const resolved = resolveCodecOptions(codecOptions);
+  return seroval.toCrossJSONStream(value, {
+    onParse,
+    onDone,
+    onError,
+    ...resolved,
+    disabledFeatures: resolved.disabledFeatures | serializeOnlyDisabledFeatures()
+  });
+}
+function createJSONDeserializer(options) {
+  const refs = new Map();
+  const resolved = resolveCodecOptions(options);
+  return function deserializeJSONChunk(node) {
+    return seroval.fromCrossJSON(node, {
+      refs,
+      ...resolved
+    });
+  };
+}
+function createJSONSerializer({
+  onData,
+  onDone,
+  onError,
+  plugins,
+  disabledFeatures,
+  depthLimit
+}) {
+  const resolved = resolveCodecOptions({
+    plugins,
+    disabledFeatures,
+    depthLimit
+  });
+  const refs = new Map();
+  const cancels = new Set();
+  let pendingWrites = 0;
+  let flushed = false;
+  let done = false;
+  const maybeDone = () => {
+    if (flushed && pendingWrites === 0 && !done) {
+      done = true;
+      onDone && onDone();
+    }
+  };
+  return {
+    write(key, value) {
+      if (flushed) return;
+      pendingWrites++;
+      let settled = false;
+      let cancel = null;
+      const stream = seroval.toCrossJSONStream(value, {
+        refs,
+        plugins: resolved.plugins,
+        disabledFeatures: resolved.disabledFeatures | serializeOnlyDisabledFeatures(),
+        onParse(node, initial) {
+          onData({
+            key,
+            node,
+            initial
+          });
+        },
+        onError,
+        onDone() {
+          settled = true;
+          if (cancel) cancels.delete(cancel);
+          pendingWrites--;
+          maybeDone();
+        }
+      });
+      if (!settled) {
+        cancel = stream;
+        cancels.add(cancel);
+      }
+    },
+    flush() {
+      flushed = true;
+      maybeDone();
+    },
+    close() {
+      flushed = true;
+      for (const cancel of cancels) cancel();
+      cancels.clear();
+    }
+  };
+}
+function createJSONDataTable(options) {
+  const deserialize = createJSONDeserializer(options);
+  const table = new Map();
+  return {
+    apply(record) {
+      const value = deserialize(record.node);
+      if (record.initial) table.set(record.key, value);
+    },
+    get(key) {
+      return table.get(key);
+    },
+    resolve(ref) {
+      return table.get(ref.$ref);
+    }
+  };
+}
+
+exports.DEFAULT_WEB_PLUGINS = DEFAULT_WEB_PLUGINS;
+exports.createHydrationSerializer = createHydrationSerializer;
+exports.createJSONDataTable = createJSONDataTable;
+exports.createJSONDeserializer = createJSONDeserializer;
+exports.createJSONSerializer = createJSONSerializer;
+exports.createSerializer = createSerializer;
+exports.getLocalHeaderScript = getLocalHeaderScript;
+exports.resolveSerializerPlugins = resolveSerializerPlugins;
+exports.serializeJSON = serializeJSON;