ember-data-resources 5.0.0 → 5.1.0

package/README.md

@@ -39,7 +39,7 @@ Available properties:
  - {{this.blog.isLoading}}
  - {{this.blog.isSuccess}}
  - {{this.blog.isError}}
- - {{this.blog.hasRun}}
+ - {{this.blog.hasRan}}
 
 Available methods:
  - <button {{on 'click' this.blog.retry}}>Retry</button>
@@ -63,7 +63,7 @@ Available methods:
    - {{blog.isLoading}}
    - {{blog.isSuccess}}
    - {{blog.isError}}
-   - {{blog.hasRun}}
+   - {{blog.hasRan}}
 
   Available methods:
    - <button {{on 'click' blog.retry}}>Retry</button>
@@ -104,7 +104,7 @@ Available properties:
  - {{this.blog.isLoading}}
  - {{this.blog.isSuccess}}
  - {{this.blog.isError}}
- - {{this.blog.hasRun}}
+ - {{this.blog.hasRan}}
 
 Available methods:
  - <button {{on 'click' this.blog.retry}}>Retry</button>
@@ -129,7 +129,7 @@ Available methods:
    - {{blog.isLoading}}
    - {{blog.isSuccess}}
    - {{blog.isError}}
-   - {{blog.hasRun}}
+   - {{blog.hasRan}}
 
   Available methods:
    - <button {{on 'click' blog.retry}}>Retry</button>
@@ -168,7 +168,7 @@ Available properties:
  - {{this.blog.isLoading}}
  - {{this.blog.isSuccess}}
  - {{this.blog.isError}}
- - {{this.blog.hasRun}}
+ - {{this.blog.hasRan}}
 
 Available methods:
  - <button {{on 'click' this.blog.retry}}>Retry</button>
@@ -192,7 +192,7 @@ Available methods:
    - {{blog.isLoading}}
    - {{blog.isSuccess}}
    - {{blog.isError}}
-   - {{blog.hasRun}}
+   - {{blog.hasRan}}
 
   Available methods:
    - <button {{on 'click' blog.retry}}>Retry</button>
@@ -234,7 +234,7 @@ Available properties:
  - {{this.blog.isLoading}}
  - {{this.blog.isSuccess}}
  - {{this.blog.isError}}
- - {{this.blog.hasRun}}
+ - {{this.blog.hasRan}}
 
 Available methods:
  - <button {{on 'click' this.blog.retry}}>Retry</button>
@@ -258,7 +258,7 @@ Available methods:
    - {{blog.isLoading}}
    - {{blog.isSuccess}}
    - {{blog.isError}}
-   - {{blog.hasRun}}
+   - {{blog.hasRan}}
 
   Available methods:
    - <button {{on 'click' blog.retry}}>Retry</button>

package/dist/-private/resources/find-all.js

@@ -1,4 +1,4 @@
-import { _ as _applyDecoratedDescriptor, R as Request, a as _initializerDefineProperty } from '../../request-17f93aea.js';
+import { _ as _applyDecoratedDescriptor, R as Request, a as _initializerDefineProperty } from '../../request-rVKgKutp.js';
 import { tracked } from '@glimmer/tracking';
 import { isDestroyed, isDestroying } from '@ember/destroyable';
 import { action } from '@ember/object';

package/dist/-private/resources/find-record.js

@@ -1,4 +1,4 @@
-import { _ as _applyDecoratedDescriptor, R as Request, a as _initializerDefineProperty } from '../../request-17f93aea.js';
+import { _ as _applyDecoratedDescriptor, R as Request, a as _initializerDefineProperty } from '../../request-rVKgKutp.js';
 import { tracked } from '@glimmer/tracking';
 import { isDestroyed, isDestroying } from '@ember/destroyable';
 import { action } from '@ember/object';

package/dist/-private/resources/query-record.js

@@ -1,4 +1,4 @@
-import { _ as _applyDecoratedDescriptor, R as Request, a as _initializerDefineProperty } from '../../request-17f93aea.js';
+import { _ as _applyDecoratedDescriptor, R as Request, a as _initializerDefineProperty } from '../../request-rVKgKutp.js';
 import { tracked } from '@glimmer/tracking';
 import { isDestroyed, isDestroying } from '@ember/destroyable';
 import { action } from '@ember/object';

package/dist/-private/resources/query.js

