dobo-extra 1.0.2 → 1.0.4

package/bajo/.dependencies

@@ -0,0 +1,2 @@
+dobo
+bajo-extra

package/bajo/config.json

@@ -14,6 +14,5 @@
     "tasks": [],
     "checkInterval": false,
     "runEarly": true
-  },
-  "dependencies": ["dobo", "bajo-extra"]
+  }
 }

package/bajo/init.js

@@ -5,15 +5,15 @@ async function handler ({ item }) {
   const { getSchema } = this.app.dobo
   const { has } = this.app.bajo.lib._
   for (const f of ['source', 'destination']) {
-    if (!has(item, f)) throw this.error('Task must have %s model', f)
+    if (!has(item, f)) throw this.error('taskMustHaveModel%s', f)
     const key = `${f}Field`
     item[key] = item[key] ?? 'createdAt'
     const schema = getSchema(item[f])
     const prop = schema.properties.find(p => p.name === item[key])
-    if (!prop) throw this.error('Unknown field \'%s@%s\'', item[key], item[f])
-    if (!types.includes(prop.type)) throw this.error('\'%s@%s (%s)\' is not supported (must be one of %s)', item[key], item[f], prop.type, join(types))
+    if (!prop) throw this.error('unknownField%s%s', item[key], item[f])
+    if (!types.includes(prop.type)) throw this.error('isNotSupported%s%s%s%s', item[key], item[f], prop.type, join(types))
   }
-  if (item.source === item.destination) throw this.error('Source & destination must be different')
+  if (item.source === item.destination) throw this.error('sourceDestMustBeDifferent')
   item.maxAge = item.maxAge ?? 1 // in days, less then 1 is ignored
 }
 

package/bajo/method/export-to.js

@@ -21,7 +21,7 @@ async function getFile (dest, ensureDir) {
   const dir = path.dirname(file)
   if (!fs.existsSync(dir)) {
     if (ensureDir) fs.ensureDirSync(dir)
-    else throw this.error('Directory \'%s\' doesn\'t exist', dir)
+    else throw this.error('dirNotExists%s', dir)
   }
   let compress = false
   let ext = path.extname(file)
@@ -30,7 +30,7 @@ async function getFile (dest, ensureDir) {
     ext = path.extname(path.basename(file).replace('.gz', ''))
     // file = file.slice(0, file.length - 3)
   }
-  if (!supportedExt.includes(ext)) throw this.error('Unsupported format \'%s\'', ext.slice(1))
+  if (!supportedExt.includes(ext)) throw this.error('unsupportedFormat%s', ext.slice(1))
   return { file, ext, compress }
 }
 

package/bajo/method/import-from.js

