dt-toolbox 7.1.3 → 7.3.0

package/Changelog.md

@@ -1,5 +1,23 @@
 ## Release History
 
+
+
+### 7.3.0 ( 2023-10-19 )
+- [x] Model function recognize a `dt-model` model. Result is equal to result of `export`;
+- [x] Model function recognize a `dt-object` model. Returns a new dt-object;
+- [x] Method `extractList` recognize a `dt-model` and `dt-object` models;
+- [x] Method `init` recognize a `dt-model` model. Result is equal to result of `load`;
+- [x] Update of @peter.naydenov/walk to version 4.2.0;
+
+
+
+### 7.2.0 (2023-09-18)
+- [x] Convertors recognize HTML DOM nodes. Makes a copy by reference;
+- [x] Convertors recognize functions. Makes a copy by reference;
+- [x] Model 'files' is not possible for functions and DOM nodes, so the value in the result will be string. For functions will be `function:functionName` and for DOM nodes will be `htmlElement:elementName`;
+
+
+
 ### 7.1.3 (2023-09-14)
 - [x] Fix: extractList: Negative value is treated as property does not exist and returns null instead of real value;
 

package/README.md

@@ -6,8 +6,8 @@
 
 
 ## Last Updates
-
-After version 7.1.x `dt-object` api has a new method `extractList` that helps to extract a multiple segments or properties, defined as a list. Use '**options**'(the second argument) to define a model of extracted data if needed. Reed about `extractList` bellow.
+- After version 7.3.0 extractList options.as can receive a `dt-model` and `dt-object`;
+- After version 7.1.x `dt-object` api has a new method `extractList` that helps to extract a multiple segments or properties, defined as a list. Use '**options**'(the second argument) to define a model of extracted data if needed. Reed about `extractList` bellow.
 
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dt-toolbox",
   "description": "Data manipulation tool",
-  "version": "7.1.3",
+  "version": "7.3.0",
   "license": "MIT",
   "author": "Peter Naydenov",
   "keywords": [
@@ -28,11 +28,11 @@
   },
   "homepage": "https://github.com/PeterNaydenov/dt-toolbox#readme",
   "dependencies": {
-    "@peter.naydenov/walk": "4.0.0"
+    "@peter.naydenov/walk": "4.2.0"
   },
   "devDependencies": {
     "c8": "^8.0.1",
-    "chai": "^4.3.8",
+    "chai": "^4.3.10",
     "mocha": "^10.2.0"
   },
   "c8": {

package/src/convertors/index.js

@@ -50,14 +50,19 @@ function from ( type ) {   // convert from something to flat...
 function to ( type, dependencies, inData ) {   // convert from flat to 'data-type'...
         const 
               breadcrumbs = {}
+            , { walk } = dependencies ()
             , check = new Set()
             , extend = new Set()
             ;
         let tups, count = 0;
         switch ( type ) {
+            case 'flat':
+            case 'dt-model':
+                             return walk ({data:inData })
             case 'std' :
             case 'standard':
                              return std.toType ( inData )
+            case 'midflat'  :
             case 'midFlat' : 
                              return midFlat.toType ( inData )
             case 'tuple':
@@ -65,7 +70,11 @@ function to ( type, dependencies, inData ) {   // convert from flat to 'data-typ
                             return tuples.toType ( inData )
             case 'files':
                            tups = tuples.toType ( inData );
-                           return tups.map ( ([k,v]) =>  (( k === 'root' ) ? v : `${k}/${v}`)   )
+                           return tups.map ( ([k,v]) => { 
+                                            if ( typeof v === 'function' )   return `${k}/function:${v.name}`
+                                            if ( v?.nodeType )               return `${k}/HtmlElement:${v.tagName? v.tagName.toLowerCase() : 'notSpecified'}`
+                                            return (( k === 'root' ) ? v : `${k}/${v}`)   
+                                        })
             case 'breadcrumb' :
             case 'breadcrumbs':
                            let current;

package/src/flatObject/extractList.js

@@ -3,26 +3,27 @@
 
 
 function extractList ( dependencies, flatIO, indexFn ) {
-return function exportList ( list, options={} ) {
+return function extractList ( list, options ) {
             const 
                       root     = indexFn ( 'root' )
                     , { main:{load}, INIT_DATA_TYPES } = dependencies ()
+                    , asTypes = [ ...INIT_DATA_TYPES, 'dt-object' ]
                     ;
             let 
                   error = false
                 , errorMsg = ''
                 ;
-
+                
             if ( options ) {
                     if ( !options.as ) {
                             error = true
                             errorMsg = `Options should be an object and property "as" is required`
                         }
-                    if ( !error && !INIT_DATA_TYPES.includes(options.as) ) {  
+                    if ( !error && !asTypes.includes(options.as) ) {  
                             error = true
-                            errorMsg = `Invalid option "as" value: ${options.as}. Choose one of: std, standard, ''`
+                            errorMsg = `Invalid option "as" value: ${options.as}.`
                         }
-                    if ( error )  throw new Error ( `Invalid option "as" value: ${options.as}` )
+                    if ( error )  throw new Error ( errorMsg )
                 }
 
             return list
@@ -34,7 +35,7 @@ return function exportList ( list, options={} ) {
                         .map ( item => {
                                             if ( item == null            )   return null
                                             if ( !(item instanceof Array))   return item
-                                            return options ? load(item).model(() => options ) : load(item)
+                                            return load(item).model(() => options )
                                         })
 }} // extractList func.
 

package/src/flatObject/model.js

@@ -9,7 +9,7 @@ return function model () {
       , selectionIx = {}
       ;
     const 
-          { convert, draft } = dependencies ()
+          { convert, draft, INIT_DATA_TYPES, main:{load} } = dependencies ()
         , draft_API = {
                           set     : draft.set ( selection, selectionIx )      // Selection: Creates a new row;
                         , connect : draft.connect ( selectionIx )             // Selection: Creates an edges among rows;
@@ -19,18 +19,19 @@ return function model () {
         , [ 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
+        , hasConvertor = as ? INIT_DATA_TYPES.includes ( as ) : false
         ;
 
     let result;
+    if ( as === 'dt-object'  ) {  
+                return load ( data )
+        }
     if ( as && !hasConvertor ) {
                 console.error ( `Model '${as}' is unknown data-model.` )
                 return null
         }
-        
     if ( as )   result = convert.to ( as, dependencies, data )
-    else        result = data
+    else        result = load ( data )
     flatIO.resetScan ()
     return result
 }} // model func.

package/src/mainLib.js

@@ -16,8 +16,8 @@ const INIT_DATA_TYPES = [
                 , 'tuple', 'tuples'
                 , 'breadcrumb', 'breadcrumbs'
                 , 'file', 'files'
-                , 'midFlat'
-                , 'flat'
+                , 'midFlat', 'midflat'
+                , 'flat', 'dt-model'
             ]
     ;
 
@@ -57,7 +57,9 @@ 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 );
+                    const d  = ['flat', 'dt-model'].includes ( model ) ? 
+                                                mainLib.load ( inData ) : 
+                                                convert.from ( model ).toFlat ( dependencies, inData );
                     return flatObject ( dependencies, d )
             } // init func.