bajo 1.1.0 → 1.1.2

package/bajo/intl/en-US.json

@@ -5,7 +5,7 @@
   "cantLocateNpmGlobalDir": "Can't locate npm global module directory",
   "cantLocateGlobalDir%s": "Can't locate '%s' global module directory",
   "cantFindMethod%s": "Can't find method named '%s'",
-  "pluginWithAliasNotLoaded%s": "Plugin with alias '%s' is not loaded",
+  "pluginWithNameAliasNotLoaded%s": "Plugin with name/alias '%s' is not loaded",
   "cantFind%s": "Can't find %s",
   "dtUnparsable%s": "Date/time unparsable '%s'",
   "cantParse%s": "'Can't parse '%s'",
@@ -152,5 +152,7 @@
   "formSubmitted": "Form Submitted",
   "formSubmittedInfo": "The form you entered has been successfully submitted and is stored securely in our system.",
   "thankYou": "Thank you!",
-  "adminArea": "Admin Area"
+  "adminArea": "Admin Area",
+  "instanceCreatedOnConn%s%s": "Instance '%s' created on connection '%s'",
+  "fileNotModuleHandler%s": "File '%s' is NOT a module handler"
 }

package/bajo/intl/id.json

@@ -5,7 +5,7 @@
   "cantLocateNpmGlobalDir": "Tidak bisa menentukan direktori global npm",
   "cantLocateGlobalDir%s": "Tidak bisa menentukan direktori global modul '%s'",
   "cantFindMethod%s": "Tidak menemukan metode dengan nama '%s'",
-  "pluginWithAliasNotLoaded%s": "Plugin dengan alias '%s' tidak termuat",
+  "pluginWithNameAliasNotLoaded%s": "Plugin dengan name/alias '%s' tidak termuat",
   "cantFind%s": "Tidak bisa menemukan %s",
   "dtUnparsable%s": "Tanggal/waktu tidak bisa di parsing '%s'",
   "cantParse%s": "'Tidak bisa memparsing '%s'",
@@ -152,5 +152,7 @@
   "formSubmitted": "Form Terkirim",
   "formSubmittedInfo": "Form yang Anda masukkan telah sukses terkirim dan disimpan dengan aman di sistim kami.",
   "thankYou": "Terima kasih!",
-  "adminArea": "Area Admin"
+  "adminArea": "Area Admin",
+  "instanceCreatedOnConn%s%s": "Instance '%s' telah dibuat pada koneksi '%s'",
+  "fileNotModuleHandler%s": "Berkas '%s' BUKAN merupakan module handler"
 }

package/boot/class/app.js

@@ -1,17 +1,16 @@
 import util from 'util'
 import lodash from 'lodash'
 import BajoCore from './bajo-core.js'
-import resolvePath from './bajo-core/method/resolve-path.js'
+import resolvePath from '../lib/resolve-path.js'
 import parseArgsArgv from '../lib/parse-args-argv.js'
 import parseEnv from '../lib/parse-env.js'
-import buildPlugins from './bajo-core/helper/build-plugins.js'
-import { buildBaseConfig, buildExtConfig } from './bajo-core/helper/build-config.js'
-import collectConfigHandlers from './bajo-core/helper/collect-config-handlers.js'
-import attachMethod from './bajo-core/helper/attach-method.js'
-import bootOrder from './bajo-core/helper/boot-order.js'
-import bootPlugins from './bajo-core/helper/boot-plugins.js'
-import exitHandler from './bajo-core/helper/exit-handler.js'
-import runAsApplet from './bajo-core/helper/run-as-applet.js'
+import buildPlugins from './bajo-core/build-plugins.js'
+import { buildBaseConfig, buildExtConfig } from './bajo-core/build-config.js'
+import collectConfigHandlers from './bajo-core/collect-config-handlers.js'
+import bootOrder from './bajo-core/boot-order.js'
+import bootPlugins from './bajo-core/boot-plugins.js'
+import exitHandler from './bajo-core/exit-handler.js'
+import runAsApplet from './bajo-core/run-as-applet.js'
 
 const { last } = lodash
 
