ember-data-resources 3.0.1 → 3.0.2

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,10 @@
+## [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.2",
   "description": "Resource helpers for reactively (re)fetching data with ember-data",
   "keywords": [
     "ember-addon"