@projectcaluma/ember-core 9.2.0 → 10.0.0

package/CHANGELOG.md

@@ -0,0 +1,16 @@
+# [@projectcaluma/ember-core-v10.0.0](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-core-v9.2.0...@projectcaluma/ember-core-v10.0.0) (2021-11-25)
+
+
+### Bug Fixes
+
+* **resolver:** fix concurrency issues with resolver helper ([7f09834](https://github.com/projectcaluma/ember-caluma/commit/7f09834b07437ecd91c548601b81360176717481))
+
+
+### chore
+
+* **deps:** update dependencies and drop support for node 10 ([51d6dee](https://github.com/projectcaluma/ember-caluma/commit/51d6deeda9811518622ba0cefd8d3876651dab4f))
+
+
+### BREAKING CHANGES
+
+* **deps:** Remove support for node v10

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,22 @@ 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,
-        ]);
+  return task(function* () {
+    const identifiers = [...this[type].identifiers];
+    const callbacks = [...this[type].callbacks];
 
-        this[type].callbacks.forEach((callback) => callback(result));
+    this[type] = undefined;
 
-        this[type] = undefined;
-      },
-    };
-  };
+    if (!identifiers.length) return;
+
+    const methodName = camelize(`resolve-${pluralize(type)}`);
+    const result = yield this.calumaOptions[methodName]?.(identifiers);
+
+    callbacks.forEach((callback) => callback(result));
+  }).enqueue();
 }
 
 export default class PrivateSchedulerService extends Service {
@@ -72,6 +72,6 @@ export default class PrivateSchedulerService extends Service {
       typeResolverName in this
     );
 
-    once(this, typeResolverName);
+    once(this[typeResolverName], "perform");
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-core",
-  "version": "9.2.0",
+  "version": "10.0.0",
   "description": "Ember core addon for working with Caluma.",
   "keywords": [
     "ember-addon"
@@ -40,9 +40,9 @@
     "@ember/test-helpers": "2.6.0",
     "@embroider/test-setup": "0.47.2",
     "@glimmer/component": "1.0.4",
-    "@projectcaluma/ember-testing": "9.0.0",
+    "@projectcaluma/ember-testing": "9.1.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",
@@ -63,10 +63,10 @@
     "npm-run-all": "4.1.5",
     "qunit": "2.17.2",
     "qunit-dom": "2.0.0",
-    "webpack": "5.64.0"
+    "webpack": "5.64.1"
   },
   "engines": {
-    "node": "10.* || >= 12"
+    "node": "12.* || 14.* || >= 16"
   },
   "ember": {
     "edition": "octane"