bajo 1.1.11 → 1.1.13

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

@@ -26,7 +26,13 @@ const defConfig = {
       date: { dateStyle: 'medium' },
       time: { timeStyle: 'short' },
       float: { maximumFractionDigits: 2 },
+      double: { maximumFractionDigits: 5 },
+      smallint: {},
       integer: {}
+    },
+    unitSys: {
+      'en-US': 'imperial',
+      id: 'metric'
     }
   },
   exitHandler: true

package/boot/class/bajo-core.js

@@ -21,6 +21,7 @@ import outmatch from 'outmatch'
 import resolvePath from '../lib/resolve-path.js'
 import importModule from '../lib/import-module.js'
 import logLevels from '../lib/log-levels.js'
+import { types as formatTypes, formats } from '../lib/formats.js'
 
 const require = createRequire(import.meta.url)
 
@@ -278,27 +279,56 @@ class BajoCore extends Plugin {
     return { result, pattern }
   }
 
+  getUnitFormat = (options = {}) => {
+    const lang = options.lang ?? this.config.lang
+    let unitSys = options.unitSys ?? this.config.intl.unitSys[lang] ?? 'metric'
+    if (!['imperial', 'nautical', 'metric'].includes(unitSys)) unitSys = 'metric'
+    return { unitSys, format: formats[unitSys] }
+  }
+
+  formatByType = (type, value, dataType, options = {}) => {
+    const { format } = this.getUnitFormat(options)
+    const { withUnit = true } = options
+    const lang = options.lang ?? this.config.lang
+    value = format[`${type}Fn`](value)
+    const unit = format[`${type}Unit`]
+    const sep = format[`${type}UnitSep`] ?? ' '
+    if (!withUnit) return [value, unit, sep]
+    const setting = this.defaultsDeep(options[dataType], this.config.intl.format[dataType])
+    value = new Intl.NumberFormat(lang, setting).format(value)
+    return `${value}${sep}${unit}`
+  }
+
   format = (value, type, options = {}) => {
     const { format } = this.config.intl
     const { emptyValue = format.emptyValue } = options
     const lang = options.lang ?? this.config.lang
+    options.withUnit = options.withUnit ?? true
+    let valueFormatted
     if ([undefined, null, ''].includes(value)) return emptyValue
     if (type === 'auto') {
       if (value instanceof Date) type = 'datetime'
     }
-    if (['integer', 'smallint'].includes(type)) {
-      value = parseInt(value)
+    if (['float', 'double'].includes(type) && this.app.bajoSpatial) {
+      if (options.latitude) return this.app.bajoSpatial.latToDms(value)
+      if (options.longitude) return this.app.bajoSpatial.lngToDms(value)
+    }
+    if (['integer', 'smallint', 'float', 'double'].includes(type)) {
+      value = ['integer', 'smallint'].includes(type) ? parseInt(value) : parseFloat(value)
       if (isNaN(value)) return emptyValue
+      for (const u of formatTypes) {
+        if (options[u]) valueFormatted = this.formatByType(u, value, type, options)
+      }
+    }
+    if (['integer', 'smallint'].includes(type)) {
       const setting = this.defaultsDeep(options.integer, format.integer)
-      return new Intl.NumberFormat(lang, setting).format(value)
+      value = new Intl.NumberFormat(lang, setting).format(Math.round(value))
+      return valueFormatted && options.withUnit ? valueFormatted : value
     }
     if (['float', 'double'].includes(type)) {
-      value = parseFloat(value)
-      if (isNaN(value)) return emptyValue
-      if (this.app.bajoSpatial && options.latitude) return this.app.bajoSpatial.latToDms(value)
-      if (this.app.bajoSpatial && options.longitude) return this.app.bajoSpatial.lngToDms(value)
-      const setting = this.defaultsDeep(options.float, format.float)
-      return new Intl.NumberFormat(lang, setting).format(value)
+      const setting = this.defaultsDeep(options[type], format[type])
+      value = new Intl.NumberFormat(lang, setting).format(value)
+      return valueFormatted && options.withUnit ? valueFormatted : value
     }
     if (['datetime', 'date'].includes(type)) {
       const setting = this.defaultsDeep(options[type], format[type])

package/boot/lib/formats.js

@@ -0,0 +1,37 @@
+export const types = ['speed', 'distance', 'area', 'degree']
+
+export const formats = {
+  metric: {
+    speedFn: (val) => val,
+    speedUnit: 'kmh',
+    distanceFn: (val) => val,
+    distanceUnit: 'km',
+    areaFn: (val) => val,
+    areaUnit: 'km²',
+    degreeFn: (val) => val,
+    degreeUnit: '°',
+    degreeUnitSep: ''
+  },
+  imperial: {
+    speedFn: (val) => val / 1.609,
+    speedUnit: 'mih',
+    distanceFn: (val) => val / 1.609,
+    distanceUnit: 'mi',
+    areaFn: (val) => val / 2.59,
+    areaUnit: 'mi²',
+    degreeFn: (val) => val,
+    degreeUnit: '°',
+    degreeUnitSep: ''
+  },
+  nautical: {
+    speedFn: (val) => val / 1.852,
+    speedUnit: 'nmh',
+    distanceFn: (val) => val / 1.852,
+    distanceUnit: 'nm',
+    areaFn: (val) => val / 2.92,
+    areaUnit: 'nm²',
+    degreeFn: (val) => val,
+    degreeUnit: '°',
+    degreeUnitSep: ''
+  }
+}

package/boot/lib/shim.js

@@ -8,6 +8,15 @@ function shim () {
       return this.replace(new RegExp(str, 'g'), newStr)
     }
   }
+  if (!String.prototype.splice) {
+    String.prototype.splice = function(index, count, add) { // eslint-disable-line
+      if (index < 0) {
+        index += this.length
+        if (index < 0) index = 0
+      }
+      return this.slice(0, index) + (add || '') + this.slice(index + count)
+    }
+  }
 }
 
 export default shim

package/package.json

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