possible-commit

src/ClassRegistry.ts

@@ -10,8 +10,6 @@
  * different sources you will need to import all fabric because you may need all classes.
  */
 
-import { Constructor } from './typedefs';
-
 export const JSON = 'json';
 export const SVG = 'svg';
 
@@ -34,26 +32,28 @@ export class ClassRegistry {
 
   setClass(classConstructor: any, classType?: string) {
     if (classType) {
-      this[JSON].set(classType, classConstructor);
+      this[JSON].set(
+        classType,
+        classConstructor
+      );
     } else {
       this[JSON].set(classConstructor.name, classConstructor);
       // legacy
+      // @TODO: needs to be removed in fabric 7 or 8
       this[JSON].set(classConstructor.name.toLowerCase(), classConstructor);
     }
+
   }
 
   getSVGClass(SVGTagName: string): any {
     return this[SVG].get(SVGTagName);
   }
 
   setSVGClass(classConstructor: any, SVGTagName?: string) {
-    if (SVGTagName) {
-      this[SVG].set(SVGTagName, classConstructor);
-    } else {
-      this[SVG].set(classConstructor.name, classConstructor);
-      // legacy
-      this[SVG].set(classConstructor.name.toLowerCase(), classConstructor);
-    }
+    this[SVG].set(
+      SVGTagName ?? classConstructor.name.toLowerCase(),
+      classConstructor
+    );
   }
 }
 

src/Collection.ts

