Skip to content

Commit

Permalink
chore: more eslint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
josemarluedke committed Jan 18, 2025
1 parent 8c28547 commit 6801a5c
Show file tree
Hide file tree
Showing 11 changed files with 76 additions and 59 deletions.
25 changes: 19 additions & 6 deletions glimmer-apollo/babel.config.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
{
"plugins": [
["@babel/plugin-transform-typescript", { "allExtensions": true, "onlyRemoveTypeImports": true, "allowDeclareFields": true }],
[
"@babel/plugin-transform-typescript",
{
"allExtensions": true,
"onlyRemoveTypeImports": true,
"allowDeclareFields": true
}
],
"@embroider/addon-dev/template-colocation-plugin",
["babel-plugin-ember-template-compilation", {
"targetFormat": "hbs",
"transforms": []
}],
["module:decorator-transforms", { "runtime": { "import": "decorator-transforms/runtime" } }],
[
"babel-plugin-ember-template-compilation",
{
"targetFormat": "hbs",
"transforms": []
}
],
[
"module:decorator-transforms",
{ "runtime": { "import": "decorator-transforms/runtime" } }
]
]
}
18 changes: 9 additions & 9 deletions glimmer-apollo/src/-private/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ const DEFAULT_CLIENT_ID = 'default';
export function setClient<TCache = unknown>(
context: object,
client: ApolloClient<TCache>,
clientId: string = DEFAULT_CLIENT_ID
clientId: string = DEFAULT_CLIENT_ID,
): void {
const owner = getOwner(context) as Owner | null;

if (!owner) {
throw new Error(
'Unable to find owner from the given context in glimmer-apollo setClient'
'Unable to find owner from the given context in glimmer-apollo setClient',
);
}

Expand All @@ -35,20 +35,20 @@ export function setClient<TCache = unknown>(

export function getClient<TCache = unknown>(
context: object,
clientId: string = DEFAULT_CLIENT_ID
clientId: string = DEFAULT_CLIENT_ID,
): ApolloClient<TCache> {
const owner = getOwner(context)
const owner = getOwner(context);

if (!owner) {
throw new Error(
'Unable to find owner from the given context in glimmer-apollo getClient'
'Unable to find owner from the given context in glimmer-apollo getClient',
);
}

const client = CLIENTS.get(owner)?.get(clientId);
if (!client) {
throw new Error(
`Apollo client with id ${clientId} has not been set yet, use setClient(new ApolloClient({ ... }, '${clientId}')) to define it`
`Apollo client with id ${clientId} has not been set yet, use setClient(new ApolloClient({ ... }, '${clientId}')) to define it`,
);
}

Expand All @@ -59,7 +59,7 @@ export function clearClients(context: object): void {
const owner = getOwner(context) as Owner | null;
if (!owner) {
throw new Error(
'Unable to find owner from the given context in glimmer-apollo clearClients'
'Unable to find owner from the given context in glimmer-apollo clearClients',
);
}

Expand All @@ -74,12 +74,12 @@ export function clearClients(context: object): void {

export function clearClient(
context: object,
clientId: string = DEFAULT_CLIENT_ID
clientId: string = DEFAULT_CLIENT_ID,
): void {
const owner = getOwner(context) as Owner | null;
if (!owner) {
throw new Error(
'Unable to find owner from the given context in glimmer-apollo clearClient'
'Unable to find owner from the given context in glimmer-apollo clearClient',
);
}

Expand Down
2 changes: 1 addition & 1 deletion glimmer-apollo/src/-private/mutation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export class MutationResource<
})
.catch((error: ApolloError) => {
this.#onError(error);
return this.data
return this.data;
});

return this.promise;
Expand Down
16 changes: 8 additions & 8 deletions glimmer-apollo/src/-private/query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
isDestroyed,
isDestroying,
tracked,
waitForPromise
waitForPromise,
} from '../environment.ts';
import { getClient } from './client.ts';
import ObservableResource from './observable.ts';
Expand All @@ -17,7 +17,7 @@ import type {
OperationVariables,
WatchQueryOptions,
ObservableSubscription,
ObservableQuery
ObservableQuery,
} from '@apollo/client/core';
import type { TemplateArgs } from './types';

Expand All @@ -32,12 +32,12 @@ export interface QueryOptions<TData, TVariables extends OperationVariables>

export type QueryPositionalArgs<
TData,
TVariables extends OperationVariables = OperationVariables
TVariables extends OperationVariables = OperationVariables,
> = [DocumentNode, QueryOptions<TData, TVariables>?];

export class QueryResource<
TData,
TVariables extends OperationVariables = OperationVariables
TVariables extends OperationVariables = OperationVariables,
> extends ObservableResource<
TData,
TVariables,
Expand All @@ -52,7 +52,7 @@ export class QueryResource<
#subscription?: ObservableSubscription;
#previousPositionalArgs: typeof this.args.positional | undefined;

#firstPromiseReject: (()=>unknown) | undefined;
#firstPromiseReject: (() => unknown) | undefined;

/** @internal */
setup(): void {
Expand Down Expand Up @@ -89,11 +89,11 @@ export class QueryResource<

const observable = client.watchQuery({
query,
...options
...options,
});

this._setObservable(
observable as ObservableQuery<TData, OperationVariables>
observable as ObservableQuery<TData, OperationVariables>,
);

this.#subscription = observable.subscribe(
Expand All @@ -110,7 +110,7 @@ export class QueryResource<
this.#firstPromiseReject();
this.#firstPromiseReject = undefined;
}
}
},
);

