Skip to content

Commit 203591b

Browse files
rjmunrorjmunro
committed
chore: Run yarn lint:fix to apply new import ordering
1 parent 5f1ceb5 commit 203591b

1,160 files changed

Lines changed: 8965 additions & 8105 deletions

File tree

Some content is hidden

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

‎meteor/__mocks__/_extendJest.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/error'
21
import { Meteor } from 'meteor/meteor'
3-
import { clone } from '@sofie-automation/corelib/dist/lib'
4-
import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
52
import _ from 'underscore'
3+
4+
import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/error'
5+
import { clone } from '@sofie-automation/corelib/dist/lib'
66
import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
7+
import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
78

89
// Include this file in to get access to the extended functions
910

‎meteor/__mocks__/_setupMocks.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import { LogLevel } from '@sofie-automation/meteor-lib/dist/lib'
2+
13
import { setLogLevel } from '../server/logging'
24
import { resetRandomId } from './random'
3-
import { LogLevel } from '@sofie-automation/meteor-lib/dist/lib'
45
import { SupressLogMessages } from './suppressLogging'
56

67
// This file is run before all tests start.

‎meteor/__mocks__/defaultCollectionObjects.ts‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
1-
import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
2-
import { clone } from '@sofie-automation/corelib/dist/lib'
3-
import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
4-
import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist'
5-
import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
6-
import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
7-
import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
81
import { IBlueprintPieceType, PieceLifespan } from '@sofie-automation/blueprints-integration'
9-
import { Piece, EmptyPieceTimelineObjectsBlob } from '@sofie-automation/corelib/dist/dataModel/Piece'
102
import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
11-
import { getRundownId } from '../server/api/ingest/lib'
12-
import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
13-
import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
143
import {
154
PartId,
165
PartInstanceId,
@@ -26,11 +15,23 @@ import {
2615
ShowStyleVariantId,
2716
StudioId,
2817
} from '@sofie-automation/corelib/dist/dataModel/Ids'
18+
import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
19+
import { PartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
20+
import { EmptyPieceTimelineObjectsBlob, Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
21+
import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
22+
import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
23+
import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist'
24+
import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
25+
import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
26+
import { clone } from '@sofie-automation/corelib/dist/lib'
27+
import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
28+
import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
2929
import {
3030
DEFAULT_FALLBACK_PART_DURATION,
3131
DEFAULT_MINIMUM_TAKE_SPAN,
3232
} from '@sofie-automation/shared-lib/dist/core/constants'
33-
import { PartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
33+
34+
import { getRundownId } from '../server/api/ingest/lib'
3435

3536
export function defaultRundownPlaylist(_id: RundownPlaylistId, studioId: StudioId): DBRundownPlaylist {
3637
return {

‎meteor/__mocks__/helpers/database.ts‎

Lines changed: 52 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,70 @@
11
import _ from 'underscore'
2+
23
import {
3-
PeripheralDevice,
4-
PeripheralDeviceType,
5-
PeripheralDeviceCategory,
6-
PERIPHERAL_SUBTYPE_PROCESS,
7-
PeripheralDeviceSubType,
8-
} from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
9-
import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
10-
import {
11-
PieceLifespan,
12-
IOutputLayer,
13-
ISourceLayer,
14-
SourceLayerType,
15-
StudioBlueprintManifest,
16-
BlueprintManifestType,
174
BlueprintManifestBase,
18-
ShowStyleBlueprintManifest,
19-
IShowStyleContext,
5+
BlueprintManifestType,
6+
BlueprintResultPart,
207
BlueprintResultRundown,
218
BlueprintResultSegment,
9+
IBlueprintActionManifest,
2210
IBlueprintAdLibPiece,
23-
IBlueprintRundown,
24-
IBlueprintSegment,
25-
BlueprintResultPart,
2611
IBlueprintPart,
2712
IBlueprintPiece,
28-
TriggerType,
29-
PlayoutActions,
30-
StatusCode,
3113
IBlueprintPieceType,
32-
IBlueprintActionManifest,
33-
SofieIngestSegment,
14+
IBlueprintRundown,
15+
IBlueprintSegment,
16+
IOutputLayer,
17+
IShowStyleContext,
18+
ISourceLayer,
19+
PieceLifespan,
20+
PlayoutActions,
21+
ShowStyleBlueprintManifest,
3422
SofieIngestRundown,
23+
SofieIngestSegment,
24+
SourceLayerType,
25+
StatusCode,
26+
StudioBlueprintManifest,
27+
TriggerType,
3528
} from '@sofie-automation/blueprints-integration'
36-
import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
37-
import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
29+
import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
3830
import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint'
39-
import { ICoreSystem, SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
40-
import { stripVersion } from '../../server/systemStatus/semverUtils'
41-
import { internalUploadBlueprint } from '../../server/api/blueprints/api'
42-
import { literal, getRandomId, getRandomString, normalizeArray } from '@sofie-automation/corelib/dist/lib'
43-
import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
44-
import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
45-
import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
31+
import {
32+
BlueprintId,
33+
RundownId,
34+
RundownPlaylistId,
35+
ShowStyleBaseId,
36+
ShowStyleVariantId,
37+
} from '@sofie-automation/corelib/dist/dataModel/Ids'
4638
import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
39+
import {
40+
PERIPHERAL_SUBTYPE_PROCESS,
41+
PeripheralDevice,
42+
PeripheralDeviceCategory,
43+
PeripheralDeviceSubType,
44+
PeripheralDeviceType,
45+
} from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
4746
import { EmptyPieceTimelineObjectsBlob, Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
48-
import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist'
47+
import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
4948
import { RundownBaselineAdLibItem } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibPiece'
50-
import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
51-
import { restartRandomId } from '../random'
52-
import { MongoMock } from '../mongo'
53-
import { defaultRundownPlaylist, defaultStudio } from '../defaultCollectionObjects'
54-
import { PackageInfo } from '../../server/coreSystem'
55-
import { DBTriggeredActions } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
56-
import { WorkerStatus } from '@sofie-automation/meteor-lib/dist/collections/Workers'
49+
import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist/RundownPlaylist'
50+
import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
51+
import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
52+
import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
53+
import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
5754
import { WorkerThreadStatus } from '@sofie-automation/corelib/dist/dataModel/WorkerThreads'
55+
import { getRandomId, getRandomString, literal, normalizeArray } from '@sofie-automation/corelib/dist/lib'
56+
import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
5857
import {
5958
applyAndValidateOverrides,
6059
wrapDefaultObject,
6160
} from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
62-
import {
63-
BlueprintId,
64-
RundownId,
65-
RundownPlaylistId,
66-
ShowStyleBaseId,
67-
ShowStyleVariantId,
68-
} from '@sofie-automation/corelib/dist/dataModel/Ids'
61+
import { ICoreSystem, SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
62+
import { DBTriggeredActions } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
63+
import { WorkerStatus } from '@sofie-automation/meteor-lib/dist/collections/Workers'
64+
import { JSONBlobStringify } from '@sofie-automation/shared-lib/dist/lib/JSONBlob'
65+
import { TSR_VERSION } from '@sofie-automation/shared-lib/dist/tsr'
66+
67+
import { internalUploadBlueprint } from '../../server/api/blueprints/api'
6968
import {
7069
AdLibPieces,
7170
CoreSystem,
@@ -83,8 +82,11 @@ import {
8382
Workers,
8483
WorkerThreadStatuses,
8584
} from '../../server/collections'
86-
import { TSR_VERSION } from '@sofie-automation/shared-lib/dist/tsr'
87-
import { JSONBlobStringify } from '@sofie-automation/shared-lib/dist/lib/JSONBlob'
85+
import { PackageInfo } from '../../server/coreSystem'
86+
import { stripVersion } from '../../server/systemStatus/semverUtils'
87+
import { defaultRundownPlaylist, defaultStudio } from '../defaultCollectionObjects'
88+
import { MongoMock } from '../mongo'
89+
import { restartRandomId } from '../random'
8890

8991
export enum LAYER_IDS {
9092
SOURCE_CAM0 = 'cam0',

‎meteor/__mocks__/helpers/lib.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import _ from 'underscore'
2-
import { LogLevel } from '@sofie-automation/meteor-lib/dist/lib'
2+
33
import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
4+
import { LogLevel } from '@sofie-automation/meteor-lib/dist/lib'
5+
46
import { AsyncOnlyMongoCollection } from '../../server/collections/collection'
57
import { getLogLevel, setLogLevel } from '../../server/logging'
68

‎meteor/__mocks__/koa-util.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import type Koa from 'koa'
21
import type KoaRouter from '@koa/router'
32
import { createMockContext, Options as MockContextOptions } from '@shopify/jest-koa-mocks'
3+
import type Koa from 'koa'
44

55
export async function callKoaRoute(
66
router: KoaRouter,

‎meteor/__mocks__/mongo.ts‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
/* eslint-disable @typescript-eslint/only-throw-error */
22
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
3-
import _ from 'underscore'
4-
import { literal, getRandomString } from '@sofie-automation/corelib/dist/lib'
5-
import { protectString, unprotectString, ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
6-
import { RandomMock } from './random'
7-
import { MeteorMock } from './meteor'
8-
import { Random } from 'meteor/random'
3+
import clone from 'fast-clone'
94
import { Meteor } from 'meteor/meteor'
5+
import { Random } from 'meteor/random'
106
import type { AnyBulkWriteOperation } from 'mongodb'
7+
import _ from 'underscore'
8+
9+
import { getRandomString, literal } from '@sofie-automation/corelib/dist/lib'
10+
import { mongoFindOptions, mongoModify, MongoQuery, mongoWhere } from '@sofie-automation/corelib/dist/mongo'
11+
import { ProtectedString, protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
1112
import {
1213
FindOneOptions,
1314
FindOptions,
@@ -18,13 +19,14 @@ import {
1819
UpdateOptions,
1920
UpsertOptions,
2021
} from '@sofie-automation/meteor-lib/dist/collections/lib'
21-
import { mongoWhere, mongoFindOptions, mongoModify, MongoQuery } from '@sofie-automation/corelib/dist/mongo'
22+
2223
import { AsyncOnlyMongoCollection, AsyncOnlyReadOnlyMongoCollection } from '../server/collections/collection'
2324
import type {
2425
MinimalMeteorMongoCollection,
2526
MinimalMongoCursor,
2627
} from '../server/collections/implementations/asyncCollection'
27-
import clone from 'fast-clone'
28+
import { MeteorMock } from './meteor'
29+
import { RandomMock } from './random'
2830

2931
export namespace MongoMock {
3032
interface ObserverEntry<T extends CollectionObject> {

‎meteor/__mocks__/slack.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Meteor } from 'meteor/meteor'
21
import { IncomingWebhookResult } from '@slack/webhook'
2+
import { Meteor } from 'meteor/meteor'
33

44
export async function sendSlackMessageToWebhook(message: string, _webhookURL: string): Promise<IncomingWebhookResult> {
55
return new Promise((resolve, reject) => {

‎meteor/server/Connections.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
import { deferAsync, getCurrentTime } from './lib/lib'
21
import { Meteor } from 'meteor/meteor'
3-
import { logger } from './logging'
2+
3+
import { MetricsGauge } from '@sofie-automation/corelib/dist/prometheus'
4+
45
import { sendTrace } from './api/integration/influx'
56
import { PeripheralDevices } from './collections'
6-
import { MetricsGauge } from '@sofie-automation/corelib/dist/prometheus'
7+
import { deferAsync, getCurrentTime } from './lib/lib'
8+
import { logger } from './logging'
79

810
const connections = new Set<string>()
911
const connectionsGauge = new MetricsGauge({

‎meteor/server/Settings.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Meteor } from 'meteor/meteor'
22
import _ from 'underscore'
3-
import { ISettings, DEFAULT_SETTINGS } from '@sofie-automation/meteor-lib/dist/Settings'
3+
4+
import { DEFAULT_SETTINGS, ISettings } from '@sofie-automation/meteor-lib/dist/Settings'
45

56
/**
67
* This is an object specifying installation-wide, User Interface settings.

0 commit comments

Comments
 (0)