@adobe/helix-html-pipeline 1.3.2 → 1.4.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [1.4.0](https://github.com/adobe/helix-html-pipeline/compare/v1.3.4...v1.4.0) (2022-04-12)
+
+
+### Features
+
+* adjust for upcoming helix-config changes ([#37](https://github.com/adobe/helix-html-pipeline/issues/37)) ([e6d4f90](https://github.com/adobe/helix-html-pipeline/commit/e6d4f90d4bf8c9a0642e921395e5ac48aa3e53c7)), closes [#36](https://github.com/adobe/helix-html-pipeline/issues/36)
+
+## [1.3.4](https://github.com/adobe/helix-html-pipeline/compare/v1.3.3...v1.3.4) (2022-04-11)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-shared-utils to v2.0.7 ([e8a293c](https://github.com/adobe/helix-html-pipeline/commit/e8a293c54ac8617d5457692e780bc60c9358c0ee))
+
+## [1.3.3](https://github.com/adobe/helix-html-pipeline/compare/v1.3.2...v1.3.3) (2022-04-06)
+
+
+### Bug Fixes
+
+* correct last-modified handling for json ([#33](https://github.com/adobe/helix-html-pipeline/issues/33)) ([c9bb4fd](https://github.com/adobe/helix-html-pipeline/commit/c9bb4fd8e0974788cf0e963567db76685fcba231))
+
 ## [1.3.2](https://github.com/adobe/helix-html-pipeline/compare/v1.3.1...v1.3.2) (2022-03-19)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@adobe/helix-markdown-support": "3.1.2",
-    "@adobe/helix-shared-utils": "2.0.6",
+    "@adobe/helix-shared-utils": "2.0.7",
     "github-slugger": "1.4.0",
     "hast-util-raw": "7.2.1",
     "hast-util-select": "5.0.1",
@@ -42,11 +42,11 @@
     "hastscript": "7.0.2",
     "mdast-util-gfm-footnote": "1.0.1",
     "mdast-util-gfm-strikethrough": "1.0.1",
-    "mdast-util-gfm-table": "1.0.3",
+    "mdast-util-gfm-table": "1.0.4",
     "mdast-util-gfm-task-list-item": "1.0.1",
     "mdast-util-to-hast": "12.1.1",
     "mdast-util-to-string": "3.1.0",
-    "micromark-extension-gfm-footnote": "1.0.3",
+    "micromark-extension-gfm-footnote": "1.0.4",
     "micromark-extension-gfm-strikethrough": "1.0.4",
     "micromark-extension-gfm-table": "1.0.5",
     "micromark-extension-gfm-tagfilter": "1.0.1",
@@ -54,12 +54,12 @@
     "micromark-util-combine-extensions": "1.0.0",
     "mime": "3.0.0",
     "rehype-format": "4.0.1",
-    "rehype-minify-whitespace": "5.0.0",
+    "rehype-minify-whitespace": "5.0.1",
     "rehype-parse": "8.0.4",
     "remark-parse": "10.0.1",
     "strip-markdown": "5.0.0",
     "unified": "10.1.2",
-    "unist-util-map": "3.0.0",
+    "unist-util-map": "3.0.1",
     "unist-util-remove": "3.1.0",
     "unist-util-remove-position": "4.0.1",
     "unist-util-select": "4.0.1",
@@ -76,16 +76,16 @@
     "codecov": "3.8.3",
     "commitizen": "4.2.4",
     "cz-conventional-changelog": "3.3.0",
-    "eslint": "8.11.0",
+    "eslint": "8.13.0",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-import": "2.25.4",
-    "esmock": "1.7.4",
+    "eslint-plugin-import": "2.26.0",
+    "esmock": "1.7.5",
     "husky": "7.0.4",
     "js-yaml": "4.1.0",
     "jsdoc-to-markdown": "7.1.1",
     "jsdom": "19.0.0",
     "junit-report-builder": "3.0.0",
-    "lint-staged": "12.3.5",
+    "lint-staged": "12.3.7",
     "mocha": "9.2.2",
     "mocha-multi-reporters": "1.5.1",
     "remark-gfm": "3.0.1",

package/src/PipelineState.d.ts

@@ -12,6 +12,12 @@
 import {PathInfo, S3Loader, FormsMessageDispatcher, PipelineTimer} from "./index";
 import {PipelineContent} from "./PipelineContent";
 
+declare enum PipelineType {
+  html = 'html',
+  json = 'json',
+  form = 'form',
+}
+
 declare interface PipelineOptions {
   log: Console;
   s3Loader: S3Loader;
@@ -70,5 +76,10 @@ declare class PipelineState {
    * optional timer that is used to measure the timing
    */
   timer?: PipelineTimer;
+
+  /**
+   * pipeline type. 'html', 'json', 'forms'
+   */
+  type: PipelineType;
 }
 

package/src/PipelineState.js

@@ -38,6 +38,7 @@ export class PipelineState {
       s3Loader: opts.s3Loader,
       messageDispatcher: opts.messageDispatcher,
       timer: opts.timer,
+      type: 'html',
     });
   }
 }

package/src/forms-pipe.js

@@ -88,6 +88,7 @@ export async function extractBodyData(request) {
  */
 export async function formsPipe(state, request) {
   const { log } = state;
+  state.type = 'form';
 
   // todo: improve
   const response = new PipelineResponse('', {

package/src/html-pipe.js

@@ -44,6 +44,7 @@ import { validatePathInfo } from './utils/path.js';
  */
 export async function htmlPipe(state, req) {
   const { log } = state;
+  state.type = 'html';
 
   if (!validatePathInfo(state.info)) {
     return new PipelineResponse('', {

package/src/json-pipe.js

@@ -13,6 +13,7 @@ import fetchMetadata from './steps/fetch-metadata.js';
 import setCustomResponseHeaders from './steps/set-custom-response-headers.js';
 import { PipelineResponse } from './PipelineResponse.js';
 import jsonFilter from './utils/json-filter.js';
+import { updateLastModified } from './utils/last-modified.js';
 
 /**
  * Runs the default pipeline and returns the response.
@@ -22,6 +23,7 @@ import jsonFilter from './utils/json-filter.js';
  */
 export async function jsonPipe(state, req) {
   const { log } = state;
+  state.type = 'json';
   const {
     owner, repo, ref, contentBusId, partition, s3Loader,
   } = state;
@@ -70,11 +72,8 @@ export async function jsonPipe(state, req) {
     raw: limit === undefined && offset === undefined && sheet === undefined,
   });
 
-  // set last-modified (note, that it is not influenced by metadata or helix-config.json)
-  const lastModified = dataResponse.headers.get('last-modified');
-  if (lastModified) {
-    response.headers.set('last-modified', lastModified);
-  }
+  // set last-modified
+  updateLastModified(state, response, dataResponse.headers.get('last-modified'));
 
   // set surrogate key
   response.headers.set('x-surrogate-key', `${contentBusId}${path}`.replace(/\//g, '_'));

package/src/steps/fetch-config.js

@@ -30,13 +30,33 @@ export default async function fetchConfig(state, req, res) {
   if (ret.status !== 200) {
     throw new PipelineStatusError(ret.status === 404 ? 404 : 502, `unable to load /helix-config.json: ${ret.status}`);
   }
+  let config;
   try {
-    state.helixConfig = JSON.parse(ret.body);
+    config = JSON.parse(ret.body);
   } catch (e) {
     log.info('failed to parse helix-config.json', e);
     throw new PipelineStatusError(400, `Failed parsing of /helix-config.json: ${e.message}`);
   }
 
+  // upgrade to version 2 if needed
+  if (config.version !== 2) {
+    Object.keys(config).forEach((name) => {
+      config[name] = {
+        data: config[name],
+      };
+    });
+  }
+
   // also update last-modified
-  updateLastModified(state, res, extractLastModified(ret.headers));
+  const configLastModified = extractLastModified(ret.headers);
+
+  // update last modified of fstab
+  updateLastModified(state, res, config.fstab?.lastModified || configLastModified);
+
+  // for html requests, also consider the HEAD config
+  if (state.type === 'html' && state.info.selector !== 'plain' && config.head?.lastModified) {
+    updateLastModified(state, res, config.head.lastModified);
+  }
+
+  state.helixConfig = config;
 }

package/src/steps/fetch-metadata.js

@@ -39,8 +39,10 @@ export default async function fetchMetadata(state, req, res) {
     }
     state.metadata = data;
 
-    // also update last-modified
-    updateLastModified(state, res, extractLastModified(ret.headers));
+    if (state.type === 'html') {
+      // also update last-modified (only for html pipeline)
+      updateLastModified(state, res, extractLastModified(ret.headers));
+    }
     return;
   }
 

package/src/steps/folder-mapping.js

@@ -40,7 +40,7 @@ export function mapPath(folders, path) {
  * @param {PipelineState} state
  */
 export default function folderMapping(state) {
-  const folders = state.helixConfig?.fstab?.folders;
+  const folders = state.helixConfig?.fstab?.data.folders;
   if (!folders) {
     return;
   }

package/src/steps/render.js

@@ -81,7 +81,7 @@ export default async function render(state, req, res) {
   appendElement($head, createElement('link', 'rel', 'alternate', 'type', 'application/xml+atom', 'href', meta.feed, 'title', `${meta.title} feed`));
 
   // inject head.html
-  const headHtml = state.helixConfig?.head?.html;
+  const headHtml = state.helixConfig?.head?.data.html;
   if (headHtml) {
     const $headHtml = await unified()
       .use(rehypeParse, { fragment: true })