dobo 1.0.18 → 1.0.20

package/bajo/intl/en-US.json

@@ -185,7 +185,7 @@
   "validation": {
     "any": {
       "required": "Required",
-      "only": "Must match with {{ref}}"
+      "only": "Must match with %(ref)s"
     },
     "string": {
       "alphanum": "Must only contain alpha-numeric characters",
@@ -200,14 +200,14 @@
       "hex": "Must only contain hexadecimal characters",
       "hexAlign": "Hex decoded representation must be byte aligned",
       "hostname": "Must be a valid hostname",
-      "ip": "must be a valid ip address with a {{cidr}} CIDR",
-      "ipVersion": "Must be a valid ip address of one of the following versions {{version}} with a {{cidr}} CIDR",
+      "ip": "must be a valid ip address with a %(cidr)s CIDR",
+      "ipVersion": "Must be a valid ip address of one of the following versions %(version)s with a %(cidr)s CIDR",
       "isoDate": "Must be in iso format",
       "isoDuration": "Must be a valid ISO 8601 duration",
-      "length": "Length must be {{limit}} characters long",
+      "length": "Length must be %(limit)s characters long",
       "lowercase": "Must only contain lowercase characters",
-      "max": "Length must be less than or equal to {{limit}} characters long",
-      "min": "Length must be at least {{limit}} characters long",
+      "max": "Length must be less than or equal to %(limit)s characters long",
+      "min": "Length must be at least %(limit)s characters long",
       "token": "Must only contain alpha-numeric and underscore characters",
       "trim": "Must not have leading or trailing whitespace",
       "uri": "Must be a valid uri",

package/bajo/intl/id.json

@@ -183,7 +183,7 @@
   "validation": {
     "any": {
       "required": "Harus diisi/dipilih",
-      "only": "Harus sesuai dengan {{ref}}"
+      "only": "Harus sesuai dengan %(ref)s"
     },
     "string": {
       "alphanum": "Harus berupa alfa numerik karakter saja",
@@ -198,14 +198,14 @@
       "hex": "Harus mengandung hexadesimal karakter yang valid saja",
       "hexAlign": "Representasi hex yang terdekode harus byte aligned",
       "hostname": "Harus berupa nama host yang valid",
-      "ip": "Harus berupa alamat ip yang valid dengan CIDR {{cidr}}",
-      "ipVersion": "Harus berupa alamat ip yang valid dengan versi {{version}} dan CIDR {{cidr}}",
+      "ip": "Harus berupa alamat ip yang valid dengan CIDR %(cidr)s",
+      "ipVersion": "Harus berupa alamat ip yang valid dengan versi %(version)s dan CIDR %(cidr)s",
       "isoDate": "Harus dalam format ISO",
       "isoDuration": "Harus berupa durasi ISO 8601 yang valid",
-      "length": "Panjang harus pas {{limit}} karakter",
+      "length": "Panjang harus pas %(limit)s karakter",
       "lowercase": "Hanya boleh mengandung huruf kecil saja",
-      "max": "Panjang karakter harus lebih kecil atau sama dengan {{limit}} karakter",
-      "min": "Panjang karakter harus setidaknya {{limit}} karakter",
+      "max": "Panjang karakter harus lebih kecil atau sama dengan %(limit)s karakter",
+      "min": "Panjang karakter harus setidaknya %(limit)s karakter",
       "token": "Hanya boleh terdiri atas karakter alfanumerik dan garis bawah saja",
       "trim": "Tidak boleh memiliki spasi didepan atau dibelakang",
       "uri": "Harus berupa URI yang valid",
@@ -213,17 +213,17 @@
     },
     "number": {
       "base": "Harus berupa angka",
-      "greater": "Harus lebih besar dari {{limit}}",
+      "greater": "Harus lebih besar dari %(limit)s",
       "infinity": "Tidak bisa tak terbatas",
       "integer": "Harus berupa integer",
-      "less": "Harus lebih kecil dari {{limit}}",
-      "max": "Harus lebih kecil atau sama dengan {{limit}}",
-      "min": "Harus lebih besar atau sama dengan {{limit}}",
-      "multiple": "Harus kelipatan dari {{multiple}}",
+      "less": "Harus lebih kecil dari %(limit)s",
+      "max": "Harus lebih kecil atau sama dengan %(limit)s",
+      "min": "Harus lebih besar atau sama dengan %(limit)s",
+      "multiple": "Harus kelipatan dari %(multiple)s",
       "negative": "Harus berupa angka negatif",
       "port": "Harus berupa nomor port yang valid",
       "positive": "Harus berupa angka positif",
-      "precision": "Harus memiliki tidak lebih dari {{limit}} tempat desimal",
+      "precision": "Harus memiliki tidak lebih dari %(limit)s tempat desimal",
       "unsafe": "Harus berupa nomor yang aman"
     }
   }

package/bajo/method/attachment/copy-uploaded.js

@@ -1,17 +1,19 @@
 import path from 'path'
 
-async function copyUploaded (name, id, { req, setField, setFile, mimeType, stats, silent = true } = {}) {
+async function copyUploaded (name, id, options = {}) {
   const { fs } = this.app.bajo.lib
+  const { omit } = this.app.bajo.lib._
+  const { req, setField, setFile, mimeType, stats, silent = true } = options
   name = this.attachmentPreCheck(name)
   if (!name) {
     if (silent) return
     throw this.error('isMissing%s', this.print.write('field.name'))
   }
-  if (!this.bajoWeb) {
+  if (!this.app.waibu) {
     if (silent) return
-    throw this.error('missingPlugin%s')
+    throw this.error('missingPlugin%s', 'Waibu')
   }
-  const { dir, files } = await this.bajoWeb.getUploadedFiles(req.id, false, true)
+  const { dir, files } = await this.app.waibu.getUploadedFiles(req.id, false, true)
   const result = []
   if (files.length === 0) return result
   for (const f of files) {
@@ -20,6 +22,7 @@ async function copyUploaded (name, id, { req, setField, setFile, mimeType, stats
     field = setField ?? field
     const file = setFile ?? parts.join('@')
     const opts = { source: f, field, file, mimeType, stats, req }
+    console.log(setField, setFile, omit(opts, ['req']))
     const rec = await this.attachmentCreate(name, id, opts)
     delete rec.dir
     result.push(rec)

package/bajo/method/record/create.js

@@ -4,6 +4,7 @@ import checkUnique from '../../../lib/check-unique.js'
 import handleAttachmentUpload from '../../../lib/handle-attachment-upload.js'
 import execValidation from '../../../lib/exec-validation.js'
 import execFeatureHook from '../../../lib/exec-feature-hook.js'
+import singleRelRows from '../../../lib/single-rel-rows.js'
 
 async function create (name, input, opts = {}) {
   const { generateId, runHook, isSet } = this.app.bajo
@@ -49,6 +50,7 @@ async function create (name, input, opts = {}) {
     nbody[k] = v
   })
   record = await handler.call(this.app[driver.ns], { schema, body: nbody, options })
+  if (isSet(options.rels)) await singleRelRows.call(this, { schema, record: record.data, options })
   if (options.req) {
     if (options.req.file) await handleAttachmentUpload.call(this, { name: schema.name, id: body.id, body, options, action: 'create' })
     if (options.req.flash && !options.noFlash) options.req.flash('notify', options.req.t('recordCreated'))

package/bajo/method/record/find-one.js

@@ -32,12 +32,12 @@ async function findOne (name, filter = {}, opts = {}) {
   }
   const record = await handler.call(this.app[driver.ns], { schema, filter, options })
   record.data = record.data[0]
+  if (isSet(options.rels)) await singleRelRows.call(this, { schema, record: record.data, options })
   if (!noHook) {
     await runHook(`${this.name}.${camelCase(name)}:afterRecordFindOne`, filter, options, record)
     await runHook(`${this.name}:afterRecordFindOne`, name, filter, options, record)
   }
   record.data = await this.pickRecord({ record: record.data, fields, schema, hidden, forceNoHidden })
-  if (isSet(options.rels)) await singleRelRows.call(this, { schema, record: record.data, options })
   if (set && !noCache) await set({ model: name, filter, options, record })
   return dataOnly ? record.data : record
 }

package/bajo/method/record/find.js

@@ -30,6 +30,7 @@ async function find (name, filter = {}, opts = {}) {
     }
   }
   const records = await handler.call(this.app[driver.ns], { schema, filter, options })
+  if (isSet(options.rels)) await multiRelRows.call(this, { schema, records: records.data, options })
   if (!noHook) {
     await runHook(`${this.name}.${camelCase(name)}:afterRecordFind`, filter, options, records)
     await runHook(`${this.name}:afterRecordFind`, name, filter, options, records)
@@ -37,7 +38,6 @@ async function find (name, filter = {}, opts = {}) {
   for (const idx in records.data) {
     records.data[idx] = await this.pickRecord({ record: records.data[idx], fields, schema, hidden, forceNoHidden })
   }
-  if (isSet(options.rels)) await multiRelRows.call(this, { schema, records: records.data, options })
   if (set && !noCache) await set({ model: name, filter, options, records })
   return dataOnly ? records.data : records
 }

package/bajo/method/record/get.js

@@ -27,12 +27,12 @@ async function get (name, id, opts = {}) {
     }
   }
   const record = await handler.call(this.app[driver.ns], { schema, id, options })
+  if (isSet(options.rels)) await singleRelRows.call(this, { schema, record: record.data, options })
   if (!noHook) {
     await runHook(`${this.name}.${camelCase(name)}:afterRecordGet`, id, options, record)
     await runHook(`${this.name}:afterRecordGet`, name, id, options, record)
   }
   record.data = await this.pickRecord({ record: record.data, fields, schema, hidden, forceNoHidden })
-  if (isSet(options.rels)) await singleRelRows.call(this, { schema, record: record.data, options })
 
   if (set && !noCache) await set({ model: name, id, options, record })
   return dataOnly ? record.data : record

package/bajo/method/record/update.js

@@ -3,6 +3,7 @@ import checkUnique from '../../../lib/check-unique.js'
 import handleAttachmentUpload from '../../../lib/handle-attachment-upload.js'
 import execValidation from '../../../lib/exec-validation.js'
 import execFeatureHook from '../../../lib/exec-feature-hook.js'
+import singleRelRows from '../../../lib/single-rel-rows.js'
 
 async function update (name, id, input, opts = {}) {
   const { runHook, isSet } = this.app.bajo
@@ -39,6 +40,7 @@ async function update (name, id, input, opts = {}) {
   })
   delete nbody.id
   const record = await handler.call(this.app[driver.ns], { schema, id, body: nbody, options })
+  if (isSet(options.rels)) await singleRelRows.call(this, { schema, record: record.data, options })
   if (options.req) {
     if (options.req.file) await handleAttachmentUpload.call(this, { name: schema.name, id, body, options, action: 'update' })
     if (options.req.flash && !options.noFlash) options.req.flash('notify', options.req.t('recordUpdated'))

package/lib/merge-attachment-info.js

@@ -2,8 +2,8 @@ async function mergeAttachmentInfo (rec, source, { mimeType, stats, fullPath })
   const { importPkg } = this.app.bajo
   const { fs } = this.app.bajo.lib
   const { pick } = this.app.bajo.lib._
-  if (!this.bajoWeb) return
-  const mime = await importPkg('bajoWeb:mime')
+  if (!this.app.waibu) return
+  const mime = await importPkg('waibu:mime')
 
   if (mimeType) rec.mimeType = mime.getType(rec.file)
   if (fullPath) rec.fullPath = source

package/lib/single-rel-rows.js

@@ -10,7 +10,7 @@ async function singleRelRows ({ schema, record, options = {} }) {
         const val = prop.rel[key]
         if (val.fields.length === 0) continue
         const relschema = this.getSchema(val.schema)
-        const relFilter = options.filter
+        const relFilter = options.filter ?? {}
         const query = {}
         query[val.propName] = record[prop.name]
         relFilter.query = query

package/package.json

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

package/waibuMpa/route/attachment/@model/@id/@field/@file.js

@@ -0,0 +1,16 @@
+import path from 'path'
+
+async function attachment (req, reply) {
+  const { importPkg, getPluginDataDir, pascalCase } = this.app.bajo
+  const mime = await importPkg('waibu:mime')
+  const { fs } = this.app.bajo.lib
+  const file = `${getPluginDataDir('dobo')}/attachment/${pascalCase(req.params.model)}/${req.params.id}/${req.params.field}/${req.params.file}`
+  if (!fs.existsSync(file)) throw this.error('_notFound', { noView: true })
+  const mimeType = mime.getType(path.extname(file))
+  reply.header('Content-Type', mimeType)
+  const stream = fs.createReadStream(file)
+  reply.send(stream)
+  return reply
+}
+
+export default attachment