@modernpoacher/halacious 6.2.6 → 6.2.8

package/README.md

@@ -42,7 +42,7 @@ yarn add @modernpoacher/halacious --dev
 Register the plugin with the app server
 ```javascript
 const hapi = require('@hapi/hapi');
-const halacious = require('@modernpoacher/halacious');
+const halacious = require('#halacious');
 
 const server = hapi.server({ port: 8080 });
 
@@ -376,7 +376,7 @@ happily let you be lazy but its much better if we do things the Right Way.
 Halacious exposes its api to your Hapi server so that you may configure it at runtime like so:
  ```javascript
 const hapi = require('@hapi/hapi');
-const halacious = require('@modernpoacher/halacious');
+const halacious = require('#halacious');
 
 async function init () {
     await server.register(halacious);
@@ -441,7 +441,7 @@ company's namespace. We can suck all these into the system in one fell swoop:
 
 ```javascript
 const hapi = require('@hapi/hapi');
-const halacious = require('@modernpoacher/halacious');
+const halacious = require('#halacious');
 
 async function init () {
     const server = hapi.server({ port: 8080 });
@@ -472,7 +472,7 @@ configuration option. For example:
 
 ```javascript
 const hapi = require('@hapi/hapi');
-const halacious = require('@modernpoacher/halacious');
+const halacious = require('#halacious');
 
 async function init () {
     const server = hapi.server({ port: 8080 });

package/examples/api-root.js

@@ -1,10 +1,8 @@
-require('module-alias/register')
-
 const hapi = require('@hapi/hapi')
 const vision = require('@hapi/vision')
-const halacious = require('halacious')
+const halacious = require('#halacious')
 
-const { name: PLUGIN } = require('halacious/package.json')
+const { name: PLUGIN } = require('#halacious/package.json')
 
 async function init () {
   const server = hapi.server({ port: 8080 })

package/examples/array-of-links.js

@@ -1,8 +1,6 @@
-require('module-alias/register')
-
 const hapi = require('@hapi/hapi')
 const vision = require('@hapi/vision')
-const halacious = require('halacious')
+const halacious = require('#halacious')
 
 async function init () {
   const server = hapi.server({ port: 8080 })

package/examples/auto-namespace.js

@@ -1,12 +1,10 @@
-require('module-alias/register')
-
 const path = require('path')
 
 const hapi = require('@hapi/hapi')
 const vision = require('@hapi/vision')
-const halacious = require('halacious')
+const halacious = require('#halacious')
 
-const { name: PLUGIN } = require('halacious/package.json')
+const { name: PLUGIN } = require('#halacious/package.json')
 
 async function init () {
   const server = hapi.server({ port: 8080 })

package/examples/functional-href.js

@@ -1,8 +1,6 @@
-require('module-alias/register')
-
 const hapi = require('@hapi/hapi')
 const vision = require('@hapi/vision')
-const halacious = require('halacious')
+const halacious = require('#halacious')
 
 async function init () {
   const server = hapi.server({ port: 8080 })

package/examples/hello-world.js

@@ -1,8 +1,6 @@
-require('module-alias/register')
-
 const hapi = require('@hapi/hapi')
 const vision = require('@hapi/vision')
-const halacious = require('halacious')
+const halacious = require('#halacious')
 
 async function init () {
   const server = hapi.server({ port: 8080 })

package/examples/manual-namespace.js

@@ -1,10 +1,8 @@
-require('module-alias/register')
-
 const hapi = require('@hapi/hapi')
 const vision = require('@hapi/vision')
-const halacious = require('halacious')
+const halacious = require('#halacious')
 
-const { name: PLUGIN } = require('halacious/package')
+const { name: PLUGIN } = require('#halacious/package')
 
 async function init () {
   const server = hapi.server({ port: 8080 })

package/examples/media-types.js

@@ -1,8 +1,6 @@
-require('module-alias/register')
-
 const hapi = require('@hapi/hapi')
 const vision = require('@hapi/vision')
-const halacious = require('halacious')
+const halacious = require('#halacious')
 
 async function init () {
   const server = hapi.server({ port: 8080 })

package/examples/paging.js

@@ -1,12 +1,10 @@
-require('module-alias/register')
-
 const hapi = require('@hapi/hapi')
 const vision = require('@hapi/vision')
 const hoek = require('@hapi/hoek')
 const Uri = require('urijs')
-const halacious = require('halacious')
+const halacious = require('#halacious')
 
-const { name: PLUGIN } = require('halacious/package')
+const { name: PLUGIN } = require('#halacious/package')
 
 const users = []
 

package/examples/programmatic-entity.js

@@ -1,8 +1,6 @@
-require('module-alias/register')
-
 const hapi = require('@hapi/hapi')
 const vision = require('@hapi/vision')
-const halacious = require('halacious')
+const halacious = require('#halacious')
 
 function User (id, firstName, lastName, googlePlusId) {
   this.id = id

package/examples/programmatic-route.js

@@ -1,8 +1,6 @@
-require('module-alias/register')
-
 const hapi = require('@hapi/hapi')
 const vision = require('@hapi/vision')
-const halacious = require('halacious')
+const halacious = require('#halacious')
 
 async function init () {
   const server = hapi.server({ port: 8080 })

package/examples/query-string.js

@@ -1,12 +1,10 @@
-require('module-alias/register')
-
 const path = require('path')
 
 const hapi = require('@hapi/hapi')
 const vision = require('@hapi/vision')
-const halacious = require('halacious')
+const halacious = require('#halacious')
 
-const { name: PLUGIN } = require('halacious/package')
+const { name: PLUGIN } = require('#halacious/package')
 
 async function init () {
   const server = hapi.server({ port: 8080 })

package/examples/simple-embed.js

@@ -1,8 +1,6 @@
-require('module-alias/register')
-
 const hapi = require('@hapi/hapi')
 const vision = require('@hapi/vision')
-const halacious = require('halacious')
+const halacious = require('#halacious')
 
 async function init () {
   const server = hapi.server({ port: 8080 })

package/examples/simple-link.js

@@ -1,8 +1,6 @@
-require('module-alias/register')
-
 const hapi = require('@hapi/hapi')
 const vision = require('@hapi/vision')
-const halacious = require('halacious')
+const halacious = require('#halacious')
 
 async function init () {
   const server = hapi.server({ port: 8080 })

package/index.d.ts

@@ -1,3 +1,7 @@
 declare module '@modernpoacher/halacious' {
-  export const plugin: object
+  const plugin: object
+
+  export {
+    plugin
+  }
 }

package/lib/plugin.js

@@ -10,6 +10,12 @@ const async = require('async')
 const {
   marked
 } = require('marked')
+const {
+  mangle
+} = require('marked-mangle')
+const {
+  gfmHeadingId
+} = require('marked-gfm-heading-id')
 const urlTemplate = require('url-template')
 const Negotiator = require('negotiator')
 const URITemplate = require('urijs/src/URITemplate')
@@ -98,7 +104,8 @@ exports.plugin = {
       settings = validated
     })
 
-    marked.setOptions(settings.marked)
+    marked.use(gfmHeadingId(settings.marked))
+    marked.use(mangle(settings.marked))
 
     const selection = settings.apiServerLabel
       ? server.select(settings.apiServerLabel)

package/lib/representation.js

@@ -2,8 +2,8 @@
 const _ = require('lodash')
 const hoek = require('@hapi/hoek')
 
-const templatedRE = new RegExp('{*}')
 const URI = require('urijs')
+const templatedRE = /{*}/
 
 /**
  * A HAL wrapper interface around an entity. Provides an api for adding new links and recursively embedding child

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernpoacher/halacious",
-  "version": "6.2.6",
+  "version": "6.2.8",
   "description": "A HAL processor for Hapi",
   "keywords": [
     "HAL",
@@ -30,15 +30,20 @@
     "lint": "eslint .",
     "lint:fix": "npm run lint -- --fix",
     "test": "cross-env NODE_ENV=test mocha test",
-    "pre-commit": "npm run lint && npm test"
+    "prepare": "husky install"
   },
   "dependencies": {
     "@hapi/boom": "9.1.0",
     "@hapi/hoek": "9.0.4",
     "@hapi/joi": "15.1.1",
+    "@typescript-eslint/eslint-plugin": "^5.59.7",
+    "@typescript-eslint/parser": "^5.59.7",
     "async": "^3.2.4",
+    "eslint-config-standard-with-typescript": "^34.0.1",
     "lodash": "^4.17.21",
     "marked": "^5.0.3",
+    "marked-gfm-heading-id": "^3.0.3",
+    "marked-mangle": "^1.0.1",
     "negotiator": "^0.6.3",
     "pug": "^3.0.2",
     "urijs": "^1.19.11",
@@ -49,7 +54,6 @@
     "@babel/eslint-parser": "^7.21.8",
     "@hapi/hapi": "18.4.1",
     "@hapi/vision": "6.0.1",
-    "babel-loader": "^9.1.2",
     "chai": "^4.3.7",
     "chai-string": "^1.5.0",
     "cross-env": "^7.0.3",
@@ -61,11 +65,16 @@
     "eslint-plugin-promise": "^6.1.1",
     "husky": "^8.0.3",
     "mocha": "^10.2.0",
-    "module-alias": "^2.2.2",
     "sinon": "^15.1.0",
     "sinon-chai": "^3.7.0"
   },
-  "_moduleAliases": {
-    "halacious": "."
+  "imports": {
+    "#halacious/package.json": "./package.json",
+    "#halacious/lib/*": "./lib/*.js",
+    "#halacious": "./lib/index.js"
+  },
+  "exports": {
+    "./lib": "./lib/*.js",
+    ".": "./lib/index.js"
   }
 }

package/test/plugin.spec.js

@@ -1,5 +1,3 @@
-require('module-alias/register')
-
 const path = require('path')
 
 const chai = require('chai')
@@ -10,15 +8,15 @@ 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 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')
+const { name: PLUGIN } = require('#halacious/package.json')
 
 describe('Halacious Plugin', () => {
   let server

package/test/representation.spec.js

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

package/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "module": "NodeNext",
+    "target": "ESNext",
+    "moduleResolution": "NodeNext",
+    "noEmit": true,
+    "strict": true,
+    "isolatedModules": true,
+    "baseUrl": "."
+  }
+}

package/types/index.d.ts

@@ -1,4 +1,12 @@
 declare namespace halacious {
+  export interface Collection {
+    uid: string
+  }
+
+  export interface Member {
+    uid: string
+  }
+
   export interface Representation {
     request: {
       route: {
@@ -11,8 +19,8 @@ declare namespace halacious {
       }
     }
     entity: {
-      collections?: Array<{ uid: string }>
-      members?: Array<{ uid: string }>
+      collections?: Collection[]
+      members?: Member[]
     }
     ignore: (v: string) => void
     embed: (v: string, u: string, m: object) => void

package/views/rel.jade

@@ -4,4 +4,4 @@ head
 body
     h1=rel.name
     =rel.description
-    !=relData
+    !=relData