@panneau/data 4.0.66 → 4.0.72

package/dist/index.d.ts

@@ -102,8 +102,8 @@ type UseResourceDestroyResult = UseMutationResult & {
 };
 declare function useResourceDestroy(resource: Resource | string): UseResourceDestroyResult;
 declare function useResourceDestroy(id: string | null): UseResourceDestroyResult;
-declare function useResourceDestroy(id: string | null, options: UseMutationOptions): UseResourceDestroyResult;
 declare function useResourceDestroy(resource: Resource | string, id: string | null): UseResourceDestroyResult;
+declare function useResourceDestroy(id: string | null, options: UseMutationOptions): UseResourceDestroyResult;
 declare function useResourceDestroy(resource: Resource | string, id: string | null, options: UseMutationOptions): UseResourceDestroyResult;
 
 type UseResourceItem<T> = UseQueryResult<T> & {
@@ -158,6 +158,7 @@ declare class Base {
     requestPut(path: any, data: any, opts?: any): Promise<unknown>;
     requestPatch(path: any, data: any, opts?: any): Promise<unknown>;
     requestDelete(path: any): Promise<unknown>;
+    hasRoute(route: any): boolean;
     route(route: any, params: any): any;
     getFullUrl(path: any): any;
     onError(err: any): any;

package/dist/index.js

@@ -1,6 +1,6 @@
 import { c } from 'react/compiler-runtime';
 import { useState, use, createContext } from 'react';
-import { useUrlGenerator, usePanneauResource, useResource } from '@panneau/core/contexts';
+import { useUrlGenerator, useRoutes, usePanneauResource, useResource } from '@panneau/core/contexts';
 import { getJSON, getCSRFHeaders, postJSON } from '@folklore/fetch';
 import { generatePath } from '@folklore/routes';
 import queryString from 'query-string';
@@ -618,6 +618,12 @@ class Base {
       _method: 'DELETE'
     }).catch(error => this.onError(error));
   }
+  hasRoute(route) {
+    const {
+      routes
+    } = this.options;
+    return typeof routes[route] !== 'undefined';
+  }
   route(route, params) {
     const {
       routes,
@@ -740,8 +746,9 @@ class ResourcesApi {
     id,
     has_routes: hasRoutes = false
   }, route, params) {
-    const routePrefix = hasRoutes ? `resources.${id}` : 'resources';
-    return this.api.route(`${routePrefix}.${route}`, hasRoutes ? params : {
+    const hasSpecificRoute = this.hasRoute(`resources.${id}.${route}`);
+    const routeName = hasSpecificRoute ? `resources.${id}.${route}` : `resources.${id}`;
+    return this.api.route(routeName, hasSpecificRoute ? params : {
       resource: id,
       ...params
     });
@@ -821,7 +828,7 @@ function useApi() {
   return use(ApiContext);
 }
 function ApiProvider(t0) {
-  const $ = c(9);
+  const $ = c(10);
   const {
     api: t1,
     baseUrl: t2,
@@ -833,11 +840,13 @@ function ApiProvider(t0) {
   const onUnauthorized = t3 === undefined ? null : t3;
   const generateUrl = useUrlGenerator();
   const previousApi = useApi();
+  const routes = useRoutes();
   let t4;
-  if ($[0] !== baseUrl || $[1] !== generateUrl || $[2] !== initialApi || $[3] !== onUnauthorized || $[4] !== previousApi) {
+  if ($[0] !== baseUrl || $[1] !== generateUrl || $[2] !== initialApi || $[3] !== onUnauthorized || $[4] !== previousApi || $[5] !== routes) {
     t4 = initialApi || previousApi || new Api({
       baseUrl,
       generateUrl,
+      routes,
       onUnauthorized
     });
     $[0] = baseUrl;
@@ -845,22 +854,23 @@ function ApiProvider(t0) {
     $[2] = initialApi;
     $[3] = onUnauthorized;
     $[4] = previousApi;
-    $[5] = t4;
+    $[5] = routes;
+    $[6] = t4;
   } else {
-    t4 = $[5];
+    t4 = $[6];
   }
   const api = t4;
   let t5;
-  if ($[6] !== api || $[7] !== children) {
+  if ($[7] !== api || $[8] !== children) {
     t5 = /*#__PURE__*/jsx(ApiContext, {
       value: api,
       children: children
     });
-    $[6] = api;
-    $[7] = children;
-    $[8] = t5;
+    $[7] = api;
+    $[8] = children;
+    $[9] = t5;
   } else {
-    t5 = $[8];
+    t5 = $[9];
   }
   return t5;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/data",
-    "version": "4.0.66",
+    "version": "4.0.72",
     "description": "",
     "keywords": [
         "javascript"
@@ -54,8 +54,8 @@
     "dependencies": {
         "@babel/runtime": "^7.28.6",
         "@folklore/fetch": "^0.1.21",
-        "@folklore/routes": "^0.2.44",
-        "@panneau/core": "^4.0.66",
+        "@folklore/routes": "^0.4.11",
+        "@panneau/core": "^4.0.72",
         "@tanstack/react-query": "^5.100.9",
         "lodash": "^4.17.21",
         "query-string": "^9.0.0"
@@ -71,5 +71,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "9f89301a517c628efb03ed6f27632c66a03dd146"
+    "gitHead": "6ef477fccf4ca9b81fcca140f56eb45413391c87"
 }