Skip to content

Commit d552dc3

Browse files
committed
Fix imports
Signed-off-by: Andrey Sobolev <[email protected]>
1 parent d99d181 commit d552dc3

File tree

73 files changed

+367
-355
lines changed

Some content is hidden

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

73 files changed

+367
-355
lines changed

dev/doc-import-tool/src/commands.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { MeasureContext } from '@hcengineering/core'
1+
import { type MeasureContext } from '@hcengineering/core'
22
import docx4js from 'docx4js'
3-
import { AnyNode } from 'domhandler'
3+
import { type AnyNode } from 'domhandler'
44

55
import extract from './extract/extract'
66
import { MetadataContainer, read } from './extract/types'
77
import importExtractedFile from './import'
88
import convert from './convert/convert'
9-
import { Config } from './config'
9+
import { type Config } from './config'
1010

1111
export async function importDoc (ctx: MeasureContext, config: Config): Promise<void> {
1212
const { specFile, doc, backend } = config

dev/doc-import-tool/src/config.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Employee } from '@hcengineering/contact'
2-
import { Ref, WorkspaceDataId, WorkspaceUuid } from '@hcengineering/core'
3-
import { DocumentSpace } from '@hcengineering/controlled-documents'
4-
import { StorageAdapter } from '@hcengineering/server-core'
1+
import { type Employee } from '@hcengineering/contact'
2+
import { type Ref, type WorkspaceDataId, type WorkspaceUuid } from '@hcengineering/core'
3+
import { type DocumentSpace } from '@hcengineering/controlled-documents'
4+
import { type StorageAdapter } from '@hcengineering/server-core'
55

6-
import { HtmlConversionBackend } from './convert/convert'
6+
import { type HtmlConversionBackend } from './convert/convert'
77

