@ember-data/store 4.6.1 → 4.7.0

package/addon/-private/{coerce-id.ts → utils/coerce-id.ts}

@@ -35,7 +35,7 @@ export function ensureStringId(id: Coercable): string {
     throw new Error(`Expected id to be a string or number, received ${String(id)}`);
   }
 
-  return normalized!;
+  return normalized;
 }
 
 export default coerceId;

package/addon/-private/{common.js → utils/common.js}

@@ -1,5 +1,4 @@
 import { deprecate } from '@ember/debug';
-import { get } from '@ember/object';
 import { DEBUG } from '@glimmer/env';
 
 import { resolve } from 'rsvp';
@@ -27,7 +26,7 @@ export function _guard(promise, test) {
 }
 
 export function _objectIsAlive(object) {
-  return !(get(object, 'isDestroyed') || get(object, 'isDestroying'));
+  return !(object.isDestroyed || object.isDestroying);
 }
 
 export function guardDestroyedStore(promise, store, label) {

package/addon/-private/utils/construct-resource.ts

@@ -5,8 +5,8 @@ import type {
   ResourceIdentifierObject,
 } from '@ember-data/types/q/ember-data-json-api';
 
-import coerceId from '../coerce-id';
-import { isStableIdentifier } from '../identifier-cache';
+import { isStableIdentifier } from '../caches/identifier-cache';
+import coerceId from './coerce-id';
 import isNonEmptyString from './is-non-empty-string';
 
 function constructResource(type: ResourceIdentifierObject): ResourceIdentifierObject;

package/addon/-private/utils/is-non-empty-string.ts

@@ -1,3 +1,3 @@
 export default function isNonEmptyString(str: any): str is string {
-  return typeof str === 'string' && str.length > 0;
+  return str && typeof str === 'string';
 }

package/addon/-private/{normalize-model-name.ts → utils/normalize-model-name.ts}

@@ -4,9 +4,6 @@ import { dasherize } from '@ember/string';
   @module @ember-data/store
 */
 
-// All modelNames are dasherized internally. Changing this function may
-// require changes to other normalization hooks (such as typeForRoot).
-
 /**
  This method normalizes a modelName into the format Ember Data uses
  internally by dasherizing it.
@@ -14,6 +11,7 @@ import { dasherize } from '@ember/string';
   @method normalizeModelName
   @static
   @public
+  @deprecated
   @for @ember-data/store
   @param {String} modelName
   @return {String} normalizedModelName

package/addon/-private/utils/promise-record.ts

@@ -1,16 +1,15 @@
 import type { StableRecordIdentifier } from '@ember-data/types/q/identifier';
 import type { RecordInstance } from '@ember-data/types/q/record-instance';
 
-import type Store from '../core-store';
-import type { PromiseObject } from '../promise-proxies';
-import { promiseObject } from '../promise-proxies';
+import type { PromiseObject } from '../proxies/promise-proxies';
+import { promiseObject } from '../proxies/promise-proxies';
+import type Store from '../store-service';
 
 export default function promiseRecord(
   store: Store,
-  promise: Promise<StableRecordIdentifier>,
-  label?: string
+  promise: Promise<StableRecordIdentifier>
 ): PromiseObject<RecordInstance> {
   let toReturn = promise.then((identifier: StableRecordIdentifier) => store.peekRecord(identifier)!);
 
-  return promiseObject(toReturn, label);
+  return promiseObject(toReturn);
 }

package/addon/-private/{serializer-response.ts → utils/serializer-response.ts}

@@ -5,8 +5,8 @@ import type { JsonApiDocument } from '@ember-data/types/q/ember-data-json-api';
 import type { AdapterPayload } from '@ember-data/types/q/minimum-adapter-interface';
 import type { MinimumSerializerInterface, RequestType } from '@ember-data/types/q/minimum-serializer-interface';
 
-import type Store from './core-store';
-import type ShimModelClass from './model/shim-model-class';
+import type ShimModelClass from '../legacy-model-support/shim-model-class';
+import type Store from '../store-service';
 
 /**
   This is a helper method that validates a JSON API top-level document

package/addon/-private/utils/uuid-polyfill.ts

@@ -0,0 +1,73 @@
+/**
+  @module @ember-data/store
+*/
+interface FastbootCrypto {
+  randomFillSync(v: Uint8Array): Uint8Array;
+}
+
+export default function installPolyfill() {
+  const isFastBoot = typeof FastBoot !== 'undefined';
+  const CRYPTO: Crypto = isFastBoot ? (FastBoot.require('crypto') as Crypto) : window.crypto;
+
+  if (!CRYPTO.randomUUID) {
+    // we might be able to optimize this by requesting more bytes than we need at a time
+    const rng = function (): Uint8Array {
+      // WHATWG crypto RNG - http://wiki.whatwg.org/wiki/Crypto
+      let rnds8 = new Uint8Array(16);
+
+      if (!CRYPTO.getRandomValues && !isFastBoot) {
+        throw new Error(`Unable to generate bytes for UUID`);
+      }
+
+      return CRYPTO.getRandomValues
+        ? CRYPTO.getRandomValues(rnds8)
+        : (CRYPTO as unknown as FastbootCrypto).randomFillSync(rnds8);
+    };
+
+    /*
+     * Convert array of 16 byte values to UUID string format of the form:
+     * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
+     */
+    const byteToHex: string[] = [];
+    for (let i = 0; i < 256; ++i) {
+      byteToHex[i] = (i + 0x100).toString(16).substr(1);
+    }
+
+    const bytesToUuid = function (buf: Uint8Array) {
+      let bth = byteToHex;
+      // join used to fix memory issue caused by concatenation: https://bugs.chromium.org/p/v8/issues/detail?id=3175#c4
+      return [
+        bth[buf[0]],
+        bth[buf[1]],
+        bth[buf[2]],
+        bth[buf[3]],
+        '-',
+        bth[buf[4]],
+        bth[buf[5]],
+        '-',
+        bth[buf[6]],
+        bth[buf[7]],
+        '-',
+        bth[buf[8]],
+        bth[buf[9]],
+        '-',
+        bth[buf[10]],
+        bth[buf[11]],
+        bth[buf[12]],
+        bth[buf[13]],
+        bth[buf[14]],
+        bth[buf[15]],
+      ].join('');
+    };
+
+    CRYPTO.randomUUID = function uuidv4(): string {
+      let rnds = rng();
+
+      // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
+      rnds[6] = (rnds[6] & 0x0f) | 0x40;
+      rnds[8] = (rnds[8] & 0x3f) | 0x80;
+
+      return bytesToUuid(rnds);
+    };
+  }
+}

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "@ember-data/store",
-  "version": "4.6.1",
-  "description": "The default blueprint for ember-cli addons.",
+  "version": "4.7.0",
+  "description": "The core of EmberData. Provides the Store service which coordinates the cache with the network and presentation layers.",
   "keywords": [
     "ember-addon"
   ],
-  "repository": "https://github.com/emberjs/data/tree/master/packages/store",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com:emberjs/data.git",
+    "directory": "packages/store"
+  },
   "license": "MIT",
   "author": "",
   "directories": {
@@ -17,8 +21,8 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "@ember-data/canary-features": "4.6.1",
-    "@ember-data/private-build-infra": "4.6.1",
+    "@ember-data/canary-features": "4.7.0",
+    "@ember-data/private-build-infra": "4.7.0",
     "@ember/string": "^3.0.0",
     "@embroider/macros": "^1.8.3",
     "@glimmer/tracking": "^1.1.2",
@@ -29,10 +33,10 @@
     "ember-cli-typescript": "^5.1.0"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.6.1",
+    "@ember-data/unpublished-test-infra": "4.7.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "~2.7.0",
-    "@types/ember": "^4.0.0",
+    "@types/ember": "^4.0.1",
     "@types/rsvp": "^4.0.4",
     "broccoli-asset-rev": "^3.0.0",
     "ember-cli": "~4.6.0",
@@ -62,7 +66,7 @@
     "configPath": "tests/dummy/config"
   },
   "volta": {
-    "node": "16.16.0",
+    "node": "16.17.0",
     "yarn": "1.22.19"
   }
 }

