Skip to content

Commit 8444439

Browse files
susnuxsusnux
authored
Merge pull request #1287 from nextcloud-libraries/refactor/restructure-library
refactor: restructure source files
2 parents 262b1c3 + bb759d0 commit 8444439

31 files changed

+268
-206
lines changed

‎__tests__/fileAction.spec.ts renamed to ‎__tests__/actions/fileAction.spec.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
* SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5-
import type { Node } from '../lib/files/node'
6-
import type { View } from '../lib/navigation/view'
5+
6+
import type { Node } from '../../lib/node/index.ts'
7+
import type { View } from '../../lib/navigation/view.ts'
78

89
import { beforeEach, describe, expect, test, vi } from 'vitest'
9-
import { getFileActions, registerFileAction, FileAction, DefaultType, FileActionData } from '../lib/fileAction'
10-
import logger from '../lib/utils/logger'
10+
import { getFileActions, registerFileAction, FileAction, DefaultType, FileActionData } from '../../lib/actions/index.ts'
11+
import logger from '../../lib/utils/logger.ts'
1112

1213
describe('FileActions init', () => {
1314

‎__tests__/fileListAction.spec.ts renamed to ‎__tests__/actions/fileListAction.spec.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
55

6-
import { beforeEach, describe, expect, test, vi } from 'vitest'
7-
8-
import type { View } from '../lib/navigation/view.ts'
6+
import type { View } from '../../lib/navigation/view.ts'
97

10-
import { getFileListActions, registerFileListAction, FileListAction } from '../lib/fileListAction.ts'
11-
import { Folder } from '../lib/files/folder.ts'
12-
import logger from '../lib/utils/logger.ts'
8+
import { beforeEach, describe, expect, test, vi } from 'vitest'
9+
import { getFileListActions, registerFileListAction, FileListAction } from '../../lib/actions/fileListAction.ts'
10+
import { Folder } from '../../lib/node/index.ts'
11+
import logger from '../../lib/utils/logger.ts'
1312

1413
const mockAction = (id: string) => new FileListAction({
1514
id,
1615
displayName: () => 'Test',
1716
iconSvgInline: () => '<svg></svg>',
1817
order: 0,
18+
// @ts-expect-error mocking for tests
1919
exec: async () => {},
2020
})
2121

@@ -38,7 +38,7 @@ describe('FileListActions init', () => {
3838

3939
expect(testAction.id).toBe('test')
4040
expect(testAction.displayName({} as unknown as View)).toBe('Test')
41-
expect(testAction.iconSvgInline({} as unknown as View)).toBe('<svg></svg>')
41+
expect(testAction.iconSvgInline!({} as unknown as View)).toBe('<svg></svg>')
4242

4343
registerFileListAction(testAction)
4444
expect(actions).toHaveLength(1)
@@ -150,12 +150,13 @@ describe('FileListAction creation', () => {
150150
iconSvgInline: () => '<svg></svg>',
151151
order: 0,
152152
enabled: () => true,
153+
// @ts-expect-error mocking for tests
153154
exec: async () => {},
154155
})
155156

156157
expect(testAction.id).toBe('test')
157158
expect(testAction.displayName({} as unknown as View)).toBe('Test')
158-
expect(testAction.iconSvgInline({} as unknown as View)).toBe('<svg></svg>')
159+
expect(testAction.iconSvgInline!({} as unknown as View)).toBe('<svg></svg>')
159160
expect(testAction.order).toBe(0)
160161
expect(testAction.enabled?.({} as unknown as View, [], {} as Folder)).toBe(true)
161162
await expect(testAction.exec({} as unknown as View, [], {} as Folder)).resolves.toBe(undefined)

‎__tests__/fileListHeaders.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
/* eslint-disable @typescript-eslint/no-explicit-any */
66
/* eslint-disable @typescript-eslint/no-non-null-assertion */
77
/* eslint-disable no-new */
8-
import { describe, expect, test, beforeEach, vi } from 'vitest'
98

10-
import { Folder } from '../lib/files/folder'
11-
import { Header, getFileListHeaders, registerFileListHeaders } from '../lib/fileListHeaders'
12-
import logger from '../lib/utils/logger'
9+
import { describe, expect, test, beforeEach, vi } from 'vitest'
10+
import { Header, getFileListHeaders, registerFileListHeaders } from '../lib/fileListHeaders.ts'
11+
import { Folder } from '../lib/node/index.ts'
12+
import logger from '../lib/utils/logger.ts'
1313

1414
describe('FileListHeader init', () => {
1515

‎__tests__/files/file.spec.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
/**
1+
/*
22
* SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5-
import { describe, expect, test } from 'vitest'
65

7-
import { File } from '../../lib/files/file'
8-
import { FileType } from '../../lib/files/fileType'
9-
import { Permission } from '../../lib/permissions'
10-
import { NodeStatus } from '../../lib/files/node'
6+
import { describe, expect, test } from 'vitest'
7+
import { File, FileType, NodeStatus } from '../../lib/node/index.ts'
8+
import { Permission } from '../../lib/permissions.ts'
119

1210
describe('File creation', () => {
1311
test('Valid dav file', () => {

‎__tests__/files/folder.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
/**
1+
/*
22
* SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5+
56
import { describe, expect, test } from 'vitest'
67

7-
import { Folder } from '../../lib/files/folder'
8-
import { FileType } from '../../lib/files/fileType'
9-
import { Permission } from '../../lib/permissions'
8+
import { FileType, Folder } from '../../lib/node/index.ts'
9+
import { Permission } from '../../lib/permissions.ts'
1010

1111
describe('Folder creation', () => {
1212
test('Valid dav folder', () => {

‎__tests__/files/node.spec.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
* SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5-
import { describe, expect, test, vi } from 'vitest'
65

7-
import { File } from '../../lib/files/file'
8-
import { Folder } from '../../lib/files/folder'
9-
import { Attribute, NodeData } from '../../lib/files/nodeData'
10-
import { Permission } from '../../lib/permissions'
11-
import { NodeStatus } from '../../lib/files/node'
6+
import type { Attribute, NodeData } from '../../lib/node/index.ts'
7+
8+
import { describe, expect, test, vi } from 'vitest'
9+
import { File, Folder, NodeStatus } from '../../lib/node/index.ts'
10+
import { Permission } from '../../lib/permissions.ts'
1211

1312
describe('Node testing', () => {
1413
test('Root null fallback', () => {

‎__tests__/index.spec.ts

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
/**
1+
/*
22
* SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5-
import { describe, expect, test } from 'vitest'
65

6+
import type { NewMenuEntry } from '../lib/newMenu/NewMenu.ts'
7+
8+
import { describe, expect, test } from 'vitest'
79
import {
810
formatFileSize,
911
addNewFileMenuEntry,
@@ -15,10 +17,9 @@ import {
1517
Node,
1618
Permission,
1719
davParsePermissions,
18-
} from '../lib/index'
19-
20-
import { Entry, NewFileMenu } from '../lib/newFileMenu'
21-
import { FileAction, registerFileAction, getFileActions } from '../lib/fileAction'
20+
} from '../lib/index.ts'
21+
import { FileAction, registerFileAction, getFileActions } from '../lib/actions/fileAction.ts'
22+
import { NewMenu } from '../lib/newMenu/NewMenu.ts'
2223

2324
describe('Exports checks', () => {
2425
test('formatFileSize', () => {
@@ -94,7 +95,7 @@ describe('NewFileMenu methods', () => {
9495
templateName: 'New file.txt',
9596
iconClass: 'icon-filetype-text',
9697
handler: () => {},
97-
} as Entry
98+
} as NewMenuEntry
9899

99100
test('Init NewFileMenu', () => {
100101
expect(window._nc_newfilemenu).toBeUndefined()
@@ -103,21 +104,21 @@ describe('NewFileMenu methods', () => {
103104
expect(menuEntries).toHaveLength(0)
104105

105106
expect(window._nc_newfilemenu).toBeDefined()
106-
expect(window._nc_newfilemenu).toBeInstanceOf(NewFileMenu)
107+
expect(window._nc_newfilemenu).toBeInstanceOf(NewMenu)
107108
})
108109

109-
test('Use existing initialized NewFileMenu', () => {
110+
test('Use existing initialized NewMenu', () => {
110111
expect(window._nc_newfilemenu).toBeDefined()
111-
expect(window._nc_newfilemenu).toBeInstanceOf(NewFileMenu)
112+
expect(window._nc_newfilemenu).toBeInstanceOf(NewMenu)
112113

113114
addNewFileMenuEntry(entry)
114115

115116
expect(window._nc_newfilemenu).toBeDefined()
116-
expect(window._nc_newfilemenu).toBeInstanceOf(NewFileMenu)
117+
expect(window._nc_newfilemenu).toBeInstanceOf(NewMenu)
117118

118119
removeNewFileMenuEntry(entry)
119120

120121
expect(window._nc_newfilemenu).toBeDefined()
121-
expect(window._nc_newfilemenu).toBeInstanceOf(NewFileMenu)
122+
expect(window._nc_newfilemenu).toBeInstanceOf(NewMenu)
122123
})
123124
})

0 commit comments

Comments
 (0)