bajo-extra 0.2.17 → 0.3.0

package/bajo/helper/download.js

@@ -1,11 +1,11 @@
 import path from 'path'
 
 async function download (url, opts = {}) {
-  const { getPluginDataDir, importPkg, error, generateId } = this.bajo.helper
+  const { fs, getPluginDataDir, importPkg, error, generateId } = this.bajo.helper
   const { fetch, formatByte, formatPercentage } = this.bajoExtra.helper
-  const { isFunction } = await importPkg('lodash-es')
+  const { isFunction } = this.bajo.helper._
   if (typeof opts === 'string') opts = { dir: opts }
-  const [fs, increment] = await importPkg('fs-extra', 'add-filename-increment')
+  const increment = await importPkg('add-filename-increment')
   if (!opts.dir) {
     opts.dir = `${getPluginDataDir('bajoExtra')}/download`
     fs.ensureDirSync(opts.dir)

package/bajo/helper/export-to.js

@@ -9,8 +9,8 @@ const { DataStream } = scramjet
 const supportedExt = ['.json', '.jsonl', '.ndjson', '.csv', '.xlsx', '.tsv']
 
 async function getFile (dest, ensureDir) {
-  const { importPkg, error, getPluginDataDir } = this.bajo.helper
-  const [fs, increment] = await importPkg('fs-extra', 'add-filename-increment')
+  const { fs, importPkg, error, getPluginDataDir } = this.bajo.helper
+  const increment = await importPkg('add-filename-increment')
   let file
   if (path.isAbsolute(dest)) file = dest
   else {
@@ -51,7 +51,7 @@ async function getData ({ source, filter, count, stream, progressFn }) {
 }
 
 function exportTo (source, dest, { filter = {}, ensureDir, useHeader = true, batch = 500, progressFn } = {}, opts = {}) {
-  const { error, importPkg, getConfig } = this.bajo.helper
+  const { fs, error, getConfig } = this.bajo.helper
   const cfg = getConfig('bajoExtra')
   if (!this.bajoDb) throw error('Bajo DB isn\'t loaded')
   filter.page = 1
@@ -59,27 +59,18 @@ function exportTo (source, dest, { filter = {}, ensureDir, useHeader = true, bat
   if (batch > cfg.stream.export.maxBatch) batch = cfg.stream.export.maxBatch
   if (batch < 0) batch = 1
   filter.limit = batch
+  const { merge } = this.bajo.helper._
 
   return new Promise((resolve, reject) => {
     const { getInfo } = this.bajoDb.helper
     let count = 0
-    let fs
-    let merge
     let file
     let ext
     let stream
     let compress
     let writer
     getInfo(source)
-      .then(() => {
-        return importPkg('lodash-es')
-      })
-      .then(l => {
-        merge = l.merge
-        return importPkg('fs-extra')
-      })
       .then(res => {
-        fs = res
         return getFile.call(this, dest, ensureDir)
       })
       .then(res => {

package/bajo/helper/fetch-and-save.js

@@ -1,6 +1,5 @@
 async function handler (rec, bulk) {
-  const { importPkg } = this.bajo.helper
-  const { isFunction, set } = await importPkg('lodash-es')
+  const { isFunction, set } = this.bajo.helper._
   const { recordCreate, recordFind, recordUpdate } = this.bajoDb.helper
   const save = bulk.save ?? {}
   const current = save.current ?? {}
@@ -52,9 +51,9 @@ async function handler (rec, bulk) {
 }
 
 async function fetchAndSave ({ url, bulk, save = {}, opts = {} } = {}) {
-  const { importPkg, getConfig, importModule } = this.bajo.helper
+  const { getConfig, importModule } = this.bajo.helper
   const { fetchBulk } = this.bajoExtra.helper
-  const { merge } = await importPkg('lodash-es')
+  const { merge } = this.bajo.helper._
   merge(bulk, { handler, save })
   const cfgDb = getConfig('bajoDb', { full: true })
   const start = await importModule(`${cfgDb.dir.pkg}/bajo/start.js`)

package/bajo/helper/fetch-bulk.js

@@ -1,6 +1,6 @@
 async function fetching ({ url, opts, bulk, spin }) {
-  const { setImmediate, importPkg, print } = this.bajo.helper
-  const { isEmpty, isFunction, has } = await importPkg('lodash-es')
+  const { setImmediate, print } = this.bajo.helper
+  const { isEmpty, isFunction, has } = this.bajo.helper._
   const { validationErrorMessage } = this.bajoDb.helper
   const { fetch } = this.bajoExtra.helper
   const resp = await fetch(url, opts ?? {})
@@ -49,8 +49,8 @@ async function fetching ({ url, opts, bulk, spin }) {
 }
 
 async function fetchBulk (url, bulk = {}, opts = {}) {
-  const { print, spinner, importPkg, error } = this.bajo.helper
-  const { isFunction } = await importPkg('lodash-es')
+  const { print, spinner, error } = this.bajo.helper
+  const { isFunction } = this.bajo.helper._
   opts.params = opts.params ?? {}
   bulk.maxStep = bulk.maxStep ?? 0
   if (!isFunction(bulk.handler)) throw error('A function handler must be provided')

package/bajo/helper/fetch.js

@@ -3,8 +3,8 @@ import http from 'http'
 import https from 'https'
 
 async function fetch (url, opts = {}, ext = {}) {
-  const { importPkg, getConfig } = this.bajo.helper
-  const { has, isPlainObject, cloneDeep, isEmpty } = await importPkg('lodash-es')
+  const { getConfig } = this.bajo.helper
+  const { has, isPlainObject, cloneDeep, isEmpty } = this.bajo.helper._
   const cfg = getConfig('bajoExtra')
   if (isPlainObject(url)) {
     ext = cloneDeep(opts)

package/bajo/helper/gzip.js

@@ -1,22 +1,19 @@
 import { createGzip, createGunzip } from 'zlib'
 
 function gzip (file, deleteOld, expand) {
+  const { fs } = this.bajo.helper
   return new Promise((resolve, reject) => {
-    const { importPkg } = this.bajo.helper
-    importPkg('fs-extra')
-      .then(fs => {
-        const newFile = expand ? file.slice(0, file.length - 3) : (file + '.gz')
-        const reader = fs.createReadStream(file)
-        const writer = fs.createWriteStream(newFile)
-        const method = expand ? createGunzip() : createGzip()
-        reader.pipe(method).pipe(writer)
-        writer.on('error', reject)
-        writer.on('finish', err => {
-          if (err) return reject(err)
-          if (deleteOld) fs.unlinkSync(file)
-          resolve()
-        })
-      })
+    const newFile = expand ? file.slice(0, file.length - 3) : (file + '.gz')
+    const reader = fs.createReadStream(file)
+    const writer = fs.createWriteStream(newFile)
+    const method = expand ? createGunzip() : createGzip()
+    reader.pipe(method).pipe(writer)
+    writer.on('error', reject)
+    writer.on('finish', err => {
+      if (err) return reject(err)
+      if (deleteOld) fs.unlinkSync(file)
+      resolve()
+    })
   })
 }
 

package/bajo/helper/import-from.js

@@ -8,13 +8,12 @@ const { DataStream } = scramjet
 const supportedExt = ['.json', '.jsonl', '.ndjson', '.csv', '.xlsx', '.tsv']
 
 async function importFrom (source, dest, { trashOld = true, batch = 1, progressFn, converterFn, useHeader = true, fileType, createOpts = {} } = {}, opts = {}) {
-  const { error, importPkg, getConfig, getPluginDataDir } = this.bajo.helper
+  const { fs, error, getConfig, getPluginDataDir } = this.bajo.helper
   if (dest !== false) {
     if (!this.bajoDb) throw error('Bajo DB isn\'t loaded')
     await this.bajoDb.helper.getInfo(dest)
   }
-  const { merge } = await importPkg('lodash-es')
-  const fs = await importPkg('fs-extra')
+  const { merge } = this.bajo.helper._
   const cfg = getConfig('bajoExtra')
 
   let file

package/bajoCli/tool/export-to.js

@@ -12,8 +12,8 @@ function makeProgress (spin) {
 
 async function exportTo ({ path, args }) {
   const { importPkg, print, dayjs, getConfig, importModule, spinner } = this.bajo.helper
-  const { isEmpty, map } = await importPkg('lodash-es')
-  const [input, select] = await importPkg('bajo-cli:@inquirer/input',
+  const { isEmpty, map } = this.bajo.helper._
+  const [input, select] = await importPkg('bajoCli:@inquirer/input',
     'bajo-cli:@inquirer/select')
   const config = getConfig()
   if (!this.bajoDb) return print.fail('Bajo DB isn\'t loaded', { exit: config.tool })

package/bajoCli/tool/import-from.js

@@ -11,9 +11,9 @@ function makeProgress (spin) {
 
 async function importFrom ({ path, args }) {
   const { importPkg, print, importModule, getConfig, spinner } = this.bajo.helper
-  const { isEmpty, map } = await importPkg('lodash-es')
-  const [input, select, confirm] = await importPkg('bajo-cli:@inquirer/input',
-    'bajo-cli:@inquirer/select', 'bajo-cli:@inquirer/confirm')
+  const { isEmpty, map } = this.bajo.helper._
+  const [input, select, confirm] = await importPkg('bajoCli:@inquirer/input',
+    'bajoCli:@inquirer/select', 'bajoCli:@inquirer/confirm')
   const config = getConfig()
   if (!this.bajoDb) return print.fail('Bajo DB isn\'t loaded', { exit: config.tool })
   const schemas = map(this.bajoDb.schemas, 'name')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo-extra",
-  "version": "0.2.17",
+  "version": "0.3.0",
   "description": "Extra package for Bajo Framework",
   "main": "index.js",
   "scripts": {