@memberjunction/react-runtime 6.2.0-edge.3 → 6.2.0-edge.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/react-runtime",
-  "version": "6.2.0-edge.3",
+  "version": "6.2.0-edge.5",
   "description": "Platform-agnostic React component runtime for MemberJunction. Provides core compilation, registry, and execution capabilities for React components in any JavaScript environment.",
   "type": "module",
   "main": "dist/index.js",
@@ -20,12 +20,12 @@
   "homepage": "https://github.com/MemberJunction/MJ#readme",
   "dependencies": {
     "@babel/standalone": "^7.29.1",
-    "@memberjunction/ai-vectors-memory": "6.2.0-edge.3",
-    "@memberjunction/core": "6.2.0-edge.3",
-    "@memberjunction/core-entities": "6.2.0-edge.3",
-    "@memberjunction/global": "6.2.0-edge.3",
-    "@memberjunction/graphql-dataprovider": "6.2.0-edge.3",
-    "@memberjunction/interactive-component-types": "6.2.0-edge.3",
+    "@memberjunction/ai-vectors-memory": "6.2.0-edge.5",
+    "@memberjunction/core": "6.2.0-edge.5",
+    "@memberjunction/core-entities": "6.2.0-edge.5",
+    "@memberjunction/global": "6.2.0-edge.5",
+    "@memberjunction/graphql-dataprovider": "6.2.0-edge.5",
+    "@memberjunction/interactive-component-types": "6.2.0-edge.5",
     "rxjs": "^7.8.2"
   },
   "devDependencies": {

package/src/__tests__/component-registry-service.test.ts

@@ -0,0 +1,38 @@
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { GetGlobalObjectStore } from '@memberjunction/global';
+import { ComponentRegistryService } from '../registry/component-registry-service';
+import type { ComponentCompiler } from '../compiler/component-compiler';
+import type { RuntimeContext } from '../types';
+
+describe('ComponentRegistryService singleton', () => {
+  const mockCompiler = {} as ComponentCompiler;
+  const mockRuntimeContext = {} as RuntimeContext;
+
+  beforeEach(() => {
+    ComponentRegistryService.Reset();
+  });
+
+  afterEach(() => {
+    ComponentRegistryService.Reset();
+  });
+
+  it('stores the singleton instance in GlobalObjectStore and clears it on Reset()', () => {
+    const globalStore = GetGlobalObjectStore();
+    expect(globalStore?.['___SINGLETON__ComponentRegistryService']).toBeUndefined();
+    expect(ComponentRegistryService.Instance).toBeUndefined();
+
+    const first = ComponentRegistryService.GetInstance(mockCompiler, mockRuntimeContext, false);
+    expect(first).toBeInstanceOf(ComponentRegistryService);
+    expect(globalStore?.['___SINGLETON__ComponentRegistryService']).toBe(first);
+    expect(ComponentRegistryService.Instance).toBe(first);
+    expect(ComponentRegistryService.getInstance(mockCompiler, mockRuntimeContext)).toBe(first);
+
+    ComponentRegistryService.Reset();
+    expect(globalStore?.['___SINGLETON__ComponentRegistryService']).toBeUndefined();
+    expect(ComponentRegistryService.Instance).toBeUndefined();
+
+    const second = ComponentRegistryService.GetInstance(mockCompiler, mockRuntimeContext, false);
+    expect(second).toBeInstanceOf(ComponentRegistryService);
+    expect(second).not.toBe(first);
+  });
+});

package/src/registry/component-registry-service.ts

@@ -14,7 +14,7 @@ import {
   RegistryComponentMetadata
 } from './registry-provider';
 import { UserInfo, Metadata, IMetadataProvider } from '@memberjunction/core';
-import { UUIDsEqual } from '@memberjunction/global';
+import { GetGlobalObjectStore, UUIDsEqual } from '@memberjunction/global';
 import { 
   MJComponentEntity, 
   MJComponentRegistryEntity,
@@ -59,7 +59,7 @@ export interface IComponentRegistryClient {
  * Service for managing component loading from registries with compilation caching
  */
 export class ComponentRegistryService {
-  private static instance: ComponentRegistryService | null = null;
+  private static readonly _globalStoreKey = '___SINGLETON__ComponentRegistryService';
   
   // Caches
   private compiledComponentCache = new Map<string, CachedCompiledComponent>();
@@ -97,9 +97,18 @@ export class ComponentRegistryService {
     this.debug = debug;
     this.graphQLClient = graphQLClient;
   }
+
+  /**
+   * Returns the initialized singleton instance from the Global Object Store, or undefined if not yet created.
+   */
+  public static get Instance(): ComponentRegistryService | undefined {
+    const g = GetGlobalObjectStore();
+    return g ? (g[ComponentRegistryService._globalStoreKey] as ComponentRegistryService | undefined) : undefined;
+  }
   
   /**
-   * Get or create the singleton instance
+   * Get or create the singleton instance, backed by the Global Object Store so bundler duplication
+   * across execution paths cannot split the cached registry.
    */
   static GetInstance(
     compiler: ComponentCompiler, 
@@ -107,10 +116,14 @@ export class ComponentRegistryService {
     debug: boolean = false,
     graphQLClient?: IComponentRegistryClient
   ): ComponentRegistryService {
-    if (!ComponentRegistryService.instance) {
-      ComponentRegistryService.instance = new ComponentRegistryService(compiler, context, debug, graphQLClient);
+    const g = GetGlobalObjectStore();
+    if (g) {
+      if (!g[ComponentRegistryService._globalStoreKey]) {
+        g[ComponentRegistryService._globalStoreKey] = new ComponentRegistryService(compiler, context, debug, graphQLClient);
+      }
+      return g[ComponentRegistryService._globalStoreKey] as ComponentRegistryService;
     }
-    return ComponentRegistryService.instance;
+    return new ComponentRegistryService(compiler, context, debug, graphQLClient);
   }
 
   /** @deprecated Use {@link GetInstance}. */
@@ -990,9 +1003,13 @@ export class ComponentRegistryService {
    * Forces new instance creation on next access
    */
   static Reset(): void {
-    if (ComponentRegistryService.instance) {
-      ComponentRegistryService.instance.forceClearAll();
-      ComponentRegistryService.instance = null;
+    const g = GetGlobalObjectStore();
+    const existing = g ? (g[ComponentRegistryService._globalStoreKey] as ComponentRegistryService | undefined) : undefined;
+    if (existing) {
+      existing.forceClearAll();
+      if (g) {
+        delete g[ComponentRegistryService._globalStoreKey];
+      }
     }
   }