bajo 0.3.6 → 0.3.7

package/boot/helper/break-ns-path.js

@@ -1,15 +1,18 @@
-import { isEmpty } from 'lodash-es'
+import { isEmpty, find } from 'lodash-es'
 
-function breakNsPath (item = '') {
-  const { error, getPlugin } = this.bajo.helper
+function breakNsPath (item = '', defaultNs = 'bajo') {
+  const { error } = this.bajo.helper
   let [ns, ...path] = item.split(':')
   path = path.join(':')
   if (isEmpty(path)) {
     path = ns
-    ns = null
+    ns = defaultNs
+  }
+  if (ns.length === 1) return [ns, path].join(':') // windows fs
+  if (!this[ns]) {
+    const ref = find(this.bajo.pluginRefs ?? [], { alias: ns })
+    if (ref) ns = ref.plugin
   }
-  // if (path.startsWith('.')) throw error('Path \'%s\' must be an absolute path', path)
-  if (!this[ns]) ns = (getPlugin(ns) || {}).name
   if (!this[ns]) throw error('Unknown plugin \'%s\' or plugin isn\'t loaded yet', ns)
   return [ns, path]
 }

package/boot/helper/get-plugin-file.js

@@ -1,8 +1,10 @@
 import { get } from 'lodash-es'
+import breakNsPath from './break-ns-path.js'
 
 function getPluginFile (file) {
+  if (!get(this, 'bajo.helper')) return file
   if (file.includes(':')) {
-    const [plugin, path] = file.split(':')
+    const [plugin, path] = breakNsPath.call(this, file)
     if (plugin !== 'file' && this && this[plugin] && plugin.length > 1) {
       const dir = get(this[plugin], 'config.dir.pkg')
       file = `${dir}${path}`

package/boot/helper/get-plugin.js

@@ -6,7 +6,7 @@ function getPlugin (name) {
     // alias?
     const ref = find(this.bajo.pluginRefs ?? [], { alias: name })
     if (!ref) throw error('\'%s\' is not loaded', name)
-    name = ref.name
+    name = ref.plugin
   }
   return this[name]
 }

package/boot/helper/import-pkg.js

@@ -4,6 +4,7 @@ import getModuleDir from './get-module-dir.js'
 import resolvePath from './resolve-path.js'
 import readJson from './read-json.js'
 import defaultsDeep from './defaults-deep.js'
+import breakNsPath from './break-ns-path.js'
 import path from 'path'
 import fs from 'fs-extra'
 
@@ -14,11 +15,7 @@ async function importPkg (...pkgs) {
     opts = defaultsDeep(pkgs.pop(), opts)
   }
   for (const pkg of pkgs) {
-    let [plugin, name] = pkg.split(':').map(item => item.trim())
-    if (!name) {
-      name = plugin
-      plugin = 'bajo'
-    }
+    const [plugin, name] = breakNsPath.call(this, pkg)
     const dir = getModuleDir.call(this, name, plugin)
     const p = readJson(`${dir}/package.json`, opts.thrownNotFound)
     const mainFileOrg = dir + '/' + (p.main ?? get(p, 'exports.default', 'index.js'))

package/boot/lib/shim.js

@@ -1,8 +1,7 @@
-// taken from: https://vanillajstoolkit.com/polyfills/stringreplaceall/
-
 function shim () {
+  // taken from: https://vanillajstoolkit.com/polyfills/stringreplaceall/
   if (!String.prototype.replaceAll) {
-    String.prototype.replaceAll = function(str, newStr){
+    String.prototype.replaceAll = function(str, newStr) { // eslint-disable-line
       if (Object.prototype.toString.call(str).toLowerCase() === '[object regexp]') {
         return this.replace(str, newStr)
       }

package/package.json

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