package/addon/-private/backburner.js

@@ -1,25 +0,0 @@
-/**
-  @module @ember-data/store
-*/
-
-import { registerWaiter } from '@ember/test';
-import { DEBUG } from '@glimmer/env';
-import Ember from 'ember';
-
-// TODO: expose Ember._Backburner as `import { _Backburner } from '@ember/runloop'` in ember-rfc176-data + emberjs/ember.js
-/*
-  syncRelationships is used by the UI to grab updates from the graph
-  and update the ManyArrays.
-
-  We may be able to remove this once the new relationship layer is
-  complete.
-*/
-const backburner = new Ember._Backburner(['coalesce', 'sync', 'notify']);
-
-if (DEBUG) {
-  registerWaiter(() => {
-    return !backburner.currentInstance && !backburner.hasTimers();
-  });
-}
-
-export default backburner;

package/addon/-private/errors-utils.js

@@ -1,146 +0,0 @@
-/**
-  @module @ember-data/adapter/error
-*/
-
-const SOURCE_POINTER_REGEXP = /^\/?data\/(attributes|relationships)\/(.*)/;
-const SOURCE_POINTER_PRIMARY_REGEXP = /^\/?data/;
-const PRIMARY_ATTRIBUTE_KEY = 'base';
-
-function makeArray(value) {
-  return Array.isArray(value) ? value : [value];
-}
-
-/**
-  Convert an hash of errors into an array with errors in JSON-API format.
-   ```javascript
-  import DS from 'ember-data';
-
-   const { errorsHashToArray } = DS;
-
-   let errors = {
-    base: 'Invalid attributes on saving this record',
-    name: 'Must be present',
-    age: ['Must be present', 'Must be a number']
-  };
-   let errorsArray = errorsHashToArray(errors);
-  // [
-  //   {
-  //     title: "Invalid Document",
-  //     detail: "Invalid attributes on saving this record",
-  //     source: { pointer: "/data" }
-  //   },
-  //   {
-  //     title: "Invalid Attribute",
-  //     detail: "Must be present",
-  //     source: { pointer: "/data/attributes/name" }
-  //   },
-  //   {
-  //     title: "Invalid Attribute",
-  //     detail: "Must be present",
-  //     source: { pointer: "/data/attributes/age" }
-  //   },
-  //   {
-  //     title: "Invalid Attribute",
-  //     detail: "Must be a number",
-  //     source: { pointer: "/data/attributes/age" }
-  //   }
-  // ]
-  ```
-  @method errorsHashToArray
-  @for @ember-data/adapter/error
-  @static
-  @public
-  @param {Object} errors hash with errors as properties
-  @return {Array} array of errors in JSON-API format
-*/
-export function errorsHashToArray(errors) {
-  let out = [];
-
-  if (errors) {
-    Object.keys(errors).forEach((key) => {
-      let messages = makeArray(errors[key]);
-      for (let i = 0; i < messages.length; i++) {
-        let title = 'Invalid Attribute';
-        let pointer = `/data/attributes/${key}`;
-        if (key === PRIMARY_ATTRIBUTE_KEY) {
-          title = 'Invalid Document';
-          pointer = `/data`;
-        }
-        out.push({
-          title: title,
-          detail: messages[i],
-          source: {
-            pointer: pointer,
-          },
-        });
-      }
-    });
-  }
-
-  return out;
-}
-
-/**
-  Convert an array of errors in JSON-API format into an object.
-
-  ```javascript
-  import DS from 'ember-data';
-
-  const { errorsArrayToHash } = DS;
-
-  let errorsArray = [
-    {
-      title: 'Invalid Attribute',
-      detail: 'Must be present',
-      source: { pointer: '/data/attributes/name' }
-    },
-    {
-      title: 'Invalid Attribute',
-      detail: 'Must be present',
-      source: { pointer: '/data/attributes/age' }
-    },
-    {
-      title: 'Invalid Attribute',
-      detail: 'Must be a number',
-      source: { pointer: '/data/attributes/age' }
-    }
-  ];
-
-  let errors = errorsArrayToHash(errorsArray);
-  // {
-  //   "name": ["Must be present"],
-  //   "age":  ["Must be present", "must be a number"]
-  // }
-  ```
-
-  @method errorsArrayToHash
-  @static
-  @for @ember-data/adapter/error
-  @public
-  @param {Array} errors array of errors in JSON-API format
-  @return {Object}
-*/
-export function errorsArrayToHash(errors) {
-  let out = {};
-
-  if (errors) {
-    errors.forEach((error) => {
-      if (error.source && error.source.pointer) {
-        let key = error.source.pointer.match(SOURCE_POINTER_REGEXP);
-
-        if (key) {
-          key = key[2];
-        } else if (error.source.pointer.search(SOURCE_POINTER_PRIMARY_REGEXP) !== -1) {
-          key = PRIMARY_ATTRIBUTE_KEY;
-        }
-
-        if (key) {
-          out[key] = out[key] || [];
-          out[key].push(error.detail || error.title);
-        }
-      }
-    });
-  }
-
-  return out;
-}