#8614: rename remaining instances of recipe in the page editor

src/bricks/effects/assignModVariable.test.ts

@@ -29,23 +29,23 @@ import { autoUUIDSequence } from "@/testUtils/factories/stringFactories";
 import { validateBrickInputOutput } from "@/validators/schemaValidator";
 import { brickOptionsFactory } from "@/testUtils/factories/runtimeFactories";
 
-const extensionId = autoUUIDSequence();
-const blueprintId = validateRegistryId("test/123");
+const modComponentId = autoUUIDSequence();
+const modId = validateRegistryId("test/123");
 
 const brick = new AssignModVariable();
 
 const logger = new ConsoleLogger({
-  extensionId,
-  blueprintId,
+  extensionId: modComponentId,
+  blueprintId: modId,
 });
 
 const brickOptions = brickOptionsFactory({ logger });
 
 beforeEach(() => {
   setState({
     namespace: StateNamespaces.MOD,
-    blueprintId,
-    extensionId,
+    modId,
+    modComponentId,
     mergeStrategy: MergeStrategies.REPLACE,
     data: {},
   });
@@ -64,7 +64,11 @@ describe("@pixiebrix/state/assign", () => {
     );
 
     expect(
-      getState({ namespace: StateNamespaces.MOD, blueprintId, extensionId }),
+      getState({
+        namespace: StateNamespaces.MOD,
+        modId,
+        modComponentId,
+      }),
     ).toEqual({ foo: { bar: 42 } });
   });
 
@@ -94,7 +98,11 @@ describe("@pixiebrix/state/assign", () => {
     );
 
     expect(
-      getState({ namespace: StateNamespaces.MOD, blueprintId, extensionId }),
+      getState({
+        namespace: StateNamespaces.MOD,
+        modId,
+        modComponentId,
+      }),
     ).toEqual({ foo: null });
   });
 
@@ -110,7 +118,11 @@ describe("@pixiebrix/state/assign", () => {
     );
 
     expect(
-      getState({ namespace: StateNamespaces.MOD, blueprintId, extensionId }),
+      getState({
+        namespace: StateNamespaces.MOD,
+        modId,
+        modComponentId,
+      }),
     ).toEqual({ foo: 42, bar: 0 });
   });
 

src/bricks/effects/assignModVariable.ts

@@ -96,14 +96,14 @@ class AssignModVariable extends EffectABC {
     }>,
     { logger }: BrickOptions,
   ): Promise<void> {
-    const { blueprintId, extensionId } = logger.context;
+    const { blueprintId: modId, extensionId: modComponentId } = logger.context;
 
     setState({
       namespace: StateNamespaces.MOD,
       data: { [variableName]: value },
       mergeStrategy: MergeStrategies.SHALLOW,
-      extensionId,
-      blueprintId,
+      modComponentId,
+      modId,
     });
   }
 }

src/bricks/effects/pageState.ts

@@ -157,8 +157,8 @@ export class SetPageState extends TransformerABC {
       data,
       mergeStrategy,
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-unnecessary-type-assertion -- TODO: https://github.com/pixiebrix/pixiebrix-extension/issues/7891
-      extensionId: extensionId!,
-      blueprintId,
+      modComponentId: extensionId!,
+      modId: blueprintId,
     });
   }
 }
@@ -205,12 +205,12 @@ export class GetPageState extends TransformerABC {
     }: BrickArgs<{ namespace?: StateNamespace }>,
     { logger, platform }: BrickOptions,
   ): Promise<JsonObject> {
-    const { blueprintId, extensionId } = logger.context;
+    const { blueprintId: modId, extensionId: modComponentId } = logger.context;
 
     return platform.state.getState({
       namespace,
-      blueprintId,
-      extensionId,
+      modId,
+      modComponentId,
     });
   }
 }

src/bricks/renderers/customForm.test.tsx

