@rpgjs/client 5.0.0-beta.1 → 5.0.0-beta.10

package/src/components/scenes/canvas.ce

@@ -1,8 +1,26 @@
 <Canvas width={engine.width} height={engine.height}>
   <Viewport worldWidth worldHeight clamp sortableChildren={true}>
-    @if (sceneData) {
-      <SceneMap />
+    @if (lightingAmbientEnabled()) {
+      <NightAmbiant
+        spots={nightLights}
+        darkness={lightingDarknessProps}
+        haze={lightingHaze}
+      />
     }
+    @if (shadowEnabled()) {
+      <SpriteShadows
+        lights={shadowLights}
+        ambientLight={shadowAmbientLight}
+        minInfluence={shadowMinInfluence}
+        falloffPower={shadowFalloffPower}
+        mode={shadowMode}
+        updateHz={shadowUpdateHz}
+        scanHz={shadowScanHz}
+        cullToViewport={shadowCullToViewport}
+        shadowColor={shadowColor}
+      />
+    }
+    <SceneMap />
   </Viewport>
   @for (gui of guiList) {
       <Container display="flex">
@@ -18,21 +36,31 @@
 </Canvas>
 
 <script>
-  import { signal, computed, effect } from "canvasengine";
+  import { computed, effect } from "canvasengine";
   import { inject } from "../../core/inject";
   import { RpgClientEngine } from "../../RpgClientEngine";
   import SceneMap from './draw-map.ce'
   import { RpgGui } from "../../Gui/Gui";
   import { delay } from "@rpgjs/common";
+  import { NightAmbiant, SpriteShadows } from '@canvasengine/presets'
 
   const engine = inject(RpgClientEngine);
   const guiService = inject(RpgGui);
   const sceneData = engine.sceneMap.data
+  const lighting = engine.sceneMap.lighting
   const guiList = computed(() => {
     return Object.values(guiService.gui()).filter((gui) => !gui.attachToSprite)
   })
-  const worldWidth = computed(() => sceneData()?.width)
-  const worldHeight = computed(() => sceneData()?.height)
+  const worldWidth = computed(() => {
+    const data = sceneData?.()
+    const scale = Number(data?.params?.scale ?? 1) || 1
+    return Number(data?.width ?? data?.params?.width ?? 2048) * scale
+  })
+  const worldHeight = computed(() => {
+    const data = sceneData?.()
+    const scale = Number(data?.params?.scale ?? 1) || 1
+    return Number(data?.height ?? data?.params?.height ?? 2048) * scale
+  })
 
   effect(() => {
      if (sceneData() && !sceneData().component) {
@@ -49,8 +77,139 @@
   const onGuiInteraction = (gui, name, data) => {
     guiService.guiInteraction(gui.name, name, data)
   }
-  
+
   const clamp = {
     direction: "all"
   }
+  const NIGHT_SPOT_RADIUS_SCALE = 4.25
+  const NIGHT_SPOT_MIN_RADIUS = 170
+  const NIGHT_SPOT_MIN_INTENSITY = 1
+  const SHADOW_SPOT_RADIUS_SCALE = 12
+  const SHADOW_SPOT_MIN_RADIUS = 480
+  const SHADOW_SPOT_MIN_INTENSITY = 1.35
+
+  const nightSpotRadius = (radius) => Math.max(radius * NIGHT_SPOT_RADIUS_SCALE, NIGHT_SPOT_MIN_RADIUS)
+  const shadowSpotRadius = (radius) => Math.max(radius * SHADOW_SPOT_RADIUS_SCALE, SHADOW_SPOT_MIN_RADIUS)
+  const nightSpotIntensity = (intensity, fallback) => Math.max(intensity ?? fallback, NIGHT_SPOT_MIN_INTENSITY)
+  const shadowSpotIntensity = (intensity) => Math.max(intensity ?? 1.3, SHADOW_SPOT_MIN_INTENSITY)
+
+  const lightingAmbient = computed(() => {
+    const state = lighting?.()
+    return state?.ambient ?? {}
+  })
+
+  const nightLights = computed(() => {
+    const state = lighting?.()
+    return (state?.spots ?? []).map((spot, index) => {
+      const radius = spot.radius ?? 180
+      return {
+        x: spot.x,
+        y: spot.y,
+        radius: nightSpotRadius(radius),
+        intensity: nightSpotIntensity(spot.intensity, index === 0 ? 1 : 0.92),
+        flicker: spot.flicker,
+        flickerSpeed: spot.flickerSpeed ?? 14,
+        pulse: spot.pulse,
+        pulseSpeed: spot.pulseSpeed,
+        phase: spot.phase,
+      }
+    })
+  })
+  const hasLightSpots = computed(() => {
+    const state = lighting?.()
+    return (state?.spots?.length ?? 0) > 0
+  })
+
+  const lightingDarkness = computed(() => {
+    const darkness = lightingAmbient().darkness
+    return typeof darkness === "number" ? darkness : 0
+  })
+
+  const lightingAmbientEnabled = computed(() => {
+    const state = lighting?.()
+    return Boolean(state && lightingDarkness() > 0)
+  })
+
+  const lightingDarknessProps = computed(() => ({
+    opacity: lightingDarkness(),
+    color: lightingAmbient().darkColor ?? "#080a12",
+  }))
+  const lightingHaze = computed(() => ({
+    color: lightingAmbient().fogColor ?? "#12182a",
+    radius: lightingAmbient().fogRadius ?? 0.44,
+    softness: lightingAmbient().fogSoftness ?? 0.3,
+    opacity: lightingAmbient().fogOpacity ?? 0.35,
+  }))
+
+  const defaultSunLight = () => {
+    const data = sceneData?.()
+    const width = Number(data?.width ?? data?.params?.width ?? 2048)
+    const height = Number(data?.height ?? data?.params?.height ?? 2048)
+    const scale = Number(data?.params?.scale ?? 1) || 1
+    const mapWidth = width * scale
+    const mapHeight = height * scale
+
+    return {
+      x: -mapWidth * 0.35,
+      y: -mapHeight * 0.45,
+      z: 520,
+      radius: Math.max(mapWidth, mapHeight) * 2.5,
+      intensity: 0.85,
+      shadowWeight: lightingDarkness() > 0 ? 2.2 : 1,
+      enabled: true,
+    }
+  }
+
+  const shadowState = computed(() => {
+    const state = lighting?.()
+    return state?.shadows ?? null
+  })
+
+  const shadowLights = computed(() => {
+    const state = lighting?.()
+    const defaultSun = defaultSunLight()
+    const sun = {
+      ...defaultSun,
+      ...(state?.sun ?? {}),
+      shadowWeight: state?.sun?.shadowWeight ?? defaultSun.shadowWeight,
+    }
+    const spotLights = (state?.spots ?? []).map((spot) => {
+      const radius = spot.radius ?? 180
+      return {
+        x: spot.x,
+        y: spot.y,
+        z: 170,
+        radius: shadowSpotRadius(radius),
+        intensity: shadowSpotIntensity(spot.intensity),
+        shadowWeight: 2.4,
+        enabled: true,
+      }
+    })
+
+    return [
+      ...((sun.enabled === false || sun.intensity <= 0) ? [] : [sun]),
+      ...spotLights,
+    ]
+  })
+
+  const shadowAmbientLight = computed(() => {
+    const shadows = shadowState()
+    if (shadows?.ambientLight === null || shadows?.ambientLight?.enabled === false) {
+      return null
+    }
+    return shadows?.ambientLight ?? { x: -0.18, y: -1, z: 420, intensity: 0.32, shadowWeight: 1 }
+  })
+
+  const shadowEnabled = computed(() => {
+    const shadows = shadowState()
+    return Boolean((shadows?.enabled || hasLightSpots()) && (shadowLights().length > 0 || shadowAmbientLight()))
+  })
+
+  const shadowMode = computed(() => shadowState()?.mode ?? "strongest")
+  const shadowUpdateHz = computed(() => shadowState()?.updateHz ?? 60)
+  const shadowScanHz = computed(() => shadowState()?.scanHz ?? 8)
+  const shadowCullToViewport = computed(() => shadowState()?.cullToViewport ?? true)
+  const shadowMinInfluence = computed(() => shadowState()?.minInfluence ?? 0.24)
+  const shadowFalloffPower = computed(() => shadowState()?.falloffPower ?? 0.85)
+  const shadowColor = computed(() => shadowState()?.shadowColor ?? "#05070d")
 </script>

package/src/components/scenes/draw-map.ce

@@ -13,14 +13,13 @@
     </Container>
   }
 
-  @if (weatherProps) {
+  @if (weatherProps()) {
     <Weather ...weatherProps() />
   }
 </Container>
 
 <script>
-    import { NoiseFilter } from 'pixi-filters';
-    import { effect, signal, computed, mount, on, tick } from 'canvasengine'
+    import { computed } from 'canvasengine'
     import { inject } from "../../core/inject";
     import { RpgClientEngine } from "../../RpgClientEngine";
     import { Weather } from '@canvasengine/presets'
@@ -29,23 +28,11 @@
     const componentAnimations = engine.componentAnimations
     const map = engine.sceneMap?.data
     const sceneComponent = computed(() => map()?.component)
-    const sceneParams = map()?.params
     const mapParams = map()?.params
-    const animations = engine.sceneMap.animations
     const weather = engine.sceneMap.weather
     const backgroundMusic = { src: mapParams?.backgroundMusic, autoplay: true, loop: true }
     const backgroundAmbientSound = { src: mapParams?.backgroundAmbientSound, autoplay: true, loop: true }
 
-    const data = signal(map()?.data)
-
-    const scale = mapParams?.scale || 1
-    const worldWidth = (mapParams?.width || 2048) * scale
-    const worldHeight = (mapParams?.height || 2048) * scale
-   
-    const clamp = {
-      direction: "all"
-    }
-
     const shakeConfig = {
       trigger: engine.mapShakeTrigger,
       intensity: 10,

package/src/components/scenes/event-layer.ce

@@ -13,7 +13,6 @@
 </Container>
 
 <script>
-    import { effect, signal } from 'canvasengine'
     import { inject } from "../../core/inject";
     import { RpgClientEngine } from "../../RpgClientEngine";
     import Character from "../character.ce";
@@ -24,4 +23,4 @@
     
     const players = engine.sceneMap.players
     const events = engine.sceneMap.events
-</script>
+</script>

package/src/core/setup.ts

@@ -14,7 +14,7 @@ export async function startGame(options: SetupOptions) {
 
   await injector(context, options.providers);
 
-  const engine = inject(context, RpgClientEngine);
+  const engine = inject<RpgClientEngine>(context, RpgClientEngine);
   await engine.start();
   return context;
-}
+}

package/src/decorators/spritesheet.ts

@@ -0,0 +1,8 @@
+export function Spritesheet(options: Record<string, any> = {}) {
+  return (target: any) => {
+    Object.assign(target, options);
+    if (target.prototype) {
+      Object.assign(target.prototype, options);
+    }
+  };
+}

package/src/index.ts

@@ -16,6 +16,7 @@ export * from "./components";
 export * from "./components/gui";
 export * from "./Sound";
 export * from "./Resource";
+export * from "./decorators/spritesheet";
 export * from "./utils/getEntityProp";
 export { Context } from "@signe/di";
 export { KeyboardControls, Input } from "canvasengine";

package/src/module.ts

@@ -195,6 +195,11 @@ export function provideClientModules(modules: RpgClientModule[]): FactoryProvide
                 engine.addSpriteComponentInFront(component);
               });
             }
+            if (sprite.components) {
+              Object.entries(sprite.components).forEach(([id, component]) => {
+                engine.registerSpriteComponent(id, component);
+              });
+            }
           },
         };
       }