waitForPromise(promise).catch(() => {
Expand Down
12 changes: 6 additions & 6 deletions glimmer-apollo/src/-private/subscription.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
isDestroyed,
isDestroying,
tracked,
waitForPromise
waitForPromise,
} from '../environment.ts';
import { Resource } from './resource.ts';
import { ApolloError } from '@apollo/client/core';
Expand All @@ -12,7 +12,7 @@ import type {
OperationVariables,
FetchResult,
SubscriptionOptions as ApolloSubscriptionOptions,
ObservableSubscription
ObservableSubscription,
} from '@apollo/client/core';
import { equal } from '@wry/equality';
import { getFastboot, createPromise, settled } from './utils.ts';
Expand All @@ -29,12 +29,12 @@ export interface SubscriptionOptions<TData, TVariables>

export type SubscriptionPositionalArgs<
TData,
TVariables = OperationVariables
TVariables = OperationVariables,
> = [DocumentNode, SubscriptionOptions<TData, TVariables>?];

export class SubscriptionResource<
TData,
TVariables extends OperationVariables = OperationVariables
TVariables extends OperationVariables = OperationVariables,
> extends Resource<
TemplateArgs<SubscriptionPositionalArgs<TData, TVariables>>
> {
Expand Down Expand Up @@ -63,7 +63,7 @@ export class SubscriptionResource<
this.promise = promise;
const observable = client.subscribe({
query,
...(options || {})
...(options || {}),
});

this.#subscription = observable.subscribe({
Expand Down Expand Up @@ -92,7 +92,7 @@ export class SubscriptionResource<
return;
}
this.#onComplete();
}
},
});