@@ -1,4 +1,4 @@
-import { _ as _applyDecoratedDescriptor, R as Request, a as _initializerDefineProperty } from '../../request-17f93aea.js';
+import { _ as _applyDecoratedDescriptor, R as Request, a as _initializerDefineProperty } from '../../request-rVKgKutp.js';
 import { tracked } from '@glimmer/tracking';
 import { isDestroyed, isDestroying } from '@ember/destroyable';
 import { action } from '@ember/object';

package/dist/-private/resources/request.js

@@ -1,4 +1,4 @@
-export { R as Request } from '../../request-17f93aea.js';
+export { R as Request } from '../../request-rVKgKutp.js';
 import '@glimmer/tracking';
 import '@ember/debug';
 import '@ember/destroyable';

package/dist/{request-17f93aea.js → request-rVKgKutp.js}

@@ -138,4 +138,4 @@ let Request = (_class = class Request extends Resource {
 }), _applyDecoratedDescriptor(_class.prototype, "retry", [action], Object.getOwnPropertyDescriptor(_class.prototype, "retry"), _class.prototype), _applyDecoratedDescriptor(_class.prototype, "__REQUEST_FUNCTION__", [action, waitFor], Object.getOwnPropertyDescriptor(_class.prototype, "__REQUEST_FUNCTION__"), _class.prototype)), _class);
 
 export { Request as R, _applyDecoratedDescriptor as _, _initializerDefineProperty as a };
-//# sourceMappingURL=request-17f93aea.js.map
+//# sourceMappingURL=request-rVKgKutp.js.map

package/dist/{request-17f93aea.js.map → request-rVKgKutp.js.map}

