ember-data-resources 4.0.4 → 5.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-data-resources",
-  "version": "4.0.4",
+  "version": "5.1.0",
   "description": "Resource helpers for reactively (re)fetching data with ember-data",
   "keywords": [
     "ember-addon"
@@ -8,147 +8,136 @@
   "repository": "https://github.com/NullVoxPopuli/ember-data-resources",
   "license": "MIT",
   "author": "NullVoxPopuli",
-  "directories": {
-    "doc": "doc",
-    "test": "tests"
-  },
-  "scripts": {
-    "build": "ember build --environment=production",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
-    "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
-    "lint:hbs": "ember-template-lint .",
-    "lint:hbs:fix": "ember-template-lint . --fix",
-    "lint:js": "eslint . --cache",
-    "lint:js:fix": "eslint . --fix",
-    "start": "ember serve",
-    "test": "npm-run-all lint test:*",
-    "test:ember": "ember test",
-    "test:ember-compatibility": "ember try:each",
-    "prepack": "ember ts:precompile",
-    "postpack": "ember ts:clean"
-  },
+  "files": [
+    "addon-main.cjs",
+    "dist",
+    "dist-types"
+  ],
   "dependencies": {
-    "@ember/test-waiters": "^3.0.2",
-    "@glimmer/tracking": "^1.1.2",
-    "ember-auto-import": "^2.4.2",
-    "ember-cli-babel": "^7.26.11",
-    "ember-cli-htmlbars": "^6.0.1",
-    "ember-cli-typescript": "^5.1.0",
-    "ember-resources": "^5.3.0"
+    "@ember/string": "^3.1.1",
+    "@ember/test-waiters": "^3.1.0",
+    "@embroider/addon-shim": "^1.0.0",
+    "ember-modify-based-class-resource": "^1.1.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.1.2",
-    "@commitlint/config-conventional": "^17.1.0",
-    "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.8.1",
-    "@embroider/test-setup": "^1.8.3",
+    "@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",
-    "@glint/template": "^0.9.3",
-    "@nullvoxpopuli/eslint-configs": "^2.2.54",
-    "@semantic-release/changelog": "^6.0.1",
-    "@semantic-release/git": "^10.0.1",
-    "@types/ember": "^4.0.1",
-    "@types/ember-data": "^4.4.1",
-    "@types/ember-data__adapter": "^4.0.0",
-    "@types/ember-data__model": "^4.0.0",
-    "@types/ember-data__serializer": "^4.0.0",
-    "@types/ember-data__store": "^4.0.0",
-    "@types/ember-qunit": "^5.0.0",
-    "@types/ember-resolver": "^5.0.11",
-    "@types/ember__application": "^4.0.1",
-    "@types/ember__array": "^4.0.2",
-    "@types/ember__component": "^4.0.10",
-    "@types/ember__controller": "^4.0.1",
-    "@types/ember__debug": "^4.0.1",
-    "@types/ember__destroyable": "^4.0.0",
-    "@types/ember__engine": "^4.0.2",
+    "@glimmer/tracking": "^1.1.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": "^3.0.3",
+    "@types/ember": "^4.0.0",
+    "@types/ember-data__store": "^4.0.3",
+    "@types/ember__application": "^4.0.0",
+    "@types/ember__array": "^4.0.4",
+    "@types/ember__component": "^4.0.0",
+    "@types/ember__controller": "^4.0.0",
+    "@types/ember__debug": "^4.0.0",
+    "@types/ember__destroyable": "^4.0.2",
+    "@types/ember__engine": "^4.0.0",
     "@types/ember__error": "^4.0.0",
-    "@types/ember__object": "^4.0.4",
+    "@types/ember__object": "^4.0.6",
     "@types/ember__polyfills": "^4.0.0",
-    "@types/ember__routing": "^4.0.10",
-    "@types/ember__runloop": "^4.0.1",
+    "@types/ember__routing": "^4.0.0",
+    "@types/ember__runloop": "^4.0.0",
     "@types/ember__service": "^4.0.0",
-    "@types/ember__string": "^3.0.9",
+    "@types/ember__string": "^3.16.0",
     "@types/ember__template": "^4.0.0",
     "@types/ember__test": "^4.0.0",
-    "@types/ember__test-helpers": "^2.8.1",
     "@types/ember__utils": "^4.0.0",
-    "@types/htmlbars-inline-precompile": "^3.0.0",
-    "@types/qunit": "^2.19.2",
-    "@types/rsvp": "^4.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.40.0",
-    "@typescript-eslint/parser": "^5.40.0",
-    "babel-eslint": "^10.1.0",
-    "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~4.6.0",
-    "ember-cli-dependency-checker": "^3.3.1",
-    "ember-cli-deprecation-workflow": "^2.1.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.6.1",
-    "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.1",
-    "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^1.0.0",
-    "ember-page-title": "^7.0.0",
-    "ember-qunit": "^5.1.5",
-    "ember-resolver": "^8.0.3",
-    "ember-source": "~4.6.0",
-    "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^4.15.0",
-    "ember-try": "^2.0.0",
-    "eslint": "^8.25.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-decorator-position": "^5.0.1",
-    "eslint-plugin-ember": "^11.0.6",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-qunit": "^7.3.1",
-    "eslint-plugin-simple-import-sort": "^8.0.0",
-    "loader.js": "^4.7.0",
-    "msw": "^0.47.0",
-    "npm-run-all": "^4.1.5",
-    "prettier": "^2.7.1",
-    "qunit": "^2.19.1",
-    "qunit-dom": "^2.0.0",
-    "semantic-release": "^19.0.5",
-    "typescript": "~4.8.2",
-    "webpack": "^5.74.0"
-  },
-  "peerDependencies": {
-    "ember-data": "^3.25.0 || ^4.0.0"
-  },
-  "release": {
-    "branches": [
-      "main",
-      "master"
-    ],
-    "plugins": [
-      "@semantic-release/commit-analyzer",
-      "@semantic-release/release-notes-generator",
-      "@semantic-release/changelog",
-      "@semantic-release/npm",
-      "@semantic-release/github",
-      "@semantic-release/git"
-    ]
+    "@typescript-eslint/eslint-plugin": "^6.19.0",
+    "@typescript-eslint/parser": "^6.19.0",
+    "concurrently": "^8.2.0",
+    "ember-resources": "^6.0.0",
+    "ember-source": "~5.4.0",
+    "ember-template-lint": "^5.10.3",
+    "eslint": "^8.43.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-ember": "^12.0.0",
+    "eslint-plugin-n": "^16.0.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.4.5",
+    "typescript": "^5.3.3"
   },
-  "volta": {
-    "node": "16.13.2",
-    "yarn": "1.22.19"
-  },
-  "engines": {
-    "node": "14.* || >= 16"
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
   },
   "ember": {
     "edition": "octane"
   },
   "ember-addon": {
-    "configPath": "tests/dummy/config"
+    "version": 2,
+    "type": "addon",
+    "main": "addon-main.cjs",
+    "app-js": {
+      "./helpers/find-all.js": "./dist/_app_/helpers/find-all.js",
+      "./helpers/find-record.js": "./dist/_app_/helpers/find-record.js",
+      "./helpers/query-record.js": "./dist/_app_/helpers/query-record.js",
+      "./helpers/query.js": "./dist/_app_/helpers/query.js"
+    }
+  },
+  "exports": {
+    ".": {
+      "types": "./dist-types/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./*": {
+      "types": "./dist-types/*.d.ts",
+      "default": "./dist/*.js"
+    },
+    "./addon-main.js": "./addon-main.cjs"
+  },
+  "typesVersions": {
+    "*": {
+      "*": [
+        "dist-types/*"
+      ]
+    }
   },
-  "msw": {
-    "workerDirectory": "tests/dummy/public"
+  "volta": {
+    "extends": "../package.json"
+  },
+  "peerDependencies": {
+    "@ember-data/store": "^3.25 || >= 4.0.0",
+    "@glimmer/tracking": "^1.1.2",
+    "ember-data": "^3.25.0 || >=4.0.0",
+    "ember-resources": "^5.3.0 || >= 6.0.0",
+    "ember-source": "^3.25.0 || >=4.0.0"
+  },
+  "scripts": {
+    "build": "concurrently 'npm:build:*'",
+    "build:js": "rollup --config",
+    "build:types": "rm -rf dist-types; pnpm glint --build",
+    "lint": "concurrently 'npm:lint:*(!fix)' --names 'lint:'",
+    "lint:fix": "concurrently 'npm:lint:*:fix' --names 'fix:'",
+    "lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern",
+    "lint:js": "eslint . --cache",
+    "lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern",
+    "lint:js:fix": "eslint . --fix",
+    "lint:types": "glint",
+    "lint:prettier:fix": "prettier . -w",
+    "lint:prettier": "prettier . -c",
+    "lint:package": "pnpm publint",
+    "lint:published-types": "attw *.tgz || exit 0",
+    "start": "rollup --config --watch",
+    "pack": "pnpm pack"
   }
-}
+}

package/-private/find.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=find.d.ts.map

package/-private/query.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=query.d.ts.map

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

@@ -1,7 +0,0 @@
-export declare class IdRequiredError extends TypeError {
-    constructor(modelName: string);
-}
-export declare class IdTypeError extends TypeError {
-    constructor(modelName: string, id: unknown);
-}
-//# sourceMappingURL=errors.d.ts.map

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

@@ -1,19 +0,0 @@
-import { Request } from './request';
-import type ArrayProxy from '@ember/array/proxy';
-import type Store from '@ember-data/store';
-export declare type FindAllOptions = Parameters<Store['findAll']>[1];
-declare type PositionalArgs = [string];
-export interface NamedArgs {
-    options: FindAllOptions;
-}
-export interface Args {
-    named: NamedArgs;
-    positional: PositionalArgs;
-}
-export declare class FindAll<Model, LocalArgs extends Args = Args> extends Request<LocalArgs> {
-    private _records;
-    __WRAPPED_FUNCTION__([modelName]: PositionalArgs, { options }: NamedArgs): Promise<void>;
-    get records(): ArrayProxy<Model> | undefined;
-}
-export {};
-//# sourceMappingURL=find-all.d.ts.map

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

@@ -1,19 +0,0 @@
-import { Request } from './request';
-import type { Id } from './types';
-import type Store from '@ember-data/store';
-export declare type FindRecordOptions = Parameters<Store['findRecord']>[2];
-declare type PositionalArgs = [string, Id];
-export interface NamedArgs {
-    options: FindRecordOptions;
-}
-export interface Args {
-    named: NamedArgs;
-    positional: PositionalArgs;
-}
-export declare class FindRecord<Model, LocalArgs extends Args = Args> extends Request<LocalArgs> {
-    private _record;
-    __WRAPPED_FUNCTION__([modelName, id]: PositionalArgs, { options }: NamedArgs): Promise<void>;
-    get record(): Model | undefined;
-}
-export {};
-//# sourceMappingURL=find-record.d.ts.map

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

@@ -1,20 +0,0 @@
-import { Request } from './request';
-import type Store from '@ember-data/store';
-declare type QueryParams = Parameters<Store['queryRecord']>;
-export declare type QueryRecordQuery = QueryParams[1];
-export declare type QueryRecordOptions = QueryParams[2];
-declare type PositionalArgs = [string, QueryRecordQuery];
-export interface NamedArgs {
-    options: QueryRecordOptions;
-}
-export interface Args {
-    named: NamedArgs;
-    positional: PositionalArgs;
-}
-export declare class QueryRecord<Model, LocalArgs extends Args = Args> extends Request<LocalArgs> {
-    private _record;
-    __WRAPPED_FUNCTION__([modelName, query]: PositionalArgs, { options }: NamedArgs): Promise<void>;
-    get record(): Model | undefined;
-}
-export {};
-//# sourceMappingURL=query-record.d.ts.map

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

@@ -1,21 +0,0 @@
-import { Request } from './request';
-import type ArrayProxy from '@ember/array/proxy';
-import type Store from '@ember-data/store';
-declare type QueryParams = Parameters<Store['query']>;
-export declare type QueryQuery = QueryParams[1];
-export declare type QueryOptions = QueryParams[2];
-declare type PositionalArgs = [string, QueryQuery];
-export interface NamedArgs {
-    options: QueryOptions;
-}
-export interface Args {
-    named: NamedArgs;
-    positional: PositionalArgs;
-}
-export declare class Query<Model, LocalArgs extends Args = Args> extends Request<LocalArgs> {
-    private _records;
-    __WRAPPED_FUNCTION__([modelName, query]: PositionalArgs, { options }: NamedArgs): Promise<void>;
-    get records(): ArrayProxy<Model> | undefined;
-}
-export {};
-//# sourceMappingURL=query.d.ts.map

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

@@ -1,2 +0,0 @@
-export declare type Id = string | number | null | undefined;
-//# sourceMappingURL=types.d.ts.map

package/.github/renovate.json5

@@ -1,93 +0,0 @@
-// Docs:
-// https://docs.renovatebot.com/configuration-options/
-{
-  "extends": [
-    "config:base",
-    ":semanticCommits"
-  ],
-  "automerge": true,
-  "masterIssue": true,
-  "rangeStrategy": "bump",
-  // From the docs:
-  // https://docs.renovatebot.com/configuration-options/#packagerules
-  // Important to know: Renovate will evaluate all packageRules and not stop once it gets a first match.
-  // Therefore, you should order your packageRules in order of importance so that later rules can override
-  // settings from earlier rules if necessary.
-  //
-  // (so if something is to be disabled, place that rule last)
-  "packageRules": [
-    ////////////////////////////////////////
-    // Grouping namespaced packages together
-    //
-    // This reduces overall PR count
-    ////////////////////////////////////////
-    {
-      "groupName": "Type Definitions",
-      "packagePatterns": ["^@types\/*"],
-      "schedule": ["after 9pm on sunday"],
-    },
-    {
-      "groupName": "Lint Dependencies",
-      "schedule": ["after 9pm on sunday"],
-      "packageNames": [
-        "eslint",
-        "babel-eslint",
-        "ember-template-lint",
-        "prettier"
-      ],
-      "packagePatterns": [
-        "eslint-plugin-.*",
-        "eslint-config-.*",
-        ".*typescript-eslint.*",
-        "^@commitlint\/*",
-        "^remark-*"
-      ]
-    },
-    // These are dependencies that come default when
-    // generating a new ember addon
-    {
-      "groupName": "Framework Dependencies",
-      "packageNames": [
-        "@ember/optional-features",
-        "@glimmer/component",
-        "@glimmer/tracking",
-        "ember-disable-prototype-extensions",
-        "ember-export-application-global",
-        "ember-load-initializers",
-        "ember-maybe-import-regenerator",
-        "ember-resolver",
-        "ember-source",
-        "ember-cli-page-title"
-      ]
-    },
-    {
-      "groupName": "CLI Dependencies",
-      "packageNames": [
-        "broccoli-asset-rev",
-        "ember-cli",
-        "ember-auto-import",
-        "ember-cli-dependency-checker",
-        "ember-cli-inject-live-reload",
-        "ember-cli-sri",
-        "ember-cli-terser"
-      ]
-    },
-    {
-      "groupName": "Testing Dependencies",
-      "schedule": ["after 9pm on sunday"],
-      "packageNames": [
-        "qunit-dom",
-        "ember-try",
-        "ember-source-channel-url",
-        "ember-qunit",
-        "qunit",
-        "npm-run-all"
-      ]
-    },
-    {
-      // changing peerDependencies *at all* is a breaking change
-      "matchDepTypes": ["peerDependencies"],
-      "enabled": false
-    }
-  ]
-}

package/.github/workflows/ci.yml

@@ -1,104 +0,0 @@
-name: CI
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-      - master
-  schedule:
-    - cron: "0 3 * * 0" # every Sunday at 3am
-
-env:
-  CI: true
-
-jobs:
-  tests:
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
-    name: Base Tests
-    timeout-minutes: 5
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node:
-          - "14"
-          - "16"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: volta-cli/action@v3
-        with:
-          node-version: ${{ matrix.node }}
-
-      - run: yarn install
-
-      - name: Test with ${{ matrix.node }}
-        run: yarn ember test
-
-#  floating-dependencies:
-#    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
-#    name: Floating Dependencies
-#    timeout-minutes: 5
-#    runs-on: ubuntu-latest
-#    strategy:
-#      matrix:
-#        node:
-#          - "12"
-#          - "14"
-#
-#    steps:
-#      - uses: actions/checkout@v2
-#      - uses: volta-cli/action@v1
-#        with:
-#          node-version: ${{ matrix.node }}
-#
-#      - run: yarn install --no-lockfile
-#
-#      - name: Test with Node ${{ matrix.node }}
-#        run: yarn ember test
-
-  try-scenarios:
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
-    name: "Compatibility"
-    timeout-minutes: 7
-    runs-on: ubuntu-latest
-    needs: tests
-
-    strategy:
-      fail-fast: true
-      matrix:
-        ember-try-scenario:
-          - ember-3.25
-          - ember-3.28-lts
-          - ember-release
-          - ember-beta
-          - ember-canary
-          # - embroider-safe
-          # - embroider-optimized
-    steps:
-      - uses: actions/checkout@v2
-      - uses: volta-cli/action@v3
-        with:
-          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
-
-  publish:
-    name: Release
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
-    needs: [tests, try-scenarios]
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          persist-credentials: false
-      - uses: volta-cli/action@v3
-      - run: yarn install
-
-      - name: Release
-        run: yarn semantic-release
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}