diff --git a/core/entities/Node.js b/core/entities/Nodule.js similarity index 97% rename from core/entities/Node.js rename to core/entities/Nodule.js index d963fb6..638d394 100644 --- a/core/entities/Node.js +++ b/core/entities/Nodule.js @@ -1,6 +1,6 @@ import Table from './Table.js' -class Node { +class Nodule { constructor (props) { const validatePropsResponse = this._validateConstructionProps(props) if (validatePropsResponse.status === 'ERR') { @@ -58,7 +58,7 @@ class Node { _assignProps = props => { this.id = props.id this.label = props.label - this.type = 'Node' + this.type = 'Nodule' this.isValid = true if (props.tables) this.importTables(props.tables) @@ -114,4 +114,4 @@ class Node { } } -export default Node +export default Nodule diff --git a/core/entities/nodes/FilterNode.js b/core/entities/nodules/FilterNodule.js similarity index 96% rename from core/entities/nodes/FilterNode.js rename to core/entities/nodules/FilterNodule.js index acebcf6..f2a718a 100644 --- a/core/entities/nodes/FilterNode.js +++ b/core/entities/nodules/FilterNodule.js @@ -1,7 +1,7 @@ -import Node from '../Node.js' +import Nodule from '../Nodule.js' import filterTypes from '../../constants/filterTypes.js' -class FilterNode extends Node { +class FilterNodule extends Nodule { constructor (props) { super (props) this._assignProps(props) @@ -94,4 +94,4 @@ class FilterNode extends Node { } } -export default FilterNode +export default FilterNodule diff --git a/core/entities/nodes/JoinNode.js b/core/entities/nodules/JoinNodule.js similarity index 95% rename from core/entities/nodes/JoinNode.js rename to core/entities/nodules/JoinNodule.js index e630954..78fefca 100644 --- a/core/entities/nodes/JoinNode.js +++ b/core/entities/nodules/JoinNodule.js @@ -1,6 +1,6 @@ -import Node from '../Node.js' +import Nodule from '../Nodule.js' -class JoinNode extends Node { +class JoinNodule extends Nodule { constructor (props) { super(props) this._assignProps(props) @@ -77,4 +77,4 @@ class JoinNode extends Node { } } -export default JoinNode +export default JoinNodule diff --git a/core/entities/nodes/TransformNode.js b/core/entities/nodules/TransformNodule.js similarity index 92% rename from core/entities/nodes/TransformNode.js rename to core/entities/nodules/TransformNodule.js index a81c379..5e10b67 100644 --- a/core/entities/nodes/TransformNode.js +++ b/core/entities/nodules/TransformNodule.js @@ -1,6 +1,6 @@ -import Node from '../Node.js' +import Nodule from '../Nodule.js' -class TransformNode extends Node { +class TransformNodule extends Nodule { constructor (props) { super(props) this._assignProps(props) @@ -53,4 +53,4 @@ class TransformNode extends Node { } } -export default TransformNode +export default TransformNodule diff --git a/tests/core/nodeTests.js b/tests/core/NoduleTests.js similarity index 73% rename from tests/core/nodeTests.js rename to tests/core/NoduleTests.js index dde93bd..75d28ee 100644 --- a/tests/core/nodeTests.js +++ b/tests/core/NoduleTests.js @@ -1,4 +1,4 @@ -import Node from '../../core/entities/Node.js' +import Nodule from '../../core/entities/Nodule.js' import Table from '../../core/entities/Table.js' const input = { @@ -17,7 +17,7 @@ const getNodeProperties = () => { const expectedOutput = { id: 'ABC', label: 'Test Node', - type: 'Node', + type: 'Nodule', tables: [ { id: 'XYZ', @@ -31,8 +31,8 @@ const getNodeProperties = () => { } try { - const node = new Node(input) - const nodeProps = node.getProperties() + const nodule = new Nodule(input) + const nodeProps = nodule.getProperties() if (JSON.stringify(nodeProps) == JSON.stringify(expectedOutput)) return true else return false } catch (err) { @@ -49,14 +49,14 @@ const createNodeWithoutTables = () => { const expectedOutput = { id: 'ABC', label: 'Test Node', - type: 'Node', + type: 'Nodule', tables: [], isValid: true } try { - const node = new Node(input) - const nodeProps = node.getProperties() + const nodule = new Nodule(input) + const nodeProps = nodule.getProperties() if (JSON.stringify(nodeProps) == JSON.stringify(expectedOutput)) return true else return false } catch (err) { @@ -74,7 +74,7 @@ const importTables = () => { const expectedOutput = { id: 'ABC', label: 'Test Node', - type: 'Node', + type: 'Nodule', tables: [{ id: 'XYZ', label: 'Test Table', @@ -86,12 +86,12 @@ const importTables = () => { } try { - const node = new Node({ + const nodule = new Nodule({ id: 'ABC', label: 'Test Node', }) - node.importTables(table) - const nodeProps = node.getProperties() + nodule.importTables(table) + const nodeProps = nodule.getProperties() if (JSON.stringify(nodeProps) == JSON.stringify(expectedOutput)) return true else return false @@ -103,19 +103,19 @@ const importTables = () => { const failToExport = () => { const expectedOutput = null - const node = new Node({ + const nodule = new Nodule({ id: 'ABC', label: 'Test Node', }) - const nodeAsTable = node.asTable() + const nodeAsTable = nodule.asTable() if (expectedOutput === nodeAsTable) return true else return false } export default [ - { name: 'Entity | Get Node Properties', test: getNodeProperties }, - { name: 'Entity | Create Node Without Tables', test: createNodeWithoutTables }, - { name: 'Entity | Import Tables to Node', test: importTables }, + { name: 'Entity | Get Nodule Properties', test: getNodeProperties }, + { name: 'Entity | Create Nodule Without Tables', test: createNodeWithoutTables }, + { name: 'Entity | Import Tables to Nodule', test: importTables }, { name: 'Entity | Fail to Export', test: failToExport } ] \ No newline at end of file diff --git a/tests/core/nodes/filterNodeTests.js b/tests/core/nodules/filterNoduleTests.js similarity index 79% rename from tests/core/nodes/filterNodeTests.js rename to tests/core/nodules/filterNoduleTests.js index a61c482..05b9b19 100644 --- a/tests/core/nodes/filterNodeTests.js +++ b/tests/core/nodules/filterNoduleTests.js @@ -1,4 +1,4 @@ -import FilterNode from '../../../core/entities/nodes/FilterNode.js' +import FilterNodule from '../../../core/entities/nodules/FilterNodule.js' import Table from '../../../core/entities/Table.js' const equalFilter = () => { @@ -23,11 +23,11 @@ const equalFilter = () => { return false } - let filterNode = {} + let filterNodule = {} try { - filterNode = new FilterNode({ + filterNodule = new FilterNodule({ id: 'ABC', - label: 'Test Node', + label: 'Test Nodule', tables: [table], filterParams: { data: 'row', @@ -40,7 +40,7 @@ const equalFilter = () => { return false } - const filteredRows = filterNode.export() + const filteredRows = filterNodule.export() if (JSON.stringify(filteredRows) === JSON.stringify(expectedOutput)) { return true } else { @@ -70,11 +70,11 @@ const addFilter = () => { return false } - let filterNode = {} + let filterNodule = {} try { - filterNode = new FilterNode({ + filterNodule = new FilterNodule({ id: 'ABC', - label: 'Test Node', + label: 'Test Nodule', tables: [table], filterParams: { data: 'row', @@ -87,13 +87,13 @@ const addFilter = () => { } try { - filterNode.addFilter({ contractor: 'AshBritt' }) + filterNodule.addFilter({ contractor: 'AshBritt' }) } catch (err) { console.log(err) return false } - const filteredRows = filterNode.export() + const filteredRows = filterNodule.export() if (JSON.stringify(filteredRows) === JSON.stringify(expectedOutput)) { return true } else { @@ -123,11 +123,11 @@ const exportWithoutTypeErrorHandle = () => { return false } - let filterNode = {} + let filterNodule = {} try { - filterNode = new FilterNode({ + filterNodule = new FilterNodule({ id: 'ABC', - label: 'Test Node', + label: 'Test Nodule', tables: [table], filterParams: { data: 'row', @@ -140,7 +140,7 @@ const exportWithoutTypeErrorHandle = () => { } try { - filterNode.export() + filterNodule.export() } catch (err) { if (JSON.stringify(err) === JSON.stringify(expectedOutput)) { return true @@ -172,11 +172,11 @@ const setType = () => { return false } - let filterNode = {} + let filterNodule = {} try { - filterNode = new FilterNode({ + filterNodule = new FilterNodule({ id: 'ABC', - label: 'Test Node', + label: 'Test Nodule', tables: [table], filterParams: { data: 'row', @@ -189,13 +189,13 @@ const setType = () => { } try { - filterNode.setFilterType('EQUAL') + filterNodule.setFilterType('EQUAL') } catch (err) { console.log(err) return false } - const filteredRows = filterNode.export() + const filteredRows = filterNodule.export() if (JSON.stringify(filteredRows) === JSON.stringify(expectedOutput)) { return true } else { @@ -225,11 +225,11 @@ const greaterFilter = () => { return false } - let filterNode = {} + let filterNodule = {} try { - filterNode = new FilterNode({ + filterNodule = new FilterNodule({ id: 'ABC', - label: 'Test Node', + label: 'Test Nodule', tables: [table], filterParams: { count: 4 @@ -243,7 +243,7 @@ const greaterFilter = () => { let filteredRows = [] try { - filteredRows = filterNode.export() + filteredRows = filterNodule.export() } catch (err) { console.log(err) return false @@ -278,11 +278,11 @@ const greaterEqualFilter = () => { return false } - let filterNode = {} + let filterNodule = {} try { - filterNode = new FilterNode({ + filterNodule = new FilterNodule({ id: 'ABC', - label: 'Test Node', + label: 'Test Nodule', tables: [table], filterParams: { count: 4 @@ -296,7 +296,7 @@ const greaterEqualFilter = () => { let filteredRows = [] try { - filteredRows = filterNode.export() + filteredRows = filterNodule.export() } catch (err) { console.log(err) return false @@ -329,11 +329,11 @@ const lesserFilter = () => { return false } - let filterNode = {} + let filterNodule = {} try { - filterNode = new FilterNode({ + filterNodule = new FilterNodule({ id: 'ABC', - label: 'Test Node', + label: 'Test Nodule', tables: [table], filterParams: { count: 4 @@ -347,7 +347,7 @@ const lesserFilter = () => { let filteredRows = [] try { - filteredRows = filterNode.export() + filteredRows = filterNodule.export() } catch (err) { console.log(err) return false @@ -381,11 +381,11 @@ const lesserEqualFilter = () => { return false } - let filterNode = {} + let filterNodule = {} try { - filterNode = new FilterNode({ + filterNodule = new FilterNodule({ id: 'ABC', - label: 'Test Node', + label: 'Test Nodule', tables: [table], filterParams: { count: 4 @@ -399,7 +399,7 @@ const lesserEqualFilter = () => { let filteredRows = [] try { - filteredRows = filterNode.export() + filteredRows = filterNodule.export() } catch (err) { console.log(err) return false @@ -414,7 +414,7 @@ const lesserEqualFilter = () => { const getAsTable = () => { const expectedOutput = { id: 'ABC', - label: 'Test Node', + label: 'Test Nodule', rows: [ { id: 'qwe', count: 4, contractor: 'AshBritt' }, { id: 'xyz', count: 2, contractor: 'HeyDay' } @@ -439,11 +439,11 @@ const getAsTable = () => { return false } - let filterNode = {} + let filterNodule = {} try { - filterNode = new FilterNode({ + filterNodule = new FilterNodule({ id: 'ABC', - label: 'Test Node', + label: 'Test Nodule', tables: [table], filterParams: { count: 4 @@ -455,14 +455,14 @@ const getAsTable = () => { return false } - let filterNodeAsTable = [] + let filterNoduleAsTable = [] try { - filterNodeAsTable = filterNode.asTable().getProperties() + filterNoduleAsTable = filterNodule.asTable().getProperties() } catch (err) { console.log(err) return false } - if (JSON.stringify(filterNodeAsTable) === JSON.stringify(expectedOutput)) { + if (JSON.stringify(filterNoduleAsTable) === JSON.stringify(expectedOutput)) { return true } else { return false @@ -470,13 +470,13 @@ const getAsTable = () => { } export default [ - { name: 'Entity | FilterNode Equal Filter', test: equalFilter }, - { name: 'Entity | FilterNode GREATER Filter', test: greaterFilter }, - { name: 'Entity | FilterNode GREATEREQUAL Filter', test: greaterEqualFilter }, - { name: 'Entity | FilterNode LESSER Filter', test: lesserFilter }, - { name: 'Entity | FilterNode LESSEREQUAL Filter', test: lesserEqualFilter }, - { name: 'Entity | FilterNode Add Filter', test: addFilter }, - { name: 'Entity | FilterNode Set Type', test: setType }, - { name: 'Entity | FilterNode Export Without Type Error', test: exportWithoutTypeErrorHandle }, - { name: 'Entity | FilterNode Export As Table', test: getAsTable }, + { name: 'Entity | FilterNodule Equal Filter', test: equalFilter }, + { name: 'Entity | FilterNodule GREATER Filter', test: greaterFilter }, + { name: 'Entity | FilterNodule GREATEREQUAL Filter', test: greaterEqualFilter }, + { name: 'Entity | FilterNodule LESSER Filter', test: lesserFilter }, + { name: 'Entity | FilterNodule LESSEREQUAL Filter', test: lesserEqualFilter }, + { name: 'Entity | FilterNodule Add Filter', test: addFilter }, + { name: 'Entity | FilterNodule Set Type', test: setType }, + { name: 'Entity | FilterNodule Export Without Type Error', test: exportWithoutTypeErrorHandle }, + { name: 'Entity | FilterNodule Export As Table', test: getAsTable }, ] \ No newline at end of file diff --git a/tests/core/nodes/joinNodeTests.js b/tests/core/nodules/joinNoduleTests.js similarity index 88% rename from tests/core/nodes/joinNodeTests.js rename to tests/core/nodules/joinNoduleTests.js index 6331383..1eea495 100644 --- a/tests/core/nodes/joinNodeTests.js +++ b/tests/core/nodules/joinNoduleTests.js @@ -1,4 +1,4 @@ -import JoinNode from '../../../core/entities/nodes/JoinNode.js' +import JoinNodule from '../../../core/entities/nodules/JoinNodule.js' import Table from '../../../core/entities/Table.js' const joinTables = () => { @@ -27,7 +27,7 @@ const joinTables = () => { { id: '2345676', contractor: 'AshBritt', type: 'lh', lat: 80, long: -41, 'contractors::id': '1WE3V6', 'contractors::name': 'AshBritt', 'contractors::employeeCount': 43, 'contractors::homeState': 'CA' }, ] - const joinNode = new JoinNode({ + const joinNodule = new JoinNodule({ id: 'QWE', label: 'Receipts with Contractors', tables: [pickupTable, contractorTable], @@ -41,9 +41,9 @@ const joinTables = () => { - const joinNodeProps = joinNode.export() + const joinNoduleProps = joinNodule.export() - if (JSON.stringify(joinNodeProps) === JSON.stringify(expectedOutput)) return true + if (JSON.stringify(joinNoduleProps) === JSON.stringify(expectedOutput)) return true else return false } @@ -73,21 +73,21 @@ const setJoinBy = () => { { id: '2345676', contractor: 'AshBritt', type: 'lh', lat: 80, long: -41, 'contractors::id': '1WE3V6', 'contractors::name': 'AshBritt', 'contractors::employeeCount': 43, 'contractors::homeState': 'CA' }, ] - const joinNode = new JoinNode({ + const joinNodule = new JoinNodule({ id: 'QWE', label: 'Receipts with Contractors', tables: [pickupTable, contractorTable] }) - joinNode.setJoinBy({ + joinNodule.setJoinBy({ baseTableLabel: 'receipts', joinParams: [ { foreignTable: 'contractors', primaryTableKey: 'contractor', matchingKey: 'name' } ] }) - const joinNodeProps = joinNode.export() + const joinNoduleProps = joinNodule.export() - if (JSON.stringify(joinNodeProps) === JSON.stringify(expectedOutput)) return true + if (JSON.stringify(joinNoduleProps) === JSON.stringify(expectedOutput)) return true else return false } diff --git a/tests/core/nodes/transformNodeTests.js b/tests/core/nodules/transformNoduleTests.js similarity index 82% rename from tests/core/nodes/transformNodeTests.js rename to tests/core/nodules/transformNoduleTests.js index 0eb1a6b..6d6b810 100644 --- a/tests/core/nodes/transformNodeTests.js +++ b/tests/core/nodules/transformNoduleTests.js @@ -1,5 +1,5 @@ import Table from '../../../core/entities/Table.js' -import TransformNode from '../../../core/entities/nodes/TransformNode.js' +import TransformNodule from '../../../core/entities/nodules/TransformNodule.js' const transformTable = () => { const expectedOutput = [ @@ -26,9 +26,9 @@ const transformTable = () => { return false } - let transformNode = {} + let transformNodule = {} try { - transformNode = new TransformNode({ + transformNodule = new TransformNodule({ id: 'ABC', label: 'Transform Test', tables: [table], @@ -43,7 +43,7 @@ const transformTable = () => { return false } - const transformRows = transformNode.export() + const transformRows = transformNodule.export() if (JSON.stringify(transformRows) === JSON.stringify(expectedOutput)) return true else return false } @@ -73,9 +73,9 @@ const setStructure = () => { return false } - let transformNode = {} + let transformNodule = {} try { - transformNode = new TransformNode({ + transformNodule = new TransformNodule({ id: 'ABC', label: 'Transform Test', tables: [table], @@ -86,7 +86,7 @@ const setStructure = () => { } try { - transformNode.setStructure({ + transformNodule.setStructure({ 'id': 'identifier', 'data': 'ticketType', 'contractor': 'contractor' @@ -96,12 +96,12 @@ const setStructure = () => { return false } - const transformRows = transformNode.export() + const transformRows = transformNodule.export() if (JSON.stringify(transformRows) === JSON.stringify(expectedOutput)) return true else return false } export default [ - { name: 'Entities | Transform Node Test', test: transformTable }, - { name: 'Entities | Transform Node Set Structure', test: setStructure } + { name: 'Entities | Transform Nodule Test', test: transformTable }, + { name: 'Entities | Transform Nodule Set Structure', test: setStructure } ] diff --git a/tests/index.js b/tests/index.js index 66e5a72..a4d0980 100644 --- a/tests/index.js +++ b/tests/index.js @@ -1,10 +1,10 @@ import ProgressBar from 'progress' import tableTests from '../tests/core/tableTests.js' -import nodeTests from '../tests/core/nodeTests.js' -import filterNodeTests from '../tests/core/nodes/filterNodeTests.js' -import joinNodeTests from '../tests/core/nodes/joinNodeTests.js' -import transformNodeTests from '../tests/core/nodes/transformNodeTests.js' +import noduleTests from '../tests/core/noduleTests.js' +import filterNoduleTests from '../tests/core/nodules/filterNoduleTests.js' +import joinNoduleTests from '../tests/core/nodules/joinNoduleTests.js' +import transformNoduleTests from '../tests/core/nodules/transformNoduleTests.js' function runTestsAndReturnFailures (tests) { const testTotalCount = tests.length @@ -40,10 +40,10 @@ function init (tests) { const testsArray = [ tableTests, - nodeTests, - filterNodeTests, - joinNodeTests, - transformNodeTests + noduleTests, + filterNoduleTests, + joinNoduleTests, + transformNoduleTests ] init (testsArray.flat()) \ No newline at end of file