@okam/directus-query 1.5.5 → 2.0.1

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 2.0.1 (2026-03-26)
+
+### 🩹 Fixes
+
+- **directus-query:** admin client token falls back to regular token ([83444996](https://github.com/OKAMca/stack/commit/83444996))
+- **directus-query:** default admin client uses correct env vars/fallbacks ([f551345d](https://github.com/OKAMca/stack/commit/f551345d))
+
+### ❤️ Thank You
+
+- poclerson
+
+# 2.0.0 (2026-02-05)
+
+This was a version bump only for directus-query to align it with other projects, there were no code changes.
+
 ## 1.5.5 (2026-01-23)
 
 ### 🧱 Updated Dependencies

package/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("graphql-request"),q=require("radashi"),i=require("@tanstack/react-query");class u{constructor(n,e,s){this.nameSpace="[STACK]",this.suppressConsole=!1,this.env=process.env.NODE_ENV,this.nameSpace=n??this.nameSpace,this.suppressConsole=s??this.suppressConsole,this.logger=e??this.internalLogger.bind(this)}internalLogger(n,e,s){this.env!=="production"&&console[e??"log"](`${this.nameSpace} ${n}`.trimStart(),s??"")}setLogger(n){this.logger=(e,s,t)=>{this.suppressConsole&&this.internalLogger(e,s,t),n(e,s,t)}}static getInstance(){return u.instance??=new u,u.instance}log(n,e,s){this.logger(n,e,s)}}u.getInstance();function g(r,n,e=!1){const s=new u(r,n,e);return s.log("Logger initialized","info"),s}const y=g("[DirectusQuery]"),Q=process.env.NEXT_PUBLIC_GRAPHQL_URL,_=process.env.NEXT_SERVER_GRAPHQL_URL,L=process.env.NEXT_GRAPHQL_URL_ADMIN,N=process.env.NEXT_PUBLIC_API_TOKEN??"",A=process.env.NEXT_PUBLIC_API_TOKEN,p=new l.GraphQLClient(_||Q,{credentials:"include",mode:"cors",fetch,headers:{Authorization:`Bearer ${N}`}}),h=new l.GraphQLClient(L,{credentials:"include",mode:"cors",fetch,headers:{Authorization:`Bearer ${A}`}});new i.QueryClient({queryCache:new i.QueryCache({onError:r=>{y.log("QueryClient Error","error",{error:r})}}),defaultOptions:{queries:{staleTime:5*1e3}}});async function o(r,n,e=p){return e.request(r,{...n})}function c(r,n){return[q.get(r,"definitions.0.name.value"),n]}function E(r,n,e,s){const t=c(r,n);return i.useQuery({queryKey:t,queryFn:async({queryKey:a})=>o(r,a[1],s),...e})}function d(r,n,e){const s=c(r,n);return i.useSuspenseQuery({queryKey:s,queryFn:async({queryKey:t})=>o(r,t[1]),...e})}function f(r,n,e){const s=c(r,n);return i.useSuspenseQuery({queryKey:s,queryFn:async({queryKey:t})=>o(r,t[1],h),...e})}const G=process.env.NEXT_PUBLIC_GRAPHQL_URL,T=process.env.NEXT_PUBLIC_API_TOKEN,P={credentials:"include",mode:"cors",fetch,headers:{Authorization:`Bearer ${T}`}};function C(r=G,n=P){const e=new l.GraphQLClient(r,n);async function s(t,a){return o(t,a,e)}return{queryGql:s,client:e}}exports.DirectusQueryLogger=y;exports.defaultGraphqlRequestAdmin=h;exports.defaultGraphqlRequestClient=p;exports.getQueryValues=c;exports.initDirectusQuery=C;exports.queryGql=o;exports.useGqlQuery=E;exports.useSuspenseGqlQuery=d;exports.useSuspenseGqlQueryAdmin=f;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("graphql-request"),_=require("radashi"),i=require("@tanstack/react-query");class u{constructor(n,e,s){this.nameSpace="[STACK]",this.suppressConsole=!1,this.env=process.env.NODE_ENV,this.nameSpace=n??this.nameSpace,this.suppressConsole=s??this.suppressConsole,this.logger=e??this.internalLogger.bind(this)}internalLogger(n,e,s){this.env!=="production"&&console[e??"log"](`${this.nameSpace} ${n}`.trimStart(),s??"")}setLogger(n){this.logger=(e,s,t)=>{this.suppressConsole&&this.internalLogger(e,s,t),n(e,s,t)}}static getInstance(){return u.instance??=new u,u.instance}log(n,e,s){this.logger(n,e,s)}}u.getInstance();function N(r,n,e=!1){const s=new u(r,n,e);return s.log("Logger initialized","info"),s}const y=N("[DirectusQuery]"),p=process.env.NEXT_PUBLIC_GRAPHQL_URL,h=process.env.NEXT_SERVER_GRAPHQL_URL,A=process.env.NEXT_GRAPHQL_URL_ADMIN,q=process.env.NEXT_PUBLIC_API_TOKEN??"",E=process.env.NEXT_API_TOKEN_ADMIN,g=new l.GraphQLClient(h||p,{credentials:"include",mode:"cors",fetch,headers:{Authorization:`Bearer ${q}`}}),Q=new l.GraphQLClient(A||h||p,{credentials:"include",mode:"cors",fetch,headers:{Authorization:`Bearer ${E||q}`}});new i.QueryClient({queryCache:new i.QueryCache({onError:r=>{y.log("QueryClient Error","error",{error:r})}}),defaultOptions:{queries:{staleTime:5*1e3}}});async function o(r,n,e=g){return e.request(r,{...n})}function c(r,n){return[_.get(r,"definitions.0.name.value"),n]}function L(r,n,e,s){const t=c(r,n);return i.useQuery({queryKey:t,queryFn:async({queryKey:a})=>o(r,a[1],s),...e})}function d(r,n,e){const s=c(r,n);return i.useSuspenseQuery({queryKey:s,queryFn:async({queryKey:t})=>o(r,t[1]),...e})}function f(r,n,e){const s=c(r,n);return i.useSuspenseQuery({queryKey:s,queryFn:async({queryKey:t})=>o(r,t[1],Q),...e})}const G=process.env.NEXT_PUBLIC_GRAPHQL_URL,T=process.env.NEXT_PUBLIC_API_TOKEN,P={credentials:"include",mode:"cors",fetch,headers:{Authorization:`Bearer ${T}`}};function R(r=G,n=P){const e=new l.GraphQLClient(r,n);async function s(t,a){return o(t,a,e)}return{queryGql:s,client:e}}exports.DirectusQueryLogger=y;exports.defaultGraphqlRequestAdmin=Q;exports.defaultGraphqlRequestClient=g;exports.getQueryValues=c;exports.initDirectusQuery=R;exports.queryGql=o;exports.useGqlQuery=L;exports.useSuspenseGqlQuery=d;exports.useSuspenseGqlQueryAdmin=f;

package/index.mjs

@@ -1,6 +1,6 @@
 import { GraphQLClient as c } from "graphql-request";
-import { get as p } from "radashi";
-import { QueryClient as h, QueryCache as _, useQuery as g, useSuspenseQuery as l } from "@tanstack/react-query";
+import { get as g } from "radashi";
+import { QueryClient as y, QueryCache as N, useQuery as f, useSuspenseQuery as l } from "@tanstack/react-query";
 class o {
   constructor(n, e, s) {
     this.nameSpace = "[STACK]", this.suppressConsole = !1, this.env = process.env.NODE_ENV, this.nameSpace = n ?? this.nameSpace, this.suppressConsole = s ?? this.suppressConsole, this.logger = e ?? this.internalLogger.bind(this);
@@ -21,29 +21,29 @@ class o {
   }
 }
 o.getInstance();
-function y(r, n, e = !1) {
+function q(r, n, e = !1) {
   const s = new o(r, n, e);
   return s.log("Logger initialized", "info"), s;
 }
-const N = y("[DirectusQuery]"), f = process.env.NEXT_PUBLIC_GRAPHQL_URL, q = process.env.NEXT_SERVER_GRAPHQL_URL, E = process.env.NEXT_GRAPHQL_URL_ADMIN, A = process.env.NEXT_PUBLIC_API_TOKEN ?? "", L = process.env.NEXT_PUBLIC_API_TOKEN, Q = new c(q || f, {
+const A = q("[DirectusQuery]"), p = process.env.NEXT_PUBLIC_GRAPHQL_URL, h = process.env.NEXT_SERVER_GRAPHQL_URL, E = process.env.NEXT_GRAPHQL_URL_ADMIN, _ = process.env.NEXT_PUBLIC_API_TOKEN ?? "", L = process.env.NEXT_API_TOKEN_ADMIN, Q = new c(h || p, {
   credentials: "include",
   mode: "cors",
   fetch,
   headers: {
-    Authorization: `Bearer ${A}`
+    Authorization: `Bearer ${_}`
   }
-}), T = new c(E, {
+}), T = new c(E || h || p, {
   credentials: "include",
   mode: "cors",
   fetch,
   headers: {
-    Authorization: `Bearer ${L}`
+    Authorization: `Bearer ${L || _}`
   }
 });
-new h({
-  queryCache: new _({
+new y({
+  queryCache: new N({
     onError: (r) => {
-      N.log("QueryClient Error", "error", { error: r });
+      A.log("QueryClient Error", "error", { error: r });
     }
   }),
   defaultOptions: {
@@ -58,11 +58,11 @@ async function u(r, n, e = Q) {
   });
 }
 function a(r, n) {
-  return [p(r, "definitions.0.name.value"), n];
+  return [g(r, "definitions.0.name.value"), n];
 }
 function m(r, n, e, s) {
   const t = a(r, n);
-  return g({
+  return f({
     queryKey: t,
     queryFn: async ({ queryKey: i }) => u(r, i[1], s),
     ...e
@@ -76,7 +76,7 @@ function v(r, n, e) {
     ...e
   });
 }
-function U(r, n, e) {
+function D(r, n, e) {
   const s = a(r, n);
   return l({
     queryKey: s,
@@ -84,15 +84,15 @@ function U(r, n, e) {
     ...e
   });
 }
-const P = process.env.NEXT_PUBLIC_GRAPHQL_URL, d = process.env.NEXT_PUBLIC_API_TOKEN, R = {
+const d = process.env.NEXT_PUBLIC_GRAPHQL_URL, P = process.env.NEXT_PUBLIC_API_TOKEN, R = {
   credentials: "include",
   mode: "cors",
   fetch,
   headers: {
-    Authorization: `Bearer ${d}`
+    Authorization: `Bearer ${P}`
   }
 };
-function O(r = P, n = R) {
+function O(r = d, n = R) {
   const e = new c(r, n);
   async function s(t, i) {
     return u(t, i, e);
@@ -103,7 +103,7 @@ function O(r = P, n = R) {
   };
 }
 export {
-  N as DirectusQueryLogger,
+  A as DirectusQueryLogger,
   T as defaultGraphqlRequestAdmin,
   Q as defaultGraphqlRequestClient,
   a as getQueryValues,
@@ -111,5 +111,5 @@ export {
   u as queryGql,
   m as useGqlQuery,
   v as useSuspenseGqlQuery,
-  U as useSuspenseGqlQueryAdmin
+  D as useSuspenseGqlQueryAdmin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@okam/directus-query",
-  "version": "1.5.5",
+  "version": "2.0.1",
   "repository": {
     "url": "https://github.com/OKAMca/stack.git"
   },
@@ -31,8 +31,8 @@
   "dependencies": {
     "@graphql-codegen/cli": "^6.1.1",
     "@graphql-typed-document-node/core": "3.2.0",
-    "@okam/core-lib": "1.17.4",
     "@okam/logger": "1.1.0",
+    "@okam/react-utils": "0.0.1",
     "@tanstack/react-query": "^5.62.3",
     "graphql-request": "^7.1.2",
     "radashi": "^12.3.0"
@@ -40,4 +40,4 @@
   "devDependencies": {
     "react": "^19.0.0"
   }
-}
+}