[CHORE] redivide assets to move record-data into package

packages/-ember-data/addon/-private/index.js

@@ -11,17 +11,13 @@ export {
   InternalModel,
   ManyArray,
   PromiseArray,
-  Relationship,
   PromiseManyArray,
   PromiseObject,
-  RecordData,
   RecordArray,
   RecordArrayManager,
   RootState,
   SnapshotRecordArray,
-  recordDataFor,
-  relationshipStateFor,
-  relationshipsFor,
   normalizeModelName,
   coerceId,
 } from '@ember-data/store/-private';
+export { RecordData, Relationship } from '@ember-data/record-data/-private';

packages/-ember-data/addon/index.js

@@ -1,5 +1,6 @@
 import { VERSION } from '@ember/version';
 import EmberError from '@ember/error';
+import Store from './store';
 
 if (VERSION.match(/^1\.([0-9]|1[0-2])\./)) {
   throw new EmberError(
@@ -9,7 +10,7 @@ if (VERSION.match(/^1\.([0-9]|1[0-2])\./)) {
   );
 }
 
-import Store, { normalizeModelName } from '@ember-data/store';
+import { normalizeModelName } from '@ember-data/store';
 import DebugAdapter from '@ember-data/debug';
 
 import {

packages/-ember-data/addon/store.ts

@@ -1 +1,21 @@
-export { default } from '@ember-data/store';
+import Store from '@ember-data/store';
+import { RecordData } from '@ember-data/record-data/-private';
+import { identifierCacheFor } from '@ember-data/store/-private';
+import { IDENTIFIERS } from '@ember-data/canary-features';
+
+type RecordDataStoreWrapper = import('@ember-data/store/-private/ts-interfaces/record-data-store-wrapper').RecordDataStoreWrapper;
+
+export default class DefaultStore extends Store {
+  createRecordDataFor(modelName: string, id: string | null, clientId: string, storeWrapper: RecordDataStoreWrapper) {
+    if (IDENTIFIERS) {
+      let identifier = identifierCacheFor(this).getOrCreateRecordIdentifier({
+        type: modelName,
+        id,
+        lid: clientId,
+      });
+      return new RecordData(identifier, storeWrapper);
+    } else {
+      return new RecordData(modelName, id, clientId, storeWrapper);
+    }
+  }
+}

packages/-ember-data/app/services/store.js

@@ -0,0 +1 @@
+export { default } from 'ember-data/store';

packages/-ember-data/index.js

@@ -8,7 +8,13 @@ const merge = require('broccoli-merge-trees');
 module.exports = Object.assign({}, addonBaseConfig, {
   shouldRollupPrivate: true,
   externalDependenciesForPrivateModule() {
-    return ['ember-data/version', '@ember-data/store/-private', '@ember-data/store', '@ember-data/model'];
+    return [
+      '@ember-data/record-data/-private',
+      'ember-data/version',
+      '@ember-data/store/-private',
+      '@ember-data/store',
+      '@ember-data/model',
+    ];
   },
   treeForAddon(tree) {
     tree = merge([tree, version()]);

packages/-ember-data/package.json

@@ -28,6 +28,7 @@
     "@ember-data/adapter": "3.15.0-alpha.0",
     "@ember-data/debug": "3.15.0-alpha.0",
     "@ember-data/model": "3.15.0-alpha.0",
+    "@ember-data/record-data": "3.15.0-alpha.0",
     "@ember-data/serializer": "3.15.0-alpha.0",
     "@ember-data/store": "3.15.0-alpha.0",
     "@ember/ordered-set": "^2.0.3",

packages/-ember-data/tests/integration/identifiers/configuration-test.ts

@@ -533,7 +533,7 @@ if (IDENTIFIERS) {
             name: 'callback-hell',
           },
           relationships: {
-            retainer: { type: 'retainer', id: '1' },
+            retainer: { data: { type: 'retainer', id: '1' } },
           },
         },
       });

packages/-ember-data/tests/integration/multiple-stores-test.js

@@ -2,7 +2,9 @@ import { run } from '@ember/runloop';
 import { setupTest } from 'ember-qunit';
 import { module, test } from 'qunit';
 import { get } from '@ember/object';
-import Store from '@ember-data/store';
+// we intentionally test against the ember-data version here
+// because the ember-data/store uses DefaultRecordData while @ember-data/store does not
+import Store from 'ember-data/store';
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 import RESTSerializer, { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
 import RESTAdapter from '@ember-data/adapter/rest';

packages/-ember-data/tests/integration/record-data/unloading-record-data-test.js

@@ -3,7 +3,8 @@ import { setupTest } from 'ember-qunit';
 import Model from '@ember-data/model';
 import { run } from '@ember/runloop';
 import { assign } from '@ember/polyfills';
-import { RecordData, recordDataFor } from 'ember-data/-private';
+import { recordDataFor } from '@ember-data/store/-private';
+import { RecordData } from '@ember-data/record-data/-private';
 import { resolve } from 'rsvp';
 import { attr, hasMany, belongsTo } from '@ember-data/model';
 

packages/-ember-data/tests/integration/records/unload-test.js

@@ -6,7 +6,7 @@ import { run } from '@ember/runloop';
 import { module, test } from 'qunit';
 import DS from 'ember-data';
 import { setupTest } from 'ember-qunit';
-import { recordDataFor } from 'ember-data/-private';
+import { recordDataFor } from '@ember-data/store/-private';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
 

packages/-ember-data/tests/integration/relationships/belongs-to-test.js

@@ -9,8 +9,8 @@ import Store from '@ember-data/store';
 import Model from '@ember-data/model';
 import testInDebug from 'dummy/tests/helpers/test-in-debug';
 import DS from 'ember-data';
-import { RecordData, recordDataFor, relationshipsFor, relationshipStateFor } from '@ember-data/store/-private';
-import { identifierCacheFor } from '@ember-data/store/-private';
+import { RecordData, relationshipsFor, relationshipStateFor } from '@ember-data/record-data/-private';
+import { identifierCacheFor, recordDataFor } from '@ember-data/store/-private';
 import { IDENTIFIERS } from '@ember-data/canary-features';
 import { setupContext, teardownContext } from '@ember/test-helpers';
 

packages/-ember-data/tests/integration/relationships/has-many-test.js

@@ -8,7 +8,7 @@ import { setupTest } from 'ember-qunit';
 import testInDebug from 'dummy/tests/helpers/test-in-debug';
 import { deprecatedTest } from 'dummy/tests/helpers/deprecated-test';
 import { module, test } from 'qunit';
-import { relationshipStateFor, relationshipsFor } from 'ember-data/-private';
+import { relationshipStateFor, relationshipsFor } from '@ember-data/record-data/-private';
 
 import Adapter from '@ember-data/adapter';
 import JSONAPISerializer from '@ember-data/serializer/json-api';

packages/-ember-data/tests/unit/model-test.js

@@ -13,7 +13,7 @@ import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import JSONAPISerializer from '@ember-data/serializer/json-api';
 import JSONSerializer from '@ember-data/serializer/json';
 import { attr as DSattr } from '@ember-data/model';
-import { recordDataFor } from 'ember-data/-private';
+import { recordDataFor } from '@ember-data/store/-private';
 import { attr, hasMany, belongsTo } from '@ember-data/model';
 import { gte } from 'ember-compatibility-helpers';
 

packages/-ember-data/tsconfig.json

@@ -25,13 +25,14 @@
       "@ember-data/model/*": ["../model/addon/*"],
       "@ember-data/adapter": ["../adapter/addon"],
       "@ember-data/adapter/*": ["../adapter/addon/*"],
+      "@ember-data/adapter/error": ["../adapter/addon/error"],
       "@ember-data/serializer": ["../serializer/addon"],
       "@ember-data/serializer/*": ["../serializer/addon/*"],
       "ember-data/test-support": ["addon-test-support"],
       "ember-data/test-support/*": ["addon-test-support/*"],
-      "@ember-data/adapter/error": ["../adapter/addon/error"],
+      "@ember-data/record-data/*": ["../record-data/addon/*"],
       "@ember-data/canary-features": ["../canary-features/addon"],
-      "*": ["../store/types/*"]
+      "*": ["../store/types/*", "../record-data/types/*"]
     }
   },
   "include": ["app/**/*", "addon/**/*", "tests/**/*", "types/**/*", "test-support/**/*", "addon-test-support/**/*"],

packages/-record-data-encapsulation-test-app/package.json

@@ -22,6 +22,7 @@
     "@ember-data/serializer": "3.15.0-alpha.0",
     "@ember-data/model": "3.15.0-alpha.0",
     "@ember-data/store": "3.15.0-alpha.0",
+    "@ember-data/debug": "3.15.0-alpha.0",
     "ember-inflector": "^3.0.1"
   },
   "devDependencies": {

packages/-serializer-encapsulation-test-app/app/services/store.js

@@ -0,0 +1,19 @@
+import Store from '@ember-data/store';
+import { RecordData } from '@ember-data/record-data/-private';
+import { identifierCacheFor } from '@ember-data/store/-private';
+import { IDENTIFIERS } from '@ember-data/canary-features';
+
+export default class DefaultStore extends Store {
+  createRecordDataFor(modelName, id, clientId, storeWrapper) {
+    if (IDENTIFIERS) {
+      let identifier = identifierCacheFor(this).getOrCreateRecordIdentifier({
+        type: modelName,
+        id,
+        lid: clientId,
+      });
+      return new RecordData(identifier, storeWrapper);
+    } else {
+      return new RecordData(modelName, id, clientId, storeWrapper);
+    }
+  }
+}

packages/-serializer-encapsulation-test-app/package.json

@@ -21,6 +21,7 @@
     "@ember-data/adapter": "3.15.0-alpha.0",
     "@ember-data/model": "3.15.0-alpha.0",
     "@ember-data/store": "3.15.0-alpha.0",
+    "@ember-data/record-data": "3.15.0-alpha.0",
     "ember-inflector": "^3.0.1"
   },
   "devDependencies": {

packages/-serializer-encapsulation-test-app/tests/integration/create-record-test.js

@@ -1,5 +1,5 @@
 import Model, { attr } from '@ember-data/model';
-import Store from '@ember-data/store';
+import Store from 'serializer-encapsulation-test-app/services/store';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import EmberObject from '@ember/object';
 import { setupTest } from 'ember-qunit';
@@ -27,7 +27,7 @@ class Person extends Model {
   }
 }
 
