@tbela99/css-parser 1.2.0 → 1.3.0

package/dist/lib/ast/math/expression.js

@@ -1,7 +1,13 @@
 import { EnumToken } from '../types.js';
 import { rem, compute } from './math.js';
 import { mathFuncs } from '../../syntax/syntax.js';
-import { minifyNumber } from '../../syntax/utils.js';
+import '../minify.js';
+import '../walk.js';
+import '../../parser/parse.js';
+import '../../parser/tokenize.js';
+import '../../parser/utils/config.js';
+import '../../syntax/color/utils/constants.js';
+import '../../renderer/sourcemap/lib/encode.js';
 
 /**
  * evaluate an array of tokens
@@ -32,12 +38,7 @@ function evaluate(tokens) {
         });
         return evaluateFunc(tokens[0]);
     }
-    // try {
     nodes = inlineExpression(evaluateExpression(buildExpression(tokens)));
-    // } catch (e) {
-    //
-    //     return tokens;
-    // }
     if (nodes.length <= 1) {
         if (nodes.length == 1) {
             if (nodes[0].typ == EnumToken.BinaryExpressionTokenType) {
@@ -48,7 +49,7 @@ function evaluate(tokens) {
                 return [{
                         ...nodes[0],
                         // @ts-ignore
-                        val: '' + Math[nodes[0].val.toUpperCase()],
+                        val: Math[nodes[0].val.toUpperCase()],
                         typ: EnumToken.NumberTokenType
                     }];
             }
@@ -68,7 +69,7 @@ function evaluate(tokens) {
                 token = { typ: EnumToken.ListToken, chi: [nodes[i], nodes[i + 1]] };
             }
             else {
-                token = doEvaluate(nodes[i + 1], { typ: EnumToken.NumberTokenType, val: '-1' }, EnumToken.Mul);
+                token = doEvaluate(nodes[i + 1], { typ: EnumToken.NumberTokenType, val: -1 }, EnumToken.Mul);
             }
             i++;
         }
@@ -83,7 +84,7 @@ function evaluate(tokens) {
         const token = curr[1].reduce((acc, curr) => doEvaluate(acc, curr, EnumToken.Add));
         if (token.typ != EnumToken.BinaryExpressionTokenType) {
             if ('val' in token && +token.val < 0) {
-                acc.push({ typ: EnumToken.Sub }, { ...token, val: String(-token.val) });
+                acc.push({ typ: EnumToken.Sub }, { ...token, val: -token.val });
                 return acc;
             }
         }
@@ -110,73 +111,37 @@ function doEvaluate(l, r, op) {
     if (!isScalarToken(l) || !isScalarToken(r) || (l.typ == r.typ && 'unit' in l && 'unit' in r && l.unit != r.unit)) {
         return defaultReturn;
     }
-    // if (l.typ == EnumToken.FunctionTokenType) {
-    //
-    //     const val: Token[] = evaluateFunc(l as FunctionToken);
-    //
-    //     if (val.length == 1) {
-    //
-    //         l = val[0];
-    //     } else {
-    //
-    //         return defaultReturn;
-    //     }
-    // }
     if (r.typ == EnumToken.FunctionTokenType) {
         const val = evaluateFunc(r);
         if (val.length == 1) {
             r = val[0];
         }
-        // else {
-        //
-        //     return defaultReturn;
-        // }
     }
-    // if (l.typ == EnumToken.FunctionTokenType) {
-    //
-    //     const val = evaluateFunc(l as FunctionToken);
-    //
-    //     if (val.length == 1) {
-    //
-    //         l = val[0];
-    //     }
-    // }
     if ((op == EnumToken.Add || op == EnumToken.Sub)) {
         // @ts-ignore
         if (l.typ != r.typ) {
             return defaultReturn;
         }
     }
-    // else if (
-    //     op == EnumToken.Mul &&
-    //     ![EnumToken.NumberTokenType, EnumToken.PercentageTokenType].includes(l.typ) &&
-    //     ![EnumToken.NumberTokenType, EnumToken.PercentageTokenType].includes(r.typ)) {
-    //
-    //     return defaultReturn;
-    // }
     let typ = l.typ == EnumToken.NumberTokenType ? r.typ : (r.typ == EnumToken.NumberTokenType ? l.typ : (l.typ == EnumToken.PercentageTokenType ? r.typ : l.typ));
     // @ts-ignore
     let v1 = l.val?.typ == EnumToken.FractionTokenType ? l.val : getValue(l);
     // @ts-ignore
     let v2 = r.val?.typ == EnumToken.FractionTokenType ? r.val : getValue(r);
-    // if (v1 == null || v2 == null) {
-    //
-    //     return defaultReturn;
-    // }
     if (op == EnumToken.Mul) {
         if (l.typ != EnumToken.NumberTokenType && r.typ != EnumToken.NumberTokenType) {
             if (typeof v1 == 'number' && l.typ == EnumToken.PercentageTokenType) {
                 v1 = {
                     typ: EnumToken.FractionTokenType,
-                    l: { typ: EnumToken.NumberTokenType, val: String(v1) },
-                    r: { typ: EnumToken.NumberTokenType, val: '100' }
+                    l: { typ: EnumToken.NumberTokenType, val: v1 },
+                    r: { typ: EnumToken.NumberTokenType, val: 100 }
                 };
             }
             else if (typeof v2 == 'number' && r.typ == EnumToken.PercentageTokenType) {
                 v2 = {
                     typ: EnumToken.FractionTokenType,
-                    l: { typ: EnumToken.NumberTokenType, val: String(v2) },
-                    r: { typ: EnumToken.NumberTokenType, val: '100' }
+                    l: { typ: EnumToken.NumberTokenType, val: v2 },
+                    r: { typ: EnumToken.NumberTokenType, val: 100 }
                 };
             }
         }
@@ -186,7 +151,7 @@ function doEvaluate(l, r, op) {
     const token = {
         ...(l.typ == EnumToken.NumberTokenType ? r : l),
         typ,
-        val: typeof val == 'number' ? minifyNumber(val) : val
+        val /* : typeof val == 'number' ? minifyNumber(val) : val */
     };
     if (token.typ == EnumToken.IdenTokenType) {
         // @ts-ignore
@@ -195,26 +160,10 @@ function doEvaluate(l, r, op) {
     return token;
 }
 function getValue(t) {
-    // if (t.typ == EnumToken.FunctionTokenType) {
-    //
-    //     v1 = evaluateFunc(t as FunctionToken);
-    //
-    //     if (v1.length != 1 || v1[0].typ == EnumToken.BinaryExpressionTokenType) {
-    //
-    //         return null;
-    //     }
-    //
-    //     t = v1[0] as NumberToken | IdentToken;
-    // }
     if (t.typ == EnumToken.IdenTokenType) {
         // @ts-ignore
         return Math[t.val.toUpperCase()];
     }
-    // if ((t.val as FractionToken).typ == EnumToken.FractionTokenType) {
-    //
-    //     // @ts-ignore
-    //     return (t.val as FractionToken).l.val / (t.val as FractionToken).r.val;
-    // }
     // @ts-ignore
     return t.typ == EnumToken.FractionTokenType ? t.l.val / t.r.val : +t.val;
 }
@@ -232,15 +181,11 @@ function evaluateFunc(token) {
         case 'sqrt':
         case 'exp': {
             const value = evaluate(values);
-            // if (value.length != 1 || (value[0].typ != EnumToken.NumberTokenType && value[0].typ != EnumToken.FractionTokenType) || (value[0].typ == EnumToken.FractionTokenType && (+(value[0] as FractionToken).r.val == 0 || !Number.isFinite(+(value[0] as FractionToken).l.val) || !Number.isFinite(+(value[0] as FractionToken).r.val)))) {
-            //
-            //     return value;
-            // }
             // @ts-ignore
             let val = value[0].typ == EnumToken.NumberTokenType ? +value[0].val : value[0].l.val / value[0].r.val;
             return [{
                     typ: EnumToken.NumberTokenType,
-                    val: '' + Math[token.val](val)
+                    val: Math[token.val](val)
                 }];
         }
         case 'hypot': {
@@ -248,29 +193,16 @@ function evaluateFunc(token) {
             let all = [];
             let ref = chi[0];
             let value = 0;
-            // if (![EnumToken.NumberTokenType, EnumToken.PercentageTokenType].includes(ref.typ) && !('unit' in ref)) {
-            //
-            //     return [token];
-            // }
             for (let i = 0; i < chi.length; i++) {
-                // @ts-ignore
-                // if (chi[i].typ != ref.typ || ('unit' in chi[i] && 'unit' in ref && chi[i].unit != ref.unit)) {
-                //
-                //     return [token];
-                // }
                 // @ts-ignore
                 const val = getValue(chi[i]);
-                // if (val == null) {
-                //
-                //     return [token];
-                // }
                 all.push(val);
                 value += val * val;
             }
             return [
                 {
                     ...ref,
-                    val: Math.sqrt(value).toFixed(rem(...all))
+                    val: +(Math.sqrt(value).toFixed(rem(...all)))
                 }
             ];
         }
@@ -279,48 +211,18 @@ function evaluateFunc(token) {
         case 'rem':
         case 'mod': {
             const chi = values.filter(t => ![EnumToken.WhitespaceTokenType, EnumToken.CommentTokenType].includes(t.typ));
-            // if (chi.length != 3 || chi[1].typ != EnumToken.CommaTokenType) {
-            //
-            //     return [token];
-            // }
-            // if (token.val == 'pow' && (chi[0].typ != EnumToken.NumberTokenType || chi[2].typ != EnumToken.NumberTokenType)) {
-            //
-            //     return [token];
-            // }
-            // if (['rem', 'mod'].includes(token.val) &&
-            //     (
-            //         chi[0].typ != chi[2].typ) || (
-            //         'unit' in chi[0] && 'unit' in chi[2] &&
-            //         chi[0].unit != chi[2].unit
-            //     )) {
-            //
-            //     return [token];
-            // }
             // https://developer.mozilla.org/en-US/docs/Web/CSS/mod
             const v1 = evaluate([chi[0]]);
             const v2 = evaluate([chi[2]]);
-            [EnumToken.PercentageTokenType, EnumToken.DimensionTokenType, EnumToken.AngleTokenType, EnumToken.NumberTokenType, EnumToken.LengthTokenType, EnumToken.TimeTokenType, EnumToken.FrequencyTokenType, EnumToken.ResolutionTokenType];
-            // if (v1.length != 1 || v2.length != 1 || !types.includes(v1[0].typ) || !types.includes(v2[0].typ) || (v1[0] as DimensionToken).unit != (v2[0] as DimensionToken).unit) {
-            //
-            //     return [token];
-            // }
             // @ts-ignore
             const val1 = getValue(v1[0]);
             // @ts-ignore
             const val2 = getValue(v2[0]);
-            // if (val1 == null || val2 == null || (v1[0].typ != v2[0].typ && val1 != 0 && val2 != 0)) {
-            //
-            //     return [token];
-            // }
             if (token.val == 'rem') {
-                // if (val2 == 0) {
-                //
-                //     return [token];
-                // }
                 return [
                     {
                         ...v1[0],
-                        val: (val1 % val2).toFixed(rem(val1, val2))
+                        val: +((val1 % val2).toFixed(rem(val1, val2)))
                     }
                 ];
             }
@@ -328,7 +230,7 @@ function evaluateFunc(token) {
                 return [
                     {
                         ...v1[0],
-                        val: String(Math.pow(val1, val2))
+                        val: Math.pow(val1, val2)
                     }
                 ];
             }
@@ -336,14 +238,14 @@ function evaluateFunc(token) {
                 return [
                     {
                         ...{}, ...v1[0],
-                        val: String(Math.atan2(val1, val2))
+                        val: Math.atan2(val1, val2)
                     }
                 ];
             }
             return [
                 {
                     ...v1[0],
-                    val: String(val2 == 0 ? val1 : val1 - (Math.floor(val1 / val2) * val2))
+                    val: val2 == 0 ? val1 : val1 - (Math.floor(val1 / val2) * val2)
                 }
             ];
         }
@@ -361,10 +263,6 @@ function evaluateFunc(token) {
                     continue;
                 }
                 const result = evaluate([curr]);
-                // if (result.length != 1 || result[0].typ == EnumToken.FunctionTokenType) {
-                //
-                //     return [token];
-                // }
                 const key = result[0].typ + ('unit' in result[0] ? result[0].unit : '');
                 if (!valuesMap.has(key)) {
                     valuesMap.set(key, []);
@@ -374,24 +272,12 @@ function evaluateFunc(token) {
             if (valuesMap.size == 1) {
                 const values = valuesMap.values().next().value;
                 if (token.val == 'log') {
-                    // if (values[0].typ != EnumToken.NumberTokenType || values.length > 2) {
-                    //
-                    //     return [token];
-                    // }
                     const val1 = getValue(values[0]);
                     const val2 = values.length == 2 ? getValue(values[1]) : null;
-                    // if (values.length == 1) {
-                    //
-                    //     return [
-                    //         {
-                    //             ...values[0],
-                    //             val: String(Math.log(val1))
-                    //         } as DimensionToken | AngleToken | NumberToken | LengthToken | TimeToken | FrequencyToken | ResolutionToken];
-                    // }
                     return [
                         {
                             ...values[0],
-                            val: String(Math.log(val1) / Math.log(val2))
+                            val: Math.log(val1) / Math.log(val2)
                         }
                     ];
                 }
@@ -415,10 +301,6 @@ function evaluateFunc(token) {
                 if (token.val == 'round') {
                     let val = getValue(values[0]);
                     let val2 = getValue(values[1]);
-                    // if (Number.isNaN(val) || Number.isNaN(val2)) {
-                    //
-                    //     return [token];
-                    // }
                     if (strategy == null || strategy == 'down') {
                         val = val - (val % val2);
                     }
@@ -426,11 +308,10 @@ function evaluateFunc(token) {
                         val = strategy == 'to-zero' ? Math.trunc(val / val2) * val2 : (strategy == 'nearest' ? Math.round(val / val2) * val2 : Math.ceil(val / val2) * val2);
                     }
                     // @ts-ignore
-                    return [{ ...values[0], val: String(val) }];
+                    return [{ ...values[0], val }];
                 }
             }
         }
-        // return [token];
     }
     return [token];
 }
@@ -440,10 +321,6 @@ function evaluateFunc(token) {
  */
 function inlineExpression(token) {
     const result = [];
-    // if (token.typ == EnumToken.ParensTokenType && (token as ParensToken).chi.length == 1) {
-    //
-    //     result.push((token as ParensToken).chi[0]);
-    // } else
     if (token.typ == EnumToken.BinaryExpressionTokenType) {
         if ([EnumToken.Mul, EnumToken.Div].includes(token.op)) {
             result.push(token);
@@ -482,7 +359,7 @@ function isScalarToken(token) {
 }
 /**
  *
- * generate binary expression tree
+ * generate a binary expression tree
  * @param tokens
  */
 function buildExpression(tokens) {
@@ -502,7 +379,7 @@ function getArithmeticOperation(op) {
 }
 /**
  *
- * generate binary expression tree
+ * generate a binary expression tree
  * @param token
  */
 function factorToken(token) {
@@ -517,7 +394,7 @@ function factorToken(token) {
     return token;
 }
 /**
- * generate binary expression tree
+ * generate a binary expression tree
  * @param tokens
  * @param ops
  */

package/dist/lib/ast/math/math.js

@@ -52,20 +52,20 @@ function compute(a, b, op) {
                 const r2 = minifyNumber(r[0]) + '/' + minifyNumber(r[1]);
                 return minifyNumber(result).length < r2.length ? result : {
                     typ: EnumToken.FractionTokenType,
-                    l: { typ: EnumToken.NumberTokenType, val: minifyNumber(r[0]) },
-                    r: { typ: EnumToken.NumberTokenType, val: minifyNumber(r[1]) }
+                    l: { typ: EnumToken.NumberTokenType, val: r[0] },
+                    r: { typ: EnumToken.NumberTokenType, val: r[1] }
                 };
         }
     }
     let l1 = typeof a == 'number' ? {
         typ: EnumToken.FractionTokenType,
-        l: { typ: EnumToken.NumberTokenType, val: minifyNumber(a) },
-        r: { typ: EnumToken.NumberTokenType, val: '1' }
+        l: { typ: EnumToken.NumberTokenType, val: a },
+        r: { typ: EnumToken.NumberTokenType, val: 1 }
     } : a;
     let r1 = typeof b == 'number' ? {
         typ: EnumToken.FractionTokenType,
-        l: { typ: EnumToken.NumberTokenType, val: minifyNumber(b) },
-        r: { typ: EnumToken.NumberTokenType, val: '1' }
+        l: { typ: EnumToken.NumberTokenType, val: b },
+        r: { typ: EnumToken.NumberTokenType, val: 1 }
     } : b;
     let l2;
     let r2;
@@ -103,8 +103,8 @@ function compute(a, b, op) {
     const result = a2[0] / a2[1];
     return minifyNumber(result).length <= minifyNumber(a2[0]).length + 1 + minifyNumber(a2[1]).length ? result : {
         typ: EnumToken.FractionTokenType,
-        l: { typ: EnumToken.NumberTokenType, val: minifyNumber(a2[0]) },
-        r: { typ: EnumToken.NumberTokenType, val: minifyNumber(a2[1]) }
+        l: { typ: EnumToken.NumberTokenType, val: a2[0] },
+        r: { typ: EnumToken.NumberTokenType, val: a2[1] }
     };
 }
 function rem(...a) {

package/dist/lib/ast/transform/compute.js

@@ -1,4 +1,4 @@
-import { multiply, identity } from './utils.js';
+import { multiply, toZero, identity } from './utils.js';
 import { EnumToken } from '../types.js';
 import { transformFunctions } from '../../syntax/syntax.js';
 import { length2Px } from '../../syntax/utils.js';
@@ -22,10 +22,6 @@ import { perspective } from './perspective.js';
 function compute(transformLists) {
     transformLists = transformLists.slice();
     stripCommaToken(transformLists);
-    // if (transformLists.length == 0) {
-    //
-    //     return null;
-    // }
     let matrix = identity();
     let mat;
     const cumulative = [];
@@ -50,8 +46,10 @@ function compute(transformLists) {
             });
         }
     }
+    // console.error({matrix});
+    // matrix = toZero(matrix) as Matrix;
     return {
-        matrix: serialize(matrix),
+        matrix: serialize(toZero(matrix)),
         cumulative,
         minified: minify(matrix) ?? [serialized]
     };
@@ -61,10 +59,6 @@ function computeMatrix(transformList, matrixVar) {
     let val;
     let i = 0;
     for (; i < transformList.length; i++) {
-        // if (transformList[i].typ == EnumToken.WhitespaceTokenType) {
-        //
-        //     continue;
-        // }
         if (transformList[i].typ != EnumToken.FunctionTokenType || !transformFunctions.includes(transformList[i].val)) {
             return null;
         }
@@ -77,16 +71,7 @@ function computeMatrix(transformList, matrixVar) {
                 {
                     values.length = 0;
                     const children = stripCommaToken(transformList[i].chi.slice());
-                    // if (children == null || children.length == 0) {
-                    //
-                    //     return null;
-                    // }
                     const valCount = transformList[i].val == 'translate3d' || transformList[i].val == 'translate' ? 3 : 1;
-                    // if (children.length == 1 && children[0].typ == EnumToken.IdenTokenType && (children[0] as IdentToken).val == 'none') {
-                    //
-                    //     values.fill(0, 0, valCount);
-                    //
-                    // } else {
                     for (let j = 0; j < children.length; j++) {
                         if (children[j].typ == EnumToken.WhitespaceTokenType) {
                             continue;
@@ -97,7 +82,6 @@ function computeMatrix(transformList, matrixVar) {
                         }
                         values.push(val);
                     }
-                    // }
                     if (values.length == 0 || values.length > valCount) {
                         return null;
                     }
@@ -132,10 +116,6 @@ function computeMatrix(transformList, matrixVar) {
                     let values = [];
                     let valuesCount = transformList[i].val == 'rotate3d' ? 4 : 1;
                     for (const child of stripCommaToken(transformList[i].chi.slice())) {
-                        // if (child.typ == EnumToken.WhitespaceTokenType) {
-                        //
-                        //     continue;
-                        // }
                         values.push(child);
                         if (transformList[i].val == 'rotateX') {
                             x = 1;
@@ -178,19 +158,11 @@ function computeMatrix(transformList, matrixVar) {
                     const children = stripCommaToken(transformList[i].chi.slice());
                     for (let k = 0; k < children.length; k++) {
                         child = children[k];
-                        // if (child.typ == EnumToken.CommentTokenType || child.typ == EnumToken.WhitespaceTokenType) {
-                        //
-                        //     continue;
-                        // }
                         if (child.typ != EnumToken.NumberTokenType) {
                             return null;
                         }
                         values.push(getNumber(child));
                     }
-                    // if (values.length == 0) {
-                    //
-                    //     return null;
-                    // }
                     if (transformList[i].val == 'scale3d') {
                         if (values.length != 3) {
                             return null;
@@ -234,10 +206,6 @@ function computeMatrix(transformList, matrixVar) {
                             continue;
                         }
                         value = getAngle(child);
-                        // if (value == null) {
-                        //
-                        //     return null;
-                        // }
                         values.push(value * 2 * Math.PI);
                     }
                     if (values.length == 0 || (values.length > (transformList[i].val == 'skew' ? 2 : 1))) {
@@ -278,7 +246,6 @@ function computeMatrix(transformList, matrixVar) {
                 }
                 break;
             case 'matrix3d':
-            // return null;
             case 'matrix':
                 {
                     const values = [];

package/dist/lib/ast/transform/matrix.js

@@ -1,4 +1,4 @@
-import { toZero, is2DMatrix, identity } from './utils.js';
+import { is2DMatrix, identity } from './utils.js';
 import { EnumToken } from '../types.js';
 import { eq } from '../../parser/utils/eq.js';
 import { getNumber } from '../../syntax/color/color.js';
@@ -9,7 +9,6 @@ import '../../parser/parse.js';
 import '../../parser/tokenize.js';
 import '../../parser/utils/config.js';
 import '../../renderer/sourcemap/lib/encode.js';
-import { minifyNumber } from '../../syntax/utils.js';
 
 function parseMatrix(mat) {
     if (mat.typ == EnumToken.IdenTokenType) {
@@ -31,30 +30,30 @@ function parseMatrix(mat) {
 function matrix(values) {
     const matrix = identity();
     if (values.length === 6) {
-        matrix[0][0] = values[0];
-        matrix[0][1] = values[1];
-        matrix[1][0] = values[2];
-        matrix[1][1] = values[3];
-        matrix[3][0] = values[4];
-        matrix[3][1] = values[5];
+        matrix[0 * 4 + 0] = values[0];
+        matrix[0 * 4 + 1] = values[1];
+        matrix[1 * 4 + 0] = values[2];
+        matrix[1 * 4 + 1] = values[3];
+        matrix[3 * 4 + 0] = values[4];
+        matrix[3 * 4 + 1] = values[5];
     }
     else if (values.length === 16) {
-        matrix[0][0] = values[0];
-        matrix[0][1] = values[1];
-        matrix[0][2] = values[2];
-        matrix[0][3] = values[3];
-        matrix[1][0] = values[4];
-        matrix[1][1] = values[5];
-        matrix[1][2] = values[6];
-        matrix[1][3] = values[7];
-        matrix[2][0] = values[8];
-        matrix[2][1] = values[9];
-        matrix[2][2] = values[10];
-        matrix[2][3] = values[11];
-        matrix[3][0] = values[12];
-        matrix[3][1] = values[13];
-        matrix[3][2] = values[14];
-        matrix[3][3] = values[15];
+        matrix[0 * 4 + 0] = values[0];
+        matrix[0 * 4 + 1] = values[1];
+        matrix[0 * 4 + 2] = values[2];
+        matrix[0 * 4 + 3] = values[3];
+        matrix[1 * 4 + 0] = values[4];
+        matrix[1 * 4 + 1] = values[5];
+        matrix[1 * 4 + 2] = values[6];
+        matrix[1 * 4 + 3] = values[7];
+        matrix[2 * 4 + 0] = values[8];
+        matrix[2 * 4 + 1] = values[9];
+        matrix[2 * 4 + 2] = values[10];
+        matrix[2 * 4 + 3] = values[11];
+        matrix[3 * 4 + 0] = values[12];
+        matrix[3 * 4 + 1] = values[13];
+        matrix[3 * 4 + 2] = values[14];
+        matrix[3 * 4 + 3] = values[15];
     }
     else {
         return null;
@@ -62,7 +61,7 @@ function matrix(values) {
     return matrix;
 }
 function serialize(matrix) {
-    matrix = matrix.map(t => toZero(t.slice()));
+    matrix = matrix.slice();
     // @ts-ignore
     if (eq(matrix, identity())) {
         return {
@@ -76,19 +75,19 @@ function serialize(matrix) {
             typ: EnumToken.FunctionTokenType,
             val: 'matrix',
             chi: [
-                matrix[0][0],
-                matrix[0][1],
-                matrix[1][0],
-                matrix[1][1],
-                matrix[3][0],
-                matrix[3][1]
+                matrix[0 * 4 + 0],
+                matrix[0 * 4 + 1],
+                matrix[1 * 4 + 0],
+                matrix[1 * 4 + 1],
+                matrix[3 * 4 + 0],
+                matrix[3 * 4 + 1]
             ].reduce((acc, t) => {
                 if (acc.length > 0) {
                     acc.push({ typ: EnumToken.CommaTokenType });
                 }
                 acc.push({
                     typ: EnumToken.NumberTokenType,
-                    val: minifyNumber(t)
+                    val: t
                 });
                 return acc;
             }, [])
@@ -97,13 +96,13 @@ function serialize(matrix) {
     return {
         typ: EnumToken.FunctionTokenType,
         val: 'matrix3d',
-        chi: matrix.flat().reduce((acc, curr) => {
+        chi: matrix.reduce((acc, curr) => {
             if (acc.length > 0) {
                 acc.push({ typ: EnumToken.CommaTokenType });
             }
             acc.push({
                 typ: EnumToken.NumberTokenType,
-                val: minifyNumber(curr)
+                val: curr
             });
             return acc;
         }, [])