@projectcaluma/ember-core 14.6.0 → 14.7.1

package/addon/caluma-query/queries/base.js

@@ -2,13 +2,9 @@ import { getOwner, setOwner } from "@ember/application";
 import { assert } from "@ember/debug";
 import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
-import {
-  enqueueTask,
-  lastValue,
-  restartableTask,
-  task,
-} from "ember-concurrency";
+import { task } from "ember-concurrency";
 import { gql } from "graphql-tag";
+import { TrackedArray } from "tracked-built-ins";
 
 export default class BaseQuery {
   @queryManager apollo;
@@ -66,17 +62,7 @@ export default class BaseQuery {
   }
 
   get value() {
-    const Model = getOwner(this).factoryFor(
-      `caluma-query-model:${this.modelName}`,
-    ).class;
-
-    return this.items.map((item) => {
-      const instance = new Model(item);
-
-      setOwner(instance, getOwner(this));
-
-      return instance;
-    });
+    return this.items;
   }
 
   fetch(...args) {
@@ -94,30 +80,33 @@ export default class BaseQuery {
     return this._fetch.perform({ filter: this.filter, order: this.order });
   }
 
-  @restartableTask
-  *_fetch({ filter = [], order = [], queryOptions = {} } = {}) {
-    yield this._fetchPage.cancelAll({ resetState: true });
+  _fetch = task(
+    { restartable: true },
+    async ({ filter = [], order = [], queryOptions = {} } = {}) => {
+      await this._fetchPage.cancelAll({ resetState: true });
 
-    this.items = [];
+      this.items = new TrackedArray();
 
-    this.filter = filter;
-    this.order = order;
-    this.queryOptions = { ...(this.queryOptions ?? {}), ...queryOptions };
+      this.filter = filter;
+      this.order = order;
+      this.queryOptions = { ...(this.queryOptions ?? {}), ...queryOptions };
 
-    return yield this._fetchPage.linked().perform();
-  }
+      return await this._fetchPage.linked().perform();
+    },
+  );
 
-  @enqueueTask
-  *_fetchMore() {
+  _fetchMore = task({ enqueue: true }, async () => {
     if (!this._data) return;
 
-    return yield this._fetchPage.linked().perform();
+    return await this._fetchPage.linked().perform();
+  });
+
+  get _data() {
+    return this._fetchPage.lastSuccessful?.value;
   }
 
-  @lastValue("_fetchPage") _data;
-  @task
-  *_fetchPage() {
-    const data = yield this.apollo.query({
+  _fetchPage = task(async () => {
+    const data = await this.apollo.query({
       query: gql`
         ${this.query}
       `,
@@ -131,13 +120,39 @@ export default class BaseQuery {
       ...this.queryOptions,
     });
 
-    this.items = yield this.processAll([
-      ...this.items,
-      ...(yield this.processNew(
-        data[this.dataKey].edges.map(({ node }) => node),
-      )),
-    ]);
+    const rawNewItems = data[this.dataKey].edges.map(({ node }) => node);
+
+    await this.#parsePage(rawNewItems);
 
     return data;
+  });
+
+  #createModel(item) {
+    const instance = new this.modelClass(item);
+    setOwner(instance, getOwner(this));
+    return instance;
+  }
+
+  async #parsePage(rawNewItems) {
+    const processedNewItems = await this.processNew(rawNewItems);
+    const rawExistingItems = this.items.map((model) => model.raw);
+
+    const allRawItems = [...processedNewItems, ...rawExistingItems];
+    const allProcessedItems = await this.processAll(allRawItems);
+
+    // Superficially check if `this.processAll` changed anything on the raw data
+    if (JSON.stringify(allRawItems) !== JSON.stringify(allProcessedItems)) {
+      // If so, we need to re-create the already existing models and reassign
+      // the `this.items` property in order to trigger a rerender for **all**
+      // items.
+      this.items = new TrackedArray(
+        allProcessedItems.map((i) => this.#createModel(i)),
+      );
+    } else {
+      // If not, only the newly added items need to be converted to models and
+      // added to the existing items in order to only trigger a partial rerender
+      // for the newly added items.
+      this.items.push(...processedNewItems.map((i) => this.#createModel(i)));
+    }
   }
 }

package/addon/caluma-query/resource.js

@@ -51,7 +51,7 @@ export default class CalumaQueryResource extends Resource {
       event.preventDefault();
     }
 
-    this.query.fetchMore();
+    return this.query.fetchMore();
   }
 
   @action
@@ -60,7 +60,7 @@ export default class CalumaQueryResource extends Resource {
       event.preventDefault();
     }
 
-    this.query.refresh();
+    return this.query.refresh();
   }
 
   get value() {

package/addon/services/-scheduler.js

@@ -9,15 +9,22 @@ import { pluralize } from "ember-inflector";
 
 const toArrayIsDeprecated = dependencySatisfies("ember-data", "^4.7.0");
 
-/**
- * Decorator to define a type resolver in the scheduler service.
- *
- * @function typeResolver
- * @param {"group"|"user"} type The type of the objects to resolve
- * @returns {Function} The decorator function that returns an enqueued task to resolve the requested objects
- */
-function typeResolver(type) {
-  return task(function* () {
+export default class PrivateSchedulerService extends Service {
+  @service calumaOptions;
+
+  @tracked groupCache = [];
+  @tracked userCache = [];
+
+  resolveGroup = task(
+    { enqueue: true },
+    async () => await this.#resolveType("group"),
+  );
+  resolveUser = task(
+    { enqueue: true },
+    async () => await this.#resolveType("user"),
+  );
+
+  async #resolveType(type) {
     const identifiers = [...(this[type]?.identifiers ?? [])];
     const callbacks = [...(this[type]?.callbacks ?? [])];
 
@@ -37,7 +44,7 @@ function typeResolver(type) {
 
     const methodName = camelize(`resolve-${pluralize(type)}`);
     const result = uncachedIdentifiers.length
-      ? yield this.calumaOptions[methodName]?.(uncachedIdentifiers)
+      ? await this.calumaOptions[methodName]?.(uncachedIdentifiers)
       : [];
 
     const allResults = toArrayIsDeprecated
@@ -48,20 +55,10 @@ function typeResolver(type) {
       this[`${type}Cache`] = allResults;
     }
 
-    yield Promise.all(callbacks.map((callback) => callback(allResults)));
+    await Promise.all(callbacks.map((callback) => callback(allResults)));
 
     return allResults;
-  }).enqueue();
-}
-
-export default class PrivateSchedulerService extends Service {
-  @service calumaOptions;
-
-  @tracked groupCache = [];
-  @tracked userCache = [];
-
-  @typeResolver("group") resolveGroup;
-  @typeResolver("user") resolveUser;
+  }
 
   /**
    * Resolve a certain object of a type only once in the runloop.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-core",
-  "version": "14.6.0",
+  "version": "14.7.1",
   "description": "Ember core addon for working with Caluma.",
   "keywords": [
     "ember-addon"
@@ -17,7 +17,7 @@
     "ember-auto-import": "^2.10.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0",
-    "ember-concurrency": "^4.0.2",
+    "ember-concurrency": "^4.0.2 || ^5.1.0",
     "ember-inflector": "^4.0.3 || ^5.0.1",
     "ember-intl": "^7.1.1",
     "ember-modify-based-class-resource": "^1.1.1",
@@ -27,15 +27,16 @@
     "graphql-tag": "^2.12.6",
     "jexl": "^2.3.0",
     "lodash.clonedeep": "^4.5.0",
-    "slugify": "^1.6.6"
+    "slugify": "^1.6.6",
+    "tracked-built-ins": "^3.4.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@ember/optional-features": "2.2.0",
+    "@ember/optional-features": "2.3.0",
     "@ember/render-modifiers": "3.0.0",
     "@ember/test-helpers": "4.0.4",
     "@embroider/test-setup": "4.0.0",
-    "@embroider/util": "1.13.4",
-    "@faker-js/faker": "10.0.0",
+    "@embroider/util": "1.13.5",
+    "@faker-js/faker": "10.2.0",
     "@glimmer/component": "1.1.2",
     "@glimmer/tracking": "1.1.2",
     "broccoli-asset-rev": "3.0.0",
@@ -55,12 +56,12 @@
     "ember-source-channel-url": "3.0.0",
     "ember-try": "4.0.0",
     "loader.js": "4.7.0",
-    "qunit": "2.24.1",
+    "qunit": "2.25.0",
     "qunit-dom": "3.5.0",
-    "sinon": "21.0.0",
-    "uikit": "3.23.13",
-    "webpack": "5.101.3",
-    "@projectcaluma/ember-testing": "14.6.0"
+    "sinon": "21.0.1",
+    "uikit": "3.25.6",
+    "webpack": "5.104.1",
+    "@projectcaluma/ember-testing": "14.7.1"
   },
   "peerDependencies": {
     "ember-data": "*",