@ember-data/model 4.8.0-alpha.6 → 4.8.0

package/addon/-private/references/belongs-to.ts

@@ -1,15 +1,15 @@
 import { deprecate } from '@ember/debug';
 import { dependentKeyCompat } from '@ember/object/compat';
+import { DEBUG } from '@glimmer/env';
 import { cached, tracked } from '@glimmer/tracking';
 
 import type { Object as JSONObject, Value as JSONValue } from 'json-typescript';
 import { resolve } from 'rsvp';
 
 import { DEPRECATE_PROMISE_PROXIES } from '@ember-data/private-build-infra/deprecations';
-import type { Graph } from '@ember-data/record-data/-private/graph';
+import type { Graph } from '@ember-data/record-data/-private/graph/graph';
 import type BelongsToRelationship from '@ember-data/record-data/-private/relationships/state/belongs-to';
 import type Store from '@ember-data/store';
-import { assertPolymorphicType } from '@ember-data/store/-debug';
 import { recordIdentifierFor } from '@ember-data/store/-private';
 import type { NotificationType } from '@ember-data/store/-private/managers/record-notification-manager';
 import type {
@@ -22,6 +22,7 @@ import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
 import type { RecordInstance } from '@ember-data/types/q/record-instance';
 import type { Dict } from '@ember-data/types/q/utils';
 
+import { assertPolymorphicType } from '../debug/assert-polymorphic-type';
 import type { LegacySupport } from '../legacy-relationships-support';
 import { LEGACY_SUPPORT } from '../model';
 
@@ -101,9 +102,16 @@ export default class BelongsToReference {
     }
   }
 
+  /**
+   * The identifier of the record that this reference refers to.
+   * `null` if no related record is known.
+   *
+   * @property {StableRecordIdentifier | null} identifier
+   * @public
+   */
   @cached
   @dependentKeyCompat
