[CHORE]: Move symbols out of /ts-interfaces and into -private/utils

emberjs · Aug 8, 2020 · 78162a0 · 78162a0
1 parent 878bf93
commit 78162a0
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 14 deletions.
diff --git a/packages/store/addon/-private/identifiers/cache.ts b/packages/store/addon/-private/identifiers/cache.ts
@@ -4,8 +4,8 @@ import { DEBUG } from '@glimmer/env';
 import coerceId from '../system/coerce-id';
 import normalizeModelName from '../system/normalize-model-name';
 import { DEBUG_CLIENT_ORIGINATED, DEBUG_IDENTIFIER_BUCKET } from '../ts-interfaces/identifier';
-import { addSymbol } from '../ts-interfaces/utils/symbol';
 import isNonEmptyString from '../utils/is-non-empty-string';
+import { addSymbol } from '../utils/symbol';
 import isStableIdentifier, { markStableIdentifier, unmarkStableIdentifier } from './is-stable-identifier';
 import uuidv4 from './utils/uuid-v4';
 

diff --git a/packages/store/addon/-private/system/core-store.ts b/packages/store/addon/-private/system/core-store.ts
@@ -39,11 +39,9 @@ import {
 } from '@ember-data/private-build-infra/deprecations';
 
 import { identifierCacheFor } from '../identifiers/cache';
-// TODO this comes from ts-interfaces but it is a function we ship
-// so needs to be moved somewhere else
-import { addSymbol } from '../ts-interfaces/utils/symbol';
 import constructResource from '../utils/construct-resource';
 import promiseRecord from '../utils/promise-record';
+import { addSymbol } from '../utils/symbol';
 import edBackburner from './backburner';
 import coerceId, { ensureStringId } from './coerce-id';
 import { errorsArrayToHash } from './errors-utils';

diff --git a/packages/store/addon/-private/system/fetch-manager.ts b/packages/store/addon/-private/system/fetch-manager.ts
@@ -5,9 +5,7 @@ import { DEBUG } from '@glimmer/env';
 
 import { default as RSVP, Promise } from 'rsvp';
 
-// TODO @runspired symbol shouldn't be in ts-interfaces
-// as it is runtime code
-import { symbol } from '../ts-interfaces/utils/symbol';
+import { symbol } from '../utils/symbol';
 import coerceId from './coerce-id';
 import { errorsArrayToHash } from './errors-utils';
 import RequestCache from './request-cache';

diff --git a/packages/store/addon/-private/system/relationship-meta.ts b/packages/store/addon/-private/system/relationship-meta.ts
@@ -3,7 +3,7 @@ import { DEBUG } from '@glimmer/env';
 import { singularize } from 'ember-inflector';
 
 import { RelationshipSchema } from '../ts-interfaces/record-data-schemas';
-import { BRAND_SYMBOL } from '../ts-interfaces/utils/brand';
+import { BRAND_SYMBOL } from '../utils/brand';
 import normalizeModelName from './normalize-model-name';
 
 type CoreStore = import('./core-store').default;

diff --git a/packages/store/addon/-private/system/request-cache.ts b/packages/store/addon/-private/system/request-cache.ts
@@ -1,5 +1,5 @@
 import { RequestStateEnum } from '../ts-interfaces/fetch-manager';
-import { addSymbol, symbol } from '../ts-interfaces/utils/symbol';
+import { addSymbol, symbol } from '../utils/symbol';
 
 type FindRecordQuery = import('../ts-interfaces/fetch-manager').FindRecordQuery;
 type SaveRecordMutation = import('../ts-interfaces/fetch-manager').SaveRecordMutation;

diff --git a/packages/store/addon/-private/system/store/record-data-store-wrapper.ts b/packages/store/addon/-private/system/store/record-data-store-wrapper.ts
@@ -2,7 +2,7 @@ import { CUSTOM_MODEL_CLASS } from '@ember-data/canary-features';
 
 import { identifierCacheFor } from '../../identifiers/cache';
 import { RecordDataStoreWrapper as IRecordDataStoreWrapper } from '../../ts-interfaces/record-data-store-wrapper';
-import { BRAND_SYMBOL } from '../../ts-interfaces/utils/brand';
+import { BRAND_SYMBOL } from '../../utils/brand';
 import constructResource from '../../utils/construct-resource';
 import { upgradeForInternal } from '../ts-upgrade-map';
 import { internalModelFactoryFor } from './internal-model-factory';

diff --git a/packages/store/addon/-private/system/ts-upgrade-map.ts b/packages/store/addon/-private/system/ts-upgrade-map.ts
@@ -2,7 +2,7 @@
   @module @ember-data/store
 */
 
-import { BRAND_SYMBOL } from '../ts-interfaces/utils/brand';
+import { BRAND_SYMBOL } from '../utils/brand';
 
 type RelationshipDefinition = import('./relationship-meta').RelationshipDefinition;
 type RecordDataStoreWrapper = import('./store/record-data-store-wrapper').default;

diff --git a/packages/store/addon/-private/ts-interfaces/identifier.ts b/packages/store/addon/-private/ts-interfaces/identifier.ts
@@ -1,7 +1,7 @@
 /**
   @module @ember-data/store
 */
-import { symbol } from '../ts-interfaces/utils/symbol';
+import { symbol } from '../utils/symbol';
 
 // provided for additional debuggability
 export const DEBUG_CLIENT_ORIGINATED: unique symbol = symbol('record-originated-on-client');

diff --git a/packages/store/addon/-private/ts-interfaces/record-data-schemas.ts b/packages/store/addon/-private/ts-interfaces/record-data-schemas.ts
@@ -1,4 +1,4 @@
-import { BRAND_SYMBOL } from './utils/brand';
+import { BRAND_SYMBOL } from '../utils/brand';
 
 /**
   @module @ember-data/store

diff --git a/packages/store/addon/-private/ts-interfaces/record-data-store-wrapper.ts b/packages/store/addon/-private/ts-interfaces/record-data-store-wrapper.ts
@@ -1,4 +1,4 @@
-import { BRAND_SYMBOL } from './utils/brand';
+import { BRAND_SYMBOL } from '../utils/brand';
 
 type RelationshipsSchema = import('./record-data-schemas').RelationshipsSchema;
 type AttributesSchema = import('./record-data-schemas').AttributesSchema;

diff --git a/...don/-private/ts-interfaces/utils/brand.ts → packages/store/addon/-private/utils/brand.ts b/...don/-private/ts-interfaces/utils/brand.ts → packages/store/addon/-private/utils/brand.ts
diff --git a/...on/-private/ts-interfaces/utils/symbol.ts → ...ages/store/addon/-private/utils/symbol.ts b/...on/-private/ts-interfaces/utils/symbol.ts → ...ages/store/addon/-private/utils/symbol.ts