@@ -226,4 +231,3 @@ export function provideClientGlobalConfig(config: any = {}) {
   }
   return provideGlobalConfig(config)
 }
-

package/src/services/loadMap.ts

@@ -20,6 +20,8 @@ type MapData = {
   height?: number;
   /** Optional map events data (NPCs, interactive objects, etc.) */
   events?: any;
+  /** Optional named positions, for example Tiled point objects used by changeMap("map", "name") */
+  positions?: Record<string, { x: number; y: number; z?: number }>;
   /** Optional map identifier, defaults to the mapId parameter if not provided */
   id?: string;
 }

package/src/services/mmorpg.ts

@@ -61,7 +61,10 @@ class BridgeWebsocket extends AbstractWebsocket {
     this.socket = await connectionRoom({
         host,
         room: this.targetRoom,
-        id: this.privateId
+        id: this.privateId,
+        query: {
+          id: this.privateId,
+        },
     }, instance)
 
     listeners?.(this.socket)
@@ -93,7 +96,10 @@ class BridgeWebsocket extends AbstractWebsocket {
       room,
       id: this.privateId,
       host: host || this.options.host || window.location.host,
-      query,
+      query: {
+        ...query,
+        id: this.privateId,
+      },
     })
   }
 

package/src/services/save.spec.ts

