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

Try to fix some type issues #409

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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 addon/-private/cache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export default class Cache {
> = {}
): Cache {
const forkedCache = this.#sourceCache.fork(settings);
const injections = getOwner(this).ownerInjection();
const injections = getOwner(this)?.ownerInjection();

return new Cache({
...injections,
Expand Down
10 changes: 5 additions & 5 deletions addon/-private/factories/coordinator-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function isFactory(f?: { create: () => {} }): boolean {
export default {
create(injections: CoordinatorInjections = {}): Coordinator {
const app = getOwner(injections);
const orbitConfig = app.lookup('ember-orbit:config');
const orbitConfig = app?.lookup('ember-orbit:config');

if (injections.sources === undefined) {
let sourceNames: string[];
Expand All @@ -23,15 +23,15 @@ export default {
delete injections.sourceNames;
} else {
sourceNames =
app.lookup('ember-orbit:source-names') ??
app?.lookup('ember-orbit:source-names') ??
modulesOfType(app.base.modulePrefix, orbitConfig.collections.sources);
sourceNames.push('store');
}
injections.sources = sourceNames
.map((name) => {
const key = `${orbitConfig.types.source}:${name}`;
const factory = app.resolveRegistration(key);
return isFactory(factory) ? app.lookup(key) : undefined;
return isFactory(factory) ? app?.lookup(key) : undefined;
})
.filter((source) => !!source);
}
Expand All @@ -43,7 +43,7 @@ export default {
delete injections.strategyNames;
} else {
strategyNames =
app.lookup('ember-orbit:strategy-names') ??
app?.lookup('ember-orbit:strategy-names') ??
modulesOfType(
app.base.modulePrefix,
orbitConfig.collections.strategies
Expand All @@ -53,7 +53,7 @@ export default {
.map((name) => {
const key = `${orbitConfig.types.strategy}:${name}`;
const factory = app.resolveRegistration(key);
return isFactory(factory) ? app.lookup(key) : undefined;
return isFactory(factory) ? app?.lookup(key) : undefined;
})
.filter((strategy) => !!strategy);
}
Expand Down
18 changes: 12 additions & 6 deletions addon/-private/factories/normalizer-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,19 @@ import {
export default {
create(injections: ModelRecordNormalizerSettings): ModelAwareNormalizer {
const app = getOwner(injections);
const orbitConfig = app.lookup('ember-orbit:config');
if (app) {
const orbitConfig = app.lookup('ember-orbit:config');

if (!orbitConfig.skipSchemaService) {
injections.schema = app.lookup(`service:${orbitConfig.services.schema}`);
}
if (!orbitConfig.skipKeyMapService) {
injections.keyMap = app.lookup(`service:${orbitConfig.services.keyMap}`);
if (!orbitConfig.skipSchemaService) {
injections.schema = app.lookup(
`service:${orbitConfig.services.schema}`
);
}
if (!orbitConfig.skipKeyMapService) {
injections.keyMap = app.lookup(
`service:${orbitConfig.services.keyMap}`
);
}
}

return new ModelAwareNormalizer(injections);
Expand Down
6 changes: 3 additions & 3 deletions addon/-private/factories/schema-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type SchemaInjections = { modelNames?: string[] } & RecordSchemaSettings;
export default {
create(injections: SchemaInjections = {}): RecordSchema {
const app = getOwner(injections);
const orbitConfig = app.lookup('ember-orbit:config');
const orbitConfig = app?.lookup('ember-orbit:config');

if (injections.models === undefined) {
let modelNames;
Expand All @@ -24,7 +24,7 @@ export default {
delete injections.modelNames;
} else {
modelNames =
app.lookup('ember-orbit:model-names') ??
app?.lookup('ember-orbit:model-names') ??
getRegisteredModels(
app.base.modulePrefix,
orbitConfig.collections.models
Expand All @@ -33,7 +33,7 @@ export default {

injections.models = {};
for (const name of modelNames) {
const { keys, attributes, relationships } = app.factoryFor(
const { keys, attributes, relationships } = app?.factoryFor(
`${orbitConfig.types.model}:${name}`
).class;

Expand Down
7 changes: 5 additions & 2 deletions addon/-private/factories/store-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ import Store, { StoreSettings } from '../store';
export default {
create(injections: StoreSettings): Store {
const app = getOwner(injections);
const orbitConfig = app.lookup('ember-orbit:config');

injections.source = app.lookup(`${orbitConfig.types.source}:store`);
if (app) {
const orbitConfig = app.lookup('ember-orbit:config');

injections.source = app.lookup(`${orbitConfig.types.source}:store`);
}

return Store.create(injections);
}
Expand Down
4 changes: 2 additions & 2 deletions addon/-private/model-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ export default class ModelFactory {

if (!modelFactory) {
let owner = getOwner(this.#cache);
let orbitConfig = owner.lookup('ember-orbit:config');
let orbitConfig = owner?.lookup('ember-orbit:config');

modelFactory = owner.factoryFor(
modelFactory = owner?.factoryFor(
`${orbitConfig.types.model}:${type}`
) as Factory;

Expand Down
2 changes: 1 addition & 1 deletion addon/-private/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export default class Store {
settings.cacheSettings.debounceLiveQueries ??= false;

const forkedSource = this.source.fork(settings);
const injections = getOwner(this).ownerInjection();
const injections = getOwner(this)?.ownerInjection();

return new Store({
...injections,
Expand Down
45 changes: 24 additions & 21 deletions addon/-private/utils/standard-injections.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,30 @@ export function applyStandardSourceInjections(
injections: RecordSourceSettings
): void {
const app = getOwner(injections);
const orbitConfig = app.lookup('ember-orbit:config');

if (!orbitConfig.skipSchemaService) {
injections.schema = app.lookup(`service:${orbitConfig.services.schema}`);
}
if (!orbitConfig.skipBucketService) {
injections.bucket = app.lookup(`service:${orbitConfig.services.bucket}`);
}
if (!orbitConfig.skipKeyMapService) {
injections.keyMap = app.lookup(`service:${orbitConfig.services.keyMap}`);
}
if (!orbitConfig.skipNormalizerService) {
injections.normalizer = app.lookup(
`service:${orbitConfig.services.normalizer}`
);
}
if (orbitConfig.skipValidatorService) {
injections.autoValidate = false;
} else {
injections.validatorFor = app.lookup(
`service:${orbitConfig.services.validator}`
);
if (app) {
const orbitConfig = app.lookup('ember-orbit:config');

if (!orbitConfig.skipSchemaService) {
injections.schema = app.lookup(`service:${orbitConfig.services.schema}`);
}
if (!orbitConfig.skipBucketService) {
injections.bucket = app.lookup(`service:${orbitConfig.services.bucket}`);
}
if (!orbitConfig.skipKeyMapService) {
injections.keyMap = app.lookup(`service:${orbitConfig.services.keyMap}`);
}
if (!orbitConfig.skipNormalizerService) {
injections.normalizer = app.lookup(
`service:${orbitConfig.services.normalizer}`
);
}
if (orbitConfig.skipValidatorService) {
injections.autoValidate = false;
} else {
injections.validatorFor = app.lookup(
`service:${orbitConfig.services.validator}`
);
}
}
}
8 changes: 4 additions & 4 deletions tests/support/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ export function createStore(
) {
initializeConfig(owner);
initializeServices(owner);
let orbitConfig = owner.lookup('ember-orbit:config');
let orbitConfig = owner?.lookup('ember-orbit:config');

if (models) {
let types: string[] = [];
Object.keys(models).forEach((type: string) => {
owner.register(`${orbitConfig.types.model}:${type}`, models[type]);
owner?.register(`${orbitConfig.types.model}:${type}`, models[type]);
types.push(type);
});

owner.register('ember-orbit:model-names', types, {
owner?.register('ember-orbit:model-names', types, {
instantiate: false
});
}

return owner.lookup(`service:${orbitConfig.services.store}`);
return owner?.lookup(`service:${orbitConfig.services.store}`);
}