Merge pull request #6 from NullVoxPopuli/custom-usable-in-resources-v7

Hook in to the registerUsable API in ember-resources v7

Author: NullVoxPopuli

.github/workflows/ci.yml

@@ -100,7 +100,7 @@ jobs:
         with:
           node-version: 18.18.1
       - uses: ./.github/actions/download-built-package
-      - run: pnpm --filter test-app test:ember
+      - run: pnpm --filter '*' test:ember
 
   floating_tests:
     name: Floating Deps Test
@@ -115,7 +115,7 @@ jobs:
           args: '--no-lockfile' 
       - uses: ./.github/actions/download-built-package
       - run: pnpm i -f
-      - run: pnpm --filter test-app test:ember
+      - run: pnpm --filter '*' test:ember
 
 
   try_scenarios:
@@ -150,3 +150,36 @@ jobs:
         run: >-
           node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
           --skip-cleanup
+
+  try_scenarios_er-7:
+    name: ${{ matrix.try-scenario }} (resources@7)
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    needs: [default_tests]
+
+    strategy:
+      fail-fast: false
+      matrix:
+        try-scenario:
+          - ember-3.28
+          - ember-4.0.0
+          - ember-4.4
+          - ember-4.8
+          - ember-4.12
+          - ember-release
+          - ember-beta
+          - ember-canary
+          - embroider-safe
+          - embroider-optimized
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: wyvox/action-setup-pnpm@v3
+        with:
+          node-version: 18.18.1
+      - uses: ./.github/actions/download-built-package
+      - name: Run Tests
+        working-directory: ./test-app-ember-resources-7
+        run: >-
+          node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
+          --skip-cleanup

ember-modify-based-class-resource/src/core/class-based/resource.ts

@@ -4,6 +4,7 @@ import { setOwner } from '@ember/application';
 import { assert } from '@ember/debug';
 // @ts-ignore
 import { invokeHelper } from '@ember/helper';
+import { dependencySatisfies, importSync, macroCondition } from '@embroider/macros';
 
 import { DEFAULT_THUNK, normalizeThunk } from '../utils';
 
@@ -15,6 +16,19 @@ import type { HelperLike } from '@glint/template';
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import type { Invoke } from '@glint/template/-private/integration';
 
+const TYPE = 'class-based';
+
+if (macroCondition(dependencySatisfies('ember-resources', '>= 7.0.0'))) {
+  // These types don't matter to consumers
+  const { registerUsable } = importSync('ember-resources') as any;
+
+  (registerUsable as any)(TYPE, (context: any, config: any) => {
+    let { definition, thunk } = config;
+
+    return invokeHelper(context, definition, () => normalizeThunk(thunk));
+  });
+}
+
 /**
  * @private utility type
  *
@@ -276,7 +290,7 @@ export class Resource<Args = unknown> {
       return {
         thunk: contextOrThunk,
         definition: this,
-        type: 'class-based',
+        type: TYPE,
         __INTERNAL__: true,
       } as unknown as SomeResource;
     }