@modernpoacher/halacious 6.2.9 → 6.3.0

package/examples/{api-root.js → api-root.cjs}

@@ -2,7 +2,7 @@ const hapi = require('@hapi/hapi')
 const vision = require('@hapi/vision')
 const halacious = require('#halacious')
 
-const { name: PLUGIN } = require('#halacious/package.json')
+const PLUGIN = '@modernpoacher/halacious'
 
 async function init () {
   const server = hapi.server({ port: 8080 })

package/examples/{auto-namespace.js → auto-namespace.cjs}

@@ -4,7 +4,7 @@ const hapi = require('@hapi/hapi')
 const vision = require('@hapi/vision')
 const halacious = require('#halacious')
 
-const { name: PLUGIN } = require('#halacious/package.json')
+const PLUGIN = '@modernpoacher/halacious'
 
 async function init () {
   const server = hapi.server({ port: 8080 })

package/index.mjs

@@ -0,0 +1 @@
+export * as default from './src/index.mjs'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernpoacher/halacious",
-  "version": "6.2.9",
+  "version": "6.3.0",
   "description": "A HAL processor for Hapi",
   "keywords": [
     "HAL",
@@ -8,7 +8,8 @@
     "hypermedia",
     "HATEOAS"
   ],
-  "main": "./index.js",
+  "type": "module",
+  "main": "./src/index.mjs",
   "author": "Jonathan Perry <modernpoacher@modernpoacher.com> (Modern Poacher Limited)",
   "contributors": [
     "Brad Leupen"
@@ -26,7 +27,7 @@
     "url": "https://github.com/modernpoacher/halacious/issues"
   },
   "scripts": {
-    "lint": "eslint .",
+    "lint": "eslint . --ext .mjs --ext .cjs --ext .mts --ext .cts",
     "lint:fix": "npm run lint -- --fix",
     "test": "cross-env NODE_ENV=test mocha test",
     "prepare": "husky install"
@@ -68,12 +69,11 @@
     "sinon-chai": "^3.7.0"
   },
   "imports": {
-    "#halacious/package.json": "./package.json",
-    "#halacious/lib/*": "./lib/*.js",
-    "#halacious": "./lib/index.js"
+    "#halacious/*": "./src/*.mjs",
+    "#halacious": "./src/index.mjs",
+    "#where-am-i": "./where-am-i.mjs"
   },
   "exports": {
-    "./lib": "./lib/*.js",
-    ".": "./lib/index.js"
+    ".": "./src/index.mjs"
   }
 }

package/{lib/index.d.ts → src/index.d.mts}

@@ -1,4 +1,4 @@
-declare namespace halacious {
+declare namespace HalaciousTypes {
   export interface Collection {
     uid: string
   }
@@ -27,4 +27,4 @@ declare namespace halacious {
   }
 }
 
-export = halacious
+export default HalaciousTypes

package/src/index.mjs

@@ -0,0 +1,2 @@
+
+export * as default from './plugin.mjs'

package/{lib/plugin.js → src/plugin.mjs}

@@ -1,34 +1,34 @@
-const joi = require('@hapi/joi')
-const boom = require('@hapi/boom')
-const hoek = require('@hapi/hoek')
-const _ = require('lodash')
-const fs = require('fs')
-const path = require('path')
-const pug = require('pug')
-const util = require('util')
-const async = require('async')
-const {
+import joi from '@hapi/joi'
+import boom from '@hapi/boom'
+import hoek from '@hapi/hoek'
+import _ from 'lodash'
+import fs from 'node:fs'
+import path from 'node:path'
+import pug from 'pug'
+import util from 'util'
+import async from 'async'
+import {
   marked
-} = require('marked')
-const {
+} from 'marked'
+import {
   mangle
-} = require('marked-mangle')
-const {
+} from 'marked-mangle'
+import {
   gfmHeadingId
-} = require('marked-gfm-heading-id')
-const urlTemplate = require('url-template')
-const Negotiator = require('negotiator')
-const URITemplate = require('urijs/src/URITemplate')
-const url = require('url')
-const URI = require('urijs')
-
-const {
-  RepresentationFactory
-} = require('./representation')
+} from 'marked-gfm-heading-id'
+import urlTemplate from 'url-template'
+import Negotiator from 'negotiator'
+import URITemplate from 'urijs/src/URITemplate.js'
+import url from 'url'
+import URI from 'urijs'
+import IAM from '#where-am-i'
+import RepresentationFactory from './representation.mjs'
 
 const HAL_MIME_TYPE = 'application/hal+json'
 
-const re = /{([^{}]+)}|([^{}]+)/g
+const REG = /{([^{}]+)}|([^{}]+)/g
+
+const PKG = JSON.parse(fs.readFileSync(path.join(IAM, './package.json')))
 
 function reach (object, path) {
   const parts = path ? path.split('.') : []
@@ -51,7 +51,7 @@ function flattenContext (template, ctx) {
   let arr
   const result = {}
 
-  while ((arr = re.exec(template)) !== null) {
+  while ((arr = REG.exec(template)) !== null) {
     if (arr[1]) {
       const value = reach(ctx, arr[1])
       result[arr[1]] = value && value.toString()
@@ -92,8 +92,8 @@ const optionsSchema = {
  * @param opts
  * @param next
  */
-exports.plugin = {
-  pkg: require('../package'),
+const plugin = {
+  pkg: PKG,
 
   async register (server, opts) {
     let settings = opts
@@ -964,7 +964,7 @@ exports.plugin = {
           engines: {
             jade: pug
           },
-          path: path.join(__dirname, '../views'),
+          path: path.join(IAM, './views'),
           isCached: false
         })
         server.route({
@@ -983,3 +983,7 @@ exports.plugin = {
     server.ext('onPreStart', internals.preStart)
   }
 }
+
+export {
+  plugin
+}

package/{lib/representation.js → src/representation.mjs}

@@ -1,8 +1,8 @@
 
-const _ = require('lodash')
-const hoek = require('@hapi/hoek')
+import _ from 'lodash'
+import hoek from '@hapi/hoek'
+import URI from 'urijs'
 
-const URI = require('urijs')
 const templatedRE = /{*}/
 
 /**
@@ -15,7 +15,7 @@ const templatedRE = /{*}/
  * @param root
  * @constructor
  */
-class Representation {
+export class Representation {
   constructor (factory, self, entity, root) {
     this._halacious = factory._halacious
     this.factory = factory
@@ -247,7 +247,7 @@ class Representation {
  * @param request a hapi request object
  * @constructor
  */
-class RepresentationFactory {
+export class RepresentationFactory {
   constructor (halacious, request) {
     this._halacious = halacious
     this._request = request
@@ -269,4 +269,4 @@ class RepresentationFactory {
   }
 }
 
-module.exports.RepresentationFactory = RepresentationFactory
+export default RepresentationFactory

package/test/{plugin.spec.js → plugin.spec.mjs}

@@ -1,22 +1,24 @@
-const path = require('path')
+import path from 'path'
 
-const chai = require('chai')
+import chai from 'chai'
+
+import hapi from '@hapi/hapi'
+import vision from '@hapi/vision'
+import sinon from 'sinon'
+import sinonChai from 'sinon-chai'
+import chaiString from 'chai-string'
+import halacious from '#halacious'
+import { plugin } from '#halacious/plugin'
+import _ from 'lodash'
+import url from 'url'
+import IAM from '#where-am-i'
 
 const should = chai.should()
-const hapi = require('@hapi/hapi')
-const vision = require('@hapi/vision')
-const sinon = require('sinon')
-const sinonChai = require('sinon-chai')
-const chaiString = require('chai-string')
-const halacious = require('#halacious')
-const { plugin } = require('#halacious/lib/plugin')
-const _ = require('lodash')
-const url = require('url')
 
 chai.use(sinonChai)
 chai.use(chaiString)
 
-const { name: PLUGIN } = require('#halacious/package.json')
+const PLUGIN = '@modernpoacher/halacious'
 
 describe('Halacious Plugin', () => {
   let server
@@ -346,7 +348,7 @@ describe('Halacious Plugin', () => {
         } = server
 
         namespaces.add({
-          dir: path.resolve(__dirname, 'rels/mycompany'),
+          dir: path.join(IAM, './test/rels/mycompany'),
           prefix: 'mco'
         })
       })
@@ -373,7 +375,7 @@ describe('Halacious Plugin', () => {
         } = server
 
         const namespace = plugin.namespaces.add({
-          dir: path.resolve(__dirname, 'rels/mycompany'),
+          dir: path.join(IAM, './test/rels/mycompany'),
           prefix: 'mco'
         })
 
@@ -402,7 +404,7 @@ describe('Halacious Plugin', () => {
         } = server
 
         plugin.namespaces.add({
-          dir: path.resolve(__dirname, 'rels/mycompany'),
+          dir: path.join(IAM, './test/rels/mycompany'),
           prefix: 'mco'
         })
       })

package/test/{representation.spec.js → representation.spec.mjs}

@@ -1,12 +1,11 @@
-const chai = require('chai')
+import chai from 'chai'
+import hapi from '@hapi/hapi'
+import halacious from '#halacious'
+import RepresentationFactory from '#halacious/representation'
 
 const should = chai.should()
-const hapi = require('@hapi/hapi')
-const halacious = require('#halacious')
 
-const { RepresentationFactory } = require('#halacious/lib/representation')
-
-const { name: PLUGIN } = require('#halacious/package.json')
+const PLUGIN = '@modernpoacher/halacious'
 
 describe('Representation Factory', () => {
   let server

package/where-am-i.mjs

@@ -0,0 +1,9 @@
+import {
+  fileURLToPath
+} from 'node:url'
+
+import {
+  dirname
+} from 'node:path'
+
+export default dirname(fileURLToPath(import.meta.url))

package/index.js

@@ -1,3 +0,0 @@
-//
-
-module.exports = require('./lib')

package/lib/index.js

@@ -1,2 +0,0 @@
-
-module.exports = require('./plugin')