@@ -352,8 +352,8 @@ describe("CustomFormRenderer", () => {
       expect(
         getState({
           namespace: StateNamespaces.MOD,
-          extensionId: options.logger.context.extensionId,
-          blueprintId: options.logger.context.blueprintId,
+          modComponentId: options.logger.context.extensionId,
+          modId: options.logger.context.blueprintId,
         }),
       ).toStrictEqual({
         name: value,

src/bricks/renderers/customForm.tsx

@@ -423,8 +423,8 @@ async function getInitialData(
       // is rendered in. And for the PixieBrix sidebar, target the top-level frame.
       return getPageState(topLevelFrame, {
         namespace,
-        blueprintId,
-        extensionId,
+        modId: blueprintId,
+        modComponentId: extensionId,
       });
     }
 
@@ -487,8 +487,8 @@ async function setData(
         namespace: storage.namespace ?? StateNamespaces.MOD,
         data: cleanValues,
         mergeStrategy: MergeStrategies.SHALLOW,
-        extensionId,
-        blueprintId,
+        modComponentId: extensionId,
+        modId: blueprintId,
       });
       return;
     }

src/bricks/transformers/controlFlow/WithAsyncModVariable.test.ts

@@ -74,8 +74,8 @@ const logger = new ConsoleLogger({
 function expectPageState(expectedState: UnknownObject) {
   const pageState = getState({
     namespace: StateNamespaces.MOD,
-    extensionId,
-    blueprintId,
+    modComponentId: extensionId,
+    modId: blueprintId,
   });
 
   expect(pageState).toStrictEqual(expectedState);
@@ -90,8 +90,8 @@ describe("WithAsyncModVariable", () => {
     setState({
       namespace: StateNamespaces.MOD,
       data: {},
-      blueprintId,
-      extensionId,
+      modId: blueprintId,
+      modComponentId: extensionId,
       mergeStrategy: MergeStrategies.REPLACE,
     });
 

src/bricks/transformers/controlFlow/WithAsyncModVariable.ts

@@ -203,8 +203,8 @@ export class WithAsyncModVariable extends TransformerABC {
         // Using shallow will replace the state key, but keep other keys
         mergeStrategy:
           strategy === "put" ? MergeStrategies.SHALLOW : MergeStrategies.DEEP,
-        extensionId,
-        blueprintId,
+        modComponentId: extensionId,
+        modId: blueprintId,
       });
     };
 
@@ -214,8 +214,8 @@ export class WithAsyncModVariable extends TransformerABC {
     // Get/set page state calls are synchronous from the content script, so safe to call sequentially
     const currentState = getState({
       namespace: StateNamespaces.MOD,
-      extensionId,
-      blueprintId,
+      modComponentId: extensionId,
+      modId: blueprintId,
     });
 
     // eslint-disable-next-line security/detect-object-injection -- user provided value that's readonly

src/bricks/transformers/temporaryInfo/DisplayTemporaryInfo.test.ts

@@ -383,8 +383,8 @@ describe("DisplayTemporaryInfo", () => {
       namespace: StateNamespaces.MOD,
       data: { foo: 42 },
       mergeStrategy: MergeStrategies.REPLACE,
-      extensionId,
-      blueprintId: null,
+      modComponentId: extensionId,
+      modId: null,
     });
 
     await tick();

src/components/fields/schemaFields/widgets/varPopup/VarMenu.tsx

@@ -174,8 +174,8 @@ const VarMenu: React.FunctionComponent<VarMenuProps> = ({
     async () =>
       getPageState(inspectedTab, {
         namespace: StateNamespaces.MOD,
-        extensionId: null,
-        blueprintId: activeModComponentFormState.recipe?.id,
+        modComponentId: null,
+        modId: activeModComponentFormState.recipe?.id,
       }),
     [],
   );

src/contentScript/pageEditor/runBrickPreview.ts

@@ -39,10 +39,10 @@ export async function runBrickPreview({
   blockConfig,
   context,
   apiVersion,
-  blueprintId,
+  modId,
   rootSelector,
 }: RunBrickArgs & {
-  blueprintId: Nullishable<RegistryId>;
+  modId: Nullishable<RegistryId>;
 }): Promise<unknown> {
   const versionOptions = apiVersionOptions(apiVersion);
 
@@ -54,7 +54,7 @@ export async function runBrickPreview({
 
   const state: IntermediateState = {
     context: extendModVariableContext(context, {
-      blueprintId,
+      modId,
       update: true,
       options: versionOptions,
     }),

src/contentScript/pageEditor/runRendererBrick.ts

@@ -47,15 +47,15 @@ type Location = "modal" | "panel";
  * @see useDocumentPreviewRunBlock
  */
 export async function runRendererBrick({
-  extensionId,
-  blueprintId,
+  modComponentId,
+  modId,
   runId,
   title,
   args,
   location,
 }: {
-  extensionId: UUID;
-  blueprintId: RegistryId | null;
+  modComponentId: UUID;
+  modId: RegistryId | null;
   runId: UUID;
   title: string;
   args: RunBrickArgs;
@@ -65,7 +65,7 @@ export async function runRendererBrick({
 
   let payload: PanelPayload;
   try {
-    await runBrickPreview({ ...args, blueprintId });
+    await runBrickPreview({ ...args, modId });
     // We're expecting a HeadlessModeError (or other error) to be thrown in the line above
     // noinspection ExceptionCaughtLocallyJS
     throw new NoRendererError();
@@ -76,23 +76,23 @@ export async function runRendererBrick({
         blockId: error.blockId,
         args: error.args,
         ctxt: error.ctxt,
-        extensionId,
+        extensionId: modComponentId,
         runId,
       };
     } else {
       payload = {
         key: nonce,
         error: serializeError(error),
-        extensionId,
+        extensionId: modComponentId,
         runId,
       };
     }
 
     if (location === "panel") {
       await showTemporarySidebarPanel({
         // Pass extension id so previous run is cancelled
-        extensionId,
-        blueprintId,
+        extensionId: modComponentId,
+        blueprintId: modId,
         nonce,
         heading: title,
         payload,
@@ -107,10 +107,10 @@ export async function runRendererBrick({
         await waitForTemporaryPanel({
           nonce,
           location,
-          extensionId,
+          extensionId: modComponentId,
           entry: {
-            extensionId,
-            blueprintId,
+            extensionId: modComponentId,
+            blueprintId: modId,
             nonce,
             heading: title,
             payload,

src/contentScript/pipelineProtocol/runMapArgs.ts

@@ -40,7 +40,7 @@ export async function runMapArgs({
   config,
   context,
   options,
-  blueprintId,
+  modId,
 }: {
   config: Args;
   context: UnknownObject;
@@ -51,12 +51,12 @@ export async function runMapArgs({
      */
     extendModVariable: boolean;
   };
-  blueprintId: Nullishable<RegistryId>;
+  modId: Nullishable<RegistryId>;
 }): Promise<unknown> {
   expectContext("contentScript");
 
   const extendedContext = extendModVariableContext(context, {
-    blueprintId,
+    modId,
     options,
     // The mod variable is only update when running a brick in a pipeline. It's not updated for `defer` expressions,
     // e.g., when rendering items for a ListElement in the Document Builder.

src/pageEditor/ModComponentFormStateWizard.tsx

@@ -56,7 +56,7 @@ const WizardNavItem: React.FunctionComponent<{
 /**
  * @deprecated This will soon be split into a new business-logic component, decoupled with the layout, using EditTabLayout
  * @see EditorTabLayout
- * @see RecipePane
+ * @see EditorPane
  */
 const ModComponentFormStateWizard: React.FunctionComponent<{
   modComponentFormState: ModComponentFormState;