dobo 1.2.9 → 2.0.0

package/index.js

@@ -10,7 +10,7 @@ import path from 'path'
 async function factory (pkgName) {
   const me = this
 
-  return class Dobo extends this.lib.BajoPlugin {
+  return class Dobo extends this.lib.Plugin {
     constructor () {
       super(pkgName, me.app)
       this.alias = 'db'
@@ -127,7 +127,7 @@ async function factory (pkgName) {
       for (const c of conns) {
         const { ns } = breakNsPath(c.type)
         const schemas = filter(this.schemas, { connection: c.name })
-        const mod = c.type === 'dobo:memory' ? memDbInstantiate : await importModule(`${ns}:/${this.name}/boot/instantiate.js`)
+        const mod = c.type === 'dobo:memory' ? memDbInstantiate : await importModule(`${ns}:/extend/${this.name}/boot/instantiate.js`)
         await mod.call(this.app[ns], { connection: c, noRebuild, schemas })
         this.log.trace('driverInstantiated%s%s', c.driver, c.name)
       }

package/lib/add-fixtures.js

@@ -16,12 +16,13 @@ async function addFixture (name, { spinner } = {}) {
   let items = await readConfig(pattern, { ns: schema.ns, ignoreError: true })
   if (isEmpty(items)) items = []
   // override
-  const overrides = await readConfig(`${this.app.main.dir.pkg}/dobo/override/${schema.ns}/fixture/${base}.*`, { ns: this.name, ignoreError: true })
+  const overrides = await readConfig(`${this.app.main.dir.pkg}/extend/dobo/override/${schema.ns}/fixture/${base}.*`, { ns: this.name, ignoreError: true })
 
   if (isArray(overrides) && !isEmpty(overrides)) items = overrides
   // extend
-  await eachPlugins(async function ({ dir, ns }) {
-    const extend = await readConfig(`${dir}/dobo/extend/${schema.ns}/fixture/${base}.*`, { ns, ignoreError: true })
+  await eachPlugins(async function ({ dir }) {
+    const { name: ns } = this
+    const extend = await readConfig(`${dir}/extend/dobo/extend/${schema.ns}/fixture/${base}.*`, { ns, ignoreError: true })
     if (isArray(extend) && !isEmpty(extend)) items.push(...extend)
   })
   if (isEmpty(items)) return result

package/lib/build-bulk-action.js

@@ -3,7 +3,7 @@ async function buildBulkAction (name, action, options = {}) {
   const { camelCase } = this.lib._
   const { schema, driver, connection } = await this.getInfo(name)
   if (!options.force && (schema.disabled ?? []).includes(action)) throw this.error('methodIsDisabled%s%s', camelCase('bulk ' + action), name)
-  const file = `${driver.plugin}:/${this.name}/method/bulk/${action}.js`
+  const file = `${driver.plugin}:/extend/${this.name}/method/bulk/${action}.js`
   if (!fs.existsSync(file)) throw this.error('methodUnsupported%s%s', camelCase('bulk ' + action), name)
   const handler = await importModule(file)
   return { handler, schema, driver, connection }

package/lib/collect-connections.js

@@ -11,9 +11,9 @@ async function collectConnections ({ item, index, options }) {
   if (isEmpty(type)) type = conn.type
   const driver = find(this.drivers, { ns, type })
   if (!driver) this.fatal('unsupportedDbType%s', conn.type)
-  let file = `${ns}:/${this.name}/lib/${type}/conn-sanitizer.js`
+  let file = `${ns}:/extend/${this.name}/lib/${type}/conn-sanitizer.js`
   if (conn.type === 'dobo:memory') file = `${ns}:/lib/mem-db/conn-sanitizer.js`
-  if (driver.provider) file = `${driver.provider}:/${ns}/lib/${type}/conn-sanitizer.js`
+  if (driver.provider) file = `${driver.provider}:/extend/${ns}/lib/${type}/conn-sanitizer.js`
   let sanitizer = await importModule(file)
   if (!sanitizer) sanitizer = defSanitizer
   const result = await sanitizer.call(this, conn)

package/lib/collect-drivers.js

@@ -12,7 +12,8 @@ async function collectDrivers () {
   })
   // others
   await runHook(`${this.name}:beforeCollectDrivers`)
-  await eachPlugins(async function ({ file, ns }) {
+  await eachPlugins(async function ({ file }) {
+    const { name: ns } = this
     const info = await readConfig(file, { ns })
     if (!info.type) this.fatal('driverMustProvideDbType')
     if (!info.driver) this.fatal('driverMustHaveName')

package/lib/collect-feature.js

@@ -1,6 +1,7 @@
 import path from 'path'
 
-async function handler ({ file, alias, ns }) {
+async function handler ({ file }) {
+  const { name: ns } = this
   const { importModule } = this.app.bajo
   const { camelCase, isFunction } = this.lib._
   const me = this.app.dobo

package/lib/collect-schemas.js

@@ -1,7 +1,8 @@
 import path from 'path'
 import sanitizeSchema from './sanitize-schema.js'
 
-async function handler ({ file, alias, ns }) {
+async function handler ({ file }) {
+  const { name: ns, alias } = this
   const { readConfig, eachPlugins } = this.app.bajo
   const { pascalCase } = this.lib.aneka
   const { get, isPlainObject, each, find, has, isArray, forOwn, isString, merge } = this.lib._
@@ -35,11 +36,12 @@ async function handler ({ file, alias, ns }) {
   mod.properties = mod.properties ?? []
   // if ((mod.properties ?? []).length === 0) this.fatal('noPropsFoundOnSchema%s', mod.name)
   // schema extender
-  await eachPlugins(async function (opts) {
-    const glob = `${opts.dir}/dobo/extend/${mod.ns}/schema/${base}.*`
+  await eachPlugins(async function ({ dir }) {
+    const { name: ns } = this
+    const glob = `${dir}/extend/dobo/extend/${mod.ns}/schema/${base}.*`
     const files = await fastGlob(glob)
     for (const file of files) {
-      const extender = await readConfig(file, { ns: opts.ns, ignoreError: true })
+      const extender = await readConfig(file, { ns, ignoreError: true })
       if (!isPlainObject(extender)) return undefined
       each(extender.properties ?? [], p => {
         if (isString(p) && mod.properties.includes(p)) return undefined
@@ -58,13 +60,13 @@ async function handler ({ file, alias, ns }) {
         })
       }
       if (feats.length > 0) mod.feature.push(...feats)
-      if (opts.plugin === this.app.bajo.mainNs) {
+      if (ns === this.app.bajo.mainNs) {
         each(['connection', 'name'], i => {
           if (has(extender, i)) mod[i] = extender[i]
         })
       }
       mod.extender = mod.extender ?? []
-      mod.extender.push(opts.plugin)
+      mod.extender.push(ns)
     }
   })
   return mod

package/lib/multi-rel-rows.js

@@ -30,7 +30,7 @@ async function multiRelRows ({ schema, records, options = {} }) {
         for (const i in records) {
           records[i]._rel = records[i]._rel ?? {}
           const rec = records[i]
-          const res = results.find(r => (r[val.propName] + '') === rec[prop.name])
+          const res = results.find(r => (r[val.propName] + '') === rec[prop.name] + '')
           if (res) records[i]._rel[key] = await this.pickRecord({ record: res, fields, schema: relschema })
           else records[i]._rel[key] = {}
         }

package/lib/resolve-method.js

@@ -7,7 +7,7 @@ async function resolveMethod (name, method, options = {}) {
   if (!options.force && (schema.disabled ?? []).includes(action)) throw this.error('methodIsDisabled%s%s', camelCase(method), name)
   let file
   if (connection.name === 'memory') file = `${this.app[driver.ns].dir.pkg}/lib/mem-db/method/${group}/${action}.js`
-  else file = `${this.app[driver.ns].dir.pkg}/${this.name}/method/${group}/${action}.js`
+  else file = `${this.app[driver.ns].dir.pkg}/extend/${this.name}/method/${group}/${action}.js`
   if (!fs.existsSync(file)) throw this.error('methodUnsupported%s%s', camelCase(method), name)
   const handler = await importModule(file)
   return { handler, schema, driver, connection }

package/lib/sanitize-schema.js

@@ -57,7 +57,7 @@ async function sanitizeSchema (items) {
       if (isEmpty(type)) type = conn.type
       const driver = find(this.drivers, { type, ns, driver: conn.driver })
       if (driver.lowerCaseModel) item.name = item.name.toLowerCase()
-      let file = `${ns}:/${this.name}/lib/${type}/prop-sanitizer.js`
+      let file = `${ns}:/extend/${this.name}/lib/${type}/prop-sanitizer.js`
       let propSanitizer = await importModule(file)
       if (!propSanitizer) propSanitizer = genericPropSanitizer
       for (const idx in item.properties) {
@@ -128,7 +128,7 @@ async function sanitizeSchema (items) {
         if (!all.includes(p.name)) all.push(p.name)
         else fatal.call(this, 'Field \'%s@%s\' should be used only once', p.name, item.name)
       })
-      file = `${ns}:/${this.name}/lib/${type}/schema-sanitizer.js`
+      file = `${ns}:/extend/${this.name}/lib/${type}/schema-sanitizer.js`
       const schemaSanitizer = await importModule(file)
       if (schemaSanitizer) await schemaSanitizer.call(this, { schema: item, connection: conn, driver })
       schemas.push(item)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo",
-  "version": "1.2.9",
+  "version": "2.0.0",
   "description": "Database ORM/ODM for Bajo Framework",
   "main": "index.js",
   "scripts": {