@@ -55,7 +54,6 @@ class App {
     await buildPlugins.call(bajo)
     await collectConfigHandlers.call(bajo)
     await buildExtConfig.call(bajo)
-    await attachMethod.call(bajo)
     await bootOrder.call(bajo)
     await bootPlugins.call(bajo)
     await exitHandler.call(bajo)

package/boot/class/bajo-core/{helper/boot-order.js → boot-order.js}

@@ -1,6 +1,5 @@
 import lodash from 'lodash'
 import fs from 'fs-extra'
-import getModuleDir from '../method/get-module-dir.js'
 
 const { reduce, map, isNaN, trim, forOwn, orderBy } = lodash
 
@@ -15,7 +14,7 @@ async function bootOrder () {
   const norder = {}
   for (let n of this.pluginPkgs) {
     n = map(n.split(':'), m => trim(m))[0]
-    const dir = n === this.mainNs ? (`${this.dir.base}/${this.mainNs}`) : getModuleDir(n)
+    const dir = n === this.mainNs ? (`${this.dir.base}/${this.mainNs}`) : this.getModuleDir(n)
     if (n !== this.mainNs && !fs.existsSync(`${dir}/plugin`)) throw this.error('packageNotFoundOrNotBajo%s', n)
     norder[n] = NaN
     try {

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

@@ -0,0 +1,19 @@
+import buildConfig from '../bajo-plugin/build-config.js'
+import checkDependency from '../bajo-plugin/check-dependency.js'
+import checkClash from '../bajo-plugin/check-clash.js'
+import attachMethod from '../bajo-plugin/attach-method.js'
+import collectHooks from '../bajo-plugin/collect-hooks.js'
+import run from '../bajo-plugin/run.js'
+import collectExitHandlers from '../bajo-plugin/collect-exit-handlers.js'
+
+async function bootPlugins () {
+  await buildConfig.call(this.app)
+  await checkClash.call(this.app)
+  await checkDependency.call(this.app)
+  await attachMethod.call(this.app)
+  await collectHooks.call(this.app)
+  await collectExitHandlers.call(this.app)
+  await run.call(this.app)
+}
+
+export default bootPlugins

package/boot/class/bajo-core/{helper/build-config.js → build-config.js}

@@ -1,10 +1,5 @@
-import readAllConfigs from '../../../lib/read-all-configs.js'
-import defaultsDeep from '../method/defaults-deep.js'
-import getKeyByValue from '../method/get-key-by-value.js'
-import resolvePath from '../method/resolve-path.js'
-import currentLoc from '../../../lib/current-loc.js'
-import envs from '../method/envs.js'
-import join from '../method/join.js'
+import readAllConfigs from '../../lib/read-all-configs.js'
+import currentLoc from '../../lib/current-loc.js'
 import omitDeep from 'omit-deep'
 import os from 'os'
 import fs from 'fs-extra'
@@ -39,15 +34,18 @@ const defConfig = {
 
 export async function buildBaseConfig () {
   this.applet = this.app.argv._.applet
-  this.config = defaultsDeep({}, this.app.env._, this.app.argv._)
+  this.config = this.defaultsDeep({}, this.app.env._, this.app.argv._)
   this.alias = this.name
   set(this, 'dir.base', this.app.cwd)
-  const path = currentLoc(import.meta).dir + '/../../../..'
-  set(this, 'dir.pkg', resolvePath(path))
+  const path = currentLoc(import.meta).dir + '/../../..'
+  set(this, 'dir.pkg', this.resolvePath(path))
   if (!get(this, 'dir.data')) set(this, 'dir.data', `${this.dir.base}/data`)
-  this.dir.data = resolvePath(this.dir.data)
+  this.dir.data = this.resolvePath(this.dir.data)
+  if (!fs.existsSync(this.dir.data)) {
+    this.log.warn('ddirNotExists%s', this.dir.data)
+  }
   if (!this.dir.tmp) {
-    this.dir.tmp = `${resolvePath(os.tmpdir())}/${this.name}`
+    this.dir.tmp = `${this.resolvePath(os.tmpdir())}/${this.name}`
     fs.ensureDirSync(this.dir.tmp)
   }
   this.app.addPlugin(this)
@@ -57,11 +55,11 @@ export async function buildExtConfig () {
   // config merging
   let resp = await readAllConfigs.call(this.app, `${this.dir.data}/config/${this.name}`)
   resp = omitDeep(pick(resp, ['log', 'exitHandler', 'env']), omitted)
-  this.config = defaultsDeep({}, resp, this.config, defConfig)
+  this.config = this.defaultsDeep({}, resp, this.config, defConfig)
   this.config.env = (this.config.env ?? 'dev').toLowerCase()
-  if (values(envs).includes(this.config.env)) this.config.env = getKeyByValue(envs, this.config.env)
-  if (!keys(envs).includes(this.config.env)) throw new Error(`Unknown environment '${this.config.env}'. Supported: ${join(keys(envs))}`)
-  process.env.NODE_ENV = envs[this.config.env]
+  if (values(this.envs).includes(this.config.env)) this.config.env = this.getKeyByValue(this.envs, this.config.env)
+  if (!keys(this.envs).includes(this.config.env)) throw new Error(`Unknown environment '${this.config.env}'. Supported: ${this.join(keys(this.envs))}`)
+  process.env.NODE_ENV = this.envs[this.config.env]
   if (!this.config.log.level) this.config.log.level = this.config.env === 'dev' ? 'debug' : 'info'
   if (this.config.silent) this.config.log.level = 'silent'
   if (this.applet) {
@@ -72,5 +70,5 @@ export async function buildExtConfig () {
   const exts = map(this.configHandlers, 'ext')
   this.initPrint()
   this.initLog()
-  this.log.debug('configHandlers%s', join(exts))
+  this.log.debug('configHandlers%s', this.join(exts))
 }

package/boot/class/bajo-core/{helper/build-plugins.js → build-plugins.js}

@@ -1,7 +1,6 @@
 import lodash from 'lodash'
 import fs from 'fs-extra'
-import getModuleDir from '../method/get-module-dir.js'
-import resolvePath from '../method/resolve-path.js'
+import resolvePath from '../../lib/resolve-path.js'
 
 const { isString, filter, map, trim, without, uniq, camelCase, isEmpty } = lodash
 
@@ -20,7 +19,7 @@ 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}`) : getModuleDir.call(this, 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 plugin
     const factory = `${dir}/plugin/factory.js`

package/boot/class/bajo-core/{helper/collect-config-handlers.js → collect-config-handlers.js}

@@ -1,5 +1,3 @@
-import getModuleDir from '../method/get-module-dir.js'
-import importModule from '../method/import-module.js'
 import lodash from 'lodash'
 const { isFunction, isPlainObject, camelCase } = lodash
 
@@ -7,11 +5,11 @@ async function collectConfigHandlers () {
   for (const pkg of this.pluginPkgs) {
     let dir
     try {
-      dir = getModuleDir.call(this, pkg)
+      dir = this.getModuleDir(pkg)
     } catch (err) {}
     if (!dir) continue
     const file = `${dir}/bajo/config-handlers.js`
-    let mod = await importModule.call(this, file)
+    let mod = await this.importModule(file)
     if (!mod) continue
     if (isFunction(mod)) mod = await mod.call(this.app[camelCase(pkg)])
     if (isPlainObject(mod)) mod = [mod]