@@ -20,14 +20,14 @@ async function importFrom (source, dest, { trashOld = true, batch = 1, progressF
     file = `${getPluginDataDir(this.name)}/import/${source}`
     fs.ensureDirSync(path.dirname(file))
   }
-  if (!fs.existsSync(file)) throw this.error('Source file \'%s\' doesn\'t exist', file)
+  if (!fs.existsSync(file)) throw this.error('sourceFileNotExists%s', file)
   let ext = fileType ? `.${fileType}` : path.extname(file)
   let decompress = false
   if (ext === '.gz') {
     ext = path.extname(path.basename(file, '.gz'))
     decompress = true
   }
-  if (!supportedExt.includes(ext)) throw this.error('Unsupported format \'%s\'', ext.slice(1))
+  if (!supportedExt.includes(ext)) throw this.error('unsupportedFormat%s', ext.slice(1))
   if (trashOld && dest !== false) await this.app.dobo.modelClear(dest)
   const reader = fs.createReadStream(file)
   batch = parseInt(batch) || 100

package/bajo/start.js

@@ -1,12 +1,12 @@
 async function start () {
   if (this.config.archive.checkInterval === false || this.config.archive.checkInterval <= 0) {
-    this.log.warn('Automatic archiving is disabled')
+    this.log.warn('autoArchiveDisabled')
     return
   }
   if (this.config.archive.runEarly) await this.archive()
   this.archiveIntv = setInterval(() => {
     this.archive().then().catch(err => {
-      this.log.error('Archive error: %s', err.message)
+      this.log.error('archiveError%s', err.message)
     })
   }, this.config.archive.checkInterval * 60 * 1000)
 }

package/bajoCli/applet/archive.js

@@ -7,25 +7,25 @@ async function move (task) {
   const prompts = await importPkg('bajoCli:@inquirer/prompts')
   const { confirm } = prompts
   // get relevant record
-  this.print.info('Copying %s -> %s...', task.source, task.destination)
+  this.print.info('copying%s%s', task.source, task.destination)
   const mark = dayjs().subtract(task.maxAge, 'day').toDate()
   const query = set({}, task.sourceField, { $lt: mark })
   let count = await statAggregate(task.source, { query }, { aggregate: 'count' })
   count = count[0].count
   if (count === 0) {
-    this.print.warn('No record found, skipped')
+    this.print.warn('notFoundSkipped')
     return
   }
   if (this.config.prompt !== false) {
     const answer = await confirm({
-      message: this.print.write('%d records will be archived. Continue?', count),
+      message: this.print.write('recordsArchivedContinue%d', count),
       default: true
     })
     if (!answer) {
-      this.print.warn('Task %s -> %s cancelled', task.source, task.destination)
+      this.print.warn('taskCancelled%s%s', task.source, task.destination)
       return
     }
-  } else this.print.info('%d records will be archived', count)
+  } else this.print.info('recordsArchived%d', count)
   let page = 1
   let total = 0
   let affected = 0
@@ -36,7 +36,7 @@ async function move (task) {
   for (;;) {
     const results = await recordFind(task.source, { query, page, limit: 100 }, { noCache: true, noHook: true })
     if (results.length === 0) break
-    if (this.bajo.config.tool && total % 1000 === 0 && total !== 0) this.print.succeed('Milestone #%s records copied', formatInteger(total))
+    if (this.bajo.config.tool && total % 1000 === 0 && total !== 0) this.print.succeed('milestoneCopied%s', formatInteger(total))
     for (const r of results) {
       if (task.maxRecords && task.maxRecords < total) {
         isMax = true
@@ -46,7 +46,7 @@ async function move (task) {
       try {
         await recordCreate(task.destination, r, { noSanitize: true, noHook: true, noResult: true, noCheckUnique: true })
         ids.push(r.id)
-        spin.setText('ID #%s', r.id)
+        spin.setText('id%s', r.id)
       } catch (err) {
         error++
       }
@@ -55,18 +55,18 @@ async function move (task) {
     affected = total - error
     page++
   }
-  if (isMax) this.print.warn('Max of %d records reached', task.maxRecords)
-  this.print.info('Removing %s...', task.source)
+  if (isMax) this.print.warn('maxReached%d', task.maxRecords)
+  this.print.info('removing%s', task.source)
   for (const idx in ids) {
     const id = ids[idx]
     try {
       await recordRemove(task.source, id, { noHook: true, noResult: true })
-      spin.setText('ID #%s', id)
-      if (this.bajo.config.tool && idx % 1000 === 0 && idx !== '0') this.print.succeed('Milestone #%s records removed', formatInteger(idx))
+      spin.setText('id%s', id)
+      if (this.bajo.config.tool && idx % 1000 === 0 && idx !== '0') this.print.succeed('milestoneRemoved%s', formatInteger(idx))
     } catch (err) {}
   }
   spin.stop()
-  this.print.info('Archiving %s -> %s ended, moved: %s, error: %s', task.source, task.destination, formatInteger(affected), formatInteger(error))
+  this.print.info('archivingEnded%s%s%s%s', task.source, task.destination, formatInteger(affected), formatInteger(error))
 }
 
 async function archive (...args) {
@@ -75,17 +75,17 @@ async function archive (...args) {
   const { confirm } = prompts
   if (this.config.prompt !== false) {
     const answer = await confirm({
-      message: this.print.write('You\'re about to manually run task archiver. Continue?'),
+      message: this.print.write('manuallyRunTaskContinue'),
       default: false
     })
 
-    if (!answer) this.print.fatal('Aborted!')
+    if (!answer) this.print.fatal('aborted')
   }
   await this.app.dobo.start()
-  if (this.archivers.length === 0) this.print.fatal('Nothing to archive')
+  if (this.archivers.length === 0) this.print.fatal('nothingToArchive')
   for (const t of this.archivers.tasks) {
     if (t.maxAge < 1) {
-      this.print.warn('Archive %s -> %s is disabled', t.source, t.destination)
+      this.print.warn('archiveDisabled%s%s', t.source, t.destination)
       continue
     }
     await move.call(this, t)

package/bajoCli/applet/export-to.js

@@ -6,7 +6,7 @@ function makeProgress (spin) {
   const { secToHms } = this.app.bajo
   return async function ({ batchNo, data, batchStart, batchEnd } = {}) {
     if (data.length === 0) return
-    spin.setText('Batch #%d (%s)', batchNo, secToHms(batchEnd.toTime() - batchStart.toTime(), true))
+    spin.setText('batch%d%s', batchNo, secToHms(batchEnd.toTime() - batchStart.toTime(), true))
   }
 }
 
@@ -19,37 +19,37 @@ async function exportTo (...args) {
   const [input, select] = await importPkg('bajoCli:@inquirer/input',
     'bajoCli:@inquirer/select')
   const schemas = map(this.app.dobo.schemas, 'name')
-  if (isEmpty(schemas)) return this.print.fatal('No schema found!')
+  if (isEmpty(schemas)) return this.print.fatal('notFound%s', this.print.write('field.schema'))
   let [model, dest, query] = args
   if (isEmpty(model)) {
     model = await select({
-      message: this.print.write('Please choose model:'),
+      message: this.print.write('chooseModel'),
       choices: map(schemas, s => ({ value: s }))
     })
   }
   if (isEmpty(dest)) {
     dest = await input({
-      message: this.print.write('Please enter destination file:'),
+      message: this.print.write('enterDestFile'),
       default: `${model}-${dayjs().format('YYYYMMDD')}.ndjson`,
       validate: (item) => !isEmpty(item)
     })
   }
   if (isEmpty(query)) {
     query = await input({
-      message: this.print.write('Please enter a query (if any):')
+      message: this.print.write('enterQueryIfAny')
     })
   }
-  const spin = this.print.spinner().start('Exporting...')
+  const spin = this.print.spinner().start('exporting')
   const progressFn = makeProgress.call(this, spin)
   const { connection } = getInfo(model)
   await start(connection.name)
   try {
     const filter = { query }
     const result = await this.exportTo(model, dest, { filter, batch, progressFn })
-    spin.succeed('%d records successfully exported to \'%s\'', result.count, _path.resolve(result.file))
+    spin.succeed('exported%d%s', result.count, _path.resolve(result.file))
   } catch (err) {
     console.log(err)
-    spin.fatal('Error: %s', err.message)
+    spin.fatal('error%s', err.message)
   }
 }
 

package/bajoCli/applet/import-from.js

@@ -5,7 +5,7 @@ const batch = 100
 function makeProgress (spin) {
   const { secToHms } = this.app.bajo
   return async function ({ batchNo, data, batchStart, batchEnd } = {}) {
-    spin.setText('Batch #%d (%s)', batchNo, secToHms(batchEnd.toTime() - batchStart.toTime(), true))
+    spin.setText('batch%d%s', batchNo, secToHms(batchEnd.toTime() - batchStart.toTime(), true))
   }
 }
 
@@ -17,32 +17,32 @@ async function importFrom (...args) {
   const [input, select, confirm] = await importPkg('bajoCli:@inquirer/input',
     'bajoCli:@inquirer/select', 'bajoCli:@inquirer/confirm')
   const schemas = map(this.app.dobo.schemas, 'name')
-  if (isEmpty(schemas)) return this.print.fatal('No schema found!')
+  if (isEmpty(schemas)) return this.print.fatal('notFound%s', this.print.write('field.schema'))
   let [dest, model] = args
   if (isEmpty(dest)) {
     dest = await input({
-      message: this.print.write('Please enter source file:'),
+      message: this.print.write('enterSourceFile'),
       validate: (item) => !isEmpty(item)
     })
   }
   if (isEmpty(model)) {
     model = await select({
-      message: this.print.write('Please choose model:'),
+      message: this.print.write('chooseModel'),
       choices: map(schemas, s => ({ value: s }))
     })
   }
   const answer = await confirm({
-    message: this.print.write('You\'re about to replace ALL records with the new ones. Are you really sure?'),
+    message: this.print.write('aboutToReplaceAllRecords'),
     default: false
   })
-  if (!answer) return this.print.fatal('Aborted!')
-  const spin = this.print.spinner({ showCounter: true }).start('Importing...')
+  if (!answer) return this.print.fatal('aborted')
+  const spin = this.print.spinner({ showCounter: true }).start('importing')
   const progressFn = makeProgress.call(this, spin)
   const { connection } = getInfo(model)
   await start(connection.name)
   try {
     const result = await importFrom(dest, model, { batch, progressFn })
-    spin.succeed('%d records successfully imported from \'%s\'', result.count, _path.resolve(result.file))
+    spin.succeed('recordsImported%d%s', result.count, _path.resolve(result.file))
   } catch (err) {
     spin.fatal('Error: %s', err.message)
   }

package/bajoI18N/resource/en-US.json

@@ -0,0 +1,37 @@
+{
+  "archiveError%s": "Archive error: %s",
+  "dirNotExists%s": "Directory '%s' doesn't exist",
+  "unsupportedFormat%s": "Unsupported format '%s'",
+  "sourceFileNotExists%s": "Source file '%s' doesn't exist",
+  "taskMissingModel%s": "Task must have %s model",
+  "unknownField%s%s": "Unknown field '%s@%s'",
+  "isNotSupported%s%s%s%s": "'%s@%s (%s)' is not supported (must be one of %s)",
+  "sourceDestMustBeDifferent": "Source & destination must be different",
+  "autoArchiveDisabled": "Automatic archiving is disabled",
+  "copying%s%s": "Copying %s -> %s...",
+  "notFoundSkipped": "No record found, skipped",
+  "recordsArchivedContinue%d": "%d records will be archived. Continue?",
+  "taskCancelled%s%s": "Task %s -> %s cancelled",
+  "recordsArchived%d": "%d records will be archived",
+  "milestoneCopied%s": "Milestone #%s records copied",
+  "id%s": "ID #%s",
+  "maxReached%d": "Max of %d records reached",
+  "removing%s": "Removing %s...",
+  "milestoneRemoved%s": "Milestone #%s records removed",
+  "archivingEnded%s%s%s%s": "Archiving %s -> %s ended, moved: %s, error: %s",
+  "manuallyRunTaskContinue": "You're about to manually run task archiver. Continue?",
+  "nothingToArchive": "Nothing to archive",
+  "archiveDisabled%s%s": "Archive %s -> %s is disabled",
+  "batch%d%s": "Batch #%d (%s)",
+  "noSchemaFound": "Batch #%d (%s)",
+  "chooseModel": "Please choose model:",
+  "enterDestFile": "Please enter destination file:",
+  "enterQueryIfAny": "Please enter a query (if any):",
+  "exporting": "Exporting...",
+  "exported%d%s": "%d records successfully exported to '%s'",
+  "enterSourceFile": "Please enter source file:",
+  "aboutToReplaceAllRecords": "You're about to replace ALL records with the new ones. Are you really sure?",
+  "importing": "Importing...",
+  "recordsImported%d%s": "%d records successfully imported from '%s'",
+  "aborted": "Aborted!"
+}

package/bajoI18N/resource/id.json

@@ -1,37 +1,37 @@
 {
-  "Directory '%s' doesn't exist": "",
-  "Unsupported format '%s'": "",
-  "Source file '%s' doesn't exist": "",
-  "Task must have %s model": "",
-  "Unknown field '%s@%s'": "",
-  "'%s@%s (%s)' is not supported (must be one of %s)": "",
-  "Source & destination must be different": "",
-  "Automatic archiving is disabled": "",
-  "Archive error: %s": "",
-  "Copying %s -> %s...": "",
-  "No record found, skipped": "",
-  "%d records will be archived. Continue?": "",
-  "Task %s -> %s cancelled": "",
-  "%d records will be archived": "",
-  "Milestone #%s records copied": "",
-  "ID #%s": "",
-  "Max of %d records reached": "",
-  "Removing %s...": "",
-  "Milestone #%s records removed": "",
-  "Archiving %s -> %s ended, moved: %s, error: %s": "",
-  "You're about to manually run task archiver. Continue?": "",
-  "Nothing to archive": "",
-  "Archive %s -> %s is disabled": "",
-  "Batch #%d (%s)": "",
-  "No schema found!": "",
-  "Please choose model:": "",
-  "Please enter destination file:": "",
-  "Please enter a query (if any):": "",
-  "Exporting...": "",
-  "%d records successfully exported to '%s'": "",
-  "Error: %s": "",
-  "Please enter source file:": "",
-  "You're about to replace ALL records with the new ones. Are you really sure?": "",
-  "Importing...": "",
-  "%d records successfully imported from '%s'": ""
+  "archiveError%s": "Archive error: %s",
+  "dirNotExists%s": "Directory '%s' doesn't exist",
+  "unsupportedFormat%s": "Unsupported format '%s'",
+  "sourceFileNotExists%s": "Source file '%s' doesn't exist",
+  "taskMissingModel%s": "Task must have %s model",
+  "unknownField%s%s": "Unknown field '%s@%s'",
+  "isNotSupported%s%s%s%s": "'%s@%s (%s)' is not supported (must be one of %s)",
+  "sourceDestMustBeDifferent": "Source & destination must be different",
+  "autoArchiveDisabled": "Automatic archiving is disabled",
+  "copying%s%s": "Copying %s -> %s...",
+  "notFoundSkipped": "No record found, skipped",
+  "recordsArchivedContinue%d": "%d records will be archived. Continue?",
+  "taskCancelled%s%s": "Task %s -> %s cancelled",
+  "recordsArchived%d": "%d records will be archived",
+  "milestoneCopied%s": "Milestone #%s records copied",
+  "id%s": "ID #%s",
+  "maxReached%d": "Max of %d records reached",
+  "removing%s": "Removing %s...",
+  "milestoneRemoved%s": "Milestone #%s records removed",
+  "archivingEnded%s%s%s%s": "Archiving %s -> %s ended, moved: %s, error: %s",
+  "manuallyRunTaskContinue": "You're about to manually run task archiver. Continue?",
+  "nothingToArchive": "Nothing to archive",
+  "archiveDisabled%s%s": "Archive %s -> %s is disabled",
+  "batch%d%s": "Batch #%d (%s)",
+  "noSchemaFound": "Batch #%d (%s)",
+  "chooseModel": "Please choose model:",
+  "enterDestFile": "Please enter destination file:",
+  "enterQueryIfAny": "Please enter a query (if any):",
+  "exporting": "Exporting...",
+  "exported%d%s": "%d records successfully exported to '%s'",
+  "enterSourceFile": "Please enter source file:",
+  "aboutToReplaceAllRecords": "You're about to replace ALL records with the new ones. Are you really sure?",
+  "importing": "Importing...",
+  "recordsImported%d%s": "%d records successfully imported from '%s'",
+  "aborted": "Aborted!"
 }

package/package.json

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