michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ci] format

Browse source
This commit is contained in:
matthewp 2023-01-30 16:57:13 +00:00 committed by fredkbot
parent 071e1dee7e
commit bec45b3be5
5 changed files with 114 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/astro/src/runtime/server/render/astro/head-and-content.ts
View file

@ -12,10 +12,7 @@ export function isHeadAndContent(obj: unknown): obj is HeadAndContent {
return typeof obj === 'object' && !!(obj as any)[headAndContentSym];
}
export function createHeadAndContent(
head: string,
content: RenderTemplateResult
): HeadAndContent {
export function createHeadAndContent(head: string, content: RenderTemplateResult): HeadAndContent {
return {
[headAndContentSym]: true,
head,

12
packages/astro/src/runtime/server/render/common.ts
View file

@ -2,13 +2,13 @@ import type { SSRResult } from '../../../@types/astro';
import type { RenderInstruction } from './types.js';
import { HTMLBytes, markHTMLString } from '../escape.js';
import { renderAllHeadContent } from './head.js';
import {
determineIfNeedsHydrationScript,
determinesIfNeedsDirectiveScript,
getPrescripts,
PrescriptType,
} from '../scripts.js';
import { renderAllHeadContent } from './head.js';
import { isSlotString, type SlotString } from './slot.js';
export const Fragment = Symbol.for('astro:fragment');
@ -21,15 +21,15 @@ export const decoder = new TextDecoder();
// These directive instructions bubble all the way up to renderPage so that we
// can ensure they are added only once, and as soon as possible.
export function stringifyChunk(result: SSRResult, chunk: string | SlotString | RenderInstruction) {
if(typeof (chunk as any).type === 'string') {
if (typeof (chunk as any).type === 'string') {
const instruction = chunk as RenderInstruction;
switch(instruction.type) {
switch (instruction.type) {
case 'directive': {
const { hydration } = instruction;
let needsHydrationScript = hydration && determineIfNeedsHydrationScript(result);
let needsDirectiveScript =
hydration && determinesIfNeedsDirectiveScript(result, hydration.directive);
let prescriptType: PrescriptType = needsHydrationScript
? 'both'
: needsDirectiveScript
@ -43,8 +43,8 @@ export function stringifyChunk(result: SSRResult, chunk: string | SlotString | R
}
}
case 'head': {
if(result._metadata.hasRenderedHead) {
return '';
if (result._metadata.hasRenderedHead) {
return '';
}
return renderAllHeadContent(result);
}

2
packages/astro/src/runtime/server/render/head.ts
View file

@ -39,7 +39,7 @@ export function renderAllHeadContent(result: SSRResult) {
return markHTMLString(content);
}
export function * renderHead(result: SSRResult) {
export function* renderHead(result: SSRResult) {
yield { type: 'head', result } as const;
}

2
packages/astro/src/runtime/server/render/types.ts
View file

@ -10,6 +10,6 @@ export type RenderDirectiveInstruction = {
export type RenderHeadInstruction = {
type: 'head';
result: SSRResult;
}
};
export type RenderInstruction = RenderDirectiveInstruction | RenderHeadInstruction;

156
packages/astro/test/units/render/head.test.js
View file

@ -7,7 +7,7 @@ import {
renderSlot,
maybeRenderHead,
renderHead,
Fragment
Fragment,
} from '../../../dist/runtime/server/index.js';
import {
createBasicEnvironment,
@ -41,41 +41,63 @@ describe('core/render', () => {
${renderSlot(result, slots['default'])}
</body>
</html>`;
})
});
const PageLayout = createComponent((result, _props, slots) => {
return render`${renderComponent(result, 'Layout', BaseLayout, {}, {
'default': () => render`
return render`${renderComponent(
result,
'Layout',
BaseLayout,
{},
{
default: () => render`
${maybeRenderHead(result)}
<main>
${renderSlot(result, slots['default'])}
</main>
`,
'head': () => render`
${renderComponent(result, 'Fragment', Fragment, { slot: 'head' }, {
'default': () => render`${renderSlot(result, slots['head'])}`
})}
`
})}
head: () => render`
${renderComponent(
result,
'Fragment',
Fragment,
{ slot: 'head' },
{
default: () => render`${renderSlot(result, slots['head'])}`,
}
)}
`,
}
)}
`;
});
const Page = createComponent((result, _props) => {
return render`${renderComponent(result, 'PageLayout', PageLayout, {}, {
'default': () => render`${maybeRenderHead(result)}<div>hello world</div>`,
'head': () => render`
${renderComponent(result, 'Fragment', Fragment, {slot: 'head'}, {
'default': () => render`<meta charset="utf-8">`
})}
`
})}`;
return render`${renderComponent(
result,
'PageLayout',
PageLayout,
{},
{
default: () => render`${maybeRenderHead(result)}<div>hello world</div>`,
head: () => render`
${renderComponent(
result,
'Fragment',
Fragment,
{ slot: 'head' },
{
default: () => render`<meta charset="utf-8">`,
}
)}
`,
}
)}`;
});
const ctx = createRenderContext({
request: new Request('http://example.com/'),
links: [
{ name: 'link', props: {rel:'stylesheet', href:'/main.css'}, children: '' }
]
links: [{ name: 'link', props: { rel: 'stylesheet', href: '/main.css' }, children: '' }],
});
const PageModule = createAstroModule(Page);
@ -97,41 +119,63 @@ describe('core/render', () => {
${renderSlot(result, slots['default'])}
</body>
</html>`;
})
});
const PageLayout = createComponent((result, _props, slots) => {
return render`${renderComponent(result, 'Layout', BaseLayout, {}, {
'default': () => render`
return render`${renderComponent(
result,
'Layout',
BaseLayout,
{},
{
default: () => render`
${maybeRenderHead(result)}
<main>
${renderSlot(result, slots['default'])}
</main>
`,
'head': () => render`
${renderComponent(result, 'Fragment', Fragment, { slot: 'head' }, {
'default': () => render`${renderSlot(result, slots['head'])}`
})}
`
})}
head: () => render`
${renderComponent(
result,
'Fragment',
Fragment,
{ slot: 'head' },
{
default: () => render`${renderSlot(result, slots['head'])}`,
}
)}
`,
}
)}
`;
});
const Page = createComponent((result, _props) => {
return render`${renderComponent(result, 'PageLayout', PageLayout, {}, {
'default': () => render`${maybeRenderHead(result)}<div>hello world</div>`,
'head': () => render`
${renderComponent(result, 'Fragment', Fragment, {slot: 'head'}, {
'default': () => render`<meta charset="utf-8">`
})}
`
})}`;
return render`${renderComponent(
result,
'PageLayout',
PageLayout,
{},
{
default: () => render`${maybeRenderHead(result)}<div>hello world</div>`,
head: () => render`
${renderComponent(
result,
'Fragment',
Fragment,
{ slot: 'head' },
{
default: () => render`<meta charset="utf-8">`,
}
)}
`,
}
)}`;
});
const ctx = createRenderContext({
request: new Request('http://example.com/'),
links: [
{ name: 'link', props: {rel:'stylesheet', href:'/main.css'}, children: '' }
]
links: [{ name: 'link', props: { rel: 'stylesheet', href: '/main.css' }, children: '' }],
});
const PageModule = createAstroModule(Page);
@ -147,26 +191,36 @@ describe('core/render', () => {
it('Multi-level layouts and head injection, without any content in layouts', async () => {
const BaseLayout = createComponent((result, _props, slots) => {
return render`${renderSlot(result, slots['default'])}`;
})
});
const PageLayout = createComponent((result, _props, slots) => {
return render`${renderComponent(result, 'Layout', BaseLayout, {}, {
'default': () => render`${renderSlot(result, slots['default'])} `,
})}
return render`${renderComponent(
result,
'Layout',
BaseLayout,
{},
{
default: () => render`${renderSlot(result, slots['default'])} `,
}
)}
`;
});
const Page = createComponent((result, _props) => {
return render`${renderComponent(result, 'PageLayout', PageLayout, {}, {
'default': () => render`${maybeRenderHead(result)}<div>hello world</div>`,
})}`;
return render`${renderComponent(
result,
'PageLayout',
PageLayout,
{},
{
default: () => render`${maybeRenderHead(result)}<div>hello world</div>`,
}
)}`;
});
const ctx = createRenderContext({
request: new Request('http://example.com/'),
links: [
{ name: 'link', props: {rel:'stylesheet', href:'/main.css'}, children: '' }
]
links: [{ name: 'link', props: { rel: 'stylesheet', href: '/main.css' }, children: '' }],
});
const PageModule = createAstroModule(Page);