Fix for PropertyBag

Improved EntityCluster description

Author: thw0rted

Source/DataSources/EntityCluster.js

@@ -963,9 +963,8 @@ EntityCluster.prototype.destroy = function () {
  * @callback EntityCluster.newClusterCallback
  *
  * @param {Entity[]} clusteredEntities An array of the entities contained in the cluster.
- * @param {Object} cluster An object
- * containing billboard, label, and point properties. The values are the same as
- * billboard, label and point entities, but must be the values of the ConstantProperty.
+ * @param {Object} cluster An object containing the Billboard, Label, and Point
+ * primitives that represent this cluster of entities.
  * @param {Billboard} cluster.billboard
  * @param {Label} cluster.label
  * @param {PointPrimitive} cluster.point

Source/DataSources/PropertyBag.js

@@ -9,7 +9,12 @@ import Property from "./Property.js";
 /**
  * A {@link Property} whose value is a key-value mapping of property names to the computed value of other properties.
  *
- * @typedef {PropertyBagType}
+ * @alias PropertyBag
+ * @constructor
+ * @implements {DictionaryLike}
+ *
+ * @param {Object} [value] An object, containing key-value mapping of property names to properties.
+ * @param {Function} [createPropertyCallback] A function that will be called when the value of any of the properties in value are not a Property.
  */
 function PropertyBag(value, createPropertyCallback) {
   this._propertyNames = [];

gulpfile.cjs

@@ -1550,6 +1550,12 @@ function createTypeScriptDefinitions() {
     .replace(/<String>/gm, "<string>")
     .replace(/<Boolean>/gm, "<boolean>")
     .replace(/<Object>/gm, "<object>")
+    // The class has to be called PropertyBag for JSDoc purposes, but we can rename
+    // it and reuse the `PropertyBag` name for a union type, see below
+    .replace(
+      /export (class|interface) PropertyBag/gm,
+      "export $1 PropertyBagBase"
+    )
     .replace(
       /= "WebGLConstants\.(.+)"/gm,
       (match, p1) => `= WebGLConstants.${p1}`
@@ -1562,19 +1568,14 @@ function createTypeScriptDefinitions() {
 /**
  * Private interfaces to support PropertyBag being a dictionary-like object.
  */
+interface DictionaryLike {
+  [index: string]: any;
+}
 interface PropertyDictionary {
   [key: string]: Property | undefined;
 }
-class PropertyBagBase {
-  readonly propertyNames: string[];
-  constructor(value?: object, createPropertyCallback?: Function);
-  addProperty(propertyName: string, value?: any, createPropertyCallback?: Function): void;
-  hasProperty(propertyName: string): boolean;
-  merge(source: Object, createPropertyCallback?: Function): void;
-  removeProperty(propertyName: string): void;
-}
 /** This has to be in the workaround section because JSDoc doesn't support Intersection Types */
-type PropertyBagType = PropertyDictionary & Property & PropertyBagBase;
+type PropertyBag = PropertyDictionary & Property & PropertyBagBase;
 
 ${source}
 }