bajo 1.1.1 → 1.1.3

package/bajo/intl/en-US.json

@@ -154,5 +154,7 @@
   "thankYou": "Thank you!",
   "adminArea": "Admin Area",
   "instanceCreatedOnConn%s%s": "Instance '%s' created on connection '%s'",
-  "fileNotModuleHandler%s": "File '%s' is NOT a module handler"
+  "fileNotModuleHandler%s": "File '%s' is NOT a module handler",
+  "error%s": "Error: %s",
+  "invalid%s%s": "Invalid %s (%s)"
 }

package/bajo/intl/id.json

@@ -154,5 +154,7 @@
   "thankYou": "Terima kasih!",
   "adminArea": "Area Admin",
   "instanceCreatedOnConn%s%s": "Instance '%s' telah dibuat pada koneksi '%s'",
-  "fileNotModuleHandler%s": "Berkas '%s' BUKAN merupakan module handler"
+  "fileNotModuleHandler%s": "Berkas '%s' BUKAN merupakan module handler",
+  "error%s": "Kesalahan: %s",
+  "invalid%s%s": "%s tidak valid (%s)"
 }

package/boot/class/bajo-core/build-config.js

@@ -42,8 +42,10 @@ export async function buildBaseConfig () {
   if (!get(this, 'dir.data')) set(this, 'dir.data', `${this.dir.base}/data`)
   this.dir.data = this.resolvePath(this.dir.data)
   if (!fs.existsSync(this.dir.data)) {
-    this.log.warn('ddirNotExists%s', this.dir.data)
+    console.log('Data directory (%s) doesn\'t exist yet', this.dir.data)
+    process.exit(1)
   }
+  fs.ensureDirSync(`${this.dir.data}/config`)
   if (!this.dir.tmp) {
     this.dir.tmp = `${this.resolvePath(os.tmpdir())}/${this.name}`
     fs.ensureDirSync(this.dir.tmp)

package/boot/class/bajo-core/build-plugins.js

@@ -19,8 +19,15 @@ async function buildPlugins () {
   this.pluginPkgs.push(this.mainNs)
   for (const pkg of this.pluginPkgs) {
     const ns = camelCase(pkg)
-    const dir = ns === this.mainNs ? (`${this.dir.base}/${this.mainNs}`) : this.getModuleDir(pkg)
-    if (ns !== this.mainNs && !fs.existsSync(`${dir}/plugin`)) throw new Error(`Package '${pkg}' isn't a valid Bajo package`)
+    let dir
+    if (ns === 'main') {
+      dir = `${this.dir.base}/${this.mainNs}`
+      fs.ensureDirSync(dir)
+      fs.ensureDirSync(`${dir}/plugin`)
+    } else {
+      dir = this.getModuleDir(pkg)
+      if (!fs.existsSync(`${dir}/plugin`)) throw new Error(`Package '${pkg}' isn't a valid Bajo package`)
+    }
     let plugin
     const factory = `${dir}/plugin/factory.js`
     if (fs.existsSync(factory)) {

package/boot/class/bajo-core.js

@@ -28,7 +28,7 @@ const {
   isFunction, words, upperFirst, map, concat, uniq, forOwn, padStart,
   trim, filter, isEmpty, orderBy, pullAt, find, camelCase, isNumber,
   cloneDeep, isPlainObject, isArray, isString, set, omit, keys, indexOf,
-  last, get, has, values, dropRight, mergeWith
+  last, get, has, values, dropRight, pick, mergeWith
 } = lodash
 
 class BajoCore extends Plugin {
@@ -163,14 +163,11 @@ class BajoCore extends Plugin {
     if (deleted.length > 0) pullAt(items, deleted)
 
     // check for duplicity
-    for (const c of items) {
-      for (const d of dupChecks) {
-        if (isFunction(d)) await d.call(this.app[ns], c, items)
-        else {
-          const checker = set({}, d, c[d])
-          const match = filter(items, checker)
-          if (match.length > 1) this.app[ns].fatal('oneOrMoreSharedTheSame%s%s', container, this.join(dupChecks.filter(i => !isFunction(i))))
-        }
+    if (dupChecks.length > 0) {
+      const checkers = []
+      for (const c of items) {
+        const checker = JSON.stringify(pick(c, dupChecks))
+        if (checkers.includes(checker)) this.app[ns].fatal('oneOrMoreSharedTheSame%s%s', container, this.join(dupChecks.filter(i => !isFunction(i))))
       }
     }
     await this.runHook(`${ns}:${camelCase('afterBuildCollection')}`, container)
@@ -570,32 +567,35 @@ class BajoCore extends Plugin {
     return dt.toDate()
   }
 
-  parseObject = (input, { silent = true, parseValue = false, lang, ns } = {}) => {
+  parseObject = (input, options = {}) => {
+    const { silent = true, parseValue = false, lang, ns } = options
+    const translate = (item) => {
+      const scope = ns ? this.app[ns] : this
+      const [text, ...args] = item.split('|')
+      return scope.print.write(text, ...args, { lang })
+    }
     const statics = ['*']
     let obj = cloneDeep(input)
     const keys = Object.keys(obj)
-    const me = this
     const mutated = []
     keys.forEach(k => {
-      const v = obj[k]
-      if (isPlainObject(v)) obj[k] = this.parseObject(v)
+      let v = obj[k]
+      if (isPlainObject(v)) obj[k] = this.parseObject(v, options)
       else if (isArray(v)) {
         v.forEach((i, idx) => {
-          if (isPlainObject(i)) obj[k][idx] = this.parseObject(i)
+          if (isPlainObject(i)) obj[k][idx] = this.parseObject(i, options)
           else if (statics.includes(i)) obj[k][idx] = i
           else if (parseValue) obj[k][idx] = dotenvParseVariables(set({}, 'item', obj[k][idx]), { assignToProcessEnv: false }).item
           if (isArray(obj[k][idx])) obj[k][idx] = obj[k][idx].map(item => typeof item === 'string' ? item.trim() : item)
         })
       } else if (this.isSet(v)) {
+        if (isString(v) && v.startsWith('t:') && lang) v = translate(v.slice(2))
         try {
           if (statics.includes(v)) obj[k] = v
           else if (k.startsWith('t:') && isString(v)) {
             const newK = k.slice(2)
-            if (lang) {
-              const scope = ns ? me.app[ns] : me
-              const [text, ...args] = v.split('|')
-              obj[newK] = scope.print.write(text, ...args, { lang })
-            } else obj[newK] = v
+            if (lang) obj[newK] = translate(v)
+            else obj[newK] = v
             mutated.push(k)
           } else if (parseValue) {
             obj[k] = dotenvParseVariables(set({}, 'item', v), { assignToProcessEnv: false }).item

package/boot/class/plugin.js

@@ -3,6 +3,20 @@ import omittedPluginKeys from '../lib/omitted-plugin-keys.js'
 import Log from './log.js'
 import Print from './print.js'
 import BajoError from './error.js'
+import fastGlob from 'fast-glob'
+import { sprintf } from 'sprintf-js'
+import outmatch from 'outmatch'
+import dayjs from '../lib/dayjs.js'
+import fs from 'fs-extra'
+
+const lib = {
+  _: lodash,
+  fs,
+  fastGlob,
+  sprintf,
+  outmatch,
+  dayjs
+}
 
 const { get, isEmpty, cloneDeep, omit, isPlainObject, camelCase } = lodash
 
@@ -12,7 +26,7 @@ class Plugin {
     this.name = camelCase(pkgName)
     this.app = app
     this.config = {}
-    this.lib = {}
+    this.lib = lib
     this.exitHandler = undefined
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "A framework to build a giant monstrous app rapidly",
   "main": "boot/index.js",
   "scripts": {