express-hbs 2.5.0 → 2.5.1

package/.claude/worktrees/node-20-26-migration-7de0c3/test/localTemplateOptions.js

@@ -0,0 +1,125 @@
+'use strict';
+var assert = require('assert');
+var path = require('path');
+var hbs = require('..');
+var H = require('./helpers');
+
+describe('local template options', function () {
+  var dirname = path.join(__dirname, 'localTemplateOptions');
+
+  describe('express3', function () {
+    it('merges res.locals._templateOptions with the self._templateOptions', function (done) {
+      var instance = hbs.create();
+      var render = instance.express3({
+        restrictLayoutsTo: dirname,
+      });
+      instance.updateTemplateOptions({
+        data: {
+          greeting: 'Hello,',
+          firstName: 'Freddy',
+          lastName: 'Krueger',
+        },
+      });
+
+      var locals = H.createLocals('express3', dirname, {
+        _templateOptions: {
+          data: {
+            lastName: 'Mercury',
+          },
+        },
+      });
+
+      render(path.join(dirname, 'template.hbs'), locals, function (err, html) {
+        assert.ifError(err);
+        assert.strictEqual(H.stripWs(html), H.stripWs('Hello, Freddy Mercury'));
+        done(err);
+      });
+    });
+
+    it('removes _templateOptions from the locals data', function (done) {
+      var instance = hbs.create();
+      var render = instance.express3({
+        restrictLayoutsTo: dirname,
+      });
+      instance.updateTemplateOptions({
+        data: {
+          greeting: 'Hello,',
+          firstName: 'Freddy',
+          lastName: 'Krueger',
+        },
+      });
+
+      var locals = H.createLocals('express3', dirname, {
+        _templateOptions: {
+          data: {
+            lastName: 'Mercury',
+          },
+        },
+      });
+
+      render(path.join(dirname, 'data-access-template.hbs'), locals, function (err, html) {
+        assert.ifError(err);
+        assert.strictEqual(H.stripWs(html), H.stripWs(''));
+        done(err);
+      });
+    });
+  });
+
+  describe('express4', function () {
+    it('merges res.locals._templateOptions with the self._templateOptions', function (done) {
+      var instance = hbs.create();
+      var render = instance.express4({
+        restrictLayoutsTo: dirname,
+      });
+      instance.updateTemplateOptions({
+        data: {
+          greeting: 'Hello,',
+          firstName: 'Freddy',
+          lastName: 'Krueger',
+        },
+      });
+
+      var locals = H.createLocals('express4', dirname, {
+        _templateOptions: {
+          data: {
+            lastName: 'Mercury',
+          },
+        },
+      });
+
+      render(path.join(dirname, 'template.hbs'), locals, function (err, html) {
+        assert.ifError(err);
+        assert.strictEqual(H.stripWs(html), H.stripWs('Hello, Freddy Mercury'));
+        done(err);
+      });
+    });
+
+    it('removes _templateOptions from the locals data', function (done) {
+      var instance = hbs.create();
+      var render = instance.express3({
+        restrictLayoutsTo: dirname,
+      });
+      instance.updateTemplateOptions({
+        data: {
+          greeting: 'Hello,',
+          firstName: 'Freddy',
+          lastName: 'Krueger',
+        },
+      });
+
+      var locals = H.createLocals('express3', dirname, {
+        _templateOptions: {
+          data: {
+            lastName: 'Mercury',
+          },
+        },
+      });
+
+      render(path.join(dirname, 'data-access-template.hbs'), locals, function (err, html) {
+        assert.ifError(err);
+        assert.strictEqual(H.stripWs(html), H.stripWs(''));
+        done(err);
+      });
+    });
+  });
+});

package/.claude/worktrees/node-20-26-migration-7de0c3/test/multiple.js

