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: clean up eslint rules #301

Merged
merged 2 commits into from
Apr 23, 2024
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 .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ module.exports = {
}],
'class-methods-use-this': 'off',
'no-underscore-dangle': 'off',
'ember/use-ember-data-rfc-395-imports': 'off',
},
overrides: [
// node files
Expand All @@ -77,7 +78,6 @@ module.exports = {
plugins: ['node'],
extends: ['plugin:node/recommended']
},
// test files
{
// test files
files: ['tests/**/*-test.{js,ts}'],
Expand Down
10 changes: 2 additions & 8 deletions addon/adapters/cloud-firestore-modular.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
/*
eslint
ember/use-ember-data-rfc-395-imports: off,
ember/no-ember-super-in-es-classes: off
*/

import { getOwner } from '@ember/application';
import { inject as service } from '@ember/service';
import Adapter from '@ember-data/adapter';
Expand Down Expand Up @@ -70,7 +64,7 @@ interface HasManyRelationshipMeta {
};
}

export default class CloudFirestoreModularAdapter extends Adapter {
export default class CloudFirestoreAdapter extends Adapter {
@service('-firestore-data-manager')
protected declare firestoreDataManager: FirestoreDataManager;

Expand Down Expand Up @@ -353,6 +347,6 @@ export default class CloudFirestoreModularAdapter extends Adapter {

declare module 'ember-data/types/registries/adapter' {
export default interface AdapterRegistry {
'cloud-firestore-modular': CloudFirestoreModularAdapter;
'cloud-firestore-modular': CloudFirestoreAdapter;
}
}
14 changes: 9 additions & 5 deletions addon/serializers/cloud-firestore-modular.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/*
eslint
@typescript-eslint/ban-types: off,
ember/use-ember-data-rfc-395-imports: off,
no-param-reassign: off,
*/

Expand Down Expand Up @@ -41,7 +39,7 @@ export default class CloudFirestoreSerializer extends JSONSerializer {
public extractRelationship(
relationshipModelName: string,
relationshipHash: DocumentReference,
): { id: string, type: string } | {} {
): { id: string, type: string } | Record<string, unknown> {
if (isNone(relationshipHash)) {
return super.extractRelationship(relationshipModelName, relationshipHash);
}
Expand All @@ -52,7 +50,10 @@ export default class CloudFirestoreSerializer extends JSONSerializer {
return { id: belongsToId, type: relationshipModelName };
}

public extractRelationships(modelClass: ModelClass, resourceHash: ResourceHash): {} {
public extractRelationships(
modelClass: ModelClass,
resourceHash: ResourceHash,
): Record<string, unknown> {
const newResourceHash = { ...resourceHash };
const links: { [key: string]: string } = {};

Expand Down Expand Up @@ -110,7 +111,10 @@ export default class CloudFirestoreSerializer extends JSONSerializer {
}
}

public serialize(snapshot: DS.Snapshot, options: {}): {} {
public serialize(
snapshot: DS.Snapshot,
options: Record<string, unknown>,
): Record<string, unknown> {
const json: { [key: string]: unknown } = { ...super.serialize(snapshot, options) };

snapshot.eachRelationship((name: string, relationship) => {
Expand Down
5 changes: 0 additions & 5 deletions addon/services/-firestore-data-manager.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
/*
eslint
ember/use-ember-data-rfc-395-imports: off
*/

import { next } from '@ember/runloop';
import DS from 'ember-data';
import ModelRegistry from 'ember-data/types/registries/model';
Expand Down
3 changes: 0 additions & 3 deletions tests/dummy/app/models/group.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/*
eslint
import/no-cycle: off,
@typescript-eslint/ban-ts-comment: off,
ember/use-ember-data-rfc-395-imports: off,
*/

import DS from 'ember-data';
Expand All @@ -22,7 +20,6 @@ export default class GroupModel extends Model {
declare public members: DS.PromiseManyArray<UserModel>;

@hasMany('post', {
// @ts-ignore: TODO - find a way to set custom property in RelationshipOptions interface
isRealtime: true,

filter(reference: Query) {
Expand Down
3 changes: 0 additions & 3 deletions tests/dummy/app/models/post.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/*
eslint
import/no-cycle: off,
@typescript-eslint/ban-ts-comment: off,
ember/use-ember-data-rfc-395-imports: off,
*/

import DS from 'ember-data';
Expand Down Expand Up @@ -31,7 +29,6 @@ export default class PostModel extends Model {
@belongsTo('user', {
inverse: null,

// @ts-ignore: TODO - find a way to set custom property in RelationshipOptions interface
buildReference(db: Firestore) {
return collection(db, 'publishers');
},
Expand Down
1 change: 0 additions & 1 deletion tests/dummy/app/models/user.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
eslint
import/no-cycle: off,
ember/use-ember-data-rfc-395-imports: off,
*/

import DS from 'ember-data';
Expand Down
1 change: 0 additions & 1 deletion tests/unit/services/-firestore-data-manager-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
import { waitUntil } from '@ember/test-helpers';
// eslint-disable-next-line ember/use-ember-data-rfc-395-imports
import DS from 'ember-data';
import RSVP from 'rsvp';
import Store from '@ember-data/store';
Expand Down
Loading