EmbeddedCollection with HasItems (remove legacy CanHaveItems)

Author: usu

src/CanHaveItems.ts

@@ -1,9 +1,6 @@
-import CanHaveItems from './CanHaveItems'
 // import LoadingStoreCollection from './LoadingStoreCollection'
 import Resource, { EmbeddedCollectionType } from './interfaces/Resource'
-import ApiActions from './interfaces/ApiActions'
-import { InternalConfig } from './interfaces/Config'
-import StoreData, { Link } from './interfaces/StoreData'
+import { Link } from './interfaces/StoreData'
 
 /**
  * Imitates a full standalone collection with an items property, even if there is no separate URI (as it
@@ -12,7 +9,7 @@ import StoreData, { Link } from './interfaces/StoreData'
  * URI, we need to reload the whole entity containing the embedded collection. Some extra info about the
  * containing entity must therefore be passed to the constrcutor.
  */
-class EmbeddedCollection extends CanHaveItems implements EmbeddedCollectionType {
+class EmbeddedCollection implements EmbeddedCollectionType {
   public _meta: {
     load: Promise<EmbeddedCollectionType>,
     reload: { // TODO: do we want/need to expose this externally? or sufficient if we keep this in the store and expose $reload()?
@@ -21,6 +18,10 @@ class EmbeddedCollection extends CanHaveItems implements EmbeddedCollectionType
     }
   }
 
+  _storeData: {
+    items: Array<Link>
+  }
+
   /**
    * @param items           array of items, which can be mixed primitive values and entity references
    * @param reloadUri       URI of the entity containing the embedded collection (for reloading)
@@ -29,29 +30,30 @@ class EmbeddedCollection extends CanHaveItems implements EmbeddedCollectionType
    * @param config          dependency injection of config object
    * @param loadParent      a promise that will resolve when the parent entity has finished (re-)loading
    */
-  constructor (items: Array<Link>, reloadUri: string, reloadProperty: string, apiActions: ApiActions, config: InternalConfig, loadParent: Promise<StoreData> | null = null) {
-    super(apiActions, config, items, reloadUri, reloadProperty)
+  constructor (items: Array<Link>, reloadUri: string, reloadProperty: string, loadCollection: Promise<EmbeddedCollectionType> | null = null) {
+    this._storeData = {
+      items
+    }
 
     this._meta = {
-      load: loadParent
-        ? loadParent.then(parentResource => new EmbeddedCollection(parentResource[reloadProperty], reloadUri, reloadProperty, apiActions, config))
-        : Promise.resolve(this),
+      load: loadCollection || Promise.resolve(this),
       reload: {
         uri: reloadUri,
         property: reloadProperty
       }
     }
   }
 
+  /*
   $loadItems () :Promise<Array<Resource>> {
     return new Promise((resolve) => {
-      const items = this.items
+      const items = this._storeData.items
       // TODO: this is probably broken as LoadingStoreCollection has no constructor anymore
       // if (items instanceof LoadingStoreCollection) items._meta.load.then(result => resolve(result))
       // else resolve(items)
       resolve(items)
     })
-  }
+  } */
 }
 
 export default EmbeddedCollection

src/EmbeddedCollection.ts

@@ -1,7 +1,7 @@
 import { isEntityReference } from './halHelpers'
 import LoadingStoreCollection from './LoadingStoreCollection'
 import Resource from './interfaces/Resource'
-import StoreDataCollection, { Link } from './interfaces/StoreData'
+import { Link } from './interfaces/StoreData'
 import ApiActions from './interfaces/ApiActions'
 import { InternalConfig } from './interfaces/Config'
 
@@ -14,10 +14,10 @@ import { InternalConfig } from './interfaces/Config'
 type GConstructor<T> = new (...args: any[]) => T;
 
 // Ensure property _storeData.items exist
-type HasStoreData = GConstructor<{ _storeData: StoreDataCollection }>;
+type HasStoreData = GConstructor<{ _storeData: { items: Array<Link> } }>;
 
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-function HasItems<TBase extends HasStoreData> (Base: TBase, apiActions: ApiActions, config: InternalConfig) {
+function HasItems<TBase extends HasStoreData> (Base: TBase, apiActions: ApiActions, config: InternalConfig, reloadUri?: string, reloadProperty?: string) {
   /**
    * Filter out items that are marked as deleting (eager removal)
    */
@@ -75,8 +75,8 @@ function HasItems<TBase extends HasStoreData> (Base: TBase, apiActions: ApiActio
   }
 
   const HasItems = class extends Base {
-    fetchAllUri = ''
-    fetchAllProperty = ''
+    fetchAllUri = reloadUri || ''
+    fetchAllProperty = reloadProperty || ''
 
     /**
      * Get items excluding ones marked as 'deleting' (eager remove)

src/HasItems.ts

@@ -3,9 +3,10 @@ import { isTemplatedLink, isEntityReference } from './halHelpers'
 import EmbeddedCollection from './EmbeddedCollection'
 import Resource from './interfaces/Resource'
 import ApiActions from './interfaces/ApiActions'
-import { StoreData } from './interfaces/StoreData'
+import { StoreData, StoreDataEntity } from './interfaces/StoreData'
 import StoreValueCreator from './StoreValueCreator'
 import { InternalConfig } from './interfaces/Config'
+import HasItems from './HasItems'
 
 /**
  * Represents an actual StoreValue, by wrapping the given Vuex store storeData. The storeData must not be loading.
@@ -41,7 +42,14 @@ class StoreValue implements Resource {
 
         // storeData[key] is an embedded collection
         if (Array.isArray(value)) {
-          this[key] = () => new EmbeddedCollection(value, storeData._meta.self, key, this.apiActions, config, storeData._meta.load)
+          // build complete Collection class = EmbeddedCollection + HasItems mixin
+          const EmbeddedCollectionClass = HasItems(EmbeddedCollection, this.apiActions, this.config, storeData._meta.self, key)
+
+          const loadCollection = storeData._meta.load
+            ? (storeData._meta.load as Promise<StoreDataEntity>).then(parentResource => new EmbeddedCollectionClass(parentResource[key], storeData._meta.self, key))
+            : null
+
+          this[key] = () => new EmbeddedCollectionClass(value, storeData._meta.self, key, loadCollection)
 
           // storeData[key] is a reference only (contains only href; no data)
         } else if (isEntityReference(value)) {