@@ -0,0 +1,115 @@
+'use strict';
+
+var request = require('supertest');
+var assert = require('assert');
+var express = require('express');
+var hbs = require('..');
+
+describe('multiple directories', function () {
+  var app;
+
+  beforeEach(function () {
+    app = express();
+    app.engine(
+      'hbs',
+      hbs.express3({
+        restrictLayoutsTo: './test/views/multiple',
+      }),
+    );
+    app.set('view engine', 'hbs');
+    app.get('/test1', function (req, res) {
+      res.render('test1');
+    });
+    app.get('/test2', function (req, res) {
+      res.render('test2');
+    });
+    app.get('/collide', function (req, res) {
+      res.render('collide');
+    });
+    app.get('/error', function (req, res) {
+      res.render('error');
+    });
+  });
+
+  it('should handle single folder', function (done) {
+    app.set('views', './test/views/multiple/views1');
+    request(app)
+      .get('/test1')
+      .end(function (err, res) {
+        assert.ifError(err);
+        var expected = '<h1>test1</h1>\n';
+        assert.equal(res.text, expected);
+        done();
+      });
+  });
+
+  it('should handle multiple folders', function (done) {
+    app.set('views', ['./test/views/multiple/views1', './test/views/multiple/views2']);
+    request(app)
+      .get('/test2')
+      .end(function (err, res) {
+        assert.ifError(err);
+        var expected = '<h1>test2</h1>\n';
+        assert.equal(res.text, expected);
+        done();
+      });
+  });
+
+  describe('should handle multiple folders in specific order', function () {
+    it('views1, views2', function (done) {
+      app.set('views', ['./test/views/multiple/views1', './test/views/multiple/views2']);
+      request(app)
+        .get('/collide')
+        .end(function (err, res) {
+          assert.ifError(err);
+          var expected = '<h1>collide1</h1>\n';
+          assert.equal(res.text, expected);
+          done();
+        });
+    });
+
+    it('views2, views1', function (done) {
+      app.set('views', ['./test/views/multiple/views2', './test/views/multiple/views1']);
+      request(app)
+        .get('/collide')
+        .end(function (err, res) {
+          assert.ifError(err);
+          var expected = '<h1>collide2</h1>\n';
+          assert.equal(res.text, expected);
+          done();
+        });
+    });
+  });
+
+  describe('should report the filename in error', function () {
+    it('should report from first folder', function (done) {
+      app.set('views', ['./test/views/multiple/views1', './test/views/multiple/views2']);
+      app.use(function (err, req, res, next) {
+        res.status(500).send(err.stack);
+      });
+
+      request(app)
+        .get('/error')
+        .end(function (err, res) {
+          assert.ifError(err);
+          assert(res.error.text.indexOf('views1/error.hbs]') > 0);
+          done();
+        });
+    });
+
+    it('should report from second folder', function (done) {
+      app.set('views', ['./test/views/multiple/views2', './test/views/multiple/views1']);
+      app.use(function (err, req, res, next) {
+        res.status(500).send(err.stack);
+      });
+
+      request(app)
+        .get('/error')
+        .end(function (err, res) {
+          assert.ifError(err);
+          assert(res.error.text.indexOf('views2/error.hbs]') > 0);
+          done();
+        });
+    });
+  });
+});

package/.claude/worktrees/node-20-26-migration-7de0c3/test/nonExpress.js

@@ -0,0 +1,36 @@
+var assert = require('assert');
+var hbs = require('..');
+var H = require('./helpers');
+
+describe('non-express', function () {
+  describe('viewsDir', function () {
+    var dirname = __dirname + '/views/viewsDir';
+
+    it('should use viewsDir options', function (done) {
+      var render = hbs.create().express3({
+        viewsDir: dirname,
+        restrictLayoutsTo: dirname,
+      });
+      var locals = H.createLocals('express3', dirname);
+
+      render(dirname + '/sub/directive.hbs', locals, function (err, html) {
+        assert.equal('<vd>directive</vd>', H.stripWs(html));
+        done();
+      });
+    });
+
+    it('should work with layoutsDir', function (done) {
+      var render = hbs.create().express3({
+        viewsDir: dirname,
+        layoutsDir: dirname + '/layouts',
+        restrictLayoutsTo: dirname,
+      });
+      var locals = H.createLocals('express3', dirname, { layout: 'default.hbs' });
+
+      render(dirname + '/sub/lay.hbs', locals, function (err, html) {
+        assert.equal('<vd>lay</vd>', H.stripWs(html));
+        done();
+      });
+    });
+  });
+});

package/.claude/worktrees/node-20-26-migration-7de0c3/test/optionsSpecs.js

@@ -0,0 +1,22 @@
+var assert = require('assert');
+var hbs = require('..');
+var path = require('path');
+var H = require('./helpers');
+var fs = require('fs');
+
+describe('options', function () {
+  var dirname = path.join(__dirname, 'views/beautify');
+
+  it('should pretty print HTML', function (done) {
+    var hb = hbs.create();
+    var render = hb.express3({ beautify: true, restrictLayoutsTo: dirname });
+    var locals = H.createLocals('express3', dirname, {});
+
+    render(dirname + '/index.hbs', locals, function (err, html) {
+      assert.ifError(err);
+      var expected = fs.readFileSync(dirname + '/expected.hbs', 'utf8');
+      assert.equal(html.trim(), expected.trim());
+      done();
+    });
+  });
+});

package/.claude/worktrees/node-20-26-migration-7de0c3/test/resolverSpecs.js

