@nordcraft/runtime 1.0.18 → 1.0.20

package/package.json

@@ -4,13 +4,13 @@
 "type": "module",
 "homepage": "https://github.com/nordcraftengine/nordcraft",
 "dependencies": {
-"@nordcraft/core": "1.0.18",
-"@nordcraft/std-lib": "1.0.18",
+"@nordcraft/core": "1.0.20",
+"@nordcraft/std-lib": "1.0.20",
 "fast-deep-equal": "3.1.3",
 "path-to-regexp": "6.3.0"
 },
 "devDependencies": {
-"@happy-dom/global-registrator": "17.4.7"
+"@happy-dom/global-registrator": "17.5.6"
 },
 "scripts": {
 "build": "tsc && bun scripts/build.js",
@@ -21,5 +21,5 @@
 "files": ["dist", "src"],
 "main": "dist/page.main.js",
 "types": "dist/page.main.d.ts",
-"version": "1.0.18"
+"version": "1.0.20"
 }

package/src/api/createAPI.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-floating-promises */
 import type { LegacyComponentAPI } from '@nordcraft/core/dist/api/apiTypes'
+import { mapHeadersToObject } from '@nordcraft/core/dist/api/headers'
 import type { ComponentData } from '@nordcraft/core/dist/component/component.types'
 import { applyFormula, isFormula } from '@nordcraft/core/dist/formula/formula'
 import { mapValues } from '@nordcraft/core/dist/utils/collections'
@@ -362,10 +363,7 @@ export function createLegacyAPI(
         url: request?.url ?? apiPayload.url,
         method: request?.method ?? apiPayload.method,
         auth: request?.auth ?? apiPayload.auth,
-        headers: [...headers.entries()].reduce<Record<string, string>>(
-          (acc, [key, value]) => ({ ...acc, [key]: value }),
-          {},
-        ),
+        headers: mapHeadersToObject(headers),
         body,
       }
       return trigger(payload)

package/src/api/createAPIv2.ts

@@ -17,6 +17,7 @@ import {
   isJsonHeader,
   isJsonStreamHeader,
   isTextHeader,
+  mapHeadersToObject,
 } from '@nordcraft/core/dist/api/headers'
 import type { ComponentData } from '@nordcraft/core/dist/component/component.types'
 import type {
@@ -29,8 +30,12 @@ import {
   omitPaths,
   sortObjectEntries,
 } from '@nordcraft/core/dist/utils/collections'
-import { PROXY_URL_HEADER, validateUrl } from '@nordcraft/core/dist/utils/url'
-import { isDefined } from '@nordcraft/core/dist/utils/util'
+import {
+  PROXY_TEMPLATES_IN_BODY,
+  PROXY_URL_HEADER,
+  validateUrl,
+} from '@nordcraft/core/dist/utils/url'
+import { isDefined, toBoolean } from '@nordcraft/core/dist/utils/util'
 import { handleAction } from '../events/handleAction'
 import type { Signal } from '../signal/signal'
 import type { ComponentContext, ContextApiV2 } from '../types'
@@ -410,6 +415,15 @@ export function createAPI({
             PROXY_URL_HEADER,
             decodeURIComponent(url.href.replace(/\+/g, ' ')),
           )
+          const allowBodyTemplateValues = toBoolean(
+            applyFormula(
+              api.server?.proxy?.useTemplatesInBody?.formula,
+              getFormulaContext(api, componentData),
+            ),
+          )
+          if (allowBodyTemplateValues) {
+            headers.set(PROXY_TEMPLATES_IN_BODY, 'true')
+          }
           requestSettings.headers = headers
           response = await fetch(proxyUrl, requestSettings)
         }
@@ -582,7 +596,7 @@ export function createAPI({
       error: null,
       response: {
         status: res.status,
-        headers: Object.fromEntries(res.headers.entries()),
+        headers: mapHeadersToObject(res.headers),
       },
     }
     return endResponse({ api, apiStatus: status, componentData, performance })
@@ -607,7 +621,7 @@ export function createAPI({
       error: null,
       response: {
         status: res.status,
-        headers: Object.fromEntries(res.headers.entries()),
+        headers: mapHeadersToObject(res.headers),
       },
     }
     return endResponse({ api, apiStatus: status, componentData, performance })
@@ -700,7 +714,7 @@ export function createAPI({
                 data: parseChunksForData(this.chunks),
                 error: null,
                 response: {
-                  headers: Object.fromEntries(res.headers.entries()),
+                  headers: mapHeadersToObject(res.headers),
                 },
               },
             },
@@ -754,7 +768,7 @@ export function createAPI({
       error: null,
       response: {
         status: res.status,
-        headers: Object.fromEntries(res.headers.entries()),
+        headers: mapHeadersToObject(res.headers),
       },
     }
 

package/src/editor-preview.main.ts

@@ -102,7 +102,7 @@ type ToddlePreviewEvent =
   | { type: 'keyup'; key: string; altKey: boolean; metaKey: boolean }
   | {
       type: 'get_computed_style'
-      styles: string[]
+      styles?: string[]
     }
   | {
       type: 'set_timeline_keyframes'
@@ -863,7 +863,7 @@ export const createRoot = (
             {
               type: 'computedStyle',
               computedStyle: Object.fromEntries(
-                styles.map((style) => [
+                (styles ?? []).map((style) => [
                   style,
                   computedStyle.getPropertyValue(style),
                 ]),