@@ -93,10 +93,14 @@ export function createCollectionMixin<TBase extends Constructor>(Base: TBase) {
 
     /**
      * Returns an array of children objects of this instance
+     * @param {...String} [types] When specified, only objects of these types are returned
      * @return {Array}
      */
-    getObjects() {
-      return [...this._objects];
+    getObjects(...types: string[]) {
+      if (types.length === 0) {
+        return [...this._objects];
+      }
+      return this._objects.filter((o) => types.includes(o.type));
     }
 
     /**

src/Pattern.ts

@@ -6,6 +6,7 @@ import { loadImage } from './util/misc/objectEnlive';
 import { pick } from './util/misc/pick';
 import { toFixed } from './util/misc/toFixed';
 import { classRegistry } from './ClassRegistry';
+import {deprecate} from 'util';
 
 export type TPatternRepeat = 'repeat' | 'repeat-x' | 'repeat-y' | 'no-repeat';
 
@@ -39,6 +40,23 @@ type TCanvasSource = { source: HTMLCanvasElement };
  * @see {@link http://fabricjs.com/dynamic-patterns demo}
  */
 export class Pattern {
+
+  /**
+   * Legacy identifier of the class. Prefer using this.constructor.name 'Pattern'
+   * or utils like isPattern
+   * Will be removed in fabric 7 or 8.
+   * @TODO add sustainable warning message
+   * @type string
+   * @deprecated
+   */
+  get type() {
+    return 'pattern';
+  }
+
+  set type(value) {
+    console.warn('Setting type has no effect', value)
+  }
+
   /**
    * @type TPatternRepeat
    * @defaults
@@ -207,3 +225,5 @@ export class Pattern {
 }
 
 classRegistry.setClass(Pattern);
+// kept for compatibility reason
+classRegistry.setClass(Pattern, 'pattern');

src/shapes/IText/IText.ts

@@ -178,6 +178,10 @@ export class IText<
     return { ...super.getDefaults(), ...IText.ownDefaults };
   }
 
+  get type() {
+    return 'i-text';
+  }
+
   /**
 
    * Constructor

src/shapes/Object/FabricObject.ts

@@ -17,7 +17,7 @@ export class FabricObject<EventSpec extends ObjectEvents = ObjectEvents>
 
 applyMixins(FabricObject, [FabricObjectSVGExportMixin]);
 
-classRegistry.setClass(FabricObject, 'Object');
+classRegistry.setClass(FabricObject);
 classRegistry.setClass(FabricObject, 'object');
 
 export { cacheProperties } from './defaultValues';

src/shapes/Object/Object.ts

@@ -14,7 +14,6 @@ import type {
 import { classRegistry } from '../../ClassRegistry';
 import { runningAnimations } from '../../util/animation/AnimationRegistry';
 import { cloneDeep } from '../../util/internals/cloneDeep';
-import { capitalize } from '../../util/lang_string';
 import { capValue } from '../../util/misc/capValue';
 import { createCanvasElement, toDataURL } from '../../util/misc/dom';
 import { invertTransform, qrDecompose } from '../../util/misc/matrix';
@@ -274,11 +273,28 @@ export class FabricObject<EventSpec extends ObjectEvents = ObjectEvents>
     return { ...FabricObject.ownDefaults };
   }
 
+  /**
+   * Legacy identifier of the class. Prefer using utils like isType or instanceOf
+   * Will be removed in fabric 7 or 8.
+   * The setter exists because is very hard to catch all the ways in which a type value
+   * could be set in the instance
+   * @TODO add sustainable warning message
+   * @type string
+   * @deprecated
+   */
+  get type() {
+    return this.constructor.name.toLowerCase();
+  }
+
+  set type(value) {
+    console.warn('Setting type has no effect', value)
+  }
+
   /**
    * Constructor
    * @param {Object} [options] Options object
    */
-  constructor(options?: Partial<ObjectProps>) {
+  constructor(options: Partial<ObjectProps>) {
     super();
     Object.assign(
       this,
@@ -500,10 +516,7 @@ export class FabricObject<EventSpec extends ObjectEvents = ObjectEvents>
           : null,
       object = {
         ...pick(this, propertiesToInclude as (keyof this)[]),
-        type:
-          this.constructor.name === 'FabricObject'
-            ? 'Object'
-            : this.constructor.name,
+        type: this.constructor.name,
         version: VERSION,
         originX: this.originX,
         originY: this.originY,
@@ -600,11 +613,7 @@ export class FabricObject<EventSpec extends ObjectEvents = ObjectEvents>
    * @return {String}
    */
   toString() {
-    return `#<${
-      this.constructor.name === 'FabricObject'
-        ? 'Object'
-        : this.constructor.name
-    }>`;
+    return `#<${this.constructor.name}>`;
   }
 
   /**
@@ -1447,11 +1456,7 @@ export class FabricObject<EventSpec extends ObjectEvents = ObjectEvents>
    * @return {Boolean}
    */
   isType(...types: string[]) {
-    return types.includes(
-      this.constructor.name === 'FabricObject'
-        ? 'Object'
-        : this.constructor.name
-    );
+    return types.includes(this.constructor.name) || types.includes(this.type);
   }
 
   /**
@@ -1544,7 +1549,7 @@ export class FabricObject<EventSpec extends ObjectEvents = ObjectEvents>
         // from the resulting enlived options, extract options.extraParam to arg0
         // to avoid accidental overrides later
         if (extraParam) {
-          const { [extraParam]: arg0, ...rest } = allOptions;
+          const { [extraParam]: arg0, type, ...rest } = allOptions;
           // @ts-ignore;
           return new this(arg0, rest);
         } else {
@@ -1569,5 +1574,5 @@ export class FabricObject<EventSpec extends ObjectEvents = ObjectEvents>
   }
 }
 
-classRegistry.setClass(FabricObject, 'Object');
+classRegistry.setClass(FabricObject);
 classRegistry.setClass(FabricObject, 'object');

src/shapes/Path.ts

@@ -3,7 +3,7 @@ import { config } from '../config';
 import { SHARED_ATTRIBUTES } from '../parser/attributes';
 import { parseAttributes } from '../parser/parseAttributes';
 import { Point } from '../Point';
-import { PathData, TClassProperties } from '../typedefs';
+import { PathData } from '../typedefs';
 import { makeBoundingBoxFromPoints } from '../util/misc/boundingBoxFromPoints';
 import { toFixed } from '../util/misc/toFixed';
 import {