Skip to content

Commit 86ec4c2

Browse files
authored
chore: tidy old type re-exports SOFIE-1149 (Sofie-Automation#1553)
* chore: tidy protectedString reexports * chore: replace createManualPromise with Promise.withResolvers * chore: remove remaining tempLib reexports from meteor * chore: tidy protectedString reexports * chore: remove remaining tempLib reexports from webui
1 parent 3b36681 commit 86ec4c2

File tree

194 files changed

+334
-357
lines changed

Some content is hidden

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

194 files changed

+334
-357
lines changed

meteor/__mocks__/_setupMocks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { setLogLevel } from '../server/logging'
22
import { resetRandomId } from './random'
3-
import { LogLevel } from '../server/lib/tempLib'
3+
import { LogLevel } from '@sofie-automation/meteor-lib/dist/lib'
44
import { SupressLogMessages } from './suppressLogging'
55

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

meteor/__mocks__/defaultCollectionObjects.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
2-
import { clone, unprotectString } from '../server/lib/tempLib'
2+
import { clone } from '@sofie-automation/corelib/dist/lib'
3+
import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
34
import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
45
import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
56
import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'

meteor/__mocks__/helpers/database.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,8 @@ import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint'
3939
import { ICoreSystem, SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
4040
import { stripVersion } from '../../server/systemStatus/semverUtils'
4141
import { internalUploadBlueprint } from '../../server/api/blueprints/api'
42-
import {
43-
literal,
44-
protectString,
45-
unprotectString,
46-
getRandomId,
47-
getRandomString,
48-
Complete,
49-
normalizeArray,
50-
} from '../../server/lib/tempLib'
42+
import { literal, getRandomId, getRandomString, Complete, normalizeArray } from '@sofie-automation/corelib/dist/lib'
43+
import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
5144
import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
5245
import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
5346
import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'

meteor/__mocks__/helpers/lib.ts

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

meteor/__mocks__/mongo.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/* eslint-disable @typescript-eslint/only-throw-error */
22
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
33
import _ from 'underscore'
4-
import { literal, ProtectedString, unprotectString, protectString, getRandomString } from '../server/lib/tempLib'
4+
import { literal, getRandomString } from '@sofie-automation/corelib/dist/lib'
5+
import { protectString, unprotectString, ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
56
import { RandomMock } from './random'
67
import { MeteorMock } from './meteor'
78
import { Random } from 'meteor/random'

meteor/server/__tests__/_testEnvironment.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { RandomMock } from '../../__mocks__/random'
22
import { MongoMock } from '../../__mocks__/mongo'
3-
import { protectString, getRandomString } from '../lib/tempLib'
3+
import { getRandomString } from '@sofie-automation/corelib/dist/lib'
4+
import { protectString } from '@sofie-automation/corelib/dist/protectedString'
45
import { sleep } from '../lib/lib'
56
import {
67
AdLibPieces,

meteor/server/__tests__/api/serviceMessages/serviceMessagesApi.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { readAllMessages, writeMessage } from '../../../api/serviceMessages/serviceMessagesApi'
22
import * as CoreSystemUtil from '../../../coreSystem/collection'
3-
import { protectString } from '../../../lib/tempLib'
3+
import { protectString } from '@sofie-automation/corelib/dist/protectedString'
44
import {
55
Criticality,
66
ExternalServiceMessage,

meteor/server/__tests__/cronjobs.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import '../../__mocks__/_extendJest'
22
import { runAllTimers, waitUntil } from '../../__mocks__/helpers/jest'
33
import { MeteorMock } from '../../__mocks__/meteor'
44
import { logger } from '../logging'
5-
import { getRandomId, getRandomString, literal, protectString } from '../lib/tempLib'
5+
import { getRandomId, getRandomString, literal } from '@sofie-automation/corelib/dist/lib'
6+
import { protectString } from '@sofie-automation/corelib/dist/protectedString'
67
import { SnapshotType } from '@sofie-automation/meteor-lib/dist/collections/Snapshots'
78
import {
89
IBlueprintPieceType,

meteor/server/api/__tests__/cleanup.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getRandomId } from '../../lib/tempLib'
1+
import { getRandomId } from '@sofie-automation/corelib/dist/lib'
22

33
import '../../collections' // include this in order to get all of the collection set up
44
import { cleanupOldDataInner } from '../cleanup'

meteor/server/api/__tests__/client.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { Meteor } from 'meteor/meteor'
22
import { MeteorMock } from '../../../__mocks__/meteor'
33
import { UserActionsLogItem } from '@sofie-automation/meteor-lib/dist/collections/UserActionsLog'
44
import { ClientAPIMethods } from '@sofie-automation/meteor-lib/dist/api/client'
5-
import { protectString, LogLevel } from '../../lib/tempLib'
5+
import { LogLevel } from '@sofie-automation/meteor-lib/dist/lib'
6+
import { protectString } from '@sofie-automation/corelib/dist/protectedString'
67
import { PeripheralDeviceCommand } from '@sofie-automation/corelib/dist/dataModel/PeripheralDeviceCommand'
78
import { setLogLevel } from '../../logging'
89
import {

0 commit comments

Comments
 (0)