file-obj-queue 3.0.0 → 3.0.1

package/package.json

@@ -2,45 +2,24 @@
   "author": {
     "name": "Jim Manton"
   },
-  "version": "3.0.0",
+  "version": "3.0.1",
   "bundleDependencies": [],
   "dependencies": {
-    "@types/node": "^18.11.19",
-    "base-queue": "^1.0.0",
-    "chai": "^4.3.7",
+    "@types/node": "^18.19.127",
+    "chai": "^4.5.0",
     "colors": "^1.4.0",
     "diffler": "^2.0.4",
     "fs": "^0.0.1-security",
-    "log-queue": "^1.0.0",
-    "mocha": "^10.2.0",
-    "queuejson": "^9.0.11",
+    "mocha": "^10.8.2",
+    "queuejson": "^10.0.0",
+    "typescript": "^4.9.5",
     "valid-path": "^2.1.0"
   },
   "scripts": {
     "start": "node app.ts",
     "test": "mocha",
     "ditched": "ditched -a",
-    "test_files": "node ./tests/files",
-    "test_all": "node ./tests/all",
-    "test_top_one": "node ./tests/top_one",
-    "test_bottom_one": "node ./tests/bottom_one",
-    "test_func_all": "node ./tests/func_all",
-    "test_status_matching": "node ./tests/status_matching",
-    "test_status_non_matching": "node ./tests/status_non_matching",
-    "test_name_matching": "node ./tests/name_matching",
-    "test_name_non_matching": "node ./tests/name_non_matching",
-    "test_version_matching": "node ./tests/version_matching",
-    "test_version_non_matching": "node ./tests/version_non_matching",
-    "test_json_all": "node ./tests/json_all",
-    "test_json_top_one": "node ./tests/json_top_one",
-    "test_json_bottom_one": "node ./tests/json_bottom_one",
-    "test_json_func_all": "node ./tests/json_func_all",
-    "test_json_status_matching": "node ./tests/json_status_matching",
-    "test_json_status_non_matching": "node ./tests/json_status_non_matching",
-    "test_json_version_matching": "node ./tests/json_version_matching",
-    "test_json_version_non_matching": "node ./tests/json_version_non_matching",
-    "test_json_name_matching": "node ./tests/json_name_matching",
-    "test_json_name_non_matching": "node ./tests/json_name_non_matching"
+    "test_files": "node ./tests/files"
   },
   "keywords": [
     "queue",

package/test/app.js

@@ -24,7 +24,7 @@ describe('require', function () {
     })
 
     it('base_queue', function () {
-        assert(require('base-queue'))
+        assert(require('../base_queue/app'))
     })
 
     it('fs', function () {
@@ -34,8 +34,4 @@ describe('require', function () {
     it('valid-path', function () {
         assert(require('valid-path'))
     })
-        
-    it('valid-path', function () {
-        assert(require('log-queue'))
-    })
 })

package/test/package.js

@@ -6,45 +6,24 @@ const packageMock = {
   "author": {
     "name": "Jim Manton"
   },
-  "version": "3.0.0",
+  "version": "3.0.1",
   "bundleDependencies": [],
   "dependencies": {
-    "@types/node": "^18.11.19",
-    "base-queue": "^1.0.0",
-    "chai": "^4.3.7",
+    "@types/node": "^18.19.127",
+    "chai": "^4.5.0",
     "colors": "^1.4.0",
     "diffler": "^2.0.4",
     "fs": "^0.0.1-security",
-    "log-queue": "^1.0.0",
-    "mocha": "^10.2.0",
-    "queuejson": "^9.0.11",
+    "mocha": "^10.8.2",
+    "queuejson": "^10.0.0",
+    "typescript": "^4.9.5",
     "valid-path": "^2.1.0"
   },
   "scripts": {
     "start": "node app.ts",
     "test": "mocha",
     "ditched": "ditched -a",
-    "test_files": "node ./tests/files",
-    "test_all": "node ./tests/all",
-    "test_top_one": "node ./tests/top_one",
-    "test_bottom_one": "node ./tests/bottom_one",
-    "test_func_all": "node ./tests/func_all",
-    "test_status_matching": "node ./tests/status_matching",
-    "test_status_non_matching": "node ./tests/status_non_matching",
-    "test_name_matching": "node ./tests/name_matching",
-    "test_name_non_matching": "node ./tests/name_non_matching",
-    "test_version_matching": "node ./tests/version_matching",
-    "test_version_non_matching": "node ./tests/version_non_matching",
-    "test_json_all": "node ./tests/json_all",
-    "test_json_top_one": "node ./tests/json_top_one",
-    "test_json_bottom_one": "node ./tests/json_bottom_one",
-    "test_json_func_all": "node ./tests/json_func_all",
-    "test_json_status_matching": "node ./tests/json_status_matching",
-    "test_json_status_non_matching": "node ./tests/json_status_non_matching",
-    "test_json_version_matching": "node ./tests/json_version_matching",
-    "test_json_version_non_matching": "node ./tests/json_version_non_matching",
-    "test_json_name_matching": "node ./tests/json_name_matching",
-    "test_json_name_non_matching": "node ./tests/json_name_non_matching"
+    "test_files": "node ./tests/files"
   },
   "keywords": [
     "queue",

package/tests/appenders/all.js

@@ -1,6 +1,6 @@
 /*
 * @author Jim Manton: jrman@risebroadband.net
-* @since 2023-2-5l
+* @since 2021-03-22l
 * lib/appenders/all.js
 */
 

package/tests/appenders/base.js

@@ -73,7 +73,7 @@ class process_object {
                         t.parent.results_array.push(obj_props)
                         t.continueProcessing()
                     } catch (e) {
-                        t.parent.getParent().logMsg({msg: `pro obj error: (${e.message})`.error, type: "error"})
+                        t.parent.getParent().logMsg(`pro obj error: (${e.message})`.red)
                         throw e
                     }
                 })

package/tests/appenders/bottom_one.js

@@ -1,6 +1,6 @@
 /*
 * @author Jim Manton: jrman@risebroadband.net
-* @since 2023-2-5
+* @since 2021-03-22
 * lib/appenders/bottom_one.js
 */
 

package/tests/appenders/func_all.js

@@ -1,6 +1,6 @@
 /*
 * @author Jim Manton: jrman@risebroadband.net
-* @since 2023-2-5
+* @since 2021-03-22
 * lib/appenders/func_all.js
 */
 

package/tests/appenders/sync.js

@@ -1,6 +1,6 @@
 /*
 * @author Jim Manton: jrman@risebroadband.net
-* @since 2023-2-5
+* @since 2021-03-22
 * lib/appenders/sync.js
 */
 

package/tests/appenders/sync_all.js

@@ -1,6 +1,6 @@
 /*
 * @author Jim Manton: jrman@risebroadband.net
-* @since 2023-2-5
+* @since 2021-03-22
 * lib/appenders/sync_all.js
 */
 

package/tests/appenders/top_one.js

@@ -1,6 +1,6 @@
 /*
 * @author Jim Manton: jrman@risebroadband.net
-* @since 2023-2-5
+* @since 2021-03-22
 * lib/appenders/top_one.js
 */
 

package/tests/appenders/version.js

@@ -1,6 +1,6 @@
 /*
 * @author Jim Manton: jrman@risebroadband.net
-* @since 2023-2-5
+* @since 2021-03-22
 * lib/appenders/status.js
 */
 

package/tests/files.js

@@ -1,45 +1,37 @@
-var file_queue = require("../app.js"),
+var colors = require('colors'),
+    file_queue = require("../app.js"),
     fs = require('fs'),
     validPath = require('valid-path')
 
 var file_data = [
-    { props: { id: 100, name: "all.js", absolute_path: __filename, check: true } },
-    { props: { id: 101, name: "func_all.js", absolute_path: __filename, check: true } },
-    { props: { id: 102, name: "top_one.js", absolute_path: __filename, check: true } },
-    { props: { id: 103, name: "bottom_one.js", absolute_path: __filename, check: true } },
-    { props: { id: 104, name: "sync_all.js", absolute_path: __filename, check: true } },
-    { props: { id: 105, name: "status.js", absolute_path: __filename, check: true } },
-    { props: { id: 106, name: "name.js", absolute_path: __filename, check: true } },
-    { props: { id: 107, name: "version.js", absolute_path: __filename, check: true } }
+    { props: { id: 100, name: "all", path: "./appenders/all.js", absolute_path: __filename, check: true } },
+    { props: { id: 101, name: "func_all", path: "./appenders/func_all.js", absolute_path: __filename, check: true } },
+    { props: { id: 102, name: "top_one", path: "./appenders/top_one.js", absolute_path: __filename, check: true } },
+    { props: { id: 103, name: "bottom_one", path: "./appenders/bottom_one.js", absolute_path: __filename, check: true } },
+    { props: { id: 104, name: "sync_all", path: "./appenders/sync_all.js", absolute_path: __filename, check: true } },
+    { props: { id: 105, name: "status", path: "./appenders/status.js", absolute_path: __filename, check: true } },
+    { props: { id: 106, name: "name", path: "./appenders/name.js", absolute_path: __filename, check: true } },
+    { props: { id: 107, name: "version", path: "./appenders/version.js", absolute_path: __filename, check: true } }
 ]
 
+
 var file_object = class file_obj {
     constructor(props) {
-        let t = this, fname = "file_obj.constructor"
-        try {
-            t.id = props.id
-            t.log = props.log
-            t.name = props.name
-            t.path = props.relative_path
-            t.absolute_path = props.absolute_path
-            t.status = 'init'
-            t.errors = false
-            t.error_msg = 'none'
-
-            // if (t.id == 104) {
-            //     t.errors = true
-            //     t.error_msg = `some sort of error here`    
-            // }
+        let t = this
+        t.id = props.id
+        t.log = props.log
+        t.name = props.name
+        t.path = props.path
+        t.absolute_path = props.absolute_path
+        t.status = 'init'
+        t.errors = false
+        t.error_msg = 'none'
 
-            t.process = t.process.bind(t)
-            t.do_checks = t.do_checks.bind(t)
+        t.process = t.process.bind(t)
+        t.do_checks = t.do_checks.bind(t)
 
-            if (props.check) {
-                t.do_checks()
-            }
-        } catch (e) {
-            e.message = `${fname} error: ${e.message}`
-            throw e
+        if (props.check) {
+            t.do_checks()
         }
 
         return t
@@ -48,7 +40,6 @@ var file_object = class file_obj {
     do_checks() {
         let t = this, path_to_check,
             last_item = t.absolute_path.split("\\").pop(),
-            fname = `file_obj.do_checks`,
             check_file = t.absolute_path.split(last_item)[0], check_path = t.path.split('/')
 
         check_file = check_file.replace(/\\/g, "/");
@@ -65,12 +56,11 @@ var file_object = class file_obj {
                     check_file += dat + '/'
             }
         })
-        check_file += `${t.name}`
+        check_file = check_file.slice(0, -1)
         try {
             if (!fs.existsSync(check_file)) {
                 t.errors = true
                 t.error_msg = `id = ${t.id} name(${t.name}) file (${check_file} does not exist)`
-                t.log({ msg: t.error_msg.error, type: "error" })
             }
         } catch (e) {
             e.message = "file_obj do_checks error: " + e.message
@@ -80,7 +70,6 @@ var file_object = class file_obj {
 
     process(callback) {
         let t = this
-        t.log({ msg: `processing object id ${t.id}. Do a bunch of stuff here.`.silly, type: "silly" })
         if (t.errors)
             callback({ error: { msg: t.error_msg } })
         else
@@ -90,19 +79,12 @@ var file_object = class file_obj {
 
 var qRequire = new file_queue()
 
-qRequire.init().process({
-    appender: "json_all",
-    exclude_logMsg: ["debug", "silly", "info"],   /* default [] */
-    process_objects: [file_object],
-    data_to_process_array: file_data
-}).then((success) => {
-    qRequire.logMsg({ msg: `test success: file objects processed with no errors`.success.italic.bold, type: "success" })
-}, (error) => {
-    if (typeof error == "string") {
-        qRequire.logMsg({msg: `error: ${error}`.error.italic.bold, type: "error"})
-    } else {
-        let add_s = (error.error_count > 1) ? 's' : ''
-        qRequire.logMsg({ msg: `${error.error_count} error${add_s} detected`.error.italic.bold, type: "error" })
-    }
+qRequire.process({ appender: "json_all", 
+                    process_objects: [file_object], 
+                    data_to_process_array: file_data }).then((success)=>{
+    qRequire.logMsg(`test success: all file objects processed with no errors`.success)
+},(error)=>{
+    let add_s = (error.error_count > 1) ? 's' : ''
+    qRequire.logMsg(`${error.error_count} error${add_s} detected`.error)
 })
 

package/lib/appenders/all.js

@@ -1,17 +0,0 @@
-/*
-* @author Jim Manton: jrman@risebroadband.net
-* @since 2023-2-5l
-* lib/appenders/all.js
-*/
-
-var base = require('./base.js')
-
-exports = module.exports = class all extends base{
-	constructor(props) {
-		super(props)
-        var t = this
-		t.aname = 'all'
-		t.pro_types = ['items']
-		return t
-    }
-}

package/lib/appenders/base.js

@@ -1,189 +0,0 @@
-/*
-* @author Jim Manton: jrman@risebroadband.net
-* @since 2023-02-06
-* lib/appenders/base.js
-*/
-
-var colors = require('colors')
-
-class process_all_obj {
-    constructor(props) {
-        let t = this
-        t.parent = props.parent
-        t.objs = t.parent.getParent().getObjs()
-        t.status = 'process'
-        t.process_objs_item = 0
-        t.process_props_item = 0
-        t.await_item = 0
-        t.any_errors = false
-
-        t.continueProcessing = t.continueProcessing.bind(t)
-    }
-
-    process () {
-        let t = this
-        try {
-            if (t.process_objs_item >= t.objs.length) {
-                if (t.any_errors)
-                    t.setStatus('finish with errors')
-                else
-                    t.setStatus('finish')
-                return
-            }
-            try {
-                let obj, pro, itm
-                try {
-                    obj = t.parent.getParent().getItemToProcess(t.process_objs_item)
-                } catch (e) {
-                    e.message = `base error: (${e.message})`
-                    throw e
-                }
-                try {
-                    pro = (typeof obj == 'function') ? obj : obj.process;
-                } catch (e) {
-                    t.parent.getParent()(`pro error: (${e.message})`.red)
-                    throw e
-                }
-                if (typeof t.parent.pro_props != 'undefined' &&
-                    typeof t.parent.pro_props.property != 'undefined' &&
-                    typeof t.parent.pro_props.items != 'undefined' &&
-                    typeof obj._getProperty == 'function') {
-                    let skip = true
-                    for (let q = 0; q < t.parent.pro_props.items.length; q++) {
-                        itm = t.parent.pro_props.items[q]
-                        if (itm == obj._getProperty(obj)) {
-                            skip = false
-                            break
-                        }
-                    }
-                    if (skip) {
-                        t.continueProcessing()
-                        return
-                    }
-                }
-                t.setStatus('wait')
-                pro((obj_props) => {
-                    try {
-                        if (typeof obj_props != 'undefined' && typeof obj_props.error != 'undefined') {
-                            t.any_errors = true
-                            t.parent.getParent().logMsg(obj_props)
-                        } else {
-                            t.parent.getParent().logMsg(obj_props)
-                        }
-                        t.parent.results_array.push(obj_props)
-                        t.continueProcessing()
-                    } catch (e) {
-                        t.parent.getParent().logMsg({msg: `pro obj error: (${e.message})`.error, type: "error"})
-                        throw e
-                    }
-                })
-            } catch (e) {
-                e.message = `error: ${e.message} `
-                throw e
-            }
-        } catch (e) {
-            e.message = `process_all_obj error: ${e.message} `
-            throw e
-        }
-    }
-
-    continueProcessing () {
-        let t = this
-        t.process_objs_item++
-        t.setStatus('process')
-        t.parent.process_all()
-    }
-
-    getStatus () {
-        return this.status
-    }
-
-    setStatus (v) {
-        this.status = v
-    }
-}
-
-exports = module.exports = class base {
-    constructor(props) {
-        let t = this
-        t.await_array = []
-        t.resolve_array = []
-        t.reject_array = []
-        t.results_array = []
-        t.getParent = props.getParent
-        t.dt_start = null
-        t.dt_end = null
-        t.process_all_obj = null
-        t.pro_props = []
-
-        t.process = t.process.bind(this)
-        t.process_all = t.process_all.bind(this)
-    }
-
-    // await(props) {
-    //     let t = this
-    //     t.await_array.push(props)
-    //     return new Promise((resolve, reject) => {
-    //         t.resolve_array.push(resolve)
-    //         t.reject_array.push(reject)
-    //     });
-    // }
-
-    process(props) {
-        let t = this
-        t.dt_start = new Date(); // start measuring time
-
-        t.pro_props = props
-
-        return new Promise((resolve, reject) => {
-            t.resolve_array.push(resolve)
-            t.reject_array.push(reject)
-            t.process_all()
-        });
-    }
-
-    getStats() {
-        let t = this
-        t.dt_end = new Date();
-        let ret_str = '', st = t.dt_start, ed = t.dt_end, ml = t.dt_end - t.dt_start
-        // ret_str += JSON.stringify(t.results_array)
-        if (t.getParent().getStats()) {
-            ret_str += `start (${st}) end(${ed}) milliseconds(${ml})`
-        }
-        return ret_str   
-    }
-
-    process_all () {
-        let t = this, _continue
-        if (t.process_all_obj == null) {
-            t.process_all_obj = new process_all_obj({ parent: t })
-        }
-
-        _continue = false
-        try {
-            switch (t.process_all_obj.getStatus()) {
-                case 'process':
-                    t.process_all_obj.process()
-                    _continue = true
-                    break
-                case 'finish with errors':
-                    t.reject_array[t.reject_array.length - 1](t.getStats())
-                    break
-                case 'finish':
-                    t.resolve_array[t.resolve_array.length - 1](t.getStats())
-                    break
-                case 'wait':
-                    return
-                default:
-                    throw new Error(`status(${t.process_all_obj.getStatus()}) does not exist`)
-            }
-
-            if (_continue)
-                t.process_all()
-        } catch (e) {
-            e.message = `process_all error: ${e.message} `
-            throw e
-        }
-    }
-}
-

package/lib/appenders/bottom_one.js

@@ -1,17 +0,0 @@
-/*
-* @author Jim Manton: jrman@risebroadband.net
-* @since 2023-2-5
-* lib/appenders/bottom_one.js
-*/
-
-var base = require('./base.js')
-
-exports = module.exports = class bottom_one extends base{
-	constructor(props) {
-		super(props)
-        var t = this
-		t.aname = 'bottom_one'
-		t.pro_types = ['items']
-		return t
-    }
-}

package/lib/appenders/func_all.js

@@ -1,17 +0,0 @@
-/*
-* @author Jim Manton: jrman@risebroadband.net
-* @since 2023-2-5
-* lib/appenders/func_all.js
-*/
-
-var base = require('./base.js')
-
-exports = module.exports = class func_all extends base {
-    constructor(props) {
-        super(props)
-        var t = this
-        t.aname = 'func_all'
-		t.pro_types = ['items']
-        return t
-    }
-}

package/lib/appenders/name.js

@@ -1,17 +0,0 @@
-/*
-* @author Jim Manton: jrman@risebroadband.net
-* @since 2023-01-16
-* lib/appenders/name.js
-*/
-
-var base = require('./base.js')
-
-exports = module.exports = class name extends base {
-    constructor(props) {
-        super(props)
-        var t = this
-        t.aname = 'name'
-		t.pro_types = ['name']
-        return t
-    }
-}

package/lib/appenders/status.js

@@ -1,17 +0,0 @@
-/*
-* @author Jim Manton: jrman@risebroadband.net
-* @since 2023-01-16
-* lib/appenders/status.js
-*/
-
-var base = require('./base.js')
-
-exports = module.exports = class status extends base {
-    constructor(props) {
-        super(props)
-        var t = this
-        t.aname = 'status'
-		t.pro_types = ['status']
-        return t
-    }
-}

package/lib/appenders/sync.js

@@ -1,17 +0,0 @@
-/*
-* @author Jim Manton: jrman@risebroadband.net
-* @since 2023-2-5
-* lib/appenders/sync.js
-*/
-
-var base = require('./base.js')
-
-exports = module.exports = class sync extends base {
-    constructor(props) {
-        super(props)
-        var t = this
-        t.aname = 'sync'
-		t.pro_types = ['items', 'byIds']
-        return t
-    }
-}

package/lib/appenders/sync_all.js

@@ -1,17 +0,0 @@
-/*
-* @author Jim Manton: jrman@risebroadband.net
-* @since 2023-2-5
-* lib/appenders/sync_all.js
-*/
-
-var base = require('./base.js')
-
-exports = module.exports = class sync_all extends base {
-    constructor(props) {
-        super(props)
-        var t = this
-        t.aname = 'sync_all'
-		t.pro_types = ['items']
-        return t
-    }
-}

package/lib/appenders/top_one.js

@@ -1,17 +0,0 @@
-/*
-* @author Jim Manton: jrman@risebroadband.net
-* @since 2023-2-5
-* lib/appenders/top_one.js
-*/
-
-var base = require('./base.js')
-
-exports = module.exports = class top_one extends base{
-	constructor(props) {
-		super(props)
-        var t = this
-		t.aname = 'top_one'
-		t.pro_types = ['items']
-		return t
-    }
-}