@rpgjs/tiledmap 5.0.0-alpha.10 → 5.0.0-alpha.2

package/dist/index.d.ts

@@ -1,4 +1,3 @@
 export declare function provideTiledMap(options: {
     basePath: string;
-    onLoadMap?: (map: string) => Promise<void>;
 }): any;

package/dist/server/index.js

@@ -1,6 +1,6 @@
 import server from "./index2.js";
 import { createModule } from "@rpgjs/common";
-import "./index3.js";
+import "@rpgjs/tiled";
 const client = null;
 const provideLoadMap = null;
 function provideTiledMap(options) {

package/dist/server/index2.js

@@ -1,4 +1,4 @@
-import { MapClass } from "./index3.js";
+import { MapClass } from "@rpgjs/tiled";
 import { defineModule } from "@rpgjs/common";
 const server = defineModule({
   map: {

package/dist/server.d.ts

@@ -1,5 +1,5 @@
 import { RpgMap } from '@rpgjs/server';
-import { MapClass } from '@canvasengine/tiled';
+import { MapClass } from '@rpgjs/tiled';
 declare module "@rpgjs/server" {
     interface RpgMap {
         tiled?: MapClass;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpgjs/tiledmap",
-  "version": "5.0.0-alpha.10",
+  "version": "5.0.0-alpha.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -22,12 +22,13 @@
   "license": "MIT",
   "description": "RPGJS is a framework for creating RPG/MMORPG games",
   "peerDependencies": {
-    "@canvasengine/presets": "2.0.0-beta.25",
-    "@rpgjs/client": "5.0.0-alpha.10",
-    "@rpgjs/common": "5.0.0-alpha.10",
-    "@rpgjs/server": "5.0.0-alpha.10",
-    "@rpgjs/vite": "5.0.0-alpha.10",
-    "canvasengine": "2.0.0-beta.25"
+    "canvasengine": "2.0.0-beta.21",
+    "@canvasengine/presets": "2.0.0-beta.21",
+    "@rpgjs/common": "5.0.0-alpha.2",
+    "@rpgjs/server": "5.0.0-alpha.2",
+    "@rpgjs/client": "5.0.0-alpha.2",
+    "@rpgjs/tiled": "5.0.0-alpha.2",
+    "@rpgjs/vite": "5.0.0-alpha.2"
   },
   "publishConfig": {
     "access": "public"
@@ -38,9 +39,6 @@
     "vite-plugin-dts": "^4.5.3"
   },
   "type": "module",
-  "dependencies": {
-    "@canvasengine/tiled": "2.0.0-beta.25"
-  },
   "scripts": {
     "dev": "vite build --watch",
     "build": "vite build"

package/src/client.ts

@@ -2,5 +2,5 @@ import { RpgClient, RpgClientEngine } from "@rpgjs/client";
 import { defineModule } from "@rpgjs/common";
 
 export default defineModule<RpgClient>({
-    componentAnimations: []
+    effects: []
 })

package/src/index.ts

@@ -2,12 +2,11 @@ import server from "./server";
 import client from "./client";
 import { createModule } from "@rpgjs/common";
 import { provideLoadMap } from "@rpgjs/client";
-import { TiledParser } from "@canvasengine/tiled";
+import { TiledParser } from "@rpgjs/tiled";
 import Tiled from "./tiled.ce";
 
 export function provideTiledMap(options: {
   basePath: string;
-  onLoadMap?: (map: string) => Promise<void>;
 }) {
   return createModule("TiledMap", [
     {
@@ -15,41 +14,33 @@ export function provideTiledMap(options: {
       client,
     },
     provideLoadMap?.(async (map) => {
-      "use client";
-      const response = await fetch(`${options.basePath}/${map}.tmx`);
-      const mapData = (await response.text());
+      'use client';
+      const response = await fetch(`${options.basePath}/${map}.tmx`)
+      const mapData = (await response.text()).replace(/source="([^"]+)"/g, `source="${options.basePath}/$1"`)
       const parser = new TiledParser(mapData);
       const parsedMap = parser.parseMap();
-      const tilesets: any = [];
+      const tilesets: any = []
       for (let tileset of parsedMap.tilesets) {
-        const response = await fetch(`${options.basePath}/${tileset.source}`);
+        const response = await fetch(`${tileset.source}`);
         const tilesetData = await response.text();
         const parser = new TiledParser(tilesetData);
         const parsedTileset = parser.parseTileset();
-        parsedTileset.image.source = `${options.basePath}/${parsedTileset.image.source}`;
+        parsedTileset.image.source = `${options.basePath}/${parsedTileset.image.source}`
         // Preserve firstgid from the original tileset reference
         tilesets.push({
-          ...tileset, // Preserve original properties including firstgid
-          ...parsedTileset, // Merge with parsed tileset data
-        });
+          ...tileset,  // Preserve original properties including firstgid
+          ...parsedTileset  // Merge with parsed tileset data
+        })
       }
-      parsedMap.tilesets = tilesets;
-
+      parsedMap.tilesets = tilesets
+      
       const obj = {
-        data: mapData,
-        component: Tiled,
-        parsedMap,
-        id: map,
-        params: {
-          basePath: options.basePath,
-        },
-      };
-
-      if (options.onLoadMap) {
-        await options.onLoadMap(map);
-      }
-
-      return obj;
+       data: mapData,
+       component: Tiled,
+       parsedMap,
+       id: map
+     }
+      return obj
     }),
   ]);
 }

package/src/server.ts

@@ -1,7 +1,10 @@
 import { RpgMap, RpgServer } from "@rpgjs/server";
-import { MapClass } from "@canvasengine/tiled";
+import { TiledParser, MapClass } from "@rpgjs/tiled";
 import { defineModule } from "@rpgjs/common";
 
+// Import TileInfo depuis le bon endroit
+import type { TileInfo } from "@rpgjs/tiled/src/classes/Map";
+
 // Extend RpgMap interface to include tiled property
 declare module "@rpgjs/server" {
   interface RpgMap {

package/src/tiled.ce

@@ -1,5 +1,5 @@
 <Container>
-    <TiledMap map basePath createLayersPerTilesZ={true} objectLayer={() => <EventLayerComponent />}  />
+    <TiledMap map basePath="map" createLayersPerTilesZ={true} objectLayer={() => <EventLayerComponent />}  />
 </Container>
 
 <script>
@@ -7,8 +7,7 @@
     import { TiledMap } from "@canvasengine/presets";
     import { signal } from "canvasengine";
 
-    const { data, params } = defineProps()
+    const { data, children } = defineProps()
 
     const map = signal(data())
-    const basePath = signal(params().basePath)
 </script>

package/dist/client/index4.js

@@ -1,15 +0,0 @@
-import { useProps, useDefineProps, signal, h, Container } from "canvasengine";
-import { EventLayerComponent } from "@rpgjs/client";
-import { TiledMap } from "@canvasengine/presets";
-function component($$props) {
-  useProps($$props);
-  const defineProps = useDefineProps($$props);
-  var _a = defineProps(), data = _a.data, params = _a.params;
-  var map = signal(data());
-  var basePath = signal(params().basePath);
-  let $this = h(Container, null, h(TiledMap, { map, basePath, createLayersPerTilesZ: true, objectLayer: () => h(EventLayerComponent) }));
-  return $this;
-}
-export {
-  component as default
-};