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.

Sign up for GitHub

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

Add glint support #772

Merged
merged 1 commit into from
Jun 27, 2023
Merged

Add glint support #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ember-link/rollup.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export default defineConfig({
// addon. Anything not listed here may get optimized away.
addon.publicEntrypoints([
'index.js',
'template-registry.js',
'helpers/link.js',
'services/link-manager.js',
'test-support/index.js'
Expand Down
23 changes: 14 additions & 9 deletions ember-link/src/helpers/link.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import type { QueryParams } from '../-params';
import type Link from '../link';
import type LinkManagerService from '../services/link-manager';

export type LinkHelperPositionalParams = [] | RouteArgs;
type PositionalParams = [] | RouteArgs;

export interface LinkHelperNamedParams extends Partial<LinkParams>, Partial<LinkParams> {
interface NamedParams extends Partial<LinkParams> {
/**
* Optional shortcut for `models={{array model}}`.
*/
Expand Down Expand Up @@ -43,7 +43,15 @@ export interface LinkHelperNamedParams extends Partial<LinkParams>, Partial<Link
onReplaceWith?: () => void;
}

export default class LinkHelper extends Helper {
export interface LinkSignature {
Args: {
Positional: PositionalParams;
Named: NamedParams;
};
Return: Link;
}

export default class LinkHelper extends Helper<LinkSignature> {
@service('link-manager') private linkManager!: LinkManagerService;

/**
Expand All @@ -52,10 +60,7 @@ export default class LinkHelper extends Helper {
* @param positional [route?, ...models?, query?]
* @param named { route?, models?, model?, query? }
*/
private normalizeLinkParams(
positional: LinkHelperPositionalParams,
named: LinkHelperNamedParams
): LinkParams {
private normalizeLinkParams(positional: PositionalParams, named: NamedParams): LinkParams {
assert(
`You provided 'queryParams', but the parameter you mean is just 'query'.`,
!('queryParams' in named)
Expand All @@ -68,7 +73,7 @@ export default class LinkHelper extends Helper {
if (named.fromURL) {
assert(
`When specifying a serialized 'fromURL' ('${named.fromURL}'), you can't provide any further 'LinkParams'.`,
!(['route', 'models', 'model', 'query'] as (keyof LinkHelperNamedParams)[]).some(
!(['route', 'models', 'model', 'query'] as (keyof NamedParams)[]).some(
(name) => named[name]
)
);
Expand Down Expand Up @@ -133,7 +138,7 @@ export default class LinkHelper extends Helper {
};
}

compute(positional: LinkHelperPositionalParams, named: LinkHelperNamedParams): Link {
compute(positional: PositionalParams, named: NamedParams): Link {
const linkParams = this.normalizeLinkParams(positional, named);

return this.linkManager.createLink(linkParams);
Expand Down
5 changes: 5 additions & 0 deletions ember-link/src/template-registry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import type LinkHelper from './helpers/link';

export default interface LinkRegistry {
link: typeof LinkHelper;
}