Skip to content
This repository has been archived by the owner on Jan 20, 2023. It is now read-only.

Commit

Permalink
fix($toc): using safe pop to avoid empty stack
Browse files Browse the repository at this point in the history
  • Loading branch information
@ulivz
ulivz committed Feb 8, 2019
1 parent 3c0c3bc commit 6eb19b4
Show file tree
Hide file tree
Showing 5 changed files with 210 additions and 136 deletions.
2 changes: 2 additions & 0 deletions docs/.vuepress/styles/index.styl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.sidebar-links > li > a
font-size 1.1em
310 changes: 179 additions & 131 deletions lib/__test__/__snapshots__/toc.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,177 +2,225 @@

exports[`getSidebarByToc 1`] = `
Array [
Object {
"children": Array [],
"collapsable": false,
"path": "/intro/",
"title": "前言",
},
Object {
"children": Array [
Array [
"/sc1lvc/",
"前端开发的演变",
],
Array [
"/wybhm9/",
"初始化项目",
],
Array [
"/fd5af7/",
"第一个组件",
],
Array [
"/agmsgo/",
"使用 Ant Design 组件",
],
Array [
"/goozth/",
"受控组件与非受控组件",
],
],
"collapsable": false,
"title": "第一章: 基础知识",
},
Object {
"children": Array [
Array [
"/layout/",
"基本布局",
],
Array [
"/ghalng/",
"侧边导航",
],
Array [
"/ipsba8/",
"路由配置",
],
Object {
"children": Array [
Array [
"/sc1lvc.html",
"前端开发的演变",
],
Array [
"/wybhm9.html",
"初始化项目",
],
Array [
"/fd5af7.html",
"第一个组件",
],
Array [
"/agmsgo.html",
"使用 Ant Design 组件",
],
Array [
"/goozth.html",
"受控组件与非受控组件",
],
],
"collapsable": false,
"title": "第一章: 基础知识",
},
Object {
"children": Array [
Array [
"/layout.html",
"基本布局",
],
Array [
"/ghalng.html",
"侧边导航",
],
Array [
"/ipsba8.html",
"路由配置",
],
],
"collapsable": false,
"path": "/chapter2.html",
"title": "第二章: 布局与路由",
},
Object {
"children": Array [
Array [
"/abl3ad.html",
"使用 model",
],
Array [
"/dsl8ee.html",
"搭建基于 model 的卡片列表页面",
],
Array [
"/ig6mzb.html",
"在 model 中请求服务端数据",
],
Array [
"/kmmq56.html",
"模拟服务端数据",
],
],
"collapsable": false,
"path": "/chapter3.html",
"title": "第三章: 小试牛刀",
},
Object {
"children": Array [
Array [
"/ndfx96.html",
"表格",
],
Array [
"/up1dn3.html",
"表单",
],
Array [
"/dk8xsp.html",
"图表",
],
],
"collapsable": false,
"path": "/chapter4.html",
"title": "第四章: 复杂页面",
},
Object {
"children": Array [
Array [
"/customized_styles.html",
"自定义样式",
],
Array [
"/wvbsue.html",
"上传与下载",
],
Array [
"/aut0sr.html",
"国际化",
],
Array [
"/lifemethods.html",
"React 的生命周期",
],
Array [
"/auth.html",
"权限",
],
Array [
"/unittest.html",
"单元测试",
],
Array [
"/typescript.html",
"使用 TypeScript",
],
],
"collapsable": false,
"title": "第五章: 进阶功能",
},
Object {
"children": Array [
Array [
"/byllph.html",
"你需要了解的 ES6 语法",
],
Array [
"/tydf0a.html",
"深入理解 umi",
],
Array [
"/about.html",
"关于我们",
],
],
"collapsable": false,
"title": "附录",
},
],
"collapsable": false,
"path": "/chapter2/",
"title": "第二章: 布局与路由",
"path": "/intro.html",
"title": "前言",
},
]
`;

exports[`getSidebarByToc 2`] = `
Array [
Object {
"children": Array [
Array [
"/abl3ad/",
"使用 model",
],
Array [
"/dsl8ee/",
"搭建基于 model 的卡片列表页面",
"/intro.html",
"介绍",
],
Array [
"/ig6mzb/",
"在 model 中请求服务端数据",
"/getting-started.html",
"快速上手",
],
Array [
"/kmmq56/",
"模拟服务端数据",
"/export-first-website.html",
"导出第一个站点",
],
],
"collapsable": false,
"path": "/chapter3/",
"title": "第三章: 小试牛刀",
"title": "指南",
},
Object {
"children": Array [
Array [
"/ndfx96/",
"表格",
],
Array [
"/up1dn3/",
"表单",
],
Array [
"/dk8xsp/",
"图表",
],
],
"children": Array [],
"collapsable": false,
"path": "/chapter4/",
"title": "第四章: 复杂页面",
"path": "/config.html",
"title": "配置",
},
]
`;

exports[`getSidebarByToc 3`] = `
Array [
Object {
"children": Array [
Array [
"/customized_styles/",
"自定义样式",
],
Array [
"/wvbsue/",
"上传与下载",
],
Array [
"/aut0sr/",
"国际化",
],
Array [
"/lifemethods/",
"React 的生命周期",
],
Array [
"/auth/",
"权限",
],
Array [
"/unittest/",
"单元测试",
"/intro.html",
"介绍",
],
Array [
"/typescript/",
"使用 TypeScript",
"/getting-started.html",
"快速上手",
],
],
"collapsable": false,
"title": "第五章: 进阶功能",
},
Object {
"children": Array [
Array [
"/byllph/",
"你需要了解的 ES6 语法",
"/generate-homepage.html",
"生成主页",
],
Array [
"/tydf0a/",
"深入理解 umi",
"/cache.html",
"缓存",
],
Array [
"/about/",
"关于我们",
"/private-repo.html",
"私有仓库",
],
],
"collapsable": false,
"title": "附录",
"title": "指南",
},
]
`;

exports[`getSidebarByToc 2`] = `
Array [
Array [
"/config.html",
"配置",
],
Object {
"children": Array [
Array [
"/intro/",
"介绍",
],
Array [
"/getting-started/",
"快速上手",
],
Array [
"/export-first-website/",
"导出第一个站点",
"/zero-markdown.html",
"Zero-Markdown",
],
],
"collapsable": false,
"title": "指南",
"title": "进阶",
},
Array [
"/config/",
"配置",
],
]
`;
15 changes: 14 additions & 1 deletion lib/__test__/toc.constant.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,20 @@ const TOC_2 = [
{ title: '配置', slug: 'config', depth: 1 }
]

const TOC_3 = [
{ title: '指南', slug: '#', depth: 1 },
{ title: '介绍', slug: 'intro', depth: 2 },
{ title: '快速上手', slug: 'getting-started', depth: 2 },
{ title: '生成主页', slug: 'generate-homepage', depth: 2 },
{ title: '缓存', slug: 'cache', depth: 2 },
{ title: '私有仓库', slug: 'private-repo', depth: 2 },
{ title: '配置', slug: 'config', depth: 1 },
{ title: '进阶', slug: '#', depth: 1 },
{ title: 'Zero-Markdown', slug: 'zero-markdown', depth: 2 }
]

module.exports = [
TOC_1,
TOC_2
TOC_2,
TOC_3
]
6 changes: 5 additions & 1 deletion lib/stack.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ module.exports = class Stack {
}

peek() {
return this.elements[this.elements.length - 1]
return this.elements[this.size() - 1]
}

size() {
return this.elements.length
}
}
Loading

0 comments on commit 6eb19b4

Please sign in to comment.