@@ -0,0 +1,127 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
+import { SaveClientService, provideSaveClient } from "./save";
+
+const createSocket = () => {
+  const listeners = new Map<string, (data: any) => void>();
+  const emitted: Array<{ event: string; data: any }> = [];
+
+  return {
+    listeners,
+    emitted,
+    on: vi.fn((event: string, callback: (data: any) => void) => {
+      listeners.set(event, callback);
+    }),
+    off: vi.fn((event: string) => {
+      listeners.delete(event);
+    }),
+    emit: vi.fn((event: string, data: any) => {
+      emitted.push({ event, data });
+    }),
+  };
+};
+
+const createService = (socket = createSocket()) => {
+  const service = Object.create(SaveClientService.prototype) as SaveClientService;
+  (service as any).webSocket = socket;
+  (service as any).pending = new Map();
+  (service as any).requestCounter = 0;
+  return { service, socket };
+};
+
+describe("SaveClientService", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-01-02T03:04:05.000Z"));
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  test("registers save result listeners idempotently", () => {
+    const { service, socket } = createService();
+
+    service.initialize();
+
+    expect(socket.off).toHaveBeenCalledTimes(4);
+    expect(socket.on).toHaveBeenCalledTimes(4);
+    expect([...socket.listeners.keys()]).toEqual([
+      "save.list.result",
+      "save.save.result",
+      "save.load.result",
+      "save.error",
+    ]);
+  });
+
+  test("lists, saves and loads slots through request/response events", async () => {
+    const { service, socket } = createService();
+    service.initialize();
+
+    const listPromise = service.listSlots();
+    expect(socket.emitted[0]).toEqual({
+      event: "save.list",
+      data: { requestId: "1767323045000-1" },
+    });
+    socket.listeners.get("save.list.result")?.({
+      requestId: "1767323045000-1",
+      slots: [{ id: "slot-a" }],
+    });
+    await expect(listPromise).resolves.toEqual([{ id: "slot-a" }]);
+
+    const savePromise = service.saveSlot(2, { map: "forest" } as any);
+    expect(socket.emitted[1]).toEqual({
+      event: "save.save",
+      data: {
+        requestId: "1767323045000-2",
+        index: 2,
+        meta: { map: "forest" },
+      },
+    });
+    socket.listeners.get("save.save.result")?.({
+      requestId: "1767323045000-2",
+      index: 2,
+      slots: [null, null, { id: "slot-c" }],
+    });
+    await expect(savePromise).resolves.toEqual([null, null, { id: "slot-c" }]);
+
+    const loadPromise = service.loadSlot(2);
+    expect(socket.emitted[2]).toEqual({
+      event: "save.load",
+      data: { requestId: "1767323045000-3", index: 2 },
+    });
+    socket.listeners.get("save.load.result")?.({
+      requestId: "1767323045000-3",
+      index: 2,
+      ok: true,
+    });
+    await expect(loadPromise).resolves.toBe(true);
+  });
+
+  test("rejects matching pending requests on save errors and ignores stale responses", async () => {
+    const { service, socket } = createService();
+    service.initialize();
+
+    const listPromise = service.listSlots();
+
+    socket.listeners.get("save.list.result")?.({
+      requestId: "unknown",
+      slots: [{ id: "stale" }],
+    });
+    expect((service as any).pending.size).toBe(1);
+
+    socket.listeners.get("save.error")?.({
+      requestId: "1767323045000-1",
+      message: "Cannot save",
+    });
+
+    await expect(listPromise).rejects.toThrow("Cannot save");
+    expect((service as any).pending.size).toBe(0);
+  });
+
+  test("provides the client save service class", () => {
+    expect(provideSaveClient()).toEqual({
+      provide: SaveClientService,
+      useClass: SaveClientService,
+    });
+  });
+});

