@ember-data/model 5.6.0-beta.0 → 5.6.0-beta.1

package/addon-main.cjs

@@ -1,5 +1,5 @@
 'use strict';
 
-const { addonShim } = require('@warp-drive/build-config/addon-shim.cjs');
+const { addonShim } = require('@warp-drive/core/addon-shim.cjs');
 
 module.exports = addonShim(__dirname);

package/dist/-private.js

@@ -1,3 +1 @@
-export { a as attr, b as belongsTo, h as hasMany } from "./has-many-BXU96bZ9.js";
-export { E as Errors, L as LEGACY_SUPPORT, M as Model, P as PromiseBelongsTo, a as PromiseManyArray, l as lookupLegacySupport } from "./model-Dkk-TZlL.js";
-export { RelatedCollection as ManyArray } from '@ember-data/store/-private';
+export * from '@warp-drive/legacy/model/-private';

package/dist/hooks.js

@@ -1,2 +1 @@
-export { i as instantiateRecord, m as modelFor, t as teardownRecord } from "./hooks-o1U_cEA3.js";
-export { b as buildSchema } from "./schema-provider-DyG6fJXt.js";
+export { buildSchema, instantiateRecord, modelFor, teardownRecord } from '@warp-drive/legacy/model';

package/dist/index.js

@@ -1,5 +1 @@
-export { a as attr, b as belongsTo, h as hasMany } from "./has-many-BXU96bZ9.js";
-export { M as default } from "./model-Dkk-TZlL.js";
-import '@ember-data/store/-private';
-export { i as instantiateRecord, m as modelFor, t as teardownRecord } from "./hooks-o1U_cEA3.js";
-export { M as ModelSchemaProvider } from "./schema-provider-DyG6fJXt.js";
+export { attr, belongsTo, buildSchema, default, hasMany, instantiateRecord, modelFor, teardownRecord } from '@warp-drive/legacy/model';

package/dist/migration-support.js

