ember-data-resources 3.0.1 → 3.0.5

package/-private/resources/errors.d.ts

@@ -1,3 +1,6 @@
-export declare class IdRequiredError extends Error {
+export declare class IdRequiredError extends TypeError {
     constructor(modelName: string);
 }
+export declare class IdTypeError extends TypeError {
+    constructor(modelName: string, id: unknown);
+}

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [3.0.5](https://github.com/NullVoxPopuli/ember-data-resources/compare/v3.0.4...v3.0.5) (2022-02-03)
+
+
+### Bug Fixes
+
+* **deps:** update dependency ember-resources to ^4.3.0 ([7fda73e](https://github.com/NullVoxPopuli/ember-data-resources/commit/7fda73e4a94abefe225e0041846a662ce4ea9a5f))
+
+## [3.0.4](https://github.com/NullVoxPopuli/ember-data-resources/compare/v3.0.3...v3.0.4) (2022-01-31)
+
+
+### Bug Fixes
+
+* **deps:** update dependency ember-resources to ^4.2.0 ([7d202b8](https://github.com/NullVoxPopuli/ember-data-resources/commit/7d202b8ad378e47af8bfb08c21eb0909935ee80e))
+
+## [3.0.3](https://github.com/NullVoxPopuli/ember-data-resources/compare/v3.0.2...v3.0.3) (2022-01-21)
+
+
+### Bug Fixes
+
+* **deps:** update dependency ember-auto-import to ^2.4.0 ([b867f76](https://github.com/NullVoxPopuli/ember-data-resources/commit/b867f7669c79aff6eeb92e12dfde2614420b921a))
+
+## [3.0.2](https://github.com/NullVoxPopuli/ember-data-resources/compare/v3.0.1...v3.0.2) (2022-01-17)
+
+
+### Bug Fixes
+
+* **findRecord:** allow string ids, and fix array thunk usage ([1eeafb4](https://github.com/NullVoxPopuli/ember-data-resources/commit/1eeafb4a73791f7a0dba9bc82787cabee82f604b)), closes [PR#227](https://github.com/PR/issues/227)
+
 ## [3.0.1](https://github.com/NullVoxPopuli/ember-data-resources/compare/v3.0.0...v3.0.1) (2022-01-15)
 
 

package/addon/-private/resources/errors.ts

@@ -1,7 +1,15 @@
-export class IdRequiredError extends Error {
+export class IdRequiredError extends TypeError {
   constructor(modelName: string) {
     super(
       `While trying to request a resource from ${modelName}, the ID was either null or undefined, and the ID is required for fetching resources`
     );
   }
 }
+
+export class IdTypeError extends TypeError {
+  constructor(modelName: string, id: unknown) {
+    super(
+      `While trying to request a resource from ${modelName}, the ID was of invalid type ${typeof id}: only string and number are supported`
+    );
+  }
+}

package/addon/-private/resources/find-record.ts

@@ -2,7 +2,7 @@ import { tracked } from '@glimmer/tracking';
 import { isDestroyed, isDestroying } from '@ember/destroyable';
 import { action } from '@ember/object';
 
-import { IdRequiredError } from './errors';
+import { IdRequiredError, IdTypeError } from './errors';
 import { Request } from './request';
 
 import type { Id } from './types';
@@ -37,6 +37,8 @@ export class FindRecord<Model, LocalArgs extends Args = Args> extends Request<Lo
      */
     if (id === null || id === undefined) {
       throw new IdRequiredError(modelName);
+    } else if (typeof id !== 'string' && typeof id !== 'number') {
+      throw new IdTypeError(modelName, id);
     }
 
     let record = await this.store.findRecord(modelName as never, id, options);

package/addon/js-helpers.ts

@@ -21,15 +21,15 @@ export function findRecord<Model = unknown>(
 ) {
   return useResource<FindRecord<Model>>(destroyable, FindRecord, () => {
     let reified = thunk();
-    let id: Id | undefined = undefined;
+    let id: Id;
     let options: FindRecordOptions;
 
-    if (typeof reified === 'number') {
-      id = reified;
+    if (Array.isArray(reified)) {
+      id = reified[0];
+      options = reified[1] ?? {};
+    } else {
+      id = reified as Id;
       options = {};
-    } else if (Array.isArray(options)) {
-      id = options[0];
-      options = options[1] || {};
     }
 
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data-resources",
-  "version": "3.0.1",
+  "version": "3.0.5",
   "description": "Resource helpers for reactively (re)fetching data with ember-data",
   "keywords": [
     "ember-addon"
@@ -30,20 +30,20 @@
   "dependencies": {
     "@ember/test-waiters": "^3.0.1",
     "@glimmer/tracking": "^1.0.4",
-    "ember-auto-import": "^2.3.0",
+    "ember-auto-import": "^2.4.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.0.1",
     "ember-cli-typescript": "^4.2.1",
-    "ember-resources": "^4.1.3"
+    "ember-resources": "^4.3.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^16.0.2",
+    "@commitlint/cli": "^16.1.0",
     "@commitlint/config-conventional": "^16.0.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
-    "@embroider/test-setup": "^0.50.2",
+    "@embroider/test-setup": "^1.0.0",
     "@glimmer/component": "^1.0.4",
-    "@nullvoxpopuli/eslint-configs": "^2.1.17",
+    "@nullvoxpopuli/eslint-configs": "^2.1.18",
     "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/git": "^10.0.1",
     "@types/ember-data__model": "^3.16.2",
@@ -70,11 +70,11 @@
     "@types/htmlbars-inline-precompile": "^1.0.1",
     "@types/qunit": "^2.11.3",
     "@types/rsvp": "^4.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.9.1",
-    "@typescript-eslint/parser": "^5.9.1",
+    "@typescript-eslint/eslint-plugin": "^5.10.1",
+    "@typescript-eslint/parser": "^5.10.1",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~4.1.0",
+    "ember-cli": "~4.1.1",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
@@ -102,14 +102,14 @@
     "eslint-plugin-qunit": "^7.2.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
     "loader.js": "^4.7.0",
-    "msw": "^0.36.4",
+    "msw": "^0.36.8",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.5.1",
     "qunit": "^2.17.2",
     "qunit-dom": "^2.0.0",
-    "semantic-release": "^18.0.1",
-    "typescript": "^4.5.4",
-    "webpack": "^5.66.0"
+    "semantic-release": "^19.0.2",
+    "typescript": "^4.5.5",
+    "webpack": "^5.68.0"
   },
   "peerDependencies": {
     "ember-data": "^3.25.0"