dt-toolbox 7.1.0 → 7.1.1

package/Changelog.md

@@ -1,5 +1,9 @@
 ## Release History
 
+### 7.1.1 (2023-09-05 )
+- [x] Fix: Multiple queries in same programming scope;
+
+
 
 ### 7.1.0 (2023-08-28)
 - [x] Method `extractList` was added;
@@ -7,6 +11,7 @@
 - [x] Fix: Tuple model if data is just an array is wrong;
 - [x] Fix: Convertor to files shows 'root' in the beginning of the path;
 - [x] Fix: Convertor to breadcrumbs shows 'root' in the beginning of the path;
+- [ ] Bug: Multiple queries in same programming scope;
 
 
 
@@ -17,11 +22,12 @@
 - [x] Method `insert` was renamed to `insertSegment`;
 - [x] Method `listSegments` was added to show list of all segments in dt-object;
 - [x] Method `insertSegment` expect the incoming data as dt-object, but if is not - will assume it as a standard javascript object and will convert it to dt-object automatically;
-- [] Method `insertSegment` can recognize a dt model object.
-- [] Bug: Method `model` doesn't recognize '**files**' as a model;
-- [] Bug: Tuple model if data is just an array is wrong;
-- [] Bug: Convertor to files shows 'root' in the beginning of the path;
-- [] Bug: Convertor to breadcrumbs shows 'root' in the beginning of the path;
+- [ ] Method `insertSegment` can recognize a dt model object.
+- [ ] Bug: Method `model` doesn't recognize '**files**' as a model;
+- [ ] Bug: Tuple model if data is just an array is wrong;
+- [ ] Bug: Convertor to files shows 'root' in the beginning of the path;
+- [ ] Bug: Convertor to breadcrumbs shows 'root' in the beginning of the path;
+- [ ] Bug: Multiple queries in same programming scope;
 
 
 

package/README.md