@@ -1,388 +1 @@
-import { recordIdentifierFor } from '@ember-data/store';
-import { getOrSetGlobal } from '@warp-drive/core-types/-private';
-import { Type } from '@warp-drive/core-types/symbols';
-import '@ember/object';
-import '@ember-data/store/-private';
-import '@ember/debug';
-import '@ember-data/request-utils/string';
-import { macroCondition, getGlobalConfig } from '@embroider/macros';
-import { u as unloadRecord, s as serialize, b as save, r as rollbackAttributes, c as reload, h as hasMany, E as Errors, d as destroyRecord, e as deleteRecord, R as RecordState, f as changedAttributes, g as belongsTo, i as createSnapshot } from "./model-Dkk-TZlL.js";
-import '@ember/application';
-import { b as buildSchema } from "./schema-provider-DyG6fJXt.js";
-
-/**
- * This module provides support for migrating away from @ember-data/model
- * to @warp-drive/schema-record.
- *
- * It includes:
- *
- * - A `withDefaults` function to assist in creating a schema in LegacyMode
- * - A `registerDerivations` function to register the derivations necessary to support LegacyMode
- * - A `DelegatingSchemaService` that can be used to provide a schema service that works with both
- *   @ember-data/model and @warp-drive/schema-record simultaneously for migration purposes.
- * - A `WithLegacy` type util that can be used to create a type that includes the legacy
- *   properties and methods of a record.
- *
- * Using LegacyMode features on a SchemaRecord *requires* the use of these derivations and schema
- * additions. LegacyMode is not intended to be a long-term solution, but rather a stepping stone
- * to assist in more rapidly adopting modern WarpDrive features.
- *
- * @module @ember-data/model/migration-support
- * @main @ember-data/model/migration-support
- */
-
-// 'isDestroying', 'isDestroyed'
-const LegacyFields = ['_createSnapshot', 'adapterError', 'belongsTo', 'changedAttributes', 'constructor', 'currentState', 'deleteRecord', 'destroyRecord', 'dirtyType', 'errors', 'hasDirtyAttributes', 'hasMany', 'isDeleted', 'isEmpty', 'isError', 'isLoaded', 'isLoading', 'isNew', 'isSaving', 'isValid', 'reload', 'rollbackAttributes', 'save', 'serialize', 'unloadRecord'];
-
-/**
- * A Type utility that enables quickly adding type information for the fields
- * defined by `import { withDefaults } from '@ember-data/model/migration-support'`.
- *
- * Example:
- *
- * ```ts
- * import { withDefaults, WithLegacy } from '@ember-data/model/migration-support';
- * import { Type } from '@warp-drive/core-types/symbols';
- * import type { HasMany } from '@ember-data/model';
- *
- * export const UserSchema = withDefaults({
- *   type: 'user',
- *   fields: [
- *     { name: 'firstName', kind: 'attribute' },
- *     { name: 'lastName', kind: 'attribute' },
- *     { name: 'age', kind: 'attribute' },
- *     { name: 'friends',
- *       kind: 'hasMany',
- *       type: 'user',
- *       options: { inverse: 'friends', async: false }
- *     },
- *     { name: 'bestFriend',
- *       kind: 'belongsTo',
- *       type: 'user',
- *       options: { inverse: null, async: false }
- *     },
- *   ],
- * });
- *
- * export type User = WithLegacy<{
- *   firstName: string;
- *   lastName: string;
- *   age: number;
- *   friends: HasMany<User>;
- *   bestFriend: User | null;
- *   [Type]: 'user';
- * }>
- * ```
- *
- * @typedoc
- */
-
-const LegacySupport = getOrSetGlobal('LegacySupport', new WeakMap());
-function legacySupport(record, options, prop) {
-  let state = LegacySupport.get(record);
-  if (!state) {
-    state = {};
-    LegacySupport.set(record, state);
-  }
-  switch (prop) {
-    case '_createSnapshot':
-      return createSnapshot;
-    case 'adapterError':
-      return record.currentState.adapterError;
-    case 'belongsTo':
-      return belongsTo;
-    case 'changedAttributes':
-      return changedAttributes;
-    case 'constructor':
-      return state._constructor = state._constructor || {
-        isModel: true,
-        name: `Record<${recordIdentifierFor(record).type}>`,
-        modelName: recordIdentifierFor(record).type
-      };
-    case 'currentState':
-      return state.recordState = state.recordState || new RecordState(record);
-    case 'deleteRecord':
-      return deleteRecord;
-    case 'destroyRecord':
-      return destroyRecord;
-    case 'dirtyType':
-      return record.currentState.dirtyType;
-    case 'errors':
-      // @ts-expect-error
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-      return state.errors = state.errors || Errors.create({
-        __record: record
-      });
-    case 'hasDirtyAttributes':
-      return record.currentState.isDirty;
-    case 'hasMany':
-      return hasMany;
-    case 'isDeleted':
-      return record.currentState.isDeleted;
-    case 'isEmpty':
-      return record.currentState.isEmpty;
-    case 'isError':
-      return record.currentState.isError;
-    case 'isLoaded':
-      return record.currentState.isLoaded;
-    case 'isLoading':
-      return record.currentState.isLoading;
-    case 'isNew':
-      return record.currentState.isNew;
-    case 'isSaving':
-      return record.currentState.isSaving;
-    case 'isValid':
-      return record.currentState.isValid;
-    case 'reload':
-      return reload;
-    case 'rollbackAttributes':
-      return rollbackAttributes;
-    case 'save':
-      return save;
-    case 'serialize':
-      return serialize;
-    case 'unloadRecord':
-      return unloadRecord;
-    default:
-      macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
-        {
-          throw new Error(`${prop} is not a supported legacy field`);
-        }
-      })() : {};
-  }
-}
-legacySupport[Type] = '@legacy';
-
-/**
- * A function which adds the necessary fields to a schema and marks it as
- * being in LegacyMode. This is used to support the legacy features of
- * @ember-data/model while migrating to WarpDrive.
- *
- * Example:
- *
- * ```ts
- * import { withDefaults, WithLegacy } from '@ember-data/model/migration-support';
- * import { Type } from '@warp-drive/core-types/symbols';
- * import type { HasMany } from '@ember-data/model';
- *
- * export const UserSchema = withDefaults({
- *   type: 'user',
- *   fields: [
- *     { name: 'firstName', kind: 'attribute' },
- *     { name: 'lastName', kind: 'attribute' },
- *     { name: 'age', kind: 'attribute' },
- *     { name: 'friends',
- *       kind: 'hasMany',
- *       type: 'user',
- *       options: { inverse: 'friends', async: false }
- *     },
- *     { name: 'bestFriend',
- *       kind: 'belongsTo',
- *       type: 'user',
- *       options: { inverse: null, async: false }
- *     },
- *   ],
- * });
- *
- * export type User = WithLegacy<{
- *   firstName: string;
- *   lastName: string;
- *   age: number;
- *   friends: HasMany<User>;
- *   bestFriend: User | null;
- *   [Type]: 'user';
- * }>
- * ```
- *
- * Using this function require registering the derivations
- * it requires with the schema service.
- *
- * ```ts
- * import { registerDerivations } from '@ember-data/model/migration-support';
- *
- * registerDerivations(schema);
- * ```
- *
- * @method withDefaults
- * @for @ember-data/model/migration-support
- * @static
- * @param {LegacyResourceSchema} schema The schema to add legacy support to.
- * @return {LegacyResourceSchema} The schema with legacy support added.
- * @public
- */
-function withDefaults(schema) {
-  schema.legacy = true;
-  schema.identity = {
-    kind: '@id',
-    name: 'id'
-  };
-  LegacyFields.forEach(field => {
-    schema.fields.push({
-      type: '@legacy',
-      name: field,
-      kind: 'derived'
-    });
-  });
-  schema.fields.push({
-    name: 'isReloading',
-    kind: '@local',
-    type: 'boolean',
-    options: {
-      defaultValue: false
-    }
-  });
-  schema.fields.push({
-    name: 'isDestroying',
-    kind: '@local',
-    type: 'boolean',
-    options: {
-      defaultValue: false
-    }
-  });
-  schema.fields.push({
-    name: 'isDestroyed',
-    kind: '@local',
-    type: 'boolean',
-    options: {
-      defaultValue: false
-    }
-  });
-  return schema;
-}
-
-/**
- * A function which registers the necessary derivations to support
- * the LegacyMode features of @ember-data/model while migrating to WarpDrive.
- *
- * This must be called in order to use the fields added by:
- *
- * ```ts
- * import { withDefaults } from '@ember-data/model/migration-support';
- * ```
- *
- * @method registerDerivations
- * @for @ember-data/model/migration-support
- * @static
- * @param {SchemaService} schema The schema service to register the derivations with.
- * @return {void}
- * @public
- */
-function registerDerivations(schema) {
-  schema.registerDerivation(legacySupport);
-}
-
-/**
- * A class which provides a schema service that delegates between
- * a primary schema service and one that supports legacy model
- * classes as its schema source.
- *
- * When the primary schema service has a schema for the given
- * resource, it will be used. Otherwise, the fallback schema
- * service will be used.
- *
- * This can be used when incrementally migrating from Models to
- * SchemaRecords by enabling unmigrated Models to continue to
- * provide their own schema information to the application.
- *
- * ```ts
- * import { DelegatingSchemaService } from '@ember-data/model/migration-support';
- * import { SchemaService } from '@warp-drive/schema-record';
- *
- * class AppStore extends Store {
- *   createSchemaService() {
- *     const schema = new SchemaService();
- *     return new DelegatingSchemaService(this, schema);
- *   }
- * }
- * ```
- *
- * All calls to register resources, derivations, transformations, hash functions
- * etc. will be delegated to the primary schema service.
- *
- * @class DelegatingSchemaService
- * @extends SchemaService
- * @public
- */
-
-class DelegatingSchemaService {
-  _preferred;
-  _secondary;
-  constructor(store, schema) {
-    this._preferred = schema;
-    this._secondary = buildSchema(store);
-  }
-  resourceTypes() {
-    return Array.from(new Set(this._preferred.resourceTypes().concat(this._secondary.resourceTypes())));
-  }
-  hasResource(resource) {
-    return this._preferred.hasResource(resource) || this._secondary.hasResource(resource);
-  }
-  hasTrait(type) {
-    if (this._preferred.hasResource({
-      type
-    })) {
-      return this._preferred.hasTrait(type);
-    }
-    return this._secondary.hasTrait(type);
-  }
-  resourceHasTrait(resource, trait) {
-    if (this._preferred.hasResource(resource)) {
-      return this._preferred.resourceHasTrait(resource, trait);
-    }
-    return this._secondary.resourceHasTrait(resource, trait);
-  }
-  fields(resource) {
-    if (this._preferred.hasResource(resource)) {
-      return this._preferred.fields(resource);
-    }
-    return this._secondary.fields(resource);
-  }
-  transformation(field) {
-    return this._preferred.transformation(field);
-  }
-  hashFn(field) {
-    return this._preferred.hashFn(field);
-  }
-  derivation(field) {
-    return this._preferred.derivation(field);
-  }
-  resource(resource) {
-    if (this._preferred.hasResource(resource)) {
-      return this._preferred.resource(resource);
-    }
-    return this._secondary.resource(resource);
-  }
-  registerResources(schemas) {
-    this._preferred.registerResources(schemas);
-  }
-  registerResource(schema) {
-    this._preferred.registerResource(schema);
-  }
-  registerTransformation(transform) {
-    this._preferred.registerTransformation(transform);
-  }
-  registerDerivation(derivation) {
-    this._preferred.registerDerivation(derivation);
-  }
-  registerHashFn(hashFn) {
-    this._preferred.registerHashFn(hashFn);
-  }
-}
-if (macroCondition(getGlobalConfig().WarpDrive.deprecations.ENABLE_LEGACY_SCHEMA_SERVICE)) {
-  DelegatingSchemaService.prototype.attributesDefinitionFor = function (resource) {
-    if (this._preferred.hasResource(resource)) {
-      return this._preferred.attributesDefinitionFor(resource);
-    }
-    return this._secondary.attributesDefinitionFor(resource);
-  };
-  DelegatingSchemaService.prototype.relationshipsDefinitionFor = function (resource) {
-    if (this._preferred.hasResource(resource)) {
-      return this._preferred.relationshipsDefinitionFor(resource);
-    }
-    return this._secondary.relationshipsDefinitionFor(resource);
-  };
-  DelegatingSchemaService.prototype.doesTypeExist = function (type) {
-    return this._preferred.doesTypeExist?.(type) || this._secondary.doesTypeExist?.(type) || false;
-  };
-}
-export { DelegatingSchemaService, registerDerivations, withDefaults };
+export * from '@warp-drive/legacy/model/migration-support';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-data/model",
-  "version": "5.6.0-beta.0",
+  "version": "5.6.0-beta.1",
   "description": "A basic Ember implementation of a resource presentation layer for use with @ember-data/store",
   "keywords": [
     "ember-addon"
@@ -41,54 +41,26 @@
       "types": "./unstable-preview-types/index.d.ts"
     }
   },
