Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: JSX serialization #291

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions packages/dom-expressions/src/serializer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Feature, Serializer, getCrossReferenceHeader } from "seroval";
import { Feature, Serializer, getCrossReferenceHeader, createPlugin } from "seroval";
import { SSRNode } from "./ssr-node";
import {
CustomEventPlugin,
DOMExceptionPlugin,
Expand All @@ -18,6 +19,31 @@ const ES2017FLAG =

const GLOBAL_IDENTIFIER = '_$HY.r'; // TODO this is a pending name

const JSXPlugin = createPlugin({
tag: 'SolidJSX',
test(value) {
return value.constructor === SSRNode;
},
parse: {
sync(value, ctx) {
// return ctx.parse(value.t);
return undefined;
},
async(value, ctx) {
// return ctx.parse(value.t);
return undefined;
},
stream(value, ctx) {
// return ctx.parse(value.t);
return undefined;
},
},
serialize(node, ctx) {
// return '_$HY.tmpl(' + ctx.serialize(node) + ')';
return 'void 0';
},
});

export function createSerializer({ onData, onDone, scopeId, onError }) {
return new Serializer({
scopeId,
Expand All @@ -34,12 +60,13 @@ export function createSerializer({ onData, onDone, scopeId, onError }) {
ResponsePlugin,
URLSearchParamsPlugin,
URLPlugin,
JSXPlugin
],
globalIdentifier: GLOBAL_IDENTIFIER,
disabledFeatures: ES2017FLAG,
onData,
onDone,
onError,
onError
});
}

Expand Down
27 changes: 7 additions & 20 deletions packages/dom-expressions/src/server.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Aliases, BooleanAttributes, ChildProperties } from "./constants";
import { sharedConfig, root } from "rxcore";
import { SSRNode, resolveSSRNode } from "./ssr-node";
import { createSerializer, getLocalHeaderScript } from "./serializer";
export { createComponent } from "rxcore";

Expand Down Expand Up @@ -304,7 +305,7 @@ export function ssr(t, ...nodes) {
t = result + t[nodes.length];
}

return { t };
return new SSRNode(t);
}

export function ssrClassList(value) {
Expand Down Expand Up @@ -373,9 +374,9 @@ export function ssrElement(tag, props, children, needsId) {
if (i !== keys.length - 1) result += " ";
}

if (skipChildren) return { t: result + "/>" };
if (skipChildren) return new SSRNode(result + "/>");
if (typeof children === "function") children = children();
return { t: result + `>${resolveSSRNode(children, true)}</${tag}>` };
return new SSRNode(result + `>${resolveSSRNode(children, true)}</${tag}>`)
}

export function ssrAttribute(key, value, isBoolean) {
Expand Down Expand Up @@ -440,23 +441,9 @@ export function escape(s, attr) {
return left < s.length ? out + s.substring(left) : out;
}

export function resolveSSRNode(node, top) {
const t = typeof node;
if (t === "string") return node;
if (node == null || t === "boolean") return "";
if (Array.isArray(node)) {
let prev = {};
let mapped = "";
for (let i = 0, len = node.length; i < len; i++) {
if (!top && typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!$-->`;
mapped += resolveSSRNode((prev = node[i]));
}
return mapped;
}
if (t === "object") return node.t;
if (t === "function") return resolveSSRNode(node());
return String(node);
}
export {
resolveSSRNode,
};

export function mergeProps(...sources) {
const target = {};
Expand Down
23 changes: 23 additions & 0 deletions packages/dom-expressions/src/ssr-node.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
export class SSRNode {
constructor(t) {
this.t = t;
}
}

export function resolveSSRNode(node, top) {
const t = typeof node;
if (t === "string") return node;
if (node == null || t === "boolean") return "";
if (Array.isArray(node)) {
let prev = {};
let mapped = "";
for (let i = 0, len = node.length; i < len; i++) {
if (!top && typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!$-->`;
mapped += resolveSSRNode((prev = node[i]));
}
return mapped;
}
if (t === "object") return node.t;
if (t === "function") return resolveSSRNode(node());
return String(node);
}
Loading