bajo 1.0.3 → 1.0.4

package/boot/class/app.js

@@ -1,5 +1,5 @@
 import util from 'util'
-import { last } from 'lodash-es'
+import lodash from 'lodash'
 import BajoCore from './bajo-core.js'
 import resolvePath from './bajo-core/method/resolve-path.js'
 import parseArgsArgv from '../lib/parse-args-argv.js'
@@ -13,6 +13,8 @@ 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'
 
+const { last } = lodash
+
 class App {
   constructor (cwd) {
     if (!cwd) cwd = process.cwd()

package/boot/class/bajo-core/helper/attach-method.js

@@ -5,6 +5,7 @@ import fs from 'fs-extra'
 import fastGlob from 'fast-glob'
 import { sprintf } from 'sprintf-js'
 import outmatch from 'outmatch'
+import lodash from 'lodash'
 
 export default async function () {
   await createMethod.call(this, `${currentLoc(import.meta).dir}/../method`)
@@ -18,7 +19,7 @@ export default async function () {
     })
   }
   // commonly used libraries
-  this.lib._ = await import('lodash-es')
+  this.lib._ = lodash
   this.lib.fs = fs
   this.lib.fastGlob = fastGlob
   this.lib.sprintf = sprintf

package/boot/class/bajo-core/helper/boot-order.js

@@ -1,7 +1,9 @@
-import { reduce, map, isNaN, trim, forOwn, orderBy } from 'lodash-es'
+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
+
 async function bootOrder () {
   this.log.debug('Setup boot order')
   const order = reduce(this.pluginPkgs, (o, k, i) => {

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

@@ -9,7 +9,8 @@ import omitDeep from 'omit-deep'
 import os from 'os'
 import fs from 'fs-extra'
 
-import { map, pick, values, keys, set, get } from 'lodash-es'
+import lodash from 'lodash'
+const { map, pick, values, keys, set, get } = lodash
 
 const omitted = ['spawn', 'cwd', 'name', 'alias', 'applet', 'a', 'plugins']
 

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

@@ -1,8 +1,10 @@
-import { isString, filter, map, trim, without, uniq, camelCase, isEmpty } from 'lodash-es'
+import lodash from 'lodash'
 import fs from 'fs-extra'
 import getModuleDir from '../method/get-module-dir.js'
 import BajoPlugin from '../../bajo-plugin.js'
 
+const { isString, filter, map, trim, without, uniq, camelCase, isEmpty } = lodash
+
 async function buildPlugins () {
   let pluginPkgs = this.config.plugins ?? []
   if (isString(pluginPkgs)) pluginPkgs = [pluginPkgs]

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

@@ -1,6 +1,7 @@
 import getModuleDir from '../method/get-module-dir.js'
 import importModule from '../method/import-module.js'
-import { isFunction, isPlainObject, camelCase } from 'lodash-es'
+import lodash from 'lodash'
+const { isFunction, isPlainObject, camelCase } = lodash
 
 async function collectConfigHandlers () {
   for (const pkg of this.pluginPkgs) {

package/boot/class/bajo-core/method/arrange-array.js

@@ -1,4 +1,5 @@
-import { filter, trim } from 'lodash-es'
+import lodash from 'lodash'
+const { filter, trim } = lodash
 
 function arrangeArray (inputs, trimItem = true) {
   const first = []

package/boot/class/bajo-core/method/break-ns-path-from-file.js

@@ -1,5 +1,6 @@
 import _path from 'path'
-import { map, camelCase } from 'lodash-es'
+import lodash from 'lodash'
+const { map, camelCase } = lodash
 
 function breakNsPathFromFile ({ file, dir, baseNs, suffix = '', getType } = {}) {
   let item = file.replace(dir + suffix, '')

package/boot/class/bajo-core/method/break-ns-path.js

@@ -1,6 +1,8 @@
-import { isEmpty } from 'lodash-es'
+import lodash from 'lodash'
 import querystring from 'querystring'
 
+const { isEmpty } = lodash
+
 function breakNsPath (item = '', defaultNs = 'bajo', checkNs = true) {
   let [ns, ...path] = item.split(':')
   let subNs

package/boot/class/bajo-core/method/build-collections.js

@@ -1,4 +1,6 @@
-import { filter, isArray, pullAt, camelCase, has, find, set, get, isFunction } from 'lodash-es'
+import lodash from 'lodash'
+
+const { filter, isArray, pullAt, camelCase, has, find, set, get, isFunction } = lodash
 
 async function buildCollections (options = {}) {
   const { runHook, join } = this.app.bajo

package/boot/class/bajo-core/method/call-handler.js

@@ -1,6 +1,8 @@
-import { isString, isFunction, isPlainObject, find } from 'lodash-es'
+import lodash from 'lodash'
 import BajoPlugin from '../../bajo-plugin.js'
 
+const { isString, isFunction, isPlainObject, find } = lodash
+
 async function callHandler (item, ...args) {
   let result
   let scope = this

package/boot/class/bajo-core/method/defaults-deep.js

@@ -1,4 +1,7 @@
-import { mergeWith, isArray } from 'lodash-es'
+import lodash from 'lodash'
+
+const { mergeWith, isArray } = lodash
+
 // based on https://github.com/nodeutils/defaults-deep/blob/master/lib/index.js
 
 const defaultsDeep = (...args) => {

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

@@ -1,7 +1,9 @@
-import { camelCase, isString, omit, cloneDeep } from 'lodash-es'
+import lodash from 'lodash'
 import fastGlob from 'fast-glob'
 import path from 'path'
 
+const { camelCase, isString, omit, cloneDeep } = lodash
+
 async function eachPlugins (handler, options = {}) {
   if (typeof options === 'string') options = { glob: options }
   const result = {}

package/boot/class/bajo-core/method/get-global-module-dir.js

@@ -1,8 +1,10 @@
 import getGlobalPath from 'get-global-path'
 import resolvePath from './resolve-path.js'
-import { dropRight } from 'lodash-es'
+import lodash from 'lodash'
 import fs from 'fs-extra'
 
+const { dropRight } = lodash
+
 function getGlobalModuleDir (pkgName, silent = true) {
   let nodeModulesDir = process.env.BAJO_GLOBAL_MODULE_DIR
   if (!nodeModulesDir) {

package/boot/class/bajo-core/method/get-method.js

@@ -1,4 +1,6 @@
-import { get, isFunction } from 'lodash-es'
+import lodash from 'lodash'
+
+const { get, isFunction } = lodash
 
 function getMethod (name = '', thrown = true) {
   const { ns, path } = this.breakNsPath(name)

package/boot/class/bajo-core/method/get-plugin-file.js

@@ -1,6 +1,8 @@
 import breakNsPath from './break-ns-path.js'
 import currentLoc from '../../../lib/current-loc.js'
-import { trim } from 'lodash-es'
+import lodash from 'lodash'
+
+const { trim } = lodash
 
 function getPluginFile (file) {
   if (file[0] === '.') file = `${currentLoc(import.meta).dir}/${trim(file.slice(1), '/')}`

package/boot/class/bajo-core/method/import-module.js

@@ -1,8 +1,10 @@
 import resolvePath from './resolve-path.js'
 import getPluginFile from './get-plugin-file.js'
-import { isFunction, isPlainObject } from 'lodash-es'
+import lodash from 'lodash'
 import fs from 'fs-extra'
 
+const { isFunction, isPlainObject } = lodash
+
 async function load (file, asDefaultImport = true, noCache = false) {
   file = resolvePath(file, true)
   if (noCache) file += `?_=${Date.now()}`

package/boot/class/bajo-core/method/import-pkg.js

@@ -1,4 +1,4 @@
-import { isPlainObject, last, isEmpty, has, keys, values, get } from 'lodash-es'
+import lodash from 'lodash'
 import os from 'os'
 import getModuleDir from './get-module-dir.js'
 import resolvePath from './resolve-path.js'
@@ -8,6 +8,8 @@ import breakNsPath from './break-ns-path.js'
 import path from 'path'
 import fs from 'fs-extra'
 
+const { isPlainObject, last, isEmpty, has, keys, values, get } = lodash
+
 async function importPkg (...pkgs) {
   const result = {}
   const notFound = []

package/boot/class/bajo-core/method/includes.js

@@ -1,7 +1,5 @@
-import { isString } from 'lodash-es'
-
 function includes (matcher = [], array = []) {
-  if (isString(matcher)) matcher = [matcher]
+  if (typeof matcher === 'string') matcher = [matcher]
   let found = false
   for (const m of matcher) {
     found = array.includes(m)

package/boot/class/bajo-core/method/is-log-in-range.js

@@ -1,5 +1,7 @@
 import logLevels from './log-levels.js'
-import { keys, indexOf } from 'lodash-es'
+import lodash from 'lodash'
+
+const { keys, indexOf } = lodash
 
 function isLogInRange (level) {
   const levels = keys(logLevels)

package/boot/class/bajo-core/method/join.js

@@ -1,6 +1,8 @@
-import { isPlainObject } from 'lodash-es'
+import lodash from 'lodash'
 import isSet from './is-set.js'
 
+const { isPlainObject } = lodash
+
 function join (array, sep) {
   const isI18n = this && this.app && this.app.bajoI18N
   if (array.length === 0) return isI18n ? this.app.bajoI18N.t('none') : 'none'

package/boot/class/bajo-core/method/num-unit.js

@@ -1,4 +1,6 @@
-import { isEmpty } from 'lodash-es'
+import lodash from 'lodash'
+
+const { isEmpty } = lodash
 
 function numUnit (value = '', defUnit = '') {
   const num = value.match(/\d+/g)

package/boot/class/bajo-core/method/paginate.js

@@ -1,4 +1,6 @@
-import { isEmpty, isPlainObject, orderBy, forOwn } from 'lodash-es'
+import lodash from 'lodash'
+
+const { isEmpty, isPlainObject, orderBy, forOwn } = lodash
 
 function paginate (collection, { page = 1, limit = 25, sort } = {}) {
   const count = collection.length

package/boot/class/bajo-core/method/parse-object.js

@@ -1,10 +1,11 @@
-import { isPlainObject, isArray, isNumber, set, cloneDeep, isString, omit } from 'lodash-es'
+import lodash from 'lodash'
 import dotenvParseVariables from 'dotenv-parse-variables'
 import ms from 'ms'
 import dayjs from '../../../lib/dayjs.js'
 import isSet from './is-set.js'
 import translate from '../../../lib/translate.js'
 
+const { isPlainObject, isArray, isNumber, set, cloneDeep, isString, omit } = lodash
 const statics = ['*']
 
 function parseDur (val) {

package/boot/class/bajo-core/method/pascal-case.js

@@ -1,4 +1,6 @@
-import { camelCase, upperFirst } from 'lodash-es'
+import lodash from 'lodash'
+
+const { camelCase, upperFirst } = lodash
 
 const pascalCase = (text) => {
   return upperFirst(camelCase(text))

package/boot/class/bajo-core/method/read-config.js

@@ -3,9 +3,11 @@ import resolvePath from './resolve-path.js'
 import getPluginFile from './get-plugin-file.js'
 import readJson from './read-json.js'
 import parseObject from './parse-object.js'
-import { find, map, isEmpty } from 'lodash-es'
+import lodash from 'lodash'
 import fg from 'fast-glob'
 
+const { find, map, isEmpty } = lodash
+
 async function readConfig (file, { ns, pattern, globOptions = {}, ignoreError, defValue = {}, opts = {} } = {}) {
   if (!ns) ns = this.name
   file = resolvePath(getPluginFile.call(this, file))

package/boot/class/bajo-core/method/read-json.js

@@ -1,7 +1,9 @@
 import fs from 'fs-extra'
-import { isEmpty } from 'lodash-es'
+import lodash from 'lodash'
 import parseObject from './parse-object.js'
 
+const { isEmpty } = lodash
+
 function readJson (file, thrownNotFound) {
   if (!fs.existsSync(file) && thrownNotFound) throw this.error('File \'%s\' not found', file)
   let resp = fs.readFileSync(file, 'utf8')

package/boot/class/bajo-core/method/run-hook.js

@@ -1,4 +1,6 @@
-import { filter, isEmpty, orderBy, pullAt } from 'lodash-es'
+import lodash from 'lodash'
+
+const { filter, isEmpty, orderBy, pullAt } = lodash
 
 async function runHook (hookName, ...args) {
   const [ns, path] = (hookName ?? '').split(':')

package/boot/class/bajo-core/method/save-as-download.js

@@ -1,8 +1,10 @@
 import fs from 'fs-extra'
 import path from 'path'
-import { trim } from 'lodash-es'
+import lodash from 'lodash'
 import increment from 'add-filename-increment'
 
+const { trim } = lodash
+
 async function saveAsDownload (file, obj, printSaved = true) {
   const { print, getPluginDataDir } = this.app.bajo
   const plugin = this.name

package/boot/class/bajo-core/method/sec-to-hms.js

@@ -1,4 +1,5 @@
-import { padStart } from 'lodash-es'
+import lodash from 'lodash'
+const { padStart } = lodash
 
 // based on: https://stackoverflow.com/questions/1322732/convert-seconds-to-hh-mm-ss-with-javascript
 

package/boot/class/bajo-core/method/titleize.js

@@ -1,6 +1,7 @@
-import { words, upperFirst, map, concat, uniq, forOwn } from 'lodash-es'
+import lodash from 'lodash'
 import generateId from './generate-id.js'
 
+const { words, upperFirst, map, concat, uniq, forOwn } = lodash
 const defIgnores = ['or', 'and', 'of', 'with']
 
 const titleize = (text, { ignores = [], replacement = {} } = {}) => {

package/boot/class/bajo-core.js

@@ -3,7 +3,8 @@ import dayjs from '../lib/dayjs.js'
 import importModule from './bajo-core/method/import-module.js'
 import readJson from './bajo-core/method/read-json.js'
 
-import { isFunction } from 'lodash-es'
+import lodash from 'lodash'
+const { isFunction } = lodash
 
 async function defConfigHandler (file, opts) {
   let mod = await importModule(file)

package/boot/class/bajo-plugin/helper/build-config.js

@@ -1,4 +1,6 @@
-import { camelCase } from 'lodash-es'
+import lodash from 'lodash'
+
+const { camelCase } = lodash
 
 async function buildConfig () {
   this.bajo.log.debug('Read configurations')

package/boot/class/bajo-plugin/helper/check-clash.js

@@ -1,4 +1,6 @@
-import { find } from 'lodash-es'
+import lodash from 'lodash'
+
+const { find } = lodash
 
 async function checkAlias () {
   const { eachPlugins } = this.bajo

package/boot/class/bajo-plugin/helper/check-dependency.js

@@ -1,6 +1,8 @@
-import { reduce, map, trim, keys, intersection, each, camelCase, get } from 'lodash-es'
+import lodash from 'lodash'
 import semver from 'semver'
 
+const { reduce, map, trim, keys, intersection, each, camelCase, get } = lodash
+
 async function runner ({ ns, pkgName }) {
   const { join } = this.app.bajo
   this.app.bajo.log.trace('- %s', ns)

package/boot/class/bajo-plugin/helper/collect-hooks.js

@@ -1,4 +1,6 @@
-import { merge, forOwn, groupBy } from 'lodash-es'
+import lodash from 'lodash'
+
+const { merge, forOwn, groupBy } = lodash
 
 async function collectHooks () {
   const { eachPlugins, runHook, isLogInRange, importModule, breakNsPathFromFile } = this.bajo

package/boot/class/bajo-plugin/helper/run.js

@@ -1,4 +1,5 @@
-import { camelCase, map } from 'lodash-es'
+import lodash from 'lodash'
+const { camelCase, map } = lodash
 
 async function run () {
   const me = this

package/boot/class/bajo-plugin.js

@@ -1,10 +1,12 @@
 import Plugin from './plugin.js'
-import { pick, isString, omit, camelCase } from 'lodash-es'
+import lodash from 'lodash'
 import omittedPluginKeys from '../lib/omitted-plugin-keys.js'
 import readAllConfigs from '../lib/read-all-configs.js'
 import titleize from './bajo-core/method/titleize.js'
 import fs from 'fs-extra'
 
+const { pick, omit, camelCase, trim, without } = lodash
+
 class BajoPlugin extends Plugin {
   constructor (pkgName, app) {
     super(pkgName, app)
@@ -41,15 +43,16 @@ class BajoPlugin extends Plugin {
     const envArgv = defaultsDeep({}, omit(this.app.env[this.name] ?? {}, omittedPluginKeys) ?? {}, omit(this.app.argv[this.name] ?? {}, omittedPluginKeys) ?? {})
     cfg = defaultsDeep({}, envArgv ?? {}, cfg ?? {})
     this.title = this.title ?? cfg.title ?? titleize(this.alias)
-    this.dependencies = cfg.dependencies ?? []
-    if (isString(this.dependencies)) this.dependencies = [this.dependencies]
+
+    this.dependencies = []
+    const depFile = `${dir}/bajo/.dependencies`
+    if (fs.existsSync(depFile)) this.dependencies = without(fs.readFileSync(depFile, 'utf8').split('\n').map(item => trim(item)), '')
     this.config = omit(cfg, ['title', 'dependencies'])
   }
 
   async _onoff (item, text, ...args) {
     this.state[item] = false
     const { runHook, importModule } = this.app.bajo
-    const { camelCase } = this.app.bajo.lib._
     const mod = await importModule(`${this.dir.pkg}/bajo/${item}.js`)
     if (mod) {
       this.log.trace(text)

package/boot/class/error.js

@@ -1,4 +1,5 @@
-import { isPlainObject, each, isArray, get, isEmpty, merge } from 'lodash-es'
+import lodash from 'lodash'
+const { isPlainObject, each, isArray, get, isEmpty, merge } = lodash
 
 Error.stackTraceLimit = 15
 

package/boot/class/log.js

@@ -1,10 +1,12 @@
 import os from 'os'
-import { isEmpty, without, merge, upperFirst } from 'lodash-es'
+import lodash from 'lodash'
 import levels from './bajo-core/method/log-levels.js'
 import isLogInRange from './bajo-core/method/is-log-in-range.js'
 import translate from '../lib/translate.js'
 import dayjs from 'dayjs'
 
+const { isEmpty, without, merge, upperFirst } = lodash
+
 class Log {
   constructor (plugin) {
     this.plugin = plugin

package/boot/class/plugin.js

@@ -1,9 +1,11 @@
-import { get, isEmpty, cloneDeep, omit, isPlainObject, camelCase } from 'lodash-es'
+import lodash from 'lodash'
 import omittedPluginKeys from '../lib/omitted-plugin-keys.js'
 import Log from './log.js'
 import Print from './print.js'
 import BajoError from './error.js'
 
+const { get, isEmpty, cloneDeep, omit, isPlainObject, camelCase } = lodash
+
 class Plugin {
   constructor (pkgName, app) {
     this.pkgName = pkgName

package/boot/class/print.js

@@ -1,8 +1,10 @@
 import ora from 'ora'
-import { isPlainObject } from 'lodash-es'
+import lodash from 'lodash'
 import defaultsDeep from './bajo-core/method/defaults-deep.js'
 import translate from '../lib/translate.js'
 
+const { isPlainObject } = lodash
+
 class Print {
   constructor (plugin, opts = {}) {
     this.opts = opts

package/boot/lib/create-method.js

@@ -1,10 +1,12 @@
 import fastGlob from 'fast-glob'
 import path from 'path'
-import { camelCase, isFunction, isPlainObject, forOwn } from 'lodash-es'
+import lodash from 'lodash'
 import resolvePath from '../class/bajo-core/method/resolve-path.js'
 import importModule from '../class/bajo-core/method/import-module.js'
 import readJson from '../class/bajo-core/method/read-json.js'
 
+const { camelCase, isFunction, isPlainObject, forOwn } = lodash
+
 export default async function (dir, pkg = 'bajo') {
   dir = resolvePath(dir)
   const files = await fastGlob([`!${dir}/**/_*.{js,json}`, `${dir}/**/*.{js,json}`])

package/boot/lib/parse-args-argv.js

@@ -4,11 +4,13 @@ import { unflatten } from 'flat'
 import isSet from '../class/bajo-core/method/is-set.js'
 import dotenvParseVariables from 'dotenv-parse-variables'
 import importModule from '../class/bajo-core/method/import-module.js'
-import { find, each, set, camelCase, forOwn } from 'lodash-es'
+import lodash from 'lodash'
 import fs from 'fs-extra'
 import path from 'path'
 import currentLoc from './current-loc.js'
 
+const { find, each, set, camelCase, forOwn } = lodash
+
 const parseItem = (data, delimiter) => {
   return unflatten(data, {
     delimiter,

package/boot/lib/parse-env.js

@@ -1,7 +1,9 @@
 import dotenvParseVariables from 'dotenv-parse-variables'
 import { unflatten } from 'flat'
 import dotEnv from 'dotenv'
-import { each, set, camelCase, forOwn } from 'lodash-es'
+import lodash from 'lodash'
+
+const { each, set, camelCase, forOwn } = lodash
 
 const parse = (data, delimiter) => {
   return unflatten(data, {

package/boot/lib/translate.js

@@ -1,6 +1,7 @@
-import { get, isPlainObject } from 'lodash-es'
+import lodash from 'lodash'
 import Sprintf from 'sprintf-js'
 const { sprintf } = Sprintf
+const { get, isPlainObject } = lodash
 
 function translate (instance, text, ...args) {
   let ntext = text

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "A framework to build a giant monstrous app rapidly",
   "main": "boot/index.js",
   "scripts": {
@@ -36,7 +36,7 @@
     "flat": "^6.0.1",
     "fs-extra": "^11.2.0",
     "get-global-path": "^0.0.1",
-    "lodash-es": "^4.17.21",
+    "lodash": "^4.17.21",
     "ms": "^2.1.3",
     "nanoid": "^5.0.9",
     "omit-deep": "^0.3.0",