Skip to content

Commit

Permalink
[ci] format
Browse files Browse the repository at this point in the history
  • Loading branch information
@matthewp @github-actions
matthewp authored and github-actions[bot] committed Jun 15, 2022
1 parent fc52321 commit f1f2078
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 98 deletions.
4 changes: 1 addition & 3 deletions packages/astro/src/@types/astro.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -772,9 +772,7 @@ export interface MarkdownInstance<T extends Record<string, any>> {
}>;
}

export type GetHydrateCallback = () => Promise<
() => void | Promise<void>
>;
export type GetHydrateCallback = () => Promise<() => void | Promise<void>>;

/**
* getStaticPaths() options
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/src/runtime/server/astro-island.prebuilt.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
* to generate this file.
*/

export default `var a;{const o={0:t=>t,1:t=>JSON.parse(t,n),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,n)),5:t=>new Set(JSON.parse(t,n)),6:t=>BigInt(t),7:t=>new URL(t)},n=(t,e)=>{if(t===""||!Array.isArray(e))return e;const[r,s]=e;return r in o?o[r](s):void 0};customElements.get("astro-island")||customElements.define("astro-island",(a=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement?.closest("astro-island[ssr]"))return;let e=null,r=this.querySelector("astro-fragment");if(r==null&&this.hasAttribute("tmpl")){let i=this.querySelector("template[data-astro-template]");i&&(e=i.innerHTML,i.remove())}else r&&(e=r.innerHTML);const s=this.hasAttribute("props")?JSON.parse(this.getAttribute("props"),n):{};this.hydrator(this)(this.Component,s,e,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),window.removeEventListener("astro:hydrate",this.hydrate),window.dispatchEvent(new CustomEvent("astro:hydrate"))}}async connectedCallback(){const[{default:e}]=await Promise.all([import(this.getAttribute("directive-url")),import(this.getAttribute("before-hydration-url"))]);window.addEventListener("astro:hydrate",this.hydrate);const r=JSON.parse(this.getAttribute("opts"));e(this,r,async()=>{const s=this.getAttribute("renderer-url"),[i,{default:l}]=await Promise.all([import(this.getAttribute("component-url")),s?import(s):()=>()=>{}]);return this.Component=i[this.getAttribute("component-export")||"default"],this.hydrator=l,this.hydrate})}attributeChangedCallback(){this.hydrator&&this.hydrate()}},a.observedAttributes=["props"],a))}`;
export default `var a;{const o={0:t=>t,1:t=>JSON.parse(t,n),2:t=>new RegExp(t),3:t=>new Date(t),4:t=>new Map(JSON.parse(t,n)),5:t=>new Set(JSON.parse(t,n)),6:t=>BigInt(t),7:t=>new URL(t)},n=(t,e)=>{if(t===""||!Array.isArray(e))return e;const[r,s]=e;return r in o?o[r](s):void 0};customElements.get("astro-island")||customElements.define("astro-island",(a=class extends HTMLElement{constructor(){super(...arguments);this.hydrate=()=>{if(!this.hydrator||this.parentElement?.closest("astro-island[ssr]"))return;let e=null,r=this.querySelector("astro-fragment");if(r==null&&this.hasAttribute("tmpl")){let i=this.querySelector("template[data-astro-template]");i&&(e=i.innerHTML,i.remove())}else r&&(e=r.innerHTML);const s=this.hasAttribute("props")?JSON.parse(this.getAttribute("props"),n):{};this.hydrator(this)(this.Component,s,e,{client:this.getAttribute("client")}),this.removeAttribute("ssr"),window.removeEventListener("astro:hydrate",this.hydrate),window.dispatchEvent(new CustomEvent("astro:hydrate"))}}async connectedCallback(){const[{default:e}]=await Promise.all([import(this.getAttribute("directive-url")),import(this.getAttribute("before-hydration-url"))]);window.addEventListener("astro:hydrate",this.hydrate);const r=JSON.parse(this.getAttribute("opts"));e(this,r,async()=>{const s=this.getAttribute("renderer-url"),[i,{default:l}]=await Promise.all([import(this.getAttribute("component-url")),s?import(s):()=>()=>{}]);return this.Component=i[this.getAttribute("component-export")||"default"],this.hydrator=l,this.hydrate})}attributeChangedCallback(){this.hydrator&&this.hydrate()}},a.observedAttributes=["props"],a))}`;
124 changes: 63 additions & 61 deletions packages/astro/src/runtime/server/astro-island.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,77 +8,79 @@
}

