diff --git a/.eslintignore b/.eslintignore index d734b770d86..11a7d457c3e 100644 --- a/.eslintignore +++ b/.eslintignore @@ -15,7 +15,7 @@ /packages/tracking/addon/ /packages/serializer/addon/ /packages/model/addon/ -/packages/record-data/addon/ +/packages/json-api/addon/ **/DEBUG/ diff --git a/.eslintrc.js b/.eslintrc.js index 62c2928ac3c..2e2429e55de 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -213,21 +213,21 @@ module.exports = { 'tests/graph/tests/integration/graph/edge-removal/helpers.ts', 'tests/graph/tests/integration/graph/edge-removal/abstract-edge-removal-test.ts', 'tests/graph/tests/integration/graph.ts', - 'packages/record-data/src/-private/relationships/state/has-many.ts', - 'packages/record-data/src/-private/relationships/state/belongs-to.ts', - 'packages/record-data/src/-private/record-data.ts', - 'packages/record-data/src/-private/normalize-link.ts', - 'packages/record-data/src/-private/graph/operations/update-relationship.ts', - 'packages/record-data/src/-private/graph/operations/replace-related-records.ts', - 'packages/record-data/src/-private/graph/operations/replace-related-record.ts', - 'packages/record-data/src/-private/graph/operations/remove-from-related-records.ts', - 'packages/record-data/src/-private/graph/operations/add-to-related-records.ts', - 'packages/record-data/src/-private/graph/index.ts', - 'packages/record-data/src/-private/graph/-utils.ts', - 'packages/record-data/src/-private/graph/-state.ts', - 'packages/record-data/src/-private/graph/-operations.ts', - 'packages/record-data/src/-private/graph/-edge-definition.ts', - 'packages/record-data/src/-private/coerce-id.ts', + 'packages/json-api/src/-private/relationships/state/has-many.ts', + 'packages/json-api/src/-private/relationships/state/belongs-to.ts', + 'packages/json-api/src/-private/record-data.ts', + 'packages/json-api/src/-private/normalize-link.ts', + 'packages/json-api/src/-private/graph/operations/update-relationship.ts', + 'packages/json-api/src/-private/graph/operations/replace-related-records.ts', + 'packages/json-api/src/-private/graph/operations/replace-related-record.ts', + 'packages/json-api/src/-private/graph/operations/remove-from-related-records.ts', + 'packages/json-api/src/-private/graph/operations/add-to-related-records.ts', + 'packages/json-api/src/-private/graph/index.ts', + 'packages/json-api/src/-private/graph/-utils.ts', + 'packages/json-api/src/-private/graph/-state.ts', + 'packages/json-api/src/-private/graph/-operations.ts', + 'packages/json-api/src/-private/graph/-edge-definition.ts', + 'packages/json-api/src/-private/coerce-id.ts', 'packages/private-build-infra/addon/index.ts', 'packages/private-build-infra/addon/deprecations.ts', 'packages/private-build-infra/addon/current-deprecations.ts', diff --git a/.gitignore b/.gitignore index 654e75cb6f4..6473637eb67 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ packages/store/addon packages/adapter/addon packages/serializer/addon packages/model/addon -packages/record-data/addon +packages/json-api/addon # dependencies bower_components diff --git a/README.md b/README.md index af763b74fed..04c5f4611f6 100644 --- a/README.md +++ b/README.md @@ -92,10 +92,10 @@ not wish to use `ember-data`, remove `ember-data` from your project's `package.j - [@ember-data/store](./packages/store) is the core and handles coordination - [@ember-data/tracking](./packages/tracking) is required when using the core and provides tracking primitives for change notification of Tracked properties -- [@ember-data/record-data](./packages/record-data) is a resource cache for JSON:API structured data. It integrates with the store via the hook `createRecordDataFor` +- [@ember-data/json-api](./packages/json-api) is a resource cache for JSON:API structured data. It integrates with the store via the hook `createRecordDataFor` - [@ember-data/model](./packages/model) is a presentation layer, it integrates with the store via the hooks `instantiateRecord` and `teardownRecord`. - [@ember-data/adapter](./packages/adapter) provides various network API integrations for APIS built over specific REST or JSON:API conventions. -- [@ember-data/serializer](./packages/serializer) pairs with `@ember-data/adapter` to normalize and serialize data to and from an API format into the `JSON:API` format understood by `@ember-data/record-data`. +- [@ember-data/serializer](./packages/serializer) pairs with `@ember-data/adapter` to normalize and serialize data to and from an API format into the `JSON:API` format understood by `@ember-data/json-api`. - [@ember-data/debug](./packages/debug) provides debugging support for the `ember-inspector`. - [ember-data](./packages/-ember-data) is a "meta" package which bundles all of these together for convenience diff --git a/docs-generator/yuidoc.json b/docs-generator/yuidoc.json index 9b09baedec5..1367c492729 100644 --- a/docs-generator/yuidoc.json +++ b/docs-generator/yuidoc.json @@ -17,7 +17,7 @@ "../packages/model/src", "../packages/serializer/src", "../packages/store/src", - "../packages/record-data/src", + "../packages/json-api/src", "../packages/debug/addon", "../packages/private-build-infra/addon", "../packages/canary-features/addon", diff --git a/ember-data-types/q/record-data.ts b/ember-data-types/q/record-data.ts index d9882d52ee4..0c279f9b1f1 100644 --- a/ember-data-types/q/record-data.ts +++ b/ember-data-types/q/record-data.ts @@ -1,4 +1,4 @@ -import { LocalRelationshipOperation } from '@ember-data/record-data/-private/graph/-operations'; +import { LocalRelationshipOperation } from '@ember-data/json-api/-private/graph/-operations'; import type { CollectionResourceRelationship, SingleResourceRelationship } from './ember-data-json-api'; import type { RecordIdentifier, StableRecordIdentifier } from './identifier'; diff --git a/packages/-ember-data/README.md b/packages/-ember-data/README.md index 9d81a251987..4d778f742a5 100644 --- a/packages/-ember-data/README.md +++ b/packages/-ember-data/README.md @@ -41,10 +41,10 @@ not wish to use `ember-data`, remove `ember-data` from your project's `package.j EmberData is organized into primitives that compose together via public APIs. - [@ember-data/store](https://github.com/emberjs/data/tree/master/packages/store) is the core and handles coordination -- [@ember-data/record-data](https://github.com/emberjs/data/tree/master/packages/record-data) is a resource cache for JSON:API structured data. It integrates with the store via the hook `createRecordDataFor` +- [@ember-data/json-api](https://github.com/emberjs/data/tree/master/packages/record-data) is a resource cache for JSON:API structured data. It integrates with the store via the hook `createRecordDataFor` - [@ember-data/model](https://github.com/emberjs/data/tree/master/packages/model) is a presentation layer, it integrates with the store via the hooks `instantiateRecord` and `teardownRecord`. - [@ember-data/adapter](https://github.com/emberjs/data/tree/master/packages/adapter) provides various network API integrations for APIS built over specific REST or JSON:API conventions. -- [@ember-data/serializer](https://github.com/emberjs/data/tree/master/packages/serializer) pairs with `@ember-data/adapter` to normalize and serialize data to and from an API format into the `JSON:API` format understood by `@ember-data/record-data`. +- [@ember-data/serializer](https://github.com/emberjs/data/tree/master/packages/serializer) pairs with `@ember-data/adapter` to normalize and serialize data to and from an API format into the `JSON:API` format understood by `@ember-data/json-api`. - [@ember-data/debug](https://github.com/emberjs/data/tree/master/packages/debug) provides debugging support for the `ember-inspector`. - [ember-data](https://github.com/emberjs/data/tree/master/packages/-ember-data) is a "meta" package which bundles all of these together for convenience diff --git a/packages/-ember-data/addon/-private/index.ts b/packages/-ember-data/addon/-private/index.ts index 4fda72e1ba4..c9e1e3dab91 100644 --- a/packages/-ember-data/addon/-private/index.ts +++ b/packages/-ember-data/addon/-private/index.ts @@ -11,7 +11,7 @@ export { Snapshot } from '@ember-data/store/-private'; // `ember-data-model-fragments' and `ember-data-change-tracker` rely on `normalizeModelName` export { RecordArrayManager, SnapshotRecordArray, normalizeModelName, coerceId } from '@ember-data/store/-private'; export { ManyArray, PromiseManyArray } from '@ember-data/model/-private'; -export { RecordData } from '@ember-data/record-data/-private'; +export { RecordData } from '@ember-data/json-api/-private'; export const PromiseArray = ArrayProxy.extend(PromiseProxyMixin); export const PromiseObject = ObjectProxy.extend(PromiseProxyMixin); diff --git a/packages/-ember-data/addon/index.js b/packages/-ember-data/addon/index.js index 033298cdc9c..9cbcb3cc672 100644 --- a/packages/-ember-data/addon/index.js +++ b/packages/-ember-data/addon/index.js @@ -72,10 +72,10 @@ not wish to use `ember-data`, remove `ember-data` from your project's `package.j *Ember*‍**Data** is organized into primitives that compose together via public APIs. - [@ember-data/store](/ember-data/release/modules/@ember-data%2Fstore) is the core and handles coordination -- [@ember-data/record-data](/ember-data/release/modules/@ember-data%2Frecord-data) is a resource cache for JSON:API structured data. It integrates with the store via the hook `createRecordDataFor` +- [@ember-data/json-api](/ember-data/release/modules/@ember-data%2Fjson-api) is a resource cache for JSON:API structured data. It integrates with the store via the hook `createRecordDataFor` - [@ember-data/model](/ember-data/release/modules/@ember-data%2Fmodel) is a presentation layer, it integrates with the store via the hooks `instantiateRecord` and `teardownRecord`. - [@ember-data/adapter](/ember-data/release/modules/@ember-data%2Fadapter) provides various network API integrations for APIS built over specific REST or JSON:API conventions. -- [@ember-data/serializer](/ember-data/release/modules/@ember-data%2Fserializer) pairs with `@ember-data/adapter` to normalize and serialize data to and from an API format into the `JSON:API` format understood by `@ember-data/record-data`. +- [@ember-data/serializer](/ember-data/release/modules/@ember-data%2Fserializer) pairs with `@ember-data/adapter` to normalize and serialize data to and from an API format into the `JSON:API` format understood by `@ember-data/json-api`. - [@ember-data/debug](/ember-data/release/modules/@ember-data%2Fdebug) provides debugging support for the `ember-inspector`. - **ember-data** is a "meta" package which bundles all of these together for convenience diff --git a/packages/-ember-data/index.js b/packages/-ember-data/index.js index 481ada0cf51..b345d64ee0a 100644 --- a/packages/-ember-data/index.js +++ b/packages/-ember-data/index.js @@ -11,7 +11,7 @@ module.exports = Object.assign({}, addonBaseConfig, { return [ 'ember', '@ember/application/namespace', - '@ember-data/record-data/-private', + '@ember-data/json-api/-private', 'ember-data/version', '@ember-data/store/-private', '@ember-data/store', diff --git a/packages/-ember-data/package.json b/packages/-ember-data/package.json index c21a5711079..9f784bcd835 100644 --- a/packages/-ember-data/package.json +++ b/packages/-ember-data/package.json @@ -21,7 +21,7 @@ "@ember-data/debug": "workspace:4.10.0-alpha.4", "@ember-data/model": "workspace:4.10.0-alpha.4", "@ember-data/private-build-infra": "workspace:4.10.0-alpha.4", - "@ember-data/record-data": "workspace:4.10.0-alpha.4", + "@ember-data/json-api": "workspace:4.10.0-alpha.4", "@ember-data/serializer": "workspace:4.10.0-alpha.4", "@ember-data/store": "workspace:4.10.0-alpha.4", "@ember-data/tracking": "workspace:4.10.0-alpha.4", @@ -44,7 +44,7 @@ "@ember-data/model": { "injected": true }, - "@ember-data/record-data": { + "@ember-data/json-api": { "injected": true }, "@ember-data/serializer": { @@ -81,4 +81,4 @@ "extends": "../../package.json" }, "packageManager": "pnpm@7.18.0" -} \ No newline at end of file +} diff --git a/packages/record-data/.npmignore b/packages/json-api/.npmignore similarity index 100% rename from packages/record-data/.npmignore rename to packages/json-api/.npmignore diff --git a/packages/record-data/LICENSE.md b/packages/json-api/LICENSE.md similarity index 100% rename from packages/record-data/LICENSE.md rename to packages/json-api/LICENSE.md diff --git a/packages/record-data/README.md b/packages/json-api/README.md similarity index 72% rename from packages/record-data/README.md rename to packages/json-api/README.md index 2ba3f28fc70..ebc39387fd5 100644 --- a/packages/record-data/README.md +++ b/packages/json-api/README.md @@ -1,11 +1,11 @@ -# @ember-data/record-data +# @ember-data/json-api Provides the default JSON:API Cache implementation for EmberData. ## Installation ``` -ember install @ember-data/record-data +ember install @ember-data/json-api ``` ## License diff --git a/packages/record-data/addon-main.js b/packages/json-api/addon-main.js similarity index 100% rename from packages/record-data/addon-main.js rename to packages/json-api/addon-main.js diff --git a/packages/record-data/babel.config.js b/packages/json-api/babel.config.js similarity index 100% rename from packages/record-data/babel.config.js rename to packages/json-api/babel.config.js diff --git a/packages/record-data/index.js b/packages/json-api/index.js similarity index 100% rename from packages/record-data/index.js rename to packages/json-api/index.js diff --git a/packages/record-data/package.json b/packages/json-api/package.json similarity index 98% rename from packages/record-data/package.json rename to packages/json-api/package.json index d8639313bb2..810121d6c26 100644 --- a/packages/record-data/package.json +++ b/packages/json-api/package.json @@ -1,5 +1,5 @@ { - "name": "@ember-data/record-data", + "name": "@ember-data/json-api", "version": "4.10.0-alpha.4", "description": "Provides the default resource cache (RecordData) implementation for ember-data", "keywords": [ diff --git a/packages/record-data/rollup.config.mjs b/packages/json-api/rollup.config.mjs similarity index 100% rename from packages/record-data/rollup.config.mjs rename to packages/json-api/rollup.config.mjs diff --git a/packages/record-data/src/-private.ts b/packages/json-api/src/-private.ts similarity index 86% rename from packages/record-data/src/-private.ts rename to packages/json-api/src/-private.ts index cf87817fffc..747abbf9a07 100644 --- a/packages/record-data/src/-private.ts +++ b/packages/json-api/src/-private.ts @@ -8,6 +8,6 @@ export { graphFor, peekGraph } from './-private/graph/index'; and providing a class that conforms to the current record-data interface specification. - @module @ember-data/record-data - @main @ember-data/record-data + @module @ember-data/json-api + @main @ember-data/json-api */ diff --git a/packages/record-data/src/-private/coerce-id.ts b/packages/json-api/src/-private/coerce-id.ts similarity index 100% rename from packages/record-data/src/-private/coerce-id.ts rename to packages/json-api/src/-private/coerce-id.ts diff --git a/packages/record-data/src/-private/debug/assert-polymorphic-type.js b/packages/json-api/src/-private/debug/assert-polymorphic-type.js similarity index 100% rename from packages/record-data/src/-private/debug/assert-polymorphic-type.js rename to packages/json-api/src/-private/debug/assert-polymorphic-type.js diff --git a/packages/record-data/src/-private/graph/-edge-definition.ts b/packages/json-api/src/-private/graph/-edge-definition.ts similarity index 100% rename from packages/record-data/src/-private/graph/-edge-definition.ts rename to packages/json-api/src/-private/graph/-edge-definition.ts diff --git a/packages/record-data/src/-private/graph/-operations.ts b/packages/json-api/src/-private/graph/-operations.ts similarity index 100% rename from packages/record-data/src/-private/graph/-operations.ts rename to packages/json-api/src/-private/graph/-operations.ts diff --git a/packages/record-data/src/-private/graph/-state.ts b/packages/json-api/src/-private/graph/-state.ts similarity index 100% rename from packages/record-data/src/-private/graph/-state.ts rename to packages/json-api/src/-private/graph/-state.ts diff --git a/packages/record-data/src/-private/graph/-utils.ts b/packages/json-api/src/-private/graph/-utils.ts similarity index 100% rename from packages/record-data/src/-private/graph/-utils.ts rename to packages/json-api/src/-private/graph/-utils.ts diff --git a/packages/record-data/src/-private/graph/graph.ts b/packages/json-api/src/-private/graph/graph.ts similarity index 100% rename from packages/record-data/src/-private/graph/graph.ts rename to packages/json-api/src/-private/graph/graph.ts diff --git a/packages/record-data/src/-private/graph/index.ts b/packages/json-api/src/-private/graph/index.ts similarity index 100% rename from packages/record-data/src/-private/graph/index.ts rename to packages/json-api/src/-private/graph/index.ts diff --git a/packages/record-data/src/-private/graph/operations/add-to-related-records.ts b/packages/json-api/src/-private/graph/operations/add-to-related-records.ts similarity index 100% rename from packages/record-data/src/-private/graph/operations/add-to-related-records.ts rename to packages/json-api/src/-private/graph/operations/add-to-related-records.ts diff --git a/packages/record-data/src/-private/graph/operations/merge-identifier.ts b/packages/json-api/src/-private/graph/operations/merge-identifier.ts similarity index 100% rename from packages/record-data/src/-private/graph/operations/merge-identifier.ts rename to packages/json-api/src/-private/graph/operations/merge-identifier.ts diff --git a/packages/record-data/src/-private/graph/operations/remove-from-related-records.ts b/packages/json-api/src/-private/graph/operations/remove-from-related-records.ts similarity index 100% rename from packages/record-data/src/-private/graph/operations/remove-from-related-records.ts rename to packages/json-api/src/-private/graph/operations/remove-from-related-records.ts diff --git a/packages/record-data/src/-private/graph/operations/replace-related-record.ts b/packages/json-api/src/-private/graph/operations/replace-related-record.ts similarity index 100% rename from packages/record-data/src/-private/graph/operations/replace-related-record.ts rename to packages/json-api/src/-private/graph/operations/replace-related-record.ts diff --git a/packages/record-data/src/-private/graph/operations/replace-related-records.ts b/packages/json-api/src/-private/graph/operations/replace-related-records.ts similarity index 100% rename from packages/record-data/src/-private/graph/operations/replace-related-records.ts rename to packages/json-api/src/-private/graph/operations/replace-related-records.ts diff --git a/packages/record-data/src/-private/graph/operations/update-relationship.ts b/packages/json-api/src/-private/graph/operations/update-relationship.ts similarity index 100% rename from packages/record-data/src/-private/graph/operations/update-relationship.ts rename to packages/json-api/src/-private/graph/operations/update-relationship.ts diff --git a/packages/record-data/src/-private/normalize-link.ts b/packages/json-api/src/-private/normalize-link.ts similarity index 100% rename from packages/record-data/src/-private/normalize-link.ts rename to packages/json-api/src/-private/normalize-link.ts diff --git a/packages/record-data/src/-private/record-data.ts b/packages/json-api/src/-private/record-data.ts similarity index 99% rename from packages/record-data/src/-private/record-data.ts rename to packages/json-api/src/-private/record-data.ts index c577235997c..26091a7c8ba 100644 --- a/packages/record-data/src/-private/record-data.ts +++ b/packages/json-api/src/-private/record-data.ts @@ -1,5 +1,5 @@ /** - * @module @ember-data/record-data + * @module @ember-data/json-api */ import { assert } from '@ember/debug'; import { schedule } from '@ember/runloop'; diff --git a/packages/record-data/src/-private/relationships/state/belongs-to.ts b/packages/json-api/src/-private/relationships/state/belongs-to.ts similarity index 100% rename from packages/record-data/src/-private/relationships/state/belongs-to.ts rename to packages/json-api/src/-private/relationships/state/belongs-to.ts diff --git a/packages/record-data/src/-private/relationships/state/has-many.ts b/packages/json-api/src/-private/relationships/state/has-many.ts similarity index 100% rename from packages/record-data/src/-private/relationships/state/has-many.ts rename to packages/json-api/src/-private/relationships/state/has-many.ts diff --git a/packages/model/package.json b/packages/model/package.json index 19e3df1e2be..b5177111387 100644 --- a/packages/model/package.json +++ b/packages/model/package.json @@ -29,14 +29,14 @@ "addon" ], "peerDependencies": { - "@ember-data/record-data": "workspace:4.10.0-alpha.4", + "@ember-data/json-api": "workspace:4.10.0-alpha.4", "@ember-data/store": "workspace:4.10.0-alpha.4", "@ember-data/tracking": "workspace:4.10.0-alpha.4", "@ember/string": "^3.0.0", "ember-inflector": "^4.0.2" }, "peerDependenciesMeta": { - "@ember-data/record-data": { + "@ember-data/json-api": { "optional": true } }, diff --git a/packages/model/src/-private/legacy-relationships-support.ts b/packages/model/src/-private/legacy-relationships-support.ts index 75876b0e08b..dccf497dcbd 100644 --- a/packages/model/src/-private/legacy-relationships-support.ts +++ b/packages/model/src/-private/legacy-relationships-support.ts @@ -4,13 +4,13 @@ import { DEBUG } from '@glimmer/env'; import { importSync } from '@embroider/macros'; import { all, resolve } from 'rsvp'; +import type { UpgradedMeta } from '@ember-data/json-api/-private/graph/-edge-definition'; +import type { LocalRelationshipOperation } from '@ember-data/json-api/-private/graph/-operations'; +import type { ImplicitRelationship } from '@ember-data/json-api/-private/graph/index'; +import type BelongsToRelationship from '@ember-data/json-api/-private/relationships/state/belongs-to'; +import type ManyRelationship from '@ember-data/json-api/-private/relationships/state/has-many'; import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra'; import { DEPRECATE_PROMISE_PROXIES } from '@ember-data/private-build-infra/deprecations'; -import type { UpgradedMeta } from '@ember-data/record-data/-private/graph/-edge-definition'; -import type { LocalRelationshipOperation } from '@ember-data/record-data/-private/graph/-operations'; -import type { ImplicitRelationship } from '@ember-data/record-data/-private/graph/index'; -import type BelongsToRelationship from '@ember-data/record-data/-private/relationships/state/belongs-to'; -import type ManyRelationship from '@ember-data/record-data/-private/relationships/state/has-many'; import type Store from '@ember-data/store'; import { fastPush, isStableIdentifier, recordIdentifierFor, SOURCE, storeFor } from '@ember-data/store/-private'; import type { NonSingletonRecordDataManager } from '@ember-data/store/-private/managers/record-data-manager'; @@ -107,9 +107,8 @@ export class LegacySupport { return loadingPromise; } - const graphFor = ( - importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private') - ).graphFor; + const graphFor = (importSync('@ember-data/json-api/-private') as typeof import('@ember-data/json-api/-private')) + .graphFor; const relationship = graphFor(this.store).get(this.identifier, key); assert(`Expected ${key} to be a belongs-to relationship`, isBelongsTo(relationship)); @@ -130,9 +129,8 @@ export class LegacySupport { assert(`Expected a stable identifier`, !relatedIdentifier || isStableIdentifier(relatedIdentifier)); const store = this.store; - const graphFor = ( - importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private') - ).graphFor; + const graphFor = (importSync('@ember-data/json-api/-private') as typeof import('@ember-data/json-api/-private')) + .graphFor; const relationship = graphFor(store).get(this.identifier, key); assert(`Expected ${key} to be a belongs-to relationship`, isBelongsTo(relationship)); @@ -214,9 +212,8 @@ export class LegacySupport { if (HAS_RECORD_DATA_PACKAGE) { let manyArray: RelatedCollection | undefined = this._manyArrayCache[key]; if (!definition) { - const graphFor = ( - importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private') - ).graphFor; + const graphFor = (importSync('@ember-data/json-api/-private') as typeof import('@ember-data/json-api/-private')) + .graphFor; definition = graphFor(this.store).get(this.identifier, key).definition; } @@ -244,7 +241,7 @@ export class LegacySupport { return manyArray; } - assert('hasMany only works with the @ember-data/record-data package'); + assert('hasMany only works with the @ember-data/json-api package'); } fetchAsyncHasMany( @@ -274,7 +271,7 @@ export class LegacySupport { this._relationshipPromisesCache[key] = loadingPromise; return loadingPromise; } - assert('hasMany only works with the @ember-data/record-data package'); + assert('hasMany only works with the @ember-data/json-api package'); } reloadHasMany(key: string, options?: FindOptions) { @@ -283,9 +280,8 @@ export class LegacySupport { if (loadingPromise) { return loadingPromise; } - const graphFor = ( - importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private') - ).graphFor; + const graphFor = (importSync('@ember-data/json-api/-private') as typeof import('@ember-data/json-api/-private')) + .graphFor; const relationship = graphFor(this.store).get(this.identifier, key) as ManyRelationship; const { definition, state } = relationship; @@ -300,14 +296,13 @@ export class LegacySupport { return promise; } - assert(`hasMany only works with the @ember-data/record-data package`); + assert(`hasMany only works with the @ember-data/json-api package`); } getHasMany(key: string, options?: FindOptions): PromiseManyArray | RelatedCollection { if (HAS_RECORD_DATA_PACKAGE) { - const graphFor = ( - importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private') - ).graphFor; + const graphFor = (importSync('@ember-data/json-api/-private') as typeof import('@ember-data/json-api/-private')) + .graphFor; const relationship = graphFor(this.store).get(this.identifier, key) as ManyRelationship; const { definition, state } = relationship; let manyArray = this.getManyArray(key, definition); @@ -331,7 +326,7 @@ export class LegacySupport { return manyArray; } } - assert(`hasMany only works with the @ember-data/record-data package`); + assert(`hasMany only works with the @ember-data/json-api package`); } _updatePromiseProxyFor(kind: 'hasMany', key: string, args: HasManyProxyCreateArgs): PromiseManyArray; @@ -381,11 +376,10 @@ export class LegacySupport { // TODO @runspired while this feels odd, it is not a regression in capability because we do // not today support references pulling from RecordDatas other than our own // because of the intimate API access involved. This is something we will need to redesign. - assert(`snapshot.belongsTo only supported for @ember-data/record-data`); + assert(`snapshot.belongsTo only supported for @ember-data/json-api`); } - const graphFor = ( - importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private') - ).graphFor; + const graphFor = (importSync('@ember-data/json-api/-private') as typeof import('@ember-data/json-api/-private')) + .graphFor; const graph = graphFor(this.store); const relationship = graph.get(this.identifier, name); @@ -519,7 +513,7 @@ export class LegacySupport { // TODO if the relationshipIsStale, should we hit the adapter anyway? return; } - assert(`hasMany only works with the @ember-data/record-data package`); + assert(`hasMany only works with the @ember-data/json-api package`); } _findBelongsToByJsonApiResource( diff --git a/packages/model/src/-private/references/belongs-to.ts b/packages/model/src/-private/references/belongs-to.ts index 9f7946e378a..05b4871abe0 100644 --- a/packages/model/src/-private/references/belongs-to.ts +++ b/packages/model/src/-private/references/belongs-to.ts @@ -6,9 +6,9 @@ import { cached, tracked } from '@glimmer/tracking'; import type { Object as JSONObject, Value as JSONValue } from 'json-typescript'; import { resolve } from 'rsvp'; +import type { Graph } from '@ember-data/json-api/-private/graph/graph'; +import type BelongsToRelationship from '@ember-data/json-api/-private/relationships/state/belongs-to'; import { DEPRECATE_PROMISE_PROXIES } from '@ember-data/private-build-infra/deprecations'; -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 { recordIdentifierFor } from '@ember-data/store/-private'; import type { NotificationType } from '@ember-data/store/-private/managers/record-notification-manager'; diff --git a/packages/model/src/-private/references/has-many.ts b/packages/model/src/-private/references/has-many.ts index 44570ea6790..0eac790f512 100644 --- a/packages/model/src/-private/references/has-many.ts +++ b/packages/model/src/-private/references/has-many.ts @@ -8,9 +8,9 @@ import { resolve } from 'rsvp'; import { ManyArray } from 'ember-data/-private'; +import type { Graph } from '@ember-data/json-api/-private/graph/graph'; +import type ManyRelationship from '@ember-data/json-api/-private/relationships/state/has-many'; import { DEPRECATE_PROMISE_PROXIES } from '@ember-data/private-build-infra/deprecations'; -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 type { NotificationType } from '@ember-data/store/-private/managers/record-notification-manager'; diff --git a/packages/private-build-infra/addon/available-packages.ts b/packages/private-build-infra/addon/available-packages.ts index 6f3cec5fd45..71e2cd4d311 100644 --- a/packages/private-build-infra/addon/available-packages.ts +++ b/packages/private-build-infra/addon/available-packages.ts @@ -2,7 +2,7 @@ export default { HAS_EMBER_DATA_PACKAGE: 'ember-data', HAS_STORE_PACKAGE: '@ember-data/store', HAS_MODEL_PACKAGE: '@ember-data/model', - HAS_RECORD_DATA_PACKAGE: '@ember-data/record-data', + HAS_RECORD_DATA_PACKAGE: '@ember-data/json-api', HAS_ADAPTER_PACKAGE: '@ember-data/adapter', HAS_SERIALIZER_PACKAGE: '@ember-data/serializer', HAS_DEBUG_PACKAGE: '@ember-data/debug', diff --git a/packages/private-build-infra/src/addon-build-config-for-data-package.js b/packages/private-build-infra/src/addon-build-config-for-data-package.js index fcfed7e945e..816bfd550f7 100644 --- a/packages/private-build-infra/src/addon-build-config-for-data-package.js +++ b/packages/private-build-infra/src/addon-build-config-for-data-package.js @@ -45,7 +45,7 @@ function addonBuildConfigForDataPackage(PackageName) { '@ember-data/adapter', '@ember-data/serializer', '@ember-data/model', - '@ember-data/record-data', + '@ember-data/json-api', '@ember-data/debug', '@ember-data/canary-features', '@ember-data/tracking', diff --git a/packages/request/README.md b/packages/request/README.md index 508171fa861..0b9d72bc9da 100644 --- a/packages/request/README.md +++ b/packages/request/README.md @@ -81,7 +81,7 @@ flowchart LR D <--> E[(fa:fa-archive Cache)] D <--> B click D href "https://github.com/emberjs/data/tree/master/packages/store" "Go to @ember-data/store" _blank - click E href "https://github.com/emberjs/data/tree/master/packages/record-data" "Go to @ember-data/record-data" _blank + click E href "https://github.com/emberjs/data/tree/master/packages/json-api" "Go to @ember-data/json-api" _blank style D color:#58a6ff; style E color:#58a6ff; ``` @@ -98,7 +98,7 @@ flowchart LR D <--> E[(fa:fa-archive Cache)] D <--> B click D href "https://github.com/emberjs/data/tree/master/packages/store" "Go to @ember-data/store" _blank - click E href "https://github.com/emberjs/data/tree/master/packages/record-data" "Go to @ember-data/record-data" _blank + click E href "https://github.com/emberjs/data/tree/master/packages/json-api" "Go to @ember-data/json-api" _blank style D color:#58a6ff; style E color:#58a6ff; ``` diff --git a/packages/store/package.json b/packages/store/package.json index ce8b359fc95..48045b335b9 100644 --- a/packages/store/package.json +++ b/packages/store/package.json @@ -30,13 +30,13 @@ ], "peerDependencies": { "@ember-data/model": "workspace:4.10.0-alpha.4", - "@ember-data/record-data": "workspace:4.10.0-alpha.4", + "@ember-data/json-api": "workspace:4.10.0-alpha.4", "@ember-data/tracking": "workspace:4.10.0-alpha.4", "@ember/string": "^3.0.0", "@glimmer/tracking": "^1.1.2" }, "peerDependenciesMeta": { - "@ember-data/record-data": { + "@ember-data/json-api": { "optional": true }, "@ember-data/model": { diff --git a/packages/store/src/-private/caches/instance-cache.ts b/packages/store/src/-private/caches/instance-cache.ts index 1fbda100c1b..84b6b97e192 100644 --- a/packages/store/src/-private/caches/instance-cache.ts +++ b/packages/store/src/-private/caches/instance-cache.ts @@ -4,11 +4,11 @@ import { DEBUG } from '@glimmer/env'; import { importSync } from '@embroider/macros'; import { resolve } from 'rsvp'; +import type { Graph } from '@ember-data/json-api/-private/graph/graph'; +import type { peekGraph } from '@ember-data/json-api/-private/graph/index'; import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra'; import { LOG_INSTANCE_CACHE } from '@ember-data/private-build-infra/debugging'; import { DEPRECATE_V1_RECORD_DATA, DEPRECATE_V1CACHE_STORE_APIS } from '@ember-data/private-build-infra/deprecations'; -import type { Graph } from '@ember-data/record-data/-private/graph/graph'; -import type { peekGraph } from '@ember-data/record-data/-private/graph/index'; import type { ExistingResourceIdentifierObject, ExistingResourceObject, @@ -43,7 +43,7 @@ let _peekGraph: peekGraph; if (HAS_RECORD_DATA_PACKAGE) { let __peekGraph: peekGraph; _peekGraph = (wrapper: Store | StoreWrapper): Graph | undefined => { - let a = (importSync('@ember-data/record-data/-private') as { peekGraph: peekGraph }).peekGraph; + let a = (importSync('@ember-data/json-api/-private') as { peekGraph: peekGraph }).peekGraph; __peekGraph = __peekGraph || a; return __peekGraph(wrapper); }; @@ -210,7 +210,7 @@ export class InstanceCache { TODO @runspired consider adding this to make polymorphism even nicer if (HAS_RECORD_DATA_PACKAGE) { if (identifier.type !== matchedIdentifier.type) { - const graphFor = importSync('@ember-data/record-data/-private').graphFor; + const graphFor = importSync('@ember-data/json-api/-private').graphFor; graphFor(this).registerPolymorphicType(identifier.type, matchedIdentifier.type); } } diff --git a/packages/store/src/-private/managers/record-data-manager.ts b/packages/store/src/-private/managers/record-data-manager.ts index 35ef1a2fc21..20631ee3060 100644 --- a/packages/store/src/-private/managers/record-data-manager.ts +++ b/packages/store/src/-private/managers/record-data-manager.ts @@ -1,6 +1,6 @@ import { assert, deprecate } from '@ember/debug'; -import type { LocalRelationshipOperation } from '@ember-data/record-data/-private/graph/-operations'; +import type { LocalRelationshipOperation } from '@ember-data/json-api/-private/graph/-operations'; import type { CollectionResourceRelationship, SingleResourceRelationship, diff --git a/packages/store/src/-private/network/fetch-manager.ts b/packages/store/src/-private/network/fetch-manager.ts index aa9af2bf52f..1ad60213d83 100644 --- a/packages/store/src/-private/network/fetch-manager.ts +++ b/packages/store/src/-private/network/fetch-manager.ts @@ -219,7 +219,7 @@ export default class FetchManager { let isReleasable = true; if (!recordData && HAS_RECORD_DATA_PACKAGE) { const graphFor = ( - importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private') + importSync('@ember-data/json-api/-private') as typeof import('@ember-data/json-api/-private') ).graphFor; const graph = graphFor(store); isReleasable = graph.isReleasable(identifier); diff --git a/packages/store/src/-private/network/snapshot.ts b/packages/store/src/-private/network/snapshot.ts index 19809aac832..871ea116e7a 100644 --- a/packages/store/src/-private/network/snapshot.ts +++ b/packages/store/src/-private/network/snapshot.ts @@ -5,10 +5,10 @@ import { assert, deprecate } from '@ember/debug'; import { importSync } from '@embroider/macros'; +import type BelongsToRelationship from '@ember-data/json-api/-private/relationships/state/belongs-to'; +import type ManyRelationship from '@ember-data/json-api/-private/relationships/state/has-many'; import { HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra'; import { DEPRECATE_SNAPSHOT_MODEL_CLASS_ACCESS } from '@ember-data/private-build-infra/deprecations'; -import type BelongsToRelationship from '@ember-data/record-data/-private/relationships/state/belongs-to'; -import type ManyRelationship from '@ember-data/record-data/-private/relationships/state/has-many'; import type { StableRecordIdentifier } from '@ember-data/types/q/identifier'; import type { OptionsHash } from '@ember-data/types/q/minimum-serializer-interface'; import type { ChangedAttributesHash } from '@ember-data/types/q/record-data'; @@ -316,12 +316,11 @@ export default class Snapshot implements Snapshot { // This is a requirement we should fix as soon as the relationship layer does not require // this intimate API usage. if (!HAS_RECORD_DATA_PACKAGE) { - assert(`snapshot.belongsTo only supported when using the package @ember-data/record-data`); + assert(`snapshot.belongsTo only supported when using the package @ember-data/json-api`); } - const graphFor = ( - importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private') - ).graphFor; + const graphFor = (importSync('@ember-data/json-api/-private') as typeof import('@ember-data/json-api/-private')) + .graphFor; const { identifier } = this; const relationship = graphFor(this._store).get(identifier, keyName) as BelongsToRelationship; @@ -419,12 +418,11 @@ export default class Snapshot implements Snapshot { // This is a requirement we should fix as soon as the relationship layer does not require // this intimate API usage. if (!HAS_RECORD_DATA_PACKAGE) { - assert(`snapshot.hasMany only supported when using the package @ember-data/record-data`); + assert(`snapshot.hasMany only supported when using the package @ember-data/json-api`); } - const graphFor = ( - importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private') - ).graphFor; + const graphFor = (importSync('@ember-data/json-api/-private') as typeof import('@ember-data/json-api/-private')) + .graphFor; const { identifier } = this; const relationship = graphFor(this._store).get(identifier, keyName) as ManyRelationship; assert( diff --git a/packages/store/src/-private/store-service.ts b/packages/store/src/-private/store-service.ts index f1d039e2755..dd9fee80d64 100644 --- a/packages/store/src/-private/store-service.ts +++ b/packages/store/src/-private/store-service.ts @@ -10,6 +10,7 @@ import { DEBUG } from '@glimmer/env'; import { importSync } from '@embroider/macros'; import { reject, resolve } from 'rsvp'; +import type { RecordData as RecordDataClass } from '@ember-data/json-api/-private'; import type DSModelClass from '@ember-data/model'; import { HAS_MODEL_PACKAGE, HAS_RECORD_DATA_PACKAGE } from '@ember-data/private-build-infra'; import { LOG_PAYLOADS } from '@ember-data/private-build-infra/debugging'; @@ -20,7 +21,6 @@ import { DEPRECATE_STORE_FIND, DEPRECATE_V1CACHE_STORE_APIS, } from '@ember-data/private-build-infra/deprecations'; -import type { RecordData as RecordDataClass } from '@ember-data/record-data/-private'; import type { DSModel } from '@ember-data/types/q/ds-model'; import type { CollectionResourceDocument, @@ -1930,7 +1930,7 @@ class Store { // during unload if (HAS_RECORD_DATA_PACKAGE) { const peekGraph = ( - importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private') + importSync('@ember-data/json-api/-private') as typeof import('@ember-data/json-api/-private') ).peekGraph; let graph = peekGraph(this); if (graph) { @@ -2411,9 +2411,8 @@ class Store { // it can be reproduced in partner tests by running // node ./scripts/packages-for-commit.js && pnpm test-external:ember-observer if (_RecordData === undefined) { - _RecordData = ( - importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private') - ).RecordData; + _RecordData = (importSync('@ember-data/json-api/-private') as typeof import('@ember-data/json-api/-private')) + .RecordData; } if (DEPRECATE_V1CACHE_STORE_APIS) { @@ -2636,9 +2635,8 @@ class Store { } if (HAS_RECORD_DATA_PACKAGE) { - const peekGraph = ( - importSync('@ember-data/record-data/-private') as typeof import('@ember-data/record-data/-private') - ).peekGraph; + const peekGraph = (importSync('@ember-data/json-api/-private') as typeof import('@ember-data/json-api/-private')) + .peekGraph; let graph = peekGraph(this); if (graph) { graph.destroy(); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 06e740af23b..2390f216a76 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -228,9 +228,9 @@ importers: '@babel/core': ^7.20.2 '@ember-data/adapter': workspace:4.10.0-alpha.4 '@ember-data/debug': workspace:4.10.0-alpha.4 + '@ember-data/json-api': workspace:4.10.0-alpha.4 '@ember-data/model': workspace:4.10.0-alpha.4 '@ember-data/private-build-infra': workspace:4.10.0-alpha.4 - '@ember-data/record-data': workspace:4.10.0-alpha.4 '@ember-data/serializer': workspace:4.10.0-alpha.4 '@ember-data/store': workspace:4.10.0-alpha.4 '@ember-data/tracking': workspace:4.10.0-alpha.4 @@ -249,11 +249,11 @@ importers: dependencies: '@ember-data/adapter': file:packages/adapter_se6ahmk4jzdpfav7ntt26kzw4q '@ember-data/debug': file:packages/debug_4xit5mb2spplspgsttavzduwxq - '@ember-data/model': file:packages/model_loeof22gxlmfbm3eagkjqz2buq + '@ember-data/json-api': file:packages/json-api_2q6jgbjyzqvo2aignqdupq2k3q + '@ember-data/model': file:packages/model_gbl6nnjbfalf4iypqwa6hinjgu '@ember-data/private-build-infra': file:packages/private-build-infra - '@ember-data/record-data': file:packages/record-data_2q6jgbjyzqvo2aignqdupq2k3q '@ember-data/serializer': file:packages/serializer_se6ahmk4jzdpfav7ntt26kzw4q - '@ember-data/store': file:packages/store_ay2ghmofe4mzaykjgvdh6vhjpu + '@ember-data/store': file:packages/store_34aa23keliycchb7yprqdbst4u '@ember-data/tracking': file:packages/tracking '@ember/edition-utils': 1.2.0 '@ember/string': 3.0.0 @@ -274,12 +274,12 @@ importers: injected: true '@ember-data/debug': injected: true + '@ember-data/json-api': + injected: true '@ember-data/model': injected: true '@ember-data/private-build-infra': injected: true - '@ember-data/record-data': - injected: true '@ember-data/serializer': injected: true '@ember-data/store': @@ -371,6 +371,64 @@ importers: '@ember-data/private-build-infra': injected: true + packages/json-api: + specifiers: + '@babel/cli': ^7.19.3 + '@babel/core': ^7.20.2 + '@babel/plugin-proposal-class-properties': ^7.18.6 + '@babel/plugin-proposal-decorators': ^7.20.0 + '@babel/plugin-proposal-private-methods': ^7.18.6 + '@babel/plugin-transform-runtime': ^7.19.6 + '@babel/plugin-transform-typescript': ^7.20.0 + '@babel/preset-env': ^7.19.4 + '@babel/preset-typescript': ^7.18.6 + '@babel/runtime': ^7.20.0 + '@ember-data/canary-features': workspace:4.10.0-alpha.4 + '@ember-data/private-build-infra': workspace:4.10.0-alpha.4 + '@ember/edition-utils': ^1.2.0 + '@embroider/addon-dev': ^2.0.0 + '@embroider/macros': ^1.10.0 + '@glimmer/component': ^1.1.2 + '@rollup/plugin-babel': ^6.0.2 + '@rollup/plugin-node-resolve': ^15.0.1 + ember-cli-babel: ^7.26.11 + ember-source: ~4.8.2 + rollup: ^3.2.3 + tslib: ^2.4.0 + typescript: ^4.8.4 + walk-sync: ^3.0.0 + dependencies: + '@ember-data/private-build-infra': file:packages/private-build-infra + '@ember/edition-utils': 1.2.0 + '@embroider/macros': 1.10.0 + ember-cli-babel: 7.26.11 + devDependencies: + '@babel/cli': 7.19.3_@babel+core@7.20.2 + '@babel/core': 7.20.2 + '@babel/plugin-proposal-class-properties': 7.18.6_@babel+core@7.20.2 + '@babel/plugin-proposal-decorators': 7.20.2_@babel+core@7.20.2 + '@babel/plugin-proposal-private-methods': 7.18.6_@babel+core@7.20.2 + '@babel/plugin-transform-runtime': 7.19.6_@babel+core@7.20.2 + '@babel/plugin-transform-typescript': 7.20.2_@babel+core@7.20.2 + '@babel/preset-env': 7.20.2_@babel+core@7.20.2 + '@babel/preset-typescript': 7.18.6_@babel+core@7.20.2 + '@babel/runtime': 7.20.1 + '@ember-data/canary-features': file:packages/canary-features + '@embroider/addon-dev': 2.0.0_jgqpuikonnnyxxj34ossexjace + '@glimmer/component': 1.1.2_@babel+core@7.20.2 + '@rollup/plugin-babel': 6.0.3_ilus2vz5zuhvfvn5o2dsrag2wi + '@rollup/plugin-node-resolve': 15.0.1_rollup@3.7.0 + ember-source: 4.8.2_e62wfu5f7mvuxez4wez2cx3ose + rollup: 3.7.0 + tslib: 2.4.1 + typescript: 4.9.3 + walk-sync: 3.0.0 + dependenciesMeta: + '@ember-data/canary-features': + injected: true + '@ember-data/private-build-infra': + injected: true + packages/model: specifiers: '@babel/cli': ^7.19.3 @@ -500,64 +558,6 @@ importers: '@ember-data/canary-features': injected: true - packages/record-data: - specifiers: - '@babel/cli': ^7.19.3 - '@babel/core': ^7.20.2 - '@babel/plugin-proposal-class-properties': ^7.18.6 - '@babel/plugin-proposal-decorators': ^7.20.0 - '@babel/plugin-proposal-private-methods': ^7.18.6 - '@babel/plugin-transform-runtime': ^7.19.6 - '@babel/plugin-transform-typescript': ^7.20.0 - '@babel/preset-env': ^7.19.4 - '@babel/preset-typescript': ^7.18.6 - '@babel/runtime': ^7.20.0 - '@ember-data/canary-features': workspace:4.10.0-alpha.4 - '@ember-data/private-build-infra': workspace:4.10.0-alpha.4 - '@ember/edition-utils': ^1.2.0 - '@embroider/addon-dev': ^2.0.0 - '@embroider/macros': ^1.10.0 - '@glimmer/component': ^1.1.2 - '@rollup/plugin-babel': ^6.0.2 - '@rollup/plugin-node-resolve': ^15.0.1 - ember-cli-babel: ^7.26.11 - ember-source: ~4.8.2 - rollup: ^3.2.3 - tslib: ^2.4.0 - typescript: ^4.8.4 - walk-sync: ^3.0.0 - dependencies: - '@ember-data/private-build-infra': file:packages/private-build-infra - '@ember/edition-utils': 1.2.0 - '@embroider/macros': 1.10.0 - ember-cli-babel: 7.26.11 - devDependencies: - '@babel/cli': 7.19.3_@babel+core@7.20.2 - '@babel/core': 7.20.2 - '@babel/plugin-proposal-class-properties': 7.18.6_@babel+core@7.20.2 - '@babel/plugin-proposal-decorators': 7.20.2_@babel+core@7.20.2 - '@babel/plugin-proposal-private-methods': 7.18.6_@babel+core@7.20.2 - '@babel/plugin-transform-runtime': 7.19.6_@babel+core@7.20.2 - '@babel/plugin-transform-typescript': 7.20.2_@babel+core@7.20.2 - '@babel/preset-env': 7.20.2_@babel+core@7.20.2 - '@babel/preset-typescript': 7.18.6_@babel+core@7.20.2 - '@babel/runtime': 7.20.1 - '@ember-data/canary-features': file:packages/canary-features - '@embroider/addon-dev': 2.0.0_jgqpuikonnnyxxj34ossexjace - '@glimmer/component': 1.1.2_@babel+core@7.20.2 - '@rollup/plugin-babel': 6.0.3_ilus2vz5zuhvfvn5o2dsrag2wi - '@rollup/plugin-node-resolve': 15.0.1_rollup@3.7.0 - ember-source: 4.8.2_e62wfu5f7mvuxez4wez2cx3ose - rollup: 3.7.0 - tslib: 2.4.1 - typescript: 4.9.3 - walk-sync: 3.0.0 - dependenciesMeta: - '@ember-data/canary-features': - injected: true - '@ember-data/private-build-infra': - injected: true - packages/request: specifiers: '@babel/cli': ^7.19.3 @@ -834,8 +834,8 @@ importers: '@babel/core': ^7.19.3 '@babel/runtime': ^7.19.3 '@ember-data/debug': workspace:4.10.0-alpha.4 + '@ember-data/json-api': workspace:4.10.0-alpha.4 '@ember-data/model': workspace:4.10.0-alpha.4 - '@ember-data/record-data': workspace:4.10.0-alpha.4 '@ember-data/serializer': workspace:4.10.0-alpha.4 '@ember-data/store': workspace:4.10.0-alpha.4 '@ember-data/tracking': workspace:4.10.0-alpha.4 @@ -868,10 +868,10 @@ importers: '@babel/core': 7.19.6 '@babel/runtime': 7.20.0 '@ember-data/debug': file:packages/debug_kmsc2736dkhfkaunrjhq23icem - '@ember-data/model': file:packages/model_krj6rcvw3p6z5dpf5jv3xpisai - '@ember-data/record-data': file:packages/record-data_2q6jgbjyzqvo2aignqdupq2k3q + '@ember-data/json-api': file:packages/json-api_2q6jgbjyzqvo2aignqdupq2k3q + '@ember-data/model': file:packages/model_gwkc2ypkqp4n2vhoy3lfmzya3m '@ember-data/serializer': file:packages/serializer_se6ahmk4jzdpfav7ntt26kzw4q - '@ember-data/store': file:packages/store_xqskmitp2kk2xfyxvp7fbxiypy + '@ember-data/store': file:packages/store_7fgkrf2jqtsl77xodn3fwsav7e '@ember-data/tracking': file:packages/tracking '@ember-data/unpublished-test-infra': file:packages/unpublished-test-infra '@ember/optional-features': 2.0.0 @@ -901,9 +901,9 @@ importers: dependenciesMeta: '@ember-data/debug': injected: true - '@ember-data/model': + '@ember-data/json-api': injected: true - '@ember-data/record-data': + '@ember-data/model': injected: true '@ember-data/serializer': injected: true @@ -1268,9 +1268,9 @@ importers: '@babel/core': ^7.19.3 '@babel/runtime': ^7.19.3 '@ember-data/canary-features': workspace:4.10.0-alpha.4 + '@ember-data/json-api': workspace:4.10.0-alpha.4 '@ember-data/model': workspace:4.10.0-alpha.4 '@ember-data/private-build-infra': workspace:4.10.0-alpha.4 - '@ember-data/record-data': workspace:4.10.0-alpha.4 '@ember-data/store': workspace:4.10.0-alpha.4 '@ember-data/tracking': workspace:4.10.0-alpha.4 '@ember-data/unpublished-test-infra': workspace:4.10.0-alpha.4 @@ -1311,10 +1311,10 @@ importers: '@babel/core': 7.19.6 '@babel/runtime': 7.20.0 '@ember-data/canary-features': file:packages/canary-features - '@ember-data/model': file:packages/model_krj6rcvw3p6z5dpf5jv3xpisai + '@ember-data/json-api': file:packages/json-api_2q6jgbjyzqvo2aignqdupq2k3q + '@ember-data/model': file:packages/model_gwkc2ypkqp4n2vhoy3lfmzya3m '@ember-data/private-build-infra': file:packages/private-build-infra - '@ember-data/record-data': file:packages/record-data_2q6jgbjyzqvo2aignqdupq2k3q - '@ember-data/store': file:packages/store_xqskmitp2kk2xfyxvp7fbxiypy + '@ember-data/store': file:packages/store_7fgkrf2jqtsl77xodn3fwsav7e '@ember-data/tracking': file:packages/tracking '@ember-data/unpublished-test-infra': file:packages/unpublished-test-infra '@ember/edition-utils': 1.2.0 @@ -1353,11 +1353,96 @@ importers: dependenciesMeta: '@ember-data/canary-features': injected: true + '@ember-data/json-api': + injected: true '@ember-data/model': injected: true '@ember-data/private-build-infra': injected: true - '@ember-data/record-data': + '@ember-data/store': + injected: true + '@ember-data/tracking': + injected: true + '@ember-data/unpublished-test-infra': + injected: true + + tests/json-api-encapsulation: + specifiers: + '@babel/core': ^7.19.3 + '@babel/runtime': ^7.19.3 + '@ember-data/adapter': workspace:4.10.0-alpha.4 + '@ember-data/debug': workspace:4.10.0-alpha.4 + '@ember-data/model': workspace:4.10.0-alpha.4 + '@ember-data/serializer': workspace:4.10.0-alpha.4 + '@ember-data/store': workspace:4.10.0-alpha.4 + '@ember-data/tracking': workspace:4.10.0-alpha.4 + '@ember-data/unpublished-test-infra': workspace:4.10.0-alpha.4 + '@ember/optional-features': ^2.0.0 + '@ember/string': ^3.0.0 + '@ember/test-helpers': ~2.8.1 + '@glimmer/component': ^1.1.2 + '@glimmer/tracking': ^1.1.2 + broccoli-asset-rev: ^3.0.0 + ember-auto-import: ^2.4.3 + ember-cli: ~4.8.0 + ember-cli-app-version: ^5.0.0 + ember-cli-babel: ^7.26.11 + ember-cli-dependency-checker: ^3.3.1 + ember-cli-htmlbars: ^6.1.1 + ember-cli-inject-live-reload: ^2.1.0 + ember-export-application-global: ^2.0.1 + ember-inflector: ^4.0.2 + ember-load-initializers: ^2.1.2 + ember-maybe-import-regenerator: ^1.0.0 + ember-qunit: ^6.0.0 + ember-resolver: ^8.0.3 + ember-source: ~4.8.0 + loader.js: ^4.7.0 + qunit: ^2.19.2 + qunit-dom: ^2.0.0 + webpack: ^5.74.0 + devDependencies: + '@babel/core': 7.20.2 + '@babel/runtime': 7.20.1 + '@ember-data/adapter': file:packages/adapter_se6ahmk4jzdpfav7ntt26kzw4q + '@ember-data/debug': file:packages/debug_4xit5mb2spplspgsttavzduwxq + '@ember-data/model': file:packages/model_immjif2w762bfh73voiecnrnha + '@ember-data/serializer': file:packages/serializer_se6ahmk4jzdpfav7ntt26kzw4q + '@ember-data/store': file:packages/store_xwjyjlgp7hihwiqvildr5ngxky + '@ember-data/tracking': file:packages/tracking + '@ember-data/unpublished-test-infra': file:packages/unpublished-test-infra + '@ember/optional-features': 2.0.0 + '@ember/string': 3.0.0 + '@ember/test-helpers': 2.8.1_o6vra3atesdmwivzf2sf5xbdmm + '@glimmer/component': 1.1.2_@babel+core@7.20.2 + '@glimmer/tracking': 1.1.2 + broccoli-asset-rev: 3.0.0 + ember-auto-import: 2.5.0_webpack@5.75.0 + ember-cli: 4.8.0 + ember-cli-app-version: 5.0.0 + ember-cli-babel: 7.26.11 + ember-cli-dependency-checker: 3.3.1_ember-cli@4.8.0 + ember-cli-htmlbars: 6.1.1 + ember-cli-inject-live-reload: 2.1.0 + ember-export-application-global: 2.0.1 + ember-inflector: 4.0.2 + ember-load-initializers: 2.1.2_@babel+core@7.20.2 + ember-maybe-import-regenerator: 1.0.0 + ember-qunit: 6.0.0_qhusffjocg4cnbdwj4yxijwhva + ember-resolver: 8.0.3_@babel+core@7.20.2 + ember-source: 4.8.2_rzt62hinieo7pkbxqnerr4utxi + loader.js: 4.7.0 + qunit: 2.19.3 + qunit-dom: 2.0.0 + webpack: 5.75.0 + dependenciesMeta: + '@ember-data/adapter': + injected: true + '@ember-data/debug': + injected: true + '@ember-data/model': + injected: true + '@ember-data/serializer': injected: true '@ember-data/store': injected: true @@ -1373,9 +1458,9 @@ importers: '@babel/runtime': ^7.19.4 '@ember-data/adapter': workspace:4.10.0-alpha.4 '@ember-data/debug': workspace:4.10.0-alpha.4 + '@ember-data/json-api': workspace:4.10.0-alpha.4 '@ember-data/model': workspace:4.10.0-alpha.4 '@ember-data/private-build-infra': workspace:4.10.0-alpha.4 - '@ember-data/record-data': workspace:4.10.0-alpha.4 '@ember-data/serializer': workspace:4.10.0-alpha.4 '@ember-data/store': workspace:4.10.0-alpha.4 '@ember-data/tracking': workspace:4.10.0-alpha.4 @@ -1438,11 +1523,11 @@ importers: '@babel/runtime': 7.20.0 '@ember-data/adapter': file:packages/adapter_se6ahmk4jzdpfav7ntt26kzw4q '@ember-data/debug': file:packages/debug_kmsc2736dkhfkaunrjhq23icem - '@ember-data/model': file:packages/model_krj6rcvw3p6z5dpf5jv3xpisai + '@ember-data/json-api': file:packages/json-api_2q6jgbjyzqvo2aignqdupq2k3q + '@ember-data/model': file:packages/model_gwkc2ypkqp4n2vhoy3lfmzya3m '@ember-data/private-build-infra': file:packages/private-build-infra - '@ember-data/record-data': file:packages/record-data_2q6jgbjyzqvo2aignqdupq2k3q '@ember-data/serializer': file:packages/serializer_se6ahmk4jzdpfav7ntt26kzw4q - '@ember-data/store': file:packages/store_xqskmitp2kk2xfyxvp7fbxiypy + '@ember-data/store': file:packages/store_7fgkrf2jqtsl77xodn3fwsav7e '@ember-data/tracking': file:packages/tracking '@ember-data/unpublished-test-infra': file:packages/unpublished-test-infra '@ember/edition-utils': 1.2.0 @@ -1502,12 +1587,12 @@ importers: injected: true '@ember-data/debug': injected: true + '@ember-data/json-api': + injected: true '@ember-data/model': injected: true '@ember-data/private-build-infra': injected: true - '@ember-data/record-data': - injected: true '@ember-data/serializer': injected: true '@ember-data/store': @@ -1656,91 +1741,6 @@ importers: ember-data: injected: true - tests/record-data-encapsulation: - specifiers: - '@babel/core': ^7.19.3 - '@babel/runtime': ^7.19.3 - '@ember-data/adapter': workspace:4.10.0-alpha.4 - '@ember-data/debug': workspace:4.10.0-alpha.4 - '@ember-data/model': workspace:4.10.0-alpha.4 - '@ember-data/serializer': workspace:4.10.0-alpha.4 - '@ember-data/store': workspace:4.10.0-alpha.4 - '@ember-data/tracking': workspace:4.10.0-alpha.4 - '@ember-data/unpublished-test-infra': workspace:4.10.0-alpha.4 - '@ember/optional-features': ^2.0.0 - '@ember/string': ^3.0.0 - '@ember/test-helpers': ~2.8.1 - '@glimmer/component': ^1.1.2 - '@glimmer/tracking': ^1.1.2 - broccoli-asset-rev: ^3.0.0 - ember-auto-import: ^2.4.3 - ember-cli: ~4.8.0 - ember-cli-app-version: ^5.0.0 - ember-cli-babel: ^7.26.11 - ember-cli-dependency-checker: ^3.3.1 - ember-cli-htmlbars: ^6.1.1 - ember-cli-inject-live-reload: ^2.1.0 - ember-export-application-global: ^2.0.1 - ember-inflector: ^4.0.2 - ember-load-initializers: ^2.1.2 - ember-maybe-import-regenerator: ^1.0.0 - ember-qunit: ^6.0.0 - ember-resolver: ^8.0.3 - ember-source: ~4.8.0 - loader.js: ^4.7.0 - qunit: ^2.19.2 - qunit-dom: ^2.0.0 - webpack: ^5.74.0 - devDependencies: - '@babel/core': 7.19.6 - '@babel/runtime': 7.20.0 - '@ember-data/adapter': file:packages/adapter_se6ahmk4jzdpfav7ntt26kzw4q - '@ember-data/debug': file:packages/debug_kmsc2736dkhfkaunrjhq23icem - '@ember-data/model': file:packages/model_xmngfixambkvkuufovlcxciu2m - '@ember-data/serializer': file:packages/serializer_se6ahmk4jzdpfav7ntt26kzw4q - '@ember-data/store': file:packages/store_wycyuvyoee33ls5puf5kocpemy - '@ember-data/tracking': file:packages/tracking - '@ember-data/unpublished-test-infra': file:packages/unpublished-test-infra - '@ember/optional-features': 2.0.0 - '@ember/string': 3.0.0 - '@ember/test-helpers': 2.8.1_44zau4gslyki3rcm3qc4yjjvrq - '@glimmer/component': 1.1.2_@babel+core@7.19.6 - '@glimmer/tracking': 1.1.2 - broccoli-asset-rev: 3.0.0 - ember-auto-import: 2.4.3_webpack@5.74.0 - ember-cli: 4.8.0 - ember-cli-app-version: 5.0.0 - ember-cli-babel: 7.26.11 - ember-cli-dependency-checker: 3.3.1_ember-cli@4.8.0 - ember-cli-htmlbars: 6.1.1 - ember-cli-inject-live-reload: 2.1.0 - ember-export-application-global: 2.0.1 - ember-inflector: 4.0.2 - ember-load-initializers: 2.1.2_@babel+core@7.19.6 - ember-maybe-import-regenerator: 1.0.0 - ember-qunit: 6.0.0_qlun7vkcguccocg2zpe7gp5kwa - ember-resolver: 8.0.3_@babel+core@7.19.6 - ember-source: 4.8.0_qgwbsqca2eub3f4vd3hrm6flxy - loader.js: 4.7.0 - qunit: 2.19.3 - qunit-dom: 2.0.0 - webpack: 5.74.0 - dependenciesMeta: - '@ember-data/adapter': - injected: true - '@ember-data/debug': - injected: true - '@ember-data/model': - injected: true - '@ember-data/serializer': - injected: true - '@ember-data/store': - injected: true - '@ember-data/tracking': - injected: true - '@ember-data/unpublished-test-infra': - injected: true - tests/request: specifiers: '@babel/core': ^7.19.3 @@ -1837,8 +1837,8 @@ importers: '@babel/core': ^7.19.3 '@babel/runtime': ^7.19.3 '@ember-data/adapter': workspace:4.10.0-alpha.4 + '@ember-data/json-api': workspace:4.10.0-alpha.4 '@ember-data/model': workspace:4.10.0-alpha.4 - '@ember-data/record-data': workspace:4.10.0-alpha.4 '@ember-data/store': workspace:4.10.0-alpha.4 '@ember-data/tracking': workspace:4.10.0-alpha.4 '@ember-data/unpublished-test-infra': workspace:4.10.0-alpha.4 @@ -1870,9 +1870,9 @@ importers: '@babel/core': 7.19.6 '@babel/runtime': 7.20.0 '@ember-data/adapter': file:packages/adapter_se6ahmk4jzdpfav7ntt26kzw4q - '@ember-data/model': file:packages/model_krj6rcvw3p6z5dpf5jv3xpisai - '@ember-data/record-data': file:packages/record-data_2q6jgbjyzqvo2aignqdupq2k3q - '@ember-data/store': file:packages/store_xqskmitp2kk2xfyxvp7fbxiypy + '@ember-data/json-api': file:packages/json-api_2q6jgbjyzqvo2aignqdupq2k3q + '@ember-data/model': file:packages/model_gwkc2ypkqp4n2vhoy3lfmzya3m + '@ember-data/store': file:packages/store_7fgkrf2jqtsl77xodn3fwsav7e '@ember-data/tracking': file:packages/tracking '@ember-data/unpublished-test-infra': file:packages/unpublished-test-infra '@ember/optional-features': 2.0.0 @@ -1902,9 +1902,9 @@ importers: dependenciesMeta: '@ember-data/adapter': injected: true - '@ember-data/model': + '@ember-data/json-api': injected: true - '@ember-data/record-data': + '@ember-data/model': injected: true '@ember-data/store': injected: true @@ -4692,7 +4692,7 @@ packages: /@types/ember__controller/4.0.4: resolution: {integrity: sha512-+f0knTIJJkRX5xijeSI/n4FvLfhMFFxIxODyFFFFB483EryYuts3QzpTwU5D66WQ5rAbZvpPRXRMPTTCNJoUhg==} dependencies: - '@types/ember__object': 4.0.5_@babel+core@7.19.6 + '@types/ember__object': 4.0.5_@babel+core@7.20.2 dev: true /@types/ember__controller/4.0.4_@babel+core@7.19.6: @@ -8461,7 +8461,7 @@ packages: dev: true /ee-first/1.1.1: - resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} + resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=} /electron-to-chromium/1.4.284: resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==} @@ -12554,7 +12554,7 @@ packages: graceful-fs: 4.2.10 /leek/0.0.24: - resolution: {integrity: sha512-6PVFIYXxlYF0o6hrAsHtGpTmi06otkwNrMcmQ0K96SeSRHPREPa9J3nJZ1frliVH7XT0XFswoJFQoXsDukzGNQ==} + resolution: {integrity: sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo=} dependencies: debug: 2.6.9 lodash.assign: 3.2.0 @@ -16063,7 +16063,7 @@ packages: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} /utils-merge/1.0.1: - resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==} + resolution: {integrity: sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=} engines: {node: '>= 0.4.0'} /uuid/8.3.2: @@ -16625,11 +16625,11 @@ packages: dependencies: '@ember-data/adapter': file:packages/adapter_se6ahmk4jzdpfav7ntt26kzw4q '@ember-data/debug': file:packages/debug_kmsc2736dkhfkaunrjhq23icem - '@ember-data/model': file:packages/model_krj6rcvw3p6z5dpf5jv3xpisai + '@ember-data/json-api': file:packages/json-api_2q6jgbjyzqvo2aignqdupq2k3q + '@ember-data/model': file:packages/model_gwkc2ypkqp4n2vhoy3lfmzya3m '@ember-data/private-build-infra': file:packages/private-build-infra - '@ember-data/record-data': file:packages/record-data_2q6jgbjyzqvo2aignqdupq2k3q '@ember-data/serializer': file:packages/serializer_se6ahmk4jzdpfav7ntt26kzw4q - '@ember-data/store': file:packages/store_xqskmitp2kk2xfyxvp7fbxiypy + '@ember-data/store': file:packages/store_7fgkrf2jqtsl77xodn3fwsav7e '@ember-data/tracking': file:packages/tracking '@ember/edition-utils': 1.2.0 '@ember/string': 3.0.0 @@ -16655,11 +16655,11 @@ packages: dependencies: '@ember-data/adapter': file:packages/adapter_se6ahmk4jzdpfav7ntt26kzw4q '@ember-data/debug': file:packages/debug_4xit5mb2spplspgsttavzduwxq - '@ember-data/model': file:packages/model_loeof22gxlmfbm3eagkjqz2buq + '@ember-data/json-api': file:packages/json-api_2q6jgbjyzqvo2aignqdupq2k3q + '@ember-data/model': file:packages/model_gbl6nnjbfalf4iypqwa6hinjgu '@ember-data/private-build-infra': file:packages/private-build-infra - '@ember-data/record-data': file:packages/record-data_2q6jgbjyzqvo2aignqdupq2k3q '@ember-data/serializer': file:packages/serializer_se6ahmk4jzdpfav7ntt26kzw4q - '@ember-data/store': file:packages/store_ay2ghmofe4mzaykjgvdh6vhjpu + '@ember-data/store': file:packages/store_34aa23keliycchb7yprqdbst4u '@ember-data/tracking': file:packages/tracking '@ember/edition-utils': 1.2.0 '@ember/string': 3.0.0 @@ -16709,7 +16709,7 @@ packages: ember-inflector: ^4.0.2 dependencies: '@ember-data/private-build-infra': file:packages/private-build-infra - '@ember-data/store': file:packages/store_ay2ghmofe4mzaykjgvdh6vhjpu + '@ember-data/store': file:packages/store_34aa23keliycchb7yprqdbst4u '@ember/string': 3.0.0 '@embroider/macros': 1.10.0 ember-cli-babel: 7.26.11 @@ -16747,7 +16747,6 @@ packages: transitivePeerDependencies: - supports-color - webpack - dev: false file:packages/debug_kmsc2736dkhfkaunrjhq23icem: resolution: {directory: packages/debug, type: directory} @@ -16768,19 +16767,36 @@ packages: - supports-color - webpack + file:packages/json-api_2q6jgbjyzqvo2aignqdupq2k3q: + resolution: {directory: packages/json-api, type: directory} + id: file:packages/json-api + name: '@ember-data/json-api' + version: 4.10.0-alpha.4 + engines: {node: ^14.8.0 || 16.* || >= 18.*} + peerDependencies: + '@ember-data/store': workspace:4.10.0-alpha.4 + dependencies: + '@ember-data/private-build-infra': file:packages/private-build-infra + '@ember-data/store': file:packages/store_34aa23keliycchb7yprqdbst4u + '@ember/edition-utils': 1.2.0 + '@embroider/macros': 1.10.0 + ember-cli-babel: 7.26.11 + transitivePeerDependencies: + - supports-color + file:packages/model: resolution: {directory: packages/model, type: directory} name: '@ember-data/model' version: 4.10.0-alpha.4 engines: {node: ^14.8.0 || 16.* || >= 18.*} peerDependencies: - '@ember-data/record-data': workspace:4.10.0-alpha.4 + '@ember-data/json-api': workspace:4.10.0-alpha.4 '@ember-data/store': workspace:4.10.0-alpha.4 '@ember-data/tracking': workspace:4.10.0-alpha.4 '@ember/string': ^3.0.0 ember-inflector: ^4.0.2 peerDependenciesMeta: - '@ember-data/record-data': + '@ember-data/json-api': optional: true dependencies: '@ember-data/canary-features': file:packages/canary-features @@ -16800,26 +16816,61 @@ packages: - supports-color dev: true - file:packages/model_krj6rcvw3p6z5dpf5jv3xpisai: + file:packages/model_gbl6nnjbfalf4iypqwa6hinjgu: + resolution: {directory: packages/model, type: directory} + id: file:packages/model + name: '@ember-data/model' + version: 4.10.0-alpha.4 + engines: {node: ^14.8.0 || 16.* || >= 18.*} + peerDependencies: + '@ember-data/json-api': workspace:4.10.0-alpha.4 + '@ember-data/store': workspace:4.10.0-alpha.4 + '@ember-data/tracking': workspace:4.10.0-alpha.4 + '@ember/string': ^3.0.0 + ember-inflector: ^4.0.2 + peerDependenciesMeta: + '@ember-data/json-api': + optional: true + dependencies: + '@ember-data/canary-features': file:packages/canary-features + '@ember-data/json-api': file:packages/json-api_2q6jgbjyzqvo2aignqdupq2k3q + '@ember-data/private-build-infra': file:packages/private-build-infra + '@ember-data/store': file:packages/store_34aa23keliycchb7yprqdbst4u + '@ember-data/tracking': file:packages/tracking + '@ember/edition-utils': 1.2.0 + '@ember/string': 3.0.0 + '@embroider/macros': 1.10.0 + ember-cached-decorator-polyfill: 1.0.1_o6vra3atesdmwivzf2sf5xbdmm + ember-cli-babel: 7.26.11 + ember-cli-string-utils: 1.1.0 + ember-cli-test-info: 1.0.0 + ember-inflector: 4.0.2 + inflection: 2.0.0 + transitivePeerDependencies: + - '@babel/core' + - ember-source + - supports-color + + file:packages/model_gwkc2ypkqp4n2vhoy3lfmzya3m: resolution: {directory: packages/model, type: directory} id: file:packages/model name: '@ember-data/model' version: 4.10.0-alpha.4 engines: {node: ^14.8.0 || 16.* || >= 18.*} peerDependencies: - '@ember-data/record-data': workspace:4.10.0-alpha.4 + '@ember-data/json-api': workspace:4.10.0-alpha.4 '@ember-data/store': workspace:4.10.0-alpha.4 '@ember-data/tracking': workspace:4.10.0-alpha.4 '@ember/string': ^3.0.0 ember-inflector: ^4.0.2 peerDependenciesMeta: - '@ember-data/record-data': + '@ember-data/json-api': optional: true dependencies: '@ember-data/canary-features': file:packages/canary-features + '@ember-data/json-api': file:packages/json-api_2q6jgbjyzqvo2aignqdupq2k3q '@ember-data/private-build-infra': file:packages/private-build-infra - '@ember-data/record-data': file:packages/record-data_2q6jgbjyzqvo2aignqdupq2k3q - '@ember-data/store': file:packages/store_xqskmitp2kk2xfyxvp7fbxiypy + '@ember-data/store': file:packages/store_7fgkrf2jqtsl77xodn3fwsav7e '@ember-data/tracking': file:packages/tracking '@ember/edition-utils': 1.2.0 '@ember/string': 3.0.0 @@ -16835,26 +16886,25 @@ packages: - ember-source - supports-color - file:packages/model_loeof22gxlmfbm3eagkjqz2buq: + file:packages/model_immjif2w762bfh73voiecnrnha: resolution: {directory: packages/model, type: directory} id: file:packages/model name: '@ember-data/model' version: 4.10.0-alpha.4 engines: {node: ^14.8.0 || 16.* || >= 18.*} peerDependencies: - '@ember-data/record-data': workspace:4.10.0-alpha.4 + '@ember-data/json-api': workspace:4.10.0-alpha.4 '@ember-data/store': workspace:4.10.0-alpha.4 '@ember-data/tracking': workspace:4.10.0-alpha.4 '@ember/string': ^3.0.0 ember-inflector: ^4.0.2 peerDependenciesMeta: - '@ember-data/record-data': + '@ember-data/json-api': optional: true dependencies: '@ember-data/canary-features': file:packages/canary-features '@ember-data/private-build-infra': file:packages/private-build-infra - '@ember-data/record-data': file:packages/record-data_2q6jgbjyzqvo2aignqdupq2k3q - '@ember-data/store': file:packages/store_ay2ghmofe4mzaykjgvdh6vhjpu + '@ember-data/store': file:packages/store_xwjyjlgp7hihwiqvildr5ngxky '@ember-data/tracking': file:packages/tracking '@ember/edition-utils': 1.2.0 '@ember/string': 3.0.0 @@ -16869,6 +16919,7 @@ packages: - '@babel/core' - ember-source - supports-color + dev: true file:packages/model_xmngfixambkvkuufovlcxciu2m: resolution: {directory: packages/model, type: directory} @@ -16877,13 +16928,13 @@ packages: version: 4.10.0-alpha.4 engines: {node: ^14.8.0 || 16.* || >= 18.*} peerDependencies: - '@ember-data/record-data': workspace:4.10.0-alpha.4 + '@ember-data/json-api': workspace:4.10.0-alpha.4 '@ember-data/store': workspace:4.10.0-alpha.4 '@ember-data/tracking': workspace:4.10.0-alpha.4 '@ember/string': ^3.0.0 ember-inflector: ^4.0.2 peerDependenciesMeta: - '@ember-data/record-data': + '@ember-data/json-api': optional: true dependencies: '@ember-data/canary-features': file:packages/canary-features @@ -16942,23 +16993,6 @@ packages: transitivePeerDependencies: - supports-color - file:packages/record-data_2q6jgbjyzqvo2aignqdupq2k3q: - resolution: {directory: packages/record-data, type: directory} - id: file:packages/record-data - name: '@ember-data/record-data' - version: 4.10.0-alpha.4 - engines: {node: ^14.8.0 || 16.* || >= 18.*} - peerDependencies: - '@ember-data/store': workspace:4.10.0-alpha.4 - dependencies: - '@ember-data/private-build-infra': file:packages/private-build-infra - '@ember-data/store': file:packages/store_ay2ghmofe4mzaykjgvdh6vhjpu - '@ember/edition-utils': 1.2.0 - '@embroider/macros': 1.10.0 - ember-cli-babel: 7.26.11 - transitivePeerDependencies: - - supports-color - file:packages/request: resolution: {directory: packages/request, type: directory} name: '@ember-data/request' @@ -17002,7 +17036,7 @@ packages: ember-inflector: ^4.0.2 dependencies: '@ember-data/private-build-infra': file:packages/private-build-infra - '@ember-data/store': file:packages/store_ay2ghmofe4mzaykjgvdh6vhjpu + '@ember-data/store': file:packages/store_34aa23keliycchb7yprqdbst4u '@ember/string': 3.0.0 '@embroider/macros': 1.10.0 ember-cli-babel: 7.26.11 @@ -17018,15 +17052,15 @@ packages: version: 4.10.0-alpha.4 engines: {node: ^14.8.0 || 16.* || >= 18.*} peerDependencies: + '@ember-data/json-api': workspace:4.10.0-alpha.4 '@ember-data/model': workspace:4.10.0-alpha.4 - '@ember-data/record-data': workspace:4.10.0-alpha.4 '@ember-data/tracking': workspace:4.10.0-alpha.4 '@ember/string': ^3.0.0 '@glimmer/tracking': ^1.1.2 peerDependenciesMeta: - '@ember-data/model': + '@ember-data/json-api': optional: true - '@ember-data/record-data': + '@ember-data/model': optional: true dependencies: '@ember-data/private-build-infra': file:packages/private-build-infra @@ -17042,27 +17076,27 @@ packages: - supports-color dev: true - file:packages/store_ay2ghmofe4mzaykjgvdh6vhjpu: + file:packages/store_34aa23keliycchb7yprqdbst4u: resolution: {directory: packages/store, type: directory} id: file:packages/store name: '@ember-data/store' version: 4.10.0-alpha.4 engines: {node: ^14.8.0 || 16.* || >= 18.*} peerDependencies: + '@ember-data/json-api': workspace:4.10.0-alpha.4 '@ember-data/model': workspace:4.10.0-alpha.4 - '@ember-data/record-data': workspace:4.10.0-alpha.4 '@ember-data/tracking': workspace:4.10.0-alpha.4 '@ember/string': ^3.0.0 '@glimmer/tracking': ^1.1.2 peerDependenciesMeta: - '@ember-data/model': + '@ember-data/json-api': optional: true - '@ember-data/record-data': + '@ember-data/model': optional: true dependencies: - '@ember-data/model': file:packages/model_loeof22gxlmfbm3eagkjqz2buq + '@ember-data/json-api': file:packages/json-api_2q6jgbjyzqvo2aignqdupq2k3q + '@ember-data/model': file:packages/model_gbl6nnjbfalf4iypqwa6hinjgu '@ember-data/private-build-infra': file:packages/private-build-infra - '@ember-data/record-data': file:packages/record-data_2q6jgbjyzqvo2aignqdupq2k3q '@ember-data/tracking': file:packages/tracking '@ember/string': 3.0.0 '@embroider/macros': 1.10.0 @@ -17074,22 +17108,54 @@ packages: - ember-source - supports-color - file:packages/store_wycyuvyoee33ls5puf5kocpemy: + file:packages/store_7fgkrf2jqtsl77xodn3fwsav7e: resolution: {directory: packages/store, type: directory} id: file:packages/store name: '@ember-data/store' version: 4.10.0-alpha.4 engines: {node: ^14.8.0 || 16.* || >= 18.*} peerDependencies: + '@ember-data/json-api': workspace:4.10.0-alpha.4 '@ember-data/model': workspace:4.10.0-alpha.4 - '@ember-data/record-data': workspace:4.10.0-alpha.4 '@ember-data/tracking': workspace:4.10.0-alpha.4 '@ember/string': ^3.0.0 '@glimmer/tracking': ^1.1.2 peerDependenciesMeta: + '@ember-data/json-api': + optional: true '@ember-data/model': optional: true - '@ember-data/record-data': + dependencies: + '@ember-data/json-api': file:packages/json-api_2q6jgbjyzqvo2aignqdupq2k3q + '@ember-data/model': file:packages/model_gwkc2ypkqp4n2vhoy3lfmzya3m + '@ember-data/private-build-infra': file:packages/private-build-infra + '@ember-data/tracking': file:packages/tracking + '@ember/string': 3.0.0 + '@embroider/macros': 1.10.0 + '@glimmer/tracking': 1.1.2 + ember-cached-decorator-polyfill: 1.0.1_44zau4gslyki3rcm3qc4yjjvrq + ember-cli-babel: 7.26.11 + transitivePeerDependencies: + - '@babel/core' + - ember-source + - supports-color + + file:packages/store_wycyuvyoee33ls5puf5kocpemy: + resolution: {directory: packages/store, type: directory} + id: file:packages/store + name: '@ember-data/store' + version: 4.10.0-alpha.4 + engines: {node: ^14.8.0 || 16.* || >= 18.*} + peerDependencies: + '@ember-data/json-api': workspace:4.10.0-alpha.4 + '@ember-data/model': workspace:4.10.0-alpha.4 + '@ember-data/tracking': workspace:4.10.0-alpha.4 + '@ember/string': ^3.0.0 + '@glimmer/tracking': ^1.1.2 + peerDependenciesMeta: + '@ember-data/json-api': + optional: true + '@ember-data/model': optional: true dependencies: '@ember-data/model': file:packages/model_xmngfixambkvkuufovlcxciu2m @@ -17106,37 +17172,37 @@ packages: - supports-color dev: true - file:packages/store_xqskmitp2kk2xfyxvp7fbxiypy: + file:packages/store_xwjyjlgp7hihwiqvildr5ngxky: resolution: {directory: packages/store, type: directory} id: file:packages/store name: '@ember-data/store' version: 4.10.0-alpha.4 engines: {node: ^14.8.0 || 16.* || >= 18.*} peerDependencies: + '@ember-data/json-api': workspace:4.10.0-alpha.4 '@ember-data/model': workspace:4.10.0-alpha.4 - '@ember-data/record-data': workspace:4.10.0-alpha.4 '@ember-data/tracking': workspace:4.10.0-alpha.4 '@ember/string': ^3.0.0 '@glimmer/tracking': ^1.1.2 peerDependenciesMeta: - '@ember-data/model': + '@ember-data/json-api': optional: true - '@ember-data/record-data': + '@ember-data/model': optional: true dependencies: - '@ember-data/model': file:packages/model_krj6rcvw3p6z5dpf5jv3xpisai + '@ember-data/model': file:packages/model_immjif2w762bfh73voiecnrnha '@ember-data/private-build-infra': file:packages/private-build-infra - '@ember-data/record-data': file:packages/record-data_2q6jgbjyzqvo2aignqdupq2k3q '@ember-data/tracking': file:packages/tracking '@ember/string': 3.0.0 '@embroider/macros': 1.10.0 '@glimmer/tracking': 1.1.2 - ember-cached-decorator-polyfill: 1.0.1_44zau4gslyki3rcm3qc4yjjvrq + ember-cached-decorator-polyfill: 1.0.1_o6vra3atesdmwivzf2sf5xbdmm ember-cli-babel: 7.26.11 transitivePeerDependencies: - '@babel/core' - ember-source - supports-color + dev: true file:packages/tracking: resolution: {directory: packages/tracking, type: directory} diff --git a/root-tsconfig.json b/root-tsconfig.json index b38243a582a..009acad209d 100644 --- a/root-tsconfig.json +++ b/root-tsconfig.json @@ -50,8 +50,8 @@ "@ember-data/serializer/*": ["packages/serializer/src/*"], "ember-data/test-support": ["packages/-ember-data/addon-test-support"], "ember-data/test-support/*": ["packages/-ember-data/addon-test-support/*"], - "@ember-data/record-data": ["packages/record-data/src"], - "@ember-data/record-data/*": ["packages/record-data/src/*"], + "@ember-data/json-api": ["packages/json-api/src"], + "@ember-data/json-api/*": ["packages/json-api/src/*"], "@ember-data/canary-features": ["packages/canary-features/addon"], "@ember-data/canary-features/*": ["packages/canary-features/addon/*"], "@ember-data/private-build-infra": ["packages/private-build-infra/addon"], @@ -81,7 +81,7 @@ "packages/store/src/**/*", "packages/adapter/src/**/*", "packages/model/src/**/*", - "packages/record-data/src/**/*", + "packages/json-api/src/**/*", "packages/serializer/src/**/*", "packages/experimental-preview-types/src/**/*", "packages/fastboot-test-app/types/**/*", diff --git a/tests/adapter-encapsulation/app/services/store.js b/tests/adapter-encapsulation/app/services/store.js index 42e90377770..7f524ecfa7a 100644 --- a/tests/adapter-encapsulation/app/services/store.js +++ b/tests/adapter-encapsulation/app/services/store.js @@ -1,4 +1,4 @@ -import { RecordData } from '@ember-data/record-data/-private'; +import { RecordData } from '@ember-data/json-api/-private'; import Store from '@ember-data/store'; export default class DefaultStore extends Store { diff --git a/tests/adapter-encapsulation/package.json b/tests/adapter-encapsulation/package.json index eaf28eeba0a..73be021c66f 100644 --- a/tests/adapter-encapsulation/package.json +++ b/tests/adapter-encapsulation/package.json @@ -28,7 +28,7 @@ "@ember-data/model": { "injected": true }, - "@ember-data/record-data": { + "@ember-data/json-api": { "injected": true }, "@ember-data/serializer": { @@ -49,7 +49,7 @@ "@babel/runtime": "^7.19.3", "@ember-data/debug": "workspace:4.10.0-alpha.4", "@ember-data/model": "workspace:4.10.0-alpha.4", - "@ember-data/record-data": "workspace:4.10.0-alpha.4", + "@ember-data/json-api": "workspace:4.10.0-alpha.4", "@ember-data/serializer": "workspace:4.10.0-alpha.4", "@ember-data/store": "workspace:4.10.0-alpha.4", "@ember-data/tracking": "workspace:4.10.0-alpha.4", @@ -89,4 +89,4 @@ "extends": "../../package.json" }, "packageManager": "pnpm@7.15.0" -} \ No newline at end of file +} diff --git a/tests/docs/fixtures/expected.js b/tests/docs/fixtures/expected.js index dcb336900e9..b4105fd959a 100644 --- a/tests/docs/fixtures/expected.js +++ b/tests/docs/fixtures/expected.js @@ -7,8 +7,8 @@ module.exports = { '@ember-data/canary-features', '@ember-data/debug', '@ember-data/deprecations', + '@ember-data/json-api', '@ember-data/model', - '@ember-data/record-data', '@ember-data/request', '@ember-data/request/fetch', '@ember-data/serializer', @@ -46,7 +46,7 @@ module.exports = { '(private) @ember-data/model Model#_notifyProperties', '(private) @ember-data/model Model#create', '(private) @ember-data/model Model#currentState', - '(private) @ember-data/record-data RecordDataDefault#createCache', + '(private) @ember-data/json-api RecordDataDefault#createCache', '(private) @ember-data/serializer/json JSONSerializer#_canSerialize', '(private) @ember-data/serializer/json JSONSerializer#_getMappedKey', '(private) @ember-data/serializer/json JSONSerializer#_mustSerialize', diff --git a/tests/embroider-basic-compat/ember-cli-build.js b/tests/embroider-basic-compat/ember-cli-build.js index 9b3fd539c72..b8c2a8e1c01 100644 --- a/tests/embroider-basic-compat/ember-cli-build.js +++ b/tests/embroider-basic-compat/ember-cli-build.js @@ -32,5 +32,28 @@ module.exports = function (defaults) { package: 'qunit', }, ], + compatAdapters: new Map([ + ['@ember-data/store', null], + ['@ember-data/record-data', null], + ['@ember-data/serializer', null], + ['@ember-data/adapter', null], + ['@ember-data/model', null], + ['@ember-data/debug', null], + ['@ember-data/tracking', null], + ['@ember-data/request', null], + ['@ember-data/private-build-infra', null], + ['@ember-data/canary-features', null], + ['ember-data', null], + ]), + packageRules: [ + { + package: '@ember-data/store', + addonModules: { + '-private.js': { + dependsOnModules: ['@ember-data/json-api/-private'], + }, + }, + }, + ], }); }; diff --git a/tests/graph/package.json b/tests/graph/package.json index 54f70be0f10..5d49a3644fc 100644 --- a/tests/graph/package.json +++ b/tests/graph/package.json @@ -23,7 +23,7 @@ "@ember-data/model": { "injected": true }, - "@ember-data/record-data": { + "@ember-data/json-api": { "injected": true }, "@ember-data/canary-features": { @@ -48,7 +48,7 @@ "@ember-data/canary-features": "workspace:4.10.0-alpha.4", "@ember-data/model": "workspace:4.10.0-alpha.4", "@ember-data/private-build-infra": "workspace:4.10.0-alpha.4", - "@ember-data/record-data": "workspace:4.10.0-alpha.4", + "@ember-data/json-api": "workspace:4.10.0-alpha.4", "@ember-data/store": "workspace:4.10.0-alpha.4", "@ember-data/tracking": "workspace:4.10.0-alpha.4", "@ember-data/unpublished-test-infra": "workspace:4.10.0-alpha.4", @@ -96,4 +96,4 @@ "extends": "../../package.json" }, "packageManager": "pnpm@7.15.0" -} \ No newline at end of file +} diff --git a/tests/graph/tests/integration/graph/edge-removal/helpers.ts b/tests/graph/tests/integration/graph/edge-removal/helpers.ts index 2479b9962f1..2d054c1effc 100644 --- a/tests/graph/tests/integration/graph/edge-removal/helpers.ts +++ b/tests/graph/tests/integration/graph/edge-removal/helpers.ts @@ -1,7 +1,7 @@ import { settled } from '@ember/test-helpers'; +import { ImplicitRelationship } from '@ember-data/json-api/-private/graph'; import Model, { attr, belongsTo, hasMany } from '@ember-data/model'; -import { ImplicitRelationship } from '@ember-data/record-data/-private/graph'; import { recordIdentifierFor } from '@ember-data/store'; import type { StableRecordIdentifier } from '@ember-data/types/q/identifier'; diff --git a/tests/graph/tests/integration/graph/edge-removal/setup.ts b/tests/graph/tests/integration/graph/edge-removal/setup.ts index c68ca7a3b0d..7ec402539fd 100644 --- a/tests/graph/tests/integration/graph/edge-removal/setup.ts +++ b/tests/graph/tests/integration/graph/edge-removal/setup.ts @@ -1,9 +1,9 @@ import { setupTest } from 'ember-qunit'; -import { graphFor } from '@ember-data/record-data/-private'; -import type { ImplicitRelationship } from '@ember-data/record-data/-private/graph'; -import type BelongsToRelationship from '@ember-data/record-data/-private/relationships/state/belongs-to'; -import type ManyRelationship from '@ember-data/record-data/-private/relationships/state/has-many'; +import { graphFor } from '@ember-data/json-api/-private'; +import type { ImplicitRelationship } from '@ember-data/json-api/-private/graph'; +import type BelongsToRelationship from '@ember-data/json-api/-private/relationships/state/belongs-to'; +import type ManyRelationship from '@ember-data/json-api/-private/relationships/state/has-many'; import Store from '@ember-data/store'; import type { DSModel } from '@ember-data/types/q/ds-model'; import type { diff --git a/tests/graph/tests/integration/graph/edge-test.ts b/tests/graph/tests/integration/graph/edge-test.ts index 8a77caa113e..b41b42e0904 100644 --- a/tests/graph/tests/integration/graph/edge-test.ts +++ b/tests/graph/tests/integration/graph/edge-test.ts @@ -2,8 +2,8 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; +import { graphFor } from '@ember-data/json-api/-private'; import Model, { attr, belongsTo, hasMany } from '@ember-data/model'; -import { graphFor } from '@ember-data/record-data/-private'; import Store from '@ember-data/store'; import { recordDataFor } from '@ember-data/store/-private'; diff --git a/tests/graph/tests/integration/graph/graph-test.ts b/tests/graph/tests/integration/graph/graph-test.ts index 16b80cb0f65..4a95a28a08f 100644 --- a/tests/graph/tests/integration/graph/graph-test.ts +++ b/tests/graph/tests/integration/graph/graph-test.ts @@ -2,7 +2,7 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; -import { graphFor } from '@ember-data/record-data/-private'; +import { graphFor } from '@ember-data/json-api/-private'; import Store from '@ember-data/store'; module('Integration | Graph | Configuration', function (hooks) { diff --git a/tests/graph/tests/integration/graph/operations-test.ts b/tests/graph/tests/integration/graph/operations-test.ts index cb403e2f1cb..15df36bdab0 100644 --- a/tests/graph/tests/integration/graph/operations-test.ts +++ b/tests/graph/tests/integration/graph/operations-test.ts @@ -2,9 +2,9 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; +import { graphFor } from '@ember-data/json-api/-private'; +import type ManyRelationship from '@ember-data/json-api/-private/relationships/state/has-many'; import Model, { attr, hasMany } from '@ember-data/model'; -import { graphFor } from '@ember-data/record-data/-private'; -import type ManyRelationship from '@ember-data/record-data/-private/relationships/state/has-many'; import Store from '@ember-data/store'; module('Integration | Graph | Operations', function (hooks: NestedHooks) { diff --git a/tests/graph/tests/integration/graph/polymorphism/implicit-keys-test.ts b/tests/graph/tests/integration/graph/polymorphism/implicit-keys-test.ts index c817bb2941f..99bf6bb7061 100644 --- a/tests/graph/tests/integration/graph/polymorphism/implicit-keys-test.ts +++ b/tests/graph/tests/integration/graph/polymorphism/implicit-keys-test.ts @@ -2,8 +2,8 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; +import { graphFor } from '@ember-data/json-api/-private'; import Model, { attr, belongsTo } from '@ember-data/model'; -import { graphFor } from '@ember-data/record-data/-private'; import Store, { recordIdentifierFor } from '@ember-data/store'; module('Integration | Graph | Implicit Keys', function (hooks) { diff --git a/tests/record-data-encapsulation/.editorconfig b/tests/json-api-encapsulation/.editorconfig similarity index 100% rename from tests/record-data-encapsulation/.editorconfig rename to tests/json-api-encapsulation/.editorconfig diff --git a/tests/record-data-encapsulation/.ember-cli b/tests/json-api-encapsulation/.ember-cli similarity index 100% rename from tests/record-data-encapsulation/.ember-cli rename to tests/json-api-encapsulation/.ember-cli diff --git a/tests/record-data-encapsulation/.gitignore b/tests/json-api-encapsulation/.gitignore similarity index 100% rename from tests/record-data-encapsulation/.gitignore rename to tests/json-api-encapsulation/.gitignore diff --git a/tests/record-data-encapsulation/.template-lintrc.js b/tests/json-api-encapsulation/.template-lintrc.js similarity index 100% rename from tests/record-data-encapsulation/.template-lintrc.js rename to tests/json-api-encapsulation/.template-lintrc.js diff --git a/tests/record-data-encapsulation/.watchmanconfig b/tests/json-api-encapsulation/.watchmanconfig similarity index 100% rename from tests/record-data-encapsulation/.watchmanconfig rename to tests/json-api-encapsulation/.watchmanconfig diff --git a/tests/record-data-encapsulation/README.md b/tests/json-api-encapsulation/README.md similarity index 100% rename from tests/record-data-encapsulation/README.md rename to tests/json-api-encapsulation/README.md diff --git a/tests/record-data-encapsulation/app/app.js b/tests/json-api-encapsulation/app/app.js similarity index 100% rename from tests/record-data-encapsulation/app/app.js rename to tests/json-api-encapsulation/app/app.js diff --git a/tests/record-data-encapsulation/app/components/.gitkeep b/tests/json-api-encapsulation/app/components/.gitkeep similarity index 100% rename from tests/record-data-encapsulation/app/components/.gitkeep rename to tests/json-api-encapsulation/app/components/.gitkeep diff --git a/tests/record-data-encapsulation/app/controllers/.gitkeep b/tests/json-api-encapsulation/app/controllers/.gitkeep similarity index 100% rename from tests/record-data-encapsulation/app/controllers/.gitkeep rename to tests/json-api-encapsulation/app/controllers/.gitkeep diff --git a/tests/record-data-encapsulation/app/helpers/.gitkeep b/tests/json-api-encapsulation/app/helpers/.gitkeep similarity index 100% rename from tests/record-data-encapsulation/app/helpers/.gitkeep rename to tests/json-api-encapsulation/app/helpers/.gitkeep diff --git a/tests/record-data-encapsulation/app/index.html b/tests/json-api-encapsulation/app/index.html similarity index 83% rename from tests/record-data-encapsulation/app/index.html rename to tests/json-api-encapsulation/app/index.html index daa5f17c7b9..8cb78ffc0a8 100644 --- a/tests/record-data-encapsulation/app/index.html +++ b/tests/json-api-encapsulation/app/index.html @@ -10,7 +10,7 @@ {{content-for "head"}} - + {{content-for "head-footer"}} @@ -18,7 +18,7 @@ {{content-for "body"}} - + {{content-for "body-footer"}} diff --git a/tests/record-data-encapsulation/app/models/.gitkeep b/tests/json-api-encapsulation/app/models/.gitkeep similarity index 100% rename from tests/record-data-encapsulation/app/models/.gitkeep rename to tests/json-api-encapsulation/app/models/.gitkeep diff --git a/tests/record-data-encapsulation/app/resolver.js b/tests/json-api-encapsulation/app/resolver.js similarity index 100% rename from tests/record-data-encapsulation/app/resolver.js rename to tests/json-api-encapsulation/app/resolver.js diff --git a/tests/record-data-encapsulation/app/router.js b/tests/json-api-encapsulation/app/router.js similarity index 100% rename from tests/record-data-encapsulation/app/router.js rename to tests/json-api-encapsulation/app/router.js diff --git a/tests/record-data-encapsulation/app/routes/.gitkeep b/tests/json-api-encapsulation/app/routes/.gitkeep similarity index 100% rename from tests/record-data-encapsulation/app/routes/.gitkeep rename to tests/json-api-encapsulation/app/routes/.gitkeep diff --git a/tests/record-data-encapsulation/app/styles/app.css b/tests/json-api-encapsulation/app/styles/app.css similarity index 100% rename from tests/record-data-encapsulation/app/styles/app.css rename to tests/json-api-encapsulation/app/styles/app.css diff --git a/tests/record-data-encapsulation/app/templates/application.hbs b/tests/json-api-encapsulation/app/templates/application.hbs similarity index 100% rename from tests/record-data-encapsulation/app/templates/application.hbs rename to tests/json-api-encapsulation/app/templates/application.hbs diff --git a/tests/record-data-encapsulation/app/templates/components/.gitkeep b/tests/json-api-encapsulation/app/templates/components/.gitkeep similarity index 100% rename from tests/record-data-encapsulation/app/templates/components/.gitkeep rename to tests/json-api-encapsulation/app/templates/components/.gitkeep diff --git a/tests/record-data-encapsulation/config/environment.js b/tests/json-api-encapsulation/config/environment.js similarity index 95% rename from tests/record-data-encapsulation/config/environment.js rename to tests/json-api-encapsulation/config/environment.js index 12544ead8fc..4eb76455ed1 100644 --- a/tests/record-data-encapsulation/config/environment.js +++ b/tests/json-api-encapsulation/config/environment.js @@ -2,7 +2,7 @@ module.exports = function (environment) { let ENV = { - modulePrefix: 'record-data-encapsulation-test-app', + modulePrefix: 'json-api-encapsulation-test-app', environment, rootURL: '/', locationType: 'auto', diff --git a/tests/record-data-encapsulation/config/optional-features.json b/tests/json-api-encapsulation/config/optional-features.json similarity index 100% rename from tests/record-data-encapsulation/config/optional-features.json rename to tests/json-api-encapsulation/config/optional-features.json diff --git a/tests/record-data-encapsulation/config/targets.js b/tests/json-api-encapsulation/config/targets.js similarity index 100% rename from tests/record-data-encapsulation/config/targets.js rename to tests/json-api-encapsulation/config/targets.js diff --git a/tests/record-data-encapsulation/ember-cli-build.js b/tests/json-api-encapsulation/ember-cli-build.js similarity index 100% rename from tests/record-data-encapsulation/ember-cli-build.js rename to tests/json-api-encapsulation/ember-cli-build.js diff --git a/tests/record-data-encapsulation/package.json b/tests/json-api-encapsulation/package.json similarity index 96% rename from tests/record-data-encapsulation/package.json rename to tests/json-api-encapsulation/package.json index d62a3f0d257..f1fb86e443d 100644 --- a/tests/record-data-encapsulation/package.json +++ b/tests/json-api-encapsulation/package.json @@ -1,12 +1,12 @@ { - "name": "record-data-encapsulation-test-app", + "name": "json-api-encapsulation-test-app", "version": "4.10.0-alpha.4", "private": true, "description": "Small description for encapsulation-test-app goes here", "repository": { "type": "git", "url": "https://github.com/emberjs/data.git", - "directory": "tests/record-data-encapsulation" + "directory": "tests/json-api-encapsulation" }, "license": "MIT", "author": "", @@ -89,4 +89,4 @@ "extends": "../../package.json" }, "packageManager": "pnpm@7.15.0" -} \ No newline at end of file +} diff --git a/tests/record-data-encapsulation/public/robots.txt b/tests/json-api-encapsulation/public/robots.txt similarity index 100% rename from tests/record-data-encapsulation/public/robots.txt rename to tests/json-api-encapsulation/public/robots.txt diff --git a/tests/record-data-encapsulation/testem.js b/tests/json-api-encapsulation/testem.js similarity index 100% rename from tests/record-data-encapsulation/testem.js rename to tests/json-api-encapsulation/testem.js diff --git a/tests/record-data-encapsulation/tests/helpers/.gitkeep b/tests/json-api-encapsulation/tests/helpers/.gitkeep similarity index 100% rename from tests/record-data-encapsulation/tests/helpers/.gitkeep rename to tests/json-api-encapsulation/tests/helpers/.gitkeep diff --git a/tests/record-data-encapsulation/tests/index.html b/tests/json-api-encapsulation/tests/index.html similarity index 86% rename from tests/record-data-encapsulation/tests/index.html rename to tests/json-api-encapsulation/tests/index.html index 5082a5df9c1..8c6b27bc403 100644 --- a/tests/record-data-encapsulation/tests/index.html +++ b/tests/json-api-encapsulation/tests/index.html @@ -11,7 +11,7 @@ {{content-for "test-head"}} - + {{content-for "head-footer"}} @@ -31,7 +31,7 @@ - + {{content-for "body-footer"}} diff --git a/tests/record-data-encapsulation/tests/integration/.gitkeep b/tests/json-api-encapsulation/tests/integration/.gitkeep similarity index 100% rename from tests/record-data-encapsulation/tests/integration/.gitkeep rename to tests/json-api-encapsulation/tests/integration/.gitkeep diff --git a/tests/record-data-encapsulation/tests/integration/smoke-test.js b/tests/json-api-encapsulation/tests/integration/smoke-test.js similarity index 91% rename from tests/record-data-encapsulation/tests/integration/smoke-test.js rename to tests/json-api-encapsulation/tests/integration/smoke-test.js index 95ea471c2c0..a30eae15b9d 100644 --- a/tests/record-data-encapsulation/tests/integration/smoke-test.js +++ b/tests/json-api-encapsulation/tests/integration/smoke-test.js @@ -40,8 +40,8 @@ module('Record-data Encapsulation - Smoke Tests', function (hooks) { this.owner.register('service:store', Store); }); - test('No @ember-data/record-data modules are present', function (assert) { - assertPackageNotPresent('@ember-data/record-data', assert); + test('No @ember-data/json-api modules are present', function (assert) { + assertPackageNotPresent('@ember-data/json-api', assert); }); test('No ember-data modules are present', function (assert) { diff --git a/tests/record-data-encapsulation/tests/test-helper.js b/tests/json-api-encapsulation/tests/test-helper.js similarity index 100% rename from tests/record-data-encapsulation/tests/test-helper.js rename to tests/json-api-encapsulation/tests/test-helper.js diff --git a/tests/record-data-encapsulation/tests/unit/.gitkeep b/tests/json-api-encapsulation/tests/unit/.gitkeep similarity index 100% rename from tests/record-data-encapsulation/tests/unit/.gitkeep rename to tests/json-api-encapsulation/tests/unit/.gitkeep diff --git a/tests/record-data-encapsulation/vendor/.gitkeep b/tests/json-api-encapsulation/vendor/.gitkeep similarity index 100% rename from tests/record-data-encapsulation/vendor/.gitkeep rename to tests/json-api-encapsulation/vendor/.gitkeep diff --git a/tests/main/package.json b/tests/main/package.json index e4fda7b1241..d33b83864d4 100644 --- a/tests/main/package.json +++ b/tests/main/package.json @@ -32,7 +32,7 @@ "@ember-data/model": { "injected": true }, - "@ember-data/record-data": { + "@ember-data/json-api": { "injected": true }, "@ember-data/serializer": { @@ -59,7 +59,7 @@ "@ember-data/debug": "workspace:4.10.0-alpha.4", "@ember-data/model": "workspace:4.10.0-alpha.4", "@ember-data/private-build-infra": "workspace:4.10.0-alpha.4", - "@ember-data/record-data": "workspace:4.10.0-alpha.4", + "@ember-data/json-api": "workspace:4.10.0-alpha.4", "@ember-data/serializer": "workspace:4.10.0-alpha.4", "@ember-data/store": "workspace:4.10.0-alpha.4", "@ember-data/tracking": "workspace:4.10.0-alpha.4", @@ -127,4 +127,4 @@ "extends": "../../package.json" }, "packageManager": "pnpm@7.15.0" -} \ No newline at end of file +} diff --git a/tests/main/tests/helpers/accessors.ts b/tests/main/tests/helpers/accessors.ts index c29f4226b3e..4f35ed62010 100644 --- a/tests/main/tests/helpers/accessors.ts +++ b/tests/main/tests/helpers/accessors.ts @@ -1,7 +1,7 @@ -import { graphFor } from '@ember-data/record-data/-private'; -import type { ImplicitRelationship } from '@ember-data/record-data/-private/graph'; -import type BelongsToRelationship from '@ember-data/record-data/-private/relationships/state/belongs-to'; -import type ManyRelationship from '@ember-data/record-data/-private/relationships/state/has-many'; +import { graphFor } from '@ember-data/json-api/-private'; +import type { ImplicitRelationship } from '@ember-data/json-api/-private/graph'; +import type BelongsToRelationship from '@ember-data/json-api/-private/relationships/state/belongs-to'; +import type ManyRelationship from '@ember-data/json-api/-private/relationships/state/has-many'; import type Store from '@ember-data/store'; import { recordIdentifierFor } from '@ember-data/store'; import type { StableRecordIdentifier } from '@ember-data/types/q/identifier'; diff --git a/tests/main/tests/integration/record-data/record-data-errors-test.ts b/tests/main/tests/integration/record-data/record-data-errors-test.ts index f79ed29ceb0..efead20d173 100644 --- a/tests/main/tests/integration/record-data/record-data-errors-test.ts +++ b/tests/main/tests/integration/record-data/record-data-errors-test.ts @@ -6,9 +6,9 @@ import { Promise } from 'rsvp'; import { setupTest } from 'ember-qunit'; import { InvalidError } from '@ember-data/adapter/error'; +import { LocalRelationshipOperation } from '@ember-data/json-api/-private/graph/-operations'; import Model, { attr } from '@ember-data/model'; import { DEPRECATE_V1_RECORD_DATA } from '@ember-data/private-build-infra/deprecations'; -import { LocalRelationshipOperation } from '@ember-data/record-data/-private/graph/-operations'; import JSONAPISerializer from '@ember-data/serializer/json-api'; import Store, { recordIdentifierFor } from '@ember-data/store'; import { DSModel } from '@ember-data/types/q/ds-model'; diff --git a/tests/main/tests/integration/record-data/record-data-state-test.ts b/tests/main/tests/integration/record-data/record-data-state-test.ts index 1a2cda86e23..1e0e2ee34d2 100644 --- a/tests/main/tests/integration/record-data/record-data-state-test.ts +++ b/tests/main/tests/integration/record-data/record-data-state-test.ts @@ -6,9 +6,9 @@ import { Promise } from 'rsvp'; import { setupTest } from 'ember-qunit'; +import { LocalRelationshipOperation } from '@ember-data/json-api/-private/graph/-operations'; import Model, { attr } from '@ember-data/model'; import { DEPRECATE_V1_RECORD_DATA } from '@ember-data/private-build-infra/deprecations'; -import { LocalRelationshipOperation } from '@ember-data/record-data/-private/graph/-operations'; import JSONAPISerializer from '@ember-data/serializer/json-api'; import Store, { recordIdentifierFor } from '@ember-data/store'; import { CollectionResourceRelationship, SingleResourceRelationship } from '@ember-data/types/q/ember-data-json-api'; diff --git a/tests/main/tests/integration/record-data/record-data-test.ts b/tests/main/tests/integration/record-data/record-data-test.ts index 54a943eaa35..a1675fe8d3e 100644 --- a/tests/main/tests/integration/record-data/record-data-test.ts +++ b/tests/main/tests/integration/record-data/record-data-test.ts @@ -6,9 +6,9 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; import JSONAPIAdapter from '@ember-data/adapter/json-api'; +import type { LocalRelationshipOperation } from '@ember-data/json-api/-private/graph/-operations'; import Model, { attr, belongsTo, hasMany } from '@ember-data/model'; import { DEPRECATE_V1_RECORD_DATA } from '@ember-data/private-build-infra/deprecations'; -import type { LocalRelationshipOperation } from '@ember-data/record-data/-private/graph/-operations'; import JSONAPISerializer from '@ember-data/serializer/json-api'; import Store from '@ember-data/store'; import type { diff --git a/tests/main/tests/integration/relationships/inverse-relationships-test.js b/tests/main/tests/integration/relationships/inverse-relationships-test.js index 9fedf156d20..92dcee50764 100644 --- a/tests/main/tests/integration/relationships/inverse-relationships-test.js +++ b/tests/main/tests/integration/relationships/inverse-relationships-test.js @@ -2,8 +2,8 @@ import { module } from 'qunit'; import { setupTest } from 'ember-qunit'; +import { graphFor } from '@ember-data/json-api/-private'; import Model, { attr, belongsTo, hasMany } from '@ember-data/model'; -import { graphFor } from '@ember-data/record-data/-private'; import { recordIdentifierFor } from '@ember-data/store'; import { deprecatedTest } from '@ember-data/unpublished-test-infra/test-support/deprecated-test'; import testInDebug from '@ember-data/unpublished-test-infra/test-support/test-in-debug'; diff --git a/tests/serializer-encapsulation/app/services/store.js b/tests/serializer-encapsulation/app/services/store.js index 42e90377770..7f524ecfa7a 100644 --- a/tests/serializer-encapsulation/app/services/store.js +++ b/tests/serializer-encapsulation/app/services/store.js @@ -1,4 +1,4 @@ -import { RecordData } from '@ember-data/record-data/-private'; +import { RecordData } from '@ember-data/json-api/-private'; import Store from '@ember-data/store'; export default class DefaultStore extends Store { diff --git a/tests/serializer-encapsulation/package.json b/tests/serializer-encapsulation/package.json index 522a1f376b4..7a549a36477 100644 --- a/tests/serializer-encapsulation/package.json +++ b/tests/serializer-encapsulation/package.json @@ -28,7 +28,7 @@ "@ember-data/model": { "injected": true }, - "@ember-data/record-data": { + "@ember-data/json-api": { "injected": true }, "@ember-data/store": { @@ -46,7 +46,7 @@ "@babel/runtime": "^7.19.3", "@ember-data/adapter": "workspace:4.10.0-alpha.4", "@ember-data/model": "workspace:4.10.0-alpha.4", - "@ember-data/record-data": "workspace:4.10.0-alpha.4", + "@ember-data/json-api": "workspace:4.10.0-alpha.4", "@ember-data/store": "workspace:4.10.0-alpha.4", "@ember-data/tracking": "workspace:4.10.0-alpha.4", "@ember-data/unpublished-test-infra": "workspace:4.10.0-alpha.4", @@ -85,4 +85,4 @@ "extends": "../../package.json" }, "packageManager": "pnpm@7.15.0" -} \ No newline at end of file +} diff --git a/tsconfig.json b/tsconfig.json index ae420aa0da0..5a088018d01 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -58,21 +58,21 @@ "tests/graph/tests/integration/graph/edge-removal/helpers.ts", "tests/graph/tests/integration/graph/edge-removal/abstract-edge-removal-test.ts", "tests/graph/tests/integration/graph.ts", - "packages/record-data/src/-private/relationships/state/has-many.ts", - "packages/record-data/src/-private/relationships/state/belongs-to.ts", - "packages/record-data/src/-private/record-data.ts", - "packages/record-data/src/-private/normalize-link.ts", - "packages/record-data/src/-private/graph/operations/update-relationship.ts", - "packages/record-data/src/-private/graph/operations/replace-related-records.ts", - "packages/record-data/src/-private/graph/operations/replace-related-record.ts", - "packages/record-data/src/-private/graph/operations/remove-from-related-records.ts", - "packages/record-data/src/-private/graph/operations/add-to-related-records.ts", - "packages/record-data/src/-private/graph/index.ts", - "packages/record-data/src/-private/graph/-utils.ts", - "packages/record-data/src/-private/graph/-state.ts", - "packages/record-data/src/-private/graph/-operations.ts", - "packages/record-data/src/-private/graph/-edge-definition.ts", - "packages/record-data/src/-private/coerce-id.ts", + "packages/json-api/src/-private/relationships/state/has-many.ts", + "packages/json-api/src/-private/relationships/state/belongs-to.ts", + "packages/json-api/src/-private/record-data.ts", + "packages/json-api/src/-private/normalize-link.ts", + "packages/json-api/src/-private/graph/operations/update-relationship.ts", + "packages/json-api/src/-private/graph/operations/replace-related-records.ts", + "packages/json-api/src/-private/graph/operations/replace-related-record.ts", + "packages/json-api/src/-private/graph/operations/remove-from-related-records.ts", + "packages/json-api/src/-private/graph/operations/add-to-related-records.ts", + "packages/json-api/src/-private/graph/index.ts", + "packages/json-api/src/-private/graph/-utils.ts", + "packages/json-api/src/-private/graph/-state.ts", + "packages/json-api/src/-private/graph/-operations.ts", + "packages/json-api/src/-private/graph/-edge-definition.ts", + "packages/json-api/src/-private/coerce-id.ts", "packages/private-build-infra/addon/index.ts", "packages/private-build-infra/addon/deprecations.ts", "packages/private-build-infra/addon/current-deprecations.ts",