waitForPromise(promise).catch(() => {
Expand Down
4 changes: 2 additions & 2 deletions glimmer-apollo/src/-private/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export interface TemplateArgs<
T extends readonly unknown[] = readonly unknown[]
T extends readonly unknown[] = readonly unknown[],
> {
positional: T;
named: Record<string, unknown>;
Expand All @@ -12,5 +12,5 @@ export interface Fastboot {

export declare function IWaitForPromise<T, KindOfPromise extends Promise<T>>(
promise: KindOfPromise,
label?: string
label?: string,
): KindOfPromise;
20 changes: 10 additions & 10 deletions glimmer-apollo/src/-private/usables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ import { type MutationPositionalArgs, MutationResource } from './mutation.ts';
import { type QueryPositionalArgs, QueryResource } from './query.ts';
import {
type SubscriptionPositionalArgs,
SubscriptionResource
SubscriptionResource,
} from './subscription.ts';
import type { OperationVariables } from '@apollo/client/core';

export function useQuery<
TData = unknown,
TVariables extends OperationVariables = OperationVariables
TVariables extends OperationVariables = OperationVariables,
>(
parentDestroyable: object,
args: () => QueryPositionalArgs<TData, TVariables>
args: () => QueryPositionalArgs<TData, TVariables>,
): QueryResource<TData, TVariables> {
return useResource<
QueryPositionalArgs<TData, TVariables>,
Expand All @@ -22,10 +22,10 @@ export function useQuery<

export function useMutation<
TData = unknown,
TVariables extends OperationVariables = OperationVariables
TVariables extends OperationVariables = OperationVariables,
>(
parentDestroyable: object,
args: () => MutationPositionalArgs<TData, TVariables>
args: () => MutationPositionalArgs<TData, TVariables>,
): MutationResource<TData, TVariables> {
return useResource<
MutationPositionalArgs<TData, TVariables>,
Expand All @@ -35,10 +35,10 @@ export function useMutation<

export function useSubscription<
TData = unknown,
TVariables extends OperationVariables = OperationVariables
TVariables extends OperationVariables = OperationVariables,
>(
parentDestroyable: object,
args: () => SubscriptionPositionalArgs<TData, TVariables>
args: () => SubscriptionPositionalArgs<TData, TVariables>,
): SubscriptionResource<TData, TVariables> {
return useResource<
SubscriptionPositionalArgs<TData, TVariables>,
Expand All @@ -48,7 +48,7 @@ export function useSubscription<

export type UseQuery<
TData = unknown,
TVariables extends OperationVariables = OperationVariables
TVariables extends OperationVariables = OperationVariables,
> = {
args: () => QueryPositionalArgs<TData, TVariables>[1];
return: QueryResource<TData, TVariables>;
Expand All @@ -58,7 +58,7 @@ export type UseQuery<

export type UseMutation<
TData = unknown,
TVariables extends OperationVariables = OperationVariables
TVariables extends OperationVariables = OperationVariables,
> = {
args: () => MutationPositionalArgs<TData, TVariables>[1];
return: MutationResource<TData, TVariables>;
Expand All @@ -68,7 +68,7 @@ export type UseMutation<

export type UseSubscription<
TData = unknown,
TVariables extends OperationVariables = OperationVariables
TVariables extends OperationVariables = OperationVariables,
> = {
args: () => SubscriptionPositionalArgs<TData, TVariables>[1];
return: SubscriptionResource<TData, TVariables>;
Expand Down
11 changes: 7 additions & 4 deletions glimmer-apollo/src/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@ export {
isDestroyed,
destroy,
registerDestructor,
associateDestroyableChild
associateDestroyableChild,
} from '@ember/destroyable';
export { waitForPromise } from '@ember/test-waiters';

export {
invokeHelper ,
invokeHelper,
setHelperManager,
capabilities as helperCapabilities
capabilities as helperCapabilities,
} from '@ember/helper';

export function getOwner(obj: object): Owner | undefined {
if (obj instanceof ApplicationInstance || ('lookup' in obj && 'factoryFor' in obj)) {
if (
obj instanceof ApplicationInstance ||
('lookup' in obj && 'factoryFor' in obj)
) {
return obj as Owner;
}

Expand Down
10 changes: 5 additions & 5 deletions glimmer-apollo/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@ export {
getClient,
setClient,
clearClient,
clearClients
clearClients,
} from './-private/client.ts';
export { gql } from '@apollo/client/core';
export { useQuery, useMutation, useSubscription } from './-private/usables.ts';
export type {
UseQuery,
UseMutation,
UseSubscription
UseSubscription,
} from './-private/usables.ts';
export type {
QueryOptions,
QueryResource,
QueryPositionalArgs
QueryPositionalArgs,
} from './-private/query.ts';
export type {
MutationOptions,
MutationResource,
MutationPositionalArgs
MutationPositionalArgs,
} from './-private/mutation.ts';
export type {
SubscriptionOptions,
SubscriptionResource,
SubscriptionPositionalArgs
SubscriptionPositionalArgs,
} from './-private/subscription.ts';
9 changes: 2 additions & 7 deletions glimmer-apollo/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"extends": "@tsconfig/ember/tsconfig.json",
"include": [
"src/**/*",
"unpublished-development-types/**/*"
],
"include": ["src/**/*", "unpublished-development-types/**/*"],
"glint": {
"environment": ["ember-loose", "ember-template-imports"]
},
Expand Down Expand Up @@ -50,8 +47,6 @@
*/
"allowImportingTsExtensions": true,

"types": [
"ember-source/types"
]
"types": ["ember-source/types"]
}
}
Loading

0 comments on commit 6801a5c

Please sign in to comment.