@adobe/helix-html-pipeline 3.6.2 → 3.7.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [3.7.0](https://github.com/adobe/helix-html-pipeline/compare/v3.6.3...v3.7.0) (2022-11-03)
+
+
+### Features
+
+* use adobe gridtables ([#183](https://github.com/adobe/helix-html-pipeline/issues/183)) ([29369c0](https://github.com/adobe/helix-html-pipeline/commit/29369c0e5cf373e157100f25c98d690083161213)), closes [#182](https://github.com/adobe/helix-html-pipeline/issues/182)
+
+## [3.6.3](https://github.com/adobe/helix-html-pipeline/compare/v3.6.2...v3.6.3) (2022-11-01)
+
+
+### Bug Fixes
+
+* handle errors when loading config ([#180](https://github.com/adobe/helix-html-pipeline/issues/180)) ([f4f4b5f](https://github.com/adobe/helix-html-pipeline/commit/f4f4b5ff4f687331c2ec321e53662519cc428eb6)), closes [#179](https://github.com/adobe/helix-html-pipeline/issues/179)
+
 ## [3.6.2](https://github.com/adobe/helix-html-pipeline/compare/v3.6.1...v3.6.2) (2022-10-31)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "3.6.2",
+  "version": "3.7.0",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -41,6 +41,8 @@
   "dependencies": {
     "@adobe/helix-markdown-support": "5.0.10",
     "@adobe/helix-shared-utils": "2.1.0",
+    "@adobe/mdast-util-gridtables": "1.0.1",
+    "@adobe/remark-gridtables": "1.0.0",
     "cookie": "0.5.0",
     "github-slugger": "2.0.0",
     "hast-util-raw": "7.2.2",

package/src/json-pipe.js

@@ -9,6 +9,7 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
+import { cleanupHeaderValue } from '@adobe/helix-shared-utils';
 import fetchConfigAll from './steps/fetch-config-all.js';
 import setCustomResponseHeaders from './steps/set-custom-response-headers.js';
 import { PipelineResponse } from './PipelineResponse.js';
@@ -17,6 +18,7 @@ import { extractLastModified, updateLastModified } from './utils/last-modified.j
 import { authenticate } from './steps/authenticate.js';
 import fetchConfig from './steps/fetch-config.js';
 import { getPathInfo } from './utils/path.js';
+import { PipelineStatusError } from './PipelineStatusError.js';
 
 /**
  * Checks the fstab for folder mapping entries and then re-adjusts the path infos if needed.
@@ -74,48 +76,58 @@ export async function jsonPipe(state, req) {
     });
   }
 
-  // fetch config and apply the folder mapping
-  await fetchConfig(state, req);
-  await folderMapping(state);
+  try {
+    // fetch config and apply the folder mapping
+    await fetchConfig(state, req);
+    await folderMapping(state);
 
-  // fetch data from content bus
-  const { path } = state.info;
-  state.timer?.update('json-fetch');
-  let dataResponse = await s3Loader.getObject('helix-content-bus', `${contentBusId}/${partition}${path}`);
+    // fetch data from content bus
+    const { path } = state.info;
+    state.timer?.update('json-fetch');
+    let dataResponse = await s3Loader.getObject('helix-content-bus', `${contentBusId}/${partition}${path}`);
 
-  // if not found, fall back to code bus
-  if (dataResponse.status === 404) {
-    dataResponse = await s3Loader.getObject('helix-code-bus', `${owner}/${repo}/${ref}${path}`);
-  }
+    // if not found, fall back to code bus
+    if (dataResponse.status === 404) {
+      dataResponse = await s3Loader.getObject('helix-code-bus', `${owner}/${repo}/${ref}${path}`);
+    }
 
-  // if still not found, return status
-  if (dataResponse.status !== 200) {
-    if (dataResponse.status < 500) {
-      await fetchConfigAll(state, req, dataResponse);
-      await setCustomResponseHeaders(state, req, dataResponse);
+    // if still not found, return status
+    if (dataResponse.status !== 200) {
+      if (dataResponse.status < 500) {
+        await fetchConfigAll(state, req, dataResponse);
+        await setCustomResponseHeaders(state, req, dataResponse);
+      }
+      return dataResponse;
     }
-    return dataResponse;
-  }
-  const data = dataResponse.body;
+    const data = dataResponse.body;
 
-  // filter data
-  const response = jsonFilter(state, data, {
-    limit: limit ? Number.parseInt(limit, 10) : undefined,
-    offset: offset ? Number.parseInt(offset, 10) : undefined,
-    sheet,
-    raw: limit === undefined && offset === undefined && sheet === undefined,
-  });
+    // filter data
+    const response = jsonFilter(state, data, {
+      limit: limit ? Number.parseInt(limit, 10) : undefined,
+      offset: offset ? Number.parseInt(offset, 10) : undefined,
+      sheet,
+      raw: limit === undefined && offset === undefined && sheet === undefined,
+    });
 
-  // set last-modified
-  updateLastModified(state, response, extractLastModified(dataResponse.headers));
+    // set last-modified
+    updateLastModified(state, response, extractLastModified(dataResponse.headers));
 
-  // set surrogate key
-  response.headers.set('x-surrogate-key', `${contentBusId}${path}`.replace(/\//g, '_'));
+    // set surrogate key
+    response.headers.set('x-surrogate-key', `${contentBusId}${path}`.replace(/\//g, '_'));
 
-  // Load config-all and set response headers
-  await fetchConfigAll(state, req, response);
-  await authenticate(state, req, response);
-  await setCustomResponseHeaders(state, req, response);
+    // Load config-all and set response headers
+    await fetchConfigAll(state, req, response);
+    await authenticate(state, req, response);
+    await setCustomResponseHeaders(state, req, response);
 
-  return response;
+    return response;
+  } catch (e) {
+    const res = new PipelineResponse('', {
+      status: e instanceof PipelineStatusError ? e.code : 500,
+    });
+    const level = res.status >= 500 ? 'error' : 'info';
+    log[level](`pipeline status: ${res.status} ${e.message}`, e);
+    res.headers.set('x-error', cleanupHeaderValue(e.message));
+    return res;
+  }
 }

package/src/steps/authenticate.js

@@ -72,7 +72,8 @@ export async function authenticate(state, req, res) {
     res.error = 'forbidden.';
   }
 
-  // set some response headers
+  // set some response headers for deferred edge authentication
+  // AdobePatentID="P11443-US"
   res.headers.set('x-hlx-auth-allow', allows.join(','));
   if (authInfo.profile) {
     res.headers.set('x-hlx-auth-iss', authInfo.profile.iss);

package/src/steps/parse-markdown.js

@@ -14,7 +14,7 @@ import remarkParse from 'remark-parse';
 import { removePosition } from 'unist-util-remove-position';
 import { dereference } from '@adobe/helix-markdown-support';
 import { remarkMatter } from '@adobe/helix-markdown-support/matter';
-import { remarkGridTable } from '@adobe/helix-markdown-support/gridtable';
+import remarkGridTable from '@adobe/remark-gridtables';
 import remarkGfm from '../utils/remark-gfm-nolink.js';
 
 export class FrontmatterParsingError extends Error {

package/src/utils/mdast-to-hast.js

@@ -11,7 +11,7 @@
  */
 import { toHast as mdast2hast, defaultHandlers } from 'mdast-util-to-hast';
 import { raw } from 'hast-util-raw';
-import { mdast2hastGridTableHandler, TYPE_TABLE } from '@adobe/helix-markdown-support/gridtable';
+import { mdast2hastGridTablesHandler, TYPE_TABLE } from '@adobe/mdast-util-gridtables';
 
 import section from './section-handler.js';
 import heading from './heading-handler.js';
@@ -28,7 +28,7 @@ export default function getHast(mdast, slugger) {
       ...defaultHandlers,
       section: section(),
       heading: heading(slugger),
-      [TYPE_TABLE]: mdast2hastGridTableHandler(),
+      [TYPE_TABLE]: mdast2hastGridTablesHandler(),
     },
     allowDangerousHtml: true,
   });

package/test/StaticS3Loader.js

@@ -34,6 +34,11 @@ export class StaticS3Loader {
       body: '',
       headers: new Map(),
     };
+    if (response instanceof Error) {
+      // eslint-disable-next-line no-console
+      console.log(`StaticS3Loader: failing ${bucketId}/${key} -> ${response.message}`);
+      throw response;
+    }
     // eslint-disable-next-line no-console
     console.log(`StaticS3Loader: loading ${bucketId}/${key} -> ${response.status}`);
     return response;