ember-data-resources 2.0.7 → 3.0.1

package/.github/workflows/ci.yml

@@ -21,8 +21,8 @@ jobs:
     strategy:
       matrix:
         node:
-          - "12"
           - "14"
+          - "16"
     steps:
       - uses: actions/checkout@v2
       - uses: volta-cli/action@v1
@@ -68,41 +68,22 @@ jobs:
       matrix:
         ember-try-scenario:
           - ember-3.25
+          - ember-3.28-lts
           - ember-release
           - ember-beta
-          # disabled because @ember/string does not support ember 4.0 yet
-          # - ember-canary
-          # disabled because support will be added later, and it doesn't work yet
-          #  - ember-data does not support embroider(optimized) yet
-          #    - store service is missing
+          - ember-canary
           # - embroider-safe
           # - embroider-optimized
     steps:
       - uses: actions/checkout@v2
       - uses: volta-cli/action@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
       - name: install dependencies
         run: yarn install
       - name: test
         run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
 
-  ember-cli-update:
-    if: "github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && ( ! contains(toJSON(github.event.commits.*.message), '[skip ci]') )"
-    runs-on: ubuntu-latest
-    needs: [tests, try-scenarios]
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ github.head_ref }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: volta-cli/action@v1
-      - uses: kellyselden/ember-cli-update-action@v3
-        with:
-          autofix_command: yarn lint:fix
-          ignore_to: true
-
   publish:
     name: Release
     runs-on: ubuntu-latest

package/.github/workflows/lint.yml

@@ -67,19 +67,21 @@ jobs:
     if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
     name: Tooling
     runs-on: ubuntu-latest
-    needs: [install_dependencies]
 
     steps:
       - uses: actions/checkout@v2
       - uses: volta-cli/action@v1
+        with:
+          node-version: 14
       - uses: actions/cache@v2
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
+      - run: yarn install
+
       - name: Semantic Release
         run: yarn semantic-release --dry-run
-        working-directory: ./ember-resources
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/CHANGELOG.md