@@ -3,8 +3,6 @@
 ![version](https://img.shields.io/github/package-json/v/peterNaydenov/dt-toolbox)
 ![license](https://img.shields.io/github/license/peterNaydenov/dt-toolbox)
 
- - [Documentatation for v.6.x.x is here](htts://github.com/PeterNaydenov/dt-toolbox/blob/master/README_v.6.x.x.md)
- - [Migration guide from v.6.x.x to v.7.x.x](htts://github.com/PeterNaydenov/dt-toolbox/blob/master/MIGRATION.md)
 
 
 ## Last Updates

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dt-toolbox",
   "description": "Data manipulation tool",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "license": "MIT",
   "author": "Peter Naydenov",
   "keywords": [

package/src/draft/connect.js

@@ -0,0 +1,50 @@
+'use strict'
+
+
+function connect ( selectionIx ) {
+return function connect ( list ) {
+            list.forEach ( item => {
+                        let arr = item.split ( '/' )
+                        const 
+                               child = arr.pop ()
+                             , parent = arr.pop ()
+                            , line = selectionIx[parent]
+                            , childLine = selectionIx[child]
+                            ;
+                            
+                        if ( !childLine     )   return this
+                        if ( !line          )   return this
+                        if ( line[1][child] )   return this
+
+                        let breadcrumbs = `${line[2]}/${child}`;
+
+                        updateBreadcrumbs ( selectionIx , child, breadcrumbs )
+                        if ( line[3].includes(breadcrumbs) )   return this
+                        line[3].push ( breadcrumbs )
+                        return this
+                })
+}} // connect func.
+
+
+
+function updateBreadcrumbs ( selectionIx, child, bread ) {
+        const 
+              childLine = selectionIx[child]
+            , oldBread = childLine [2]
+            ;
+
+        childLine[2] = bread
+        selectionIx[oldBread] = childLine
+
+        childLine[3].forEach ( (br,i) => {
+                        const search = new RegExp (`^${oldBread}\/`);
+                        const brUpdate = br.replace ( search, `${bread}/` );
+                        updateBreadcrumbs ( selectionIx[br], br, brUpdate )
+                })
+} // updateBreadcrumbs func.
+
+
+
+export default connect
+
+

package/src/draft/index.js

@@ -0,0 +1,13 @@
+import push from './push.js'
+import set from './set.js'
+import connect from './connect.js'
+import save from './save.js'
+
+
+
+export default {
+                      push
+                    , set
+                    , connect
+                    , save
+            }

package/src/flatData/get.js

@@ -8,7 +8,7 @@
 
 
 function get ( flatIO ) {
-return function find ( name ) {
+return function get ( name ) {
         const list = [];
         flatIO.getScanList().every ( line => {
                         const loc = line[2];

package/src/flatData/index.js

@@ -4,11 +4,6 @@ import insert      from './insert.js'
 import ex          from './export.js'
 import setupFilter from './setupFilter.js'
 
-import set from './set.js'
-import connect from './connect.js'
-import save from './save.js'
-import push from './push.js'
-
 import fr   from './from.js'
 import use  from './use.js'
 import find  from './find.js'
@@ -16,13 +11,14 @@ import like from './like.js'
 import look from './look.js'
 import get  from './get.js'
 
-
 // Default filters
 import list       from './filters/list.js'
 import listObject from './filters/listObject.js'
 import object     from './filters/object.js'
 import root       from './filters/root.js'
 
+
+
 function flatData ( dependencies, d ) {
           const 
               [ copy, indexes, flatData ] = d
@@ -31,11 +27,7 @@ function flatData ( dependencies, d ) {
             , filterFn = { list, listObject, object, root } // { filter functions}
             ;
 
-        let 
-              selection = []          // Place for building a query/model result;
-            , selectionIx = {}
-            , scanList  = flatData     // Where 'look' function will be executed;
-            ;
+        let scanList  = flatData;   // Where 'look' function will be executed;
             
         const  
                 getFilterNames = () => Object.keys ( filterFn )
@@ -60,35 +52,23 @@ function flatData ( dependencies, d ) {
                           insert  : insert ( flatStorage, filtering, getFilterNames )                     // Insert a new rows to existing flatData;
                         , export  : ex ( flatStorage )                                                   // Exports a copy of flatData;
                         , getCopy : name => ( copy[name] ) ? copy[name] : null 
-                        , getSelection  : () => selection
-                        , getSelectionIx : () => selectionIx
                         , getIndexes    : () => indexes
                         , getLine       : k => indexes[k] ? indexes[k] : null
                         , getFilters    : () => filters
                         , getScanList   : () => scanList
                         , setupScanList : l =>  scanList = l
                         , setupFilter : setupFilter ( flatStorage, filterFn, filtering, getFilterNames )   // Add and apply a new filter function to flatData;
-                        , reset         : () => {  selection = [], scanList = flatData    }              // Removes 'selection' and reset the scanList to use all flatData;
-                        , resetScan     : () => { scanList = flatData }
+                        , resetScan     : () => { scanList = flatData }                                  // Reset the scanList to use all flatData;
                     }
-            , flatStoreSelection_API = {
-                          set     : set ( selection, selectionIx )      // Selection: Creates a new row;
-                        , connect : connect ( selectionIx )             // Selection: Creates an edges among rows;
-                        , save    : save ( selectionIx )                // Selection: Sets property+value in specified selection row;
-                        , push    : push ( selectionIx )                // Selection: Adds a new value to selection row if data is an array structure;
-                  }
+            
             , flatStore_API = {
-                          set     : flatStoreSelection_API.set  
-                        , connect : flatStoreSelection_API.connect
-                        , save    : flatStoreSelection_API.save
-                        , push    : flatStoreSelection_API.push
-                        
-                        , from : fr ( flatIO_API )                               // Scan: Scan deeper from object;
-                        , use  : use ( flatIO_API )                              // Scan: Use filter to select objects to scan;
-                        , get  : get ( flatIO_API )                              // Scan: Take a single object with specific breadcrumbs;
-                        , find  : find ( flatIO_API  )                             // Scan: String search for exact object name;
-                        , like : like ( flatIO_API )                             // Scan: String search in object name;
-                        , look : look ( flatIO_API )     // Scan: Executes on each object property in the selection list;
+                          // Query and Model functions will add methods related to new structure: set, connect, save, push;
+                          from : fr ( flatIO_API )     // Scan: Scan deeper from object;
+                        , use  : use ( flatIO_API )    // Scan: Use filter to select objects to scan;
+                        , get  : get ( flatIO_API )    // Scan: Take a single object with specific breadcrumbs;
+                        , find  : find ( flatIO_API  )   // Scan: String search for exact object name;
+                        , like : like ( flatIO_API )   // Scan: String search in object name;
+                        , look : look ( flatIO_API )   // Scan: Executes on each object property in the selection list;
                     }
             ;
         return [ flatIO_API , flatStore_API ]

package/src/flatObject/extractList.js

@@ -6,8 +6,7 @@ function extractList ( dependencies, flatIO, indexFn ) {
 return function exportList ( list, options={} ) {
             const 
                       root     = indexFn ( 'root' )
-                    , { main } = dependencies ()
-                    , { load } = main ()
+                    , { main:{load} } = dependencies ()
                     , possibleAs = ['standard', 'std', 'midFlat', 'tuple', 'tuples', 'breadcrumb', 'breadcrumbs', 'files', 'file' ]
                     ;
             let 

package/src/flatObject/insert.js

@@ -8,7 +8,6 @@ return function insert ( name, inData ) {
             if ( isDTO(inData) ) {
                         d    = inData.export ()
                         copy = inData.copy ()
-                        
                }
             else if ( isDTM(inData) ) {
                         d = walk ({ data : inData })

package/src/flatObject/model.js

@@ -4,11 +4,20 @@
 
 function model ( dependencies, flatIO ,flatStore ) {
 return function model () {
+    let 
+        selection = []          // Place for building a query/model result;
+      , selectionIx = {}
+      ;
     const 
-          [ fn, ...args ] = arguments
-        , { as } = fn ( flatStore, ...args ) || {}
-        , { convert } = dependencies ()
-        , selection = flatIO.getSelection ()
+          { convert, draft } = dependencies ()
+        , draft_API = {
+                          set     : draft.set ( selection, selectionIx )      // Selection: Creates a new row;
+                        , connect : draft.connect ( selectionIx )             // Selection: Creates an edges among rows;
+                        , save    : draft.save ( selectionIx )                // Selection: Sets property+value in specified selection row;
+                        , push    : draft.push ( selectionIx )                // Selection: Adds a new value to selection row if data is an array structure;
+                    }
+        , [ fn, ...args ] = arguments
+        , { as } = fn ( {...flatStore,...draft_API}, ...args ) || {}
         , data = ( selection.length === 0 ) ? flatIO.export() : selection
         , CONVERTOR_NAMES = [ 'standard', 'std', 'midFlat', 'tuple', 'tuples', 'breadcrumb', 'breadcrumbs', 'files', 'file' ]
         , hasConvertor = as ? CONVERTOR_NAMES.includes ( as ) : false
@@ -19,9 +28,10 @@ return function model () {
                 console.error ( `Model '${as}' is unknown data-model.` )
                 return null
         }
+        
     if ( as )   result = convert.to ( as, dependencies, data )
     else        result = data
-    flatIO.reset ()
+    flatIO.resetScan ()
     return result
 }} // model func.
 

package/src/flatObject/query.js

@@ -2,19 +2,28 @@
 
 
 
-function query ( dependencies, flatIO ,flatStore ) {
+function query ( dependencies, flatIO, flatStore ) {
 return function query () {
     const 
-          { main } = dependencies ()
-        , { load } = main ()
+          { main:{load}, draft } = dependencies ()
         , [ fn, ...args ] = arguments
         ;
+    let 
+        selection = []          // Place for building a query/model result;
+      , selectionIx = {}
+      ;
+
+    const draft_API = {
+                  set     : draft.set ( selection, selectionIx )      // Selection: Creates a new row;
+                , connect : draft.connect ( selectionIx )             // Selection: Creates an edges among rows;
+                , save    : draft.save ( selectionIx )                // Selection: Sets property+value in specified selection row;
+                , push    : draft.push ( selectionIx )                // Selection: Adds a new value to selection row if data is an array structure;
+        }
     
-    fn ( flatStore, ...args )
-    const result = flatIO.getSelection ();
-    flatIO.reset ()
-    if ( result.length === 0 )   return this
-    return load ( result )
+    fn ( {...flatStore, ...draft_API}, ...args )
+    flatIO.resetScan ()
+    if ( selection.length === 0 )   return this
+    return load ( selection )
 }} // query func.
 
 

package/src/mainLib.js

@@ -4,9 +4,10 @@
 
 import walk from '@peter.naydenov/walk'
 
-import flatObject from './flatObject/index.js'        // Flat data api.
-import flatData   from './flatData/index.js'          // Query data api. Used in model functions 
-import convert   from './convertors/index.js'       // Convertors
+import flatObject from './flatObject/index.js'     // Flat data api.
+import flatData   from './flatData/index.js'       // Query data api. Used in model functions 
+import convert   from './convertors/index.js'    // Convertors
+import draft     from './draft/index.js'         // Build a dt-model api
 
 
 
@@ -31,7 +32,7 @@ const mainLib = {
                             , flatObject
                             , convert
                             , INIT_DATA_TYPES
-                            , main : () => ({ load : mainLib.load })
+                            , main : { load : mainLib.load }
                             , isDTO : d  => typeof d.insertSegment  === 'function'
                             , isDTM : d => {
                                                 if ( !(d    instanceof Array))   return false
@@ -40,7 +41,7 @@ const mainLib = {
                                                 if ( d[0][0] !== 'root'      )   return false
                                                 return true
                                         }
-                            , 
+                            , draft
                         }
             } // dependencies func.
 
@@ -56,11 +57,8 @@ const mainLib = {
                             console.error ( `Can't understand your data-model: ${model}. Please, find what is possible on https://github.com/PeterNaydenov/dt-toolbox` )
                             return null
                         }
-                    const 
-                          d  = convert.from(model).toFlat ( dependencies, inData )
-                        , flat =  flatObject ( dependencies, d )
-                        ;
-                    return flat
+                    const d  = convert.from(model).toFlat ( dependencies, inData );
+                    return flatObject ( dependencies, d )
             } // init func.