@@ -1 +1 @@
-{"version":3,"file":"request-17f93aea.js","sources":["../../node_modules/.pnpm/@babel+runtime@7.22.5/node_modules/@babel/runtime/helpers/esm/initializerDefineProperty.js","../../node_modules/.pnpm/@babel+runtime@7.22.5/node_modules/@babel/runtime/helpers/esm/applyDecoratedDescriptor.js","../src/-private/resources/request.ts"],"sourcesContent":["export default function _initializerDefineProperty(target, property, descriptor, context) {\n  if (!descriptor) return;\n  Object.defineProperty(target, property, {\n    enumerable: descriptor.enumerable,\n    configurable: descriptor.configurable,\n    writable: descriptor.writable,\n    value: descriptor.initializer ? descriptor.initializer.call(context) : void 0\n  });\n}","export default function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) {\n  var desc = {};\n  Object.keys(descriptor).forEach(function (key) {\n    desc[key] = descriptor[key];\n  });\n  desc.enumerable = !!desc.enumerable;\n  desc.configurable = !!desc.configurable;\n  if ('value' in desc || desc.initializer) {\n    desc.writable = true;\n  }\n  desc = decorators.slice().reverse().reduce(function (desc, decorator) {\n    return decorator(target, property, desc) || desc;\n  }, desc);\n  if (context && desc.initializer !== void 0) {\n    desc.value = desc.initializer ? desc.initializer.call(context) : void 0;\n    desc.initializer = undefined;\n  }\n  if (desc.initializer === void 0) {\n    Object.defineProperty(target, property, desc);\n    desc = null;\n  }\n  return desc;\n}","import { tracked } from '@glimmer/tracking';\nimport { assert } from '@ember/debug';\nimport { isDestroyed, isDestroying } from '@ember/destroyable';\nimport { action } from '@ember/object';\nimport { inject as service } from '@ember/service';\nimport { waitFor, waitForPromise } from '@ember/test-waiters';\n\nimport { Resource } from 'ember-resources';\n\nimport type Store from '@ember-data/store';\nimport type { ExpandArgs } from 'ember-resources';\n\nexport type FindRecordOptions = Parameters<Store['findRecord']>[2];\n\nexport class Request<Args> extends Resource<Args> {\n  @service declare store: Store;\n\n  @tracked error: Error | undefined;\n  @tracked isLoading = false;\n  @tracked hasRan = false;\n\n  /**\n   * Args saved, untracked, for retrying\n   */\n  declare positional: ExpandArgs<Args>['Positional'];\n  declare named: ExpandArgs<Args>['Named'];\n\n  modify(positional: ExpandArgs<Args>['Positional'], named: ExpandArgs<Args>['Named']) {\n    this.positional = positional;\n    this.named = named;\n\n    /**\n     * We need to consume all arguments here so that we correctly respond to updates to\n     * dirtied source data.\n     *\n     * e.g.: when an id changes that is passed to findRecord, we re-fetch.\n     */\n    this.__REQUEST_FUNCTION__([...(positional as unknown[])] as ExpandArgs<Args>['Positional'], {\n      ...named,\n    });\n  }\n\n  async __WRAPPED_FUNCTION__(\n    _positional: ExpandArgs<Args>['Positional'],\n    _named: ExpandArgs<Args>['Named']\n  ) {\n    throw new Error('Not Implemented');\n  }\n\n  get isSuccess() {\n    return !this.error;\n  }\n\n  get isError() {\n    return Boolean(this.error);\n  }\n\n  get records(): unknown | undefined {\n    return assert(\n      `The resource for ${this.constructor.name} does not have a records property. ` +\n        `You might be looking for .record instead.`\n    );\n  }\n\n  get record(): unknown | undefined {\n    return assert(\n      `The resource for ${this.constructor.name} does not have a record property. ` +\n        `You might be looking for .records instead.`\n    );\n  }\n\n  @action\n  async retry() {\n    return waitForPromise(this.__WRAPPED_FUNCTION__(this.positional, this.named));\n  }\n\n  @action\n  @waitFor\n  async __REQUEST_FUNCTION__(\n    _positional: ExpandArgs<Args>['Positional'],\n    _named: ExpandArgs<Args>['Named']\n  ) {\n    /**\n     * Args are already consumed, but let's delay doing anything\n     * until we can get out of a tracking frame.\n     */\n    await Promise.resolve();\n\n    if (isDestroyed(this) || isDestroying(this)) return;\n\n    this.error = undefined;\n    this.isLoading = true;\n\n    try {\n      await this.retry();\n    } catch (e) {\n      if (isDestroyed(this) || isDestroying(this)) return;\n\n      if (e instanceof Error) {\n        this.error = e;\n      } else {\n        // How likely is this to happen?\n        throw e;\n      }\n    }\n\n    if (isDestroyed(this) || isDestroying(this)) {\n      return;\n    }\n\n    this.isLoading = false;\n    this.hasRan = true;\n  }\n}\n"],"names":["_initializerDefineProperty","target","property","descriptor","context","Object","defineProperty","enumerable","configurable","writable","value","initializer","call","_applyDecoratedDescriptor","decorators","desc","keys","forEach","key","slice","reverse","reduce","decorator","undefined","Request","_class","Resource","constructor","args","_descriptor","_descriptor2","_descriptor3","_descriptor4","modify","positional","named","__REQUEST_FUNCTION__","__WRAPPED_FUNCTION__","_positional","_named","Error","isSuccess","error","isError","Boolean","records","assert","name","record","retry","waitForPromise","Promise","resolve","isDestroyed","isDestroying","isLoading","e","hasRan","prototype","service","tracked","action","getOwnPropertyDescriptor","waitFor"],"mappings":"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","x_google_ignoreList":[0,1]}
+{"version":3,"file":"request-rVKgKutp.js","sources":["../../node_modules/.pnpm/@babel+runtime@7.22.5/node_modules/@babel/runtime/helpers/esm/initializerDefineProperty.js","../../node_modules/.pnpm/@babel+runtime@7.22.5/node_modules/@babel/runtime/helpers/esm/applyDecoratedDescriptor.js","../src/-private/resources/request.ts"],"sourcesContent":["export default function _initializerDefineProperty(target, property, descriptor, context) {\n  if (!descriptor) return;\n  Object.defineProperty(target, property, {\n    enumerable: descriptor.enumerable,\n    configurable: descriptor.configurable,\n    writable: descriptor.writable,\n    value: descriptor.initializer ? descriptor.initializer.call(context) : void 0\n  });\n}","export default function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) {\n  var desc = {};\n  Object.keys(descriptor).forEach(function (key) {\n    desc[key] = descriptor[key];\n  });\n  desc.enumerable = !!desc.enumerable;\n  desc.configurable = !!desc.configurable;\n  if ('value' in desc || desc.initializer) {\n    desc.writable = true;\n  }\n  desc = decorators.slice().reverse().reduce(function (desc, decorator) {\n    return decorator(target, property, desc) || desc;\n  }, desc);\n  if (context && desc.initializer !== void 0) {\n    desc.value = desc.initializer ? desc.initializer.call(context) : void 0;\n    desc.initializer = undefined;\n  }\n  if (desc.initializer === void 0) {\n    Object.defineProperty(target, property, desc);\n    desc = null;\n  }\n  return desc;\n}","import { tracked } from '@glimmer/tracking';\nimport { assert } from '@ember/debug';\nimport { isDestroyed, isDestroying } from '@ember/destroyable';\nimport { action } from '@ember/object';\nimport { inject as service } from '@ember/service';\nimport { waitFor, waitForPromise } from '@ember/test-waiters';\n\nimport { Resource } from 'ember-resources';\n\nimport type Store from '@ember-data/store';\nimport type { ExpandArgs } from 'ember-resources';\n\nexport type FindRecordOptions = Parameters<Store['findRecord']>[2];\n\nexport class Request<Args> extends Resource<Args> {\n  @service declare store: Store;\n\n  @tracked error: Error | undefined;\n  @tracked isLoading = false;\n  @tracked hasRan = false;\n\n  /**\n   * Args saved, untracked, for retrying\n   */\n  declare positional: ExpandArgs<Args>['Positional'];\n  declare named: ExpandArgs<Args>['Named'];\n\n  modify(positional: ExpandArgs<Args>['Positional'], named: ExpandArgs<Args>['Named']) {\n    this.positional = positional;\n    this.named = named;\n\n    /**\n     * We need to consume all arguments here so that we correctly respond to updates to\n     * dirtied source data.\n     *\n     * e.g.: when an id changes that is passed to findRecord, we re-fetch.\n     */\n    this.__REQUEST_FUNCTION__([...(positional as unknown[])] as ExpandArgs<Args>['Positional'], {\n      ...named,\n    });\n  }\n\n  async __WRAPPED_FUNCTION__(\n    _positional: ExpandArgs<Args>['Positional'],\n    _named: ExpandArgs<Args>['Named']\n  ) {\n    throw new Error('Not Implemented');\n  }\n\n  get isSuccess() {\n    return !this.error;\n  }\n\n  get isError() {\n    return Boolean(this.error);\n  }\n\n  get records(): unknown | undefined {\n    return assert(\n      `The resource for ${this.constructor.name} does not have a records property. ` +\n        `You might be looking for .record instead.`\n    );\n  }\n\n  get record(): unknown | undefined {\n    return assert(\n      `The resource for ${this.constructor.name} does not have a record property. ` +\n        `You might be looking for .records instead.`\n    );\n  }\n\n  @action\n  async retry() {\n    return waitForPromise(this.__WRAPPED_FUNCTION__(this.positional, this.named));\n  }\n\n  @action\n  @waitFor\n  async __REQUEST_FUNCTION__(\n    _positional: ExpandArgs<Args>['Positional'],\n    _named: ExpandArgs<Args>['Named']\n  ) {\n    /**\n     * Args are already consumed, but let's delay doing anything\n     * until we can get out of a tracking frame.\n     */\n    await Promise.resolve();\n\n    if (isDestroyed(this) || isDestroying(this)) return;\n\n    this.error = undefined;\n    this.isLoading = true;\n\n    try {\n      await this.retry();\n    } catch (e) {\n      if (isDestroyed(this) || isDestroying(this)) return;\n\n      if (e instanceof Error) {\n        this.error = e;\n      } else {\n        // How likely is this to happen?\n        throw e;\n      }\n    }\n\n    if (isDestroyed(this) || isDestroying(this)) {\n      return;\n    }\n\n    this.isLoading = false;\n    this.hasRan = true;\n  }\n}\n"],"names":["_initializerDefineProperty","target","property","descriptor","context","Object","defineProperty","enumerable","configurable","writable","value","initializer","call","_applyDecoratedDescriptor","decorators","desc","keys","forEach","key","slice","reverse","reduce","decorator","undefined","Request","_class","Resource","constructor","args","_descriptor","_descriptor2","_descriptor3","_descriptor4","modify","positional","named","__REQUEST_FUNCTION__","__WRAPPED_FUNCTION__","_positional","_named","Error","isSuccess","error","isError","Boolean","records","assert","name","record","retry","waitForPromise","Promise","resolve","isDestroyed","isDestroying","isLoading","e","hasRan","prototype","service","tracked","action","getOwnPropertyDescriptor","waitFor"],"mappings":"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","x_google_ignoreList":[0,1]}