@@ -1,3 +1,43 @@
+## [3.0.1](https://github.com/NullVoxPopuli/ember-data-resources/compare/v3.0.0...v3.0.1) (2022-01-15)
+
+
+### Bug Fixes
+
+* **deps:** update dependency ember-auto-import to ^2.3.0 ([9798244](https://github.com/NullVoxPopuli/ember-data-resources/commit/9798244b243ef7a2186c35ab592fa7fc30255b22))
+
+# [3.0.0](https://github.com/NullVoxPopuli/ember-data-resources/compare/v2.1.0...v3.0.0) (2022-01-08)
+
+
+### chore
+
+* change node support, add 16, drop 12 ([a4b4404](https://github.com/NullVoxPopuli/ember-data-resources/commit/a4b44042341d462afc9a2271fd90e5d824f7c06d))
+
+
+### BREAKING CHANGES
+
+* node 12 is no longer supported
+
+# [2.1.0](https://github.com/NullVoxPopuli/ember-data-resources/compare/v2.0.8...v2.1.0) (2022-01-08)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @ember/test-waiters to ^3.0.1 ([eea91c5](https://github.com/NullVoxPopuli/ember-data-resources/commit/eea91c55e07ed3860321883309645ace99b86e9a))
+* **deps:** update dependency ember-cli-babel to ^7.26.11 ([89688e2](https://github.com/NullVoxPopuli/ember-data-resources/commit/89688e2d74e8ccbc50f4040c9a4b11f86be0f82c))
+* **deps:** update dependency ember-resources to ^4.1.3 ([d76e599](https://github.com/NullVoxPopuli/ember-data-resources/commit/d76e599b5c153009fed52ac7aa739b51cd52fad7))
+
+
+### Features
+
+* support strict-mode ([33c3411](https://github.com/NullVoxPopuli/ember-data-resources/commit/33c341116947bb3466c296a94a7b0ff71c8d0de0))
+
+## [2.0.8](https://github.com/NullVoxPopuli/ember-data-resources/compare/v2.0.7...v2.0.8) (2021-12-17)
+
+
+### Bug Fixes
+
+* **deps:** update dependency ember-cli-babel to ^7.26.10 ([73ee9f8](https://github.com/NullVoxPopuli/ember-data-resources/commit/73ee9f8392b6adc4c57a1eb8365e2c16a0d4dc9a))
+
 ## [2.0.7](https://github.com/NullVoxPopuli/ember-data-resources/compare/v2.0.6...v2.0.7) (2021-12-16)
 
 

package/README.md

@@ -68,6 +68,20 @@ Available methods:
 {{/let}}
 ```
 
+**in strict mode**
+
+See: [First-class Component Templates](https://github.com/emberjs/rfcs/pull/779)
+
+```jsx
+import { FindAll } from 'ember-data-resources';
+
+<template>
+  {{#let (FindAll 'blog') as |blogs|}}
+    ...
+  {{/let}}
+</template>
+```
+
 ### `findRecord`
 
 ```js
@@ -120,6 +134,19 @@ Available methods:
 {{/let}}
 ```
 
+**in strict mode**
+
+See: [First-class Component Templates](https://github.com/emberjs/rfcs/pull/779)
+
+```jsx
+import { FindRecord } from 'ember-data-resources';
+
+<template>
+  {{#let (FindRecord 'blog' @id) as |blog|}}
+    ...
+  {{/let}}
+</template>
+```
 
 ### `query`
 
@@ -170,6 +197,21 @@ Available methods:
 {{/let}}
 ```
 
+**in strict mode**
+
+See: [First-class Component Templates](https://github.com/emberjs/rfcs/pull/779)
+
+```jsx
+import { Query } from 'ember-data-resources';
+
+<template>
+  {{#let (Query 'blog' query=(hash ...)) as |blogs|}}
+    ...
+  {{/let}}
+</template>
+```
+
+
 ### `queryRecord`
 
 ```js
@@ -222,6 +264,20 @@ Available methods:
 {{/let}}
 ```
 
+**in strict mode**
+
+See: [First-class Component Templates](https://github.com/emberjs/rfcs/pull/779)
+
+```jsx
+import { QueryRecord } from 'ember-data-resources';
+
+<template>
+  {{#let (QueryRecord 'blog' query=(hash ...)) as |blog|}}
+    ...
+  {{/let}}
+</template>
+```
+
 Contributing
 ------------------------------------------------------------------------------
 

package/addon/index.ts

@@ -1,125 +1,10 @@
-/* eslint-disable @typescript-eslint/ban-types */
-import { useResource } from 'ember-resources';
-
-import { FindAll } from './-private/resources/find-all';
-import { FindRecord } from './-private/resources/find-record';
-import { Query } from './-private/resources/query';
-import { QueryRecord } from './-private/resources/query-record';
-
-import type { FindAllOptions } from './-private/resources/find-all';
-import type { FindRecordOptions } from './-private/resources/find-record';
-import type { QueryOptions, QueryQuery } from './-private/resources/query';
-import type { QueryRecordOptions, QueryRecordQuery } from './-private/resources/query-record';
-import type { Id } from './-private/resources/types';
-
-type FindRecordThunkResult = Id | [Id] | [Id, FindRecordOptions];
-
-export function findRecord<Model = unknown>(
-  destroyable: object,
-  modelName: string,
-  thunk: () => FindRecordThunkResult
-) {
-  return useResource<FindRecord<Model>>(destroyable, FindRecord, () => {
-    let reified = thunk();
-    let id: Id | undefined = undefined;
-    let options: FindRecordOptions;
-
-    if (typeof reified === 'number') {
-      id = reified;
-      options = {};
-    } else if (Array.isArray(options)) {
-      id = options[0];
-      options = options[1] || {};
-    }
-
-    return {
-      positional: [modelName, id],
-      named: {
-        options,
-      },
-    };
-  });
-}
-
-type FindAllThunkResult = { options: FindAllOptions } | FindAllOptions | void;
-
-export function findAll<Model = unknown>(
-  destroyable: object,
-  modelName: string,
-  thunk?: () => FindAllThunkResult
-) {
-  return useResource<FindAll<Model>>(destroyable, FindAll, () => {
-    let reified = thunk?.() || {};
-    let options = 'options' in reified ? reified.options : reified;
-
-    return {
-      positional: [modelName],
-      named: {
-        options,
-      },
-    };
-  });
-}
-
-type QueryThunkResult = QueryQuery | [QueryQuery] | [QueryQuery, QueryOptions];
-
-export function query<Model = unknown>(
-  destroyable: object,
-  modelName: string,
-  thunk: () => QueryThunkResult
-) {
-  return useResource<Query<Model>>(destroyable, Query, () => {
-    let reified = thunk();
-
-    if (Array.isArray(reified)) {
-      let [query, options] = reified;
-
-      return {
-        positional: [modelName, query],
-        named: {
-          options: options || {},
-        },
-      };
-    }
-
-    return {
-      positional: [modelName, reified],
-      named: {
-        options: {},
-      },
-    };
-  });
-}
-
-type QueryRecordThunkResult =
-  | QueryRecordQuery
-  | [QueryRecordQuery]
-  | [QueryRecordQuery, QueryRecordOptions];
-
-export function queryRecord<Model = unknown>(
-  destroyable: object,
-  modelName: string,
-  thunk: () => QueryRecordThunkResult
-) {
-  return useResource<QueryRecord<Model>>(destroyable, QueryRecord, () => {
-    let reified = thunk();
-
-    if (Array.isArray(reified)) {
-      let [query, options] = reified;
-
-      return {
-        positional: [modelName, query],
-        named: {
-          options: options || {},
-        },
-      };
-    }
-
-    return {
-      positional: [modelName, reified],
-      named: {
-        options: {},
-      },
-    };
-  });
-}
+// For direct use in templates' strict Mode
+// for loose mode, these don't need to be imported, and are resolveable via
+// the lower-kebab-case variant of each of these names
+export { FindAll } from './-private/resources/find-all';
+export { FindRecord } from './-private/resources/find-record';
+export { Query } from './-private/resources/query';
+export { QueryRecord } from './-private/resources/query-record';
+
+// Resource wrappers in JS/TS classes
+export { findAll, findRecord, query, queryRecord } from './js-helpers';

package/addon/js-helpers.ts

@@ -0,0 +1,125 @@
+/* eslint-disable @typescript-eslint/ban-types */
+import { useResource } from 'ember-resources';
+
+import { FindAll } from './-private/resources/find-all';
+import { FindRecord } from './-private/resources/find-record';
+import { Query } from './-private/resources/query';
+import { QueryRecord } from './-private/resources/query-record';
+
+import type { FindAllOptions } from './-private/resources/find-all';
+import type { FindRecordOptions } from './-private/resources/find-record';
+import type { QueryOptions, QueryQuery } from './-private/resources/query';
+import type { QueryRecordOptions, QueryRecordQuery } from './-private/resources/query-record';
+import type { Id } from './-private/resources/types';
+
+type FindRecordThunkResult = Id | [Id] | [Id, FindRecordOptions];
+
+export function findRecord<Model = unknown>(
+  destroyable: object,
+  modelName: string,
+  thunk: () => FindRecordThunkResult
+) {
+  return useResource<FindRecord<Model>>(destroyable, FindRecord, () => {
+    let reified = thunk();
+    let id: Id | undefined = undefined;
+    let options: FindRecordOptions;
+
+    if (typeof reified === 'number') {
+      id = reified;
+      options = {};
+    } else if (Array.isArray(options)) {
+      id = options[0];
+      options = options[1] || {};
+    }
+
+    return {
+      positional: [modelName, id],
+      named: {
+        options,
+      },
+    };
+  });
+}
+
+type FindAllThunkResult = { options: FindAllOptions } | FindAllOptions | void;
+
+export function findAll<Model = unknown>(
+  destroyable: object,
+  modelName: string,
+  thunk?: () => FindAllThunkResult
+) {
+  return useResource<FindAll<Model>>(destroyable, FindAll, () => {
+    let reified = thunk?.() || {};
+    let options = 'options' in reified ? reified.options : reified;
+
+    return {
+      positional: [modelName],
+      named: {
+        options,
+      },
+    };
+  });
+}
+
+type QueryThunkResult = QueryQuery | [QueryQuery] | [QueryQuery, QueryOptions];
+
+export function query<Model = unknown>(
+  destroyable: object,
+  modelName: string,
+  thunk: () => QueryThunkResult
+) {
+  return useResource<Query<Model>>(destroyable, Query, () => {
+    let reified = thunk();
+
+    if (Array.isArray(reified)) {
+      let [query, options] = reified;
+
+      return {
+        positional: [modelName, query],
+        named: {
+          options: options || {},
+        },
+      };
+    }
+
+    return {
+      positional: [modelName, reified],
+      named: {
+        options: {},
+      },
+    };
+  });
+}
+
+type QueryRecordThunkResult =
+  | QueryRecordQuery
+  | [QueryRecordQuery]
+  | [QueryRecordQuery, QueryRecordOptions];
+
+export function queryRecord<Model = unknown>(
+  destroyable: object,
+  modelName: string,
+  thunk: () => QueryRecordThunkResult
+) {
+  return useResource<QueryRecord<Model>>(destroyable, QueryRecord, () => {
+    let reified = thunk();
+
+    if (Array.isArray(reified)) {
+      let [query, options] = reified;
+
+      return {
+        positional: [modelName, query],
+        named: {
+          options: options || {},
+        },
+      };
+    }
+
+    return {
+      positional: [modelName, reified],
+      named: {
+        options: {},
+      },
+    };
+  });
+}

package/index.d.ts

@@ -1,20 +1,5 @@
-import { FindAll } from './-private/resources/find-all';
-import { FindRecord } from './-private/resources/find-record';
-import { Query } from './-private/resources/query';
-import { QueryRecord } from './-private/resources/query-record';
-import type { FindAllOptions } from './-private/resources/find-all';
-import type { FindRecordOptions } from './-private/resources/find-record';
-import type { QueryOptions, QueryQuery } from './-private/resources/query';
-import type { QueryRecordOptions, QueryRecordQuery } from './-private/resources/query-record';
-import type { Id } from './-private/resources/types';
-declare type FindRecordThunkResult = Id | [Id] | [Id, FindRecordOptions];
-export declare function findRecord<Model = unknown>(destroyable: object, modelName: string, thunk: () => FindRecordThunkResult): FindRecord<Model, import("./-private/resources/find-record").Args>;
-declare type FindAllThunkResult = {
-    options: FindAllOptions;
-} | FindAllOptions | void;
-export declare function findAll<Model = unknown>(destroyable: object, modelName: string, thunk?: () => FindAllThunkResult): FindAll<Model, import("./-private/resources/find-all").Args>;
-declare type QueryThunkResult = QueryQuery | [QueryQuery] | [QueryQuery, QueryOptions];
-export declare function query<Model = unknown>(destroyable: object, modelName: string, thunk: () => QueryThunkResult): Query<Model, import("./-private/resources/query").Args>;
-declare type QueryRecordThunkResult = QueryRecordQuery | [QueryRecordQuery] | [QueryRecordQuery, QueryRecordOptions];
-export declare function queryRecord<Model = unknown>(destroyable: object, modelName: string, thunk: () => QueryRecordThunkResult): QueryRecord<Model, import("./-private/resources/query-record").Args>;
-export {};
+export { FindAll } from './-private/resources/find-all';
+export { FindRecord } from './-private/resources/find-record';
+export { Query } from './-private/resources/query';
+export { QueryRecord } from './-private/resources/query-record';
+export { findAll, findRecord, query, queryRecord } from './js-helpers';

package/js-helpers.d.ts

@@ -0,0 +1,20 @@
+import { FindAll } from './-private/resources/find-all';
+import { FindRecord } from './-private/resources/find-record';
+import { Query } from './-private/resources/query';
+import { QueryRecord } from './-private/resources/query-record';
+import type { FindAllOptions } from './-private/resources/find-all';
+import type { FindRecordOptions } from './-private/resources/find-record';
+import type { QueryOptions, QueryQuery } from './-private/resources/query';
+import type { QueryRecordOptions, QueryRecordQuery } from './-private/resources/query-record';
+import type { Id } from './-private/resources/types';
+declare type FindRecordThunkResult = Id | [Id] | [Id, FindRecordOptions];
+export declare function findRecord<Model = unknown>(destroyable: object, modelName: string, thunk: () => FindRecordThunkResult): FindRecord<Model, import("./-private/resources/find-record").Args>;
+declare type FindAllThunkResult = {
+    options: FindAllOptions;
+} | FindAllOptions | void;
+export declare function findAll<Model = unknown>(destroyable: object, modelName: string, thunk?: () => FindAllThunkResult): FindAll<Model, import("./-private/resources/find-all").Args>;
+declare type QueryThunkResult = QueryQuery | [QueryQuery] | [QueryQuery, QueryOptions];
+export declare function query<Model = unknown>(destroyable: object, modelName: string, thunk: () => QueryThunkResult): Query<Model, import("./-private/resources/query").Args>;
+declare type QueryRecordThunkResult = QueryRecordQuery | [QueryRecordQuery] | [QueryRecordQuery, QueryRecordOptions];
+export declare function queryRecord<Model = unknown>(destroyable: object, modelName: string, thunk: () => QueryRecordThunkResult): QueryRecord<Model, import("./-private/resources/query-record").Args>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data-resources",
-  "version": "2.0.7",
+  "version": "3.0.1",
   "description": "Resource helpers for reactively (re)fetching data with ember-data",
   "keywords": [
     "ember-addon"
@@ -28,24 +28,24 @@
     "postpack": "ember ts:clean"
   },
   "dependencies": {
-    "@ember/test-waiters": "^3.0.0",
+    "@ember/test-waiters": "^3.0.1",
     "@glimmer/tracking": "^1.0.4",
-    "ember-auto-import": "^2.2.4",
-    "ember-cli-babel": "^7.26.8",
+    "ember-auto-import": "^2.3.0",
+    "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.0.1",
     "ember-cli-typescript": "^4.2.1",
-    "ember-resources": "^4.1.2"
+    "ember-resources": "^4.1.3"
   },
   "devDependencies": {
-    "@commitlint/cli": "^15.0.0",
-    "@commitlint/config-conventional": "^15.0.0",
+    "@commitlint/cli": "^16.0.2",
+    "@commitlint/config-conventional": "^16.0.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
-    "@embroider/test-setup": "^0.48.1",
+    "@embroider/test-setup": "^0.50.2",
     "@glimmer/component": "^1.0.4",
-    "@nullvoxpopuli/eslint-configs": "^2.1.11",
-    "@semantic-release/changelog": "^5.0.1",
-    "@semantic-release/git": "^9.0.1",
+    "@nullvoxpopuli/eslint-configs": "^2.1.17",
+    "@semantic-release/changelog": "^6.0.1",
+    "@semantic-release/git": "^10.0.1",
     "@types/ember-data__model": "^3.16.2",
     "@types/ember-data__store": "^3.16.1",
     "@types/ember-qunit": "^3.4.15",
@@ -68,19 +68,19 @@
     "@types/ember__test-helpers": "^2.6.0",
     "@types/ember__utils": "^3.16.2",
     "@types/htmlbars-inline-precompile": "^1.0.1",
-    "@types/qunit": "^2.11.2",
+    "@types/qunit": "^2.11.3",
     "@types/rsvp": "^4.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.6.0",
-    "@typescript-eslint/parser": "^5.6.0",
+    "@typescript-eslint/eslint-plugin": "^5.9.1",
+    "@typescript-eslint/parser": "^5.9.1",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.28.4",
+    "ember-cli": "~4.1.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-cli-typescript-blueprints": "^3.0.0",
-    "ember-data": "^4.0.2",
+    "ember-data": "^4.1.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
@@ -88,28 +88,28 @@
     "ember-page-title": "^7.0.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~4.0.1",
+    "ember-source": "~4.1.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^3.14.0",
+    "ember-template-lint": "^3.16.0",
     "ember-try": "^2.0.0",
-    "eslint": "^8.4.1",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-decorator-position": "^4.0.1",
     "eslint-plugin-ember": "^10.5.8",
-    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-qunit": "^7.1.0",
+    "eslint-plugin-qunit": "^7.2.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
     "loader.js": "^4.7.0",
-    "msw": "^0.36.3",
+    "msw": "^0.36.4",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.5.1",
     "qunit": "^2.17.2",
     "qunit-dom": "^2.0.0",
-    "semantic-release": "^17.4.7",
+    "semantic-release": "^18.0.1",
     "typescript": "^4.5.4",
-    "webpack": "^5.65.0"
+    "webpack": "^5.66.0"
   },
   "peerDependencies": {
     "ember-data": "^3.25.0"
@@ -129,11 +129,11 @@
     ]
   },
   "volta": {
-    "node": "16.13.1",
+    "node": "16.13.2",
     "yarn": "1.22.17"
   },
   "engines": {
-    "node": "10.* || >= 12"
+    "node": "14.* || >= 16"
   },
   "ember": {
     "edition": "octane"