-module('inteegration/create-record - running createRecord with minimum serializer', function(hooks) {
+module('integration/create-record - running createRecord with minimum serializer', function(hooks) {
   setupTest(hooks);
 
   hooks.beforeEach(function(assert) {

packages/-serializer-encapsulation-test-app/tests/integration/errors-test.js

@@ -1,5 +1,5 @@
 import Model, { attr } from '@ember-data/model';
-import Store from '@ember-data/store';
+import Store from 'serializer-encapsulation-test-app/services/store';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import EmberObject from '@ember/object';
 import { setupTest } from 'ember-qunit';

packages/-serializer-encapsulation-test-app/tests/integration/relationships-test.js

@@ -2,7 +2,7 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { resolve } from 'rsvp';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
-import Store from '@ember-data/store';
+import Store from 'serializer-encapsulation-test-app/services/store';
 import Model, { attr, hasMany, belongsTo } from '@ember-data/model';
 import EmberObject from '@ember/object';
 

packages/-serializer-encapsulation-test-app/tests/integration/requests-test.js

@@ -1,5 +1,5 @@
 import Model, { attr } from '@ember-data/model';
-import Store from '@ember-data/store';
+import Store from 'serializer-encapsulation-test-app/services/store';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import EmberObject from '@ember/object';
 import { setupTest } from 'ember-qunit';

packages/-serializer-encapsulation-test-app/tests/integration/serialize-test.js

@@ -1,5 +1,5 @@
 import Model, { attr } from '@ember-data/model';
-import Store from '@ember-data/store';
+import Store from 'serializer-encapsulation-test-app/services/store';
 import EmberObject from '@ember/object';
 import { setupTest } from 'ember-qunit';
 import { module, test } from 'qunit';

packages/-serializer-encapsulation-test-app/tests/integration/update-record-test.js

@@ -1,5 +1,5 @@
 import Model, { attr } from '@ember-data/model';
-import Store from '@ember-data/store';
+import Store from 'serializer-encapsulation-test-app/services/store';
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import EmberObject from '@ember/object';
 import { setupTest } from 'ember-qunit';
@@ -27,7 +27,7 @@ class Person extends Model {
   }
 }
 
-module('inteegration/create-record - running createRecord with minimum serializer', function(hooks) {
+module('integration/create-record - running createRecord with minimum serializer', function(hooks) {
   setupTest(hooks);
 
   hooks.beforeEach(function(assert) {

packages/debug/README.md

@@ -10,7 +10,7 @@ Provides developer ergonomics and dev-mode enhancements for apps built with Embe
 ## Installation
 
 ```
-ember install @ember-data/record-data
+ember install @ember-data/debug
 ```
 
 ## Usage

packages/debug/package.json

@@ -19,14 +19,14 @@
     "test:all": "ember try:each"
   },
   "dependencies": {
-    "@ember-data/-build-infra": "3.14.0-alpha.4",
+    "@ember-data/-build-infra": "3.15.0-alpha.0",
     "@ember/edition-utils": "^1.1.1",
     "ember-cli-babel": "^7.12.0",
     "ember-cli-test-info": "^1.0.0",
     "ember-cli-typescript": "^3.0.0"
   },
   "devDependencies": {
-    "@ember-data/-test-infra": "3.14.0-alpha.4",
+    "@ember-data/-test-infra": "3.15.0-alpha.0",
     "@ember/optional-features": "^0.7.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-cli": "^3.13.1",

packages/record-data/addon/-private/coerce-id.ts

@@ -0,0 +1,39 @@
+import { DEBUG } from '@glimmer/env';
+
+// Used by the store to normalize IDs entering the store.  Despite the fact
+// that developers may provide IDs as numbers (e.g., `store.findRecord('person', 1)`),
+// it is important that internally we use strings, since IDs may be serialized
+// and lose type information.  For example, Ember's router may put a record's
+// ID into the URL, and if we later try to deserialize that URL and find the
+// corresponding record, we will not know if it is a string or a number.
+type Coercable = string | number | boolean | null | undefined | symbol;
+
+function coerceId(id: Coercable): string | null {
+  if (id === null || id === undefined || id === '') {
+    return null;
+  }
+  if (typeof id === 'string') {
+    return id;
+  }
+  if (typeof id === 'symbol') {
+    return id.toString();
+  }
+  return '' + id;
+}
+
+export function ensureStringId(id: Coercable): string {
+  let normalized: string | null = null;
+  if (typeof id === 'string') {
+    normalized = id.length > 0 ? id : null;
+  } else if (typeof id === 'number' && !isNaN(id)) {
+    normalized = '' + id;
+  }
+
+  if (DEBUG && normalized === null) {
+    throw new Error(`Expected id to be a string or number, recieved ${String(id)}`);
+  }
+
+  return normalized!;
+}
+
+export default coerceId;

packages/record-data/addon/-private/index.ts

@@ -0,0 +1,5 @@
+export { default as RecordData } from './record-data';
+export { default as Relationship } from './relationships/state/relationship';
+export { default as BelongsToRelationship } from './relationships/state/belongs-to';
+export { default as ManyRelationship } from './relationships/state/has-many';
+export { relationshipStateFor, relationshipsFor } from './record-data-for';

packages/store/addon/-private/system/normalize-link.js → packages/record-data/addon/-private/normalize-link.ts

@@ -1,19 +1,18 @@
-/**
-  @module @ember-data/store
-*/
-
 /*
   This method normalizes a link to an "links object". If the passed link is
   already an object it's returned without any modifications.
 
   See http://jsonapi.org/format/#document-links for more information.
 
   @method _normalizeLink
-  @private
+  @internal
   @param {String} link
   @return {Object|null}
 */
-export default function _normalizeLink(link) {
+type Link = import('@ember-data/store/-private/ts-interfaces/ember-data-json-api').Link;
+type LinkObject = import('@ember-data/store/-private/ts-interfaces/ember-data-json-api').LinkObject;
+
+export default function _normalizeLink(link: Link): LinkObject | null {
   switch (typeof link) {
     case 'object':
       return link;

packages/store/addon/-private/system/ordered-set.ts → packages/record-data/addon/-private/ordered-set.ts

@@ -1,10 +1,6 @@
 import EmberOrderedSet from '@ember/ordered-set';
 import { guidFor } from '@ember/object/internals';
 
-/**
-  @module @ember-data/store
-*/
-
 export default class EmberDataOrderedSet<T> extends EmberOrderedSet<T> {
   static create() {
     return new this();