-  "peerDependencies": {
-    "ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
-    "@ember-data/graph": "5.6.0-beta.0",
-    "@ember-data/json-api": "5.6.0-beta.0",
-    "@ember-data/legacy-compat": "5.6.0-beta.0",
-    "@ember-data/store": "5.6.0-beta.0",
-    "@ember-data/request-utils": "5.6.0-beta.0",
-    "@warp-drive/core-types": "5.6.0-beta.0"
-  },
-  "peerDependenciesMeta": {
-    "@ember-data/json-api": {
-      "optional": true
-    },
-    "@ember-data/graph": {
-      "optional": true
-    }
-  },
+  "peerDependencies": {},
   "dependencies": {
     "@ember/edition-utils": "^1.2.0",
     "@embroider/macros": "^1.16.12",
     "ember-cli-string-utils": "^1.1.0",
     "ember-cli-test-info": "^1.0.0",
     "inflection": "~3.0.2",
-    "@warp-drive/build-config": "5.6.0-beta.0"
+    "@warp-drive/core": "5.6.0-beta.0",
+    "@warp-drive/legacy": "5.6.0-beta.0",
+    "@warp-drive/utilities": "5.6.0-beta.0"
   },
   "devDependencies": {
     "@babel/core": "^7.26.10",
     "@babel/plugin-transform-typescript": "^7.27.0",
     "@babel/preset-env": "^7.26.9",
     "@babel/preset-typescript": "^7.27.0",
-    "@ember-data/graph": "5.6.0-beta.0",
-    "@ember-data/json-api": "5.6.0-beta.0",
-    "@ember-data/legacy-compat": "5.6.0-beta.0",
-    "@ember-data/request": "5.6.0-beta.0",
-    "@ember-data/request-utils": "5.6.0-beta.0",
-    "@ember-data/store": "5.6.0-beta.0",
-    "@ember/test-waiters": "^4.1.0",
-    "@glimmer/component": "^2.0.0",
-    "@warp-drive/core-types": "5.6.0-beta.0",
-    "@warp-drive/internal-config": "5.6.0-beta.0",
-    "decorator-transforms": "^2.3.0",
-    "ember-source": "~6.3.0",
+    "@warp-drive/internal-config": "5.6.0-beta.1",
     "expect-type": "^1.2.1",
     "typescript": "^5.8.3",
-    "vite": "^5.4.15"
-  },
-  "engines": {
-    "node": ">= 18.20.8"
+    "vite": "^7.0.0"
   },
   "volta": {
     "extends": "../../package.json"

package/unstable-preview-types/-private.d.ts

@@ -1,13 +1,4 @@
 declare module '@ember-data/model/-private' {
-  export { attr } from '@ember-data/model/-private/attr';
-  export { belongsTo } from '@ember-data/model/-private/belongs-to';
-  export { hasMany } from '@ember-data/model/-private/has-many';
-  export { Model } from '@ember-data/model/-private/model';
-  export type { ModelStore } from '@ember-data/model/-private/model';
-  export { Errors } from '@ember-data/model/-private/errors';
-  export { RelatedCollection as ManyArray } from '@ember-data/store/-private';
-  export { PromiseBelongsTo } from '@ember-data/model/-private/promise-belongs-to';
-  export { PromiseManyArray } from '@ember-data/model/-private/promise-many-array';
-  export { lookupLegacySupport, LEGACY_SUPPORT } from '@ember-data/model/-private/legacy-relationships-support';
-}
-//# sourceMappingURL=-private.d.ts.map
+  export * from "@warp-drive/legacy/model/-private";
+  
+}

