vaporous 0.0.11 → 0.0.12

package/Vaporous.js

@@ -238,8 +238,8 @@ class Vaporous {
      * @param {string} target - Field name containing array to expand
      * @returns {Vaporous} - Returns this instance for chaining
      */
-    mvexpand(target) {
-        return transformations.mvexpand.call(this, target);
+    mvexpand(...targets) {
+        return transformations.mvexpand.call(this, targets);
     }
 
     // ========================================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vaporous",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Transition data to different structured states for analytical processing",
   "main": "Vaporous.js",
   "scripts": {

package/src/http.js

@@ -3,59 +3,64 @@ const httpsLib = require('https')
 const { HttpProxyAgent } = require('http-proxy-agent')
 const { HttpsProxyAgent } = require('https-proxy-agent')
 
+const request = async ({ uri, method, headers, body, options = {} }) => {
+    const response = await new Promise((resolve, reject) => {
+        const isHTTPs = uri.startsWith('https')
+        const lib = isHTTPs ? httpsLib : httpLib
+        const { hostname, port, pathname, search } = new URL(uri)
+        const path = pathname + (search || '')
 
-async function load_http() {
+        const options = {
+            method,
+            hostname,
+            port,
+            path,
+            headers
+        }
 
-    for (let event of this.events) {
-        const { _http_req_uri,
-            _http_req_method,
-            _http_req_headers,
-            _http_req_body } = event
-
-
-        const task = new Promise((resolve, reject) => {
-            const lib = _http_req_uri.startsWith('https') ? httpsLib : httpLib
-            const { hostname, port, pathname, search } = new URL(_http_req_uri)
-            const path = pathname + (search || '')
-
-            const options = {
-                method: _http_req_method,
-                hostname,
-                port,
-                path,
-                headers: _http_req_headers
-            }
-
-            const proxy = process.env.HTTP_PROXY || process.env.HTTPS_PROXY || process.env.http_proxy || process.env.https_proxy
-
-            if (proxy) {
-                const isHttps = _http_req_uri.startsWith('https')
-                options.agent = isHttps ? new HttpsProxyAgent(proxy) : new HttpProxyAgent(proxy)
-            }
-
-            const req = lib.request(options, res => {
-                let body = '';
-
-                res.on('data', data => {
-                    body += data
-                })
-
-                res.on('end', () => {
-                    event._http_res_body = body
-                    event._http_res_status = res.statusCode
-                    event._http_res_headers = res.headers
-                    resolve(body)
-                })
+        const proxy = isHTTPs ? (process.env.https_proxy || process.env.HTTPS_PROXY) : (process.env.http_proxy || process.env.HTTP_PROXY)
+
+        if (proxy) options.agent = isHTTPs ? new HttpsProxyAgent(proxy) : new HttpProxyAgent(proxy)
+
+        const req = lib.request(options, res => {
+            let body = '';
+
+            res.on('data', data => {
+                body += data
+            })
+
+            res.on('end', () => {
+                resolve({ body, statusCode: res.statusCode, headers: res.headers })
             })
+        })
 
-            if (_http_req_body) req.write(_http_req_body)
-            req.end()
+        if (body) req.write(body)
+        req.end()
+    })
+
+    if (response.statusCode === 307) {
+        return request({ uri: response.headers.location, method, headers, body, options })
+    }
+
+    return response;
+}
+
+async function load_http() {
+
+    for (let event of this.events) {
+        const res = await request({
+            uri: event._http_req_uri,
+            method: event._http_req_method,
+            headers: event._http_req_headers,
+            body: event._http_req_body
         })
 
-        await task
+        event._http_res_status = res.statusCode
+        event._http_res_headers = res.headers
+        event._http_res_body = res.body
     }
 
-    return this;
+    return this
 }
 
 module.exports = {

package/src/processing.js

@@ -31,8 +31,9 @@ async function parallel(target, { multiThread = false } = {}, callbackPath) {
         const instance = new Vaporous({ loggers })
         instance.events = thisEvent
 
-        const task = await funct(instance)
-        tasks.push(task.begin())
+        const task = funct(instance).begin()
+        tasks.push(task)
+        await task
 
         await processSingleThread()
     }
@@ -135,9 +136,11 @@ async function recurse(funct) {
     for (let event of this.events) {
         const target = new Vaporous({ loggers: this.loggers })
         target.events = [event]
+        event._recursion = true
 
         const localRecursion = async (target) => {
-            const val = await funct(target)
+            const executionChain = funct(target)
+            const val = await executionChain.begin()
             if (val.events[0]._recursion) return localRecursion(target)
             return val
         }
@@ -155,7 +158,7 @@ async function doIf(condition, callback) {
     if (proceed) {
         const clone = this.clone()
         const task = await callback(clone)
-        task.begin()
+        await task.begin()
         this.events = clone.events
     }
     return this;

package/src/statistics.js

@@ -41,7 +41,9 @@ module.exports = {
                 const reference = map[key]._statsRaw[aggregation.field]
 
                 if (aggregation.sortable) {
-                    sortedCache[aggregation.field] = reference.slice().sort((a, b) => a - b)
+                    if (sortedCache[aggregation.field] === undefined) {
+                        sortedCache[aggregation.field] = reference.slice().sort((a, b) => a - b)
+                    }
                     result[outputField] = aggregation.calculate(sortedCache[aggregation.field])
                 } else {
                     result[outputField] = aggregation.calculate(reference)

package/src/transformations.js

@@ -60,27 +60,28 @@ module.exports = {
         return this;
     },
 
-    mvexpand(target) {
+    mvexpand(targets) {
 
         const arr = []
         this.events.forEach(event => {
             if (event instanceof Array) {
-                if (!!target) throw new Error('Cannot mvexpand an array to a target')
+                if (targets.length !== 0) throw new Error('Cannot mvexpand on a target value when source data is array')
+
                 event.forEach((item, i) => {
-                    item.i = i
+                    item._mvExpand = i
                     arr.push(item)
                 })
             } else {
+                // Identify max iterations
+                const max = targets.reduce((prev, curr) => Math.max(prev, event[curr].length), 0)
 
-
-                if (!event[target]) return arr.push(event)
-                event[target].forEach((item, i) => {
-                    arr.push({
-                        ...event,
-                        [target]: item,
-                        [`_mvExpand_${target}`]: i
+                for (let i = 0; i < max; i++) {
+                    const obj = { ...event, _mvExpand: i }
+                    targets.forEach(target => {
+                        obj[target] = event[target][i]
                     })
-                })
+                    arr.push(obj)
+                }
             }
         })
 

package/src/visualization.js

@@ -372,12 +372,14 @@ module.exports = {
         return this;
     },
 
-    render(location = './Vaporous_generation.html', { tabOrder } = {}) {
+    render(location = './Vaporous_generation.html', options = {}) {
 
 
         const classSafe = (name) => name.replace(/[^a-zA-Z0-9]/g, "_")
 
-        if (tabOrder) this.tabs = tabOrder
+        if (typeof options === 'function') options = options()
+
+        if (options.tabOrder) this.tabs = options.tabOrder
 
         const createElement = (name, type, visualisationOptions, eventData, { trellis, trellisName = "", columnDefinitions }) => {
 

package/Vaporous_generation.html

@@ -1,324 +0,0 @@
-
-<html>
-        <head>
-        <meta name="viewport" content="width=device-width, initial-scale=0.5">
-            <style>
-                @import url('https://fonts.googleapis.com/css?family=Roboto:400,700&display=swap');
-
-/* Apply Roboto to all elements */
-* {
-    font-family: 'Roboto', Arial, sans-serif !important;
-}
-
-body {
-    font-family: 'Roboto', Arial, sans-serif;
-}
-
-/* Chart-specific styles */
-.chart,
-.chart-container,
-canvas,
-svg,
-.chartjs-render-monitor {
-    font-family: 'Roboto', Arial, sans-serif !important;
-}
-
-/* Third-party library overrides */
-.ag-theme-quartz,
-.ag-cell,
-.ag-header-cell,
-.tabulator,
-.tabulator-cell,
-.tabulator-header {
-    font-family: 'Roboto', Arial, sans-serif !important;
-}
-
-body {
-    margin: 0;
-    padding: 16px;
-}
-
-.tabBar {
-    display: flex;
-    overflow: auto;
-    box-shadow:
-        0 3px 12px rgba(0, 0, 0, 0.09),
-        0 6px 18px rgba(0, 0, 0, 0.06);
-    min-height: 32px;
-    margin-bottom: 24px;
-    margin-top: 8px;
-    margin-left: 8px;
-    margin-right: 8px;
-    position: relative;
-    background: #fff;
-    align-items: center;
-}
-
-.tabs {
-    border-radius: 8px;
-    padding: 8px 20px;
-    cursor: pointer;
-    background: none;
-    border: none;
-    outline: none;
-    font-size: 1rem;
-    color: #555;
-    transition: all 0.3s ease-in-out;
-    text-align: center;
-    margin: 12px;
-    position: relative;
-    z-index: 1;
-}
-
-.tabs:not(.selectedTab):hover {
-    color: #1976d2;
-}
-
-.selectedTab {
-    color: #fff;
-    font-weight: bold;
-}
-
-.selectedTab::before {
-    content: '';
-    position: absolute;
-    background: #1976d2;
-    border-radius: 8px;
-    z-index: -1;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    transition: transform 0.3s ease-in-out;
-    box-shadow:
-        0 4px 16px rgba(25, 118, 210, 0.3),
-        0 8px 24px rgba(25, 118, 210, 0.2);
-    animation: slideInFromLeft 0.3s ease-in-out forwards;
-}
-
-.selectedTab.slideFromRight::before {
-    animation: slideInFromRight 0.3s ease-in-out forwards;
-}
-
-@keyframes slideInFromLeft {
-    0% {
-        transform: translateX(-100%);
-        opacity: 0;
-    }
-
-    100% {
-        transform: translateX(0);
-        opacity: 1;
-    }
-}
-
-@keyframes slideInFromRight {
-    0% {
-        transform: translateX(100%);
-        opacity: 0;
-    }
-
-    100% {
-        transform: translateX(0);
-        opacity: 1;
-    }
-}
-
-#content {
-    display: flex;
-    flex-wrap: wrap;
-    padding: 0px;
-    gap: 8px;
-    justify-content: flex-start;
-}
-
-.parentHolder {
-    display: flex;
-    margin: 2px;
-    border: 1px solid #d3d3d3;
-}
-
-.parentHolder::after {
-    border: 2px solid red;
-    /* Change color and width as needed */
-    pointer-events: none;
-    z-index: 2;
-}
-
-.tabContent {
-    opacity: 1;
-    transition: opacity 0.3s,
-}
-
-.graphTitle {
-    opacity: 0.7;
-    text-align: center;
-    display: 'flex';
-}
-
-.tableHolder {
-    margin-top: 8px;
-    width: 100%;
-    /* height: 600px; */
-    /* overflow: auto; */
-}
-
-#extendedDescription {
-    text-align: center;
-    opacity: 0.7;
-    margin-bottom: 16px;
-}
-            </style>
-            <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-            <script src="https://cdn.jsdelivr.net/npm/ag-grid-community@34.2.0/dist/ag-grid-community.min.js"></script>
-
-    
-    <script type="text/javascript">
-
-      const classSafe = (name) => name.replace(/[^a-zA-Z0-9]/g, "_")
-
-      var selectedTab = classSafe("User Stats")
-      var previousTab = null
-      const tokens = {}
-      const visualisationData = [[{"columnDefinitions":[{"field":"gender"},{"field":"avgHeight"}],"rowData":[{"gender":"female","avgHeight":177.5666666666667},{"gender":"male","avgHeight":173.15249999999997}],"title":"Average height"}],[{"type":"line","data":{"labels":["female","male"],"datasets":[{"label":"avgHeight","data":[177.5666666666667,173.15249999999997],"pointRadius":0}]},"options":{"scales":{"y":{"type":"linear","display":true,"position":"left","min":173.15249999999997,"max":[177.5666666666667]},"x":{"type":"category","ticks":{"display":false}}},"responsive":true,"plugins":{"legend":{"display":true,"position":"bottom"},"title":{"display":false,"text":"Average height"}}}}]]
-      const tabOrder = ["User_Stats"]
-
-      const _sort = (order, data, ...keys) => {
-    return data.sort((a, b) => {
-        let directive = 0;
-
-        keys.some(key => {
-            directive = typeof a[key] === 'number' ? a[key] - b[key] : a[key].localeCompare(b[key])
-            if (order === 'dsc') directive = directive * -1
-            if (directive !== 0) return true;
-        })
-
-        return directive;
-    })
-}
-      const createElement = (name, type, visualisationOptions, eventData, { trellis, trellisName = "", columnDefinitions }) => {
-
-            if (classSafe(visualisationOptions.tab) !== selectedTab) return;
-
-            if (visualisationOptions.extendedDescription) {
-                const descriptions = document.getElementById('extendedDescription')
-                const thisDescription = document.createElement('div')
-                thisDescription.innerHTML = visualisationOptions.extendedDescription
-                descriptions.appendChild(thisDescription)
-            }
-
-            eventData = visualisationData[eventData]
-
-            // TODO: migrate trellis functionality from here to tograph
-            if (trellis) {
-                let pairs = trellisName.map((name, i) => [name, eventData[i]]);
-                pairs = pairs.sort((a, b) => a[0].localeCompare(b[0]))
-
-                // Unzip back into separate arrays
-                trellisName = pairs.map(p => p[0]);
-                eventData = pairs.map(p => p[1]);
-            }
-
-            const columnCount = visualisationOptions.columns || 2
-
-            eventData.forEach((trellisData, i) => {
-                const parentHolder = document.createElement('div')
-
-                const titleDiv = document.createElement('div')
-                titleDiv.classList.add('graphTitle')
-                parentHolder.appendChild(titleDiv)
-
-                if (trellisData.options) {
-                    titleDiv.textContent = trellisData.options.plugins.title.text
-                } else {
-                    titleDiv.textContent = trellisData.title
-                }
-
-                document.getElementById('content').appendChild(parentHolder)
-
-                parentHolder.style = `flex: 0 0 calc(${100 / columnCount}% - 8px); max-width: calc(${100 / columnCount}% - 8px);`
-                if (type === 'Table') {
-                    const tableDiv = document.createElement('div')
-                    tableDiv.classList.add('tableHolder')
-                    document.documentElement.style.setProperty("--ag-spacing", `4px`);
-
-
-                    // Need to do column defintiions here
-                    parentHolder.appendChild(tableDiv)
-                    new agGrid.createGrid(tableDiv, {
-                        suppressFieldDotNotation: true,
-                        rowData: trellisData.rowData,
-                        // Columns to be displayed (Should match rowData properties)
-                        columnDefs: trellisData.columnDefinitions,
-                        defaultColDef: {
-                            flex: 1,
-                            resizable: true,
-                            sortable: true,
-                            filter: true
-                        },
-                        domLayout: 'autoHeight',
-                        enableCellTextSelection: true,
-                        // suppressHorizontalScroll: false,
-                        // autoSizeStrategy: {
-                        //     type: 'fitGridWidth',
-                        //     defaultMinWidth: 100
-                        // }
-                    });
-                } else {
-                    const graphEntity = document.createElement('canvas')
-                    parentHolder.appendChild(graphEntity)
-                    new Chart(graphEntity, trellisData)
-                }
-
-            })
-        }
-      
-      function drawVis(tab) {
-            if (tab) {
-                if (selectedTab) {
-                    document.getElementById(selectedTab).classList.remove('selectedTab')
-                    document.getElementById(selectedTab).classList.remove('slideFromRight')
-                    previousTab = selectedTab
-                }
-                selectedTab = tab
-            } else if (true) {
-                selectedTab = classSafe('User Stats')
-            }
-
-            if (selectedTab) {
-                const selectedElement = document.getElementById(selectedTab)
-                selectedElement.classList.add('selectedTab')
-                
-                // Determine slide direction based on tab positions
-                if (previousTab) {
-                    const previousIndex = tabOrder.indexOf(previousTab)
-                    const currentIndex = tabOrder.indexOf(selectedTab)
-                    
-                    if (currentIndex < previousIndex) {
-                        // Moving to left tab, slide from right
-                        selectedElement.classList.add('slideFromRight')
-                    }
-                    // For right movement or first load, use default slideFromLeft animation
-                }
-            }
-            document.getElementById('content').innerHTML = ''
-            document.getElementById('extendedDescription').innerHTML = ''
-            createElement('Average height', 'Table', {"tab":"User Stats","columns":2} ,0, {"xPrimary":"gender","columnDefinitions":[["gender","avgHeight"]]}),createElement('Average height', 'Line', {"tab":"User Stats","columns":2} ,1, {"xPrimary":"gender","columnDefinitions":[["gender","avgHeight"]]})
-      }
-
-        document.addEventListener("DOMContentLoaded", function(event) {
-            drawVis()
-        });
-      
-    </script>
-  </head>
-  <body>
-        <div class='tabBar'>
-            <div id=User_Stats class='tabs' onclick="drawVis('User_Stats')">User Stats</div>
-        </div>
-
-    <div id='extendedDescription'></div>
-    <div id='content'></div>
-  </body>
-</html>
-