Merge branch 'main' into fix-map

eslint.config.mjs

@@ -3,9 +3,12 @@ import noOnlyTests from "eslint-plugin-no-only-tests";
 import eslintComments from "eslint-plugin-eslint-comments";
 import tsParser from "@typescript-eslint/parser";
 
-export default [{
-  ignores: ["packages/*/dist/**/*", "packages/*/dev/**/*", "**/*/__snapshots__/**/*"],
-}, {
+/** @type {import("eslint").Linter.Config} */
+export default {
+
+  files: ["**/*.{js,mjs,jsx,ts,tsx}"],
+  ignores: ["**/{dist,node_modules,__snapshots__}/**/*", "packages/*/dev/**/*", "site/**/*"],
+
   plugins: {
     "@typescript-eslint": typescriptEslint,
     "no-only-tests": noOnlyTests,
@@ -44,4 +47,4 @@ export default [{
     "eslint-comments/no-unused-disable": "warn",
     "no-only-tests/no-only-tests": "warn",
   },
-}];
+};

package.json

@@ -13,8 +13,8 @@
   "scripts": {
     "dev": "pnpm -dir site run dev",
     "format": "prettier --cache -w {site,packages,scripts,template}/**/*.{js,ts,json,css,tsx,jsx,md,html} --ignore-path .gitignore",
-    "lint:packages": "echo \"DISABLED: eslint --max-warnings 0 packages/*/src/**/*\"",
-    "lint:tests": "echo \"DISABLED: eslint packages/*/test/** --rule \"no-only-tests/no-only-tests: error\"\"",
+    "lint:packages": "eslint --max-warnings 0 \"packages/*/src/**/*\"",
+    "lint:tests": "eslint \"packages/*/test/**\" --rule \"no-only-tests/no-only-tests: error\"",
     "lint": "pnpm run \"/^lint:.*/\"",  
     "test:client": "vitest -c ./configs/vitest.config.ts",
     "test:ssr": "pnpm run test:client --mode ssr",
@@ -37,7 +37,6 @@
     "eslint": "^9.10.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-no-only-tests": "^3.3.0",
-    "gzip-size": "^7.0.0",
     "jsdom": "^25.0.0",
     "json-to-markdown-table": "^1.0.0",
     "prettier": "^3.3.3",

packages/cookies/README.md

@@ -0,0 +1,98 @@
+<p>
+  <img width="100%" src="https://assets.solidjs.com/banner?type=Primitives&background=tiles&project=cookies" alt="Solid Primitives cookies">
+</p>
+
+# @solid-primitives/cookies
+
+[![turborepo](https://img.shields.io/badge/built%20with-turborepo-cc00ff.svg?style=for-the-badge&logo=turborepo)](https://turborepo.org/)
+[![size](https://img.shields.io/bundlephobia/minzip/@solid-primitives/cookies?style=for-the-badge&label=size)](https://bundlephobia.com/package/@solid-primitives/cookies)
+[![version](https://img.shields.io/npm/v/@solid-primitives/cookies?style=for-the-badge)](https://www.npmjs.com/package/@solid-primitives/cookies)
+[![stage](https://img.shields.io/endpoint?style=for-the-badge&url=https%3A%2F%2Fraw.githubusercontent.com%2Fsolidjs-community%2Fsolid-primitives%2Fmain%2Fassets%2Fbadges%2Fstage-0.json)](https://github.com/solidjs-community/solid-primitives#contribution-process)
+
+A set of primitives for handling cookies in solid
+
+- [`createServerCookie`](#createservercookie) - Provides a getter and setter for a reactive cookie, which works isomorphically.
+- [`createUserTheme`](#createusertheme) - Creates a Server Cookie providing a type safe way to store a theme and access it on the server or client.
+- [`getCookiesString`](#getCookiesString) - A primitive that allows for the cookie string to be accessed isomorphically on the client, or on the server
+
+## Installation
+
+```bash
+npm install @solid-primitives/cookies
+# or
+yarn add @solid-primitives/cookies
+# or
+pnpm add @solid-primitives/cookies
+```
+
+## How to use it
+
+## `createServerCookie`
+
+A primitive for creating a cookie that can be accessed isomorphically on the client, or the server.
+
+```ts
+import { createServerCookie } from "@solid-primitives/cookies";
+
+const [cookie, setCookie] = createServerCookie("cookieName");
+
+cookie(); // => string | undefined
+```
+
+### Custom serialization
+
+Custom cookie serializers and deserializers can also be implemented
+
+```ts
+import { createServerCookie } from "@solid-primitives/cookies";
+
+const [serverCookie, setServerCookie] = createServerCookie("coolCookie", {
+  deserialize: str => (str ? str.split(" ") : []), // Deserializes cookie into a string[]
+  serialize: val => (val ? val.join(" ") : ""), // serializes the value back into a string
+});
+
+serverCookie(); // => string[]
+```
+
+## `createUserTheme`
+
+Composes `createServerCookie` to provide a type safe way to store a theme and access it on the server or client.
+
+```ts
+import { createUserTheme } from "@solid-primitives/cookies";
+
+const [theme, setTheme] = createUserTheme("cookieName");
+
+theme(); // => "light" | "dark" | undefined
+
+// with default value
+const [theme, setTheme] = createUserTheme("cookieName", {
+  defaultValue: "light",
+});
+
+theme(); // => "light" | "dark"
+```
+
+## `getCookiesString`
+
+A primitive that allows for the cookie string to be accessed isomorphically on the client, or on the server.
+Uses `getRequestEvent` on the server and `document.cookie` on the client.
+
+```ts
+import { getCookiesString, parseCookie } from "@solid-primitives/cookies";
+
+const string = getCookiesString();
+const cookie = parseCookie(string, "cookie_name");
+```
+
+## Examples
+
+PRs welcome :)
+
+## Demo
+
+You can view a demo of this primitive here: <https://codesandbox.io/p/sandbox/amazing-easley-wqk38i?file=%2Fsrc%2Fcookies_primitive%2Findex.ts%3A36%2C20>
+
+## Changelog
+
+See [CHANGELOG.md](./CHANGELOG.md)

packages/start/dev/index.tsx → packages/cookies/dev/index.tsx

@@ -1,16 +1,17 @@
-import { Component, createSignal } from "solid-js";
+import { Component } from "solid-js";
+import { createUserTheme } from "../src/index.js";
 
 const App: Component = () => {
-  const [count, setCount] = createSignal(0);
-  const increment = () => setCount(count() + 1);
+  const [theme, setTheme] = createUserTheme();
+  const increment = () => setTheme(theme() === "light" ? "dark" : "light");
   return (
     <div class={`min-h-screen ${"dark" == "dark" ? "dark" : ""}`}>
       <div class="box-border flex min-h-screen w-full flex-col items-center justify-center space-y-4 bg-gray-800 p-24 text-white">
         <div class="wrapper-v">
           <h4>Counter component</h4>
           <p class="caption">it's very important...</p>
           <button class="btn" onClick={increment}>
-            {count()}
+            {theme()}
           </button>
         </div>
       </div>

packages/start/package.json → packages/cookies/package.json

@@ -1,13 +1,14 @@
 {
-  "name": "@solid-primitives/start",
-  "version": "0.0.4",
-  "description": "A set of primitives for Solid Start",
-  "author": "Thomas",
+  "name": "@solid-primitives/cookies",
+  "version": "0.0.1",
+  "description": "A set of primitives for handling cookies in solid",
+  "author": "Thomas Beer (https://github.com/Tommypop2)",
   "contributors": [
-    "Damian Tarnawski <[email protected]>"
+    "Damian Tarnawski <[email protected]>",
+    "Seth Murphy (https://github.com/eagerestwolf)"
   ],
   "license": "MIT",
-  "homepage": "https://primitives.solidjs.community/package/start",
+  "homepage": "https://primitives.solidjs.community/package/cookies",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/solidjs-community/solid-primitives.git"
@@ -16,18 +17,18 @@
     "url": "https://github.com/solidjs-community/solid-primitives/issues"
   },
   "primitive": {
-    "name": "start",
+    "name": "cookies",
     "stage": 0,
     "list": [
       "createServerCookie",
-      "createUserTheme"
+      "createUserTheme",
+      "getCookiesString"
     ],
-    "category": "Solid Start"
+    "category": "Network"
   },
   "keywords": [
     "solid",
     "primitives",
-    "solid-start",
     "ssr"
   ],
   "private": false,
@@ -59,11 +60,9 @@
     "test:ssr": "pnpm run vitest --mode ssr"
   },
   "peerDependencies": {
-    "solid-js": "^1.6.12",
-    "solid-start": ">=0.2.26"
+    "solid-js": "^1.8.18"
   },
   "devDependencies": {
-    "solid-js": "^1.8.7",
-    "solid-start": "^0.3.10"
+    "solid-js": "^1.8.18"
   }
 }

packages/start/src/index.ts → packages/cookies/src/index.ts

@@ -1,28 +1,43 @@
 import { createSignal, createEffect, Signal } from "solid-js";
-import { isServer } from "solid-js/web";
-import { parseCookie } from "solid-start";
-import { useRequest } from "solid-start/server/ServerContext.jsx";
+import { getRequestEvent, isServer } from "solid-js/web";
+
+const YEAR = 365 * 24 * 60 * 60;
+
+/*
+ Original code by Chakra UI
+ MIT Licensed, Copyright (c) 2019 Segun Adebayo.
+
+ Credits to the Chakra UI team:
+ https://github.com/chakra-ui/chakra-ui/blob/%40chakra-ui/toast%401.2.0/packages/color-mode/src/storage-manager.ts
+*/
+
+export function parseCookie(cookie: string, key: string): string | undefined {
+  return cookie.match(new RegExp(`(^| )${key}=([^;]+)`))?.[2];
+}
+
+/**
+ * A primitive that allows for the cookie string to be accessed isomorphically on the client, or on the server
+ * @return Returns the cookie string
+ */
+export function getCookiesString(): string {
+  if (isServer) {
+    return getRequestEvent()?.request.headers.get("cookie") ?? "";
+  }
+  return document.cookie;
+}
 
 export type MaxAgeOptions = {
-  /**
-   * The maximum age of the cookie in seconds. Defaults to 1 year.
-   */
+  /** The maximum age of the cookie in seconds. Defaults to 1 year. */
   cookieMaxAge?: number;
 };
 
 export type ServerCookieOptions<T = string> = MaxAgeOptions & {
-  /**
-   * A function to deserialize the cookie value to be used as signal value
-   */
+  /** A function to deserialize the cookie value to be used as signal value */
   deserialize?: (str: string | undefined) => T;
-  /**
-   * A function to serialize the signal value to be used as cookie value
-   */
+  /** A function to serialize the signal value to be used as cookie value */
   serialize?: (value: T) => string;
 };
 
-const YEAR = 365 * 24 * 60 * 60;
-
 /**
  * A primitive for creating a cookie that can be accessed isomorphically on the client, or the server
  *
@@ -51,13 +66,7 @@ export function createServerCookie<T>(
     cookieMaxAge = YEAR,
   } = options ?? {};
 
-  const [cookie, setCookie] = createSignal(
-    deserialize(
-      parseCookie(isServer ? (useRequest().request.headers.get("cookie") ?? "") : document.cookie)[
-        name
-      ],
-    ),
-  );
+  const [cookie, setCookie] = createSignal(deserialize(parseCookie(getCookiesString(), name)));
 
   createEffect(p => {
     const string = serialize(cookie());
@@ -91,10 +100,10 @@ export function createUserTheme(
   name?: string,
   options?: UserThemeOptions,
 ): Signal<Theme | undefined>;
-export function createUserTheme(name = "theme", options?: UserThemeOptions): Signal<any> {
-  const defaultValue = options?.defaultValue;
+export function createUserTheme(name = "theme", options: UserThemeOptions = {}): Signal<any> {
+  const { defaultValue, cookieMaxAge } = options;
   return createServerCookie(name, {
-    ...options,
+    cookieMaxAge,
     deserialize: str => (str === "light" || str === "dark" ? str : defaultValue),
     serialize: String,
   });

packages/date/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @solid-primitives/date
 
+## 2.0.24
+
+### Patch Changes
+
+- @solid-primitives/memo@1.3.10
+
 ## 2.0.23
 
 ### Patch Changes

packages/date/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solid-primitives/date",
-  "version": "2.0.23",
+  "version": "2.0.24",
   "description": "Collection of reactive primitives and utility functions, providing easier ways to deal with dates in SolidJS",
   "author": "Damian Tarnawski @thetarnav <[email protected]>",
   "license": "MIT",

packages/deep/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @solid-primitives/deep
 
+## 0.2.10
+
+### Patch Changes
+
+- @solid-primitives/memo@1.3.10
+
 ## 0.2.9
 
 ### Patch Changes

packages/deep/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solid-primitives/deep",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "Primitives for tracking and observing nested reactive objects in Solid.",
   "author": "Samuel Burbano <[email protected]>",
   "contributors": [

packages/filesystem/src/adapter-vfs.ts

@@ -21,7 +21,7 @@ export const makeVirtualFileSystem = (
   const storageValue = storage?.getItem(key);
   try {
     storedValue = JSON.parse(typeof storageValue === "string" ? storageValue : "null");
-  } catch (e) {}
+  } catch (_) {}
   let fs = storedValue || initial || {};
   if ((storageValue as unknown) instanceof Promise) {
     (storageValue as unknown as Promise<string>).then(storedValue => {
@@ -57,7 +57,7 @@ export const makeVirtualFileSystem = (
       typeof ref === "object" &&
         Object.keys(ref).forEach((item: string) =>
           typeof ref[item] === "string"
-            ? files.push(filter(`${path}${item}`, ref[item] as string))
+            ? files.push(filter(`${path}${item}`, ref[item]))
             : walker(ref[item], `${path}${item}/`),
         );
     };
@@ -181,7 +181,7 @@ export const makeVirtualFileSystem = (
         get: path => {
           try {
             return ofs.readFile(path);
-          } catch (e) {}
+          } catch (_) {}
         },
         has: path => ofs.getType(path) === "file",
         keys: () => getFiles(path => path)[Symbol.iterator](),

packages/immutable/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @solid-primitives/immutable
 
+## 1.0.10
+
+### Patch Changes
+
+- Updated dependencies [9749071]
+  - @solid-primitives/keyed@1.2.3
+
 ## 1.0.9
 
 ### Patch Changes

packages/immutable/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solid-primitives/immutable",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Primitive for rectifying immutable values and dealing with immutability in Solid.",
   "author": "Damian Tarnawski <[email protected]>",
   "contributors": [],