@warp-drive/legacy 5.7.0-alpha.0 → 5.7.0-alpha.10

package/dist/model/migration-support.js

@@ -1,9 +1,10 @@
+import { deprecate } from '@ember/debug';
 import { recordIdentifierFor } from '@warp-drive/core';
 import { notifyInternalSignal, ARRAY_SIGNAL } from '@warp-drive/core/store/-private';
 import { getOrSetGlobal } from '@warp-drive/core/types/-private';
 import { Type } from '@warp-drive/core/types/symbols';
 import { l as lookupLegacySupport, E as Errors } from "../errors-BX5wowuz.js";
-import { b as buildSchema, u as unloadRecord, s as serialize, a as save, r as rollbackAttributes, c as reload, h as hasMany, d as destroyRecord, e as deleteRecord, R as RecordState, f as changedAttributes, g as belongsTo, i as createSnapshot } from "../schema-provider-BdQhkT-Q.js";
+import { b as buildSchema, u as unloadRecord, s as serialize, _ as _save, a as save, r as rollbackAttributes, c as _reload, d as reload, h as hasMany, e as _destroyRecord, f as destroyRecord, g as deleteRecord, R as RecordState, i as changedAttributes, j as belongsTo, k as createSnapshot } from "../schema-provider-Cbnf6sKm.js";
 import { macroCondition, getGlobalConfig } from '@embroider/macros';
 
 /**
@@ -25,7 +26,6 @@ import { macroCondition, getGlobalConfig } from '@embroider/macros';
  *
  * @module
  */
-
 // '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'];
 
@@ -78,10 +78,13 @@ function legacySupport(record, options, prop) {
     state = {};
     LegacySupport.set(record, state);
   }
