Support array columns config

gajus · Apr 22, 2021 · 3776f96 · 3776f96
1 parent 526a098
commit 3776f96
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 16 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/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}},
@@ -160,6 +175,27 @@ const streamConfigSamples: {invalid: unknown[], valid: StreamUserConfig[], } = {
  },
  },
 
+ {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'}]},
+
  ],
 };
 

diff --git a/test/config.ts → test/tableConfig.ts b/test/config.ts → test/tableConfig.ts
@@ -9,7 +9,7 @@ import {
 import validators from '../src/generated/validators';
 import configSchema from '../src/schemas/config.json';
 import sharedSchema from '../src/schemas/shared.json';
-import configSamples from './configSamples';
+import tableConfigSamples from './tableConfigSamples';
 
 const validateConfig = validators['config.json'];
 
@@ -25,14 +25,14 @@ describe('config.json schema', () => {
  });
 
  it('passes validation of valid config samples', () => {
- for (const sample of configSamples.valid) {
+ for (const sample of tableConfigSamples.valid) {
  expect(validate(sample)).to.equal(true);
  expect(validateConfig(sample)).to.equal(true);
  }
  });
 
  it('fails validation of invalid config samples', () => {
- for (const sample of configSamples.invalid) {
+ for (const sample of tableConfigSamples.invalid) {
  expect(validate(sample)).to.equal(false);
  expect(validateConfig(sample)).to.equal(false);
  }

diff --git a/test/configSamples.ts → test/tableConfigSamples.ts b/test/configSamples.ts → test/tableConfigSamples.ts
@@ -2,7 +2,7 @@ import type {
  TableUserConfig,
 } from '../src';
 
-const configSamples: {invalid: unknown[], valid: TableUserConfig[], } = {
+const tableConfigSamples: {invalid: unknown[], valid: TableUserConfig[], } = {
  invalid: [
  {border: 1},
  {border: {unknown: '-'}},
@@ -32,6 +32,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}},
@@ -97,17 +100,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',
@@ -142,6 +143,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}},
@@ -154,4 +159,4 @@ const configSamples: {invalid: unknown[], valid: TableUserConfig[], } = {
  ],
 };
 
-export default configSamples;
+export default tableConfigSamples;