88
export interface Config {
99
doc: string

dev/doc-import-tool/src/extract/container.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { parseDocument } from 'htmlparser2'
33

44
import { NodeType } from './types'
55
import { clean } from '../helpers'
6-
import { Cell } from './common'
6+
import { type Cell } from './common'
77

88
export abstract class Container {
99
constructor (

dev/doc-import-tool/src/extract/extract.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { parseDocument } from 'htmlparser2'
2-
import { AnyNode, Document } from 'domhandler'
2+
import { type AnyNode, type Document } from 'domhandler'
33
import { findAll } from 'domutils'
44

5-
import { FileSpec, FileSpecType, TocFileSpec } from './types'
5+
import { type FileSpec, FileSpecType, type TocFileSpec } from './types'
66
import { createMetadataExtractor } from './meta'
7-
import { ExtractedSection, TocSectionExtractor, extractSections } from './sections'
7+
import { type ExtractedSection, TocSectionExtractor, extractSections } from './sections'
88

99
/**
1010
* @public

dev/doc-import-tool/src/extract/meta.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import { AnyNode, Document, Element, Text } from 'domhandler'
1+
import { type AnyNode, type Document, type Element, type Text } from 'domhandler'
22
import { find } from 'domutils'
33
import { ElementType } from 'htmlparser2'
44

55
import {
6-
DocMetadataSpec,
6+
type DocMetadataSpec,
77
MetadataContainer,
8-
DocTableRowMetadata,
9-
DocMetaTagsMetadata,
10-
PageHeaderTableRowMetadata,
11-
MetadataTableCell
8+
type DocTableRowMetadata,
9+
type DocMetaTagsMetadata,
10+
type PageHeaderTableRowMetadata,
11+
type MetadataTableCell
1212
} from './types'
1313
import { ELEMENT_LIMIT } from './common'
1414
import { TableNodeExtractor } from './nodes'
15-
import { TableContainer } from './container'
15+
import { type TableContainer } from './container'
1616

1717
interface DocMetadataExtractor {
1818
extractName: (doc: Document) => string

dev/doc-import-tool/src/extract/nodes.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Document, Element, AnyNode as AnyDomNode, AnyNode } from 'domhandler'
1+
import { type Document, type Element, type AnyNode as AnyDomNode, type AnyNode } from 'domhandler'
22
import { ElementType } from 'htmlparser2'
33
import {
44
compareDocumentPosition,
@@ -10,9 +10,9 @@ import {
1010
removeSubsets
1111
} from 'domutils'
1212

13-
import { NodeType, ListParams, TableParams, GenericParams, TocParaSeqParams, TagsWithTextSpec, TagsSpec } from './types'
13+
import { NodeType, type ListParams, type TableParams, type GenericParams, type TocParaSeqParams, type TagsWithTextSpec, type TagsSpec } from './types'
1414
import { clean, compareStrExact } from '../helpers'
15-
import { Container, GenericContainer, ListContainer, TableContainer } from './container'
15+
import { type Container, GenericContainer, ListContainer, TableContainer } from './container'
1616

1717
// Copied from domutils ambient const enums to solve 'isolatedModules' is enabled
1818
const enum DocumentPosition {

dev/doc-import-tool/src/extract/sections.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Document } from 'domhandler'
2-
import { Markup } from '@hcengineering/core'
1+
import { type Document } from 'domhandler'
2+
import { type Markup } from '@hcengineering/core'
33

4-
import { GenericNodeSpec, NodeType, SectionSpec, SectionType, TocSectionSpec } from './types'
5-
import { AnyContainer, createNodeExtractor } from './nodes'
4+
import { type GenericNodeSpec, NodeType, type SectionSpec, SectionType, type TocSectionSpec } from './types'
5+
import { type AnyContainer, createNodeExtractor } from './nodes'
66

77
/**
88
* @public

dev/doc-import-tool/src/import.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
import attachment, { Attachment } from '@hcengineering/attachment'
1+
import attachment, { type Attachment } from '@hcengineering/attachment'
22
import { getClient as getCollaboratorClient } from '@hcengineering/collaborator-client'
33
import documents, {
4-
ChangeControl,
5-
ControlledDocument,
4+
type ChangeControl,
5+
type ControlledDocument,
66
DEFAULT_PERIODIC_REVIEW_INTERVAL,
7-
Document,
8-
DocumentCategory,
7+
type Document,
8+
type DocumentCategory,
99
DocumentState,
10-
DocumentTemplate,
10+
type DocumentTemplate,
1111
createChangeControl,
1212
createControlledDocFromTemplate,
1313
createDocumentTemplate
1414
} from '@hcengineering/controlled-documents'
1515
import core, {
16-
AttachedData,
17-
BackupClient,
18-
Client as CoreClient,
19-
Data,
20-
MeasureContext,
21-
Ref,
16+
type AttachedData,
17+
type BackupClient,
18+
type Client as CoreClient,
19+
type Data,
20+
type MeasureContext,
21+
type Ref,
2222
TxOperations,
2323
generateId,
2424
makeDocCollabId,
@@ -30,9 +30,9 @@ import { generateToken } from '@hcengineering/server-token'
3030
import { findAll, getOuterHTML } from 'domutils'
3131
import { parseDocument } from 'htmlparser2'
3232

33-
import { Config } from './config'
34-
import { ExtractedFile } from './extract/extract'
35-
import { ExtractedSection } from './extract/sections'
33+
import { type Config } from './config'
34+
import { type ExtractedFile } from './extract/extract'
35+
import { type ExtractedSection } from './extract/sections'
3636

3737
export default async function importExtractedFile (
3838
ctx: MeasureContext,

dev/doc-import-tool/src/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414
//
15-
import { Employee } from '@hcengineering/contact'
16-
import documents, { DocumentSpace } from '@hcengineering/controlled-documents'
17-
import { MeasureMetricsContext, Ref, systemAccountUuid, WorkspaceUuid, type WorkspaceDataId } from '@hcengineering/core'
15+
import { type Employee } from '@hcengineering/contact'
16+
import documents, { type DocumentSpace } from '@hcengineering/controlled-documents'
17+
import { MeasureMetricsContext, type Ref, systemAccountUuid, type WorkspaceUuid, type WorkspaceDataId } from '@hcengineering/core'
1818
import { setMetadata } from '@hcengineering/platform'
1919
import serverClientPlugin from '@hcengineering/server-client'
2020
import { type StorageAdapter } from '@hcengineering/server-core'
@@ -23,7 +23,7 @@ import serverToken, { generateToken } from '@hcengineering/server-token'
2323
import { program } from 'commander'
2424

2525
import { importDoc } from './commands'
26-
import { Config } from './config'
26+
import { type Config } from './config'
2727
import { getBackend } from './convert/convert'
2828

2929
/**

packages/core/src/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ export async function createClient (
299299
// We have upgrade procedure and need rebuild all stuff.
300300
hierarchy = new Hierarchy()
301301
model = new ModelDb(hierarchy)
302-
;(client as ClientImpl).setModel(hierarchy, model)
302+
;(client).setModel(hierarchy, model)
303303

304304
ctx.withSync('build-model', {}, (ctx) => {
305305
buildModel(ctx, current, modelFilter, hierarchy, model)

packages/core/src/hierarchy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class Hierarchy {
6666
}
6767

6868
asIfArray<D extends Doc, M extends D>(docs: D[], mixin: Ref<Mixin<M>>): M[] {
69-
return docs.map((it) => this.asIf(it, mixin)).filter((it) => it !== undefined) as M[]
69+
return docs.map((it) => this.asIf(it, mixin)).filter((it) => it !== undefined)
7070
}
7171

7272
static toDoc<D extends Doc>(doc: D): D {
@@ -607,7 +607,7 @@ export class Hierarchy {
607607
const classes = Array.from(this.classifiers.values()).filter(
608608
(it) => this.isClass(it) || this._isMixin(it)
609609
) as Class<Doc>[]
610-
return (classes.map((it) => it.domain).filter((it) => it !== undefined) as Domain[]).filter(
610+
return (classes.map((it) => it.domain).filter((it) => it !== undefined)).filter(
611611
(it, idx, array) => array.findIndex((pt) => pt === it) === idx
612612
)
613613
}

packages/ui/src/components/SelectPopup.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
}
104104
const promises = values.map(translateValue)
105105
const result: Array<readonly [string, string] | null> = await Promise.all(promises)
106-
itemLabelsTranslation = new Map(result.filter((r) => r !== null) as Array<readonly [string, string]>)
106+
itemLabelsTranslation = new Map(result.filter((r) => r !== null))
107107
}
108108
109109
$: void translateLabels(value)

plugins/bitrix/src/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export function collectFields (fieldMapping: BitrixFieldMapping[]): string[] {
4848
switch (f.operation.kind) {
4949
case MappingOperation.CopyValue:
5050
fields.push(
51-
...Array.from(f.operation.patterns.map((it) => it.field).filter((it) => it !== undefined) as string[])
51+
...Array.from(f.operation.patterns.map((it) => it.field).filter((it) => it !== undefined))
5252
)
5353
break
5454
case MappingOperation.CreateChannel:

plugins/contact-resources/src/components/AccountArrayEditor.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
void update?.()
8787
})
8888
89-
$: employees = value.map((p) => $personRefByAccountUuidStore.get(p)).filter((p) => p !== undefined) as Ref<Employee>[]
89+
$: employees = value.map((p) => $personRefByAccountUuidStore.get(p)).filter((p) => p !== undefined)
9090
$: docQuery =
9191
excludeItems.length === 0 && includeItems.length === 0
9292
? {}

plugins/contact-resources/src/components/UserBoxItems.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
}
7777
7878
function getPersons (employees: Ref<Employee>[], employeeById: IdMap<Employee>): Employee[] {
79-
return employees.map((p) => employeeById.get(p)).filter((p) => p !== undefined) as Employee[]
79+
return employees.map((p) => employeeById.get(p)).filter((p) => p !== undefined)
8080
}
8181
8282
function removePerson (removed: Employee): void {

plugins/controlled-documents-resources/src/components/document/right-panel/info/DocumentFlatHierarchy.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@
5353
.map((ref) => tree.bundleOf(ref))
5454
.filter((r) => r !== undefined)
5555
56-
if (parents.length > 0) levels.push([parents as DocumentBundle[], false])
56+
if (parents.length > 0) levels.push([parents, false])
5757
if (me) {
5858
levels.push([[me], true])
5959
}
60-
if (children.length > 0) levels.push([children as DocumentBundle[], false])
60+
if (children.length > 0) levels.push([children, false])
6161
}
6262
</script>
6363

plugins/document-resources/src/components/navigator/DocHierarchy.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
dispatch('selected', obj)
8989
}
9090
91-
$: _documents = documents.map((it) => documentById.get(it)).filter((it) => it !== undefined) as Document[]
91+
$: _documents = documents.map((it) => documentById.get(it)).filter((it) => it !== undefined)
9292
$: _descendants = new Map(_documents.map((it) => [it._id, getDescendants(it._id)]))
9393
</script>
9494

plugins/drive-resources/src/components/FolderTreeLevel.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
dispatch('selected', obj)
5757
}
5858
59-
$: _folders = folders.map((it) => folderById.get(it)).filter((it) => it !== undefined) as Folder[]
59+
$: _folders = folders.map((it) => folderById.get(it)).filter((it) => it !== undefined)
6060
$: _descendants = new Map(_folders.map((it) => [it._id, getDescendants(it._id)]))
6161
</script>
6262

plugins/hr-resources/src/components/sidebar/DepartmentsHierarchy.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
dispatch('selected', department)
5656
}
5757
58-
$: _departments = departments.map((it) => departmentById.get(it)).filter((it) => it !== undefined) as Department[]
58+
$: _departments = departments.map((it) => departmentById.get(it)).filter((it) => it !== undefined)
5959
$: _descendants = new Map(_departments.map((it) => [it._id, getDescendants(it._id)]))
6060
</script>
6161

plugins/setting-resources/src/components/EditClassLabel.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
return undefined
6262
})
6363
.filter((it) => it !== undefined)
64-
.filter((it, idx, arr) => arr.indexOf(it) === idx) as IntlString[]
64+
.filter((it, idx, arr) => arr.indexOf(it) === idx)
6565
</script>
6666

6767
<Card

plugins/task-resources/src/components/StatusSelector.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
} else {
6868
const type = taskTypes.get(kind)
6969
if (type !== undefined) {
70-
statuses = type.statuses.map((p) => store.get(p)).filter((p) => p !== undefined) as Status[]
70+
statuses = type.statuses.map((p) => store.get(p)).filter((p) => p !== undefined)
7171
}
7272
}
7373
}

plugins/task-resources/src/components/state/CreateStatePopup.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
description
130130
})
131131
132-
const states = _taskType.statuses.map((p) => $statusStore.byId.get(p)).filter((p) => p !== undefined) as Status[]
132+
const states = _taskType.statuses.map((p) => $statusStore.byId.get(p)).filter((p) => p !== undefined)
133133
const lastIndex = states.findLastIndex((p) => p.category === category)
134134
const statuses = [..._taskType.statuses.slice(0, lastIndex + 1), _id, ..._taskType.statuses.slice(lastIndex + 1)]
135135
@@ -193,7 +193,7 @@
193193
_taskType.statuses
194194
.map((it) => $statusStore.byId.get(it))
195195
.filter((it) => it !== undefined)
196-
.filter((it) => it?.category === status?.category) as Status[]
196+
.filter((it) => it?.category === status?.category)
197197
).filter((it, idx, arr) => arr.findIndex((qt) => qt._id === it._id) === idx)
198198
199199
canDelete = sameCategory.length > 1

plugins/task-resources/src/components/state/StatesProjectEditor.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
taskType.statuses
161161
.map((it) => $statusStore.byId.get(it))
162162
.filter((it) => it !== undefined)
163-
.filter((it) => it?.category === _status.category) as Status[]
163+
.filter((it) => it?.category === _status.category)
164164
).filter((it, idx, arr) => arr.findIndex((qt) => qt._id === it._id) === idx)
165165
166166
$settingsStore = {

plugins/task-resources/src/components/state/TypeStatesPopup.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
): Status[] {
4040
if (type === undefined) return []
4141
42-
let res = type.statuses.map((p) => statusStore.get(p._id)).filter((p) => p !== undefined) as Status[]
42+
let res = type.statuses.map((p) => statusStore.get(p._id)).filter((p) => p !== undefined)
4343
if (taskType !== undefined) {
4444
res = res.filter((p) => taskType.statuses.includes(p._id))
4545
}

plugins/tracker-resources/src/components/CreateIssue.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
const val = tagElements.get(p)
316316
return val !== undefined ? tagAsRef(val) : undefined
317317
})
318-
.filter((p) => p !== undefined) as TagReference[])
318+
.filter((p) => p !== undefined))
319319
: [],
320320
status: currentProject?.defaultIssueStatus
321321
}
@@ -337,7 +337,7 @@
337337
const val = tagElements.get(p)
338338
return val !== undefined ? tagAsRef(val) : undefined
339339
})
340-
.filter((p) => p !== undefined) as TagReference[])
340+
.filter((p) => p !== undefined))
341341
: []
342342
343343
if (object.kind !== undefined) {

plugins/view-resources/src/components/folders/FolderTreeLevel.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
return result
6262
}
6363
64-
$: _folders = folders.map((it) => folderById.get(it)).filter((it) => it !== undefined) as Doc[]
64+
$: _folders = folders.map((it) => folderById.get(it)).filter((it) => it !== undefined)
6565
$: _descendants = new Map(_folders.map((it) => [it._id, getDescendants(it._id)]))
6666
</script>
6767

plugins/view-resources/src/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ export async function buildModel (options: BuildModelOptions): Promise<Attribute
527527
return errorPresenter
528528
}
529529
})
530-
return (await Promise.all(model)).filter((a) => a !== undefined) as AttributeModel[]
530+
return (await Promise.all(model)).filter((a) => a !== undefined)
531531
}
532532

533533
export async function deleteObject (client: TxOperations, object: Doc): Promise<void> {
@@ -939,7 +939,7 @@ export async function getCategories (
939939
*/
940940
export function getCategorySpaces (categories: CategoryType[]): Array<Ref<Space>> {
941941
return Array.from(
942-
(categories.filter((it) => typeof it === 'object') as AggregateValue[]).reduce<Set<Ref<Space>>>((arr, val) => {
942+
(categories.filter((it) => typeof it === 'object')).reduce<Set<Ref<Space>>>((arr, val) => {
943943
val.values.forEach((it) => arr.add(it.space))
944944
return arr
945945
}, new Set())

0 commit comments

Comments
 (0)