diff --git a/README.md b/README.md
index 979169dd9..be62a870f 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
[](https://pnpm.io/)
[](https://turborepo.org/)
-[](https://dash.deno.com/playground/combined-npm-downloads)
+[](https://dash.deno.com/playground/combined-npm-downloads)
A project that strives to develop high-quality, community contributed Solid primitives. All utilities are well tested and continuously maintained. Every contribution to the repository is checked for quality and maintained to the highest degree of excellence. The ultimate goal is to extend Solid's primary and secondary primitives with a set of tertiary primitives.
@@ -66,6 +66,7 @@ The goal of Solid Primitives is to wrap client and server side functionality to
|[event-dispatcher](https://github.com/solidjs-community/solid-primitives/tree/main/packages/event-dispatcher#readme)|[](https://github.com/solidjs-community/solid-primitives#contribution-process)|[createEventDispatcher](https://github.com/solidjs-community/solid-primitives/tree/main/packages/event-dispatcher#createeventdispatcher)|[](https://bundlephobia.com/package/@solid-primitives/event-dispatcher)|[](https://www.npmjs.com/package/@solid-primitives/event-dispatcher)|
|[i18n](https://github.com/solidjs-community/solid-primitives/tree/main/packages/i18n#readme)|[](https://github.com/solidjs-community/solid-primitives#contribution-process)|[createI18nContext](https://github.com/solidjs-community/solid-primitives/tree/main/packages/i18n#createi18ncontext) [useI18n](https://github.com/solidjs-community/solid-primitives/tree/main/packages/i18n#usei18n)|[](https://bundlephobia.com/package/@solid-primitives/i18n)|[](https://www.npmjs.com/package/@solid-primitives/i18n)|
|[immutable](https://github.com/solidjs-community/solid-primitives/tree/main/packages/immutable#readme)|[](https://github.com/solidjs-community/solid-primitives#contribution-process)|[List of functions](https://github.com/solidjs-community/solid-primitives/tree/main/packages/immutable#list-of-functions)|[](https://bundlephobia.com/package/@solid-primitives/immutable)|[](https://www.npmjs.com/package/@solid-primitives/immutable)|
+|[jsx-parser](https://github.com/solidjs-community/solid-primitives/tree/main/packages/jsx-parser#readme)|[](https://github.com/solidjs-community/solid-primitives#contribution-process)|[createJSXParser](https://github.com/solidjs-community/solid-primitives/tree/main/packages/jsx-parser#createjsxparser)|[](https://bundlephobia.com/package/@solid-primitives/jsx-parser)|[](https://www.npmjs.com/package/@solid-primitives/jsx-parser)|
|[map](https://github.com/solidjs-community/solid-primitives/tree/main/packages/map#readme)|[](https://github.com/solidjs-community/solid-primitives#contribution-process)|[ReactiveMap](https://github.com/solidjs-community/solid-primitives/tree/main/packages/map#reactivemap) [ReactiveWeakMap](https://github.com/solidjs-community/solid-primitives/tree/main/packages/map#reactiveweakmap)|[](https://bundlephobia.com/package/@solid-primitives/map)|[](https://www.npmjs.com/package/@solid-primitives/map)|
|[pagination](https://github.com/solidjs-community/solid-primitives/tree/main/packages/pagination#readme)|[](https://github.com/solidjs-community/solid-primitives#contribution-process)|[createPagination](https://github.com/solidjs-community/solid-primitives/tree/main/packages/pagination#createpagination)|[](https://bundlephobia.com/package/@solid-primitives/pagination)|[](https://www.npmjs.com/package/@solid-primitives/pagination)|
|[platform](https://github.com/solidjs-community/solid-primitives/tree/main/packages/platform#readme)|[](https://github.com/solidjs-community/solid-primitives#contribution-process)|[List of variables](https://github.com/solidjs-community/solid-primitives/tree/main/packages/platform#list-of-variables)|[](https://bundlephobia.com/package/@solid-primitives/platform)|[](https://www.npmjs.com/package/@solid-primitives/platform)|
diff --git a/packages/jsx-parser/LICENSE b/packages/jsx-parser/LICENSE
new file mode 100644
index 000000000..38b41d975
--- /dev/null
+++ b/packages/jsx-parser/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Solid Primitives Working Group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/packages/jsx-parser/README.md b/packages/jsx-parser/README.md
new file mode 100644
index 000000000..3095cb93b
--- /dev/null
+++ b/packages/jsx-parser/README.md
@@ -0,0 +1,134 @@
+
+
+
+
+# @solid-primitives/parser
+
+A primitive to extend the types of values JSX can return. These JSX-elements are named `tokens`.
+
+- [`createJSXParser`](#createJSXParser) — Provides the tools to create and identify `tokens`: `createToken`, `childrenTokens`, `isToken` and `id`.
+- [`createToken`](#createToken) — Instantiates a `token` associated with the corresponding jsx-parser.
+- [`childrenTokens`](#childrenTokens) — A function similar to Solid's `children()`, but that will only return valid `tokens` created by the corresponding jsx-parser's `createToken`
+- [`isToken`](#isToken) — A function to validate if an element is a `token` created by the corresponding jsx-parser's `createToken`
+- [`id`](#id) — The symbol unique to the corresponding jsx-parser
+
+## Installation
+
+```bash
+npm install @solid-primitives/jsx-parser
+# or
+yarn add @solid-primitives/jsx-parser
+# or
+pnpm add @solid-primitives/jsx-parser
+```
+
+## `createJSXParser`
+
+Provides the tools to create and identify `tokens`.
+
+### How to use it
+
+`createJSXParser` takes an optional id as argument, and returns the following functions `createToken`, `childrenTokens`, `isToken` and the symbol associated with the jsx-parser `id`.
+
+It also takes as a generic the union of accepted token-types.
+
+```tsx
+import { createJSXParser } from "@solid-primitives/jsx-parser";
+
+type UnionOfAcceptedTokens = Token1 | Token2 | ...
+
+const {createToken, childrenTokens, isToken, id} = createJSXParser('parser-example');
+```
+
+## `createToken`
+
+A function to create a `token` associated with the corresponding jsx-parser.
+
+### How to use it
+
+`createToken` takes two callback-arguments: the first callback returns the token, an optional second callback returns a JSXElement. This second callback is used when the token is being rendered by Solid. If the second callback is not present, the following error will be shown instead: `tokens can only be rendered inside a Parser with id ...`
+
+It takes as generic two types: the props of the associated JSX-element and the return-value of the token.
+
+```tsx
+type Props = {
+ id: string;
+};
+
+type Token = {
+ props: Props;
+ value: number;
+};
+
+const TokenExample = createToken(
+ props => {
+ const value = Math.random();
+ return {
+ props,
+ value
+ };
+ },
+ props => {
+ return {props.id};
+ }
+);
+```
+
+This token can then be used as a JSX-element inside your solid-code:
+
+```tsx
+const App = () => {
+ return ;
+};
+```
+
+TokenExample is typed as a JSXElement, this is so TokenExample can be used in JSX without causing type-errors.
+
+## `childrenTokens`
+
+A function similar to Solid's [`children()`](https://www.solidjs.com/docs/latest#children), but that will only return valid `tokens` created by the corresponding jsx-parser's `createToken`
+
+### How to use it
+
+`childrenTokens` takes a callback returning `props.children`, and will return all tokens associated with the corresponding jsx-parser. Just like Solid's `children`, `childrenTokens` will resolve the tokens: multiple `childrenTokens` of the same `props.children` will execute the token-callback multiple times!
+
+```tsx
+const tokens = childrenTokens(() => props.children);
+```
+
+## `isToken`
+
+A function to validate if a value is a token created by the corresponding jsx-parser, by checking if the value contains the `id`-symbol.
+
+### How to use it
+
+`isToken` takes a value, often this would be a JSXElement. The function returns `false` in case the value is not a token created by the corresponding jsx-parser. In case the value is a token `isToken` returns the value cast to a `token`.
+
+```tsx
+const value = props.children[0]; // value is typed as a JSXElement
+const token = isToken(value);
+if (!token) return;
+token; // token is typed as UnionOfAcceptedTokens
+```
+
+## `id`
+
+The symbol which is attached to all tokens of the corresponding jsx-parser. This is internally used in `childrenTokens` and `isToken` to validate if a value is a token.
+
+### How to use it
+
+`id` can be used for validation.
+
+```tsx
+const value = props.children[0];
+if (!(id in value)) return;
+const token = value as UnionOfAcceptedTokens;
+```
+
+## Demo
+
+TODO
+
+## Changelog
+
+See [CHANGELOG.md](./CHANGELOG.md)
diff --git a/packages/jsx-parser/dev/index.html b/packages/jsx-parser/dev/index.html
new file mode 100644
index 000000000..38e477282
--- /dev/null
+++ b/packages/jsx-parser/dev/index.html
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+ Solid App
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/jsx-parser/dev/index.tsx b/packages/jsx-parser/dev/index.tsx
new file mode 100644
index 000000000..a3c49461c
--- /dev/null
+++ b/packages/jsx-parser/dev/index.tsx
@@ -0,0 +1,86 @@
+import { Component, JSX, ParentComponent } from "solid-js";
+import { render } from "solid-js/web";
+import "uno.css";
+import { createJSXParser } from "../src";
+
+type Props = {
+ value: number;
+ children?: JSX.Element | JSX.Element[];
+};
+
+const { createToken, childrenTokens } = createJSXParser<{
+ id: "Value" | "Add" | "Subtract";
+ props: Props;
+}>({ name: "calculator" });
+
+const Calculator: ParentComponent = props => {
+ const tokens = childrenTokens(() => props.children);
+
+ const calculation = () => {
+ let result = 0;
+ tokens().forEach(token => {
+ console.info("token is ", token);
+ if (token.id === "Value") {
+ result = token.props.value;
+ } else if (token.id === "Add") {
+ result += token.props.value;
+ } else if (token.id === "Subtract") {
+ result -= token.props.value;
+ }
+ console.info("result is", result);
+ });
+ return result;
+ };
+
+ return (
+
+