Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Aug 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/store/addon/-private/identifiers/cache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 1 addition & 3 deletions packages/store/addon/-private/system/core-store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 1 addition & 3 deletions packages/store/addon/-private/system/fetch-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/store/addon/-private/system/relationship-meta.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/store/addon/-private/system/request-cache.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/store/addon/-private/system/ts-upgrade-map.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/store/addon/-private/ts-interfaces/identifier.ts
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BRAND_SYMBOL } from './utils/brand';
import { BRAND_SYMBOL } from '../utils/brand';

/**
@module @ember-data/store
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down