const propTypes: PropTypeSelector = {
0: value => value,
1: value => JSON.parse(value, reviver),
2: value => new RegExp(value),
3: value => new Date(value),
4: value => new Map(JSON.parse(value, reviver)),
5: value => new Set(JSON.parse(value, reviver)),
6: value => BigInt(value),
7: value => new URL(value),
0: (value) => value,
1: (value) => JSON.parse(value, reviver),
2: (value) => new RegExp(value),
3: (value) => new Date(value),
4: (value) => new Map(JSON.parse(value, reviver)),
5: (value) => new Set(JSON.parse(value, reviver)),
6: (value) => BigInt(value),
7: (value) => new URL(value),
};

const reviver = (propKey: string, raw: string): any => {
if(propKey === '' || !Array.isArray(raw)) return raw;
if (propKey === '' || !Array.isArray(raw)) return raw;
const [type, value] = raw;
return (type in propTypes) ? propTypes[type](value) : undefined;
return type in propTypes ? propTypes[type](value) : undefined;
};

if(!customElements.get('astro-island')) {
customElements.define('astro-island', class extends HTMLElement {
public Component: any;
public hydrator: any;
static observedAttributes = ['props'];
async connectedCallback(){
const [ { default: setup } ] = await Promise.all([
import(this.getAttribute('directive-url')!),
import(this.getAttribute('before-hydration-url')!)
]);
window.addEventListener('astro:hydrate', this.hydrate);

const opts = JSON.parse(this.getAttribute('opts')!);
setup(this, opts, async () => {
const rendererUrl = this.getAttribute('renderer-url');
const [
componentModule,
{ default: hydrator }
] = await Promise.all([
import(this.getAttribute('component-url')!),
rendererUrl ? import(rendererUrl) : () => () => {}
if (!customElements.get('astro-island')) {
customElements.define(
'astro-island',
class extends HTMLElement {
public Component: any;
public hydrator: any;
static observedAttributes = ['props'];
async connectedCallback() {
const [{ default: setup }] = await Promise.all([
import(this.getAttribute('directive-url')!),
import(this.getAttribute('before-hydration-url')!),
]);
this.Component = componentModule[this.getAttribute('component-export') || 'default'];
this.hydrator = hydrator;
return this.hydrate;
});
}
hydrate = () => {
if(!this.hydrator || this.parentElement?.closest('astro-island[ssr]')) {
return;
window.addEventListener('astro:hydrate', this.hydrate);

const opts = JSON.parse(this.getAttribute('opts')!);
setup(this, opts, async () => {
const rendererUrl = this.getAttribute('renderer-url');
const [componentModule, { default: hydrator }] = await Promise.all([
import(this.getAttribute('component-url')!),
rendererUrl ? import(rendererUrl) : () => () => {},
]);
this.Component = componentModule[this.getAttribute('component-export') || 'default'];
this.hydrator = hydrator;
return this.hydrate;
});
}
let innerHTML: string | null = null;
let fragment = this.querySelector('astro-fragment');
if (fragment == null && this.hasAttribute('tmpl')) {
// If there is no child fragment, check to see if there is a template.
// This happens if children were passed but the client component did not render any.
let template = this.querySelector('template[data-astro-template]');
if (template) {
innerHTML = template.innerHTML;
template.remove();
hydrate = () => {
if (!this.hydrator || this.parentElement?.closest('astro-island[ssr]')) {
return;
}
} else if (fragment) {
innerHTML = fragment.innerHTML;
let innerHTML: string | null = null;
let fragment = this.querySelector('astro-fragment');
if (fragment == null && this.hasAttribute('tmpl')) {
// If there is no child fragment, check to see if there is a template.
// This happens if children were passed but the client component did not render any.
let template = this.querySelector('template[data-astro-template]');
if (template) {
innerHTML = template.innerHTML;
template.remove();
}
} else if (fragment) {
innerHTML = fragment.innerHTML;
}
const props = this.hasAttribute('props')
? JSON.parse(this.getAttribute('props')!, reviver)
: {};
this.hydrator(this)(this.Component, props, innerHTML, {
client: this.getAttribute('client'),
});
this.removeAttribute('ssr');
window.removeEventListener('astro:hydrate', this.hydrate);
window.dispatchEvent(new CustomEvent('astro:hydrate'));
};
attributeChangedCallback() {
if (this.hydrator) this.hydrate();
}
const props = this.hasAttribute('props') ? JSON.parse(this.getAttribute('props')!, reviver) : {};
this.hydrator(this)(this.Component, props, innerHTML, {
client: this.getAttribute('client')
});
this.removeAttribute('ssr');
window.removeEventListener('astro:hydrate', this.hydrate);
window.dispatchEvent(new CustomEvent('astro:hydrate'));
}
attributeChangedCallback() {
if(this.hydrator) this.hydrate();
}
});
);
}
}
23 changes: 10 additions & 13 deletions packages/astro/src/runtime/server/hydration.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import type {
SSRResult,
} from '../../@types/astro';
import { escapeHTML } from './escape.js';
import { hydrationSpecifier, serializeListValue } from './util.js';
import { serializeProps } from './serialize.js';
import { hydrationSpecifier, serializeListValue } from './util.js';

const HydrationDirectives = ['load', 'idle', 'media', 'visible', 'only'];

Expand Down Expand Up @@ -95,11 +95,6 @@ interface HydrateScriptOptions {
props: Record<string | number, any>;
}






/** For hydrated components, generate a <script type="module"> to load the component */
export async function generateHydrateScript(
scriptOptions: HydrateScriptOptions,
Expand All @@ -118,15 +113,15 @@ export async function generateHydrateScript(
children: '',
props: {
// This is for HMR, probably can avoid it in prod
uid: astroId
}
uid: astroId,
},
};

// Add component url
island.props['component-url'] = await result.resolve(componentUrl);

// Add renderer url
if(renderer.clientEntrypoint) {
if (renderer.clientEntrypoint) {
island.props['component-export'] = componentExport.value;
island.props['renderer-url'] = await result.resolve(renderer.clientEntrypoint);
island.props['props'] = escapeHTML(serializeProps(props));
Expand All @@ -136,10 +131,12 @@ export async function generateHydrateScript(
island.props['client'] = hydrate;
island.props['directive-url'] = await result.resolve(hydrationSpecifier(hydrate));
island.props['before-hydration-url'] = await result.resolve('astro:scripts/before-hydration.js');
island.props['opts'] = escapeHTML(JSON.stringify({
name: metadata.displayName,
value: metadata.hydrateArgs || ''
}))
island.props['opts'] = escapeHTML(
JSON.stringify({
name: metadata.displayName,
value: metadata.hydrateArgs || '',
})
);

return island;
}
19 changes: 7 additions & 12 deletions packages/astro/src/runtime/server/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import type {
SSRLoadedRenderer,
SSRResult,
} from '../../@types/astro';
import islandScript from './astro-island.prebuilt.js';
import { escapeHTML, HTMLString, markHTMLString } from './escape.js';
import { extractDirectives, generateHydrateScript } from './hydration.js';
import { serializeProps } from './serialize.js';
import { shorthash } from './shorthash.js';
import { serializeListValue } from './util.js';
import islandScript from './astro-island.prebuilt.js';
import { serializeProps } from './serialize.js';

export { markHTMLString, markHTMLString as unescapeHTML } from './escape.js';
export type { Metadata } from './metadata';
Expand All @@ -33,7 +33,7 @@ const svgEnumAttributes = /^(autoReverse|externalResourcesRequired|focusable|pre
const resultsWithHydrationScript = new WeakSet<SSRResult>();

function determineIfNeedsHydrationScript(result: SSRResult): boolean {
if(resultsWithHydrationScript.has(result)) {
if (resultsWithHydrationScript.has(result)) {
return false;
}
resultsWithHydrationScript.add(result);
Expand Down Expand Up @@ -342,30 +342,25 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
const needsAstroTemplate = children && !/<\/?astro-fragment\>/.test(html);
const template = needsAstroTemplate ? `<template data-astro-template>${children}</template>` : '';

if(needsAstroTemplate) {
if (needsAstroTemplate) {
island.props.tmpl = '';
}

island.children = `${
html ?? ''
}${template}`;
island.children = `${html ?? ''}${template}`;

// Add the astro-island definition only once. Since the SSRResult object
// is scoped to a page renderer we can use it as a key to know if the script
// has been rendered or not.
let script = '';
if(needsHydrationScript) {
if (needsHydrationScript) {
// Note that this is a class script, not a module script.
// This is so that it executes immediate, and when the browser encounters
// an astro-island element the callbacks will fire immediately, causing the JS
// deps to be loaded immediately.
script = `<script>${islandScript}</script>`;
}

return markHTMLString(
script +
renderElement('astro-island', island, false)
);
return markHTMLString(script + renderElement('astro-island', island, false));
}

/** Create the Astro.fetchContent() runtime function. */
Expand Down
12 changes: 7 additions & 5 deletions packages/astro/src/runtime/server/serialize.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@ function serializeArray(value: any[]): any[] {
}

function serializeObject(value: Record<any, any>): Record<any, any> {
return Object.fromEntries(Object.entries(value).map(([k, v]) => {
return [k, convertToSerializedForm(v)];
}));
return Object.fromEntries(
Object.entries(value).map(([k, v]) => {
return [k, convertToSerializedForm(v)];
})
);
}

function convertToSerializedForm(value: any): [ValueOf<typeof PROP_TYPE>, any] {
const tag = Object.prototype.toString.call(value);
switch(tag) {
switch (tag) {
case '[object Date]': {
return [PROP_TYPE.Date, (value as Date).toISOString()];
}
Expand All @@ -46,7 +48,7 @@ function convertToSerializedForm(value: any): [ValueOf<typeof PROP_TYPE>, any] {
return [PROP_TYPE.JSON, JSON.stringify(serializeArray(value))];
}
default: {
if(typeof value === 'object') {
if (typeof value === 'object') {
return [PROP_TYPE.Value, serializeObject(value)];
} else {
return [PROP_TYPE.Value, value];
Expand Down
6 changes: 3 additions & 3 deletions scripts/cmd/prebuild.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { pathToFileURL, fileURLToPath } from 'url';

export default async function prebuild(...args) {
let buildToString = args.indexOf('--to-string');
if(buildToString !== -1) {
if (buildToString !== -1) {
args.splice(buildToString, 1);
buildToString = true;
}
Expand All @@ -33,10 +33,10 @@ export default async function prebuild(...args) {
const tscode = await fs.promises.readFile(filepath, 'utf-8');
const esbuildresult = await esbuild.transform(tscode, {
loader: 'ts',
minify: true
minify: true,
});
const rootURL = new URL('../../', import.meta.url);
const rel = path.relative(fileURLToPath(rootURL), filepath)
const rel = path.relative(fileURLToPath(rootURL), filepath);
const mod = `/**
* This file is prebuilt from ${rel}
* Do not edit this directly, but instead edit that file and rerun the prebuild
Expand Down

0 comments on commit f1f2078

Please sign in to comment.