refator: refactor types

hexojs · Apr 30, 2024 · 5d0ae13 · 5d0ae13
1 parent 88e252d
commit 5d0ae13
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/lib/plugins/console/list/category.ts b/lib/plugins/console/list/category.ts
@@ -2,11 +2,13 @@ import { underline } from 'picocolors';
 import table from 'text-table';
 import { stringLength } from './common';
 import type Hexo from '../../../hexo';
+import type { CategorySchema } from '../../../types';
+import type Model from 'warehouse/dist/model';
 
 function listCategory(this: Hexo): void {
-  const categories = this.model('Category');
+  const categories: Model<CategorySchema> = this.model('Category');
 
-  const data = categories.sort({name: 1}).map(cate => [cate.name, String(cate.length)]);
+  const data = categories.sort({name: 1}).map((cate: CategorySchema) => [cate.name, String(cate.length)]);
 
   // Table header
   const header = ['Name', 'Posts'].map(str => underline(str));

diff --git a/lib/plugins/console/list/page.ts b/lib/plugins/console/list/page.ts
@@ -2,11 +2,13 @@ import { magenta, underline, gray } from 'picocolors';
 import table from 'text-table';
 import { stringLength } from './common';
 import type Hexo from '../../../hexo';
+import type { PageSchema } from '../../../types';
+import type Model from 'warehouse/dist/model';
 
 function listPage(this: Hexo): void {
-  const Page = this.model('Page');
+  const Page: Model<PageSchema> = this.model('Page');
 
-  const data = Page.sort({date: 1}).map(page => {
+  const data = Page.sort({date: 1}).map((page: PageSchema) => {
     const date = page.date.format('YYYY-MM-DD');
     return [gray(date), page.title, magenta(page.source)];
   });

diff --git a/lib/plugins/console/list/post.ts b/lib/plugins/console/list/post.ts
@@ -2,15 +2,17 @@ import { gray, magenta, underline } from 'picocolors';
 import table from 'text-table';
 import { stringLength } from './common';
 import type Hexo from '../../../hexo';
+import type { PostSchema } from '../../../types';
+import type Model from 'warehouse/dist/model';
 
 function mapName(item) {
   return item.name;
 }
 
 function listPost(this: Hexo): void {
-  const Post = this.model('Post');
+  const Post: Model<PostSchema> = this.model('Post');
 
-  const data = Post.sort({published: -1, date: 1}).map(post => {
+  const data = Post.sort({published: -1, date: 1}).map((post: PostSchema) => {
     const date = post.published ? post.date.format('YYYY-MM-DD') : 'Draft';
     const tags = post.tags.map(mapName);
     const categories = post.categories.map(mapName);

diff --git a/lib/plugins/console/list/route.ts b/lib/plugins/console/list/route.ts
@@ -14,9 +14,9 @@ function listRoute(this: Hexo): void {
   console.log(s);
 }
 
-function buildTree(routes) {
-  const obj = {};
-  let cursor;
+function buildTree(routes: string[]) {
+  const obj: Record<string, any> = {};
+  let cursor: typeof obj;
 
   for (let i = 0, len = routes.length; i < len; i++) {
     const item = routes[i].split('/');
@@ -32,7 +32,7 @@ function buildTree(routes) {
   return obj;
 }
 
-function buildNodes(tree) {
+function buildNodes(tree: Record<string, any>) {
   const nodes = [];
 
   for (const [key, item] of Object.entries(tree)) {

diff --git a/lib/plugins/console/list/tag.ts b/lib/plugins/console/list/tag.ts
@@ -2,11 +2,13 @@ import { magenta, underline } from 'picocolors';
 import table from 'text-table';
 import { stringLength } from './common';
 import type Hexo from '../../../hexo';
+import type { TagSchema } from '../../../types';
+import type Model from 'warehouse/dist/model';
 
 function listTag(this: Hexo): void {
-  const Tag = this.model('Tag');
+  const Tag: Model<TagSchema> = this.model('Tag');
 
-  const data = Tag.sort({name: 1}).map(tag => [tag.name, String(tag.length), magenta(tag.path)]);
+  const data = Tag.sort({name: 1}).map((tag: TagSchema) => [tag.name, String(tag.length), magenta(tag.path)]);
 
   // Table header
   const header = ['Name', 'Posts', 'Path'].map(str => underline(str));

diff --git a/test/scripts/hexo/hexo.ts b/test/scripts/hexo/hexo.ts
@@ -168,6 +168,7 @@ describe('Hexo', () => {
     themeConfig.a.b.should.eql(3);
 
     const Locals = hexo._generateLocals();
+    // @ts-expect-error
     const { theme: themeLocals } = new Locals('', {path: '', layout: [], data: {}});
 
     themeLocals.a.should.have.own.property('c');
@@ -187,6 +188,7 @@ describe('Hexo', () => {
     themeConfig.c.should.eql(3);
 
     const Locals = hexo._generateLocals();
+    // @ts-expect-error
     const { theme: themeLocals } = new Locals('', {path: '', layout: [], data: {}});
 
     themeLocals.should.have.own.property('c');