Skip to content

Commit

Permalink
Add @typescript-eslint/consistent-type-imports eslint rule
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesfries committed Dec 29, 2024
1 parent 3be007d commit 6f9afd1
Show file tree
Hide file tree
Showing 17 changed files with 38 additions and 24 deletions.
9 changes: 8 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,14 @@ module.exports = {
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
],
rules: {},
rules: {
'@typescript-eslint/consistent-type-imports': [
'warn',
{
disallowTypeAnnotations: false,
},
],
},
},
// node files
{
Expand Down
2 changes: 1 addition & 1 deletion addon/-private/flatten-doc-snapshot.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DocumentSnapshot } from 'firebase/firestore';
import type { DocumentSnapshot } from 'firebase/firestore';

export default function flattenDocSnapshot(docSnapshot: DocumentSnapshot): {
id: string;
Expand Down
9 changes: 5 additions & 4 deletions addon/adapters/cloud-firestore-modular.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { getOwner } from '@ember/application';
import { service } from '@ember/service';
import Adapter from '@ember-data/adapter';
import DS, { type ModelSchema } from 'ember-data';
import type DS from 'ember-data';
import { type ModelSchema } from 'ember-data';
import type ModelRegistry from 'ember-data/types/registries/model';
import RSVP from 'rsvp';
import Store from '@ember-data/store';
import type Store from '@ember-data/store';

import {
import type {
CollectionReference,
DocumentReference,
Firestore,
Expand All @@ -25,7 +26,7 @@ import {
writeBatch,
} from 'ember-cloud-firestore-adapter/firebase/firestore';
import AdapterRecordNotFoundError from 'ember-cloud-firestore-adapter/utils/custom-errors';
import FirestoreDataManager from 'ember-cloud-firestore-adapter/services/-firestore-data-manager';
import type FirestoreDataManager from 'ember-cloud-firestore-adapter/services/-firestore-data-manager';
import buildCollectionName from 'ember-cloud-firestore-adapter/-private/build-collection-name';
import flattenDocSnapshot from 'ember-cloud-firestore-adapter/-private/flatten-doc-snapshot';

Expand Down
7 changes: 4 additions & 3 deletions addon/serializers/cloud-firestore-modular.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
*/

import { isNone } from '@ember/utils';
import DS, { type ModelSchema } from 'ember-data';
import type DS from 'ember-data';
import { type ModelSchema } from 'ember-data';
import JSONSerializer from '@ember-data/serializer/json';
import Store from '@ember-data/store';
import type Store from '@ember-data/store';

import {
import type {
CollectionReference,
DocumentReference,
Firestore,
Expand Down
4 changes: 2 additions & 2 deletions addon/services/-firestore-data-manager.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { next } from '@ember/runloop';
import DS from 'ember-data';
import type DS from 'ember-data';
import type ModelRegistry from 'ember-data/types/registries/model';
import Service, { service } from '@ember/service';
import StoreService from '@ember-data/store';
import type StoreService from '@ember-data/store';

import type {
CollectionReference,
Expand Down
3 changes: 2 additions & 1 deletion addon/transforms/timestamp.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { typeOf } from '@ember/utils';
import Transform from '@ember-data/serializer/transform';

import { FieldValue, Timestamp } from 'firebase/firestore';
import type { FieldValue } from 'firebase/firestore';
import { Timestamp } from 'firebase/firestore';

import { serverTimestamp } from 'ember-cloud-firestore-adapter/firebase/firestore';

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/features-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { click, visit, waitFor } from '@ember/test-helpers';
import { module, test } from 'qunit';
import { setupApplicationTest } from 'ember-qunit';

import { Firestore } from 'firebase/firestore';
import type { Firestore } from 'firebase/firestore';

import {
doc,
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/controllers/application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { service } from '@ember/service';
import Controller from '@ember/controller';

import type { Auth } from 'firebase/auth';
import SessionService from 'ember-simple-auth/services/session';
import type SessionService from 'ember-simple-auth/services/session';

import {
createUserWithEmailAndPassword,
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/controllers/query.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { action } from '@ember/object';
import Controller from '@ember/controller';

import { CollectionReference } from 'firebase/firestore';
import type { CollectionReference } from 'firebase/firestore';

import {
query,
Expand Down
4 changes: 2 additions & 2 deletions tests/dummy/app/models/group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import/no-cycle: off,
*/

import DS from 'ember-data';
import type DS from 'ember-data';
import Model, { attr, hasMany } from '@ember-data/model';

import { Query } from 'firebase/firestore';
import type { Query } from 'firebase/firestore';

import { limit, query } from 'ember-cloud-firestore-adapter/firebase/firestore';
import type PostModel from './post';
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/models/post.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import/no-cycle: off,
*/

import DS from 'ember-data';
import type DS from 'ember-data';
import Model, { attr, belongsTo } from '@ember-data/model';

import type { Firestore } from 'firebase/firestore';
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/models/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import/no-cycle: off,
*/

import DS from 'ember-data';
import type DS from 'ember-data';
import Model, { attr, hasMany } from '@ember-data/model';

import type GroupModel from './group';
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/routes/application.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { service } from '@ember/service';
import Route from '@ember/routing/route';

import SessionService from 'ember-simple-auth/services/session';
import type SessionService from 'ember-simple-auth/services/session';

export default class ApplicationRoute extends Route {
@service
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/routes/find-all.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { service } from '@ember/service';
import ArrayProxy from '@ember/array/proxy';
import type ArrayProxy from '@ember/array/proxy';
import Route from '@ember/routing/route';
import type Store from '@ember-data/store';

Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/routes/query.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { service } from '@ember/service';
import ArrayProxy from '@ember/array/proxy';
import type ArrayProxy from '@ember/array/proxy';
import Route from '@ember/routing/route';
import type Store from '@ember-data/store';

Expand Down
6 changes: 5 additions & 1 deletion tests/unit/adapters/cloud-firestore-modular-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ import EmberObject from '@ember/object';

import Store from '@ember-data/store';
import type { ModelSchema } from 'ember-data';
import { CollectionReference, Firestore, WriteBatch } from 'firebase/firestore';
import type {
CollectionReference,
Firestore,
WriteBatch,
} from 'firebase/firestore';
import sinon from 'sinon';

import {
Expand Down
2 changes: 1 addition & 1 deletion types/ember-simple-auth/services/session.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import Service from '@ember/service';
import Evented from '@ember/object/evented';

import firebase from 'firebase/compat/app';
import type firebase from 'firebase/compat/app';

interface Data {
authenticated: {
Expand Down

0 comments on commit 6f9afd1

Please sign in to comment.