package/unstable-preview-types/hooks.d.ts

@@ -1,5 +1,4 @@
 declare module '@ember-data/model/hooks' {
-  export { instantiateRecord, teardownRecord, modelFor } from '@ember-data/model/-private/hooks';
-  export { buildSchema } from '@ember-data/model/-private/schema-provider';
-}
-//# sourceMappingURL=hooks.d.ts.map
+  export { instantiateRecord, teardownRecord, modelFor, buildSchema } from "@warp-drive/legacy/model";
+  
+}

package/unstable-preview-types/index.d.ts

@@ -1,77 +1,45 @@
-/// <reference path="./hooks.d.ts" />
-/// <reference path="./migration-support.d.ts" />
 /// <reference path="./-private.d.ts" />
-/// <reference path="./migration-support.type-test.d.ts" />
-/// <reference path="./-private/util.d.ts" />
-/// <reference path="./-private/legacy-relationships-support.d.ts" />
-/// <reference path="./-private/hooks.d.ts" />
-/// <reference path="./-private/model.type-test.d.ts" />
-/// <reference path="./-private/record-state.d.ts" />
-/// <reference path="./-private/has-many.type-test.d.ts" />
-/// <reference path="./-private/promise-many-array.d.ts" />
-/// <reference path="./-private/has-many.d.ts" />
-/// <reference path="./-private/belongs-to.type-test.d.ts" />
-/// <reference path="./-private/attr.d.ts" />
-/// <reference path="./-private/attr.type-test.d.ts" />
-/// <reference path="./-private/promise-belongs-to.d.ts" />
-/// <reference path="./-private/model.d.ts" />
-/// <reference path="./-private/model-methods.d.ts" />
-/// <reference path="./-private/belongs-to.d.ts" />
-/// <reference path="./-private/type-utils.d.ts" />
-/// <reference path="./-private/errors.d.ts" />
-/// <reference path="./-private/model-for-mixin.d.ts" />
-/// <reference path="./-private/notify-changes.d.ts" />
-/// <reference path="./-private/promise-proxy-base.d.ts" />
-/// <reference path="./-private/schema-provider.d.ts" />
-/// <reference path="./-private/references/has-many.d.ts" />
-/// <reference path="./-private/references/belongs-to.d.ts" />
-/// <reference path="./-private/debug/assert-polymorphic-type.d.ts" />
+/// <reference path="./migration-support.d.ts" />
+/// <reference path="./hooks.d.ts" />
 declare module '@ember-data/model' {
   /**
-   * This package provides a Presentation Model for resource data in an EmberData Cache.
-   *
-   * Models are defined as classes extending from `import Model from '@ember-data/model';` and the
-   * attributes and relationships on these classes are parsed at runtime to supply static "schema"
-   * to EmberData's SchemaService.
-   *
-   * Resource data for individual resources fetched from your API is presented to the UI via instances
-   * of the `Model`s you define. An instantiated `Model` is referred to as a `record`.
+  * This package provides a Presentation Model for resource data in an EmberData Cache.
+  *
+  * Models are defined as classes extending from `import Model from '@ember-data/model';` and the
+  * attributes and relationships on these classes are parsed at runtime to supply static "schema"
+  * to EmberData's SchemaService.
+  *
+  * Resource data for individual resources fetched from your API is presented to the UI via instances
+  * of the `Model`s you define. An instantiated `Model` is referred to as a `record`.
+  
+  When we refer to the `ModelClass` as opposed to a `Model` or `Record` we are referring
+  specifically to the class definition and the static schema methods present on it.
   
-    When we refer to the `ModelClass` as opposed to a `Model` or `Record` we are referring
-    specifically to the class definition and the static schema methods present on it.
+  When we refer to a `record` we refer to a specific class instance presenting
+  the resource data for a given `type` and `id`.
   
-    When we refer to a `record` we refer to a specific class instance presenting
-    the resource data for a given `type` and `id`.
+  ### Defining a Model
   
-    ### Defining a Model
+  ```js [app/models/person.js]
+  import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
   
-    ```app/models/person.js
-    import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
+  export default class PersonModel extends Model {
+  @attr name;
   
-    export default class PersonModel extends Model {
-      @attr name;
+  @belongsTo('pet', { inverse: 'owners', async: false }) dog;
   
-      @belongsTo('pet', { inverse: 'owners', async: false }) dog;
+  @hasMany('person', { inverse: 'friends', async: true }) friends;
+  }
+  ```
   
-      @hasMany('person', { inverse: 'friends', async: true }) friends;
-    }
-    ```
+  ### modelName convention
   
-    ### modelName convention
+  By convention, the name of a given model (its `type`) matches the name
+  of the file in the `app/models` folder and should be lowercase, singular
+  and dasherized.
   
-    By convention, the name of a given model (its `type`) matches the name
-    of the file in the `app/models` folder and should be lowercase, singular
-    and dasherized.
+  @module
+  */
+  export { default, attr, belongsTo, hasMany, instantiateRecord, teardownRecord, modelFor, buildSchema, type ManyArray, type HasMany, type AsyncHasMany, type AsyncBelongsTo } from "@warp-drive/legacy/model";
   
-    @module @ember-data/model
-    @main @ember-data/model
-   */
-  export { Model as default, attr, belongsTo, hasMany } from '@ember-data/model/-private';
-  export type { PromiseBelongsTo as AsyncBelongsTo } from '@ember-data/model/-private/promise-belongs-to';
-  export type { PromiseManyArray as AsyncHasMany } from '@ember-data/model/-private/promise-many-array';
-  export type { RelatedCollection as ManyArray } from '@ember-data/store/-private';
-  export type { RelatedCollection as HasMany } from '@ember-data/store/-private';
-  export { instantiateRecord, teardownRecord, modelFor } from '@ember-data/model/-private/hooks';
-  export { ModelSchemaProvider } from '@ember-data/model/-private/schema-provider';
-}
-//# sourceMappingURL=index.d.ts.map
+}