Skip to content

Commit b46f8ca

Browse files
authored
Merge pull request #878 from live-codes/fix-validate-config
Fix validate config
2 parents 341c5d5 + 968e2a5 commit b46f8ca

2 files changed

Lines changed: 4 additions & 16 deletions

File tree

src/livecodes/config/__tests__/validate-config.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ describe('validateConfig', () => {
157157
script: { invalid: 'hi' },
158158
} as any;
159159

160-
const correctConfig = {};
160+
const correctConfig = { script: { language: 'javascript' } };
161161
expect(validateConfig(testConfig)).toEqual(correctConfig);
162162
});
163163

src/livecodes/config/validate-config.ts

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,6 @@ export const validateConfig = (config: Partial<Config>): Partial<Config> => {
4343
const editorIds: EditorId[] = ['markup', 'style', 'script'];
4444
const zoomLevels: Array<Config['zoom']> = [1, 0.5, 0.25];
4545

46-
const isEditor = (x: any) =>
47-
is(x, 'object') &&
48-
(is(x.language, 'string') ||
49-
is(x.title, 'string') ||
50-
is(x.content, 'string') ||
51-
is(x.contentUrl, 'string') ||
52-
is(x.hiddenContent, 'string') ||
53-
is(x.hiddenContentUrl, 'string') ||
54-
is(x.foldedLines, 'array', 'object') ||
55-
is(x.order, 'number') ||
56-
is(x.selector, 'string'));
57-
5846
const isFoldedLines = (x: any) => is(x, 'object') && (is(x.from, 'number') || is(x.to, 'number'));
5947

6048
const fixSfcLanguage = (lang: Language, editorId: EditorId) =>
@@ -150,13 +138,13 @@ export const validateConfig = (config: Partial<Config>): Partial<Config> => {
150138
...(is(config.languages, 'array', 'string')
151139
? { languages: removeDuplicates(config.languages) }
152140
: {}),
153-
...(isEditor(config.markup)
141+
...(is(config.markup, 'object')
154142
? { markup: validateEditorProps(config.markup as Editor, 'markup') }
155143
: {}),
156-
...(isEditor(config.style)
144+
...(is(config.style, 'object')
157145
? { style: validateEditorProps(config.style as Editor, 'style') }
158146
: {}),
159-
...(isEditor(config.script)
147+
...(is(config.script, 'object')
160148
? { script: validateEditorProps(config.script as Editor, 'script') }
161149
: {}),
162150
...(is(config.tools, 'object')

0 commit comments

Comments
 (0)