bajo-extra 0.1.0 → 0.2.0

package/bajo/helper/export-to.js

@@ -9,13 +9,12 @@ const { DataStream } = scramjet
 const supportedExt = ['.json', '.jsonl', '.ndjson', '.csv', '.xlsx']
 
 async function getFile (dest, ensureDir) {
-  const { importPkg, getConfig, error } = this.bajo.helper
+  const { importPkg, error, getPluginDataDir } = this.bajo.helper
   const [fs, increment] = await importPkg('fs-extra', 'add-filename-increment')
-  const config = getConfig()
   let file
   if (path.isAbsolute(dest)) file = dest
   else {
-    file = `${config.dir.data}/plugins/bajoDb/export/${dest}`
+    file = `${getPluginDataDir('bajoDb')}/export/${dest}`
     fs.ensureDirSync(path.dirname(file))
   }
   file = increment(file, { fs: true })

package/bajo/helper/hash.js

@@ -0,0 +1,10 @@
+import bcrypt from 'bcrypt'
+import crypto from 'crypto'
+
+async function hash (text, type = 'md5', { digest = 'hex', salt = 10 } = {}) {
+  if (typeof text !== 'string') text = JSON.stringify(text)
+  if (type === 'bcrypt') return await bcrypt.hash(text, salt)
+  return crypto.createHash(type).update(text).digest(digest)
+}
+
+export default hash

package/bajo/helper/import-from.js

@@ -8,18 +8,17 @@ const { DataStream } = scramjet
 const supportedExt = ['.json', '.jsonl', '.ndjson', '.csv', '.xlsx']
 
 async function importFrom (source, dest, { trashOld = true, batch, progressFn, useHeader = true } = {}) {
-  const { error, importPkg, getConfig } = this.bajo.helper
+  const { error, importPkg, getConfig, getPluginDataDir } = this.bajo.helper
   if (!this.bajoDb) throw error('Bajo DB isn\'t loaded')
   const { getInfo, recordClear, recordCreate } = this.bajoDb.helper
   await getInfo(dest)
   const fs = await importPkg('fs-extra')
-  const config = getConfig()
   const cfg = getConfig('bajoExtra')
 
   let file
   if (path.isAbsolute(source)) file = source
   else {
-    file = `${config.dir.data}/plugins/bajoDb/import/${source}`
+    file = `${getPluginDataDir('bajoDb')}/import/${source}`
     fs.ensureDirSync(path.dirname(file))
   }
   if (!fs.existsSync(file)) throw error('Source file \'%s\' doesn\'t exist', file)

package/bajo/helper/is-bcrypt.js

@@ -0,0 +1,6 @@
+function isBcryptString (text) {
+  // return /^\$2[ayb]\$.{56}$/.test(text)
+  return /^\$2[aby]?\$\d{1,2}\$[./A-Za-z0-9]{53}$/.test(text)
+}
+
+export default isBcryptString

package/bajo/helper/is-md5.js

@@ -0,0 +1,6 @@
+function isMd5 (text) {
+  // return /^\$2[ayb]\$.{56}$/.test(text)
+  return /^[a-f0-9]{32}$/i.test(text)
+}
+
+export default isMd5

package/bajoCli/tool/export-to.js

@@ -15,17 +15,17 @@ async function exportTo (path, args) {
   if (!this.bajoDb) print.fatal('Bajo DB isn\'t loaded')
   const schemas = map(this.bajoDb.schemas, 'name')
   if (isEmpty(schemas)) print.fatal('No schema found!')
-  let [repo, dest, query] = args
-  if (isEmpty(repo)) {
-    repo = await select({
-      message: print.__('Please choose repository:'),
+  let [coll, dest, query] = args
+  if (isEmpty(coll)) {
+    coll = await select({
+      message: print.__('Please choose collection:'),
       choices: map(schemas, s => ({ value: s }))
     })
   }
   if (isEmpty(dest)) {
     dest = await input({
       message: print.__('Please enter destination file:'),
-      default: `${repo}-${dayjs().format('YYYYMMDD')}.ndjson`,
+      default: `${coll}-${dayjs().format('YYYYMMDD')}.ndjson`,
       validate: (item) => !isEmpty(item)
     })
   }
@@ -38,12 +38,12 @@ async function exportTo (path, args) {
   const progressFn = makeProgress.call(this, spinner)
   const cfg = getConfig('bajoDb', { full: true })
   const { batch } = getConfig()
-  const start = await importModule(`${cfg.dir}/bajo/start.js`)
-  const { connection } = await this.bajoDb.helper.getInfo(repo)
+  const start = await importModule(`${cfg.dir.pkg}/bajo/start.js`)
+  const { connection } = await this.bajoDb.helper.getInfo(coll)
   await start.call(this, connection.name)
   try {
     const filter = { query }
-    const result = await this.bajoExtra.helper.exportTo(repo, dest, { filter, batch, progressFn })
+    const result = await this.bajoExtra.helper.exportTo(coll, dest, { filter, batch, progressFn })
     spinner.succeed('%d records successfully exported to \'%s\'', result.count, Path.resolve(result.file))
   } catch (err) {
     console.log(err)

package/bajoCli/tool/import-from.js

@@ -14,16 +14,16 @@ async function importFrom (path, args) {
   if (!this.bajoDb) print.fatal('Bajo DB isn\'t loaded')
   const schemas = map(this.bajoDb.schemas, 'name')
   if (isEmpty(schemas)) print.fatal('No schema found!')
-  let [dest, repo] = args
+  let [dest, coll] = args
   if (isEmpty(dest)) {
     dest = await input({
       message: print.__('Please enter source file:'),
       validate: (item) => !isEmpty(item)
     })
   }
-  if (isEmpty(repo)) {
-    repo = await select({
-      message: print.__('Please choose repository:'),
+  if (isEmpty(coll)) {
+    coll = await select({
+      message: print.__('Please choose collection:'),
       choices: map(schemas, s => ({ value: s }))
     })
   }
@@ -36,11 +36,11 @@ async function importFrom (path, args) {
   const progressFn = makeProgress.call(this, spinner)
   const cfg = getConfig('bajoDb', { full: true })
   const { batch } = getConfig()
-  const start = await importModule(`${cfg.dir}/bajo/start.js`)
-  const { connection } = await this.bajoDb.helper.getInfo(repo)
+  const start = await importModule(`${cfg.dir.pkg}/bajo/start.js`)
+  const { connection } = await this.bajoDb.helper.getInfo(coll)
   await start.call(this, connection.name)
   try {
-    const result = await this.bajoExtra.helper.importFrom(dest, repo, { batch, progressFn })
+    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)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo-extra",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Extra package for Bajo Framework",
   "main": "index.js",
   "scripts": {
@@ -28,7 +28,11 @@
   "dependencies": {
     "async": "^3.2.4",
     "axios": "^1.4.0",
+    "bcrypt": "^5.1.1",
+    "email-addresses": "^5.0.0",
+    "fast-jwt": "^3.2.0",
     "ndjson-csv-xlsx": "^1.1.1",
+    "performant-array-to-tree": "^1.11.0",
     "query-string": "^8.1.0",
     "scramjet": "^4.36.9"
   }