8000 chore: alterative functional templating syntax by paoloricciuti · Pull Request #15599 · sveltejs/svelte · GitHub
[go: up one dir, main page]
Skip to content

chore: alterative functional templating syntax #15599

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

Merged
merged 4 commits into from
Apr 1, 2025
Merged

chore: alterative functional templating syntax #15599

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfbc271
chore: alterative functional templating syntax
paoloricciuti Mar 24, 2025
a78111f
fix: remove `.at(-1)`
paoloricciuti Mar 24, 2025
36a3c84
chore: move create elements, text, comment etc to `operations`
paoloricciuti Mar 26, 2025
b79fcd1
chore: only use `append` to append to the fragment
paoloricciuti Mar 26, 2025
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
Prev Previous commit
Next Next commit
chore: move create elements, text, comment etc to operations
  • Loading branch information
@paoloricciuti
paoloricciuti committed Mar 26, 2025
commit 36a3c84645f6a7dcb677b1b8ddfee0170c9b8e33
41 changes: 41 additions & 0 deletions packages/svelte/src/internal/client/dom/operations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,3 +204,44 @@ export function sibling(node, count = 1, is_text = false) {
export function clear_text_content(node) {
node.textContent = '';
}

/**
*
* @param {string} tag
* @param {string} [namespace]
* @ 8000 param {string} [is]
* @returns
*/
export function create_element(tag, namespace, is) {
let options = is ? { is } : undefined;
if (namespace) {
return document.createElementNS(namespace, tag, options);
}
return document.createElement(tag, options);
}

export function create_fragment() {
return document.createDocumentFragment();
}

/**
* @param {string} data
* @returns
*/
export function create_comment(data = '') {
return document.createComment(data);
}

/**
* @param {Element} element
* @param {string} key
* @param {string} value
* @returns
*/
export function set_attribute(element, key, value = '') {
if (key.startsWith('xlink:')) {
element.setAttributeNS('http://www.w3.org/1999/xlink', key, value);
return;
}
return element.setAttribute(key, value);
}
35 changes: 14 additions & 21 deletions packages/svelte/src/internal/client/dom/template.js
View file
Open in desktop
6434
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
/** @import { Effect, TemplateNode } from '#client' */
import { hydrate_next, hydrate_node, hydrating, set_hydrate_node } from './hydration.js';
import { create_text, get_first_child, is_firefox } from './operations.js';
import {
create_text,
get_first_child,
is_firefox,
create_element,
create_fragment,
create_comment,
set_attribute
} from './operations.js';
import { create_fragment_from_html } from './reconciler.js';
import { active_effect } from '../runtime.js';
import {
Expand Down Expand Up @@ -79,14 +87,14 @@ export function template(content, flags) {
* @param {Array<string | undefined>} [namespace_stack]
*/
function structure_to_fragment(structure, ns, namespace_stack = [], foreign_object_count = 0) {
var fragment = document.createDocumentFragment();
var fragment = create_fragment();
for (var i = 0; i < structure.length; i += 1) {
var item = structure[i];
if (item == null || Array.isArray(item)) {
const data = item ? item[0] : '';
fragment.insertBefore(document.createComment(data), null);
fragment.insertBefore(create_comment(data), null);
} else if (typeof item === 'string') {
fragment.appendChild(document.createTextNode(item));
fragment.appendChild(create_text(item));
continue;
} else {
let namespace =
Expand All @@ -107,25 +115,10 @@ function structure_to_fragment(structure, ns, namespace_stack = [], foreign_obje
if (namespace !== namespace_stack[namespace_stack.length - 1]) {
namespace_stack.push(namespace);
}
var args = [item.e];
if (item.is) {
// @ts-ignore
args.push({ is: item.is });
}
if (namespace) {
args.unshift(namespace);
}
var element = /** @type {HTMLElement} */ (
// @ts-ignore
(namespace ? document.createElementNS : document.createElement).call(document, ...args)
);
var element = create_element(item.e, namespace, item.is);

for (var key in item.p) {
if (key.startsWith('xlink:')) {
element.setAttributeNS('http://www.w3.org/1999/xlink', key, item.p[key] ?? '');
continue;
}
element.setAttribute(key, item.p[key] ?? '');
set_attribute(element, key, item.p[key]);
}
if (item.c) {
(element.tagName === 'TEMPLATE'
Expand Down
0