@rpgjs/client 5.0.0-alpha.43 → 5.0.0-alpha.44

package/dist/utils/getEntityProp.js

@@ -1,54 +1,52 @@
-import { computed } from 'canvasengine';
-
-const entityPropMap = {
-  level: (entity) => entity._level(),
-  exp: (entity) => entity._exp(),
-  gold: (entity) => entity._gold(),
-  hp: (entity) => entity.hpSignal(),
-  sp: (entity) => entity.spSignal(),
-  name: (entity) => entity.name(),
-  type: (entity) => entity.type(),
-  x: (entity) => entity.x(),
-  y: (entity) => entity.y(),
-  z: (entity) => entity.z(),
-  tint: (entity) => entity.tint(),
-  direction: (entity) => entity.direction(),
-  speed: (entity) => entity.speed(),
-  hitbox: (entity) => entity.hitbox(),
-  animation: (entity) => entity.animationName(),
-  canMove: (entity) => entity.canMove(),
-  graphics: (entity) => entity.graphics(),
-  items: (entity) => entity.items(),
-  equipments: (entity) => entity.equipments(),
-  states: (entity) => entity.states(),
-  skills: (entity) => entity.skills(),
-  effects: (entity) => entity._effects(),
-  componentsTop: (entity) => entity.componentsTop(),
-  componentsBottom: (entity) => entity.componentsBottom(),
-  componentsCenter: (entity) => entity.componentsCenter(),
-  componentsLeft: (entity) => entity.componentsLeft(),
-  componentsRight: (entity) => entity.componentsRight()
+import { computed } from "canvasengine";
+//#region src/utils/getEntityProp.ts
+var entityPropMap = {
+	level: (entity) => entity._level(),
+	exp: (entity) => entity._exp(),
+	gold: (entity) => entity._gold(),
+	hp: (entity) => entity.hpSignal(),
+	sp: (entity) => entity.spSignal(),
+	name: (entity) => entity.name(),
+	type: (entity) => entity.type(),
+	x: (entity) => entity.x(),
+	y: (entity) => entity.y(),
+	z: (entity) => entity.z(),
+	tint: (entity) => entity.tint(),
+	direction: (entity) => entity.direction(),
+	speed: (entity) => entity.speed(),
+	hitbox: (entity) => entity.hitbox(),
+	animation: (entity) => entity.animationName(),
+	canMove: (entity) => entity.canMove(),
+	graphics: (entity) => entity.graphics(),
+	items: (entity) => entity.items(),
+	equipments: (entity) => entity.equipments(),
+	states: (entity) => entity.states(),
+	skills: (entity) => entity.skills(),
+	effects: (entity) => entity._effects(),
+	componentsTop: (entity) => entity.componentsTop(),
+	componentsBottom: (entity) => entity.componentsBottom(),
+	componentsCenter: (entity) => entity.componentsCenter(),
+	componentsLeft: (entity) => entity.componentsLeft(),
+	componentsRight: (entity) => entity.componentsRight()
 };
-const isSignal = (value) => typeof value === "function";
-const toSignal = (value) => isSignal(value) ? value : computed(() => value);
-const getEntityProp = (entity, key) => {
-  const entitySignal = toSignal(entity);
-  return computed(() => {
-    const current = entitySignal();
-    if (!current) {
-      return void 0;
-    }
-    if (Object.prototype.hasOwnProperty.call(entityPropMap, key)) {
-      const getter = entityPropMap[key];
-      return getter(current);
-    }
-    if (key.startsWith("params.")) {
-      const paramKey = key.slice("params.".length);
-      return current._param?.()?.[paramKey];
-    }
-    return void 0;
-  });
+var isSignal = (value) => typeof value === "function";
+var toSignal = (value) => isSignal(value) ? value : computed(() => value);
+var getEntityProp = (entity, key) => {
+	const entitySignal = toSignal(entity);
+	return computed(() => {
+		const current = entitySignal();
+		if (!current) return;
+		if (Object.prototype.hasOwnProperty.call(entityPropMap, key)) {
+			const getter = entityPropMap[key];
+			return getter(current);
+		}
+		if (key.startsWith("params.")) {
+			const paramKey = key.slice(7);
+			return current._param?.()?.[paramKey];
+		}
+	});
 };
-
+//#endregion
 export { getEntityProp };
-//# sourceMappingURL=getEntityProp.js.map
+
+//# sourceMappingURL=getEntityProp.js.map

package/dist/utils/getEntityProp.js.map

@@ -1 +1 @@
-{"version":3,"file":"getEntityProp.js","sources":["../../src/utils/getEntityProp.ts"],"sourcesContent":["import { computed, Signal } from \"canvasengine\";\nimport { RpgClientObject } from \"../Game/Object\";\n\nconst BUILTIN_PARAM_KEYS = [\n  \"maxHp\",\n  \"maxSp\",\n  \"atk\",\n  \"pdef\",\n  \"sdef\",\n  \"str\",\n  \"agi\",\n  \"int\",\n  \"dex\",\n] as const;\n\ntype BuiltInParamKey = typeof BUILTIN_PARAM_KEYS[number];\ntype ParamPropKey = `params.${BuiltInParamKey}` | `params.${string}`;\n\nconst entityPropMap = {\n  level: (entity: RpgClientObject) => entity._level(),\n  exp: (entity: RpgClientObject) => entity._exp(),\n  gold: (entity: RpgClientObject) => entity._gold(),\n  hp: (entity: RpgClientObject) => entity.hpSignal(),\n  sp: (entity: RpgClientObject) => entity.spSignal(),\n  name: (entity: RpgClientObject) => entity.name(),\n  type: (entity: RpgClientObject) => entity.type(),\n  x: (entity: RpgClientObject) => entity.x(),\n  y: (entity: RpgClientObject) => entity.y(),\n  z: (entity: RpgClientObject) => entity.z(),\n  tint: (entity: RpgClientObject) => entity.tint(),\n  direction: (entity: RpgClientObject) => entity.direction(),\n  speed: (entity: RpgClientObject) => entity.speed(),\n  hitbox: (entity: RpgClientObject) => entity.hitbox(),\n  animation: (entity: RpgClientObject) => entity.animationName(),\n  canMove: (entity: RpgClientObject) => entity.canMove(),\n  graphics: (entity: RpgClientObject) => entity.graphics(),\n  items: (entity: RpgClientObject) => entity.items(),\n  equipments: (entity: RpgClientObject) => entity.equipments(),\n  states: (entity: RpgClientObject) => entity.states(),\n  skills: (entity: RpgClientObject) => entity.skills(),\n  effects: (entity: RpgClientObject) => entity._effects(),\n  componentsTop: (entity: RpgClientObject) => entity.componentsTop(),\n  componentsBottom: (entity: RpgClientObject) => entity.componentsBottom(),\n  componentsCenter: (entity: RpgClientObject) => entity.componentsCenter(),\n  componentsLeft: (entity: RpgClientObject) => entity.componentsLeft(),\n  componentsRight: (entity: RpgClientObject) => entity.componentsRight(),\n} as const;\n\ntype EntityPropMap = typeof entityPropMap;\ntype EntityPropKey = keyof EntityPropMap | ParamPropKey;\ntype EntityPropValue<K extends EntityPropKey> = K extends keyof EntityPropMap\n  ? ReturnType<EntityPropMap[K]>\n  : K extends `params.${string}`\n  ? number | undefined\n  : never;\n\nconst isSignal = <T>(value: unknown): value is Signal<T> =>\n  typeof value === \"function\";\n\nconst toSignal = <T>(value: Signal<T> | T): Signal<T> =>\n  isSignal<T>(value) ? value : computed(() => value);\n\nexport const getEntityProp = <K extends EntityPropKey>(\n  entity: Signal<RpgClientObject | undefined> | RpgClientObject | undefined,\n  key: K\n): Signal<EntityPropValue<K>> => {\n  const entitySignal = toSignal(entity);\n\n  return computed(() => {\n    const current = entitySignal();\n    if (!current) {\n      return undefined as EntityPropValue<K>;\n    }\n\n    if (Object.prototype.hasOwnProperty.call(entityPropMap, key)) {\n      const getter = entityPropMap[key as keyof EntityPropMap];\n      return getter(current) as EntityPropValue<K>;\n    }\n\n    if (key.startsWith(\"params.\")) {\n      const paramKey = key.slice(\"params.\".length);\n      return current._param?.()?.[paramKey] as EntityPropValue<K>;\n    }\n\n    return undefined as EntityPropValue<K>;\n  });\n};\n"],"names":[],"mappings":";;AAkBA,MAAM,aAAA,GAAgB;AAAA,EACpB,KAAA,EAAO,CAAC,MAAA,KAA4B,MAAA,CAAO,MAAA,EAAO;AAAA,EAClD,GAAA,EAAK,CAAC,MAAA,KAA4B,MAAA,CAAO,IAAA,EAAK;AAAA,EAC9C,IAAA,EAAM,CAAC,MAAA,KAA4B,MAAA,CAAO,KAAA,EAAM;AAAA,EAChD,EAAA,EAAI,CAAC,MAAA,KAA4B,MAAA,CAAO,QAAA,EAAS;AAAA,EACjD,EAAA,EAAI,CAAC,MAAA,KAA4B,MAAA,CAAO,QAAA,EAAS;AAAA,EACjD,IAAA,EAAM,CAAC,MAAA,KAA4B,MAAA,CAAO,IAAA,EAAK;AAAA,EAC/C,IAAA,EAAM,CAAC,MAAA,KAA4B,MAAA,CAAO,IAAA,EAAK;AAAA,EAC/C,CAAA,EAAG,CAAC,MAAA,KAA4B,MAAA,CAAO,CAAA,EAAE;AAAA,EACzC,CAAA,EAAG,CAAC,MAAA,KAA4B,MAAA,CAAO,CAAA,EAAE;AAAA,EACzC,CAAA,EAAG,CAAC,MAAA,KAA4B,MAAA,CAAO,CAAA,EAAE;AAAA,EACzC,IAAA,EAAM,CAAC,MAAA,KAA4B,MAAA,CAAO,IAAA,EAAK;AAAA,EAC/C,SAAA,EAAW,CAAC,MAAA,KAA4B,MAAA,CAAO,SAAA,EAAU;AAAA,EACzD,KAAA,EAAO,CAAC,MAAA,KAA4B,MAAA,CAAO,KAAA,EAAM;AAAA,EACjD,MAAA,EAAQ,CAAC,MAAA,KAA4B,MAAA,CAAO,MAAA,EAAO;AAAA,EACnD,SAAA,EAAW,CAAC,MAAA,KAA4B,MAAA,CAAO,aAAA,EAAc;AAAA,EAC7D,OAAA,EAAS,CAAC,MAAA,KAA4B,MAAA,CAAO,OAAA,EAAQ;AAAA,EACrD,QAAA,EAAU,CAAC,MAAA,KAA4B,MAAA,CAAO,QAAA,EAAS;AAAA,EACvD,KAAA,EAAO,CAAC,MAAA,KAA4B,MAAA,CAAO,KAAA,EAAM;AAAA,EACjD,UAAA,EAAY,CAAC,MAAA,KAA4B,MAAA,CAAO,UAAA,EAAW;AAAA,EAC3D,MAAA,EAAQ,CAAC,MAAA,KAA4B,MAAA,CAAO,MAAA,EAAO;AAAA,EACnD,MAAA,EAAQ,CAAC,MAAA,KAA4B,MAAA,CAAO,MAAA,EAAO;AAAA,EACnD,OAAA,EAAS,CAAC,MAAA,KAA4B,MAAA,CAAO,QAAA,EAAS;AAAA,EACtD,aAAA,EAAe,CAAC,MAAA,KAA4B,MAAA,CAAO,aAAA,EAAc;AAAA,EACjE,gBAAA,EAAkB,CAAC,MAAA,KAA4B,MAAA,CAAO,gBAAA,EAAiB;AAAA,EACvE,gBAAA,EAAkB,CAAC,MAAA,KAA4B,MAAA,CAAO,gBAAA,EAAiB;AAAA,EACvE,cAAA,EAAgB,CAAC,MAAA,KAA4B,MAAA,CAAO,cAAA,EAAe;AAAA,EACnE,eAAA,EAAiB,CAAC,MAAA,KAA4B,MAAA,CAAO,eAAA;AACvD,CAAA;AAUA,MAAM,QAAA,GAAW,CAAI,KAAA,KACnB,OAAO,KAAA,KAAU,UAAA;AAEnB,MAAM,QAAA,GAAW,CAAI,KAAA,KACnB,QAAA,CAAY,KAAK,CAAA,GAAI,KAAA,GAAQ,QAAA,CAAS,MAAM,KAAK,CAAA;AAE5C,MAAM,aAAA,GAAgB,CAC3B,MAAA,EACA,GAAA,KAC+B;AAC/B,EAAA,MAAM,YAAA,GAAe,SAAS,MAAM,CAAA;AAEpC,EAAA,OAAO,SAAS,MAAM;AACpB,IAAA,MAAM,UAAU,YAAA,EAAa;AAC7B,IAAA,IAAI,CAAC,OAAA,EAAS;AACZ,MAAA,OAAO,MAAA;AAAA,IACT;AAEA,IAAA,IAAI,OAAO,SAAA,CAAU,cAAA,CAAe,IAAA,CAAK,aAAA,EAAe,GAAG,CAAA,EAAG;AAC5D,MAAA,MAAM,MAAA,GAAS,cAAc,GAA0B,CAAA;AACvD,MAAA,OAAO,OAAO,OAAO,CAAA;AAAA,IACvB;AAEA,IAAA,IAAI,GAAA,CAAI,UAAA,CAAW,SAAS,CAAA,EAAG;AAC7B,MAAA,MAAM,QAAA,GAAW,GAAA,CAAI,KAAA,CAAM,SAAA,CAAU,MAAM,CAAA;AAC3C,MAAA,OAAO,OAAA,CAAQ,MAAA,IAAS,GAAI,QAAQ,CAAA;AAAA,IACtC;AAEA,IAAA,OAAO,MAAA;AAAA,EACT,CAAC,CAAA;AACH;;;;"}
+{"version":3,"file":"getEntityProp.js","names":[],"sources":["../../src/utils/getEntityProp.ts"],"sourcesContent":["import { computed, Signal } from \"canvasengine\";\nimport { RpgClientObject } from \"../Game/Object\";\n\nconst BUILTIN_PARAM_KEYS = [\n  \"maxHp\",\n  \"maxSp\",\n  \"atk\",\n  \"pdef\",\n  \"sdef\",\n  \"str\",\n  \"agi\",\n  \"int\",\n  \"dex\",\n] as const;\n\ntype BuiltInParamKey = typeof BUILTIN_PARAM_KEYS[number];\ntype ParamPropKey = `params.${BuiltInParamKey}` | `params.${string}`;\n\nconst entityPropMap = {\n  level: (entity: RpgClientObject) => entity._level(),\n  exp: (entity: RpgClientObject) => entity._exp(),\n  gold: (entity: RpgClientObject) => entity._gold(),\n  hp: (entity: RpgClientObject) => entity.hpSignal(),\n  sp: (entity: RpgClientObject) => entity.spSignal(),\n  name: (entity: RpgClientObject) => entity.name(),\n  type: (entity: RpgClientObject) => entity.type(),\n  x: (entity: RpgClientObject) => entity.x(),\n  y: (entity: RpgClientObject) => entity.y(),\n  z: (entity: RpgClientObject) => entity.z(),\n  tint: (entity: RpgClientObject) => entity.tint(),\n  direction: (entity: RpgClientObject) => entity.direction(),\n  speed: (entity: RpgClientObject) => entity.speed(),\n  hitbox: (entity: RpgClientObject) => entity.hitbox(),\n  animation: (entity: RpgClientObject) => entity.animationName(),\n  canMove: (entity: RpgClientObject) => entity.canMove(),\n  graphics: (entity: RpgClientObject) => entity.graphics(),\n  items: (entity: RpgClientObject) => entity.items(),\n  equipments: (entity: RpgClientObject) => entity.equipments(),\n  states: (entity: RpgClientObject) => entity.states(),\n  skills: (entity: RpgClientObject) => entity.skills(),\n  effects: (entity: RpgClientObject) => entity._effects(),\n  componentsTop: (entity: RpgClientObject) => entity.componentsTop(),\n  componentsBottom: (entity: RpgClientObject) => entity.componentsBottom(),\n  componentsCenter: (entity: RpgClientObject) => entity.componentsCenter(),\n  componentsLeft: (entity: RpgClientObject) => entity.componentsLeft(),\n  componentsRight: (entity: RpgClientObject) => entity.componentsRight(),\n} as const;\n\ntype EntityPropMap = typeof entityPropMap;\ntype EntityPropKey = keyof EntityPropMap | ParamPropKey;\ntype EntityPropValue<K extends EntityPropKey> = K extends keyof EntityPropMap\n  ? ReturnType<EntityPropMap[K]>\n  : K extends `params.${string}`\n  ? number | undefined\n  : never;\n\nconst isSignal = <T>(value: unknown): value is Signal<T> =>\n  typeof value === \"function\";\n\nconst toSignal = <T>(value: Signal<T> | T): Signal<T> =>\n  isSignal<T>(value) ? value : computed(() => value);\n\nexport const getEntityProp = <K extends EntityPropKey>(\n  entity: Signal<RpgClientObject | undefined> | RpgClientObject | undefined,\n  key: K\n): Signal<EntityPropValue<K>> => {\n  const entitySignal = toSignal(entity);\n\n  return computed(() => {\n    const current = entitySignal();\n    if (!current) {\n      return undefined as EntityPropValue<K>;\n    }\n\n    if (Object.prototype.hasOwnProperty.call(entityPropMap, key)) {\n      const getter = entityPropMap[key as keyof EntityPropMap];\n      return getter(current) as EntityPropValue<K>;\n    }\n\n    if (key.startsWith(\"params.\")) {\n      const paramKey = key.slice(\"params.\".length);\n      return current._param?.()?.[paramKey] as EntityPropValue<K>;\n    }\n\n    return undefined as EntityPropValue<K>;\n  });\n};\n"],"mappings":";;AAkBA,IAAM,gBAAgB;CACpB,QAAQ,WAA4B,OAAO,QAAQ;CACnD,MAAM,WAA4B,OAAO,MAAM;CAC/C,OAAO,WAA4B,OAAO,OAAO;CACjD,KAAK,WAA4B,OAAO,UAAU;CAClD,KAAK,WAA4B,OAAO,UAAU;CAClD,OAAO,WAA4B,OAAO,MAAM;CAChD,OAAO,WAA4B,OAAO,MAAM;CAChD,IAAI,WAA4B,OAAO,GAAG;CAC1C,IAAI,WAA4B,OAAO,GAAG;CAC1C,IAAI,WAA4B,OAAO,GAAG;CAC1C,OAAO,WAA4B,OAAO,MAAM;CAChD,YAAY,WAA4B,OAAO,WAAW;CAC1D,QAAQ,WAA4B,OAAO,OAAO;CAClD,SAAS,WAA4B,OAAO,QAAQ;CACpD,YAAY,WAA4B,OAAO,eAAe;CAC9D,UAAU,WAA4B,OAAO,SAAS;CACtD,WAAW,WAA4B,OAAO,UAAU;CACxD,QAAQ,WAA4B,OAAO,OAAO;CAClD,aAAa,WAA4B,OAAO,YAAY;CAC5D,SAAS,WAA4B,OAAO,QAAQ;CACpD,SAAS,WAA4B,OAAO,QAAQ;CACpD,UAAU,WAA4B,OAAO,UAAU;CACvD,gBAAgB,WAA4B,OAAO,eAAe;CAClE,mBAAmB,WAA4B,OAAO,kBAAkB;CACxE,mBAAmB,WAA4B,OAAO,kBAAkB;CACxE,iBAAiB,WAA4B,OAAO,gBAAgB;CACpE,kBAAkB,WAA4B,OAAO,iBAAiB;CACvE;AAUD,IAAM,YAAe,UACnB,OAAO,UAAU;AAEnB,IAAM,YAAe,UACnB,SAAY,MAAM,GAAG,QAAQ,eAAe,MAAM;AAEpD,IAAa,iBACX,QACA,QAC+B;CAC/B,MAAM,eAAe,SAAS,OAAO;AAErC,QAAO,eAAe;EACpB,MAAM,UAAU,cAAc;AAC9B,MAAI,CAAC,QACH;AAGF,MAAI,OAAO,UAAU,eAAe,KAAK,eAAe,IAAI,EAAE;GAC5D,MAAM,SAAS,cAAc;AAC7B,UAAO,OAAO,QAAQ;;AAGxB,MAAI,IAAI,WAAW,UAAU,EAAE;GAC7B,MAAM,WAAW,IAAI,MAAM,EAAiB;AAC5C,UAAO,QAAQ,UAAU,GAAG;;GAI9B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpgjs/client",
-  "version": "5.0.0-alpha.43",
+  "version": "5.0.0-alpha.44",
   "description": "RPGJS is a framework for creating RPG/MMORPG games",
   "main": "dist/index.js",
   "types": "./dist/index.d.ts",
@@ -22,10 +22,10 @@
     "pixi.js": "^8.9.2"
   },
   "dependencies": {
-    "@rpgjs/client": "5.0.0-alpha.43",
-    "@rpgjs/common": "5.0.0-alpha.43",
-    "@rpgjs/server": "5.0.0-alpha.43",
-    "@rpgjs/ui-css": "5.0.0-alpha.43",
+    "@rpgjs/client": "5.0.0-alpha.44",
+    "@rpgjs/common": "5.0.0-alpha.44",
+    "@rpgjs/server": "5.0.0-alpha.44",
+    "@rpgjs/ui-css": "5.0.0-alpha.44",
     "@signe/di": "^2.8.3",
     "@signe/room": "^2.8.3",
     "@signe/sync": "^2.8.3",
@@ -33,10 +33,10 @@
     "rxjs": "^7.8.2"
   },
   "devDependencies": {
-    "@canvasengine/compiler": "2.0.0-beta.54",
-    "vite": "^7.3.1",
+    "@canvasengine/compiler": "2.0.0-beta.56",
+    "vite": "^8.0.0",
     "vite-plugin-dts": "^4.5.4",
-    "vitest": "^4.0.18"
+    "vitest": "^4.1.0"
   },
   "type": "module",
   "scripts": {

package/src/components/character.ce

@@ -1,4 +1,4 @@
-<Container x={smoothX} y={smoothY} zIndex={z} viewportFollow={shouldFollowCamera} controls onBeforeDestroy visible >
+<Container x={smoothX} y={smoothY} zIndex={z} viewportFollow={shouldFollowCamera} controls onBeforeDestroy  visible>
   @for (compConfig of normalizedComponentsBehind) {
     <Container>
       <compConfig.component object ...compConfig.props />

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

@@ -1,7 +1,9 @@
 <Container sound={backgroundMusic} shake={shakeConfig} freeze={engine.gamePause}>
   <Container sound={backgroundAmbientSound} />
 
-  <sceneComponent() data={map().data} params={map().params} />
+  @if (map() && sceneComponent()) {
+    <sceneComponent() data={map().data} params={map().params} />
+  }
 
   @for (componentAnimation of componentAnimations) {
     <Container>

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}