dobo 1.0.17 → 1.0.19

package/bajo/intl/en-US.json

@@ -1,10 +1,10 @@
 {
-  "isConnected%s%s": "[%s] '%s' is connected",
-  "errorOn%s%s": "[%s] Error on '%s': %s",
-  "isDestroyed%s%s": "[%s] '%s' is destroyed",
-  "loadedSchemas%s": "[%s] Loaded schemas: %s",
-  "loadSchema%s%s%d": "[%s] Load schema: %s (%d)",
-  "loadedConns%s%s": "[%s] Loaded connections: %s",
+  "isConnected%s%s": "%s' is connected",
+  "errorOn%s%s": "Error on '%s': %s",
+  "isDestroyed%s%s": "'%s' is destroyed",
+  "loadedSchemas%s": "Loaded schemas: %s",
+  "loadSchema%s%s%d": "Load schema: %s (%d)",
+  "loadedConns%s%s": "Loaded connections: %s",
   "unsupportedPropTypeIn%s%s": "Unsupported property type '%s' in '%s'",
   "noSchemaFound": "No schema found!",
   "enterSchemaName": "Enter schema name, separated by space:",
@@ -20,7 +20,7 @@
   "errorCreatingModel%s%s": "Error creating model '%s': %s",
   "modelDropped%s": "Model '%s' successfully dropped",
   "memoryDbSkipped%s%s": "DB '%s' for '%s' is a memory DB, skipped",
-  "modelBuiltOnthefly%s%s%s": "[%s] Model '%s@%s' successfully built on the fly",
+  "modelBuiltOnthefly%s%s%s": "Model '%s@%s' successfully built on the fly",
   "unableToBuildModel%s%s%s": "Unable to re-build model '%s' in '%s': %s",
   "unknownSchema%s": "Unknown schema '%s'",
   "payloadMustBeJson": "Payload must be a valid 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

@@ -1,10 +1,10 @@
 {
-  "isConnected%s%s": "[%s] '%s' telah tersambung",
-  "errorOn%s%s": "[%s] Kesalahan pada '%s': %s",
-  "isDestroyed%s%s": "[%s] '%s' telah dimusnahkan",
-  "loadedSchemas%s": "[%s] Skema termuat: %s",
-  "loadSchema%s%s%d": "[%s] Muat skema: %s (%d)",
-  "loadedConns%s%s": "[%s] Koneksi termuat: %s",
+  "isConnected%s%s": "'%s' telah tersambung",
+  "errorOn%s%s": "Kesalahan pada '%s': %s",
+  "isDestroyed%s%s": "'%s' telah dimusnahkan",
+  "loadedSchemas%s": "Skema termuat: %s",
+  "loadSchema%s%s%d": "Muat skema: %s (%d)",
+  "loadedConns%s%s": "Koneksi termuat: %s",
   "unsupportedPropTypeIn%s%s": "Tipe properti '%s' di '%s' tidak didukung",
   "noSchemaFound": "Tidak ditemukan skema!",
   "enterSchemaName": "Masukkan nama skema, dipisah dengan spasi:",
@@ -19,7 +19,7 @@
   "errorCreatingModel%s%s": "Gagal membuat model '%s': %s",
   "modelDropped%s": "Model '%s' sukses dihapus",
   "memoryDbSkipped%s%s": "Db '%s' untuk '%s' adalah database memori, lewati",
-  "modelBuiltOnthefly%s%s%s": "[%s] Model '%s@%s' sukses dibuat ulang on the fly",
+  "modelBuiltOnthefly%s%s%s": "Model '%s@%s' sukses dibuat ulang on the fly",
   "unableToBuildModel%s%s%s": "Gagal membuat ulang model '%s' di '%s': %s",
   "unknownSchema%s": "Skema '%s' tidak dikenal",
   "payloadMustBeJson": "Data harus berupa obyek JSON yang valid",
@@ -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,20 @@
 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._
+  console.log(omit(options, ['req']))
+  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 +23,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/clear.js

@@ -4,8 +4,9 @@ async function clear (name, opts = {}) {
   const { runHook } = this.app.bajo
   await this.modelExists(name, true)
   const { cloneDeep, camelCase, omit } = this.app.bajo.lib._
-  const options = cloneDeep(omit(opts, ['req']))
+  const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req
+  options.reply = opts.reply
   const { noHook } = options
   const { handler, schema, driver } = await resolveMethod.call(this, name, 'record-clear', options)
   if (!noHook) {

package/bajo/method/record/count.js

@@ -4,8 +4,9 @@ async function count (name, filter = {}, opts = {}) {
   const { runHook } = this.app.bajo
   const { get, set } = this.cache ?? {}
   const { cloneDeep, camelCase, omit } = this.app.bajo.lib._
-  const options = cloneDeep(omit(opts, ['req']))
+  const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req
+  options.reply = opts.reply
   options.dataOnly = options.dataOnly ?? true
   let { dataOnly, noHook, noCache } = options
   options.dataOnly = false

package/bajo/method/record/create.js

@@ -9,8 +9,9 @@ async function create (name, input, opts = {}) {
   const { generateId, runHook, isSet } = this.app.bajo
   const { clearModel } = this.cache ?? {}
   const { find, forOwn, cloneDeep, camelCase, omit, get, pick } = this.app.bajo.lib._
-  const options = cloneDeep(omit(opts, ['req']))
+  const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req
+  options.reply = opts.reply
   options.dataOnly = options.dataOnly ?? true
   input = cloneDeep(input)
   const { fields, dataOnly, noHook, noValidation, noCheckUnique, noFeatureHook, noResult, noSanitize, hidden, forceNoHidden } = options

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

@@ -5,8 +5,9 @@ async function findOne (name, filter = {}, opts = {}) {
   const { runHook, isSet } = this.app.bajo
   const { get, set } = this.cache ?? {}
   const { cloneDeep, camelCase, omit } = this.app.bajo.lib._
-  const options = cloneDeep(omit(opts, ['req']))
+  const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req
+  options.reply = opts.reply
   options.dataOnly = options.dataOnly ?? true
   let { fields, dataOnly, noHook, noCache, hidden, forceNoHidden } = options
   options.count = false

package/bajo/method/record/find.js

@@ -5,8 +5,9 @@ async function find (name, filter = {}, opts = {}) {
   const { runHook, isSet } = this.app.bajo
   const { get, set } = this.cache ?? {}
   const { cloneDeep, camelCase, omit } = this.app.bajo.lib._
-  const options = cloneDeep(omit(opts, ['req']))
+  const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req
+  options.reply = opts.reply
   options.dataOnly = options.dataOnly ?? true
   let { fields, dataOnly, noHook, noCache, hidden, forceNoHidden } = options
   options.count = options.count ?? false

package/bajo/method/record/get.js

@@ -5,8 +5,9 @@ async function get (name, id, opts = {}) {
   const { runHook, isSet } = this.app.bajo
   const { get, set } = this.cache ?? {}
   const { cloneDeep, camelCase, omit } = this.app.bajo.lib._
-  const options = cloneDeep(omit(opts, ['req']))
+  const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req
+  options.reply = opts.reply
   options.dataOnly = options.dataOnly ?? true
   let { fields, dataOnly, noHook, noCache, hidden = [], forceNoHidden } = options
   await this.modelExists(name, true)

package/bajo/method/record/remove.js

@@ -5,8 +5,9 @@ async function remove (name, id, opts = {}) {
   const { runHook } = this.app.bajo
   const { clearModel } = this.cache ?? {}
   const { cloneDeep, camelCase, omit } = this.app.bajo.lib._
-  const options = cloneDeep(omit(opts, ['req']))
+  const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req
+  options.reply = opts.reply
   options.dataOnly = options.dataOnly ?? true
   const { fields, dataOnly, noHook, noResult, hidden, forceNoHidden } = options
   options.dataOnly = false

package/bajo/method/record/update.js

@@ -8,8 +8,9 @@ async function update (name, id, input, opts = {}) {
   const { runHook, isSet } = this.app.bajo
   const { clearModel } = this.cache ?? {}
   const { forOwn, find, cloneDeep, camelCase, omit, get } = this.app.bajo.lib._
-  const options = cloneDeep(omit(opts, ['req']))
+  const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req
+  options.reply = opts.reply
   options.dataOnly = options.dataOnly ?? true
   input = cloneDeep(input)
   const { fields, dataOnly, noHook, noValidation, noCheckUnique, noFeatureHook, noResult, noSanitize, partial = true, hidden, forceNoHidden } = options

package/bajo/method/record/upsert.js

@@ -2,8 +2,9 @@ async function upsert (name, input, opts = {}) {
   const { generateId } = this.app.bajo
   const { find } = this.app.bajo.lib._
   const { cloneDeep, omit } = this.app.bajo.lib._
-  const options = cloneDeep(omit(opts, ['req']))
+  const options = cloneDeep(omit(opts, ['req', 'reply']))
   options.req = opts.req
+  options.reply = opts.reply
   options.dataOnly = options.dataOnly ?? true
   await this.modelExists(name, true)
   const { schema } = this.getInfo(name)

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "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')
+  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