@ember-data/store 4.6.1 → 4.6.2

package/addon/-private/identifier-cache.ts

@@ -4,6 +4,8 @@
 import { assert, warn } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 
+import { getOwnConfig, macroCondition } from '@embroider/macros';
+
 import type { ExistingResourceObject, ResourceIdentifierObject } from '@ember-data/types/q/ember-data-json-api';
 import type {
   ForgetMethod,
@@ -22,6 +24,7 @@ import coerceId from './coerce-id';
 import { DEBUG_CLIENT_ORIGINATED, DEBUG_IDENTIFIER_BUCKET } from './identifer-debug-consts';
 import normalizeModelName from './normalize-model-name';
 import isNonEmptyString from './utils/is-non-empty-string';
+import installPolyfill from './utils/uuid-polyfill';
 import WeakCache from './weak-cache';
 
 const IDENTIFIERS = new WeakSet();
@@ -33,6 +36,10 @@ export function isStableIdentifier(identifier: Object): identifier is StableReco
 const isFastBoot = typeof FastBoot !== 'undefined';
 const _crypto: Crypto = isFastBoot ? (FastBoot.require('crypto') as Crypto) : window.crypto;
 
+if (macroCondition(getOwnConfig<{ polyfillUUID: boolean }>().polyfillUUID)) {
+  installPolyfill();
+}
+
 function uuidv4(): string {
   return _crypto.randomUUID();
 }

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,6 +1,6 @@
 {
   "name": "@ember-data/store",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "description": "The default blueprint for ember-cli addons.",
   "keywords": [
     "ember-addon"
@@ -17,8 +17,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.6.2",
+    "@ember-data/private-build-infra": "4.6.2",
     "@ember/string": "^3.0.0",
     "@embroider/macros": "^1.8.3",
     "@glimmer/tracking": "^1.1.2",
@@ -29,7 +29,7 @@
     "ember-cli-typescript": "^5.1.0"
   },
   "devDependencies": {
-    "@ember-data/unpublished-test-infra": "4.6.1",
+    "@ember-data/unpublished-test-infra": "4.6.2",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "~2.7.0",
     "@types/ember": "^4.0.0",