@betterportal/framework 10.1.42 → 10.1.44

package/lib/runtime/view.js

@@ -29,20 +29,15 @@ export function createViewDefinition(input) {
         }
     };
 }
-function resolveTheme(html, requestedTheme) {
-    if (!requestedTheme)
-        return null;
-    return requestedTheme in html.themeRenderers ? requestedTheme : null;
-}
-function resolveMode(html, theme, requestedMode) {
-    const renderer = html.themeRenderers[theme];
+function resolveMode(html, rendererKey, requestedMode) {
+    const renderer = html.renderers[rendererKey];
     if (!renderer)
         return null;
     if (!requestedMode)
         return renderer.renderModes[0] ?? null;
     return renderer.renderModes.includes(requestedMode) ? requestedMode : null;
 }
-export function negotiateViewResponse(view, acceptHeader, jsonBody, renderHtml) {
+export function negotiateViewResponse(view, acceptHeader, jsonBody, rendererKey, renderHtml) {
     const requested = resolveRequestedRepresentation(acceptHeader);
     const validatedJsonBody = view.schemas.response.parse(jsonBody);
     if (requested.kind === "metadata") {
@@ -79,8 +74,7 @@ export function negotiateViewResponse(view, acceptHeader, jsonBody, renderHtml)
             }
         };
     }
-    const theme = resolveTheme(view.html, requested.theme);
-    if (!theme) {
+    if (!rendererKey || !(rendererKey in view.html.renderers)) {
         return {
             status: 406,
             contentType: "application/json",
@@ -89,7 +83,7 @@ export function negotiateViewResponse(view, acceptHeader, jsonBody, renderHtml)
             }
         };
     }
-    const mode = resolveMode(view.html, theme, requested.mode);
+    const mode = resolveMode(view.html, rendererKey, requested.mode);
     if (!mode) {
         return {
             status: 406,
@@ -101,8 +95,8 @@ export function negotiateViewResponse(view, acceptHeader, jsonBody, renderHtml)
     }
     return {
         status: 200,
-        contentType: `text/html; theme=${theme}; mode=${mode}`,
-        body: renderHtml(theme, mode, jsonBody)
+        contentType: `text/html; mode=${mode}`,
+        body: renderHtml(rendererKey, mode, jsonBody)
     };
 }
 export function resolveRepresentationFromAccept(acceptHeader) {

package/lib/runtime/view.js.map

@@ -1 +1 @@
-{"version":3,"file":"view.js","sourceRoot":"","sources":["../../src/runtime/view.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"view.js","sourceRoot":"","sources":["../../src/runtime/view.ts"],"names":[],"mappings":"AAIA,OAAO,EAIL,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAA2B,8BAA8B,EAAE,MAAM,YAAY,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AA6DvD,MAAM,UAAU,oBAAoB,CAOlC,KAAsG;IAEtG,MAAM,QAAQ,GAAG,kBAAkB,CAAC,KAAK,CAAC;QACxC,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,OAAO,EAAE,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC;QAC3B,YAAY,EAAE,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QACxD,WAAW,EAAE,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACtD,aAAa,EAAE,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAC1D,UAAU,EAAE,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QACpD,kBAAkB,EAAE,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;QAChE,sBAAsB,EAAE,oBAAoB,CAAC,kBAAkB,CAAC;QAChE,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,aAAa,EAAE,CAAC,KAAK,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC5D,GAAG,QAAQ;YACX,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAc;SACvE,CAAC,CAAC;QACH,UAAU,EAAE,KAAK,CAAC,UAAU;KAC7B,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,KAAK;QACR,UAAU;YACR,OAAO,QAAQ,CAAC;QAClB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,IAA+B,EAAE,WAAmB,EAAE,aAA0B;IACnG,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC7C,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3B,IAAI,CAAC,aAAa;QAAE,OAAO,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAC3D,OAAO,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7E,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,IAA4F,EAC5F,YAAgC,EAChC,QAA+B,EAC/B,WAA+B,EAC/B,UAA6G;IAE7G,MAAM,SAAS,GAAG,8BAA8B,CAAC,YAAY,CAAC,CAAC;IAC/D,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAc,CAAC;IAE7E,IAAI,SAAS,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAClC,OAAO;YACL,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,4CAA4C;YACzD,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE;SACxB,CAAC;IACJ,CAAC;IAED,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC9B,OAAO;YACL,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,kBAAkB;YAC/B,IAAI,EAAE,iBAAiB;SACxB,CAAC;IACJ,CAAC;IAED,8EAA8E;IAC9E,qEAAqE;IACrE,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO;YACL,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,kBAAkB;YAC/B,IAAI,EAAE;gBACJ,KAAK,EAAE,gDAAgD;aACxD;SACF,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO;YACL,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,kBAAkB;YAC/B,IAAI,EAAE;gBACJ,KAAK,EAAE,+CAA+C;aACvD;SACF,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1D,OAAO;YACL,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,kBAAkB;YAC/B,IAAI,EAAE;gBACJ,KAAK,EAAE,gDAAgD;aACxD;SACF,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IACjE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;YACL,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,kBAAkB;YAC/B,IAAI,EAAE;gBACJ,KAAK,EAAE,gDAAgD;aACxD;SACF,CAAC;IACJ,CAAC;IAED,OAAO;QACL,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,mBAAmB,IAAI,EAAE;QACtC,IAAI,EAAE,UAAU,CAAC,WAAW,EAAE,IAAI,EAAE,QAAQ,CAAC;KAC9C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,YAAqB;IACnE,OAAO,8BAA8B,CAAC,YAAY,CAAC,CAAC;AACtD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@betterportal/framework",
-  "version": "10.1.42",
+  "version": "10.1.44",
   "description": "BetterPortal v10 core library for Node.js",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",