bajo-extra 0.2.4 → 0.2.6

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

@@ -19,7 +19,8 @@ async function fetchAndSave ({ source = {}, converter, coll, current = {}, optio
     try {
       await recordCreate(coll, r)
       if (current.coll && current.query) {
-        const recs = await recordFind(current.coll, current.query)
+        const query = await current.query.call(this, r)
+        const recs = await recordFind(current.coll, { query })
         const rc = current.converter ? await current.converter.call(this, r, options) : r
         if (recs.length > 0) {
           const id = recs[0].id

package/bajoCli/tool/export-to.js

@@ -7,14 +7,20 @@ function makeProgress (spinner) {
   }
 }
 
-async function exportTo (path, args) {
+async function exportTo ({ path, args, returnEarly }) {
   const { importPkg, print, dayjs, getConfig, importModule } = this.bajo.helper
   const { isEmpty, map } = await importPkg('lodash-es')
   const [input, select] = await importPkg('bajo-cli:@inquirer/input',
     'bajo-cli:@inquirer/select')
-  if (!this.bajoDb) print.fatal('Bajo DB isn\'t loaded')
+  if (!this.bajoDb) {
+    print.fail('Bajo DB isn\'t loaded', { exit: !returnEarly })
+    if (returnEarly) return
+  }
   const schemas = map(this.bajoDb.schemas, 'name')
-  if (isEmpty(schemas)) print.fatal('No schema found!')
+  if (isEmpty(schemas)) {
+    print.fail('No schema found!', { exit: !returnEarly })
+    if (returnEarly) return
+  }
   let [coll, dest, query] = args
   if (isEmpty(coll)) {
     coll = await select({
@@ -47,7 +53,7 @@ async function exportTo (path, args) {
     spinner.succeed('%d records successfully exported to \'%s\'', result.count, Path.resolve(result.file))
   } catch (err) {
     console.log(err)
-    spinner.fatal('Error: %s', err.message)
+    spinner.fail('Error: %s', err.message, { exit: !returnEarly })
   }
 }
 

package/bajoCli/tool/import-from.js

@@ -6,14 +6,20 @@ function makeProgress (spinner) {
   }
 }
 
-async function importFrom (path, args) {
+async function importFrom ({ path, args, returnEarly }) {
   const { importPkg, print, importModule, getConfig } = 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')
-  if (!this.bajoDb) print.fatal('Bajo DB isn\'t loaded')
+  if (!this.bajoDb) {
+    print.fail('Bajo DB isn\'t loaded', { exit: !returnEarly })
+    if (returnEarly) return
+  }
   const schemas = map(this.bajoDb.schemas, 'name')
-  if (isEmpty(schemas)) print.fatal('No schema found!')
+  if (isEmpty(schemas)) {
+    print.fail('No schema found!', { exit: !returnEarly })
+    if (returnEarly) return
+  }
   let [dest, coll] = args
   if (isEmpty(dest)) {
     dest = await input({
@@ -31,7 +37,10 @@ async function importFrom (path, args) {
     message: print.__('You\'re about to replace ALL records with the new ones. Are you really sure?'),
     default: false
   })
-  if (!answer) print.fatal('Aborted!')
+  if (!answer) {
+    print.fail('Aborted!', { exit: !returnEarly })
+    if (returnEarly) return
+  }
   const spinner = print.bora('Importing...').start()
   const progressFn = makeProgress.call(this, spinner)
   const cfg = getConfig('bajoDb', { full: true })
@@ -43,7 +52,7 @@ async function importFrom (path, args) {
     const result = await this.bajoExtra.helper.importFrom(dest, coll, { batch, progressFn })
     spinner.succeed('%d records successfully imported from \'%s\'', result.count, Path.resolve(result.file))
   } catch (err) {
-    spinner.fatal('Error: %s', err.message)
+    spinner.fail('Error: %s', err.message, { exit: !returnEarly })
   }
 }
 

package/bajoCli/tool.js

@@ -1,8 +1,8 @@
-async function tool ({ path, args = [] }) {
+async function tool ({ path, args = [], returnEarly }) {
   const { currentLoc } = this.bajo.helper
   const { runToolMethod } = this.bajoCli.helper
   const options = { demonize: ['shell'] }
-  await runToolMethod({ path, args, dir: `${currentLoc(import.meta).dir}/tool`, options })
+  await runToolMethod({ path, args, dir: `${currentLoc(import.meta).dir}/tool`, options, returnEarly })
 }
 
 export default tool

package/package.json

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