chore: add recommended JSON:API setup test app (#8832)

* chore: add recommended JSON:API setup test app * fix lockfile * attempt to get pnpm to cooperate * update settings * fix lint * at last
emberjs · Sep 4, 2023 · d9ccccb · d9ccccb
1 parent 932f077
commit d9ccccb
Show file tree

Hide file tree

Showing 69 changed files with 4,374 additions and 2,956 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -21,6 +21,7 @@
 /packages/request-utils/addon/
 /packages/rest/addon/
 /packages/active-record/addon/
+/packages/data-worker/addon/
 
 **/DEBUG/
 

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -274,7 +274,6 @@ module.exports = {
         'scripts/**',
         'docs-generator/**',
         'tests/performance/fixtures/**/*.js',
-        'tests/performance/server/**/*.js',
         'tests/*/ember-cli-build.js',
         'tests/*/index.js',
         'tests/*/testem.js',
@@ -283,6 +282,7 @@ module.exports = {
         'tests/*/.template-lintrc.js',
         'tests/*/config/**/*.js',
         'tests/*/tests/dummy/config/**/*.js',
+        'tests/*/server/**/*.js',
         'packages/-ember-data/lib/*.js',
         'packages/private-build-infra/src/**/*.js',
         'packages/unpublished-test-infra/src/**/*.js',

diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ packages/legacy-compat/addon
 packages/request-utils/addon
 packages/rest/addon
 packages/active-record/addon
+packages/data-worker/addon
 
 # dependencies
 bower_components

diff --git a/.npmrc b/.npmrc
@@ -11,9 +11,12 @@ hoist-pattern[]=*node-fetch*
 
 # we want true but cannot use true until the below issue is fixed
 # https://github.com/pnpm/pnpm/issues/5340
-strict-peer-dependencies=false
+strict-peer-dependencies=true
 auto-install-peers=false # probably apps should set this to true, but we need to test with it false to be sure we aren't the bad citizen
-dedupe-peer-dependents=false # this currently introduces more bugs than it fixes
+dedupe-peer-dependents=true # this currently introduces more bugs than it fixes
 resolve-peers-from-workspace-root=false # if its not declared we don't want it resolved: ensure tests are truly isolated
 save-workspace-protocol=rolling
 resolution-mode=highest
+dedupe-direct-deps=true
+child-concurrency=10
+ignore-dep-scripts=true
diff --git a/package.json b/package.json
@@ -115,6 +115,7 @@
       "ember-cli-babel": "^8.0.0",
       "ember-cli-htmlbars": "^6.3.0",
       "ember-cli-typescript": "^5.2.1",
+      "@ember/string": "3.1.1",
       "ember-compatibility-helpers": "^1.2.6"
     },
     "peerDependencyRules": {

diff --git a/packages/-ember-data/package.json b/packages/-ember-data/package.json
@@ -77,6 +77,9 @@
     },
     "@ember-data/private-build-infra": {
       "injected": true
+    },
+    "@ember/string": {
+      "injected": true
     }
   },
   "devDependencies": {

diff --git a/packages/active-record/package.json b/packages/active-record/package.json
@@ -29,6 +29,17 @@
     "@ember/string": "^3.1.1",
     "@ember-data/store": "^4.12.0 || ^5.0.0"
   },
+  "dependenciesMeta": {
+    "ember-inflector": {
+      "injected": true
+    },
+    "@ember-data/store": {
+      "injected": true
+    },
+    "@ember/string": {
+      "injected": true
+    }
+  },
   "files": [
     "addon-main.js",
     "addon",

diff --git a/packages/adapter/package.json b/packages/adapter/package.json
@@ -41,6 +41,9 @@
   "dependenciesMeta": {
     "@ember-data/private-build-infra": {
       "injected": true
+    },
+    "@ember/string": {
+      "injected": true
     }
   },
   "dependencies": {

diff --git a/packages/debug/package.json b/packages/debug/package.json
@@ -21,6 +21,12 @@
   "dependenciesMeta": {
     "@ember-data/private-build-infra": {
       "injected": true
+    },
+    "@ember/string": {
+      "injected": true
+    },
+    "@ember-data/store": {
+      "injected": true
     }
   },
   "dependencies": {

diff --git a/packages/graph/package.json b/packages/graph/package.json
@@ -37,6 +37,9 @@
   "dependenciesMeta": {
     "@ember-data/private-build-infra": {
       "injected": true
+    },
+    "@ember-data/store": {
+      "injected": true
     }
   },
   "dependencies": {

diff --git a/packages/json-api/package.json b/packages/json-api/package.json
@@ -44,6 +44,9 @@
     "@ember-data/graph": {
       "injected": true
     },
+    "@ember-data/store": {
+      "injected": true
+    },
     "@ember-data/request-utils": {
       "injected": true,
       "optional": true

diff --git a/packages/model/package.json b/packages/model/package.json
@@ -57,6 +57,12 @@
   "dependenciesMeta": {
     "@ember-data/private-build-infra": {
       "injected": true
+    },
+    "@ember-data/store": {
+      "injected": true
+    },
+    "@ember/string": {
+      "injected": true
     }
   },
   "dependencies": {

diff --git a/packages/model/src/-private/hooks.ts b/packages/model/src/-private/hooks.ts
@@ -10,13 +10,17 @@ import Model from './model';
 import { getModelFactory } from './schema-provider';
 import { normalizeModelName } from './util';
 
+function recast(context: Store): asserts context is ModelStore {}
+
 export function instantiateRecord(
-  this: ModelStore,
+  this: Store,
   identifier: StableRecordIdentifier,
   createRecordArgs: { [key: string]: unknown }
 ): Model {
   const type = identifier.type;
 
+  recast(this);
+
   const cache = this.cache;
   // TODO deprecate allowing unknown args setting
   const createOptions = {
@@ -52,8 +56,10 @@ export function modelFor(this: Store, modelName: string): typeof Model | void {
     `Please pass a proper model name to the store's modelFor method`,
     typeof modelName === 'string' && modelName.length
   );
+  recast(this);
+
   const type = normalizeModelName(modelName);
-  const maybeFactory = getModelFactory(this as ModelStore, type);
+  const maybeFactory = getModelFactory(this, type);
   const klass = maybeFactory && maybeFactory.class ? maybeFactory.class : null;
 
   const ignoreType = !klass || !klass.isModel || this._forceShim;

diff --git a/packages/rest/package.json b/packages/rest/package.json
@@ -29,6 +29,14 @@
     "@ember/string": "^3.1.1",
     "@ember-data/store": "^4.12.0 || ^5.0.0"
   },
+  "dependenciesMeta": {
+    "@ember/string": {
+      "injected": true
+    },
+    "@ember-data/store": {
+      "injected": true
+    }
+  },
   "files": [
     "addon-main.js",
     "addon",

diff --git a/packages/serializer/package.json b/packages/serializer/package.json
@@ -40,6 +40,9 @@
   "dependenciesMeta": {
     "@ember-data/private-build-infra": {
       "injected": true
+    },
+    "@ember/string": {
+      "injected": true
     }
   },
   "dependencies": {

diff --git a/packages/store/package.json b/packages/store/package.json
@@ -42,6 +42,9 @@
   "dependenciesMeta": {
     "@ember-data/private-build-infra": {
       "injected": true
+    },
+    "@ember/string": {
+      "injected": true
     }
   },
   "dependencies": {

diff --git a/packages/store/src/-private/cache-handler.ts b/packages/store/src/-private/cache-handler.ts
@@ -24,7 +24,10 @@ export interface LifetimesService {
 }
 
 export type StoreRequestInfo = ImmutableRequestInfo;
-export type LooseStoreRequestInfo = Omit<StoreRequestInfo, 'records'> & { records: ResourceIdentifierObject[] };
+export type LooseStoreRequestInfo = Omit<StoreRequestInfo, 'records' | 'headers'> & {
+  records?: ResourceIdentifierObject[];
+  headers?: Headers;
+};
 
 export type StoreRequestInput = StoreRequestInfo | LooseStoreRequestInfo;
 

diff --git a/packages/store/src/-private/store-service.ts b/packages/store/src/-private/store-service.ts
@@ -237,7 +237,7 @@ class Store extends EmberObject {
     @method init
     @private
   */
-  constructor(createArgs?: Record<string, unknown>) {
+  constructor(createArgs?: unknown) {
     // @ts-expect-error ember-source types improperly expect createArgs to be `Owner`
     super(createArgs);
     Object.assign(this, createArgs);