Skip to content

Commit a0375f5

Browse files
authored
chore: Use import/order eslint rule (#965)
1 parent ca6ccdb commit a0375f5

Some content is hidden

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

64 files changed

+179
-178
lines changed

.eslintrc

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,12 @@
4444
"import/no-mutable-exports": "error",
4545
"import/unambiguous": "error",
4646
"import/first": "error",
47-
// TODO next PR
48-
// "import/order": "error",
47+
"import/order": [
48+
"error",
49+
{
50+
"groups": ["builtin", "external", "internal", "parent", "sibling", "index"]
51+
}
52+
],
4953
"import/newline-after-import": "error",
5054
"import/no-unassigned-import": "error",
5155
"import/no-named-default": "error"
@@ -61,6 +65,7 @@
6165
"alwaysTryTypes": true,
6266
"project": ["packages/*/tsconfig.json"]
6367
}
64-
}
68+
},
69+
"import/internal-regex": "^@temporalio/"
6570
}
6671
}

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
# eslint-import-resolver-typescript requires packages to be built
121121
- name: Compile all non-rust code
122122
run: npm run build -- --ignore @temporalio/core-bridge
123-
- run: npm run lint
123+
- run: npm run lint.check
124124
- run: npm run lint.prune
125125

126126
# Compile native bridge code and isolate extension for Windows, Mac and Linux.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
"ci-stress": "node ./packages/test/lib/load/run-all-stress-ci-scenarios.js",
3030
"ci-nightly": "node ./packages/test/lib/load/run-all-nightly-scenarios.js",
3131
"wait-namespace": "node ./scripts/wait-on-temporal.mjs",
32-
"lint": "eslint packages/*/src --ext .ts --no-error-on-unmatched-pattern && prettier --end-of-line auto --check .",
32+
"lint": "eslint packages/*/src --ext .ts --no-error-on-unmatched-pattern --fix && prettier --write .",
33+
"lint.check": "eslint packages/*/src --ext .ts --no-error-on-unmatched-pattern && prettier --end-of-line auto --check .",
3334
"lint.prune": "ts-prune --error -p tsconfig.prune.json --ignore \"used in module\" --skip \".d.ts\"",
3435
"format": "prettier --write .",
3536
"clean": "node ./scripts/clean.mjs",

packages/activity/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
* @module
7070
*/
7171

72-
import { AbortSignal } from 'abort-controller';
7372
import { AsyncLocalStorage } from 'async_hooks';
73+
import { AbortSignal } from 'abort-controller';
7474
import { msToNumber } from '@temporalio/common/lib/time';
7575

