Support array columns config

gajus · Apr 23, 2021 · 7585d6c · 7585d6c
1 parent 2728d70
commit 7585d6c
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 11 deletions.
diff --git a/src/schemas/shared.json b/src/schemas/shared.json
@@ -3,13 +3,23 @@
  "$schema": "http://json-schema.org/draft-07/schema#",
  "definitions": {
  "columns": {
- "type": "object",
- "patternProperties": {
- "^[0-9]+$": {
+ "oneOf": [
+ {
+ "type": "object",
+ "patternProperties": {
+ "^[0-9]+$": {
  "$ref": "#/definitions/column"
+ }
+ },
+ "additionalProperties": false
+ },
+ {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/column"
  }
- },
- "additionalProperties": false
+  }
+ ]
  },
  "column": {
  "type": "object",

diff --git a/test/configSamples.ts b/test/configSamples.ts
@@ -34,6 +34,9 @@ const configSamples: {invalid: unknown[], valid: TableUserConfig[], } = {
  {columns: {1: {truncate: '1'}}},
  {columns: {1: {paddingLeft: '1'}}},
  {columns: {1: {paddingRight: '1'}}},
+ {columns: [1]},
+ {columns: ['']},
+ {columns: [{unknown: 1}]},
  {columnDefault: 1},
  {columnDefault: {unknown: 1}},
  {columnDefault: {alignment: 1}},
@@ -102,17 +105,15 @@ const configSamples: {invalid: unknown[], valid: TableUserConfig[], } = {
  paddingLeft: 0,
  paddingRight: 1,
  },
-
- // drawHorizontalLine: () => {
- // return false
- // }
+ drawHorizontalLine: () => {
+ return false;
+ },
  },
+
  {
  columnDefault: {
  width: 50,
  },
-
- // columnCount: 3,
  columns: {
  0: {
  alignment: 'right',
@@ -151,6 +152,10 @@ const configSamples: {invalid: unknown[], valid: TableUserConfig[], } = {
  {columns: {1: {truncate: 1}}},
  {columns: {1: {paddingLeft: 1}}},
  {columns: {1: {paddingRight: 1}}},
+ {columns: []},
+ {columns: [{width: 5}]},
+ {columns: [{wrapWord: true}, {truncate: 1}]},
+ {columns: [{paddingLeft: 1}, {paddingRight: 1}, {alignment: 'right'}]},
  {columnDefault: {alignment: 'left'}},
  {columnDefault: {width: 5}},
  {columnDefault: {wrapWord: true}},

diff --git a/test/streamConfigSamples.ts b/test/streamConfigSamples.ts
@@ -32,6 +32,21 @@ const streamConfigSamples: {invalid: unknown[], valid: StreamUserConfig[], } = {
  {columns: {1: {truncate: '1'}}},
  {columns: {1: {paddingLeft: '1'}}},
  {columns: {1: {paddingRight: '1'}}},
+ {columnCount: 3,
+ columnDefault: {
+ width: 50,
+ },
+ columns: [1]},
+ {columnCount: 3,
+ columnDefault: {
+ width: 50,
+ },
+ columns: ['']},
+ {columnCount: 3,
+ columnDefault: {
+ width: 50,
+ },
+ columns: [{unknown: 1}]},
  {columnDefault: 1},
  {columnDefault: {unknown: 1}},
  {columnDefault: {alignment: 1}},
@@ -214,6 +229,28 @@ const streamConfigSamples: {invalid: unknown[], valid: StreamUserConfig[], } = {
  columnDefault: {width: 20},
  columns: {0: {wrapWord: false}},
  },
+
+ {columnCount: 3,
+ columnDefault: {
+ width: 50,
+ },
+ columns: []},
+ {columnCount: 3,
+ columnDefault: {
+ width: 50,
+ },
+ columns: [{width: 5}]},
+ {columnCount: 3,
+ columnDefault: {
+ width: 50,
+ },
+ columns: [{wrapWord: true}, {truncate: 1}]},
+ {columnCount: 3,
+ columnDefault: {
+ width: 50,
+ },
+ columns: [{paddingLeft: 1}, {paddingRight: 1}, {alignment: 'right'}]},
+
  ],
 };