refactor: convert namespaces to modules

Author: cnblogs-dudu

src/auth/auth-manager.ts

@@ -27,39 +27,38 @@ authProvider.onDidChangeSessions(async e => {
     await BlogExportProvider.optionalInstance?.refreshRecords({ force: false, clearCache: true })
 })
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
-export namespace AuthManager {
-    export async function isAuthed() {
+export class AuthManager {
+    static async isAuthed() {
         const sessionJsonList = await LocalState.getSecret(ExtConst.EXT_SESSION_STORAGE_KEY)
         const sessionList = JSON.parse(sessionJsonList ?? '[]') as AuthSession[]
         return sessionList.length > 0
     }
 
-    export function ensureSession(opt?: AuthGetSessionOpt) {
+    static ensureSession(opt?: AuthGetSessionOpt) {
         try {
             return authentication.getSession(authProvider.providerId, [], opt)
         } catch (e) {
             throw Error(`创建/获取 Session 失败: ${e as string}`)
         }
     }
 
-    export async function webLogin() {
+    static async webLogin() {
         authProvider.useBrowser()
-        await login()
+        await AuthManager.login()
     }
 
-    export async function patLogin() {
+    static async patLogin() {
         authProvider.usePat()
-        await login()
+        await AuthManager.login()
     }
 
-    export async function login() {
-        const session = await ensureSession({ createIfNone: false, forceNewSession: true })
+    static async login() {
+        const session = await AuthManager.ensureSession({ createIfNone: false, forceNewSession: true })
         if (session !== undefined)
             await LocalState.setSecret(ExtConst.EXT_SESSION_STORAGE_KEY, JSON.stringify([session]))
     }
 
-    export async function logout() {
+    static async logout() {
         if (!(await AuthManager.isAuthed())) return
 
         try {
@@ -74,19 +73,19 @@ export namespace AuthManager {
         }
     }
 
-    export async function acquireToken() {
-        const session = await ensureSession({ createIfNone: false })
+    static async acquireToken() {
+        const session = await AuthManager.ensureSession({ createIfNone: false })
 
         if (session === undefined) Alert.throwWithWarn('未授权')
         if (isAuthSessionExpired(session)) {
             void Alert.warn('授权已过期，请重新登录')
-            await logout()
+            await AuthManager.logout()
         }
 
         return session?.accessToken
     }
 
-    export async function updateAuthStatus() {
+    static async updateAuthStatus() {
         const isAuthed = await AuthManager.isAuthed()
         await setCtx('isAuthed', isAuthed)
         await setCtx('isUnauthorized', !isAuthed)

src/auth/oauth.ts

@@ -7,9 +7,8 @@ function getAuthedOauthReq() {
     return new OauthReq(ExtConst.CLIENT_ID, ExtConst.CLIENT_SEC)
 }
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
-export namespace Oauth {
-    export function getToken(verifyCode: string, authCode: string) {
+export class Oauth {
+    static getToken(verifyCode: string, authCode: string) {
         const req = getAuthedOauthReq()
         try {
             return req.getToken(authCode, verifyCode, globalCtx.extUrl)
@@ -19,7 +18,7 @@ export namespace Oauth {
         }
     }
 
-    export function revokeToken(token: string) {
+    static revokeToken(token: string) {
         try {
             const req = getAuthedOauthReq()
             return req.revokeToken(token)

src/cmd/blog-export/open-local.ts

@@ -18,9 +18,7 @@ export async function openLocalExport(opts: Partial<typeof defaultOptions> = def
             canSelectFolders: false,
             canSelectMany: false,
             filters: {
-                // eslint-disable-next-line @typescript-eslint/naming-convention
                 Sqlite: ['db', 'zip'],
-                // eslint-disable-next-line @typescript-eslint/naming-convention
                 // ZipSqlite: ['zip'],
             },
         })) ?? []
@@ -44,7 +42,7 @@ export async function openLocalExport(opts: Partial<typeof defaultOptions> = def
     // }
 
     if (isConfirmedToUnzip) {
-        // eslint-disable-next-line @typescript-eslint/naming-convention
+
         const AdmZip = (await import('adm-zip')).default
         const zip = new AdmZip(filePath)
         zip.extractEntryTo(`${fileName}.db`, dirname, false, true)

src/cmd/browser.ts

@@ -3,38 +3,47 @@ import { execCmd } from '@/infra/cmd'
 import { UserService } from '@/service/user.service'
 import { Alert } from '@/infra/alert'
 
-export namespace Browser.Open {
-    export function open(url: string) {
-        return execCmd('vscode.open', Uri.parse(url))
-    }
-}
+export class Browser {
+    static Open = class {
+        static open(url: string) {
+            return execCmd('vscode.open', Uri.parse(url))
+        }
 
-export namespace Browser.Open.Cnb {
-    export const home = () => open('https://www.cnblogs.com')
-    export const news = () => open('https://news.cnblogs.com')
-    export const ing = () => open('https://ing.cnblogs.com')
-    export const q = () => open('https://q.cnblogs.com')
-}
+        static Cnb = class {
+            static home = () => Browser.Open.open('https://www.cnblogs.com')
+            static news = () => Browser.Open.open('https://news.cnblogs.com')
+            static ing = () => Browser.Open.open('https://ing.cnblogs.com')
+            static q = () => Browser.Open.open('https://q.cnblogs.com')
+        }
 
-export namespace Browser.Open.User {
-    export const accountSetting = () => open('https://account.cnblogs.com/settings/account')
-    export const buyVip = () => open('https://cnblogs.vip/')
+        User = class {
+            static accountSetting = () => Browser.Open.open('https://account.cnblogs.com/settings/account')
+            static buyVip = () => Browser.Open.open('https://cnblogs.vip/')
 
-    export async function blog() {
-        const blogApp = (await UserService.getUserInfo())?.blogApp
+            static async blog() {
+                const blogApp = (await UserService.getUserInfo())?.blogApp
 
-        if (blogApp == null) return void Alert.warn('未开通博客')
+                if (blogApp == null) return void Alert.warn('未开通博客')
 
-        void open(`https://www.cnblogs.com/${blogApp}`)
-    }
+                void Browser.Open.open(`https://www.cnblogs.com/${blogApp}`)
+            }
 
-    export const blogConsole = () => open('https://write.cnblogs.com')
+            static blogConsole = () => Browser.Open.open('https://write.cnblogs.com')
 
-    export async function home() {
-        const accountId = (await UserService.getUserInfo())?.accountId
-        if (accountId !== undefined) {
-            const url = `https://home.cnblogs.com/u/${accountId}`
-            return open(url)
+            static async home() {
+                const accountId = (await UserService.getUserInfo())?.accountId
+                if (accountId !== undefined) {
+                    const url = `https://home.cnblogs.com/u/${accountId}`
+                    return Browser.Open.open(url)
+                }
+            }
         }
     }
 }
+
+
+
+// eslint-disable-next-line @typescript-eslint/no-namespace
+export namespace Browser.Open.User {
+
+}

src/cmd/ing/ing-page-list.ts

@@ -2,60 +2,62 @@ import { getIngListWebviewProvider } from '@/service/ing/ing-list-webview-provid
 import { QuickPickItem, window } from 'vscode'
 import { IngType, IngTypesMetadata } from '@/model/ing'
 
-export namespace Ing.ListView {
-    export const refresh = () => getIngListWebviewProvider().reload()
-
-    export function goNext() {
-        const provider = getIngListWebviewProvider()
-        const { pageIndex } = provider
-        return provider.reload({ pageIndex: pageIndex + 1 })
-    }
-
-    export function goPrev() {
-        const provider = getIngListWebviewProvider()
-        const { pageIndex } = provider
-        if (pageIndex > 1) return provider.reload({ pageIndex: pageIndex - 1 })
-        return Promise.resolve()
-    }
-
-    export function goFirst(): Promise<void> {
-        return getIngListWebviewProvider().reload({ pageIndex: 1 })
-    }
-
-    export function switchType() {
-        const options: (QuickPickItem & { ingType: IngType })[] = IngTypesMetadata.map(
-            ([ingType, { displayName, description }]) => ({
-                label: displayName,
-                ingType: ingType,
-                description: description,
-                picked: ingType === getIngListWebviewProvider().ingType,
-            })
-        )
-        const quickPick = window.createQuickPick<(typeof options)[0]>()
-
-        quickPick.title = '选择闪存类型'
-        quickPick.items = options
-        quickPick.canSelectMany = false
-        quickPick.activeItems = options.filter(x => x.picked)
-        quickPick.selectedItems = quickPick.activeItems
-        quickPick.ignoreFocusOut = false
-
-        const disposables = [quickPick]
-
-        quickPick.onDidChangeSelection(
-            ([selectedItem]) => {
-                quickPick.hide()
-                return getIngListWebviewProvider().reload({
-                    pageIndex: 1,
-                    ingType: selectedItem.ingType,
+export class Ing {
+    static ListView = class {
+        static refresh = () => getIngListWebviewProvider().reload()
+
+        static goNext() {
+            const provider = getIngListWebviewProvider()
+            const { pageIndex } = provider
+            return provider.reload({ pageIndex: pageIndex + 1 })
+        }
+
+        static goPrev() {
+            const provider = getIngListWebviewProvider()
+            const { pageIndex } = provider
+            if (pageIndex > 1) return provider.reload({ pageIndex: pageIndex - 1 })
+            return Promise.resolve()
+        }
+
+        static goFirst(): Promise<void> {
+            return getIngListWebviewProvider().reload({ pageIndex: 1 })
+        }
+
+        static switchType() {
+            const options: (QuickPickItem & { ingType: IngType })[] = IngTypesMetadata.map(
+                ([ingType, { displayName, description }]) => ({
+                    label: displayName,
+                    ingType: ingType,
+                    description: description,
+                    picked: ingType === getIngListWebviewProvider().ingType,
                 })
-            },
-            undefined,
-            disposables
-        )
-        quickPick.onDidHide(() => disposables.forEach(d => d.dispose()), undefined, disposables)
-        quickPick.show()
-
-        return Promise.resolve()
+            )
+            const quickPick = window.createQuickPick<(typeof options)[0]>()
+
+            quickPick.title = '选择闪存类型'
+            quickPick.items = options
+            quickPick.canSelectMany = false
+            quickPick.activeItems = options.filter(x => x.picked)
+            quickPick.selectedItems = quickPick.activeItems
+            quickPick.ignoreFocusOut = false
+
+            const disposables = [quickPick]
+
+            quickPick.onDidChangeSelection(
+                ([selectedItem]) => {
+                    quickPick.hide()
+                    return getIngListWebviewProvider().reload({
+                        pageIndex: 1,
+                        ingType: selectedItem.ingType,
+                    })
+                },
+                undefined,
+                disposables
+            )
+            quickPick.onDidHide(() => disposables.forEach(d => d.dispose()), undefined, disposables)
+            quickPick.show()
+
+            return Promise.resolve()
+        }
     }
 }

src/cmd/upload-img/upload-img-from-path.ts

@@ -7,7 +7,7 @@ export function uploadImgFromPath(path: string) {
         const readStream = fs.createReadStream(path)
         return imageService.upload(readStream)
     } catch (e) {
-        console.log(`上传图片失败: ${<string>e}`)
-        void Alert.err(`上传图片失败: ${<string>e}`)
+        console.log(`上传图片失败: ${e as string}`)
+        void Alert.err(`上传图片失败: ${e as string}`)
     }
 }

src/cmd/workspace.ts

@@ -3,8 +3,8 @@ import { Alert } from '@/infra/alert'
 import { WorkspaceCfg } from '@/ctx/cfg/workspace'
 import { TextDocument, WorkspaceEdit, window, Range } from 'vscode'
 
-export namespace Workspace {
-    export function resetTextDoc(doc: TextDocument, text: string) {
+export class Workspace {
+    static resetTextDoc(doc: TextDocument, text: string) {
         const firstLine = doc.lineAt(0)
         const lastLine = doc.lineAt(doc.lineCount - 1)
         const range = new Range(firstLine.range.start, lastLine.range.end)
@@ -16,7 +16,7 @@ export namespace Workspace {
         return we
     }
 
-    export async function codeOpen() {
+    static async codeOpen() {
         const uri = WorkspaceCfg.getWorkspaceUri()
         const options = ['在当前窗口中打开', '在新窗口中打开']
         const msg = `即将打开 ${uri.fsPath}`
@@ -28,11 +28,11 @@ export namespace Workspace {
         await execCmd('vscode.openFolder', uri, shouldOpenInNewWindow)
     }
 
-    export function osOpen() {
+    static osOpen() {
         void execCmd('revealFileInOS', WorkspaceCfg.getWorkspaceUri())
     }
 
-    export async function set() {
+    static async set() {
         const uris = await window.showOpenDialog({
             title: '选择工作空间',
             canSelectFolders: true,

src/ctx/cfg/icon-theme.ts

@@ -1,7 +1,7 @@
 import { workspace } from 'vscode'
 
-export namespace IconThemeCfg {
-    export function getIconTheme(): string {
+export class IconThemeCfg {
+    static getIconTheme(): string {
         return workspace.getConfiguration('workbench').get('iconTheme') ?? 'unknown'
     }
 }