@nordcraft/runtime 1.0.39 → 1.0.41

package/package.json

@@ -4,8 +4,8 @@
 "type": "module",
 "homepage": "https://github.com/nordcraftengine/nordcraft",
 "dependencies": {
-"@nordcraft/core": "1.0.39",
-"@nordcraft/std-lib": "1.0.39",
+"@nordcraft/core": "1.0.41",
+"@nordcraft/std-lib": "1.0.41",
 "fast-deep-equal": "3.1.3",
 "path-to-regexp": "6.3.0"
 },
@@ -21,5 +21,5 @@
 "files": ["dist", "src"],
 "main": "dist/page.main.js",
 "types": "dist/page.main.d.ts",
-"version": "1.0.39"
+"version": "1.0.41"
 }

package/src/editor-preview.main.ts

@@ -16,7 +16,10 @@ import type {
   ToddleEnv,
 } from '@nordcraft/core/dist/formula/formula'
 import { applyFormula } from '@nordcraft/core/dist/formula/formula'
-import type { PluginFormula } from '@nordcraft/core/dist/formula/formulaTypes'
+import {
+  isToddleFormula,
+  type PluginFormula,
+} from '@nordcraft/core/dist/formula/formulaTypes'
 import { valueFormula } from '@nordcraft/core/dist/formula/formulaUtils'
 import { getClassName } from '@nordcraft/core/dist/styling/className'
 import type { OldTheme, Theme } from '@nordcraft/core/dist/styling/theme'
@@ -31,6 +34,7 @@ import type {
   Toddle,
 } from '@nordcraft/core/dist/types'
 import { mapObject, omitKeys } from '@nordcraft/core/dist/utils/collections'
+import type { PluginAction } from '@nordcraft/ssr/dist/ssr.types'
 import * as libActions from '@nordcraft/std-lib/dist/actions'
 import * as libFormulas from '@nordcraft/std-lib/dist/formulas'
 import fastDeepEqual from 'fast-deep-equal'
@@ -85,6 +89,17 @@ type ToddlePreviewEvent =
         }
       >
     }
+  | {
+      type: 'global_formulas'
+      formulas: Record<
+        string,
+        PluginFormula<FormulaHandlerV2> | PluginFormula<string>
+      >
+    }
+  | {
+      type: 'global_actions'
+      actions: Record<string, PluginActionV2 | PluginAction>
+    }
   | { type: 'theme'; theme: Theme | OldTheme }
   | { type: 'mode'; mode: 'design' | 'test' }
   | { type: 'attrs'; attrs: Record<string, unknown> }
@@ -160,13 +175,7 @@ enum TextNodeComputedStyles {
 
 let env: ToddleEnv
 
-export const initGlobalObject = ({
-  formulas,
-  actions,
-}: {
-  formulas: Record<string, Record<string, PluginFormula<FormulaHandlerV2>>>
-  actions: Record<string, Record<string, PluginActionV2>>
-}) => {
+export const initGlobalObject = () => {
   env = {
     isServer: false,
     branchName: window.__toddle.branch,
@@ -175,14 +184,14 @@ export const initGlobalObject = ({
     logErrors: true,
   }
   window.toddle = (() => {
-    const legacyActions: Record<string, ActionHandler> = {}
-    const legacyFormulas: Record<string, FormulaHandler> = {}
+    const legacyActions: Record<string, ActionHandler | undefined> = {}
+    const legacyFormulas: Record<string, FormulaHandler | undefined> = {}
     const argumentInputDataList: Record<string, ArgumentInputDataFunction> = {}
     const toddle: Toddle<LocationSignal, PreviewShowSignal> = {
       isEqual: fastDeepEqual,
       errors: [],
-      formulas,
-      actions,
+      formulas: {},
+      actions: {},
       registerAction: (name, handler) => {
         if (legacyActions[name]) {
           console.error('There already exists an action with the name ', name)
@@ -190,6 +199,13 @@ export const initGlobalObject = ({
         }
         legacyActions[name] = handler
       },
+      clearLegacyActions: () => {
+        Object.keys(legacyActions)
+          .filter((key) => !key.startsWith('@toddle/'))
+          .forEach((key) => {
+            delete legacyActions[key]
+          })
+      },
       getAction: (name) => legacyActions[name],
       registerFormula: (name, handler, getArgumentInputData) => {
         if (legacyFormulas[name]) {
@@ -201,6 +217,13 @@ export const initGlobalObject = ({
           argumentInputDataList[name] = getArgumentInputData
         }
       },
+      clearLegacyFormulas: () => {
+        Object.keys(legacyFormulas)
+          .filter((key) => !key.startsWith('@toddle/'))
+          .forEach((key) => {
+            delete legacyFormulas[key]
+          })
+      },
       getFormula: (name) => legacyFormulas[name],
       getCustomAction: (name, packageName) => {
         return (
@@ -415,6 +438,45 @@ export const createRoot = (
 
           break
         }
+        case 'global_formulas': {
+          const formulas: Record<string, PluginFormula<FormulaHandlerV2>> = {}
+          window.toddle.clearLegacyFormulas?.()
+          Object.entries(message.data.formulas ?? {}).forEach(
+            ([name, formula]) => {
+              if (
+                !isToddleFormula<FormulaHandlerV2 | string>(formula) &&
+                typeof formula.name === 'string' &&
+                formula.version === undefined
+              ) {
+                // Legacy formulas are self-registering. We need to execute them to register them
+                Function(formula.handler as unknown as string)()
+                return
+              }
+              formulas[name] = formula as PluginFormula<FormulaHandlerV2>
+            },
+          )
+          window.toddle.formulas[window.__toddle.project] = formulas
+          break
+        }
+        case 'global_actions': {
+          const actions: Record<string, PluginActionV2> = {}
+          window.toddle.clearLegacyActions?.()
+          Object.entries(message.data.actions ?? {}).forEach(
+            ([name, action]) => {
+              if (
+                typeof action.name === 'string' &&
+                action.version === undefined
+              ) {
+                // Legacy actions are self-registering. We need to execute them to register them
+                Function(action.handler)()
+                return
+              }
+              actions[name] = action as PluginActionV2
+            },
+          )
+          window.toddle.actions[window.__toddle.project] = actions
+          break
+        }
         case 'packages': {
           if (message.data.packages) {
             packageComponents = Object.values(message.data.packages ?? {})