@projectcaluma/ember-core 14.7.0 → 14.7.1

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

@@ -2,12 +2,7 @@ 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";
 
@@ -85,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 = new TrackedArray();
+      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}
       `,
@@ -124,10 +122,10 @@ export default class BaseQuery {
 
     const rawNewItems = data[this.dataKey].edges.map(({ node }) => node);
 
-    yield this.#parsePage(rawNewItems);
+    await this.#parsePage(rawNewItems);
 
     return data;
-  }
+  });
 
   #createModel(item) {
     const instance = new this.modelClass(item);

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.7.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",
@@ -61,7 +61,7 @@
     "sinon": "21.0.1",
     "uikit": "3.25.6",
     "webpack": "5.104.1",
-    "@projectcaluma/ember-testing": "14.7.0"
+    "@projectcaluma/ember-testing": "14.7.1"
   },
   "peerDependencies": {
     "ember-data": "*",