Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[labs/ssr] Convert a few generators to plain functions #5087

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.

Sign up for GitHub

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

Closed
justinfagnani wants to merge 1 commit into from
Closed

[labs/ssr] Convert a few generators to plain functions #5087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions packages/labs/ssr/src/lib/element-renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ export abstract class ElementRenderer {
* The default implementation serializes all attributes on the element
* instance.
*/
*renderAttributes(): RenderResult {
renderAttributes(): RenderResult {
let result = '';
if (this.element !== undefined) {
const {attributes} = this.element;
for (
Expand All @@ -194,12 +195,13 @@ export abstract class ElementRenderer {
i++
) {
if (value === '' || value === undefined || value === null) {
yield ` ${name}`;
result += ` ${name}`;
} else {
yield ` ${name}="${escapeHtml(value)}"`;
result += ` ${name}="${escapeHtml(value)}"`;
}
}
}
return [result];
}
}

Expand All @@ -215,13 +217,15 @@ export class FallbackRenderer extends ElementRenderer {
this._attributes[name.toLowerCase()] = value;
}

override *renderAttributes(): RenderResult {
override renderAttributes(): RenderResult {
let result = '';
for (const [name, value] of Object.entries(this._attributes)) {
if (value === '' || value === undefined || value === null) {
yield ` ${name}`;
result += ` ${name}`;
} else {
yield ` ${name}="${escapeHtml(value)}"`;
result += ` ${name}="${escapeHtml(value)}"`;
}
}
return [result];
}
}
6 changes: 3 additions & 3 deletions packages/labs/ssr/src/lib/lit-element-renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@ export class LitElementRenderer extends ElementRenderer {
yield* renderValue((this.element as any).render(), renderInfo);
}

override *renderLight(renderInfo: RenderInfo): RenderResult {
override renderLight(renderInfo: RenderInfo): RenderResult {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const value = (this.element as any)?.renderLight();
if (value) {
yield* renderValue(value, renderInfo);
return renderValue(value, renderInfo);
} else {
yield '';
return [];
}
}
}
21 changes: 12 additions & 9 deletions packages/labs/ssr/src/lib/render-value.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,12 +879,12 @@ And the inner template was:
? getLast(renderInfo.customElementInstanceStack)
: undefined;
if (part.type === PartType.PROPERTY) {
yield* renderPropertyPart(instance, op, committedValue);
yield renderPropertyPart(instance, op, committedValue);
} else if (part.type === PartType.BOOLEAN_ATTRIBUTE) {
// Boolean attribute binding
yield* renderBooleanAttributePart(instance, op, committedValue);
yield renderBooleanAttributePart(instance, op, committedValue);
} else {
yield* renderAttributePart(instance, op, committedValue);
yield renderAttributePart(instance, op, committedValue);
}
}
partIndex += statics.length - 1;
Expand Down Expand Up @@ -1078,7 +1078,7 @@ function throwErrorForPartIndexMismatch(
throw new Error(errorMsg);
}

function* renderPropertyPart(
function renderPropertyPart(
instance: ElementRenderer | undefined,
op: AttributePartOp,
value: unknown
Expand All @@ -1090,11 +1090,12 @@ function* renderPropertyPart(
instance.setProperty(op.name, value);
}
if (reflectedName !== undefined) {
yield `${reflectedName}="${escapeHtml(String(value))}"`;
return `${reflectedName}="${escapeHtml(String(value))}"`;
}
return '';
}

function* renderBooleanAttributePart(
function renderBooleanAttributePart(
instance: ElementRenderer | undefined,
op: AttributePartOp,
value: unknown
Expand All @@ -1103,12 +1104,13 @@ function* renderBooleanAttributePart(
if (instance !== undefined) {
instance.setAttribute(op.name, '');
} else {
yield op.name;
return op.name;
}
}
return '';
}

function* renderAttributePart(
function renderAttributePart(
instance: ElementRenderer | undefined,
op: AttributePartOp,
value: unknown
Expand All @@ -1117,9 +1119,10 @@ function* renderAttributePart(
if (instance !== undefined) {
instance.setAttribute(op.name, String(value ?? ''));
} else {
yield `${op.name}="${escapeHtml(String(value ?? ''))}"`;
return `${op.name}="${escapeHtml(String(value ?? ''))}"`;
}
}
return '';
}

/**
Expand Down
4 changes: 2 additions & 2 deletions packages/labs/ssr/src/lib/render.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export type {RenderResult} from './render-result.js';
* to any reentrant calls to `render`, e.g. from a `renderShadow` callback
* on an ElementRenderer.
*/
export function* render(
export function render(
value: unknown,
renderInfo?: Partial<RenderInfo>
): RenderResult {
Expand All @@ -43,5 +43,5 @@ export function* render(
if (isTemplateResult(value)) {
hydratable = isHydratable(value);
}
yield* renderValue(value, renderInfo as RenderInfo, hydratable);
return renderValue(value, renderInfo as RenderInfo, hydratable);
}
Loading