package/src/utils/getEntityProp.spec.ts

@@ -0,0 +1,96 @@
+import { describe, expect, test } from "vitest";
+import { signal } from "canvasengine";
+import { getEntityProp } from "./getEntityProp";
+
+const createEntity = () => {
+  const name = signal("Alex");
+
+  return {
+    _level: signal(5),
+    _exp: signal(120),
+    _gold: signal(30),
+    hpSignal: signal(80),
+    spSignal: signal(12),
+    type: signal("player"),
+    x: signal(10),
+    y: signal(20),
+    z: signal(0),
+    tint: signal(0xffffff),
+    direction: signal(2),
+    hitbox: signal({ w: 32, h: 48 }),
+    animationName: signal("idle"),
+    graphics: signal(["hero"]),
+    items: signal([{ id: "potion" }]),
+    equipments: signal([]),
+    states: signal([]),
+    skills: signal([]),
+    _effects: signal([]),
+    componentsTop: signal(["nameplate"]),
+    componentsBottom: signal([]),
+    componentsCenter: signal([]),
+    componentsLeft: signal([]),
+    componentsRight: signal([]),
+    _param: signal({ maxHp: 100, custom: 7 }),
+    _canMove: signal(true),
+    get name() {
+      return name();
+    },
+    set name(value: string) {
+      name.set(value);
+    },
+    get speed() {
+      return 4;
+    },
+    get canMove() {
+      return true;
+    },
+  } as any;
+};
+
+describe("getEntityProp", () => {
+  test("returns undefined until a reactive entity becomes available", () => {
+    const entity = signal<any>(undefined);
+    const hp = getEntityProp(entity, "hp");
+    const maxHp = getEntityProp(entity, "params.maxHp");
+
+    expect(hp()).toBeUndefined();
+    expect(maxHp()).toBeUndefined();
+
+    const current = createEntity();
+    entity.set(current);
+
+    expect(hp()).toBe(80);
+    expect(maxHp()).toBe(100);
+
+    const next = createEntity();
+    next.hpSignal.set(42);
+    next._param.set({ maxHp: 90 });
+    entity.set(next);
+
+    expect(hp()).toBe(42);
+    expect(maxHp()).toBe(90);
+  });
+
+  test("reads built-in, param and unknown keys without throwing", () => {
+    const entity = createEntity();
+
+    expect(getEntityProp(entity, "name")()).toBe("Alex");
+    expect(getEntityProp(entity, "componentsTop")()).toEqual(["nameplate"]);
+    expect(getEntityProp(entity, "params.custom")()).toBe(7);
+    expect(getEntityProp(entity, "params.missing")()).toBeUndefined();
+    expect(getEntityProp(entity, "unknown" as any)()).toBeUndefined();
+  });
+
+  test("reads canMove from the synced value when available", () => {
+    const entity = createEntity();
+    const canMove = getEntityProp(entity, "canMove");
+
+    expect(canMove()).toBe(true);
+
+    entity._canMove.set(false);
+    expect(canMove()).toBe(false);
+
+    entity._canMove.set({ value: true } as any);
+    expect(canMove()).toBe(true);
+  });
+});

