Skip to content

Commit

Permalink
update tests #12
Browse files Browse the repository at this point in the history
  • Loading branch information
@tbela99
tbela99 committed Aug 19, 2023
1 parent d8b04a9 commit 062d4a0
Show file tree
Hide file tree
Showing 20 changed files with 862 additions and 121 deletions.
58 changes: 31 additions & 27 deletions dist/index-umd-web.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1040,22 +1040,6 @@
}
return true;
}
function isHexDigit(name) {
if (name.length || name.length > 6) {
return false;
}
for (let chr of name) {
let codepoint = chr.charCodeAt(0);
if (!isDigit(codepoint) &&
// A F
!(codepoint >= 0x41 && codepoint <= 0x46) &&
// a f
!(codepoint >= 0x61 && codepoint <= 0x66)) {
return false;
}
}
return true;
}
function isFunction(name) {
return name.endsWith('(') && isIdent(name.slice(0, -1));
}
Expand Down Expand Up @@ -2730,7 +2714,7 @@
const result = (intersect.length == 0 ? null : {
...node1,
// @ts-ignore
sel: [...new Set([...(n1?.raw?.reduce(reducer, []) || splitRule(n1.sel)).concat(n2?.raw?.reduce(reducer, []) || splitRule(n2.sel))])].join(','),
sel: [...new Set([...(n1?.raw?.reduce(reducer, []) /*|| splitRule(n1.sel) */).concat(n2?.raw?.reduce(reducer, []) /* || splitRule(n2.sel) */)])].join(','),
chi: intersect.reverse()
});
if (result == null || [n1, n2].reduce((acc, curr) => curr.chi.length == 0 ? acc : acc + render(curr, options).code.length, 0) <= [node1, node2, result].reduce((acc, curr) => curr.chi.length == 0 ? acc : acc + render(curr, options).code.length, 0)) {
Expand Down Expand Up @@ -3312,42 +3296,60 @@
ast.chi = [...properties].concat(ast.chi.slice(k));
return ast;
}
function splitRule(buffer) {
const result = [[]];
let str = '';
/*
function splitRule(buffer: string): string[][] {
const result: string[][] = [[]];
let str: string = '';
for (let i = 0; i < buffer.length; i++) {
let chr = buffer.charAt(i);
let chr: string = buffer.charAt(i);
if (isWhiteSpace(chr.charCodeAt(0))) {
let k = i;
while (k + 1 < buffer.length) {
if (isWhiteSpace(buffer[k + 1].charCodeAt(0))) {
k++;
continue;
}
break;
}
if (str !== '') {
// @ts-ignore
result.at(-1).push(str);
str = '';
}
// @ts-ignore
if (result.at(-1).length > 0) {
// @ts-ignore
result.at(-1).push(' ');
}
i = k;
continue;
}
if (chr == ',') {
if (str !== '') {
// @ts-ignore
result.at(-1).push(str);
str = '';
}
result.push([]);
continue;
}
str += chr;
if (chr == '\\') {
str += buffer.charAt(++i);
Expand Down Expand Up @@ -3383,8 +3385,7 @@
str += chr;
if (chr == open) {
inParens++;
}
else if (chr == close) {
} else if (chr == close) {
inParens--;
}
if (inParens == 0) {
Expand All @@ -3394,16 +3395,20 @@
i = k;
}
}
if (str !== '') {
// @ts-ignore
result.at(-1).push(str);
}
return result;
}
*/
function reduceRuleSelector(node) {
if (node.raw == null) {
Object.defineProperty(node, 'raw', { enumerable: false, writable: true, value: splitRule(node.sel) });
}
// if (node.raw == null) {
//
// Object.defineProperty(node, 'raw', {enumerable: false, writable: true, value: splitRule(node.sel)})
// }
// @ts-ignore
// if (node.raw != null) {
// @ts-ignore
Expand Down Expand Up @@ -4850,7 +4855,6 @@
exports.isFunction = isFunction;
exports.isHash = isHash;
exports.isHexColor = isHexColor;
exports.isHexDigit = isHexDigit;
exports.isIdent = isIdent;
exports.isIdentCodepoint = isIdentCodepoint;
exports.isIdentStart = isIdentStart;
Expand Down
58 changes: 31 additions & 27 deletions dist/index.cjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1038,22 +1038,6 @@ function isHexColor(name) {
}
return true;
}
function isHexDigit(name) {
if (name.length || name.length > 6) {
return false;
}
for (let chr of name) {
let codepoint = chr.charCodeAt(0);
if (!isDigit(codepoint) &&
// A F
!(codepoint >= 0x41 && codepoint <= 0x46) &&
// a f
!(codepoint >= 0x61 && codepoint <= 0x66)) {
return false;
}
}
return true;
}
function isFunction(name) {
return name.endsWith('(') && isIdent(name.slice(0, -1));
}
Expand Down Expand Up @@ -2728,7 +2712,7 @@ function minify(ast, options = {}, recursive = false, errors) {
const result = (intersect.length == 0 ? null : {
...node1,
// @ts-ignore
sel: [...new Set([...(n1?.raw?.reduce(reducer, []) || splitRule(n1.sel)).concat(n2?.raw?.reduce(reducer, []) || splitRule(n2.sel))])].join(','),
sel: [...new Set([...(n1?.raw?.reduce(reducer, []) /*|| splitRule(n1.sel) */).concat(n2?.raw?.reduce(reducer, []) /* || splitRule(n2.sel) */)])].join(','),
chi: intersect.reverse()
});
if (result == null || [n1, n2].reduce((acc, curr) => curr.chi.length == 0 ? acc : acc + render(curr, options).code.length, 0) <= [node1, node2, result].reduce((acc, curr) => curr.chi.length == 0 ? acc : acc + render(curr, options).code.length, 0)) {
Expand Down Expand Up @@ -3310,42 +3294,60 @@ function minifyRule(ast) {
ast.chi = [...properties].concat(ast.chi.slice(k));
return ast;
}
function splitRule(buffer) {
const result = [[]];
let str = '';
/*
function splitRule(buffer: string): string[][] {
const result: string[][] = [[]];
let str: string = '';
for (let i = 0; i < buffer.length; i++) {
let chr = buffer.charAt(i);
let chr: string = buffer.charAt(i);
if (isWhiteSpace(chr.charCodeAt(0))) {
let k = i;
while (k + 1 < buffer.length) {
if (isWhiteSpace(buffer[k + 1].charCodeAt(0))) {
k++;
continue;
}
break;
}
if (str !== '') {
// @ts-ignore
result.at(-1).push(str);
str = '';
}
// @ts-ignore
if (result.at(-1).length > 0) {
// @ts-ignore
result.at(-1).push(' ');
}
i = k;
continue;
}
if (chr == ',') {
if (str !== '') {
// @ts-ignore
result.at(-1).push(str);
str = '';
}
result.push([]);
continue;
}
str += chr;
if (chr == '\\') {
str += buffer.charAt(++i);
Expand Down Expand Up @@ -3381,8 +3383,7 @@ function splitRule(buffer) {
str += chr;
if (chr == open) {
inParens++;
}
else if (chr == close) {
} else if (chr == close) {
inParens--;
}
if (inParens == 0) {
Expand All @@ -3392,16 +3393,20 @@ function splitRule(buffer) {
i = k;
}
}
if (str !== '') {
// @ts-ignore
result.at(-1).push(str);
}
return result;
}
*/
function reduceRuleSelector(node) {
if (node.raw == null) {
Object.defineProperty(node, 'raw', { enumerable: false, writable: true, value: splitRule(node.sel) });
}
// if (node.raw == null) {
//
// Object.defineProperty(node, 'raw', {enumerable: false, writable: true, value: splitRule(node.sel)})
// }
// @ts-ignore
// if (node.raw != null) {
// @ts-ignore
Expand Down Expand Up @@ -4834,7 +4839,6 @@ exports.isFrequency = isFrequency;
exports.isFunction = isFunction;
exports.isHash = isHash;
exports.isHexColor = isHexColor;
exports.isHexDigit = isHexDigit;
exports.isIdent = isIdent;
exports.isIdentCodepoint = isIdentCodepoint;
exports.isIdentStart = isIdentStart;
Expand Down
3 changes: 1 addition & 2 deletions dist/index.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,6 @@ declare function isDimension(name: string): boolean;
declare function isPercentage(name: string): boolean;
declare function parseDimension(name: string): DimensionToken | LengthToken | AngleToken;
declare function isHexColor(name: string): boolean;
declare function isHexDigit(name: string): boolean;
declare function isFunction(name: string): boolean;
declare function isAtKeyword(name: string): boolean;
declare function isNewLine(codepoint: number): boolean;
Expand Down Expand Up @@ -700,4 +699,4 @@ declare function resolve(url: string, currentDirectory: string, cwd?: string): {
declare function parse(iterator: string, opt?: ParserOptions): Promise<ParseResult>;
declare function transform(css: string, options?: TransformOptions): Promise<TransformResult>;

export { colorsFunc, combinators, dirname, funcList, getConfig, hasDeclaration, isAngle, isAtKeyword, isColor, isDigit, isDimension, isFrequency, isFunction, isHash, isHexColor, isHexDigit, isIdent, isIdentCodepoint, isIdentStart, isLength, isNewLine, isNonPrintable, isNumber, isPercentage, isPseudo, isResolution, isTime, isWhiteSpace, load, matchType, matchUrl, minify, minifyRule, parse, parseDimension, parseString, reduceSelector, render, renderToken, resolve, tokenize, transform, urlTokenMatcher, walk };
export { colorsFunc, combinators, dirname, funcList, getConfig, hasDeclaration, isAngle, isAtKeyword, isColor, isDigit, isDimension, isFrequency, isFunction, isHash, isHexColor, isIdent, isIdentCodepoint, isIdentStart, isLength, isNewLine, isNonPrintable, isNumber, isPercentage, isPseudo, isResolution, isTime, isWhiteSpace, load, matchType, matchUrl, minify, minifyRule, parse, parseDimension, parseString, reduceSelector, render, renderToken, resolve, tokenize, transform, urlTokenMatcher, walk };
Loading

0 comments on commit 062d4a0

Please sign in to comment.