Skip to content
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

Jump to bottom

refactor: Regex to sets #398

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

refactor: Regex to sets #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfb7d3f
refactor: Switch `VOID_ELEMENTS` over
rschristian Sep 22, 2024
8e49cc2
refactor: Switch `HTML_LOWER_CASE` over
rschristian Sep 22, 2024
c12a3b5
refactor: Switch `SVG_KEBAB_CASE` over
rschristian Sep 22, 2024
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
6 changes: 3 additions & 3 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
NAMESPACE_REPLACE_REGEX,
HTML_LOWER_CASE,
HTML_ENUMERATED,
SVG_CAMEL_CASE,
SVG_KEBAB_CASE,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renamed for consistency.

HTML_LOWER_CASE is converting camel-cased names to lower-cased, therefore SVG_CAMEL_CASE stands out as it's converting camel-cased names to kebab-cased.

createComponent
} from './lib/util.js';
import { options, h, Fragment } from 'preact';
Expand Down Expand Up @@ -631,13 +631,13 @@ function _renderToString(
// serialize boolean aria-xyz or enumerated attribute values as strings
v = v + EMPTY_STR;
} else if (isSvgMode) {
if (SVG_CAMEL_CASE.test(name)) {
if (SVG_KEBAB_CASE.has(name)) {
name =
name === 'panose1'
? 'panose-1'
: name.replace(/([A-Z])/g, '-$1').toLowerCase();
}
} else if (HTML_LOWER_CASE.test(name)) {
} else if (HTML_LOWER_CASE.has(name)) {
name = name.toLowerCase();
}
}
Expand Down
142 changes: 139 additions & 3 deletions src/lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,144 @@
export const VOID_ELEMENTS = /^(?:area|base|br|col|embed|hr|img|input|link|meta|param|source|track|wbr)$/;
export const VOID_ELEMENTS = new Set([
'area',
'base',
'br',
'col',
'command',
'embed',
'hr',
'img',
'input',
'keygen',
'link',
'meta',
'param',
'source',
'track',
'wbr'
]);
export const UNSAFE_NAME = /[\s\n\\/='"\0<>]/;
export const NAMESPACE_REPLACE_REGEX = /^(xlink|xmlns|xml)([A-Z])/;
export const HTML_LOWER_CASE = /^accessK|^auto[A-Z]|^cell|^ch|^col|cont|cross|dateT|encT|form[A-Z]|frame|hrefL|inputM|maxL|minL|noV|playsI|popoverT|readO|rowS|src[A-Z]|tabI|useM|item[A-Z]/;
export const SVG_CAMEL_CASE = /^ac|^ali|arabic|basel|cap|clipPath$|clipRule$|color|dominant|enable|fill|flood|font|glyph[^R]|horiz|image|letter|lighting|marker[^WUH]|overline|panose|pointe|paint|rendering|shape|stop|strikethrough|stroke|text[^L]|transform|underline|unicode|units|^v[^i]|^w|^xH/;
export const HTML_LOWER_CASE = new Set([
'accessKey',
'accessKeyLabel',
'autoComplete',
'autoCorrect',
'autoFocus',
'autoPlay',
'autoCapitalize',
'cellPadding',
'cellSpacing',
'charSet',
'colSpan',
'contentEditable',
'contextMenu',
'controlsList',
'crossOrigin',
'dateTime',
'encType',
'formAction',
'formEncType',
'formMethod',
'formNoValidate',
'formTarget',
'frameBorder',
'hrefLang',
'inputMode',
'maxLength',
'minLength',
'noValidate',
'playsInline',
'popoverTarget',
'popoverTargetAction',
'readOnly',
'rowSpan',
'srcSet',
'srcDoc',
'srcLang',
'tabIndex',
'useMap',
'itemProp',
'itemScope',
'itemType',
'itemID',
'itemRef'
]);
export const SVG_KEBAB_CASE = new Set([
'accentHeight',
'accumulate',
'alignmentBaseline',
'arabicForm',
'baselineShift',
'capHeight',
'clipPath',
'clipRule',
'colorInterpolation',
'colorInterpolationFilters',
'colorProfile',
'colorRendering',
'dominantBaseline',
'enableBackground',
'fillOpacity',
'fillRule',
'floodColor',
'floodOpacity',
'fontFamily',
'fontSize',
'fontSizeAdjust',
'fontStretch',
'fontStyle',
'fontVariant',
'fontWeight',
'glyphName',
'glyphOrientationHorizontal',
'glyphOrientationVertical',
'horizAdvX',
'horizOriginX',
'imageRendering',
'letterSpacing',
'lightingColor',
'markerEnd',
'markerMid',
'markerStart',
'overlinePosition',
'overlineThickness',
'paintOrder',
'panose1',
'pointerEvents',
'renderingIntent',
'shapeRendering',
'stopColor',
'stopOpacity',
'strikethroughPosition',
'strikethroughThickness',
'strokeDasharray',
'strokeDashoffset',
'strokeLinecap',
'strokeLinejoin',
'strokeMiterlimit',
'strokeOpacity',
'strokeWidth',
'textAnchor',
'textDecoration',
'textRendering',
'transformOrigin',
'underlinePosition',
'underlineThickness',
'unicodeBidi',
'unicodeRange',
'unitsPerEm',
'vAlphabetic',
'vectorEffect',
'vertAdvY',
'vertOriginX',
'vertOriginY',
'vHanging',
'vIdeographic',
'vMathematical',
'wordSpacing',
'writingMode',
'xHeight'
]);

// Boolean DOM properties that translate to enumerated ('true'/'false') attributes
export const HTML_ENUMERATED = new Set(['draggable', 'spellcheck']);
Expand Down
8 changes: 4 additions & 4 deletions src/pretty.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
UNSAFE_NAME,
VOID_ELEMENTS,
NAMESPACE_REPLACE_REGEX,
SVG_CAMEL_CASE,
SVG_KEBAB_CASE,
HTML_LOWER_CASE,
getContext
} from './lib/util.js';
Expand Down Expand Up @@ -252,13 +252,13 @@ function _renderToStringPretty(
} else if (NAMESPACE_REPLACE_REGEX.test(name)) {
name = name.replace(NAMESPACE_REPLACE_REGEX, '$1:$2').toLowerCase();
} else if (isSvgMode) {
if (SVG_CAMEL_CASE.test(name)) {
if (SVG_KEBAB_CASE.has(name)) {
name =
name === 'panose1'
? 'panose-1'
: name.replace(/([A-Z])/g, '-$1').toLowerCase();
}
} else if (HTML_LOWER_CASE.test(name)) {
} else if (HTML_LOWER_CASE.has(name)) {
name = name.toLowerCase();
}

Expand Down Expand Up @@ -332,7 +332,7 @@ function _renderToStringPretty(
throw new Error(`${nodeName} is not a valid HTML tag name in ${s}`);

let isVoid =
VOID_ELEMENTS.test(nodeName) ||
VOID_ELEMENTS.has(nodeName) ||
(opts.voidElements && opts.voidElements.test(nodeName));
let pieces = [];

Expand Down