dobo-extra 1.1.0 → 1.1.2

package/bajoCli/applet/archive.js

@@ -1,7 +1,7 @@
 async function move (task) {
   const { importPkg } = this.app.bajo
-  const { dayjs } = this.app.bajo.lib
-  const { set } = this.app.bajo.lib._
+  const { dayjs } = this.lib
+  const { set } = this.lib._
   const { formatInteger } = this.app.bajoExtra
   const { recordFind, recordCreate, recordRemove, statAggregate } = this.app.dobo
   const prompts = await importPkg('bajoCli:@inquirer/prompts')

package/bajoCli/applet/export-to.js

@@ -3,7 +3,7 @@ import _path from 'path'
 const batch = 100
 
 function makeProgress (spin) {
-  const { secToHms } = this.app.bajo
+  const { secToHms } = this.lib.aneka
   return async function ({ batchNo, data, batchStart, batchEnd } = {}) {
     if (data.length === 0) return
     spin.setText('batch%d%s', batchNo, secToHms(batchEnd.toTime() - batchStart.toTime(), true))
@@ -12,8 +12,8 @@ function makeProgress (spin) {
 
 async function exportTo (...args) {
   const { importPkg } = this.app.bajo
-  const { dayjs } = this.app.bajo.lib
-  const { isEmpty, map } = this.app.bajo.lib._
+  const { dayjs } = this.lib
+  const { isEmpty, map } = this.lib._
   const { getInfo, start } = this.app.dobo
 
   const [input, select] = await importPkg('bajoCli:@inquirer/input',

package/bajoCli/applet/import-from.js

@@ -3,7 +3,7 @@ import _path from 'path'
 const batch = 100
 
 function makeProgress (spin) {
-  const { secToHms } = this.app.bajo
+  const { secToHms } = this.lib.aneka
   return async function ({ batchNo, data, batchStart, batchEnd } = {}) {
     spin.setText('batch%d%s', batchNo, secToHms(batchEnd.toTime() - batchStart.toTime(), true))
   }
@@ -11,7 +11,7 @@ function makeProgress (spin) {
 
 async function importFrom (...args) {
   const { importPkg } = this.app.bajo
-  const { isEmpty, map } = this.app.bajo.lib._
+  const { isEmpty, map } = this.lib._
   const { getInfo, start } = this.app.dobo
 
   const [input, select, confirm] = await importPkg('bajoCli:@inquirer/input',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo-extra",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Bajo DB Extra Tools/Utility",
   "main": "index.js",
   "scripts": {

package/plugin/init.js

@@ -3,7 +3,7 @@ const types = ['datetime', 'date', 'timestamp']
 async function handler ({ item }) {
   const { join } = this.app.bajo
   const { getSchema } = this.app.dobo
-  const { has } = this.app.bajo.lib._
+  const { has } = this.lib._
   for (const f of ['source', 'destination']) {
     if (!has(item, f)) throw this.error('taskMustHaveModel%s', f)
     const key = `${f}Field`

package/plugin/method/export-to.js

@@ -9,8 +9,8 @@ const { json, ndjson, csv, xlsx } = format
 
 async function getFile (dest, ensureDir) {
   const { importPkg, getPluginDataDir } = this.app.bajo
-  const { fs } = this.app.bajo.lib
-  const increment = await importPkg('add-filename-increment')
+  const { fs } = this.lib
+  const increment = await importPkg('bajo:add-filename-increment')
   let file
   if (path.isAbsolute(dest)) file = dest
   else {
@@ -51,8 +51,8 @@ async function getData ({ source, filter, count, stream, progressFn }) {
 }
 
 function exportTo (source, dest, { filter = {}, ensureDir, useHeader = true, batch = 500, progressFn } = {}, opts = {}) {
-  const { fs } = this.app.bajo.lib
-  const { merge } = this.app.bajo.lib._
+  const { fs } = this.lib
+  const { merge } = this.lib._
 
   filter.page = 1
   batch = parseInt(batch) ?? 500

package/plugin/method/import-from.js

@@ -10,8 +10,8 @@ const { json, ndjson, csv, xlsx } = format
 async function importFrom (source, dest, { trashOld = true, batch = 1, progressFn, converterFn, useHeader = true, fileType, createOpts = {} } = {}, opts = {}) {
   const { getPluginDataDir } = this.app.bajo
   const { recordCreate } = this.app.dobo
-  const { merge } = this.app.bajo.lib._
-  const { fs } = this.app.bajo.lib
+  const { merge } = this.lib._
+  const { fs } = this.lib
 
   if (dest !== false) this.app.dobo.getInfo(dest) // make sure dest model is valid
   let file