-  get _relatedIdentifier(): StableRecordIdentifier | null {
+  get identifier(): StableRecordIdentifier | null {
     this._ref; // consume the tracked prop
     if (this.___relatedToken) {
       this.store._notificationManager.unsubscribe(this.___relatedToken);
@@ -165,11 +173,11 @@ export default class BelongsToReference {
    ```
 
    @method id
-    @public
+   @public
    @return {String} The id of the record in this belongsTo relationship.
    */
   id(): string | null {
-    return this._relatedIdentifier?.id || null;
+    return this.identifier?.id || null;
   }
 
   /**
@@ -388,33 +396,37 @@ export default class BelongsToReference {
    */
   async push(data: SingleResourceDocument | Promise<SingleResourceDocument>): Promise<RecordInstance> {
     let jsonApiDoc: SingleResourceDocument = data as SingleResourceDocument;
-    if (DEPRECATE_PROMISE_PROXIES && (data as { then: unknown }).then) {
-      jsonApiDoc = await resolve(data);
-      if (jsonApiDoc !== data) {
-        deprecate(
-          `You passed in a Promise to a Reference API that now expects a resolved value. await the value before setting it.`,
-          false,
-          {
-            id: 'ember-data:deprecate-promise-proxies',
-            until: '5.0',
-            since: {
-              enabled: '4.8',
-              available: '4.8',
-            },
-            for: 'ember-data',
-          }
-        );
+    if (DEPRECATE_PROMISE_PROXIES) {
+      if ((data as { then: unknown }).then) {
+        jsonApiDoc = await resolve(data);
+        if (jsonApiDoc !== data) {
+          deprecate(
+            `You passed in a Promise to a Reference API that now expects a resolved value. await the value before setting it.`,
+            false,
+            {
+              id: 'ember-data:deprecate-promise-proxies',
+              until: '5.0',
+              since: {
+                enabled: '4.7',
+                available: '4.7',
+              },
+              for: 'ember-data',
+            }
+          );
+        }
       }
     }
     let record = this.store.push(jsonApiDoc);
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    assertPolymorphicType(
-      this.belongsToRelationship.identifier,
-      this.belongsToRelationship.definition,
-      recordIdentifierFor(record),
-      this.store
-    );
+    if (DEBUG) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+      assertPolymorphicType(
+        this.belongsToRelationship.identifier,
+        this.belongsToRelationship.definition,
+        recordIdentifierFor(record),
+        this.store
+      );
+    }
 
     const { identifier } = this.belongsToRelationship;
     this.store._join(() => {

package/addon/-private/references/has-many.ts

@@ -9,11 +9,10 @@ import { resolve } from 'rsvp';
 import { ManyArray } from 'ember-data/-private';
 
 import { DEPRECATE_PROMISE_PROXIES } from '@ember-data/private-build-infra/deprecations';
-import type { Graph } from '@ember-data/record-data/-private/graph';
+import type { Graph } from '@ember-data/record-data/-private/graph/graph';
 import type ManyRelationship from '@ember-data/record-data/-private/relationships/state/has-many';
 import type Store from '@ember-data/store';
 import { recordIdentifierFor } from '@ember-data/store';
-import { assertPolymorphicType } from '@ember-data/store/-debug';
 import type { NotificationType } from '@ember-data/store/-private/managers/record-notification-manager';
 import type {
   CollectionResourceDocument,
@@ -28,6 +27,7 @@ import type { RecordInstance } from '@ember-data/types/q/record-instance';
 import type { FindOptions } from '@ember-data/types/q/store';
 import type { Dict } from '@ember-data/types/q/utils';
 
+import { assertPolymorphicType } from '../debug/assert-polymorphic-type';
 import type { LegacySupport } from '../legacy-relationships-support';
 import { LEGACY_SUPPORT } from '../model';
 
@@ -102,9 +102,15 @@ export default class HasManyReference {
     this.___relatedTokenMap.clear();
   }
 
+  /**
+   * An array of identifiers for the records that this reference refers to.
+   *
+   * @property {StableRecordIdentifier[]} identifiers
+   * @public
+   */
   @cached
   @dependentKeyCompat
-  get _relatedIdentifiers(): StableRecordIdentifier[] {
+  get identifiers(): StableRecordIdentifier[] {
     this._ref; // consume the tracked prop
 
     let resource = this._resource();
@@ -236,7 +242,7 @@ export default class HasManyReference {
    @return {Array} The ids in this has-many relationship
    */
   ids(): Array<string | null> {
-    return this._relatedIdentifiers.map((identifier) => identifier.id);
+    return this.identifiers.map((identifier) => identifier.id);
   }
 
   /**
@@ -400,22 +406,24 @@ export default class HasManyReference {
     objectOrPromise: ExistingResourceObject[] | CollectionResourceDocument | { data: SingleResourceDocument[] }
   ): Promise<ManyArray> {
     let payload = objectOrPromise;
-    if (DEPRECATE_PROMISE_PROXIES && (objectOrPromise as unknown as { then: unknown }).then) {
-      payload = await resolve(objectOrPromise);
-      if (payload !== objectOrPromise) {
-        deprecate(
-          `You passed in a Promise to a Reference API that now expects a resolved value. await the value before setting it.`,
-          false,
-          {
-            id: 'ember-data:deprecate-promise-proxies',
-            until: '5.0',
-            since: {
-              enabled: '4.8',
-              available: '4.8',
-            },
-            for: 'ember-data',
-          }
-        );
+    if (DEPRECATE_PROMISE_PROXIES) {
+      if ((objectOrPromise as unknown as { then: unknown }).then) {
+        payload = await resolve(objectOrPromise);
+        if (payload !== objectOrPromise) {
+          deprecate(
+            `You passed in a Promise to a Reference API that now expects a resolved value. await the value before setting it.`,
+            false,
+            {
+              id: 'ember-data:deprecate-promise-proxies',
+              until: '5.0',
+              since: {
+                enabled: '4.7',
+                available: '4.7',
+              },
+              for: 'ember-data',
+            }
+          );
+        }
       }
     }
     let array: Array<ExistingResourceObject | SingleResourceDocument>;
@@ -519,7 +527,16 @@ export default class HasManyReference {
       this.___identifier
     )!;
 
-    return this._isLoaded() ? support.getManyArray(this.key) : null;
+    const loaded = this._isLoaded();
+
+    if (!loaded) {
+      // subscribe to changes
+      // for when we are not loaded yet
+      this._ref;
+      return null;
+    }
+
+    return support.getManyArray(this.key);
   }
 
   /**

package/addon/-private/relationship-meta.ts

@@ -75,8 +75,12 @@ class RelationshipDefinition implements RelationshipSchema {
 
     if (shouldFindInverse(this.meta)) {
       inverse = modelClass.inverseFor(this.key, store);
-    } else if (DEBUG) {
-      modelClass.typeForRelationship(this.key, store);
+    }
+    // TODO make this error again for the non-polymorphic case
+    if (DEBUG) {
+      if (!this.options.polymorphic) {
+        modelClass.typeForRelationship(this.key, store);
+      }
     }
 
     if (inverse) {

package/addon/index.ts

@@ -36,5 +36,4 @@
   @module @ember-data/model
   @main @ember-data/model
  */
-
 export { Model as default, attr, belongsTo, hasMany } from './-private';

package/blueprints/model-test/mocha-files/__root__/__path__/__test__.js

@@ -1,15 +1,16 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
+
 import { setupModelTest } from 'ember-mocha';
 
-describe('<%= friendlyTestDescription %>', function() {
+describe('<%= friendlyTestDescription %>', function () {
   setupModelTest('<%= dasherizedModuleName %>', {
     // Specify the other units that are required for this test.
-  <%= typeof needs !== 'undefined' ? needs : '' %>
+  <%= typeof needs !== 'undefined' ? needs : '' %>,
   });
 
   // Replace this with your real tests.
-  it('exists', function() {
+  it('exists', function () {
     let model = this.subject();
     // var store = this.store();
     expect(model).to.be.ok;

package/blueprints/model-test/mocha-rfc-232-files/__root__/__path__/__test__.js

@@ -1,12 +1,13 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
+
 import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
-describe('<%= friendlyTestDescription %>', function() {
+describe('<%= friendlyTestDescription %>', function () {
   setupTest();
 
   // Replace this with your real tests.
-  it('exists', function() {
+  it('exists', function () {
     let store = this.owner.lookup('service:store');
     let model = store.createRecord('<%= dasherizedModuleName %>', {});
     expect(model).to.be.ok;

package/blueprints/model-test/qunit-files/__root__/__path__/__test__.js

@@ -1,11 +1,12 @@
 import { module, test } from 'qunit';
+
 import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
-module('<%= friendlyTestDescription %>', function(hooks) {
+module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
 
   // Replace this with your real tests.
-  test('it exists', function(assert) {
+  test('it exists', function (assert) {
     let store = this.owner.lookup('service:store');
     let model = store.createRecord('<%= dasherizedModuleName %>', {});
     assert.ok(model);

package/index.js

@@ -15,10 +15,10 @@ module.exports = Object.assign({}, addonBaseConfig, {
       '@ember-data/canary-features',
       '@ember-data/store',
       '@ember-data/store/-private',
-      '@ember-data/store/-debug',
       '@embroider/macros',
       '@ember/string',
       '@embroider/macros/es-compat',
+      '@ember-data/tracking/-private',
 
       '@ember/object/proxy',
       '@ember/object/promise-proxy-mixin',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/model",
-  "version": "4.8.0-alpha.6",
+  "version": "4.8.0",
   "description": "A presentation layer for apps built with @ember-data/store",
   "keywords": [
     "ember-addon"
@@ -12,66 +12,53 @@
   },
   "license": "MIT",
   "author": "",
-  "directories": {
-    "doc": "doc",
-    "test": "tests"
+  "directories": {},
+  "scripts": {},
+  "peerDependencies": {
+    "@ember-data/record-data": "workspace:4.9.0-alpha.6",
+    "@ember-data/store": "workspace:4.9.0-alpha.6",
+    "@ember-data/tracking": "workspace:4.9.0-alpha.6",
+    "@ember/string": "^3.0.0",
+    "ember-inflector": "^4.0.2"
+  },
+  "peerDependenciesMeta": {
+    "@ember-data/record-data": {
+      "optional": true
+    }
   },
-  "scripts": {
-    "build": "ember build",
-    "start": "ember serve",
-    "test:node": "mocha"
+  "dependenciesMeta": {
+    "@ember-data/canary-features": {
+      "injected": true
+    },
+    "@ember-data/private-build-infra": {
+      "injected": true
+    }
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.8.0-alpha.6",
-    "@ember-data/private-build-infra": "4.8.0-alpha.6",
-    "@ember-data/store": "4.8.0-alpha.6",
+    "@ember-data/canary-features": "workspace:4.8.0",
+    "@ember-data/private-build-infra": "workspace:4.8.0",
     "@ember/edition-utils": "^1.2.0",
-    "@ember/string": "^3.0.0",
-    "@embroider/macros": "^1.8.3",
-    "ember-auto-import": "^2.4.2",
-    "ember-cached-decorator-polyfill": "^0.1.4",
+    "@embroider/macros": "^1.9.0",
+    "ember-auto-import": "^2.4.3",
+    "ember-cached-decorator-polyfill": "^1.0.1",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-string-utils": "^1.1.0",
     "ember-cli-test-info": "^1.0.0",
-    "ember-cli-typescript": "^5.1.0",
     "ember-compatibility-helpers": "^1.2.6",
-    "inflection": "~1.13.2"
+    "inflection": "~1.13.4"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.8.0-alpha.6",
-    "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "~2.7.0",
-    "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~4.6.0",
-    "ember-cli-blueprint-test-helpers": "^0.19.2",
-    "ember-cli-dependency-checker": "^3.3.1",
-    "ember-cli-htmlbars": "^6.1.0",
-    "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-cli-sri": "^2.1.1",
-    "ember-cli-terser": "~4.0.2",
-    "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-qunit": "^5.1.5",
-    "ember-resolver": "^8.0.3",
-    "ember-source": "~4.6.0",
-    "ember-source-channel-url": "^3.0.0",
-    "ember-try": "^2.0.0",
-    "loader.js": "^4.7.0",
-    "qunit": "^2.19.1",
-    "qunit-dom": "^2.0.0",
-    "silent-error": "^1.1.1",
+    "@babel/core": "^7.19.6",
+    "@glimmer/component": "^1.1.2",
+    "ember-source": "~4.8.0",
     "webpack": "^5.74.0"
   },
   "engines": {
     "node": "^14.8.0 || 16.* || >= 18.*"
   },
-  "ember-addon": {
-    "configPath": "tests/dummy/config"
-  },
+  "ember-addon": {},
   "volta": {
-    "node": "16.17.0",
-    "yarn": "1.22.19"
-  }
+    "extends": "../../package.json"
+  },
+  "packageManager": "pnpm@7.14.1"
 }

package/config/environment.js

@@ -1,5 +0,0 @@
-'use strict';
-
-module.exports = function (/* environment, appConfig */) {
-  return {};
-};