@questwork/q-utilities 0.1.2 → 0.1.3

package/dist/index.min.cjs

@@ -52,13 +52,13 @@ __webpack_require__.d(__webpack_exports__, {
   ApiResponse: () => (/* reexport */ ApiResponse),
   KeyValueObject: () => (/* reexport */ KeyValueObject),
   Metadata: () => (/* reexport */ Metadata),
+  QMeta: () => (/* reexport */ QMeta),
   Repo: () => (/* reexport */ Repo),
   Service: () => (/* reexport */ Service),
   convertString: () => (/* reexport */ convertString),
   formatDate: () => (/* reexport */ formatDate),
   getValidation: () => (/* reexport */ getValidation),
   getValueByKeys: () => (/* reexport */ getValueByKeys),
-  jwtHelper: () => (/* reexport */ jwtHelper),
   makeApiResponse: () => (/* reexport */ makeApiResponse),
   makeService: () => (/* reexport */ makeService),
   padZeros: () => (/* reexport */ padZeros),
@@ -289,284 +289,6 @@ function getValueByKeys(keys, data) {
 ;// ./lib/helpers/getValueByKeys/index.js
 
 
-;// ./lib/helpers/jwtHelper/jwtHelper.js
-// 'use strict'
-
-/* eslint-disable new-cap */
-/* eslint-disable camelcase */
-/* eslint-disable no-mixed-operators */
-/* eslint-disable no-useless-escape */
-/* eslint-disable no-param-reassign */
-
-/* eslint func-names: 0 */
-
-// const Buffer = require('buffer/').Buffer
-
-const EXPIRY = 3600 // in second
-const ALGORITHM = 'HS256'
-const SECRET = 'ab1234cd'
-
-const _hasBuffer = typeof Buffer === 'function'
-
-const jwtHelper = {
-  create(obj, { secret, algorithm, expiry } = {}) {
-    const sAlgorithm = algorithm || ALGORITHM
-    const sSecret = secret || SECRET
-    const exp = expiry || getTimeInSecond() + EXPIRY
-    const payload = {
-      ...obj,
-      exp
-    }
-    return encode(payload, sSecret, sAlgorithm)
-  },
-  createByUser(loginAccount) {
-    const exp = getTimeInSecond() + EXPIRY
-    const payload = {
-      loginAccount,
-      exp
-    }
-    return this.encode(payload)
-  },
-  encode(payload, algorithm) {
-    return encode(payload, SECRET, algorithm)
-  },
-  decode(token, algorithm) {
-    const noVerify = !this.verify(token)
-    return decode(token, SECRET, noVerify, algorithm) // if noVerify = true, may skip verification
-  },
-  getPayload(token) {
-    const payload = getPayload(token)
-    return {
-      payload
-    }
-  },
-  getPayloadIdByKey(token, key) {
-    const payload = getPayload(token)
-    const id = payload[key] ? payload[key].id : null
-    return {
-      id,
-      jwtToken: token
-    }
-  },
-  resolve(token, secret, algorithm) {
-    const sSecret = secret || SECRET
-    return decode(token, sSecret, false, algorithm) // need verification
-  },
-  verify(token) {
-    const payload = getPayload(token)
-    const today = getTimeInSecond()
-    return (payload.exp && (today <= payload.exp)) || false
-  }
-}
-
-/**
- * Private functions
- */
-
-const getPayload = (token) => decode(token, SECRET, true)
-
-const getTimeInSecond = () => Math.floor(Date.now() / 1000)
-
-/**
- * Private functions, based on jwt-simple 0.2.0
- */
-
-const { cryptoHelper } = require('../cryptoHelper')
-
-const algorithmMap = {
-  HS256: 'sha256',
-  HS384: 'sha384',
-  HS512: 'sha512',
-  RS256: 'RSA-SHA256'
-}
-
-const typeMap = {
-  HS256: 'hmac',
-  HS384: 'hmac',
-  HS512: 'hmac',
-  RS256: 'sign'
-}
-
-
-/**
- * Decode jwt
- *
- * @param {Object} token
- * @param {String} key
- * @param {Boolean} noVerify
- * @param {String} algorithm
- * @return {Object} payload
- * @api public
- */
-const decode = function jwt_decode(token, key, noVerify, algorithm) {
-  // check token
-  if (!token) {
-    throw new Error('No token supplied')
-  }
-  // check segments
-  const segments = token.split('.')
-  if (segments.length !== 3) {
-    throw new Error('Not enough or too many segments')
-  }
-
-  // All segment should be base64
-  const headerSeg = segments[0]
-  const payloadSeg = segments[1]
-  const signatureSeg = segments[2]
-
-  // base64 decode and parse JSON
-  const header = JSON.parse(base64urlDecode(headerSeg))
-
-  const payload = JSON.parse(base64urlDecode(payloadSeg))
-
-  if (!noVerify) {
-    const signingMethod = algorithmMap[algorithm || header.alg]
-    const signingType = typeMap[algorithm || header.alg]
-    if (!signingMethod || !signingType) {
-      throw new Error('Algorithm not supported')
-    }
-
-    // verify signature. `sign` will return base64 string.
-    const signingInput = [headerSeg, payloadSeg].join('.')
-    if (!verify(signingInput, key, signingMethod, signingType, signatureSeg)) {
-      throw new Error('Signature verification failed')
-    }
-  }
-
-  return payload
-}
-
-
-/**
- * Encode jwt
- *
- * @param {Object} payload
- * @param {String} key
- * @param {String} algorithm
- * @return {String} token
- * @api public
- */
-const encode = function jwt_encode(payload, key, algorithm) {
-  // Check key
-  if (!key) {
-    throw new Error('Require key')
-  }
-
-  // Check algorithm, default is HS256
-  if (!algorithm) {
-    algorithm = ALGORITHM
-  }
-
-  const signingMethod = algorithmMap[algorithm]
-  const signingType = typeMap[algorithm]
-  if (!signingMethod || !signingType) {
-    throw new Error('Algorithm not supported')
-  }
-
-  // header, typ is fixed value.
-  const header = { typ: 'JWT', alg: algorithm }
-
-  // create segments, all segments should be base64 string
-  const segments = []
-  segments.push(base64urlEncode(JSON.stringify(header)))
-  segments.push(base64urlEncode(JSON.stringify(payload)))
-  segments.push(sign(segments.join('.'), key, signingMethod, signingType))
-
-  return segments.join('.')
-}
-
-
-/**
- * private util functions
- */
-
-function verify(input, key, method, type, signature) {
-  if (type === 'hmac') {
-    return (signature === sign(input, key, method, type))
-  } else if (type === 'sign') {
-    try {
-      return cryptoHelper.createStringVerify({
-        algorithm: method,
-        data: input,
-        object: key,
-        signature: base64urlUnescape(signature),
-        signatureEncoding: 'base64'
-      })
-    } catch (error) {
-      throw new Error('createStringVerify failed')
-    }
-  }
-  throw new Error('Algorithm type not recognized')
-}
-
-function sign(input, key, method, type) {
-  let base64str
-  if (type === 'hmac') {
-    base64str = cryptoHelper.createStringHmac({
-      algorithm: method,
-      key,
-      data: input,
-      outputEncoding: 'base64'
-    })
-  } else if (type === 'sign') {
-    try {
-      base64str = cryptoHelper.createSignature({
-        algorithm: method,
-        data: input,
-        privateKey: key,
-        outputEncoding: 'base64'
-      })
-    } catch (error) {
-      throw new Error('createSignature failed')
-    }
-  } else {
-    throw new Error('Algorithm type not recognized')
-  }
-  return base64urlEscape(base64str)
-}
-
-function _decode(str) {
-  if (_hasBuffer) {
-    return Buffer.from(base64urlUnescape(str), 'base64').toString('utf8')
-  }
-  return atob(base64urlUnescape(str))
-}
-
-function _encode(str) {
-  if (_hasBuffer) {
-    return base64urlEscape(Buffer.from(str, 'utf8').toString('base64'))
-  }
-  return base64urlEscape(btoa(str))
-}
-
-function base64urlDecode(str) {
-  // fixed bug if decode string is incorrect
-  // return (new Buffer.from(base64urlUnescape(str), 'base64')).toString() || '{}'
-  return _decode(str)
-}
-
-function base64urlUnescape(str) {
-  str += new Array(5 - str.length % 4).join('=')
-  return str.replace(/\-/g, '+').replace(/_/g, '/')
-}
-
-function base64urlEncode(str) {
-  // return base64urlEscape(new Buffer.from((str)).toString('base64'))
-  return _encode(str)
-}
-
-function base64urlEscape(str) {
-  return str.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '')
-}
-
-
-
-;// ./lib/helpers/jwtHelper/index.js
-
-
-
-
-
 ;// ./lib/helpers/padZeros/padZeros.js
 function padZeros(num, minLength = 6) {
   num = num.toString()
@@ -603,7 +325,6 @@ function stringFormatter(str) {
 
 
 
-
 ;// ./lib/models/apiResponse/apiResponse.js
 class ApiResponse {
   constructor(options = {}) {
@@ -933,13 +654,86 @@ class Metadata extends KeyValueObject {
 
 
 
+;// ./lib/models/qMeta/qMeta.js
+
+
+const updateAllowedProps = [
+  'attributes',
+  'ref'
+]
+
+class QMeta {
+  constructor(options = {}) {
+    options = options || {}
+    this.attributes = KeyValueObject.initOnlyValidFromArray(options.attributes)
+    this.ref = options.ref || {}
+  }
+
+  static get _classname() {
+    return 'QMeta'
+  }
+  static get _superclass() {
+    return 'QMeta'
+  }
+
+  // Class methods
+  static init(options = {}) {
+    if (options instanceof QMeta) {
+      return options
+    }
+    return new QMeta(options)
+  }
+
+  // instance methods
+  addAttribute(obj) {
+    const kvObject = KeyValueObject.init(obj)
+    if (!kvObject) {
+      throw new Error('invalid meta attribute')
+    }
+    this.attributes.push(kvObject)
+    return this
+  }
+
+  update(obj) {
+    Object.keys(obj).forEach((key) => {
+      if (updateAllowedProps.includes(key)) {
+        if (key === 'attributes') {
+          this[key] = KeyValueObject.initOnlyValidFromArray(obj[key])
+        } else {
+          this[key] = obj[key]
+        }
+      }
+    })
+    return this
+  }
+}
+
+
+
+;// ./lib/models/qMeta/index.js
+
+
+
+
 ;// ./lib/models/repo/repo.js
 class Repo {
   constructor(options) {
+    options = options || {}
     this.model = options.model
-    this.dbTransaction = options.dbTransaction
+    this._sharedOptions = options._sharedOptions // { session: this.dbTransaction }
+    this._queryOptions = options._queryOptions
+    this._saveOptions = options._saveOptions
+    this._Class = options._constructor && options._constructor._Class
+      ? options._constructor._Class
+      : null
+  }
+  static init(options = {}) {
+    if (options instanceof this) {
+      return options
+    }
+    const instance = new this(options)
+    return instance.isValid ? instance : null
   }
-
   static get _classname() {
     return 'Repo'
   }
@@ -947,8 +741,40 @@ class Repo {
     return 'Repo'
   }
 
+  get _classname() {
+    return 'Repo'
+  }
+
+  get _superclass() {
+    return 'Repo'
+  }
+
+  get isValid() {
+    return this.model
+      && (typeof this.model.deleteOne === 'function')
+      && (typeof this.model.findAll === 'function')
+      && (typeof this.model.saveOne === 'function')
+  }
+
+  get queryOptions() {
+    return {
+      ...this._sharedOptions,
+      ...this._queryOptions,
+    }
+  }
+
+  get saveOptions() {
+    return {
+      ...this._sharedOptions,
+      ...this._saveOptions,
+    }
+  }
+
   init(options) {
-    throw new Error('subclass should implement .init(options)')
+    if (this._Class && typeof this._Class.init === 'function') {
+      return this._Class.init(options)
+    }
+    return options
   }
 
   async deleteOne({ id }) {
@@ -965,9 +791,8 @@ class Repo {
   }
 
   findAll({ query }) {
-    const options = {}
     return new Promise((resolve, reject) => {
-      this.model.findAll(query, options, (err, data, total) => {
+      this.model.findAll(query, this.queryOptions, (err, data, total) => {
         if (err) {
           reject(err)
         } else {
@@ -982,9 +807,8 @@ class Repo {
   }
 
   findOne({ query }) {
-    const options = { session: this.dbTransaction }
     return new Promise((resolve, reject) => {
-      this.model.findAll(query, options, (err, data) => {
+      this.model.findAll(query, this.queryOptions, (err, data) => {
         if (err) {
           reject(err)
         } else if (data.length === 1) {
@@ -1003,13 +827,13 @@ class Repo {
   }
 
   saveAll({ docs }) {
-    const self = this
     let isNew
     return Promise.all(docs.map(async (doc) => {
       if (doc) {
-        const result = await self.saveOne({ doc })
+        const result = await this.saveOne({ doc })
         isNew = result.isNew
-        return result.data[0]
+        const _data = result._data || result.data
+        return _data[0]
       }
       return null
     })).then((savedData) => {
@@ -1023,9 +847,8 @@ class Repo {
   }
 
   saveOne({ doc }) {
-    const options = { session: this.dbTransaction }
     return new Promise((resolve, reject) => {
-      this.model.saveOne(doc, options, (err, result) => {
+      this.model.saveOne(doc, this.saveOptions, (err, result) => {
         if (err) {
           reject(err)
         } else {
@@ -1121,9 +944,9 @@ function makeService({ repo }) {
   if (repo === undefined) {
     throw new Error('repo is required.')
   }
-  // if (!(repo instanceof Repo)) {
-  //   throw new Error('repo is not an instance of Repo.')
-  // }
+  if (repo._superclass !== Repo._superclass) {
+    throw new Error('repo is not an instance of Repo.')
+  }
   return new Service({ repo })
 }
 
@@ -1141,6 +964,7 @@ function makeService({ repo }) {
 
 
 
+
 ;// ./lib/index.js
 
 

package/dist/index.min.js

@@ -27,13 +27,13 @@ __webpack_require__.d(__webpack_exports__, {
   sh: () => (/* reexport */ ApiResponse),
   Yc: () => (/* reexport */ KeyValueObject),
   OS: () => (/* reexport */ Metadata),
+  Z8: () => (/* reexport */ QMeta),
   lc: () => (/* reexport */ Repo),
   kl: () => (/* reexport */ Service),
   l0: () => (/* reexport */ convertString),
   Yq: () => (/* reexport */ formatDate),
   G8: () => (/* reexport */ getValidation),
   pY: () => (/* reexport */ getValueByKeys),
-  Q_: () => (/* reexport */ jwtHelper),
   su: () => (/* reexport */ makeApiResponse),
   Q6: () => (/* reexport */ makeService),
   Lv: () => (/* reexport */ padZeros),
@@ -264,284 +264,6 @@ function getValueByKeys(keys, data) {
 ;// ./lib/helpers/getValueByKeys/index.js
 
 
-;// ./lib/helpers/jwtHelper/jwtHelper.js
-// 'use strict'
-
-/* eslint-disable new-cap */
-/* eslint-disable camelcase */
-/* eslint-disable no-mixed-operators */
-/* eslint-disable no-useless-escape */
-/* eslint-disable no-param-reassign */
-
-/* eslint func-names: 0 */
-
-// const Buffer = require('buffer/').Buffer
-
-const EXPIRY = 3600 // in second
-const ALGORITHM = 'HS256'
-const SECRET = 'ab1234cd'
-
-const _hasBuffer = typeof Buffer === 'function'
-
-const jwtHelper = {
-  create(obj, { secret, algorithm, expiry } = {}) {
-    const sAlgorithm = algorithm || ALGORITHM
-    const sSecret = secret || SECRET
-    const exp = expiry || getTimeInSecond() + EXPIRY
-    const payload = {
-      ...obj,
-      exp
-    }
-    return encode(payload, sSecret, sAlgorithm)
-  },
-  createByUser(loginAccount) {
-    const exp = getTimeInSecond() + EXPIRY
-    const payload = {
-      loginAccount,
-      exp
-    }
-    return this.encode(payload)
-  },
-  encode(payload, algorithm) {
-    return encode(payload, SECRET, algorithm)
-  },
-  decode(token, algorithm) {
-    const noVerify = !this.verify(token)
-    return decode(token, SECRET, noVerify, algorithm) // if noVerify = true, may skip verification
-  },
-  getPayload(token) {
-    const payload = getPayload(token)
-    return {
-      payload
-    }
-  },
-  getPayloadIdByKey(token, key) {
-    const payload = getPayload(token)
-    const id = payload[key] ? payload[key].id : null
-    return {
-      id,
-      jwtToken: token
-    }
-  },
-  resolve(token, secret, algorithm) {
-    const sSecret = secret || SECRET
-    return decode(token, sSecret, false, algorithm) // need verification
-  },
-  verify(token) {
-    const payload = getPayload(token)
-    const today = getTimeInSecond()
-    return (payload.exp && (today <= payload.exp)) || false
-  }
-}
-
-/**
- * Private functions
- */
-
-const getPayload = (token) => decode(token, SECRET, true)
-
-const getTimeInSecond = () => Math.floor(Date.now() / 1000)
-
-/**
- * Private functions, based on jwt-simple 0.2.0
- */
-
-const { cryptoHelper } = require('../cryptoHelper')
-
-const algorithmMap = {
-  HS256: 'sha256',
-  HS384: 'sha384',
-  HS512: 'sha512',
-  RS256: 'RSA-SHA256'
-}
-
-const typeMap = {
-  HS256: 'hmac',
-  HS384: 'hmac',
-  HS512: 'hmac',
-  RS256: 'sign'
-}
-
-
-/**
- * Decode jwt
- *
- * @param {Object} token
- * @param {String} key
- * @param {Boolean} noVerify
- * @param {String} algorithm
- * @return {Object} payload
- * @api public
- */
-const decode = function jwt_decode(token, key, noVerify, algorithm) {
-  // check token
-  if (!token) {
-    throw new Error('No token supplied')
-  }
-  // check segments
-  const segments = token.split('.')
-  if (segments.length !== 3) {
-    throw new Error('Not enough or too many segments')
-  }
-
-  // All segment should be base64
-  const headerSeg = segments[0]
-  const payloadSeg = segments[1]
-  const signatureSeg = segments[2]
-
-  // base64 decode and parse JSON
-  const header = JSON.parse(base64urlDecode(headerSeg))
-
-  const payload = JSON.parse(base64urlDecode(payloadSeg))
-
-  if (!noVerify) {
-    const signingMethod = algorithmMap[algorithm || header.alg]
-    const signingType = typeMap[algorithm || header.alg]
-    if (!signingMethod || !signingType) {
-      throw new Error('Algorithm not supported')
-    }
-
-    // verify signature. `sign` will return base64 string.
-    const signingInput = [headerSeg, payloadSeg].join('.')
-    if (!verify(signingInput, key, signingMethod, signingType, signatureSeg)) {
-      throw new Error('Signature verification failed')
-    }
-  }
-
-  return payload
-}
-
-
-/**
- * Encode jwt
- *
- * @param {Object} payload
- * @param {String} key
- * @param {String} algorithm
- * @return {String} token
- * @api public
- */
-const encode = function jwt_encode(payload, key, algorithm) {
-  // Check key
-  if (!key) {
-    throw new Error('Require key')
-  }
-
-  // Check algorithm, default is HS256
-  if (!algorithm) {
-    algorithm = ALGORITHM
-  }
-
-  const signingMethod = algorithmMap[algorithm]
-  const signingType = typeMap[algorithm]
-  if (!signingMethod || !signingType) {
-    throw new Error('Algorithm not supported')
-  }
-
-  // header, typ is fixed value.
-  const header = { typ: 'JWT', alg: algorithm }
-
-  // create segments, all segments should be base64 string
-  const segments = []
-  segments.push(base64urlEncode(JSON.stringify(header)))
-  segments.push(base64urlEncode(JSON.stringify(payload)))
-  segments.push(sign(segments.join('.'), key, signingMethod, signingType))
-
-  return segments.join('.')
-}
-
-
-/**
- * private util functions
- */
-
-function verify(input, key, method, type, signature) {
-  if (type === 'hmac') {
-    return (signature === sign(input, key, method, type))
-  } else if (type === 'sign') {
-    try {
-      return cryptoHelper.createStringVerify({
-        algorithm: method,
-        data: input,
-        object: key,
-        signature: base64urlUnescape(signature),
-        signatureEncoding: 'base64'
-      })
-    } catch (error) {
-      throw new Error('createStringVerify failed')
-    }
-  }
-  throw new Error('Algorithm type not recognized')
-}
-
-function sign(input, key, method, type) {
-  let base64str
-  if (type === 'hmac') {
-    base64str = cryptoHelper.createStringHmac({
-      algorithm: method,
-      key,
-      data: input,
-      outputEncoding: 'base64'
-    })
-  } else if (type === 'sign') {
-    try {
-      base64str = cryptoHelper.createSignature({
-        algorithm: method,
-        data: input,
-        privateKey: key,
-        outputEncoding: 'base64'
-      })
-    } catch (error) {
-      throw new Error('createSignature failed')
-    }
-  } else {
-    throw new Error('Algorithm type not recognized')
-  }
-  return base64urlEscape(base64str)
-}
-
-function _decode(str) {
-  if (_hasBuffer) {
-    return Buffer.from(base64urlUnescape(str), 'base64').toString('utf8')
-  }
-  return atob(base64urlUnescape(str))
-}
-
-function _encode(str) {
-  if (_hasBuffer) {
-    return base64urlEscape(Buffer.from(str, 'utf8').toString('base64'))
-  }
-  return base64urlEscape(btoa(str))
-}
-
-function base64urlDecode(str) {
-  // fixed bug if decode string is incorrect
-  // return (new Buffer.from(base64urlUnescape(str), 'base64')).toString() || '{}'
-  return _decode(str)
-}
-
-function base64urlUnescape(str) {
-  str += new Array(5 - str.length % 4).join('=')
-  return str.replace(/\-/g, '+').replace(/_/g, '/')
-}
-
-function base64urlEncode(str) {
-  // return base64urlEscape(new Buffer.from((str)).toString('base64'))
-  return _encode(str)
-}
-
-function base64urlEscape(str) {
-  return str.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '')
-}
-
-
-
-;// ./lib/helpers/jwtHelper/index.js
-
-
-
-
-
 ;// ./lib/helpers/padZeros/padZeros.js
 function padZeros(num, minLength = 6) {
   num = num.toString()
@@ -578,7 +300,6 @@ function stringFormatter(str) {
 
 
 
-
 ;// ./lib/models/apiResponse/apiResponse.js
 class ApiResponse {
   constructor(options = {}) {
@@ -908,13 +629,86 @@ class Metadata extends KeyValueObject {
 
 
 
+;// ./lib/models/qMeta/qMeta.js
+
+
+const updateAllowedProps = [
+  'attributes',
+  'ref'
+]
+
+class QMeta {
+  constructor(options = {}) {
+    options = options || {}
+    this.attributes = KeyValueObject.initOnlyValidFromArray(options.attributes)
+    this.ref = options.ref || {}
+  }
+
+  static get _classname() {
+    return 'QMeta'
+  }
+  static get _superclass() {
+    return 'QMeta'
+  }
+
+  // Class methods
+  static init(options = {}) {
+    if (options instanceof QMeta) {
+      return options
+    }
+    return new QMeta(options)
+  }
+
+  // instance methods
+  addAttribute(obj) {
+    const kvObject = KeyValueObject.init(obj)
+    if (!kvObject) {
+      throw new Error('invalid meta attribute')
+    }
+    this.attributes.push(kvObject)
+    return this
+  }
+
+  update(obj) {
+    Object.keys(obj).forEach((key) => {
+      if (updateAllowedProps.includes(key)) {
+        if (key === 'attributes') {
+          this[key] = KeyValueObject.initOnlyValidFromArray(obj[key])
+        } else {
+          this[key] = obj[key]
+        }
+      }
+    })
+    return this
+  }
+}
+
+
+
+;// ./lib/models/qMeta/index.js
+
+
+
+
 ;// ./lib/models/repo/repo.js
 class Repo {
   constructor(options) {
+    options = options || {}
     this.model = options.model
-    this.dbTransaction = options.dbTransaction
+    this._sharedOptions = options._sharedOptions // { session: this.dbTransaction }
+    this._queryOptions = options._queryOptions
+    this._saveOptions = options._saveOptions
+    this._Class = options._constructor && options._constructor._Class
+      ? options._constructor._Class
+      : null
+  }
+  static init(options = {}) {
+    if (options instanceof this) {
+      return options
+    }
+    const instance = new this(options)
+    return instance.isValid ? instance : null
   }
-
   static get _classname() {
     return 'Repo'
   }
@@ -922,8 +716,40 @@ class Repo {
     return 'Repo'
   }
 
+  get _classname() {
+    return 'Repo'
+  }
+
+  get _superclass() {
+    return 'Repo'
+  }
+
+  get isValid() {
+    return this.model
+      && (typeof this.model.deleteOne === 'function')
+      && (typeof this.model.findAll === 'function')
+      && (typeof this.model.saveOne === 'function')
+  }
+
+  get queryOptions() {
+    return {
+      ...this._sharedOptions,
+      ...this._queryOptions,
+    }
+  }
+
+  get saveOptions() {
+    return {
+      ...this._sharedOptions,
+      ...this._saveOptions,
+    }
+  }
+
   init(options) {
-    throw new Error('subclass should implement .init(options)')
+    if (this._Class && typeof this._Class.init === 'function') {
+      return this._Class.init(options)
+    }
+    return options
   }
 
   async deleteOne({ id }) {
@@ -940,9 +766,8 @@ class Repo {
   }
 
   findAll({ query }) {
-    const options = {}
     return new Promise((resolve, reject) => {
-      this.model.findAll(query, options, (err, data, total) => {
+      this.model.findAll(query, this.queryOptions, (err, data, total) => {
         if (err) {
           reject(err)
         } else {
@@ -957,9 +782,8 @@ class Repo {
   }
 
   findOne({ query }) {
-    const options = { session: this.dbTransaction }
     return new Promise((resolve, reject) => {
-      this.model.findAll(query, options, (err, data) => {
+      this.model.findAll(query, this.queryOptions, (err, data) => {
         if (err) {
           reject(err)
         } else if (data.length === 1) {
@@ -978,13 +802,13 @@ class Repo {
   }
 
   saveAll({ docs }) {
-    const self = this
     let isNew
     return Promise.all(docs.map(async (doc) => {
       if (doc) {
-        const result = await self.saveOne({ doc })
+        const result = await this.saveOne({ doc })
         isNew = result.isNew
-        return result.data[0]
+        const _data = result._data || result.data
+        return _data[0]
       }
       return null
     })).then((savedData) => {
@@ -998,9 +822,8 @@ class Repo {
   }
 
   saveOne({ doc }) {
-    const options = { session: this.dbTransaction }
     return new Promise((resolve, reject) => {
-      this.model.saveOne(doc, options, (err, result) => {
+      this.model.saveOne(doc, this.saveOptions, (err, result) => {
         if (err) {
           reject(err)
         } else {
@@ -1096,9 +919,9 @@ function makeService({ repo }) {
   if (repo === undefined) {
     throw new Error('repo is required.')
   }
-  // if (!(repo instanceof Repo)) {
-  //   throw new Error('repo is not an instance of Repo.')
-  // }
+  if (repo._superclass !== Repo._superclass) {
+    throw new Error('repo is not an instance of Repo.')
+  }
   return new Service({ repo })
 }
 
@@ -1116,6 +939,7 @@ function makeService({ repo }) {
 
 
 
+
 ;// ./lib/index.js
 
 
@@ -1126,15 +950,15 @@ function makeService({ repo }) {
 var __webpack_exports__ApiResponse = __webpack_exports__.sh;
 var __webpack_exports__KeyValueObject = __webpack_exports__.Yc;
 var __webpack_exports__Metadata = __webpack_exports__.OS;
+var __webpack_exports__QMeta = __webpack_exports__.Z8;
 var __webpack_exports__Repo = __webpack_exports__.lc;
 var __webpack_exports__Service = __webpack_exports__.kl;
 var __webpack_exports__convertString = __webpack_exports__.l0;
 var __webpack_exports__formatDate = __webpack_exports__.Yq;
 var __webpack_exports__getValidation = __webpack_exports__.G8;
 var __webpack_exports__getValueByKeys = __webpack_exports__.pY;
-var __webpack_exports__jwtHelper = __webpack_exports__.Q_;
 var __webpack_exports__makeApiResponse = __webpack_exports__.su;
 var __webpack_exports__makeService = __webpack_exports__.Q6;
 var __webpack_exports__padZeros = __webpack_exports__.Lv;
 var __webpack_exports__stringFormatter = __webpack_exports__.Qy;
-export { __webpack_exports__ApiResponse as ApiResponse, __webpack_exports__KeyValueObject as KeyValueObject, __webpack_exports__Metadata as Metadata, __webpack_exports__Repo as Repo, __webpack_exports__Service as Service, __webpack_exports__convertString as convertString, __webpack_exports__formatDate as formatDate, __webpack_exports__getValidation as getValidation, __webpack_exports__getValueByKeys as getValueByKeys, __webpack_exports__jwtHelper as jwtHelper, __webpack_exports__makeApiResponse as makeApiResponse, __webpack_exports__makeService as makeService, __webpack_exports__padZeros as padZeros, __webpack_exports__stringFormatter as stringFormatter };
+export { __webpack_exports__ApiResponse as ApiResponse, __webpack_exports__KeyValueObject as KeyValueObject, __webpack_exports__Metadata as Metadata, __webpack_exports__QMeta as QMeta, __webpack_exports__Repo as Repo, __webpack_exports__Service as Service, __webpack_exports__convertString as convertString, __webpack_exports__formatDate as formatDate, __webpack_exports__getValidation as getValidation, __webpack_exports__getValueByKeys as getValueByKeys, __webpack_exports__makeApiResponse as makeApiResponse, __webpack_exports__makeService as makeService, __webpack_exports__padZeros as padZeros, __webpack_exports__stringFormatter as stringFormatter };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@questwork/q-utilities",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Questwork QUtilities",
   "main": "dist/index.min.js",
   "type": "module",
@@ -10,6 +10,11 @@
       "default": "./dist/index.min.js"
     }
   },
+  "scripts": {
+    "build": "cross-env NODE_ENV=production minimize=false gulp",
+    "lint": "eslint .",
+    "test:models": "NODE_ENV=test mocha --exit 'lib/models/test.setup.js' 'lib/models/**/*.spec.js'"
+  },
   "author": {
     "name": "Questwork Consulting Limited",
     "email": "info@questwork.com",
@@ -40,10 +45,5 @@
   },
   "engines": {
     "node": ">=10.0.0"
-  },
-  "scripts": {
-    "build": "cross-env NODE_ENV=production minimize=false gulp",
-    "lint": "eslint .",
-    "test:models": "NODE_ENV=test mocha --exit 'lib/models/test.setup.js' 'lib/models/**/*.spec.js'"
   }
-}
+}