@jpmorganchase/mosaic-site-middleware 0.1.0-beta.21 → 0.1.0-beta.23

package/.turbo/turbo-build.log

@@ -1,2 +1,2 @@
-@jpmorganchase/mosaic-site-middleware:build: cache hit, replaying output eebc1a386641880b
+@jpmorganchase/mosaic-site-middleware:build: cache hit, replaying output 00de0937a50cf8b8
 @jpmorganchase/mosaic-site-middleware:build: $ tsc

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @jpmorganchase/mosaic-site-middleware
 
+## 0.1.0-beta.23
+
+### Patch Changes
+
+- 513d45f: Sidebar behavior and styling changes.
+  Add Client-side search feature.
+  Relax node engine requirements.
+  Removal of patches from the site package.
+  Update site generator templates.
+- Updated dependencies [513d45f]
+  - @jpmorganchase/mosaic-schemas@0.1.0-beta.23
+  - @jpmorganchase/mosaic-store@0.1.0-beta.23
+  - @jpmorganchase/mosaic-types@0.1.0-beta.23
+
+## 0.1.0-beta.22
+
+### Patch Changes
+
+- be89e4f: fix markdown tables and update generator's Salt patches
+
+  - Salt patches in generator were out of sync with Mosaic repo
+  - Markdown now support github flavoured markdown, such as Tables
+
+- Updated dependencies [be89e4f]
+  - @jpmorganchase/mosaic-schemas@0.1.0-beta.22
+  - @jpmorganchase/mosaic-store@0.1.0-beta.22
+  - @jpmorganchase/mosaic-types@0.1.0-beta.22
+
 ## 0.1.0-beta.21
 
 ### Patch Changes

package/dist/compileMdx.js

@@ -1,11 +1,12 @@
 import { serialize } from 'next-mdx-remote/serialize';
