@hybridly/core 0.6.1 → 0.7.0

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-const qs = require('qs');
 const utils = require('@hybridly/utils');
+const qs = require('qs');
 const axios = require('axios');
 const superjson = require('superjson');
 
@@ -524,6 +524,27 @@ function updateRoutingConfiguration(routing) {
   setContext({ routing });
 }
 
+function isDownloadResponse(response) {
+  return response.status === 200 && !!response.headers["content-disposition"];
+}
+async function handleDownloadResponse(response) {
+  const blob = new Blob([response.data], { type: response.headers["content-type"] });
+  const urlObject = window.webkitURL || window.URL;
+  const link = document.createElement("a");
+  link.style.display = "none";
+  link.href = urlObject.createObjectURL(blob);
+  link.download = getFileNameFromContentDispositionHeader(response.headers["content-disposition"]);
+  link.click();
+  setTimeout(() => {
+    urlObject.revokeObjectURL(link.href);
+    link.remove();
+  }, 0);
+}
+function getFileNameFromContentDispositionHeader(header) {
+  const result = header.split(";")[1]?.trim().split("=")[1];
+  return result?.replace(/^"(.*)"$/, "$1") ?? "";
+}
+
 const state = {
   initialized: false,
   context: {}
@@ -550,7 +571,7 @@ async function initializeContext(options) {
     },
     scrollRegions: [],
     plugins: options.plugins ?? [],
-    axios: options.axios ?? axios__default.create(),
+    axios: registerAxios(options.axios ?? axios__default.create()),
     routing: options.routing,
     preloadCache: /* @__PURE__ */ new Map(),
     hooks: {},
@@ -559,6 +580,23 @@ async function initializeContext(options) {
   await runHooks("initialized", {}, state.context);
   return getInternalRouterContext();
 }
+function registerAxios(axios2) {
+  axios2.interceptors.response.use(
+    (response) => {
+      if (!isDownloadResponse(response)) {
+        const text = new TextDecoder().decode(response.data);
+        try {
+          response.data = JSON.parse(text);
+        } catch {
+          response.data = text;
+        }
+      }
+      return response;
+    },
+    (error) => Promise.reject(error)
+  );
+  return axios2;
+}
 function setContext(merge = {}, options = {}) {
   Object.keys(merge).forEach((key) => {
     Reflect.set(state.context, key, merge[key]);
@@ -644,27 +682,6 @@ async function closeDialog(options) {
   });
 }
 
-function isDownloadResponse(response) {
-  return response.status === 200 && !!response.headers["content-disposition"];
-}
-async function handleDownloadResponse(response) {
-  const blob = new Blob([response.data], { type: "application/octet-stream" });
-  const urlObject = window.webkitURL || window.URL;
-  const link = document.createElement("a");
-  link.style.display = "none";
-  link.href = urlObject.createObjectURL(blob);
-  link.download = getFileNameFromContentDispositionHeader(response.headers["content-disposition"]);
-  link.click();
-  setTimeout(() => {
-    urlObject.revokeObjectURL(link.href);
-    link.remove();
-  }, 0);
-}
-function getFileNameFromContentDispositionHeader(header) {
-  const result = header.split(";")[1]?.trim().split("=")[1];
-  return result?.replace(/^"(.*)"$/, "$1") ?? "";
-}
-
 function isPreloaded(targetUrl) {
   const context = getInternalRouterContext();
   return context.preloadCache.has(targetUrl.toString()) ?? false;
@@ -1005,6 +1022,7 @@ async function performHybridRequest(targetUrl, options, abortController) {
       "X-Requested-With": "XMLHttpRequest",
       "Accept": "text/html, application/xhtml+xml"
     },
+    responseType: "arraybuffer",
     validateStatus: () => true,
     onUploadProgress: async (event) => {
       await runHooks("progress", options.hooks, {

package/dist/index.d.cts

@@ -90,12 +90,6 @@ interface HookOptions {
  */
 declare function registerHook<T extends keyof Hooks>(hook: T, fn: Hooks[T], options?: HookOptions): () => void;
 
-interface Plugin extends Partial<Hooks> {
-    /** Identifier of the plugin. */
-    name: string;
-}
-declare function definePlugin(plugin: Plugin): Plugin;
-
 interface CloseDialogOptions extends HybridRequestOptions {
     /**
      * Close the dialog without a round-trip to the server.
@@ -104,6 +98,25 @@ interface CloseDialogOptions extends HybridRequestOptions {
     local?: boolean;
 }
 
+interface RoutingConfiguration {
+    url: string;
+    port?: number;
+    defaults: Record<string, any>;
+    routes: Record<string, RouteDefinition>;
+}
+interface RouteDefinition {
+    uri: string;
+    method: Method[];
+    bindings: Record<string, string>;
+    domain?: string;
+    wheres?: Record<string, string>;
+    name: string;
+}
+interface GlobalRouteCollection extends RoutingConfiguration {
+}
+type RouteName = keyof GlobalRouteCollection['routes'];
+type RouteParameters<T extends RouteName> = Record<keyof GlobalRouteCollection['routes'][T]['bindings'], any> & Record<string, any>;
+
 type UrlResolvable = string | URL | Location;
 type UrlTransformable = BaseUrlTransformable | ((string: URL) => BaseUrlTransformable);
 type BaseUrlTransformable = Partial<Omit<URL, 'searchParams' | 'toJSON' | 'toString'>> & {
@@ -333,24 +346,11 @@ interface Progress {
 }
 type Errors = any;
 
-interface RoutingConfiguration {
-    url: string;
-    port?: number;
-    defaults: Record<string, any>;
-    routes: Record<string, RouteDefinition>;
-}
-interface RouteDefinition {
-    uri: string;
-    method: Method[];
-    bindings: Record<string, string>;
-    domain?: string;
-    wheres?: Record<string, string>;
+interface Plugin extends Partial<Hooks> {
+    /** Identifier of the plugin. */
     name: string;
 }
-interface GlobalRouteCollection extends RoutingConfiguration {
-}
-type RouteName = keyof GlobalRouteCollection['routes'];
-type RouteParameters<T extends RouteName> = Record<keyof GlobalRouteCollection['routes'][T]['bindings'], any> & Record<string, any>;
+declare function definePlugin(plugin: Plugin): Plugin;
 
 /** Options for creating a router context. */
 interface RouterContextOptions {
@@ -474,7 +474,7 @@ interface DynamicConfiguration {
     };
     components: {
         eager?: boolean;
-        directories: string[];
+        files: string[];
         views: Component[];
         layouts: Component[];
         components: Component[];

package/dist/index.d.mts

@@ -90,12 +90,6 @@ interface HookOptions {
  */
 declare function registerHook<T extends keyof Hooks>(hook: T, fn: Hooks[T], options?: HookOptions): () => void;
 
-interface Plugin extends Partial<Hooks> {
-    /** Identifier of the plugin. */
-    name: string;
-}
-declare function definePlugin(plugin: Plugin): Plugin;
-
 interface CloseDialogOptions extends HybridRequestOptions {
     /**
      * Close the dialog without a round-trip to the server.
@@ -104,6 +98,25 @@ interface CloseDialogOptions extends HybridRequestOptions {
     local?: boolean;
 }
 
+interface RoutingConfiguration {
+    url: string;
+    port?: number;
+    defaults: Record<string, any>;
+    routes: Record<string, RouteDefinition>;
+}
+interface RouteDefinition {
+    uri: string;
+    method: Method[];
+    bindings: Record<string, string>;
+    domain?: string;
+    wheres?: Record<string, string>;
+    name: string;
+}
+interface GlobalRouteCollection extends RoutingConfiguration {
+}
+type RouteName = keyof GlobalRouteCollection['routes'];
+type RouteParameters<T extends RouteName> = Record<keyof GlobalRouteCollection['routes'][T]['bindings'], any> & Record<string, any>;
+
 type UrlResolvable = string | URL | Location;
 type UrlTransformable = BaseUrlTransformable | ((string: URL) => BaseUrlTransformable);
 type BaseUrlTransformable = Partial<Omit<URL, 'searchParams' | 'toJSON' | 'toString'>> & {
@@ -333,24 +346,11 @@ interface Progress {
 }
 type Errors = any;
 
-interface RoutingConfiguration {
-    url: string;
-    port?: number;
-    defaults: Record<string, any>;
-    routes: Record<string, RouteDefinition>;
-}
-interface RouteDefinition {
-    uri: string;
-    method: Method[];
-    bindings: Record<string, string>;
-    domain?: string;
-    wheres?: Record<string, string>;
+interface Plugin extends Partial<Hooks> {
+    /** Identifier of the plugin. */
     name: string;
 }
-interface GlobalRouteCollection extends RoutingConfiguration {
-}
-type RouteName = keyof GlobalRouteCollection['routes'];
-type RouteParameters<T extends RouteName> = Record<keyof GlobalRouteCollection['routes'][T]['bindings'], any> & Record<string, any>;
+declare function definePlugin(plugin: Plugin): Plugin;
 
 /** Options for creating a router context. */
 interface RouterContextOptions {
@@ -474,7 +474,7 @@ interface DynamicConfiguration {
     };
     components: {
         eager?: boolean;
-        directories: string[];
+        files: string[];
         views: Component[];
         layouts: Component[];
         components: Component[];

package/dist/index.d.ts

@@ -90,12 +90,6 @@ interface HookOptions {
  */
 declare function registerHook<T extends keyof Hooks>(hook: T, fn: Hooks[T], options?: HookOptions): () => void;
 
-interface Plugin extends Partial<Hooks> {
-    /** Identifier of the plugin. */
-    name: string;
-}
-declare function definePlugin(plugin: Plugin): Plugin;
-
 interface CloseDialogOptions extends HybridRequestOptions {
     /**
      * Close the dialog without a round-trip to the server.
@@ -104,6 +98,25 @@ interface CloseDialogOptions extends HybridRequestOptions {
     local?: boolean;
 }
 
+interface RoutingConfiguration {
+    url: string;
+    port?: number;
+    defaults: Record<string, any>;
+    routes: Record<string, RouteDefinition>;
+}
+interface RouteDefinition {
+    uri: string;
+    method: Method[];
+    bindings: Record<string, string>;
+    domain?: string;
+    wheres?: Record<string, string>;
+    name: string;
+}
+interface GlobalRouteCollection extends RoutingConfiguration {
+}
+type RouteName = keyof GlobalRouteCollection['routes'];
+type RouteParameters<T extends RouteName> = Record<keyof GlobalRouteCollection['routes'][T]['bindings'], any> & Record<string, any>;
+
 type UrlResolvable = string | URL | Location;
 type UrlTransformable = BaseUrlTransformable | ((string: URL) => BaseUrlTransformable);
 type BaseUrlTransformable = Partial<Omit<URL, 'searchParams' | 'toJSON' | 'toString'>> & {
@@ -333,24 +346,11 @@ interface Progress {
 }
 type Errors = any;
 
-interface RoutingConfiguration {
-    url: string;
-    port?: number;
-    defaults: Record<string, any>;
-    routes: Record<string, RouteDefinition>;
-}
-interface RouteDefinition {
-    uri: string;
-    method: Method[];
-    bindings: Record<string, string>;
-    domain?: string;
-    wheres?: Record<string, string>;
+interface Plugin extends Partial<Hooks> {
+    /** Identifier of the plugin. */
     name: string;
 }
-interface GlobalRouteCollection extends RoutingConfiguration {
-}
-type RouteName = keyof GlobalRouteCollection['routes'];
-type RouteParameters<T extends RouteName> = Record<keyof GlobalRouteCollection['routes'][T]['bindings'], any> & Record<string, any>;
+declare function definePlugin(plugin: Plugin): Plugin;
 
 /** Options for creating a router context. */
 interface RouterContextOptions {
@@ -474,7 +474,7 @@ interface DynamicConfiguration {
     };
     components: {
         eager?: boolean;
-        directories: string[];
+        files: string[];
         views: Component[];
         layouts: Component[];
         components: Component[];

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import qs from 'qs';
 import { debug, merge, removeTrailingSlash, debounce, random, hasFiles, objectToFormData, match, showResponseErrorModal, when } from '@hybridly/utils';
+import qs from 'qs';
 import axios from 'axios';
 import { stringify, parse } from 'superjson';
 
@@ -517,6 +517,27 @@ function updateRoutingConfiguration(routing) {
   setContext({ routing });
 }
 
+function isDownloadResponse(response) {
+  return response.status === 200 && !!response.headers["content-disposition"];
+}
+async function handleDownloadResponse(response) {
+  const blob = new Blob([response.data], { type: response.headers["content-type"] });
+  const urlObject = window.webkitURL || window.URL;
+  const link = document.createElement("a");
+  link.style.display = "none";
+  link.href = urlObject.createObjectURL(blob);
+  link.download = getFileNameFromContentDispositionHeader(response.headers["content-disposition"]);
+  link.click();
+  setTimeout(() => {
+    urlObject.revokeObjectURL(link.href);
+    link.remove();
+  }, 0);
+}
+function getFileNameFromContentDispositionHeader(header) {
+  const result = header.split(";")[1]?.trim().split("=")[1];
+  return result?.replace(/^"(.*)"$/, "$1") ?? "";
+}
+
 const state = {
   initialized: false,
   context: {}
@@ -543,7 +564,7 @@ async function initializeContext(options) {
     },
     scrollRegions: [],
     plugins: options.plugins ?? [],
-    axios: options.axios ?? axios.create(),
+    axios: registerAxios(options.axios ?? axios.create()),
     routing: options.routing,
     preloadCache: /* @__PURE__ */ new Map(),
     hooks: {},
@@ -552,6 +573,23 @@ async function initializeContext(options) {
   await runHooks("initialized", {}, state.context);
   return getInternalRouterContext();
 }
+function registerAxios(axios2) {
+  axios2.interceptors.response.use(
+    (response) => {
+      if (!isDownloadResponse(response)) {
+        const text = new TextDecoder().decode(response.data);
+        try {
+          response.data = JSON.parse(text);
+        } catch {
+          response.data = text;
+        }
+      }
+      return response;
+    },
+    (error) => Promise.reject(error)
+  );
+  return axios2;
+}
 function setContext(merge = {}, options = {}) {
   Object.keys(merge).forEach((key) => {
     Reflect.set(state.context, key, merge[key]);
@@ -637,27 +675,6 @@ async function closeDialog(options) {
   });
 }
 
-function isDownloadResponse(response) {
-  return response.status === 200 && !!response.headers["content-disposition"];
-}
-async function handleDownloadResponse(response) {
-  const blob = new Blob([response.data], { type: "application/octet-stream" });
-  const urlObject = window.webkitURL || window.URL;
-  const link = document.createElement("a");
-  link.style.display = "none";
-  link.href = urlObject.createObjectURL(blob);
-  link.download = getFileNameFromContentDispositionHeader(response.headers["content-disposition"]);
-  link.click();
-  setTimeout(() => {
-    urlObject.revokeObjectURL(link.href);
-    link.remove();
-  }, 0);
-}
-function getFileNameFromContentDispositionHeader(header) {
-  const result = header.split(";")[1]?.trim().split("=")[1];
-  return result?.replace(/^"(.*)"$/, "$1") ?? "";
-}
-
 function isPreloaded(targetUrl) {
   const context = getInternalRouterContext();
   return context.preloadCache.has(targetUrl.toString()) ?? false;
@@ -998,6 +1015,7 @@ async function performHybridRequest(targetUrl, options, abortController) {
       "X-Requested-With": "XMLHttpRequest",
       "Accept": "text/html, application/xhtml+xml"
     },
+    responseType: "arraybuffer",
     validateStatus: () => true,
     onUploadProgress: async (event) => {
       await runHooks("progress", options.hooks, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hybridly/core",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Core functionality of Hybridly",
   "keywords": [
     "hybridly",
@@ -34,15 +34,15 @@
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "peerDependencies": {
-    "axios": "^1.6.2"
+    "axios": "^1.6.7"
   },
   "dependencies": {
-    "qs": "^6.11.2",
+    "qs": "^6.12.0",
     "superjson": "^2.2.1",
-    "@hybridly/utils": "0.6.1"
+    "@hybridly/utils": "0.7.0"
   },
   "devDependencies": {
-    "defu": "^6.1.3"
+    "defu": "^6.1.4"
   },
   "scripts": {
     "build": "unbuild",