fabric 6.4.1 → 6.4.2

package/src/util/path/regex.ts

@@ -1,39 +1,46 @@
 import { reNum } from '../../parser/constants';
 
+const commaWsp = `\\s*,?\\s*`;
+
 /**
  * p for param
  * using "bad naming" here because it makes the regex much easier to read
+ * p is a number that is preceded by an arbitary number of spaces, maybe 0,
+ * a comma or not, and then possibly more spaces or not.
  */
-const p = `(${reNum})`;
+const p = `${commaWsp}(${reNum})`;
+
+// const reMoveToCommand = `(M) ?(?:${p}${p} ?)+`;
 
-const reMoveToCommand = `(M) (?:${p} ${p} ?)+`;
+// const reLineCommand = `(L) ?(?:${p}${p} ?)+`;
 
-const reLineCommand = `(L) (?:${p} ${p} ?)+`;
+// const reHorizontalLineCommand = `(H) ?(?:${p} ?)+`;
 
-const reHorizontalLineCommand = `(H) (?:${p} ?)+`;
+// const reVerticalLineCommand = `(V) ?(?:${p} ?)+`;
 
-const reVerticalLineCommand = `(V) (?:${p} ?)+`;
+// const reClosePathCommand = String.raw`(Z)\s*`;
 
-const reClosePathCommand = String.raw`(Z)\s*`;
+// const reCubicCurveCommand = `(C) ?(?:${p}${p}${p}${p}${p}${p} ?)+`;
 
-const reCubicCurveCommand = `(C) (?:${p} ${p} ${p} ${p} ${p} ${p} ?)+`;
+// const reCubicCurveShortcutCommand = `(S) ?(?:${p}${p}${p}${p} ?)+`;
 
-const reCubicCurveShortcutCommand = `(S) (?:${p} ${p} ${p} ${p} ?)+`;
+// const reQuadraticCurveCommand = `(Q) ?(?:${p}${p}${p}${p} ?)+`;
 
-const reQuadraticCurveCommand = `(Q) (?:${p} ${p} ${p} ${p} ?)+`;
+// const reQuadraticCurveShortcutCommand = `(T) ?(?:${p}${p} ?)+`;
 
-const reQuadraticCurveShortcutCommand = `(T) (?:${p} ${p} ?)+`;
+export const reArcCommandPoints = `${p}${p}${p}${commaWsp}([01])${commaWsp}([01])${p}${p}`;
+// const reArcCommand = `(A) ?(?:${reArcCommandPoints} ?)+`;
 
-const reArcCommand = `(A) (?:${p} ${p} ${p} ([01]) ?([01]) ${p} ${p} ?)+`;
+// export const rePathCommandGroups =
+//   `(?:(?:${reMoveToCommand})` +
+//   `|(?:${reLineCommand})` +
+//   `|(?:${reHorizontalLineCommand})` +
+//   `|(?:${reVerticalLineCommand})` +
+//   `|(?:${reClosePathCommand})` +
+//   `|(?:${reCubicCurveCommand})` +
+//   `|(?:${reCubicCurveShortcutCommand})` +
+//   `|(?:${reQuadraticCurveCommand})` +
+//   `|(?:${reQuadraticCurveShortcutCommand})` +
+//   `|(?:${reArcCommand}))`;
 
-export const rePathCommand =
-  `(?:(?:${reMoveToCommand})` +
-  `|(?:${reLineCommand})` +
-  `|(?:${reHorizontalLineCommand})` +
-  `|(?:${reVerticalLineCommand})` +
-  `|(?:${reClosePathCommand})` +
-  `|(?:${reCubicCurveCommand})` +
-  `|(?:${reCubicCurveShortcutCommand})` +
-  `|(?:${reQuadraticCurveCommand})` +
-  `|(?:${reQuadraticCurveShortcutCommand})` +
-  `|(?:${reArcCommand}))`;
+export const rePathCommand = '[mzlhvcsqta][^mzlhvcsqta]*';

package/src/util/path/typedefs.ts

@@ -293,6 +293,28 @@ export type TSimpleParsedCommand =
 
 export type TSimpleParseCommandType = 'L' | 'M' | 'C' | 'Q' | 'Z';
 
+export type TComplexParsedCommandType =
+  | 'M'
+  | 'L'
+  | 'C'
+  | 'Q'
+  | 'Z'
+  | 'z'
+  | 'm'
+  | 'l'
+  | 'h'
+  | 'v'
+  | 'c'
+  | 's'
+  | 'q'
+  | 't'
+  | 'a'
+  | 'H'
+  | 'V'
+  | 'S'
+  | 'T'
+  | 'A';
+
 /**
  * A series of simple paths
  */