Skip to content
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
16 changes: 2 additions & 14 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,13 @@
import EmberApplication from '@ember/application';
import { StrictResolver } from './strict-resolver.ts';

type ExportableType =
| undefined
| null
| object
| number
| string
| boolean
// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
| Function;

export default class EmberApp extends EmberApplication {
Resolver = {
create: ({
namespace,
}: {
namespace: {
modules: Record<string, Record<string, unknown>>;
modules: Record<string, unknown>;
plurals?: Record<string, string>;
};
}) => {
Expand All @@ -35,9 +25,7 @@ export default class EmberApp extends EmberApplication {
@public
*/
declare modules?: {
[modulePath: string]:
| ExportableType
| { [exportName: string]: ExportableType };
[modulePath: string]: unknown;
};

// TODO: I don't think I really want to add this, but I also don't want to
Expand Down
6 changes: 3 additions & 3 deletions src/strict-resolver.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import type { Factory, Resolver } from '@ember/owner';

export class StrictResolver implements Resolver {
#modules = new Map<string, Record<string, unknown>>();
#modules = new Map<string, unknown>();
#plurals = new Map<string, string>();
original: any;

constructor(
modules: Record<string, Record<string, unknown>>,
modules: Record<string, unknown>,
plurals: Record<string, string> | undefined = undefined,
) {
this.addModules(modules);
Expand All @@ -18,7 +18,7 @@ export class StrictResolver implements Resolver {
}
}

addModules(modules: Record<string, Record<string, unknown>>) {
addModules(modules: Record<string, unknown>) {
for (const [moduleName, module] of Object.entries(modules)) {
this.#modules.set(this.#normalizeModule(moduleName), module);
}
Expand Down
Loading