@@ -0,0 +1,54 @@
+'use strict';
+
+var assert = require('assert');
+var generateId = require('../lib/generate-id');
+var resolver = require('../lib/resolver');
+
+describe('resolver', function () {
+  it('detects an unresolved helper at the start of rendered output', function () {
+    assert.equal(resolver.hasResolvers('__aSyNcId__<_12345678__'), true);
+  });
+
+  it('does not report rendered output without a resolver marker', function () {
+    assert.equal(resolver.hasResolvers('rendered output'), false);
+  });
+
+  it('resolves asynchronous helper output with its context', function (done) {
+    var cache = {};
+    var id = resolver.resolve(
+      cache,
+      function (context, callback) {
+        callback(context.value);
+      },
+      { value: 'resolved' },
+    );
+
+    resolver.done(cache, function (err, values) {
+      assert.ifError(err);
+      assert.equal(values[id], 'resolved');
+      done();
+    });
+  });
+
+  it('reports synchronous helper failures', function (done) {
+    var cache = {};
+    resolver.resolve(cache, function () {
+      throw new Error('helper failed');
+    });
+
+    resolver.done(cache, function (err) {
+      assert.equal(err.message, 'helper failed');
+      done();
+    });
+  });
+});
+
+describe('generateId', function () {
+  it('uses an eight-character default', function () {
+    assert.match(generateId(), /^[A-Za-z_]{8}$/);
+  });
+
+  it('uses the requested length', function () {
+    assert.match(generateId(16), /^[A-Za-z_]{16}$/);
+  });
+});

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/beautify/expected.hbs

@@ -0,0 +1,9 @@
+<html>
+
+<head>head</head>
+
+<body>
+  <h1>heading 1</h1>
+  <h2>heading 2</h2>
+</body>
+<html>

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/beautify/index.hbs

@@ -0,0 +1,2 @@
+<html>
+  <head>head</head> <body><h1>heading 1</h1><h2>heading 2</h2></body> <html>

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/customExtension/layout.server.view.html

@@ -0,0 +1 @@
+<html>{{{body}}}</html>

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/customExtension/partialsDir/partial1.server.view.html

@@ -0,0 +1 @@
+<partial>1</partial>

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/customExtension/partialsDir/partial2.server.view.html

@@ -0,0 +1 @@
+<partial>2</partial>

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/customExtension/partialsDir/subs/subPartial1.server.view.html

@@ -0,0 +1 @@
+<subpartial>1</subpartial>

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/customExtension/partialsDir/subs/subPartial2.server.view.html

@@ -0,0 +1 @@
+<subpartial>2</subpartial>

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/customExtension/template.server.view.html

@@ -0,0 +1,5 @@
+{{!< layout}}
+{{> subs/subPartial1}}
+{{> partial1}}
+{{> subs/subPartial2}}
+{{> partial2}}

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/disableLayoutDirective/aside.hbs

@@ -0,0 +1 @@
+aside

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/disableLayoutDirective/index.hbs

@@ -0,0 +1,2 @@
+{{!< layouts/default}}
+dld

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/disableLayoutDirective/layouts/default.hbs

@@ -0,0 +1 @@
+<dld>{{{body}}}</dld>

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/helpers/home/async.hbs

@@ -0,0 +1,6 @@
+{{!< ../layouts/default}}
+asynctemplate
+{{async "foo"}}
+{{async "bar"}}
+{{async "bah"}}
+{{async "baz"}}

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/helpers/home/index.hbs

@@ -0,0 +1,3 @@
+{{!< ../layouts/default}}
+index
+{{sync "index"}}

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/helpers/layouts/default.hbs

@@ -0,0 +1 @@
+<default>{{{body}}}</default>

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/multiple/views1/collide.hbs

@@ -0,0 +1 @@
+<h1>collide1</h1>

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/multiple/views1/error.hbs

