{r0}
)
-}
+})
const DynamicImage1 = (props) => {
- const url = createMemo(() => {
- return (
- DynamicImage1ServerFunction.url.replace('_server', '_server/') +
- `&args=${encodeURIComponent(JSON.stringify(props.values))}`
- )
- })
+ const url = createMemo(() =>
+ serverFunctionUrl(DynamicImage1ServerFunction, ...props.values),
+ )
return url
}
const [signal] = createSignal('')
const coolVar = DynamicImage1({
values: [signal()],
-})
+})
\ No newline at end of file
diff --git a/tests/fixtures/solid-start/custom-image-options/code.js b/packages/ogp/tests/fixtures/solid/custom-image-options/code.js
similarity index 100%
rename from tests/fixtures/solid-start/custom-image-options/code.js
rename to packages/ogp/tests/fixtures/solid/custom-image-options/code.js
diff --git a/packages/ogp/tests/fixtures/solid/custom-image-options/output.js b/packages/ogp/tests/fixtures/solid/custom-image-options/output.js
new file mode 100644
index 0000000..18cda32
--- /dev/null
+++ b/packages/ogp/tests/fixtures/solid/custom-image-options/output.js
@@ -0,0 +1,20 @@
+import { serverFunctionUrl } from '@solidjs/web/server-functions'
+import { GET } from '@solidjs/web/server-functions'
+import { createOpenGraphImage } from '@solidjs/ogp/server'
+import { createMemo } from 'solid-js'
+const DynamicImage1ServerFunction = GET((...args) => {
+ 'use server'
+
+ return createOpenGraphImage(Hi!
, {
+ emoji: 'openmoji',
+ })
+})
+const DynamicImage1 = (props) => {
+ const url = createMemo(() =>
+ serverFunctionUrl(DynamicImage1ServerFunction, ...props.values),
+ )
+ return url
+}
+DynamicImage1({
+ values: [],
+})
\ No newline at end of file
diff --git a/tests/fixtures/solid-start/exclude-static/code.js b/packages/ogp/tests/fixtures/solid/exclude-static/code.js
similarity index 100%
rename from tests/fixtures/solid-start/exclude-static/code.js
rename to packages/ogp/tests/fixtures/solid/exclude-static/code.js
diff --git a/tests/fixtures/solid-start/exclude-static/output.js b/packages/ogp/tests/fixtures/solid/exclude-static/output.js
similarity index 54%
rename from tests/fixtures/solid-start/exclude-static/output.js
rename to packages/ogp/tests/fixtures/solid/exclude-static/output.js
index 41c765c..cecff3c 100644
--- a/tests/fixtures/solid-start/exclude-static/output.js
+++ b/packages/ogp/tests/fixtures/solid/exclude-static/output.js
@@ -1,6 +1,8 @@
+import { serverFunctionUrl } from '@solidjs/web/server-functions'
+import { GET } from '@solidjs/web/server-functions'
import { createOpenGraphImage } from '@solidjs/ogp/server'
import { createMemo } from 'solid-js'
-const DynamicImage1ServerFunction = (...args) => {
+const DynamicImage1ServerFunction = GET((...args) => {
'use server'
return createOpenGraphImage(
@@ -12,14 +14,11 @@ const DynamicImage1ServerFunction = (...args) => {
Hello
,
)
-}
+})
const DynamicImage1 = (props) => {
- const url = createMemo(() => {
- return (
- DynamicImage1ServerFunction.url.replace('_server', '_server/') +
- `&args=${encodeURIComponent(JSON.stringify(props.values))}`
- )
- })
+ const url = createMemo(() =>
+ serverFunctionUrl(DynamicImage1ServerFunction, ...props.values),
+ )
return url
}
const coolVar = DynamicImage1({
diff --git a/tests/fixtures/solid-start/missing-child/code.js b/packages/ogp/tests/fixtures/solid/missing-child/code.js
similarity index 100%
rename from tests/fixtures/solid-start/missing-child/code.js
rename to packages/ogp/tests/fixtures/solid/missing-child/code.js
diff --git a/tests/fixtures/solid-start/missing-child/options.json b/packages/ogp/tests/fixtures/solid/missing-child/options.json
similarity index 100%
rename from tests/fixtures/solid-start/missing-child/options.json
rename to packages/ogp/tests/fixtures/solid/missing-child/options.json
diff --git a/tests/fixtures/solid-start/multiple-children/code.js b/packages/ogp/tests/fixtures/solid/multiple-children/code.js
similarity index 100%
rename from tests/fixtures/solid-start/multiple-children/code.js
rename to packages/ogp/tests/fixtures/solid/multiple-children/code.js
diff --git a/tests/fixtures/solid-start/multiple-children/output.js b/packages/ogp/tests/fixtures/solid/multiple-children/output.js
similarity index 52%
rename from tests/fixtures/solid-start/multiple-children/output.js
rename to packages/ogp/tests/fixtures/solid/multiple-children/output.js
index 10d71c2..85cdf90 100644
--- a/tests/fixtures/solid-start/multiple-children/output.js
+++ b/packages/ogp/tests/fixtures/solid/multiple-children/output.js
@@ -1,6 +1,8 @@
+import { serverFunctionUrl } from '@solidjs/web/server-functions'
+import { GET } from '@solidjs/web/server-functions'
import { createOpenGraphImage } from '@solidjs/ogp/server'
import { createMemo } from 'solid-js'
-const DynamicImage1ServerFunction = (...args) => {
+const DynamicImage1ServerFunction = GET((...args) => {
'use server'
return createOpenGraphImage(
@@ -9,14 +11,11 @@ const DynamicImage1ServerFunction = (...args) => {
,
)
-}
+})
const DynamicImage1 = (props) => {
- const url = createMemo(() => {
- return (
- DynamicImage1ServerFunction.url.replace('_server', '_server/') +
- `&args=${encodeURIComponent(JSON.stringify(props.values))}`
- )
- })
+ const url = createMemo(() =>
+ serverFunctionUrl(DynamicImage1ServerFunction, ...props.values),
+ )
return url
}
const coolVar = DynamicImage1({
diff --git a/tests/fixtures/solid-start/multiple-images/code.js b/packages/ogp/tests/fixtures/solid/multiple-images/code.js
similarity index 100%
rename from tests/fixtures/solid-start/multiple-images/code.js
rename to packages/ogp/tests/fixtures/solid/multiple-images/code.js
diff --git a/packages/ogp/tests/fixtures/solid/multiple-images/output.js b/packages/ogp/tests/fixtures/solid/multiple-images/output.js
new file mode 100644
index 0000000..200270e
--- /dev/null
+++ b/packages/ogp/tests/fixtures/solid/multiple-images/output.js
@@ -0,0 +1,36 @@
+import { serverFunctionUrl } from '@solidjs/web/server-functions'
+import { GET } from '@solidjs/web/server-functions'
+import { createOpenGraphImage } from '@solidjs/ogp/server'
+import { createMemo } from 'solid-js'
+const DynamicImage2ServerFunction = GET((...args) => {
+ 'use server'
+
+ const [r0] = args
+ return createOpenGraphImage({r0}
, {
+ width: 800,
+ })
+})
+const DynamicImage2 = (props) => {
+ const url = createMemo(() =>
+ serverFunctionUrl(DynamicImage2ServerFunction, ...props.values),
+ )
+ return url
+}
+const DynamicImage1ServerFunction = GET((...args) => {
+ 'use server'
+
+ const [r0] = args
+ return createOpenGraphImage({r0}
)
+})
+const DynamicImage1 = (props) => {
+ const url = createMemo(() =>
+ serverFunctionUrl(DynamicImage1ServerFunction, ...props.values),
+ )
+ return url
+}
+const first = DynamicImage1({
+ values: [a()],
+})
+const second = DynamicImage2({
+ values: [b()],
+})
\ No newline at end of file
diff --git a/tests/fixtures/solid-start/nested-expressions/code.js b/packages/ogp/tests/fixtures/solid/nested-expressions/code.js
similarity index 100%
rename from tests/fixtures/solid-start/nested-expressions/code.js
rename to packages/ogp/tests/fixtures/solid/nested-expressions/code.js
diff --git a/tests/fixtures/solid-start/nested-expressions/output.js b/packages/ogp/tests/fixtures/solid/nested-expressions/output.js
similarity index 56%
rename from tests/fixtures/solid-start/nested-expressions/output.js
rename to packages/ogp/tests/fixtures/solid/nested-expressions/output.js
index ea6857f..268ee46 100644
--- a/tests/fixtures/solid-start/nested-expressions/output.js
+++ b/packages/ogp/tests/fixtures/solid/nested-expressions/output.js
@@ -1,18 +1,17 @@
+import { serverFunctionUrl } from '@solidjs/web/server-functions'
+import { GET } from '@solidjs/web/server-functions'
import { createOpenGraphImage } from '@solidjs/ogp/server'
import { createMemo } from 'solid-js'
-const DynamicImage1ServerFunction = (...args) => {
+const DynamicImage1ServerFunction = GET((...args) => {
'use server'
const [r0, r1] = args
return createOpenGraphImage({r1}
)
-}
+})
const DynamicImage1 = (props) => {
- const url = createMemo(() => {
- return (
- DynamicImage1ServerFunction.url.replace('_server', '_server/') +
- `&args=${encodeURIComponent(JSON.stringify(props.values))}`
- )
- })
+ const url = createMemo(() =>
+ serverFunctionUrl(DynamicImage1ServerFunction, ...props.values),
+ )
return url
}
const coolVar = DynamicImage1({
diff --git a/tests/fixtures/solid-start/nested-in-jsx/code.js b/packages/ogp/tests/fixtures/solid/nested-in-jsx/code.js
similarity index 100%
rename from tests/fixtures/solid-start/nested-in-jsx/code.js
rename to packages/ogp/tests/fixtures/solid/nested-in-jsx/code.js
diff --git a/tests/fixtures/solid-start/nested-in-jsx/output.js b/packages/ogp/tests/fixtures/solid/nested-in-jsx/output.js
similarity index 65%
rename from tests/fixtures/solid-start/nested-in-jsx/output.js
rename to packages/ogp/tests/fixtures/solid/nested-in-jsx/output.js
index 5f435a4..5fecf02 100644
--- a/tests/fixtures/solid-start/nested-in-jsx/output.js
+++ b/packages/ogp/tests/fixtures/solid/nested-in-jsx/output.js
@@ -1,20 +1,19 @@
+import { serverFunctionUrl } from '@solidjs/web/server-functions'
+import { GET } from '@solidjs/web/server-functions'
import { createOpenGraphImage } from '@solidjs/ogp/server'
import { createMemo } from 'solid-js'
import { Image } from '@solidjs/ogp'
import { createSignal } from 'solid-js'
-const DynamicImage1ServerFunction = (...args) => {
+const DynamicImage1ServerFunction = GET((...args) => {
'use server'
const [r0] = args
return createOpenGraphImage({`Hello ${r0 * 2}!`}
)
-}
+})
const DynamicImage1 = (props) => {
- const url = createMemo(() => {
- return (
- DynamicImage1ServerFunction.url.replace('_server', '_server/') +
- `&args=${encodeURIComponent(JSON.stringify(props.values))}`
- )
- })
+ const url = createMemo(() =>
+ serverFunctionUrl(DynamicImage1ServerFunction, ...props.values),
+ )
return url
}
export default function Home() {
diff --git a/tests/fixtures/solid-start/no-dynamic-image/code.js b/packages/ogp/tests/fixtures/solid/no-dynamic-image/code.js
similarity index 100%
rename from tests/fixtures/solid-start/no-dynamic-image/code.js
rename to packages/ogp/tests/fixtures/solid/no-dynamic-image/code.js
diff --git a/tests/fixtures/solid-start/no-dynamic-image/output.js b/packages/ogp/tests/fixtures/solid/no-dynamic-image/output.js
similarity index 100%
rename from tests/fixtures/solid-start/no-dynamic-image/output.js
rename to packages/ogp/tests/fixtures/solid/no-dynamic-image/output.js
diff --git a/tests/fixtures/solid-start/partially-dynamic-object/code.js b/packages/ogp/tests/fixtures/solid/partially-dynamic-object/code.js
similarity index 100%
rename from tests/fixtures/solid-start/partially-dynamic-object/code.js
rename to packages/ogp/tests/fixtures/solid/partially-dynamic-object/code.js
diff --git a/tests/fixtures/solid-start/partially-dynamic-object/output.js b/packages/ogp/tests/fixtures/solid/partially-dynamic-object/output.js
similarity index 62%
rename from tests/fixtures/solid-start/partially-dynamic-object/output.js
rename to packages/ogp/tests/fixtures/solid/partially-dynamic-object/output.js
index 63e4737..b692e47 100644
--- a/tests/fixtures/solid-start/partially-dynamic-object/output.js
+++ b/packages/ogp/tests/fixtures/solid/partially-dynamic-object/output.js
@@ -1,7 +1,9 @@
+import { serverFunctionUrl } from '@solidjs/web/server-functions'
+import { GET } from '@solidjs/web/server-functions'
import { createOpenGraphImage } from '@solidjs/ogp/server'
import { createMemo } from 'solid-js'
import { createSignal } from 'solid-js'
-const DynamicImage1ServerFunction = (...args) => {
+const DynamicImage1ServerFunction = GET((...args) => {
'use server'
const [r0] = args
@@ -15,14 +17,11 @@ const DynamicImage1ServerFunction = (...args) => {
{}
,
)
-}
+})
const DynamicImage1 = (props) => {
- const url = createMemo(() => {
- return (
- DynamicImage1ServerFunction.url.replace('_server', '_server/') +
- `&args=${encodeURIComponent(JSON.stringify(props.values))}`
- )
- })
+ const url = createMemo(() =>
+ serverFunctionUrl(DynamicImage1ServerFunction, ...props.values),
+ )
return url
}
const [signal] = createSignal('hello')
diff --git a/tests/fixtures/solid-start/realistic-styles/code.js b/packages/ogp/tests/fixtures/solid/realistic-styles/code.js
similarity index 100%
rename from tests/fixtures/solid-start/realistic-styles/code.js
rename to packages/ogp/tests/fixtures/solid/realistic-styles/code.js
diff --git a/tests/fixtures/solid-start/realistic-styles/output.js b/packages/ogp/tests/fixtures/solid/realistic-styles/output.js
similarity index 66%
rename from tests/fixtures/solid-start/realistic-styles/output.js
rename to packages/ogp/tests/fixtures/solid/realistic-styles/output.js
index cd0b77b..5a190b5 100644
--- a/tests/fixtures/solid-start/realistic-styles/output.js
+++ b/packages/ogp/tests/fixtures/solid/realistic-styles/output.js
@@ -1,6 +1,8 @@
+import { serverFunctionUrl } from '@solidjs/web/server-functions'
+import { GET } from '@solidjs/web/server-functions'
import { createOpenGraphImage } from '@solidjs/ogp/server'
import { createMemo } from 'solid-js'
-const DynamicImage1ServerFunction = (...args) => {
+const DynamicImage1ServerFunction = GET((...args) => {
'use server'
const [r0] = args
@@ -19,14 +21,11 @@ const DynamicImage1ServerFunction = (...args) => {
{`👋 Hello, ${r0 * 2}!`}
,
)
-}
+})
const DynamicImage1 = (props) => {
- const url = createMemo(() => {
- return (
- DynamicImage1ServerFunction.url.replace('_server', '_server/') +
- `&args=${encodeURIComponent(JSON.stringify(props.values))}`
- )
- })
+ const url = createMemo(() =>
+ serverFunctionUrl(DynamicImage1ServerFunction, ...props.values),
+ )
return url
}
const coolVar = DynamicImage1({
diff --git a/tests/fixtures/solid-start/variables/code.js b/packages/ogp/tests/fixtures/solid/variables/code.js
similarity index 100%
rename from tests/fixtures/solid-start/variables/code.js
rename to packages/ogp/tests/fixtures/solid/variables/code.js
diff --git a/tests/fixtures/solid-start/variables/output.js b/packages/ogp/tests/fixtures/solid/variables/output.js
similarity index 50%
rename from tests/fixtures/solid-start/variables/output.js
rename to packages/ogp/tests/fixtures/solid/variables/output.js
index 13b9720..44d315c 100644
--- a/tests/fixtures/solid-start/variables/output.js
+++ b/packages/ogp/tests/fixtures/solid/variables/output.js
@@ -1,18 +1,17 @@
+import { serverFunctionUrl } from '@solidjs/web/server-functions'
+import { GET } from '@solidjs/web/server-functions'
import { createOpenGraphImage } from '@solidjs/ogp/server'
import { createMemo } from 'solid-js'
-const DynamicImage1ServerFunction = (...args) => {
+const DynamicImage1ServerFunction = GET((...args) => {
'use server'
const [r0] = args
return createOpenGraphImage({r0}
)
-}
+})
const DynamicImage1 = (props) => {
- const url = createMemo(() => {
- return (
- DynamicImage1ServerFunction.url.replace('_server', '_server/') +
- `&args=${encodeURIComponent(JSON.stringify(props.values))}`
- )
- })
+ const url = createMemo(() =>
+ serverFunctionUrl(DynamicImage1ServerFunction, ...props.values),
+ )
return url
}
const coolVar = DynamicImage1({
diff --git a/tests/fixtures/tanstack-start/basic/code.js b/packages/ogp/tests/fixtures/tanstack-start/basic/code.js
similarity index 100%
rename from tests/fixtures/tanstack-start/basic/code.js
rename to packages/ogp/tests/fixtures/tanstack-start/basic/code.js
diff --git a/tests/fixtures/tanstack-start/basic/output.js b/packages/ogp/tests/fixtures/tanstack-start/basic/output.js
similarity index 100%
rename from tests/fixtures/tanstack-start/basic/output.js
rename to packages/ogp/tests/fixtures/tanstack-start/basic/output.js
diff --git a/tests/fixtures/tanstack-start/custom-image-options/code.js b/packages/ogp/tests/fixtures/tanstack-start/custom-image-options/code.js
similarity index 100%
rename from tests/fixtures/tanstack-start/custom-image-options/code.js
rename to packages/ogp/tests/fixtures/tanstack-start/custom-image-options/code.js
diff --git a/tests/fixtures/tanstack-start/custom-image-options/output.js b/packages/ogp/tests/fixtures/tanstack-start/custom-image-options/output.js
similarity index 100%
rename from tests/fixtures/tanstack-start/custom-image-options/output.js
rename to packages/ogp/tests/fixtures/tanstack-start/custom-image-options/output.js
diff --git a/tests/fixtures/tanstack-start/multiple-images/code.js b/packages/ogp/tests/fixtures/tanstack-start/multiple-images/code.js
similarity index 100%
rename from tests/fixtures/tanstack-start/multiple-images/code.js
rename to packages/ogp/tests/fixtures/tanstack-start/multiple-images/code.js
diff --git a/tests/fixtures/tanstack-start/multiple-images/output.js b/packages/ogp/tests/fixtures/tanstack-start/multiple-images/output.js
similarity index 100%
rename from tests/fixtures/tanstack-start/multiple-images/output.js
rename to packages/ogp/tests/fixtures/tanstack-start/multiple-images/output.js
diff --git a/tests/fixtures/tanstack-start/nested-in-jsx/code.js b/packages/ogp/tests/fixtures/tanstack-start/nested-in-jsx/code.js
similarity index 100%
rename from tests/fixtures/tanstack-start/nested-in-jsx/code.js
rename to packages/ogp/tests/fixtures/tanstack-start/nested-in-jsx/code.js
diff --git a/tests/fixtures/tanstack-start/nested-in-jsx/output.js b/packages/ogp/tests/fixtures/tanstack-start/nested-in-jsx/output.js
similarity index 100%
rename from tests/fixtures/tanstack-start/nested-in-jsx/output.js
rename to packages/ogp/tests/fixtures/tanstack-start/nested-in-jsx/output.js
diff --git a/tests/fixtures/tanstack-start/no-dynamic-image/code.js b/packages/ogp/tests/fixtures/tanstack-start/no-dynamic-image/code.js
similarity index 100%
rename from tests/fixtures/tanstack-start/no-dynamic-image/code.js
rename to packages/ogp/tests/fixtures/tanstack-start/no-dynamic-image/code.js
diff --git a/tests/fixtures/tanstack-start/no-dynamic-image/output.js b/packages/ogp/tests/fixtures/tanstack-start/no-dynamic-image/output.js
similarity index 100%
rename from tests/fixtures/tanstack-start/no-dynamic-image/output.js
rename to packages/ogp/tests/fixtures/tanstack-start/no-dynamic-image/output.js
diff --git a/tests/fixtures/tanstack-start/variables/code.js b/packages/ogp/tests/fixtures/tanstack-start/variables/code.js
similarity index 100%
rename from tests/fixtures/tanstack-start/variables/code.js
rename to packages/ogp/tests/fixtures/tanstack-start/variables/code.js
diff --git a/tests/fixtures/tanstack-start/variables/output.js b/packages/ogp/tests/fixtures/tanstack-start/variables/output.js
similarity index 100%
rename from tests/fixtures/tanstack-start/variables/output.js
rename to packages/ogp/tests/fixtures/tanstack-start/variables/output.js
diff --git a/packages/ogp/tests/open-graph.test.ts b/packages/ogp/tests/open-graph.test.ts
new file mode 100644
index 0000000..4d6ef48
--- /dev/null
+++ b/packages/ogp/tests/open-graph.test.ts
@@ -0,0 +1,31 @@
+import type { JSX } from '@solidjs/web';
+import { renderToString } from '@solidjs/web';
+import { createComponent } from 'solid-js';
+import { describe, expect, it } from 'vitest';
+import { OpenGraph } from '../src/index';
+
+// The compiled DynamicImage is an accessor of the image url, which the JSX
+// types do not describe.
+// oxlint-disable-next-line no-unsafe-type-assertion
+const compiledImage = (() => '/_server/image?args=%5B1%5D') as unknown as JSX.Element;
+
+describe('OpenGraph', () => {
+ it('adds an og:image meta tag with the origin and the image url', () => {
+ let head = '';
+ renderToString(
+ () =>
+ createComponent(OpenGraph, {
+ origin: 'https://example.com',
+ children: compiledImage,
+ }),
+ // The output has no , so the head tags arrive here.
+ {
+ onHead(value) {
+ head = value;
+ },
+ },
+ );
+ expect(head).toContain('property="og:image"');
+ expect(head).toContain('content="https://example.com/_server/image?args=%5B1%5D"');
+ });
+});
diff --git a/packages/ogp/tests/server.test.ts b/packages/ogp/tests/server.test.ts
new file mode 100644
index 0000000..ac1fdf5
--- /dev/null
+++ b/packages/ogp/tests/server.test.ts
@@ -0,0 +1,84 @@
+import { describe, expect, it } from 'vitest';
+import { getArguments, parseSolidJSX } from '../src/server';
+
+describe('parseSolidJSX', () => {
+ it('returns undefined when given nothing', async () => {
+ await expect(parseSolidJSX()).resolves.toBeUndefined();
+ await expect(parseSolidJSX(undefined)).resolves.toBeUndefined();
+ });
+
+ it('converts an HTML string into a satori vnode tree', async () => {
+ const vnode = await parseSolidJSX('hi
');
+ expect(vnode).toMatchObject({
+ type: 'div',
+ props: { children: [{ type: 'div', props: { children: 'hi' } }] },
+ });
+ });
+
+ it('unwraps a function that returns markup', async () => {
+ const vnode = await parseSolidJSX(() => 'sync');
+ expect(vnode).toMatchObject({
+ props: { children: [{ type: 'span', props: { children: 'sync' } }] },
+ });
+ });
+
+ it('awaits a function that returns a promise', async () => {
+ const vnode = await parseSolidJSX(async () => await Promise.resolve('async'));
+ expect(vnode).toMatchObject({
+ props: { children: [{ type: 'span', props: { children: 'async' } }] },
+ });
+ });
+
+ it("reads markup off Solid's `{ t }` server-rendered template object", async () => {
+ const vnode = await parseSolidJSX({ t: 'from template
' });
+ expect(vnode).toMatchObject({
+ props: { children: [{ props: { children: 'from template' } }] },
+ });
+ });
+
+ it('strips every hydration key so none reaches satori', async () => {
+ const vnode = await parseSolidJSX({
+ t: 'hix
',
+ });
+ const serialized = JSON.stringify(vnode);
+ expect(serialized).not.toContain('_hk');
+ expect(serialized).toContain('keep');
+ });
+
+ it('joins the strings of a template that had holes', async () => {
+ const vnode = await parseSolidJSX({ t: ['', 'joined', '
'], h: [] });
+ expect(vnode).toMatchObject({
+ props: { children: [{ type: 'div', props: { children: 'joined' } }] },
+ });
+ });
+
+ it('rejects a template with holes that have not resolved', async () => {
+ await expect(parseSolidJSX({ t: ['', '
'], h: [() => 'later'] })).rejects.toThrow(
+ 'DynamicImage content must render synchronously',
+ );
+ });
+
+ it('returns undefined for values it cannot turn into markup', async () => {
+ await expect(parseSolidJSX(123)).resolves.toBeUndefined();
+ const unknownObject: object = { nope: true };
+ await expect(parseSolidJSX(unknownObject)).resolves.toBeUndefined();
+ await expect(parseSolidJSX(() => 42)).resolves.toBeUndefined();
+ });
+});
+
+describe('getArguments', () => {
+ it('returns an empty list when the url carries no args', () => {
+ expect(getArguments('https://example.com/_server/')).toEqual([]);
+ expect(getArguments('https://example.com/_server/?other=1')).toEqual([]);
+ });
+
+ it('round-trips the values encoded by the compiled component', () => {
+ const values = ['hello', 42, { nested: true }, null];
+ const url = `https://example.com/_server/?args=${encodeURIComponent(JSON.stringify(values))}`;
+ expect(getArguments(url)).toEqual(values);
+ });
+
+ it('throws on an args param that is not valid JSON', () => {
+ expect(() => getArguments('https://example.com/_server/?args=not-json')).toThrow();
+ });
+});
diff --git a/tests/unplugin.test.ts b/packages/ogp/tests/unplugin.test.ts
similarity index 54%
rename from tests/unplugin.test.ts
rename to packages/ogp/tests/unplugin.test.ts
index 72dd339..2a03a46 100644
--- a/tests/unplugin.test.ts
+++ b/packages/ogp/tests/unplugin.test.ts
@@ -1,93 +1,99 @@
-import { join } from 'node:path'
-import { describe, expect, it, vi } from 'vitest'
-import type { Options } from '../src/unplugin'
-import { unplugin } from '../src/unplugin'
+import { join } from 'node:path';
+import { describe, expect, it, vi } from 'vitest';
+import type { Options } from '../src/unplugin';
+import { unplugin } from '../src/unplugin';
/**
* The plugin's `transform` never touches `this`, so the raw rollup form can be
* driven directly instead of standing up a real bundler.
*/
-const transform = (code: string, id: string, opts?: Options) => {
- const plugin = unplugin.raw(opts, { framework: 'rollup' }) as {
- transform: (code: string, id: string) => Promise<{ code: string } | null>
+type TransformResult = { code: string } | null;
+
+async function transform(code: string, id: string, opts?: Options): Promise{signal()}
{signal()}
{signal()}
`, src('plain.tsx'))
- expect(res!.code).not.toContain('ServerFunction')
- expect(res!.code).not.toContain('createOpenGraphImage')
- })
+ const res = await transform(`const x = {signal()}
`, src('plain.tsx'));
+ expect(res!.code).not.toContain('ServerFunction');
+ expect(res!.code).not.toContain('createOpenGraphImage');
+ });
it('surfaces a DynamicImage that has no element child', async () => {
await expect(
transform(`const x = Hi!
, {
- emoji: 'openmoji',
- })
-}
-const DynamicImage1 = (props) => {
- const url = createMemo(() => {
- return (
- DynamicImage1ServerFunction.url.replace('_server', '_server/') +
- `&args=${encodeURIComponent(JSON.stringify(props.values))}`
- )
- })
- return url
-}
-DynamicImage1({
- values: [],
-})
\ No newline at end of file
diff --git a/tests/fixtures/solid-start/multiple-images/output.js b/tests/fixtures/solid-start/multiple-images/output.js
deleted file mode 100644
index 212c7ed..0000000
--- a/tests/fixtures/solid-start/multiple-images/output.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { createOpenGraphImage } from '@solidjs/ogp/server'
-import { createMemo } from 'solid-js'
-const DynamicImage2ServerFunction = (...args) => {
- 'use server'
-
- const [r0] = args
- return createOpenGraphImage({r0}
, {
- width: 800,
- })
-}
-const DynamicImage2 = (props) => {
- const url = createMemo(() => {
- return (
- DynamicImage2ServerFunction.url.replace('_server', '_server/') +
- `&args=${encodeURIComponent(JSON.stringify(props.values))}`
- )
- })
- return url
-}
-const DynamicImage1ServerFunction = (...args) => {
- 'use server'
-
- const [r0] = args
- return createOpenGraphImage({r0}
)
-}
-const DynamicImage1 = (props) => {
- const url = createMemo(() => {
- return (
- DynamicImage1ServerFunction.url.replace('_server', '_server/') +
- `&args=${encodeURIComponent(JSON.stringify(props.values))}`
- )
- })
- return url
-}
-const first = DynamicImage1({
- values: [a()],
-})
-const second = DynamicImage2({
- values: [b()],
-})
\ No newline at end of file
diff --git a/tests/server.test.ts b/tests/server.test.ts
deleted file mode 100644
index 1dc15db..0000000
--- a/tests/server.test.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { getArguments, parseSolidJSX } from '../src/server'
-
-describe('parseSolidJSX', () => {
- it('returns undefined when given nothing', async () => {
- await expect(parseSolidJSX()).resolves.toBeUndefined()
- await expect(parseSolidJSX(undefined)).resolves.toBeUndefined()
- })
-
- it('converts an HTML string into a satori vnode tree', async () => {
- const vnode = await parseSolidJSX('hi
')
- expect(vnode).toMatchObject({
- type: 'div',
- props: { children: [{ type: 'div', props: { children: 'hi' } }] },
- })
- })
-
- it('unwraps a function that returns markup', async () => {
- const vnode = await parseSolidJSX(() => 'sync')
- expect(vnode).toMatchObject({
- props: { children: [{ type: 'span', props: { children: 'sync' } }] },
- })
- })
-
- it('awaits a function that returns a promise', async () => {
- const vnode = await parseSolidJSX(async () => 'async')
- expect(vnode).toMatchObject({
- props: { children: [{ type: 'span', props: { children: 'async' } }] },
- })
- })
-
- it("reads markup off Solid's `{ t }` server-rendered template object", async () => {
- const vnode = await parseSolidJSX({ t: 'from template
' })
- expect(vnode).toMatchObject({
- props: { children: [{ props: { children: 'from template' } }] },
- })
- })
-
- it('strips the hydration key so it does not reach satori', async () => {
- const vnode = await parseSolidJSX({ t: 'hi
' })
- const serialized = JSON.stringify(vnode)
- expect(serialized).not.toContain('data-hk')
- expect(serialized).toContain('keep')
- })
-
- it('returns undefined for values it cannot turn into markup', async () => {
- await expect(parseSolidJSX(123 as never)).resolves.toBeUndefined()
- await expect(parseSolidJSX({ nope: true } as never)).resolves.toBeUndefined()
- await expect(parseSolidJSX(() => 42 as never)).resolves.toBeUndefined()
- })
-})
-
-describe('getArguments', () => {
- it('returns an empty list when the url carries no args', () => {
- expect(getArguments('https://example.com/_server/')).toEqual([])
- expect(getArguments('https://example.com/_server/?other=1')).toEqual([])
- })
-
- it('round-trips the values encoded by the compiled component', () => {
- const values = ['hello', 42, { nested: true }, null]
- const url = `https://example.com/_server/?args=${encodeURIComponent(JSON.stringify(values))}`
- expect(getArguments(url)).toEqual(values)
- })
-
- it('throws on an args param that is not valid JSON', () => {
- expect(() => getArguments('https://example.com/_server/?args=not-json')).toThrow()
- })
-})
diff --git a/vitest.config.ts b/vitest.config.ts
deleted file mode 100644
index 0a4e9a2..0000000
--- a/vitest.config.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig({
- test: {
- // babel-plugin-tester calls `describe`/`it` off the global scope.
- globals: true,
- },
-});