Skip to content

Commit f9fe702

Browse files
benwindingbenwinding
authored
Merge pull request #263 from amilosmanli/prettier-organize-imports
Ordering imports with prettier
2 parents fa7348f + 6941cc9 commit f9fe702

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+96
-90
lines changed

Diff for: ‎.prettierrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"singleQuote": true,
3-
"tabWidth": 2
3+
"tabWidth": 2,
4+
"organizeImportsSkipDestructiveCodeActions": true
45
}

Diff for: ‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"jest": "^23.6.0",
2929
"microbundle": "^0.15.0",
3030
"prettier": "^2.8.3",
31+
"prettier-plugin-organize-imports": "^3.2.2",
3132
"ra-core": "3.10.0",
3233
"ts-jest": "^25",
3334
"tslint": "^5.16.0",

Diff for: ‎src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { DataProvider } from './providers/DataProvider';
21
import { AuthProvider } from './providers/AuthProvider';
2+
import { DataProvider } from './providers/DataProvider';
33
import { RAFirebaseOptions } from './providers/options';
44

55
export {

Diff for: ‎src/misc/document-parser.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import {
2-
FireStoreQueryDocumentSnapshot,
32
FireStoreDocumentSnapshot,
3+
FireStoreQueryDocumentSnapshot,
44
} from './firebase-models';
55
import { logWarn } from './logger';
6+
import * as ra from './react-admin-models';
67
import {
78
applyRefDocs,
89
translateDocFromFirestore,
910
} from './translate-from-firestore';
10-
import * as ra from './react-admin-models';
1111

1212
export function parseFireStoreDocument<T extends ra.Record>(
1313
doc: FireStoreQueryDocumentSnapshot | FireStoreDocumentSnapshot | undefined

Diff for: ‎src/misc/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ export * from './objectFlatten';
99
export * from './pathHelper';
1010
export * from './react-admin-models';
1111
export * from './status-code-translator';
12+
export * from './storage-parser';
1213
export * from './translate-from-firestore';
1314
export * from './translate-to-firestore';
14-
export * from './storage-parser';

Diff for: ‎src/misc/logger/firestore-logger.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { RAFirebaseOptions } from 'providers/options';
2-
import { LogNoOp, LoggerBase } from './logger-base';
2+
import { LoggerBase, LogNoOp } from './logger-base';
33

44
const LOGGER_ENABLEDKEY = 'LOGGING_FIRESTORE_COSTS_ENABLED';
55
const logger = new LoggerBase('💸firestore-costs:', LOGGER_ENABLEDKEY);

Diff for: ‎src/misc/logger/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export * from './logger-base';
2-
export * from './logger';
31
export * from './firestore-logger';
2+
export * from './logger';
3+
export * from './logger-base';

Diff for: ‎src/misc/react-admin-models.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// React-Admin Core
22
export {
3+
AuthProvider,
34
CreateParams,
45
CreateResult,
56
DataProvider,
@@ -15,12 +16,11 @@ export {
1516
GetManyResult,
1617
GetOneParams,
1718
GetOneResult,
19+
Identifier,
1820
Record,
1921
UpdateManyParams,
2022
UpdateManyResult,
2123
UpdateParams,
2224
UpdateResult,
23-
Identifier,
24-
AuthProvider,
2525
UserIdentity,
2626
} from 'ra-core';

Diff for: ‎src/misc/translate-from-firestore.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { set, has } from 'lodash';
1+
import { has, set } from 'lodash';
22
import { IFirebaseWrapper } from 'providers/database';
3+
import { FireStoreDocumentRef } from './firebase-models';
34
import { REF_INDENTIFIER } from './internal.models';
45
import { logError } from './logger';
5-
import { FireStoreDocumentRef } from './firebase-models';
66

77
export interface RefDocFound {
88
fieldPath: string;

Diff for: ‎src/providers/AuthProvider.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { messageTypes } from './../misc/messageTypes';
2-
import { log, retrieveStatusTxt, logWarn, logger } from '../misc';
3-
import { RAFirebaseOptions } from './options';
4-
import { FirebaseWrapper } from './database/firebase/FirebaseWrapper';
1+
import { log, logger, logWarn, retrieveStatusTxt } from '../misc';
2+
import { FireUser } from '../misc/firebase-models';
53
import {
64
AuthProvider as RaAuthProvider,
75
UserIdentity,
86
} from '../misc/react-admin-models';
7+
import { messageTypes } from './../misc/messageTypes';
98
import { IFirebaseWrapper } from './database';
10-
import { FireUser } from '../misc/firebase-models';
9+
import { FirebaseWrapper } from './database/firebase/FirebaseWrapper';
10+
import { RAFirebaseOptions } from './options';
1111

1212
class AuthClient {
1313
private fireWrapper: IFirebaseWrapper;

Diff for: ‎src/providers/DataProvider.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import {
22
getAbsolutePath,
33
log,
4-
logger,
5-
retrieveStatusCode,
64
logError,
5+
logger,
76
MakeFirestoreLogger,
7+
retrieveStatusCode,
88
} from '../misc';
9+
import { FireApp } from '../misc/firebase-models';
910
import * as ra from '../misc/react-admin-models';
10-
import { RAFirebaseOptions } from './options';
11+
import { Create, Delete, DeleteMany, Update, UpdateMany } from './commands';
1112
import { FirebaseWrapper } from './database/firebase/FirebaseWrapper';
12-
import { FireApp } from '../misc/firebase-models';
1313
import { FireClient } from './database/FireClient';
14+
import { RAFirebaseOptions } from './options';
1415
import { GetList, GetMany, GetManyReference, GetOne } from './queries';
15-
import { Create, Delete, DeleteMany, Update, UpdateMany } from './commands';
1616

1717
export interface IDataProvider extends ra.DataProvider {
1818
app: FireApp;

Diff for: ‎src/providers/commands/Create.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { FireClient } from '../database/FireClient';
21
import { log } from '../../misc';
32
import * as ra from '../../misc/react-admin-models';
3+
import { FireClient } from '../database/FireClient';
44

55
export async function Create<T extends ra.Record>(
66
resourceName: string,

Diff for: ‎src/providers/commands/Delete.Soft.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { FireClient } from '../database/FireClient';
21
import { log, logError } from '../../misc';
32
import * as ra from '../../misc/react-admin-models';
3+
import { FireClient } from '../database/FireClient';
44

55
export async function DeleteSoft<T extends ra.Record>(
66
resourceName: string,

Diff for: ‎src/providers/commands/Delete.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { FireClient } from '../database/FireClient';
21
import { log } from '../../misc';
32
import * as ra from '../../misc/react-admin-models';
3+
import { FireClient } from '../database/FireClient';
44
import { DeleteSoft } from './Delete.Soft';
55

66
export async function Delete<T extends ra.Record>(

Diff for: ‎src/providers/commands/DeleteMany.Soft.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { FireClient } from '../database/FireClient';
21
import { log, logError } from '../../misc';
32
import * as ra from '../../misc/react-admin-models';
3+
import { FireClient } from '../database/FireClient';
44

55
export async function DeleteManySoft(
66
resourceName: string,

Diff for: ‎src/providers/commands/DeleteMany.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { FireClient } from '../database/FireClient';
21
import { log } from '../../misc';
32
import * as ra from '../../misc/react-admin-models';
3+
import { FireClient } from '../database/FireClient';
44
import { DeleteManySoft } from './DeleteMany.Soft';
55

66
export async function DeleteMany(

Diff for: ‎src/providers/commands/Update.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { FireClient } from '../database/FireClient';
21
import { log } from '../../misc';
32
import * as ra from '../../misc/react-admin-models';
3+
import { FireClient } from '../database/FireClient';
44

55
export async function Update<T extends ra.Record>(
66
resourceName: string,

Diff for: ‎src/providers/commands/UpdateMany.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { FireClient } from '../database/FireClient';
21
import { log } from '../../misc';
32
import * as ra from '../../misc/react-admin-models';
3+
import { FireClient } from '../database/FireClient';
44

55
export async function UpdateMany(
66
resourceName: string,

Diff for: ‎src/providers/commands/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export * from './Create';
2-
export * from './Delete.Soft';
32
export * from './Delete';
4-
export * from './DeleteMany.Soft';
3+
export * from './Delete.Soft';
54
export * from './DeleteMany';
5+
export * from './DeleteMany.Soft';
66
export * from './Update';
77
export * from './UpdateMany';

Diff for: ‎src/providers/database/FireClient.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
import { set, get } from 'lodash';
2-
import {
3-
TASK_CANCELED,
4-
TASK_PAUSED,
5-
TASK_RUNNING,
6-
} from '../../misc/firebase-models';
1+
import { get, set } from 'lodash';
72
import {
83
AddCreatedByFields,
94
AddUpdatedByFields,
5+
dispatch,
106
IFirestoreLogger,
117
joinPaths,
128
log,
139
logError,
14-
dispatch,
15-
translateDocToFirestore,
1610
parseStoragePath,
11+
translateDocToFirestore,
1712
} from '../../misc';
13+
import {
14+
TASK_CANCELED,
15+
TASK_PAUSED,
16+
TASK_RUNNING,
17+
} from '../../misc/firebase-models';
1818
import { RAFirebaseOptions } from '../options';
1919
import { IFirebaseWrapper } from './firebase/IFirebaseWrapper';
2020
import { IResource, ResourceManager } from './ResourceManager';

Diff for: ‎src/providers/database/ResourceManager.ts

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { RAFirebaseOptions } from '../options';
2-
import { IFirebaseWrapper } from './firebase/IFirebaseWrapper';
1+
import { FireStoreCollectionRef } from 'misc/firebase-models';
32
import {
4-
log,
53
getAbsolutePath,
6-
messageTypes,
7-
logWarn,
84
IFirestoreLogger,
5+
log,
6+
logWarn,
7+
messageTypes,
98
parseFireStoreDocument,
109
} from '../../misc';
11-
import { FireStoreCollectionRef } from 'misc/firebase-models';
10+
import { RAFirebaseOptions } from '../options';
11+
import { IFirebaseWrapper } from './firebase/IFirebaseWrapper';
1212

1313
type IResourceItem = {} & { id: string; deleted?: boolean };
1414
export interface IResource {
@@ -92,7 +92,9 @@ export class ResourceManager {
9292
const query = this.applyQuery(collection, collectionQuery);
9393
const newDocs = await query.get();
9494

95-
resource.list = newDocs.docs.map((doc) => parseFireStoreDocument<IResourceItem>(doc));
95+
resource.list = newDocs.docs.map((doc) =>
96+
parseFireStoreDocument<IResourceItem>(doc)
97+
);
9698
const count = newDocs.docs.length;
9799
this.flogger.logDocument(count)();
98100
log('resourceManager.RefreshResource', {

Diff for: ‎src/providers/database/firebase/FirebaseWrapper.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
import { IFirebaseWrapper } from './IFirebaseWrapper';
2-
31
import firebase from 'firebase/compat/app';
42
import 'firebase/compat/auth';
53
import 'firebase/compat/firestore';
64
import 'firebase/compat/storage';
7-
85
import { log } from 'misc';
9-
import { RAFirebaseOptions } from 'providers/options';
106
import {
117
FireApp,
128
FireAuth,
@@ -19,6 +15,8 @@ import {
1915
FireUploadTaskSnapshot,
2016
FireUser,
2117
} from 'misc/firebase-models';
18+
import { RAFirebaseOptions } from 'providers/options';
19+
import { IFirebaseWrapper } from './IFirebaseWrapper';
2220

2321
export class FirebaseWrapper implements IFirebaseWrapper {
2422
private firestore: FireStore;

Diff for: ‎src/providers/database/firebase/IFirebaseWrapper.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import { RAFirebaseOptions } from '../../options';
21
import {
32
FireApp,
43
FireAuth,
5-
FireUser,
64
FireAuthUserCredentials,
75
FireStorage,
8-
FireStore,
9-
FireStoreTimeStamp,
106
FireStoragePutFileResult,
11-
FireStoreCollectionRef,
7+
FireStore,
128
FireStoreBatch,
9+
FireStoreCollectionRef,
10+
FireStoreTimeStamp,
11+
FireUser,
1312
} from 'misc/firebase-models';
13+
import { RAFirebaseOptions } from '../../options';
1414

1515
export interface IFirebaseWrapper {
1616
options: RAFirebaseOptions;

Diff for: ‎src/providers/database/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export * from './ResourceManager';
2-
export * from './FireClient';
31
export * from './firebase/FirebaseWrapper';
42
export * from './firebase/IFirebaseWrapper';
3+
export * from './FireClient';
4+
export * from './ResourceManager';

Diff for: ‎src/providers/lazy-loading/FirebaseLazyLoadingClient.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1+
import {
2+
FireStoreCollectionRef,
3+
FireStoreDocumentSnapshot,
4+
} from 'misc/firebase-models';
5+
import { FireClient } from 'providers/database';
16
import {
27
log,
38
messageTypes,
49
parseFireStoreDocument,
510
recursivelyMapStorageUrls,
611
} from '../../misc';
12+
import * as ra from '../../misc/react-admin-models';
713
import { IResource, ResourceManager } from '../database/ResourceManager';
814
import { RAFirebaseOptions } from '../options';
9-
import * as ra from '../../misc/react-admin-models';
1015
import {
1116
getFullParamsForQuery,
1217
getNextPageParams,
1318
paramsToQuery,
1419
} from './paramsToQuery';
1520
import { clearQueryCursors, setQueryCursor } from './queryCursors';
16-
import { FireClient } from 'providers/database';
17-
import {
18-
FireStoreCollectionRef,
19-
FireStoreDocumentSnapshot,
20-
} from 'misc/firebase-models';
2121

2222
export class FirebaseLazyLoadingClient {
2323
constructor(

Diff for: ‎src/providers/queries/GetList.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { FireClient } from '../database/FireClient';
2-
import { FirebaseLazyLoadingClient } from '../lazy-loading/FirebaseLazyLoadingClient';
31
import {
42
filterArray,
53
log,
64
recursivelyMapStorageUrls,
75
sortArray,
86
} from '../../misc';
97
import * as ra from '../../misc/react-admin-models';
8+
import { FireClient } from '../database/FireClient';
9+
import { FirebaseLazyLoadingClient } from '../lazy-loading/FirebaseLazyLoadingClient';
1010

1111
export async function GetList<T extends ra.Record>(
1212
resourceName: string,

Diff for: ‎src/providers/queries/GetMany.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { FireClient } from '../database/FireClient';
21
import { log, recursivelyMapStorageUrls } from '../../misc';
32
import * as ra from '../../misc/react-admin-models';
3+
import { FireClient } from '../database/FireClient';
44

55
export async function GetMany<T extends ra.Record>(
66
resourceName: string,

Diff for: ‎src/providers/queries/GetManyReference.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { FireClient } from '../database/FireClient';
21
import {
32
filterArray,
43
log,
54
recursivelyMapStorageUrls,
65
sortArray,
76
} from '../../misc';
87
import * as ra from '../../misc/react-admin-models';
8+
import { FireClient } from '../database/FireClient';
99

1010
export async function GetManyReference<T extends ra.Record>(
1111
resourceName: string,

Diff for: ‎src/providers/queries/GetOne.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { FireClient } from '../database/FireClient';
21
import { log, translateDocFromFirestore } from '../../misc';
32
import * as ra from '../../misc/react-admin-models';
3+
import { FireClient } from '../database/FireClient';
44

55
export async function GetOne<T extends ra.Record>(
66
resourceName: string,

Diff for: ‎src/providers/queries/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export * from './GetOne';
21
export * from './GetList';
3-
export * from './GetManyReference';
42
export * from './GetMany';
3+
export * from './GetManyReference';
4+
export * from './GetOne';

0 commit comments

Comments
 (0)