+  const suppressDeprecation = Boolean(options && options.suppressDeprecation);
   switch (prop) {
     case '_createSnapshot':
+      // FIXME should be deprecated too?
       return createSnapshot;
     case 'adapterError':
+      // FIXME should be deprecated too?
       return record.currentState.adapterError;
     case 'belongsTo':
       return belongsTo;
@@ -98,10 +101,11 @@ function legacySupport(record, options, prop) {
     case 'deleteRecord':
       return deleteRecord;
     case 'destroyRecord':
-      return destroyRecord;
+      return suppressDeprecation ? _destroyRecord : destroyRecord;
     case 'dirtyType':
       return record.currentState.dirtyType;
     case 'errors':
+      // FIXME should be deprecated too?
       // @ts-expect-error
       // eslint-disable-next-line @typescript-eslint/no-unsafe-call
       return state.errors = state.errors || Errors.create({
@@ -128,12 +132,13 @@ function legacySupport(record, options, prop) {
     case 'isValid':
       return record.currentState.isValid;
     case 'reload':
-      return reload;
+      return suppressDeprecation ? _reload : reload;
     case 'rollbackAttributes':
       return rollbackAttributes;
     case 'save':
-      return save;
+      return suppressDeprecation ? _save : save;
     case 'serialize':
+      // FIXME should be deprecated too? (is somewhat deprecated via store.serializeRecord)
       return serialize;
     case 'unloadRecord':
       return unloadRecord;
@@ -214,6 +219,50 @@ function withDefaults(schema) {
       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
+    }
+  });
+  schema.objectExtensions = schema.objectExtensions || [];
+  schema.objectExtensions.push('deprecated-model-behaviors');
+  return schema;
+}
+function withRestoredDeprecatedModelRequestBehaviors(schema) {
+  schema.legacy = true;
+  schema.identity = {
+    kind: '@id',
+    name: 'id'
+  };
+  LegacyFields.forEach(field => {
+    schema.fields.push({
+      type: '@legacy',
+      name: field,
+      kind: 'derived',
+      options: {
+        suppressDeprecation: true
+      }
+    });
+  });
   schema.fields.push({
     name: 'isReloading',
     kind: '@local',
@@ -261,27 +310,32 @@ function registerDerivations(schema) {
   schema._registerMode('@legacy', {
     belongsTo: {
       get(store, record, cacheKey, field) {
+        // FIXME field.name here should likely be field.sourceKey || field.name
         return lookupLegacySupport(record).getBelongsTo(field.name);
       },
       set(store, record, cacheKey, field, value) {
         store._join(() => {
+          // FIXME field.name here should likely be field.sourceKey || field.name
           lookupLegacySupport(record).setDirtyBelongsTo(field.name, value);
         });
       }
     },
     hasMany: {
       get(store, record, cacheKey, field) {
+        // FIXME field.name here should likely be field.sourceKey || field.name
         return lookupLegacySupport(record).getHasMany(field.name);
       },
       set(store, record, cacheKey, field, value) {
         store._join(() => {
           const support = lookupLegacySupport(record);
+          // FIXME field.name here should likely be field.sourceKey || field.name
           const manyArray = support.getManyArray(field.name);
           manyArray.splice(0, manyArray.length, ...value);
         });
       },
       notify(store, record, cacheKey, field) {
         const support = lookupLegacySupport(record);
+        // FIXME field.name here should likely be field.sourceKey || field.name
         const manyArray = support && support._manyArrayCache[field.name];
         const hasPromise = support && support._relationshipPromisesCache[field.name];
         if (manyArray && hasPromise) {
@@ -297,6 +351,34 @@ function registerDerivations(schema) {
       }
     }
   });
+  schema.CAUTION_MEGA_DANGER_ZONE_registerExtension({
+    name: 'deprecated-model-behaviors',
+    kind: 'object',
+    features: {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+      get isReloading() {
+        deprecate(`record.isReloading is deprecated, please use store.request and either <Request> or getRequuestState to keep track of the request state instead.`, false, {
+          id: 'warp-drive:deprecate-legacy-request-methods',
+          until: '6.0',
+          for: '@warp-drive/core',
+          url: 'https://docs.warp-drive.io/api/@warp-drive/core/build-config/deprecations/variables/ENABLE_LEGACY_REQUEST_METHODS',
+          since: {
+            enabled: '5.7',
+            available: '5.7'
+          }
+        });
+        // @ts-expect-error
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+        return this._isReloading;
+      },
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+      set isReloading(v) {
+        // @ts-expect-error
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        this._isReloading = v;
+      }
+    }
+  });
 }
 
 /**
@@ -403,8 +485,8 @@ class DelegatingSchemaService {
   CAUTION_MEGA_DANGER_ZONE_resourceExtensions(resource) {
     return this._preferred.CAUTION_MEGA_DANGER_ZONE_resourceExtensions(resource);
   }
-  CAUTION_MEGA_DANGER_ZONE_objectExtensions(field) {
-    return this._preferred.CAUTION_MEGA_DANGER_ZONE_objectExtensions(field);
+  CAUTION_MEGA_DANGER_ZONE_objectExtensions(field, resolvedType) {
+    return this._preferred.CAUTION_MEGA_DANGER_ZONE_objectExtensions(field, resolvedType);
   }
   CAUTION_MEGA_DANGER_ZONE_arrayExtensions(field) {
     return this._preferred.CAUTION_MEGA_DANGER_ZONE_arrayExtensions(field);
@@ -461,4 +543,4 @@ if (macroCondition(getGlobalConfig().WarpDrive.deprecations.ENABLE_LEGACY_SCHEMA
     return this._preferred.doesTypeExist?.(type) || this._secondary.doesTypeExist?.(type) || false;
   };
 }
-export { DelegatingSchemaService, registerDerivations, withDefaults };
+export { DelegatingSchemaService, registerDerivations, withDefaults, withRestoredDeprecatedModelRequestBehaviors };

package/dist/model.js

@@ -1,13 +1,14 @@
 import { computed } from '@ember/object';
 import { recordIdentifierFor } from '@warp-drive/core';
 import { peekCache, setRecordIdentifier, StoreMap, setCacheFor } from '@warp-drive/core/store/-private';
-import { j as isElementDescriptor, n as normalizeModelName, k as getModelFactory } from "./schema-provider-BdQhkT-Q.js";
-export { M as Model, b as buildSchema, M as default } from "./schema-provider-BdQhkT-Q.js";
+import { i as isElementDescriptor, n as normalizeModelName } from "./util-Dul6TZts.js";
 import { macroCondition, getGlobalConfig } from '@embroider/macros';
 import { warn, deprecate } from '@ember/debug';
 import { RecordStore } from '@warp-drive/core/types/symbols';
 import { l as lookupLegacySupport } from "./errors-BX5wowuz.js";
 import { singularize, dasherize } from '@warp-drive/utilities/string';
+import { l as getModelFactory } from "./schema-provider-Cbnf6sKm.js";
+export { M as Model, b as buildSchema, M as default, m as restoreDeprecatedModelRequestBehaviors } from "./schema-provider-Cbnf6sKm.js";
 import { setOwner, getOwner } from '@ember/application';
 function _attr(type, options) {
   if (typeof type === 'object') {

package/dist/{schema-provider-BdQhkT-Q.js → schema-provider-Cbnf6sKm.js}

@@ -2,45 +2,14 @@ import { getOwner } from '@ember/application';
 import { deprecate } from '@ember/debug';
 import EmberObject from '@ember/object';
 import { recordIdentifierFor, storeFor } from '@warp-drive/core';
-import { peekCache, notifyInternalSignal, peekInternalSignal, withSignalStore, ARRAY_SIGNAL, recordIdentifierFor as recordIdentifierFor$1, gate, memoized, defineSignal, coerceId, entangleSignal } from '@warp-drive/core/store/-private';
+import { peekCache, notifyInternalSignal, peekInternalSignal, withSignalStore, ARRAY_SIGNAL, recordIdentifierFor as recordIdentifierFor$1, gate, memoized, defineSignal, coerceId, entangleSignal, defineGate } from '@warp-drive/core/store/-private';
 import { RecordStore } from '@warp-drive/core/types/symbols';
 import { l as lookupLegacySupport, L as LEGACY_SUPPORT, E as Errors } from "./errors-BX5wowuz.js";
 import { u as upgradeStore, F as FetchManager } from "./-private-CKrP0ogQ.js";
 import { macroCondition, getGlobalConfig } from '@embroider/macros';
 import { cacheFor } from '@ember/object/internals';
 import { d as decorateMethodV2 } from "./runtime-BPCpkOf1-BKOwiRJp.js";
-import { dasherize } from '@warp-drive/utilities/string';
-function isElementDescriptor(args) {
-  const [maybeTarget, maybeKey, maybeDesc] = args;
-  return (
-    // Ensure we have the right number of args
-    args.length === 3 && (
-    // Make sure the target is a class or object (prototype)
-    typeof maybeTarget === 'function' || typeof maybeTarget === 'object' && maybeTarget !== null) &&
-    // Make sure the key is a string
-    typeof maybeKey === 'string' && (
-    // Make sure the descriptor is the right shape
-    typeof maybeDesc === 'object' && maybeDesc !== null && 'enumerable' in maybeDesc && 'configurable' in maybeDesc ||
-    // TS compatibility
-    maybeDesc === undefined)
-  );
-}
-function normalizeModelName(type) {
-  if (macroCondition(getGlobalConfig().WarpDrive.deprecations.DEPRECATE_NON_STRICT_TYPES)) {
-    const result = dasherize(type);
-    deprecate(`The resource type '${type}' is not normalized. Update your application code to use '${result}' instead of '${type}'.`, result === type, {
-      id: 'ember-data:deprecate-non-strict-types',
-      until: '6.0',
-      for: 'ember-data',
-      since: {
-        available: '4.13',
-        enabled: '5.3'
-      }
-    });
-    return result;
-  }
-  return type;
-}
+import { n as normalizeModelName } from "./util-Dul6TZts.js";
 function rollbackAttributes() {
   const {
     currentState
@@ -70,6 +39,27 @@ function hasMany(prop) {
   return lookupLegacySupport(this).referenceFor('hasMany', prop);
 }
 function reload(options = {}) {
+  if (macroCondition(!getGlobalConfig().WarpDrive.deprecations.ENABLE_LEGACY_REQUEST_METHODS)) {
+    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+      {
+        throw new Error(`You cannot use reload() on a record when ENABLE_LEGACY_REQUEST_METHODS is false.`);
+      }
+    })() : {};
+  } else {
+    deprecate(`record.reload is deprecated, please use store.request to initiate a request instead.`, false, {
+      id: 'warp-drive:deprecate-legacy-request-methods',
+      until: '6.0',
+      for: '@warp-drive/core',
+      url: 'https://docs.warp-drive.io/api/@warp-drive/core/build-config/deprecations/variables/ENABLE_LEGACY_REQUEST_METHODS',
+      since: {
+        enabled: '5.7',
+        available: '5.7'
+      }
+    });
+    return _reload.call(this, options);
+  }
+}
+function _reload(options = {}) {
   options.isReloading = true;
   options.reload = true;
   const identifier = recordIdentifierFor(this);
@@ -107,6 +97,27 @@ function deleteRecord() {
   }
 }
 function save(options) {
+  if (macroCondition(!getGlobalConfig().WarpDrive.deprecations.ENABLE_LEGACY_REQUEST_METHODS)) {
+    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+      {
+        throw new Error(`You cannot use save() on a record when ENABLE_LEGACY_REQUEST_METHODS is false.`);
+      }
+    })() : {};
+  } else {
+    deprecate(`record.save is deprecated, please use store.request to initiate a request instead.`, false, {
+      id: 'warp-drive:deprecate-legacy-request-methods',
+      until: '6.0',
+      for: '@warp-drive/core',
+      url: 'https://docs.warp-drive.io/api/@warp-drive/core/build-config/deprecations/variables/ENABLE_LEGACY_REQUEST_METHODS',
+      since: {
+        enabled: '5.7',
+        available: '5.7'
+      }
+    });
+    return _save.call(this, options);
+  }
+}
+function _save(options) {
   let promise;
   if (this.currentState.isNew && this.currentState.isDeleted) {
     promise = Promise.resolve(this);
@@ -117,6 +128,27 @@ function save(options) {
   return promise;
 }
 function destroyRecord(options) {
+  if (macroCondition(!getGlobalConfig().WarpDrive.deprecations.ENABLE_LEGACY_REQUEST_METHODS)) {
+    macroCondition(getGlobalConfig().WarpDrive.env.DEBUG) ? (test => {
+      {
+        throw new Error(`You cannot use destroyRecord() on a record when ENABLE_LEGACY_REQUEST_METHODS is false.`);
+      }
+    })() : {};
+  } else {
+    deprecate(`record.destroyRecord is deprecated, please use store.request to initiate a request instead.`, false, {
+      id: 'warp-drive:deprecate-legacy-request-methods',
+      until: '6.0',
+      for: '@warp-drive/core',
+      url: 'https://docs.warp-drive.io/api/@warp-drive/core/build-config/deprecations/variables/ENABLE_LEGACY_REQUEST_METHODS',
+      since: {
+        enabled: '5.7',
+        available: '5.7'
+      }
+    });
+    return _destroyRecord.call(this, options);
+  }
+}
+function _destroyRecord(options) {
   const {
     isNew
   } = this.currentState;
@@ -1917,7 +1949,44 @@ Model.prototype.deleteRecord = deleteRecord;
 Model.prototype.changedAttributes = changedAttributes;
 Model.prototype.rollbackAttributes = rollbackAttributes;
 Model.prototype.reload = reload;
-defineSignal(Model.prototype, 'isReloading', false);
+defineGate(Model.prototype, 'isReloading', {
+  get() {
+    deprecate(`record.isReloading is deprecated, please use store.request and either <Request> or getRequuestState to keep track of the request state instead.`, false, {
+      id: 'warp-drive:deprecate-legacy-request-methods',
+      until: '6.0',
+      for: '@warp-drive/core',
+      url: 'https://docs.warp-drive.io/api/@warp-drive/core/build-config/deprecations/variables/ENABLE_LEGACY_REQUEST_METHODS',
+      since: {
+        enabled: '5.7',
+        available: '5.7'
+      }
+    });
+    return this._isReloading ?? false;
+  },
+  set(v) {
+    this._isReloading = v;
+  },
+  configurable: true,
+  // @ts-expect-error specially handled prop
+  isLocal: true
+});
+function restoreDeprecatedModelRequestBehaviors(ModelKlass) {
+  // @ts-expect-error TS doesn't know how to do `this` function overloads
+  ModelKlass.prototype.save = _save;
+  // @ts-expect-error TS doesn't know how to do `this` function overloads
+  ModelKlass.prototype.destroyRecord = _destroyRecord;
+  ModelKlass.prototype.reload = _reload;
+  defineGate(Model.prototype, 'isReloading', {
+    get() {
+      return this._isReloading ?? false;
+    },
+    set(v) {
+      this._isReloading = v;
+    },
+    // @ts-expect-error specially handled prop
+    isLocal: true
+  });
+}
 
 // this is required to prevent `init` from passing
 // the values initialized during create to `setUnknownProperty`
@@ -2232,4 +2301,4 @@ function getModelFactory(store, type) {
   }
   return factory;
 }
-export { Model as M, RecordState as R, save as a, buildSchema as b, reload as c, destroyRecord as d, deleteRecord as e, changedAttributes as f, belongsTo as g, hasMany as h, createSnapshot as i, isElementDescriptor as j, getModelFactory as k, normalizeModelName as n, rollbackAttributes as r, serialize as s, unloadRecord as u };
+export { Model as M, RecordState as R, _save as _, save as a, buildSchema as b, _reload as c, reload as d, _destroyRecord as e, destroyRecord as f, deleteRecord as g, hasMany as h, changedAttributes as i, belongsTo as j, createSnapshot as k, getModelFactory as l, restoreDeprecatedModelRequestBehaviors as m, rollbackAttributes as r, serialize as s, unloadRecord as u };