package/src/utils/getEntityProp.ts

@@ -1,5 +1,6 @@
 import { computed, Signal } from "canvasengine";
 import { RpgClientObject } from "../Game/Object";
+import { readPropValue } from "./readPropValue";
 
 const BUILTIN_PARAM_KEYS = [
   "maxHp",
@@ -22,17 +23,17 @@ const entityPropMap = {
   gold: (entity: RpgClientObject) => entity._gold(),
   hp: (entity: RpgClientObject) => entity.hpSignal(),
   sp: (entity: RpgClientObject) => entity.spSignal(),
-  name: (entity: RpgClientObject) => entity.name(),
+  name: (entity: RpgClientObject) => entity.name,
   type: (entity: RpgClientObject) => entity.type(),
   x: (entity: RpgClientObject) => entity.x(),
   y: (entity: RpgClientObject) => entity.y(),
   z: (entity: RpgClientObject) => entity.z(),
   tint: (entity: RpgClientObject) => entity.tint(),
   direction: (entity: RpgClientObject) => entity.direction(),
-  speed: (entity: RpgClientObject) => entity.speed(),
+  speed: (entity: RpgClientObject) => entity.speed,
   hitbox: (entity: RpgClientObject) => entity.hitbox(),
   animation: (entity: RpgClientObject) => entity.animationName(),
-  canMove: (entity: RpgClientObject) => entity.canMove(),
+  canMove: (entity: RpgClientObject) => readPropValue<boolean>((entity as any)._canMove ?? entity.canMove),
   graphics: (entity: RpgClientObject) => entity.graphics(),
   items: (entity: RpgClientObject) => entity.items(),
   equipments: (entity: RpgClientObject) => entity.equipments(),

package/src/utils/readPropValue.ts

@@ -0,0 +1,16 @@
+export const readPropValue = <T = unknown>(value: unknown): T => {
+  if (typeof value === "function") {
+    return readPropValue((value as () => unknown)());
+  }
+
+  if (value && typeof value === "object" && "value" in value) {
+    return readPropValue((value as { value: unknown }).value);
+  }
+
+  return value as T;
+};
+
+export const getCanMoveValue = (entity: any): boolean => {
+  const value = readPropValue(entity?._canMove ?? entity?.canMove);
+  return value !== false;
+};

package/dist/node_modules/.pnpm/@signe_di@2.9.0/node_modules/@signe/di/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../../../../../../../../../node_modules/.pnpm/@signe+di@2.9.0/node_modules/@signe/di/dist/index.js"],"sourcesContent":["var __defProp = Object.defineProperty;\nvar __name = (target, value) => __defProp(target, \"name\", { value, configurable: true });\n\n// src/inject.ts\nvar DEFAULT_INSTANCE_KEY = \"__default__\";\nfunction toTokenName(token) {\n  return typeof token === \"function\" ? token.name : token;\n}\n__name(toTokenName, \"toTokenName\");\nfunction toInstanceKey(name) {\n  return name ?? DEFAULT_INSTANCE_KEY;\n}\n__name(toInstanceKey, \"toInstanceKey\");\nfunction getRecord(context, token) {\n  return context.get(\"inject:\" + toTokenName(token));\n}\n__name(getRecord, \"getRecord\");\nfunction ensureRecord(context, token) {\n  const key = \"inject:\" + toTokenName(token);\n  let record = context.get(key);\n  if (!record) {\n    record = {\n      multi: false,\n      values: /* @__PURE__ */ new Map(),\n      injected: /* @__PURE__ */ new Set()\n    };\n  }\n  context.set(key, record);\n  return record;\n}\n__name(ensureRecord, \"ensureRecord\");\nfunction provide(context, token, value, options = {}) {\n  const record = ensureRecord(context, token);\n  const instanceKey = toInstanceKey(options.name);\n  if (options.multi) {\n    record.multi = true;\n  }\n  if (!record.multi && instanceKey !== DEFAULT_INSTANCE_KEY) {\n    record.multi = true;\n  }\n  record.values.set(instanceKey, value);\n  return value;\n}\n__name(provide, \"provide\");\nfunction isInjected(context, token, options = {}) {\n  const record = getRecord(context, token);\n  if (!record) {\n    return false;\n  }\n  if (options.name) {\n    return record.injected.has(toInstanceKey(options.name));\n  }\n  if (record.multi) {\n    return record.injected.size > 0;\n  }\n  return record.injected.has(DEFAULT_INSTANCE_KEY);\n}\n__name(isInjected, \"isInjected\");\nfunction isProvided(context, token, options = {}) {\n  const record = getRecord(context, token);\n  if (!record) {\n    return false;\n  }\n  if (options.name) {\n    return record.values.has(toInstanceKey(options.name));\n  }\n  if (record.multi) {\n    return record.values.size > 0;\n  }\n  return record.values.has(DEFAULT_INSTANCE_KEY);\n}\n__name(isProvided, \"isProvided\");\nfunction hasInstance(context, token, options = {}) {\n  return isProvided(context, token, options);\n}\n__name(hasInstance, \"hasInstance\");\nfunction handleMissingInjection(token, options) {\n  const name = toTokenName(token);\n  if (options.name) {\n    throw new Error(`Injection provider ${name} with name ${options.name} not found`);\n  }\n  throw new Error(`Injection provider ${name} not found`);\n}\n__name(handleMissingInjection, \"handleMissingInjection\");\nfunction markInjected(record, key) {\n  record.injected.add(key);\n}\n__name(markInjected, \"markInjected\");\nfunction markAllInjected(record) {\n  for (const key of record.values.keys()) {\n    record.injected.add(key);\n  }\n}\n__name(markAllInjected, \"markAllInjected\");\nfunction inject(context, token, options = {}) {\n  const record = getRecord(context, token);\n  if (!record) {\n    if (options.optional) {\n      return options.multi ? [] : void 0;\n    }\n    return handleMissingInjection(token, options);\n  }\n  if (options.name) {\n    const instanceKey = toInstanceKey(options.name);\n    if (!record.values.has(instanceKey)) {\n      if (options.optional) {\n        return void 0;\n      }\n      return handleMissingInjection(token, options);\n    }\n    const value2 = record.values.get(instanceKey);\n    markInjected(record, instanceKey);\n    return value2;\n  }\n  if (options.multi || record.multi) {\n    if (record.values.size === 0) {\n      if (options.optional) {\n        return [];\n      }\n      return handleMissingInjection(token, options);\n    }\n    markAllInjected(record);\n    return Array.from(record.values.values());\n  }\n  const value = record.values.get(DEFAULT_INSTANCE_KEY);\n  if (value === void 0) {\n    if (options.optional) {\n      return void 0;\n    }\n    return handleMissingInjection(token, options);\n  }\n  markInjected(record, DEFAULT_INSTANCE_KEY);\n  return value;\n}\n__name(inject, \"inject\");\nfunction override(providers, newProvider, options) {\n  let { upsert = false, key } = options ?? {};\n  if (!key) {\n    key = typeof newProvider === \"function\" ? newProvider.name : newProvider.provide;\n  }\n  const flatProviders = providers.flat();\n  const exists = flatProviders.some((provider) => {\n    if (typeof provider === \"function\") {\n      return provider.name === key;\n    } else if (typeof provider === \"object\") {\n      return provider.provide === key;\n    }\n    return false;\n  });\n  const mappedProviders = flatProviders.map((provider) => {\n    if (typeof provider === \"function\" && provider.name === key) {\n      return newProvider;\n    } else if (typeof provider === \"object\" && provider.provide === key) {\n      return newProvider;\n    }\n    return provider;\n  });\n  if (upsert && !exists) {\n    mappedProviders.push(newProvider);\n  }\n  return mappedProviders;\n}\n__name(override, \"override\");\nfunction findProviders(providers, name) {\n  const results = [];\n  for (const provider of providers) {\n    if (Array.isArray(provider)) {\n      results.push(...findProviders(provider, name));\n    } else if (findProvider(provider, name)) {\n      results.push(provider);\n    }\n  }\n  return results;\n}\n__name(findProviders, \"findProviders\");\nfunction findProvider(providers, name) {\n  if (!Array.isArray(providers)) {\n    if (typeof providers === \"object\" && \"provide\" in providers) {\n      const provider = providers;\n      const providerName = typeof provider.provide === \"function\" ? provider.provide.name : provider.provide;\n      if (name instanceof RegExp) {\n        if (name.test(providerName)) return providers;\n      } else {\n        if (providerName === name) return providers;\n      }\n    }\n    return null;\n  }\n  for (const provider of providers) {\n    if (Array.isArray(provider)) {\n      const found = findProvider(provider, name);\n      if (found) return found;\n      continue;\n    }\n    if (typeof provider === \"object\" && \"provide\" in provider) {\n      const providerName = typeof provider.provide === \"function\" ? provider.provide.name : provider.provide;\n      if (name instanceof RegExp) {\n        if (name.test(providerName)) return provider;\n      } else {\n        if (providerName === name) return provider;\n      }\n    }\n  }\n  return null;\n}\n__name(findProvider, \"findProvider\");\n\n// src/merge-config.ts\nfunction processProvider(mergedConfig, baseConfig, provider) {\n  if (Array.isArray(provider)) {\n    for (const nestedProvider of provider) {\n      processProvider(mergedConfig, baseConfig, nestedProvider);\n    }\n    return;\n  }\n  const existingProvider = findProvider(baseConfig.providers, provider.provide);\n  if (existingProvider) {\n    mergedConfig.providers = override(mergedConfig.providers, provider);\n  } else {\n    mergedConfig.providers.push(provider);\n  }\n}\n__name(processProvider, \"processProvider\");\nfunction mergeConfig(baseConfig, config) {\n  const mergedConfig = {\n    ...baseConfig,\n    ...config,\n    providers: [\n      ...baseConfig.providers\n    ]\n    // Start with a copy of base providers\n  };\n  for (const provider of config.providers) {\n    processProvider(mergedConfig, baseConfig, provider);\n  }\n  return mergedConfig;\n}\n__name(mergeConfig, \"mergeConfig\");\n\n// src/provider.ts\nfunction extractProvideOptions(source) {\n  if (!source) {\n    return void 0;\n  }\n  const { multi, name } = source;\n  if (multi === void 0 && name === void 0) {\n    return void 0;\n  }\n  return {\n    multi,\n    name\n  };\n}\n__name(extractProvideOptions, \"extractProvideOptions\");\nfunction getDeps(provider) {\n  if (typeof provider === \"function\") {\n    return provider.deps ?? [];\n  }\n  return provider.deps ?? [];\n}\n__name(getDeps, \"getDeps\");\nfunction sortProviders(providers) {\n  const tokenName = /* @__PURE__ */ __name((t) => typeof t === \"function\" ? t.name : t, \"tokenName\");\n  const map = /* @__PURE__ */ new Map();\n  for (const p of providers) {\n    const token = tokenName(typeof p === \"function\" ? p : p.provide);\n    const list = map.get(token);\n    if (list) {\n      list.push(p);\n    } else {\n      map.set(token, [\n        p\n      ]);\n    }\n  }\n  const result = [];\n  const visited = /* @__PURE__ */ new Set();\n  const stack = /* @__PURE__ */ new Set();\n  const visit = /* @__PURE__ */ __name((token) => {\n    const name = tokenName(token);\n    if (visited.has(name)) return;\n    if (stack.has(name)) {\n      throw new Error(`Circular dependency detected for provider ${name}`);\n    }\n    stack.add(name);\n    const providersForToken = map.get(name);\n    if (providersForToken) {\n      for (const provider of providersForToken) {\n        for (const dep of getDeps(provider)) {\n          visit(dep);\n        }\n        result.push(provider);\n      }\n      visited.add(name);\n    }\n    stack.delete(name);\n  }, \"visit\");\n  for (const p of providers) {\n    const token = typeof p === \"function\" ? p : p.provide;\n    visit(token);\n  }\n  return result;\n}\n__name(sortProviders, \"sortProviders\");\nasync function injector(context, providers) {\n  providers = providers.flat();\n  providers = sortProviders(providers);\n  for (const provider of providers) {\n    let token;\n    let instance;\n    let options;\n    if (typeof provider === \"function\") {\n      token = provider;\n      instance = new provider(context);\n      const diOptions = extractProvideOptions(provider.diOptions ?? provider.di);\n      options = diOptions;\n    } else {\n      token = provider.provide;\n      options = extractProvideOptions(provider);\n      const provideUserClass = provider.useClass;\n      const isClass = typeof provideUserClass === \"function\";\n      if (isClass) {\n        instance = new provideUserClass(context);\n      } else if (\"useValue\" in provider) {\n        instance = provider.useValue;\n      } else if (\"useFactory\" in provider) {\n        instance = provider.useFactory?.(context);\n        if (instance instanceof Promise) {\n          instance = await instance;\n        }\n      } else if (\"useExisting\" in provider) {\n        instance = inject(context, provider.useExisting);\n      }\n    }\n    provide(context, token, instance, options);\n  }\n}\n__name(injector, \"injector\");\n\n// src/context.ts\nvar Context = class {\n  static {\n    __name(this, \"Context\");\n  }\n  /** Internal storage for injected values */\n  values = {};\n  /**\n   * Sets a value in the context\n   * @param key - Unique identifier for the value\n   * @param value - Value to store\n   */\n  set(key, value) {\n    this.values[key] = value;\n  }\n  /**\n   * Retrieves a value from the context\n   * @param key - Unique identifier for the value\n   * @returns The stored value or undefined if not found\n   */\n  get(key) {\n    return this.values[key];\n  }\n};\nexport {\n  Context,\n  findProvider,\n  findProviders,\n  hasInstance,\n  inject,\n  injector,\n  isInjected,\n  isProvided,\n  mergeConfig,\n  override,\n  provide\n};\n//# sourceMappingURL=index.js.map"],"x_google_ignoreList":[0],"mappings":"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"}