+import remarkGfm from 'remark-gfm';
 import rehypeSlug from 'rehype-slug';
 import { codeBlocks } from './plugins/codeBlocks.js';
 export async function compileMDX(content, parseFrontmatter = true, rehypePlugins = [], remarkPlugins = []) {
     const mdxSource = await serialize(content, {
         mdxOptions: {
             rehypePlugins: [rehypeSlug, ...remarkPlugins],
-            remarkPlugins: [codeBlocks, ...rehypePlugins]
+            remarkPlugins: [codeBlocks, remarkGfm, ...rehypePlugins]
         },
         parseFrontmatter
     });

package/dist/compileMdx.js.map

@@ -1 +1 @@
-{"version":3,"file":"compileMdx.js","sourceRoot":"","sources":["../src/compileMdx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,OAAO,EACP,gBAAgB,GAAG,IAAI,EACvB,aAAa,GAAG,EAAE,EAClB,aAAa,GAAG,EAAE;IAElB,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE;QACzC,UAAU,EAAE;YACV,aAAa,EAAE,CAAC,UAAU,EAAE,GAAG,aAAa,CAAC;YAC7C,aAAa,EAAE,CAAC,UAAU,EAAE,GAAG,aAAa,CAAC;SAC9C;QACD,gBAAgB;KACjB,CAAC,CAAC;IACH,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"compileMdx.js","sourceRoot":"","sources":["../src/compileMdx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,OAAO,EACP,gBAAgB,GAAG,IAAI,EACvB,aAAa,GAAG,EAAE,EAClB,aAAa,GAAG,EAAE;IAElB,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE;QACzC,UAAU,EAAE;YACV,aAAa,EAAE,CAAC,UAAU,EAAE,GAAG,aAAa,CAAC;YAC7C,aAAa,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC;SACzD;QACD,gBAAgB;KACjB,CAAC,CAAC;IACH,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/index.d.ts

@@ -4,5 +4,6 @@ export * from './MiddlewareError.js';
 export * from './middlewarePresets.js';
 export * from './withMDXContent.js';
 export * from './withMosaicMode.js';
+export * from './withSearchIndex.js';
 export * from './withSession.js';
 export * from './withSharedConfig.js';

package/dist/index.js

@@ -4,6 +4,7 @@ export * from './MiddlewareError.js';
 export * from './middlewarePresets.js';
 export * from './withMDXContent.js';
 export * from './withMosaicMode.js';
+export * from './withSearchIndex.js';
 export * from './withSession.js';
 export * from './withSharedConfig.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC"}

package/dist/middlewarePresets.d.ts

@@ -1,5 +1,5 @@
 import type { Redirect } from 'next';
-import { SharedConfigSlice } from '@jpmorganchase/mosaic-store';
+import { SearchIndexSlice, SharedConfigSlice } from '@jpmorganchase/mosaic-store';
 import type { ContentProps } from '@jpmorganchase/mosaic-types';
 import { MosaicMiddleware, MosaicMiddlewareWithConfig } from './createMiddlewareRunner.js';
 import { type MosaicModeProps } from './withMosaicMode.js';
@@ -28,6 +28,6 @@ export declare type MosaicAppProps<T> = {
 /** Mosaic getServerSideProps result which supports error handling */
 export declare type GetMosaicServerSidePropsResult<T> = MosaicAppProps<T>;
 /** MiddlewarePresets props */
-export declare type MiddlewarePresetsProps = MosaicModeProps & ContentProps & SharedConfigSlice;
+export declare type MiddlewarePresetsProps = MosaicModeProps & ContentProps & SearchIndexSlice & SharedConfigSlice;
 /** A collection of preset [[`Middleware`]] plugins that will compose together the page props */
 export declare const middlewarePresets: Array<MosaicMiddleware<MiddlewarePresetsProps> | MosaicMiddlewareWithConfig<MiddlewarePresetsProps, unknown>>;

package/dist/middlewarePresets.js

@@ -1,6 +1,7 @@
+import { withSearchIndex } from './withSearchIndex.js';
 import { withSharedConfig } from './withSharedConfig.js';
 import { withMDXContent } from './withMDXContent.js';
 import { withMosaicMode } from './withMosaicMode.js';
 /** A collection of preset [[`Middleware`]] plugins that will compose together the page props */
-export const middlewarePresets = [withMosaicMode, withSharedConfig, withMDXContent];
+export const middlewarePresets = [withMosaicMode, withSharedConfig, withMDXContent, withSearchIndex];
 //# sourceMappingURL=middlewarePresets.js.map

package/dist/middlewarePresets.js.map

@@ -1 +1 @@
-{"version":3,"file":"middlewarePresets.js","sourceRoot":"","sources":["../src/middlewarePresets.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAwB,MAAM,qBAAqB,CAAC;AAgC3E,gGAAgG;AAChG,MAAM,CAAC,MAAM,iBAAiB,GAG1B,CAAC,cAAc,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC"}
+{"version":3,"file":"middlewarePresets.js","sourceRoot":"","sources":["../src/middlewarePresets.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAwB,MAAM,qBAAqB,CAAC;AAmC3E,gGAAgG;AAChG,MAAM,CAAC,MAAM,iBAAiB,GAG1B,CAAC,cAAc,EAAE,gBAAgB,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC"}

package/dist/withSearchIndex.d.ts

@@ -0,0 +1,25 @@
+import type { SearchIndex, SearchIndexSlice } from '@jpmorganchase/mosaic-store';
+import { MosaicMiddleware } from './createMiddlewareRunner.js';
+export { SearchIndex };
+/**
+ * Fetch search-data.json
+ *
+ * @param url the search data file URL
+ * @returns search data JSON
+ */
+export declare function fetchSearchData(url: string): Promise<Response>;
+/**
+ * Get environment vars
+ *
+ * @param urlPath the path for the page being loaded
+ * @returns environment vars
+ */
+export declare const getEnv: (urlPath: any) => import("zod").SafeParseSuccess<{
+    MOSAIC_SNAPSHOT_DIR: string;
+}>;
+/**
+ * Adds the [[`SearchIndex`]] props to the page props
+ * @param _context
+ * @returns site props object
+ */
+export declare const withSearchIndex: MosaicMiddleware<SearchIndexSlice>;

package/dist/withSearchIndex.js

@@ -0,0 +1,96 @@
+import path from 'path';
+import { fileLoaderProcessEnvSchema } from '@jpmorganchase/mosaic-schemas';
+import MiddlewareError from './MiddlewareError.js';
+import { loadLocalFile, loadS3File } from './loaders';
+if (typeof window !== 'undefined') {
+    throw new Error('This file should not be loaded on the client.');
+}
+/**
+ * Fetch search-data.json
+ *
+ * @param url the search data file URL
+ * @returns search data JSON
+ */
+export async function fetchSearchData(url) {
+    const response = await fetch(url, {
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    });
+    return response;
+}
+/**
+ * Get environment vars
+ *
+ * @param urlPath the path for the page being loaded
+ * @returns environment vars
+ */
+export const getEnv = urlPath => {
+    const env = fileLoaderProcessEnvSchema.safeParse(process.env);
+    if (!env.success) {
+        env.error.issues.forEach(issue => {
+            console.error(`Missing process.env.${issue.path.join()} environment variable required to load shared-config for ${urlPath}`);
+        });
+        throw new Error(`Environment variables missing for loading of shared-config required by ${urlPath}`);
+    }
+    return env;
+};
+/**
+ * Adds the [[`SearchIndex`]] props to the page props
+ * @param _context
+ * @returns site props object
+ */
+export const withSearchIndex = async (context) => {
+    const { res, resolvedUrl } = context;
+    const isSnapshotFile = res.getHeader('X-Mosaic-Mode') === 'snapshot-file';
+    const isSnapshotS3 = res.getHeader('X-Mosaic-Mode') === 'snapshot-s3';
+    const matches = resolvedUrl.match(/(.*)[!/]/);
+    const urlPath = matches?.length ? matches[1] : '';
+    const mosaicUrl = isSnapshotS3 || isSnapshotFile ? '' : res.getHeader('X-Mosaic-Content-Url');
+    const searchDataUrl = `${mosaicUrl}/search-data.json`;
+    try {
+        let searchIndexData;
+        if (isSnapshotFile) {
+            const env = getEnv(urlPath);
+            const { MOSAIC_SNAPSHOT_DIR: mosaicSnapshotDir } = env.data;
+            const filePath = path.join(process.cwd(), mosaicSnapshotDir, 'search-data.json');
+            const rawSearchIndexData = await loadLocalFile(filePath);
+            searchIndexData = JSON.parse(rawSearchIndexData);
+        }
+        else if (isSnapshotS3) {
+            const s3Key = `/search-data.json`.replace(/^\//, '');
+            const rawSearchIndexData = await loadS3File(s3Key);
+            searchIndexData = JSON.parse(rawSearchIndexData);
+        }
+        else {
+            const response = await fetchSearchData(searchDataUrl);
+            if (response.ok && response.status !== 204) {
+                searchIndexData = await response.json();
+            }
+            else {
+                const show500 = response.status !== 404 && response.status !== 204;
+                const show404 = response.status === 404;
+                let errorMessage = `Could not find any search data defined for ${searchDataUrl}`;
+                if (show500) {
+                    errorMessage = `An un-expected error occurred reading ${searchDataUrl}`;
+                }
+                throw new MiddlewareError(response.status, searchDataUrl, [errorMessage], {
+                    show404,
+                    show500
+                });
+            }
+        }
+        return { props: { searchIndex: searchIndexData } };
+    }
+    catch (error) {
+        if (error instanceof Error) {
+            console.error(error.message);
+            throw new MiddlewareError(500, searchDataUrl, [error.message], { show500: true });
+        }
+        else {
+            console.error('unexpected error');
+            throw new MiddlewareError(500, searchDataUrl, ['unexpected error'], { show500: true });
+        }
+    }
+};
+//# sourceMappingURL=withSearchIndex.js.map

package/dist/withSearchIndex.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"withSearchIndex.js","sourceRoot":"","sources":["../src/withSearchIndex.ts"],"names":[],"mappings":"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"}

package/dist/withSession.js

@@ -28,7 +28,7 @@ async function resolveSession(accessToken) {
  * @param options
  */
 export const withSession = async (context, options) => {
-    if (process.env.ENABLE_LOGIN !== 'true') {
+    if (process.env.NEXT_PUBLIC_ENABLE_LOGIN !== 'true') {
         return {};
     }
     if (!process.env.COOKIE_SECRET) {

package/dist/withSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"withSession.js","sourceRoot":"","sources":["../src/withSession.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAElF,OAAO,eAAe,MAAM,sBAAsB,CAAC;AAEnD,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IACjC,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;CAClE;AAiBD,MAAM,kBAAkB,GAAG,CAAC,OAAkC,EAAE,EAAE;IAChE,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CACxF,CAAC;IAEF,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CACb,qFAAqF,CACtF,CAAC;KACH;IACD,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACrC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChC,OAAO;QACL,QAAQ,EAAE;YACR,WAAW,EAAE,4BAA4B,kBAAkB,CAAC,GAAG,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE;YAC7F,SAAS,EAAE,KAAK;SACjB;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,KAAK,UAAU,cAAc,CAAC,WAAW;IACvC,OAAO,CACL,WAAW;QACX,OAAO,CAAC,GAAG,CAAC,2CAA2C,KAAK,MAAM;QACjE,mBAAmB,CAAC,WAAW,CAAa,CAC9C,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GAAmD,KAAK,EAC9E,OAAO,EACP,OAAO,EACP,EAAE;IACF,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,MAAM,EAAE;QACvC,OAAO,EAAE,CAAC;KACX;IACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE;QAC9B,MAAM,YAAY,GAAG,mEAAmE,CAAC;QACzF,MAAM,IAAI,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,YAAY,CAAC,EAAE;YAClE,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;KACJ;IACD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,WAAW,CAAC,CAAC;IAClD,uDAAuD;IACvD,MAAM,iBAAiB,GAAG,OAAO,EAAE,aAAa,CAAC;IACjD,MAAM,UAAU,GAAG,CAAC,CAAC,CACnB,WAAW;QACX,OAAO;QACP,6DAA6D;QAC7D,0BAA0B,CAAC,OAAO,EAAE,MAAM,CAAC,aAAa,CAAC,CAC1D,CAAC;IACF,IAAI,iBAAiB,IAAI,CAAC,UAAU,EAAE;QACpC,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC;KACpC;IAED,OAAO;QACL,KAAK,EAAE;YACL,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,UAAU;gBACV,WAAW;gBACX,gBAAgB;aACjB;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,0BAA0B,CAAC,OAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa;IAC5F,MAAM,EAAE,OAAO,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;IAChC,OAAO,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB,CAAC;AAClD,CAAC"}
+{"version":3,"file":"withSession.js","sourceRoot":"","sources":["../src/withSession.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAElF,OAAO,eAAe,MAAM,sBAAsB,CAAC;AAEnD,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IACjC,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;CAClE;AAiBD,MAAM,kBAAkB,GAAG,CAAC,OAAkC,EAAE,EAAE;IAChE,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CACxF,CAAC;IAEF,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CACb,qFAAqF,CACtF,CAAC;KACH;IACD,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACrC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChC,OAAO;QACL,QAAQ,EAAE;YACR,WAAW,EAAE,4BAA4B,kBAAkB,CAAC,GAAG,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE;YAC7F,SAAS,EAAE,KAAK;SACjB;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,KAAK,UAAU,cAAc,CAAC,WAAW;IACvC,OAAO,CACL,WAAW;QACX,OAAO,CAAC,GAAG,CAAC,2CAA2C,KAAK,MAAM;QACjE,mBAAmB,CAAC,WAAW,CAAa,CAC9C,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GAAmD,KAAK,EAC9E,OAAO,EACP,OAAO,EACP,EAAE;IACF,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,KAAK,MAAM,EAAE;QACnD,OAAO,EAAE,CAAC;KACX;IACD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE;QAC9B,MAAM,YAAY,GAAG,mEAAmE,CAAC;QACzF,MAAM,IAAI,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,YAAY,CAAC,EAAE;YAClE,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;KACJ;IACD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,WAAW,CAAC,CAAC;IAClD,uDAAuD;IACvD,MAAM,iBAAiB,GAAG,OAAO,EAAE,aAAa,CAAC;IACjD,MAAM,UAAU,GAAG,CAAC,CAAC,CACnB,WAAW;QACX,OAAO;QACP,6DAA6D;QAC7D,0BAA0B,CAAC,OAAO,EAAE,MAAM,CAAC,aAAa,CAAC,CAC1D,CAAC;IACF,IAAI,iBAAiB,IAAI,CAAC,UAAU,EAAE;QACpC,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC;KACpC;IAED,OAAO;QACL,KAAK,EAAE;YACL,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,UAAU;gBACV,WAAW;gBACX,gBAAgB;aACjB;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,0BAA0B,CAAC,OAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa;IAC5F,MAAM,EAAE,OAAO,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;IAChC,OAAO,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB,CAAC;AAClD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jpmorganchase/mosaic-site-middleware",
-  "version": "0.1.0-beta.21",
+  "version": "0.1.0-beta.23",
   "license": "Apache-2.0",
   "description": "Mosaic - Site middleware",
   "main": "./dist/index.js",
@@ -27,9 +27,9 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.256.0",
-    "@jpmorganchase/mosaic-schemas": "^0.1.0-beta.21",
-    "@jpmorganchase/mosaic-store": "^0.1.0-beta.21",
-    "@jpmorganchase/mosaic-types": "^0.1.0-beta.21",
+    "@jpmorganchase/mosaic-schemas": "^0.1.0-beta.23",
+    "@jpmorganchase/mosaic-store": "^0.1.0-beta.23",
+    "@jpmorganchase/mosaic-types": "^0.1.0-beta.23",
     "@types/mdast": "^3.0.0",
     "acorn": "^8.0.0",
     "acorn-jsx": "^5.0.0",
@@ -41,6 +41,7 @@
     "node-cookie": "^2.1.2",
     "react-error-boundary": "^3.1.4",
     "react-pro-sidebar": "1.0.0-alpha.7",
+    "remark-gfm": "3.0.1",
     "rehype-slug": "^5.0.1",
     "unified": "^10.0.0",
     "unist-util-visit": "^2.0.0",

package/src/compileMdx.ts

@@ -1,4 +1,5 @@
 import { serialize } from 'next-mdx-remote/serialize';
+import remarkGfm from 'remark-gfm';
 import rehypeSlug from 'rehype-slug';
 import { codeBlocks } from './plugins/codeBlocks.js';
 
@@ -11,7 +12,7 @@ export async function compileMDX(
   const mdxSource = await serialize(content, {
     mdxOptions: {
       rehypePlugins: [rehypeSlug, ...remarkPlugins],
-      remarkPlugins: [codeBlocks, ...rehypePlugins]
+      remarkPlugins: [codeBlocks, remarkGfm, ...rehypePlugins]
     },
     parseFrontmatter
   });

package/src/index.ts

@@ -4,5 +4,6 @@ export * from './MiddlewareError.js';
 export * from './middlewarePresets.js';
 export * from './withMDXContent.js';
 export * from './withMosaicMode.js';
+export * from './withSearchIndex.js';
 export * from './withSession.js';
 export * from './withSharedConfig.js';

package/src/middlewarePresets.ts

@@ -1,7 +1,7 @@
 import type { Redirect } from 'next';
-import { SharedConfigSlice } from '@jpmorganchase/mosaic-store';
+import { SearchIndexSlice, SharedConfigSlice } from '@jpmorganchase/mosaic-store';
 import type { ContentProps } from '@jpmorganchase/mosaic-types';
-
+import { withSearchIndex } from './withSearchIndex.js';
 import { withSharedConfig } from './withSharedConfig.js';
 import { withMDXContent } from './withMDXContent.js';
 import { MosaicMiddleware, MosaicMiddlewareWithConfig } from './createMiddlewareRunner.js';
@@ -35,10 +35,13 @@ export type MosaicAppProps<T> = {
 export type GetMosaicServerSidePropsResult<T> = MosaicAppProps<T>;
 
 /** MiddlewarePresets props */
-export type MiddlewarePresetsProps = MosaicModeProps & ContentProps & SharedConfigSlice;
+export type MiddlewarePresetsProps = MosaicModeProps &
+  ContentProps &
+  SearchIndexSlice &
+  SharedConfigSlice;
 
 /** A collection of preset [[`Middleware`]] plugins that will compose together the page props */
 export const middlewarePresets: Array<
   | MosaicMiddleware<MiddlewarePresetsProps>
   | MosaicMiddlewareWithConfig<MiddlewarePresetsProps, unknown>
-> = [withMosaicMode, withSharedConfig, withMDXContent];
+> = [withMosaicMode, withSharedConfig, withMDXContent, withSearchIndex];

package/src/withSearchIndex.ts

@@ -0,0 +1,109 @@
+import path from 'path';
+import { GetServerSidePropsContext } from 'next';
+import type { SearchIndex, SearchIndexSlice } from '@jpmorganchase/mosaic-store';
+import { fileLoaderProcessEnvSchema } from '@jpmorganchase/mosaic-schemas';
+import { MosaicMiddleware } from './createMiddlewareRunner.js';
+import MiddlewareError from './MiddlewareError.js';
+import { loadLocalFile, loadS3File } from './loaders';
+
+if (typeof window !== 'undefined') {
+  throw new Error('This file should not be loaded on the client.');
+}
+
+export { SearchIndex };
+
+/**
+ * Fetch search-data.json
+ *
+ * @param url the search data file URL
+ * @returns search data JSON
+ */
+export async function fetchSearchData(url: string) {
+  const response = await fetch(url, {
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  });
+  return response;
+}
+
+/**
+ * Get environment vars
+ *
+ * @param urlPath the path for the page being loaded
+ * @returns environment vars
+ */
+export const getEnv = urlPath => {
+  const env = fileLoaderProcessEnvSchema.safeParse(process.env);
+  if (!env.success) {
+    env.error.issues.forEach(issue => {
+      console.error(
+        `Missing process.env.${issue.path.join()} environment variable required to load shared-config for ${urlPath}`
+      );
+    });
+    throw new Error(
+      `Environment variables missing for loading of shared-config required by ${urlPath}`
+    );
+  }
+  return env;
+};
+
+/**
+ * Adds the [[`SearchIndex`]] props to the page props
+ * @param _context
+ * @returns site props object
+ */
+export const withSearchIndex: MosaicMiddleware<SearchIndexSlice> = async (
+  context: GetServerSidePropsContext
+) => {
+  const { res, resolvedUrl } = context;
+  const isSnapshotFile = res.getHeader('X-Mosaic-Mode') === 'snapshot-file';
+  const isSnapshotS3 = res.getHeader('X-Mosaic-Mode') === 'snapshot-s3';
+
+  const matches = resolvedUrl.match(/(.*)[!/]/);
+  const urlPath = matches?.length ? matches[1] : '';
+
+  const mosaicUrl = isSnapshotS3 || isSnapshotFile ? '' : res.getHeader('X-Mosaic-Content-Url');
+  const searchDataUrl = `${mosaicUrl}/search-data.json`;
+
+  try {
+    let searchIndexData;
+    if (isSnapshotFile) {
+      const env = getEnv(urlPath);
+      const { MOSAIC_SNAPSHOT_DIR: mosaicSnapshotDir } = env.data;
+      const filePath = path.join(process.cwd(), mosaicSnapshotDir, 'search-data.json');
+      const rawSearchIndexData = await loadLocalFile(filePath);
+      searchIndexData = JSON.parse(rawSearchIndexData);
+    } else if (isSnapshotS3) {
+      const s3Key = `/search-data.json`.replace(/^\//, '');
+      const rawSearchIndexData = await loadS3File(s3Key);
+      searchIndexData = JSON.parse(rawSearchIndexData);
+    } else {
+      const response = await fetchSearchData(searchDataUrl);
+      if (response.ok && response.status !== 204) {
+        searchIndexData = await response.json();
+      } else {
+        const show500 = response.status !== 404 && response.status !== 204;
+        const show404 = response.status === 404;
+        let errorMessage = `Could not find any search data defined for ${searchDataUrl}`;
+        if (show500) {
+          errorMessage = `An un-expected error occurred reading ${searchDataUrl}`;
+        }
+        throw new MiddlewareError(response.status, searchDataUrl, [errorMessage], {
+          show404,
+          show500
+        });
+      }
+    }
+
+    return { props: { searchIndex: searchIndexData } };
+  } catch (error) {
+    if (error instanceof Error) {
+      console.error(error.message);
+      throw new MiddlewareError(500, searchDataUrl, [error.message], { show500: true });
+    } else {
+      console.error('unexpected error');
+      throw new MiddlewareError(500, searchDataUrl, ['unexpected error'], { show500: true });
+    }
+  }
+};

package/src/withSession.ts

@@ -61,7 +61,7 @@ export const withSession: MosaicMiddleware<SessionProps, SessionOptions> = async
   context,
   options
 ) => {
-  if (process.env.ENABLE_LOGIN !== 'true') {
+  if (process.env.NEXT_PUBLIC_ENABLE_LOGIN !== 'true') {
     return {};
   }
   if (!process.env.COOKIE_SECRET) {