From 08dce0dbb9e0a03da43d29b553148153dc0f9778 Mon Sep 17 00:00:00 2001 From: Lachlan Kermode Date: Fri, 7 Dec 2018 14:49:16 +0000 Subject: [PATCH] strip down blueprint structure to what is necessary --- src/lib/Fetcher.js | 3 +++ src/lib/blueprinters.js | 16 ++++++++-------- test/internals.js | 6 ++++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/lib/Fetcher.js b/src/lib/Fetcher.js index 890ba97..3103145 100644 --- a/src/lib/Fetcher.js +++ b/src/lib/Fetcher.js @@ -68,8 +68,11 @@ class Fetcher { const parts = url.split('/') acc.push([ parts[1], parts[2] ]) return acc + } else { + return acc } }, []) + return allParts .map(parts => buildDesaturated( this.sheetId, diff --git a/src/lib/blueprinters.js b/src/lib/blueprinters.js index 62b6fe9..3dba25d 100644 --- a/src/lib/blueprinters.js +++ b/src/lib/blueprinters.js @@ -4,23 +4,23 @@ import R from 'ramda' export const defaultBlueprint = { name: null, - id: null, - dialects: ['rest'], // supported dialects, can (eventually) be multiple + sheet: { + name: null, + id: null + }, resources: {} } export const defaultResource = { - options: { - fragment: true - }, data: [] } export function buildDesaturated (sheetId, sheetName, tab, resource) { const bp = R.clone(defaultBlueprint) - bp.name = sheetName - bp.id = sheetId - bp.resources[tab] = resource + bp.sheet.name = sheetName + bp.sheet.id = sheetId + bp.name = tab + bp.resources[resource] = null return bp } diff --git a/test/internals.js b/test/internals.js index 64ef814..49c6ba4 100644 --- a/test/internals.js +++ b/test/internals.js @@ -15,9 +15,11 @@ const egInput1 = [ test('defaultBlueprint exports', t => { const expected = { + sheet: { + name: null, + id: null + }, name: null, - id: null, - dialects: ['rest'], resources: {} } t.deepEqual(expected, defaultBlueprint)