@@ -0,0 +1 @@
+{{{http://google.co.uk}}

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/multiple/views1/test1.hbs

@@ -0,0 +1 @@
+<h1>test1</h1>

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/multiple/views2/collide.hbs

@@ -0,0 +1 @@
+<h1>collide2</h1>

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/multiple/views2/error.hbs

@@ -0,0 +1 @@
+{{{http://google.co.uk}}

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/multiple/views2/test2.hbs

@@ -0,0 +1 @@
+<h1>test2</h1>

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/viewsDir/layouts/default.hbs

@@ -0,0 +1 @@
+<vd>{{{body}}}</vd>

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/viewsDir/sub/directive.hbs

@@ -0,0 +1,2 @@
+{{!< ../layouts/default}}
+directive

package/.claude/worktrees/node-20-26-migration-7de0c3/test/views/viewsDir/sub/lay.hbs

@@ -0,0 +1 @@
+lay

package/.claude/worktrees/security-patches-review-c621ea/.editorconfig

@@ -0,0 +1,8 @@
+; indicate this is the root of the project
+
+[*]
+indent_style = space
+end_of_line = lf
+
+[*.js]
+indent_size = 2

package/.claude/worktrees/security-patches-review-c621ea/.github/workflows/publish.yml

@@ -0,0 +1,73 @@
+name: Publish
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'package.json'
+  workflow_dispatch:
+    inputs:
+      dry-run:
+        description: 'Preview what would be published without actually publishing'
+        required: false
+        type: boolean
+        default: true
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  publish:
+    name: Publish to npm
+    runs-on: ubuntu-latest
+
+    permissions:
+      # OIDC trusted publishing to npm. Provenance is enabled because this
+      # repository is public; public repos can generate a provenance
+      # attestation at publish time.
+      id-token: write
+      contents: read
+
+    env:
+      FORCE_COLOR: 1
+      CI: true
+      NPM_CONFIG_PROVENANCE: true
+      NPM_CONFIG_REGISTRY: 'https://registry.npmjs.org'
+
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        with:
+          persist-credentials: false
+
+      - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7
+        with:
+          node-version: '26.13.0'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install Corepack
+        run: npm install --global corepack@0.34.6
+      - name: Enable corepack
+        run: corepack enable
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile --prefer-offline
+
+      - name: Determine whether to publish
+        id: pub
+        run: |
+          name=$(jq -r .name package.json)
+          version=$(jq -r .version package.json)
+          if [ -n "$(npm view "$name@$version" version 2>/dev/null)" ]; then
+            echo "$name@$version is already published; nothing to do"
+            echo "publish=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "queueing $name@$version"
+            echo "publish=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Publish to npm
+        if: steps.pub.outputs.publish == 'true'
+        # --no-git-checks is required because actions/checkout leaves the repo on
+        # a detached HEAD, which pnpm's default publish branch check rejects.
+        run: pnpm publish --no-git-checks ${{ (github.event.inputs['dry-run'] == 'true' && '--dry-run') || '' }}

package/.claude/worktrees/security-patches-review-c621ea/.github/workflows/test.yml

@@ -0,0 +1,48 @@
+name: Test
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [22, 24, 26]
+    name: Node ${{ matrix.node }}
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+      - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1
+      - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
+        with:
+          node-version: ${{ matrix.node }}
+          cache: pnpm
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm lint
+      - name: Run tests with coverage
+        run: pnpm coverage
+
+  required-checks-pass:
+    name: Required checks pass
+    if: always()
+    needs: [build]
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: Verify all required jobs succeeded
+        if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
+        run: exit 1

package/.claude/worktrees/security-patches-review-c621ea/.jsbeautifyrc

@@ -0,0 +1,17 @@
+{
+    "indent_size": 2,
+    "indent_char": " ",
+    "indent_level": 0,
+    "indent_with_tabs": false,
+    "preserve_newlines": true,
+    "max_preserve_newlines": 10,
+    "jslint_happy": false,
+    "brace_style": "collapse",
+    "keep_array_indentation": false,
+    "keep_function_indentation": false,
+    "space_before_conditional": true,
+    "break_chained_methods": false,
+    "eval_code": false,
+    "unescape_strings": false,
+    "wrap_line_length": 0
+}

package/.claude/worktrees/security-patches-review-c621ea/.nvmrc

@@ -0,0 +1 @@
+22

package/.claude/worktrees/security-patches-review-c621ea/.nycrc.json

@@ -0,0 +1,16 @@
+{
+  "all": true,
+  "include": [
+    "index.js",
+    "lib/**/*.js"
+  ],
+  "branches": 80,
+  "functions": 80,
+  "lines": 80,
+  "statements": 80,
+  "reporter": [
+    "text",
+    "json-summary",
+    "lcov"
+  ]
+}

package/.claude/worktrees/security-patches-review-c621ea/.oxfmtrc.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "./node_modules/oxfmt/configuration_schema.json",
+  "singleQuote": true,
+  "tabWidth": 2,
+  "sortPackageJson": false,
+  "ignorePatterns": [
+    "**/node_modules/**",
+    "**/coverage/**",
+    "pnpm-lock.yaml",
+    "**/*.json",
+    "**/*.jsonc",
+    "**/*.yml",
+    "**/*.yaml",
+    "**/*.md",
+    "**/*.hbs",
+    "**/*.html",
+    "**/*.css"
+  ]
+}