relay-runtime 0.0.0-main-e0f88a3b → 0.0.0-main-2087b512

package/util/getFragmentIdentifier.js.flow

@@ -13,19 +13,17 @@
 
 'use strict';
 
-const RelayFeatureFlags = require('./RelayFeatureFlags');
-
-const isEmptyObject = require('./isEmptyObject');
-const stableCopy = require('./stableCopy');
+import type {ReaderFragment} from './ReaderNode';
 
 const {
   getDataIDsFromFragment,
-  getVariablesFromFragment,
   getSelector,
+  getVariablesFromFragment,
 } = require('../store/RelayModernSelector');
-const {shorten} = require('./shortString');
-
-import type {ReaderFragment} from './ReaderNode';
+const isEmptyObject = require('./isEmptyObject');
+const RelayFeatureFlags = require('./RelayFeatureFlags');
+const stableCopy = require('./stableCopy');
+const {intern} = require('./StringInterner');
 
 function getFragmentIdentifier(
   fragmentNode: ReaderFragment,
@@ -52,7 +50,10 @@ function getFragmentIdentifier(
         : Array.isArray(dataIDs)
         ? '[' + dataIDs.join(',') + ']'
         : dataIDs;
-    ids = RelayFeatureFlags.STRING_INTERN_LEVEL <= 1 ? ids : shorten(ids);
+    ids =
+      RelayFeatureFlags.STRING_INTERN_LEVEL <= 1
+        ? ids
+        : intern(ids, RelayFeatureFlags.MAX_DATA_ID_LENGTH);
 
     return (
       fragmentOwnerIdentifier +
@@ -67,7 +68,10 @@ function getFragmentIdentifier(
     );
   } else {
     let ids = JSON.stringify(dataIDs) ?? 'missing';
-    ids = RelayFeatureFlags.STRING_INTERN_LEVEL <= 1 ? ids : shorten(ids);
+    ids =
+      RelayFeatureFlags.STRING_INTERN_LEVEL <= 1
+        ? ids
+        : intern(ids, RelayFeatureFlags.MAX_DATA_ID_LENGTH);
 
     return (
       fragmentOwnerIdentifier +

package/util/getOperation.js.flow

@@ -13,14 +13,14 @@
 
 'use strict';
 
-const {REQUEST, SPLIT_OPERATION} = require('./RelayConcreteNode');
-
 import type {
   NormalizationOperation,
   NormalizationRootNode,
   NormalizationSplitOperation,
 } from './NormalizationNode';
 
+const {REQUEST, SPLIT_OPERATION} = require('./RelayConcreteNode');
+
 /**
  * OperationLoaders can return either a NormalizationSplitOperation or
  * ConcreteRequest.

package/util/getPaginationMetadata.js.flow

@@ -13,15 +13,15 @@
 
 'use strict';
 
-const getRefetchMetadata = require('./getRefetchMetadata');
-const invariant = require('invariant');
-
 import type {
   ConcreteRequest,
   ReaderFragment,
   ReaderPaginationMetadata,
 } from 'relay-runtime';
 
+const getRefetchMetadata = require('./getRefetchMetadata');
+const invariant = require('invariant');
+
 function getPaginationMetadata(
   fragmentNode: ReaderFragment,
   componentDisplayName: string,

package/util/getPaginationVariables.js.flow

@@ -13,12 +13,12 @@
 
 'use strict';
 
-const invariant = require('invariant');
-const warning = require('warning');
-
 import type {ReaderPaginationMetadata} from './ReaderNode';
 import type {Variables} from './RelayRuntimeTypes';
 
+const invariant = require('invariant');
+const warning = require('warning');
+
 export type Direction = 'forward' | 'backward';
 
 function getPaginationVariables(

package/util/getPendingOperationsForFragment.js.flow

@@ -13,11 +13,11 @@
 
 'use strict';
 
-const {getPromiseForActiveRequest} = require('../query/fetchQueryInternal');
-
 import type {IEnvironment, RequestDescriptor} from '../store/RelayStoreTypes';
 import type {ReaderFragment} from './ReaderNode';
 
+const {getPromiseForActiveRequest} = require('../query/fetchQueryInternal');
+
 function getPendingOperationsForFragment(
   environment: IEnvironment,
   fragmentNode: ReaderFragment,

package/util/getRefetchMetadata.js.flow

@@ -13,14 +13,14 @@
 
 'use strict';
 
-const invariant = require('invariant');
-
 import type {
   ConcreteRequest,
   ReaderFragment,
   ReaderRefetchMetadata,
 } from 'relay-runtime';
 
+const invariant = require('invariant');
+
 function getRefetchMetadata(
   fragmentNode: ReaderFragment,
   componentDisplayName: string,

package/util/getRelayHandleKey.js.flow

@@ -12,9 +12,8 @@
 
 'use strict';
 
-const invariant = require('invariant');
-
 const {DEFAULT_HANDLE_KEY} = require('./RelayDefaultHandleKey');
+const invariant = require('invariant');
 
 /**
  * @internal

package/util/getRequestIdentifier.js.flow

@@ -12,12 +12,12 @@
 
 'use strict';
 
-const invariant = require('invariant');
-const stableCopy = require('./stableCopy');
-
 import type {RequestParameters} from './RelayConcreteNode';
 import type {Variables} from './RelayRuntimeTypes';
 
+const stableCopy = require('./stableCopy');
+const invariant = require('invariant');
+
 export type RequestIdentifier = string;
 
 /**

package/lib/util/shortString.js

@@ -1,63 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * 
- * @format
- */
-// flowlint ambiguous-object-type:error
-'use strict';
-
-var RelayFeatureFlags = require('./RelayFeatureFlags');
-/**
- * Convert a long string into a unique short string
- */
-
-
-var ids = Object.create(null);
-var digits = initDigitTable();
-var seq = 1;
-var ESCAPE_PREFIX = 'n';
-var INTERN_PREFIX = 'i';
-
-function initDigitTable() {
-  var ret = Object.create(null);
-
-  for (var i = 0; i < 10; ++i) {
-    ret["".concat(i)] = true;
-  }
-
-  return ret;
-} // escape a string so that it never conflicts with a shortened string
-
-
-function escape(str) {
-  if ( // "i<digit>..." -> "ni<digit>..."
-  str[0] === INTERN_PREFIX && str[1] in digits || // "ni<digit>..." -> "nni<digit>"
-  str[0] === ESCAPE_PREFIX) {
-    return ESCAPE_PREFIX + str;
-  }
-
-  return str;
-}
-
-function shorten(str) {
-  if (RelayFeatureFlags.MAX_DATA_ID_LENGTH == null || str.length < RelayFeatureFlags.MAX_DATA_ID_LENGTH) {
-    return escape(str);
-  }
-
-  if (str in ids) {
-    return ids[str];
-  }
-
-  var ret = INTERN_PREFIX + seq++;
-  ids[str] = ret;
-  return ret;
-}
-
-module.exports = {
-  escape: escape,
-  shorten: shorten
-};

package/util/shortString.js.flow

@@ -1,62 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-// flowlint ambiguous-object-type:error
-
-'use strict';
-
-const RelayFeatureFlags = require('./RelayFeatureFlags');
-
-/**
- * Convert a long string into a unique short string
- */
-const ids = Object.create(null);
-const digits = initDigitTable();
-let seq = 1;
-const ESCAPE_PREFIX = 'n';
-const INTERN_PREFIX = 'i';
-
-function initDigitTable() {
-  const ret = Object.create(null);
-  for (let i = 0; i < 10; ++i) {
-    ret[`${i}`] = true;
-  }
-  return ret;
-}
-
-// escape a string so that it never conflicts with a shortened string
-function escape(str: string): string {
-  if (
-    // "i<digit>..." -> "ni<digit>..."
-    (str[0] === INTERN_PREFIX && str[1] in digits) ||
-    // "ni<digit>..." -> "nni<digit>"
-    str[0] === ESCAPE_PREFIX
-  ) {
-    return ESCAPE_PREFIX + str;
-  }
-  return str;
-}
-
-function shorten(str: string): string {
-  if (
-    RelayFeatureFlags.MAX_DATA_ID_LENGTH == null ||
-    str.length < RelayFeatureFlags.MAX_DATA_ID_LENGTH
-  ) {
-    return escape(str);
-  }
-  if (str in ids) {
-    return ids[str];
-  }
-  const ret = INTERN_PREFIX + seq++;
-  ids[str] = ret;
-  return ret;
-}
-
-module.exports = {escape, shorten};