package/dist-types/-private/resources/find-all.d.ts

@@ -1,4 +1,4 @@
-import { Request } from "../../request-17f93aea.js";
+import { Request } from "../../request-rVKgKutp.js";
 import ArrayProxy from '@ember/array/proxy';
 import Store from '@ember-data/store';
 type FindAllOptions = Parameters<Store['findAll']>[1];

package/dist-types/-private/resources/find-record.d.ts

@@ -1,4 +1,4 @@
-import { Request } from "../../request-17f93aea.js";
+import { Request } from "../../request-rVKgKutp.js";
 import { Id } from "./types.js";
 import Store from '@ember-data/store';
 type FindRecordOptions = Parameters<Store['findRecord']>[2];

package/dist-types/-private/resources/query-record.d.ts

@@ -1,4 +1,4 @@
-import { Request } from "../../request-17f93aea.js";
+import { Request } from "../../request-rVKgKutp.js";
 import Store from '@ember-data/store';
 type QueryParams = Parameters<Store['queryRecord']>;
 type QueryRecordQuery = QueryParams[1];

package/dist-types/-private/resources/query.d.ts

@@ -1,4 +1,4 @@
-import { Request } from "../../request-17f93aea.js";
+import { Request } from "../../request-rVKgKutp.js";
 import ArrayProxy from '@ember/array/proxy';
 import Store from '@ember-data/store';
 type QueryParams = Parameters<Store['query']>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data-resources",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "Resource helpers for reactively (re)fetching data with ember-data",
   "keywords": [
     "ember-addon"
@@ -15,25 +15,27 @@
   ],
   "dependencies": {
     "@ember/string": "^3.1.1",
-    "@ember/test-waiters": "^3.0.2",
-    "@embroider/addon-shim": "^1.0.0"
+    "@ember/test-waiters": "^3.1.0",
+    "@embroider/addon-shim": "^1.0.0",
+    "ember-modify-based-class-resource": "^1.1.0"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.2.0",
-    "@babel/core": "^7.22.5",
+    "@arethetypeswrong/cli": "^0.13.5",
+    "@babel/core": "^7.23.7",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-decorators": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.5",
     "@ember-data/store": "^5.0.0",
+    "@ember-data/tracking": "^5.3.0",
     "@embroider/addon-dev": "^3.1.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@glint/core": "^1.0.2",
+    "@glint/core": "^1.3.0",
     "@glint/environment-ember-loose": "^1.0.2",
     "@glint/template": "^1.0.2",
     "@nullvoxpopuli/eslint-configs": "^3.1.3",
-    "@tsconfig/ember": "^2.0.0",
+    "@tsconfig/ember": "^3.0.3",
     "@types/ember": "^4.0.0",
     "@types/ember-data__store": "^4.0.3",
     "@types/ember__application": "^4.0.0",
@@ -53,26 +55,27 @@
     "@types/ember__template": "^4.0.0",
     "@types/ember__test": "^4.0.0",
     "@types/ember__utils": "^4.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
+    "@typescript-eslint/eslint-plugin": "^6.19.0",
+    "@typescript-eslint/parser": "^6.19.0",
     "concurrently": "^8.2.0",
-    "ember-source": "~4.10.0",
-    "ember-resources": "^5.3.0",
+    "ember-resources": "^6.0.0",
+    "ember-source": "~5.4.0",
     "ember-template-lint": "^5.10.3",
     "eslint": "^8.43.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-ember": "^11.8.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-ember": "^12.0.0",
     "eslint-plugin-n": "^16.0.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "execa": "^7.1.1",
-    "prettier": "^2.8.8",
-    "prettier-plugin-ember-template-tag": "^0.3.2",
-    "publint": "^0.1.12",
-    "rollup": "~3.21.0",
-    "rollup-plugin-copy": "^3.4.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-qunit": "^8.0.1",
+    "execa": "^8.0.1",
+    "prettier": "^3.2.4",
+    "prettier-plugin-ember-template-tag": "^2.0.0",
+    "publint": "^0.2.7",
+    "rollup": "~4.9.5",
+    "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-delete": "^2.0.0",
-    "rollup-plugin-ts": "^3.2.0",
-    "typescript": "^4.9.4"
+    "rollup-plugin-ts": "^3.4.5",
+    "typescript": "^5.3.3"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -116,8 +119,8 @@
     "@ember-data/store": "^3.25 || >= 4.0.0",
     "@glimmer/tracking": "^1.1.2",
     "ember-data": "^3.25.0 || >=4.0.0",
-    "ember-source": "^3.25.0 || >=4.0.0",
-    "ember-resources": "^5.3.0 || >= 6.0.0"
+    "ember-resources": "^5.3.0 || >= 6.0.0",
+    "ember-source": "^3.25.0 || >=4.0.0"
   },
   "scripts": {
     "build": "concurrently 'npm:build:*'",