Skip to content

Commit 7521666

Browse files
committed
Make sorting parameters arrays
1 parent 1fc7416 commit 7521666

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

packages/webdoc-cli/src/config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import merge from "lodash.merge";
66
type ConfigSchema = {
77
plugins?: Array<string>,
88
docs?: {
9-
sort?: string
9+
sort?: string | string[]
1010
},
1111
source?: {
1212
// Declared in order of priority
@@ -52,7 +52,7 @@ type ConfigSchema = {
5252
/* eslint-disable no-multi-spaces */
5353
const defaultConfig: ConfigSchema = {
5454
docs: {
55-
sort: "type, scope, access, name", // @webdoc/parser{mod:sort}
55+
sort: ["type", "scope", "access", "name"], // @webdoc/parser{mod:sort}
5656
},
5757
source: {
5858
},

packages/webdoc-parser/src/transformer/mod-sort-members.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,15 @@ export default function sort(rootDoc: Doc): void {
6060
}
6161

6262
// The doc-tree is sorted by source already
63-
if (!sortBasis || sortBasis.startsWith("source")) {
63+
if (!sortBasis ||
64+
(typeof sortBasis === "string" && sortBasis.startsWith("source")) ||
65+
(Array.isArray(sortBasis) && sortBasis[0] === "source")) {
6466
return;
6567
}
6668

6769
// Extract the doc properties used for sorting
68-
const props = sortBasis.split(",").map((prop) => prop.trim());
70+
const props = Array.isArray(sortBasis) ?
71+
sortBasis : sortBasis.split(",").map((prop) => prop.trim());
6972

7073
// Ensure all props are supported
7174
props.forEach((prop) => {

0 commit comments

Comments
 (0)