7676
export {

packages/client/src/base-client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import os from 'os';
12
import { DataConverter, LoadedDataConverter } from '@temporalio/common';
23
import { isLoadedDataConverter, loadDataConverter } from '@temporalio/common/lib/internal-non-workflow';
34
import { Connection } from './connection';
45
import { ConnectionLike, Metadata } from './types';
5-
import os from 'os';
66

77
export interface BaseClientOptions {
88
/**

packages/client/src/connection.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { AsyncLocalStorage } from 'async_hooks';
12
import * as grpc from '@grpc/grpc-js';
3+
import type { RPCImpl } from 'protobufjs';
24
import { filterNullAndUndefined, normalizeTlsConfig, TLSConfig } from '@temporalio/common/lib/internal-non-workflow';
35
import { msOptionalToNumber } from '@temporalio/common/lib/time';
4-
import { AsyncLocalStorage } from 'async_hooks';
5-
import type { RPCImpl } from 'protobufjs';
66
import { isServerErrorResponse, ServiceError } from './errors';
77
import { defaultGrpcRetryOptions, makeGrpcRetryInterceptor } from './grpc-retry';
88
import pkg from './pkg';

packages/client/src/helpers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import {
66
} from '@temporalio/common';
77
import { optionalTsToDate, tsToDate } from '@temporalio/common/lib/time';
88
import { decodeMapFromPayloads } from '@temporalio/common/lib/internal-non-workflow/codec-helpers';
9-
import { RawWorkflowExecutionInfo, WorkflowExecutionInfo, WorkflowExecutionStatusName } from './types';
109
import { temporal } from '@temporalio/proto';
10+
import { RawWorkflowExecutionInfo, WorkflowExecutionInfo, WorkflowExecutionStatusName } from './types';
1111

1212
function workflowStatusCodeToName(code: temporal.api.enums.v1.WorkflowExecutionStatus): WorkflowExecutionStatusName {
1313
return workflowStatusCodeToNameInternal(code) ?? 'UNKNOWN';

packages/client/src/schedule-client.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import { status as grpcStatus } from '@grpc/grpc-js';
2+
import { v4 as uuid4 } from 'uuid';
23
import { mapToPayloads, searchAttributePayloadConverter } from '@temporalio/common';
34
import { composeInterceptors, Headers } from '@temporalio/common/lib/interceptors';
45
import {
56
encodeMapToPayloads,
67
decodeMapFromPayloads,
78
filterNullAndUndefined,
89
} from '@temporalio/common/lib/internal-non-workflow';
10+
import { temporal } from '@temporalio/proto';
11+
import { optionalDateToTs, optionalTsToDate, optionalTsToMs, tsToDate } from '@temporalio/common/lib/time';
912
import { CreateScheduleInput, CreateScheduleOutput, ScheduleClientInterceptor } from './interceptors';
1013
import { WorkflowService } from './types';
11-
import { v4 as uuid4 } from 'uuid';
1214
import { isServerErrorResponse, ServiceError } from './errors';
1315
import {
1416
Backfill,
@@ -19,8 +21,6 @@ import {
1921
ScheduleOverlapPolicy,
2022
ScheduleUpdateOptions,
2123
} from './schedule-types';
22-
import { temporal } from '@temporalio/proto';
23-
import { optionalDateToTs, optionalTsToDate, optionalTsToMs, tsToDate } from '@temporalio/common/lib/time';
2424
import {
2525
compileScheduleOptions,
2626
compileUpdatedScheduleOptions,

packages/client/src/schedule-helpers.ts

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import Long from 'long'; // eslint-disable-line import/no-named-as-default
12
import {
23
compileRetryPolicy,
34
decompileRetryPolicy,
@@ -14,6 +15,16 @@ import {
1415
encodeMapToPayloads,
1516
encodeToPayloads,
1617
} from '@temporalio/common/lib/internal-non-workflow';
18+
import { temporal } from '@temporalio/proto';
19+
import {
20+
msOptionalToTs,
21+
msToTs,
22+
optionalDateToTs,
23+
optionalTsToDate,
24+
optionalTsToMs,
25+
tsToDate,
26+
} from '@temporalio/common/lib/time';
27+
import { RequireAtLeastOne } from '@temporalio/common/src/type-helpers';
1728
import {
1829
CalendarSpec,
1930
CalendarSpecDescription,
@@ -37,18 +48,6 @@ import {
3748
ScheduleExecutionResult,
3849
ScheduleExecutionStartWorkflowActionResult,
3950
} from './schedule-types';
40-
import { temporal } from '@temporalio/proto';
41-
import {
42-
msOptionalToTs,
43-
msToTs,
44-
optionalDateToTs,
45-
optionalTsToDate,
46-
optionalTsToMs,
47-
tsToDate,
48-
} from '@temporalio/common/lib/time';
49-
import { RequireAtLeastOne } from '@temporalio/common/src/type-helpers';
50-
// eslint-disable-next-line import/no-named-as-default
51-
import Long from 'long';
5251

5352
const [encodeSecond, decodeSecond] = makeCalendarSpecFieldCoders(
5453
'second',

packages/client/src/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import type * as grpc from '@grpc/grpc-js';
12
import type { SearchAttributes } from '@temporalio/common';
23
import * as proto from '@temporalio/proto';
3-
import type * as grpc from '@grpc/grpc-js';
44
import { Replace } from '@temporalio/common/lib/type-helpers';
55

66
export interface WorkflowExecution {

0 commit comments

Comments
 (0)