@projectcaluma/ember-core 9.2.0 → 10.1.0

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

@@ -8,7 +8,7 @@ import {
   restartableTask,
   task,
 } from "ember-concurrency-decorators";
-import gql from "graphql-tag";
+import { gql } from "graphql-tag";
 
 export default class BaseQuery {
   @queryManager apollo;

package/addon/helpers/-resolver.js

@@ -20,6 +20,8 @@ export default class PrivateResolver extends Helper {
       ? identifiers[0]
       : identifiers;
 
+    if (!identifier) return null;
+
     // The parameter for the helper changed so we need to recompute and store
     // the new parameter to remember it at the next computation
     if (identifier !== this._identifier) {

package/addon/services/-scheduler.js

@@ -2,6 +2,7 @@ import { assert } from "@ember/debug";
 import { once } from "@ember/runloop";
 import Service, { inject as service } from "@ember/service";
 import { camelize } from "@ember/string";
+import { task } from "ember-concurrency";
 import { pluralize } from "ember-inflector";
 
 /**
@@ -9,23 +10,24 @@ import { pluralize } from "ember-inflector";
  *
  * @function typeResolver
  * @param {"group"|"user"} type The type of the objects to resolve
- * @returns {Function} The decorator function that returns a method descriptor to resolve the requested objects
+ * @returns {Function} The decorator function that returns an enqueued task to resolve the requested objects
  */
 function typeResolver(type) {
-  return function () {
-    return {
-      async value() {
-        const methodName = camelize(`resolve-${pluralize(type)}`);
-        const result = await this.calumaOptions[methodName]?.([
-          ...this[type].identifiers,
-        ]);
-
-        this[type].callbacks.forEach((callback) => callback(result));
-
-        this[type] = undefined;
-      },
-    };
-  };
+  return task(function* () {
+    const identifiers = [...this[type].identifiers];
+    const callbacks = [...this[type].callbacks];
+
+    this[type] = undefined;
+
+    if (!identifiers.length) return;
+
+    const methodName = camelize(`resolve-${pluralize(type)}`);
+    const result = yield this.calumaOptions[methodName]?.(identifiers);
+
+    yield Promise.all(callbacks.map((callback) => callback(result)));
+
+    return result;
+  }).enqueue();
 }
 
 export default class PrivateSchedulerService extends Service {
@@ -72,6 +74,18 @@ export default class PrivateSchedulerService extends Service {
       typeResolverName in this
     );
 
-    once(this, typeResolverName);
+    once(this[typeResolverName], "perform");
+  }
+
+  resolve(identifiers, type) {
+    const typeResolverName = camelize(`resolve-${type}`);
+
+    if (!this[type]) {
+      this[type] = { identifiers: new Set(), callbacks: new Set() };
+    }
+
+    identifiers.forEach((identifier) => this[type].identifiers.add(identifier));
+
+    return this[typeResolverName]?.perform();
   }
 }

package/addon/services/caluma-options.js

@@ -1,4 +1,5 @@
 import Service, { inject as service } from "@ember/service";
+import { tracked } from "@glimmer/tracking";
 
 import slugify from "@projectcaluma/ember-core/utils/slugify";
 
@@ -14,6 +15,8 @@ import slugify from "@projectcaluma/ember-core/utils/slugify";
 export default class CalumaOptionsService extends Service {
   @service intl;
 
+  @tracked currentGroupId;
+
   constructor(...args) {
     super(...args);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-core",
-  "version": "9.2.0",
+  "version": "10.1.0",
   "description": "Ember core addon for working with Caluma.",
   "keywords": [
     "ember-addon"
@@ -14,16 +14,17 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@apollo/client": "^3.4.16",
+    "@apollo/client": "^3.5.6",
     "@glimmer/tracking": "^1.0.4",
     "ember-apollo-client": "^3.2.0",
     "ember-auto-import": "^2.2.3",
     "ember-changeset-validations": "^3.16.0",
     "ember-cli-babel": "^7.26.6",
-    "ember-cli-htmlbars": "^6.0.0",
+    "ember-cli-htmlbars": "^6.0.1",
     "ember-concurrency": "^2.2.0",
     "ember-concurrency-decorators": "^2.0.3",
     "ember-fetch": "^8.0.4",
+    "ember-inflector": "^4.0.2",
     "ember-intl": "^5.7.0",
     "graphql": "^15.6.1",
     "graphql-tag": "^2.12.6",
@@ -32,17 +33,17 @@
     "lodash.clonedeep": "^4.5.0",
     "moment": "^2.29.1",
     "proxy-polyfill": "^0.3.2",
-    "slugify": "^1.6.2"
+    "slugify": "^1.6.3"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
-    "@ember/render-modifiers": "2.0.0",
+    "@ember/render-modifiers": "2.0.2",
     "@ember/test-helpers": "2.6.0",
-    "@embroider/test-setup": "0.47.2",
+    "@embroider/test-setup": "0.48.1",
     "@glimmer/component": "1.0.4",
-    "@projectcaluma/ember-testing": "9.0.0",
+    "@projectcaluma/ember-testing": "10.0.0",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "3.28.3",
+    "ember-cli": "3.28.4",
     "ember-cli-code-coverage": "1.0.3",
     "ember-cli-dependency-checker": "3.2.0",
     "ember-cli-inject-live-reload": "2.1.0",
@@ -55,7 +56,7 @@
     "ember-maybe-import-regenerator": "1.0.0",
     "ember-qunit": "5.1.5",
     "ember-resolver": "8.0.3",
-    "ember-source": "3.28.6",
+    "ember-source": "3.28.8",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "faker": "5.5.3",
@@ -63,10 +64,10 @@
     "npm-run-all": "4.1.5",
     "qunit": "2.17.2",
     "qunit-dom": "2.0.0",
-    "webpack": "5.64.0"
+    "webpack": "5.65.0"
   },
   "engines": {
-    "node": "10.* || >= 12"
+    "node": "12.* || 14.* || >= 16"
   },
   "ember": {
     "edition": "octane"