@modernpoacher/halacious 7.0.4 → 7.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernpoacher/halacious",
-  "version": "7.0.4",
+  "version": "7.0.6",
   "description": "A HAL processor for Hapi",
   "keywords": [
     "HAL",
@@ -59,14 +59,14 @@
     "@hapi/vision": "^7.0.3",
     "@modernpoacher/hooks": "^1.0.457",
     "@sequencemedia/sinon-chai": "^0.0.6",
-    "@typescript-eslint/eslint-plugin": "^6.19.0",
-    "@typescript-eslint/parser": "^6.19.0",
+    "@typescript-eslint/eslint-plugin": "^6.19.1",
+    "@typescript-eslint/parser": "^6.19.1",
     "chai": "^5.0.0",
     "cross-env": "^7.0.3",
     "eslint": "^8.56.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-config-standard-with-typescript": "^43.0.1",
-    "husky": "^8.0.3",
+    "husky": "^9.0.1",
     "mocha": "^10.2.0",
     "sinon": "^17.0.1"
   },

package/src/plugin.mjs

@@ -26,7 +26,7 @@ import URITemplate from 'urijs/src/URITemplate.js'
 import PKG from '#package' assert { type: 'json' }
 import IAM from '#where-am-i'
 
-import RepresentationFactory from './representation.mjs'
+import RepresentationFactory from './representationFactory.mjs'
 
 import {
   getRepresentationEntity,

package/src/representation.mjs

@@ -14,13 +14,13 @@ const TEMPLATE = /{*}/
  * entities.
  *
  * @param factory
- * @param self
  * @param entity
+ * @param self
  * @param root
  * @constructor
  */
 export class Representation {
-  constructor (factory, self, entity, root = this) {
+  constructor (factory, entity, link, root = this) {
     const {
       _halacious: halacious,
       _request: request
@@ -28,15 +28,15 @@ export class Representation {
 
     const {
       href
-    } = self
+    } = link
 
     const links = {
-      self
+      self: link
     }
 
     this.factory = factory
-    this.self = href
     this.entity = entity
+    this.self = href
     this._root = root
     this._halacious = halacious
     this._request = request
@@ -179,7 +179,7 @@ export class Representation {
    * @return {{}}
    */
   toJSON () {
-    // initialize the json entity
+    // initialize the entity
     const object = { _links: this.getLinks() }
 
     // copy all target properties in the entity using JSON.stringify(). if the entity has a .toJSON() implementation,
@@ -191,18 +191,11 @@ export class Representation {
     const ignore = this.getIgnore()
 
     JSON.stringify(entity, (key, value) => {
-      if (!key) {
-        return value
-      }
+      if (!key) return value
 
       if (!ignore.has(key)) Reflect.set(object, key, value)
     })
 
-    const props = this.getProps()
-
-    // merge in any extra properties
-    Object.assign(object, Object.fromEntries(Array.from(props.entries()).filter(([key]) => !ignore.has(key))))
-
     const embedded = this.getEmbedded()
 
     const entries = Object.entries(embedded)
@@ -221,9 +214,7 @@ export class Representation {
             }
 
             JSON.stringify(entryValue, (key, value) => {
-              if (!key) {
-                return value
-              }
+              if (!key) return value
 
               if (!ignore.has(key)) Reflect.set(currentValue, key, value)
             })
@@ -235,7 +226,12 @@ export class Representation {
       )
     }
 
-    return object
+    const props = this.getProps()
+
+    // merge in any extra properties
+    return (
+      Object.assign(object, Object.fromEntries(Array.from(props.entries()).filter(([key]) => !ignore.has(key))))
+    )
   }
 
   /**
@@ -386,60 +382,4 @@ export class Representation {
   }
 }
 
-/**
- * Responsible for creating all hal entities, top level or embedded, needed for a Hapi request
- *
- * @param halacious a reference to the plugin api
- * @param request a hapi request object
- * @constructor
- */
-export class RepresentationFactory {
-  constructor (halacious, request) {
-    this._halacious = halacious
-    this._request = request
-  }
-
-  getHalacious () {
-    return this._halacious
-  }
-
-  getRequest () {
-    return this._request
-  }
-
-  getRequestPath () {
-    return this.getRequest()?.path
-  }
-
-  get halacious () {
-    return this._halacious
-  }
-
-  get request () {
-    return this._request
-  }
-
-  get requestPath () {
-    return this.request?.path
-  }
-
-  /**
-   * Creates a new hal representation out of a javascript object
-   * @param {{}=} entity the entity to wrap with a representation. an empty object is created by default
-   * @param {String || {}=} self the self href or link object. The request's path is used by default
-   * @param {Representation} root a pointer to the top level representation for adding curied links
-   * should be expanded into absolute urls
-   * @return {Representation}
-   */
-  create (entity = {}, self = this.getRequestPath(), root) {
-    const halacious = this.getHalacious()
-
-    const link = halacious.link(self)
-
-    return (
-      new Representation(this, link, entity, root)
-    )
-  }
-}
-
-export default RepresentationFactory
+export default Representation

package/src/representationFactory.mjs

@@ -0,0 +1,60 @@
+import Representation from './representation.mjs'
+
+/**
+ * Responsible for creating all hal entities, top level or embedded, needed for a Hapi request
+ *
+ * @param halacious a reference to the plugin api
+ * @param request a hapi request object
+ * @constructor
+ */
+export class RepresentationFactory {
+  constructor (halacious, request) {
+    this._halacious = halacious
+    this._request = request
+  }
+
+  getHalacious () {
+    return this._halacious
+  }
+
+  getRequest () {
+    return this._request
+  }
+
+  getRequestPath () {
+    console.log(this.getRequest()?.path)
+    return this.getRequest()?.path
+  }
+
+  get halacious () {
+    return this._halacious
+  }
+
+  get request () {
+    return this._request
+  }
+
+  get requestPath () {
+    return this.request?.path
+  }
+
+  /**
+   * Creates a new hal representation out of a javascript object
+   * @param {{}=} entity the entity to wrap with a representation. an empty object is created by default
+   * @param {String || {}=} self the self href or link object. The request's path is used by default
+   * @param {Representation} root a pointer to the top level representation for adding curied links
+   * should be expanded into absolute urls
+   * @return {Representation}
+   */
+  create (entity = {}, self = this.getRequestPath(), root) {
+    const halacious = this.getHalacious()
+
+    const link = halacious.link(self)
+
+    return (
+      new Representation(this, entity, link, root)
+    )
+  }
+}
+
+export default RepresentationFactory

package/babel.config.cjs

@@ -1,44 +0,0 @@
-const debug = require('debug')
-
-const log = debug('@modernpoacher/halacious')
-
-const {
-  env: {
-    NODE_ENV = 'development'
-  }
-} = process
-
-log('`@modernpoacher/halacious` is awake')
-
-function env () {
-  log({ NODE_ENV })
-
-  return (
-    NODE_ENV === 'production'
-  )
-}
-
-const presets = [
-  [
-    '@babel/env', {
-      targets: {
-        node: 'current'
-      },
-      useBuiltIns: 'usage',
-      corejs: 3
-    }
-  ]
-]
-
-const plugins = [
-  '@babel/syntax-import-assertions'
-]
-
-module.exports = (api) => {
-  if (api) api.cache.using(env)
-
-  return {
-    presets,
-    plugins
-  }
-}