@ramathibodi/nuxt-commons 0.1.28 → 0.1.29

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": "^3.0.0"
   },
-  "version": "0.1.28",
+  "version": "0.1.29",
   "builder": {
     "@nuxt/module-builder": "0.8.3",
     "unbuild": "2.0.0"

package/dist/runtime/composables/api.js

@@ -1,11 +1,10 @@
-import { trimEnd, trimStart } from "lodash-es";
-import { useRuntimeConfig, useAuthentication } from "#imports";
 import { ofetch } from "ofetch";
+import { trimEnd, trimStart } from "lodash-es";
+import { useAuthentication, useRuntimeConfig } from "#imports";
 export function useApi() {
   const config = useRuntimeConfig();
-  const nuxtApp = useNuxtApp();
   function urlBuilder(url) {
-    let returnUrl = "";
+    let returnUrl;
     if (Array.isArray(url)) {
       if (url[0].toLowerCase() == "agent") url[0] = config?.public.WS_AGENT || config?.public.WS_DEVICE;
       returnUrl = url.join("/");
@@ -15,26 +14,30 @@ export function useApi() {
     if (returnUrl.startsWith("http://") || returnUrl.startsWith("https://")) return returnUrl;
     else return trimEnd(config?.public.WS_API, "/") + "/" + trimStart(returnUrl, "/");
   }
-  function optionBuilder(method, body, params, options) {
-    let returnOption = {
-      method,
-      body,
-      query: params
-    };
+  function optionBuilder(method, body, params, options = {}) {
     const headers = {
       "Content-Type": "application/json",
       "Accept": "application/json"
     };
-    if (useAuthentication().keycloak?.token) {
-      headers["Authorization"] = `Bearer ${useAuthentication().keycloak.token}`;
-    }
-    if (options) {
-      options = Object.assign(options, returnOption);
-      if (options.headers) options.headers = Object.assign(options.headers, headers);
-      else options.headers = headers;
+    const { token } = useAuthentication().keycloak || {};
+    if (token) {
+      headers["Authorization"] = `Bearer ${token}`;
     }
-    returnOption = Object.assign(returnOption, options);
-    return returnOption;
+    const baseOptions = {
+      method,
+      body,
+      query: params,
+      headers
+    };
+    const finalHeaders = {
+      ...headers,
+      ...options.headers || {}
+    };
+    Object.assign(baseOptions, options);
+    return {
+      ...baseOptions,
+      headers: finalHeaders
+    };
   }
   function get(url, body, params, options) {
     return ofetch(urlBuilder(url), optionBuilder("GET", body, params, options));

package/dist/runtime/composables/graphqlOperation.js

@@ -7,7 +7,7 @@ export function buildFields(operationFields, fields, depth = 0) {
   if (!fields || fields.length == 0) fields = [...operationFields.fields];
   if (fields.includes("*")) {
     operationFields.fields.forEach((field) => {
-      if (!fields.includes(field)) fields.push(field);
+      if (!fields.includes(field) && !field.toLowerCase().endsWith("base64") && !field.toLowerCase().endsWith("base64string")) fields.push(field);
     });
     fields.splice(fields.indexOf("*"), 1);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ramathibodi/nuxt-commons",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "description": "Ramathibodi Nuxt modules for common components",
   "repository": {
     "type": "git",
@@ -114,5 +114,5 @@
     "vitest": "^1.6.0",
     "vue-tsc": "2.0.29"
   },
-  "packageManager": "pnpm@9.12.1+sha512.e5a7e52a4183a02d5931057f7a0dbff9d5e9ce3161e33fa68ae392125b79282a8a8a470a51dfc8a0ed86221442eb2fb57019b0990ed24fab519bf0e1bc5ccfc4"
+  "packageManager": "pnpm@9.12.2+sha512.22721b3a11f81661ae1ec68ce1a7b879425a1ca5b991c975b074ac220b187ce56c708fe5db69f4c962c989452eee76c82877f4ee80f474cebd61ee13461b6228"
 }