minify 0% #14

tbela99 · tbela99 · commit 5f267fe728bb · 2023-08-21T21:00:27.000-04:00
diff --git a/dist/index-umd-web.js b/dist/index-umd-web.js
@@ -772,7 +772,8 @@
                 }
                 return val + unit;
             case 'Perc':
-                return token.val + '%';
+                const perc = reduceNumber(token.val);
+                return options.minify && perc == '0' ? '0' : perc + '%';
             case 'Number':
                 return reduceNumber(token.val);
             case 'Comment':
@@ -2820,7 +2821,7 @@
                 if (delim.typ == 'Block-start') {
                     const position = map.get(tokens[0]);
                     const uniq = new Map;
-                    parseTokens(tokens, { minify: options.minify }).reduce((acc, curr, index, array) => {
+                    parseTokens(tokens, { minify: true }).reduce((acc, curr, index, array) => {
                         if (curr.typ == 'Whitespace') {
                             if (trimWhiteSpace.includes(array[index - 1]?.typ) ||
                                 trimWhiteSpace.includes(array[index + 1]?.typ) ||
@@ -2829,7 +2830,7 @@
                                 return acc;
                             }
                         }
-                        let t = renderToken(curr, { minify: true });
+                        let t = renderToken(curr, { minify: false });
                         if (t == ',') {
                             acc.push([]);
                         }
diff --git a/dist/index.cjs b/dist/index.cjs
@@ -770,7 +770,8 @@ function renderToken(token, options = {}, reducer, errors) {
             }
             return val + unit;
         case 'Perc':
-            return token.val + '%';
+            const perc = reduceNumber(token.val);
+            return options.minify && perc == '0' ? '0' : perc + '%';
         case 'Number':
             return reduceNumber(token.val);
         case 'Comment':
@@ -2818,7 +2819,7 @@ async function parse$1(iterator, opt = {}) {
             if (delim.typ == 'Block-start') {
                 const position = map.get(tokens[0]);
                 const uniq = new Map;
-                parseTokens(tokens, { minify: options.minify }).reduce((acc, curr, index, array) => {
+                parseTokens(tokens, { minify: true }).reduce((acc, curr, index, array) => {
                     if (curr.typ == 'Whitespace') {
                         if (trimWhiteSpace.includes(array[index - 1]?.typ) ||
                             trimWhiteSpace.includes(array[index + 1]?.typ) ||
@@ -2827,7 +2828,7 @@ async function parse$1(iterator, opt = {}) {
                             return acc;
                         }
                     }
-                    let t = renderToken(curr, { minify: true });
+                    let t = renderToken(curr, { minify: false });
                     if (t == ',') {
                         acc.push([]);
                     }
diff --git a/dist/lib/parser/parse.js b/dist/lib/parser/parse.js
@@ -204,7 +204,7 @@ async function parse(iterator, opt = {}) {
             if (delim.typ == 'Block-start') {
                 const position = map.get(tokens[0]);
                 const uniq = new Map;
-                parseTokens(tokens, { minify: options.minify }).reduce((acc, curr, index, array) => {
+                parseTokens(tokens, { minify: true }).reduce((acc, curr, index, array) => {
                     if (curr.typ == 'Whitespace') {
                         if (trimWhiteSpace.includes(array[index - 1]?.typ) ||
                             trimWhiteSpace.includes(array[index + 1]?.typ) ||
@@ -213,7 +213,7 @@ async function parse(iterator, opt = {}) {
                             return acc;
                         }
                     }
-                    let t = renderToken(curr, { minify: true });
+                    let t = renderToken(curr, { minify: false });
                     if (t == ',') {
                         acc.push([]);
                     }
diff --git a/dist/lib/renderer/render.js b/dist/lib/renderer/render.js
@@ -276,7 +276,8 @@ function renderToken(token, options = {}, reducer, errors) {
             }
             return val + unit;
         case 'Perc':
-            return token.val + '%';
+            const perc = reduceNumber(token.val);
+            return options.minify && perc == '0' ? '0' : perc + '%';
         case 'Number':
             return reduceNumber(token.val);
         case 'Comment':
diff --git a/src/lib/ast/walk.ts b/src/lib/ast/walk.ts
@@ -12,7 +12,7 @@ export function* walk(node: AstNode, parent?: AstRuleList, root?: AstRuleList):
 
         for (const child of <Array<AstNode>>node.chi) {
 
-            yield* walk(<AstNode>child, <AstRuleList>node, <AstRuleList>(root ?? node))
+            yield* walk(<AstNode>child, <AstRuleList>node, <AstRuleList>(root ?? node));
         }
     }
 }
diff --git a/src/lib/parser/parse.ts b/src/lib/parser/parse.ts
@@ -284,7 +284,7 @@ export async function parse(iterator: string, opt: ParserOptions = {}): Promise<
                 const position: Position = <Position>map.get(tokens[0]);
 
                 const uniq = new Map<string, string[]>;
-                parseTokens(tokens, {minify: options.minify}).reduce((acc: string[][], curr: Token, index: number, array: Token[]) => {
+                parseTokens(tokens, {minify: true}).reduce((acc: string[][], curr: Token, index: number, array: Token[]) => {
 
                     if (curr.typ == 'Whitespace') {
 
@@ -298,7 +298,7 @@ export async function parse(iterator: string, opt: ParserOptions = {}): Promise<
                         }
                     }
 
-                    let t = renderToken(curr, {minify: true});
+                    let t = renderToken(curr, {minify: false});
                     if (t == ',') {
                         acc.push([]);
                     } else {
diff --git a/src/lib/renderer/render.ts b/src/lib/renderer/render.ts
@@ -437,7 +437,8 @@ export function renderToken(token: Token, options: RenderOptions = {}, reducer?:
 
         case 'Perc':
 
-            return token.val + '%';
+            const perc = reduceNumber(token.val);
+            return options.minify && perc == '0' ? '0' : perc + '%';
 
         case 'Number':
 
diff --git a/test/files/css/bootstrap.css b/test/files/css/bootstrap.css

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ async function parse(iterator, opt = {}) {`
`204`	`204`	`if (delim.typ == 'Block-start') {`
`205`	`205`	`const position = map.get(tokens[0]);`
`206`	`206`	`const uniq = new Map;`
`207`		`- parseTokens(tokens, { minify: options.minify }).reduce((acc, curr, index, array) => {`
	`207`	`+ parseTokens(tokens, { minify: true }).reduce((acc, curr, index, array) => {`
`208`	`208`	`if (curr.typ == 'Whitespace') {`
`209`	`209`	`if (trimWhiteSpace.includes(array[index - 1]?.typ) \|\|`
`210`	`210`	`trimWhiteSpace.includes(array[index + 1]?.typ) \|\|`
`@@ -213,7 +213,7 @@ async function parse(iterator, opt = {}) {`
`213`	`213`	`return acc;`
`214`	`214`	`}`
`215`	`215`	`}`
`216`		`- let t = renderToken(curr, { minify: true });`
	`216`	`+ let t = renderToken(curr, { minify: false });`
`217`	`217`	`if (t == ',') {`
`218`	`218`	`acc.push([]);`
`219`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export function* walk(node: AstNode, parent?: AstRuleList, root?: AstRuleList):`
`12`	`12`
`13`	`13`	`for (const child of <Array<AstNode>>node.chi) {`
`14`	`14`
`15`		`- yield* walk(<AstNode>child, <AstRuleList>node, <AstRuleList>(root ?? node))`
	`15`	`+ yield* walk(<AstNode>child, <AstRuleList>node, <AstRuleList>(root ?? node));`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ export async function parse(iterator: string, opt: ParserOptions = {}): Promise<`
`284`	`284`	`const position: Position = <Position>map.get(tokens[0]);`
`285`	`285`
`286`	`286`	`const uniq = new Map<string, string[]>;`
`287`		`- parseTokens(tokens, {minify: options.minify}).reduce((acc: string[][], curr: Token, index: number, array: Token[]) => {`
	`287`	`+ parseTokens(tokens, {minify: true}).reduce((acc: string[][], curr: Token, index: number, array: Token[]) => {`
`288`	`288`
`289`	`289`	`if (curr.typ == 'Whitespace') {`
`290`	`290`
`@@ -298,7 +298,7 @@ export async function parse(iterator: string, opt: ParserOptions = {}): Promise<`
`298`	`298`	`}`
`299`	`299`	`}`
`300`	`300`
`301`		`- let t = renderToken(curr, {minify: true});`
	`301`	`+ let t = renderToken(curr, {minify: false});`
`302`	`302`	`if (t == ',') {`
`303`	`303`	`acc.push([]);`
`304`	`304`	`} else {`