@holo-js/adapter-nuxt 0.3.16 → 0.3.18

package/dist/module.d.mts

@@ -65,6 +65,7 @@ type NuxtViteOptions = {
 interface NuxtOptionsWithNitro {
     nitro: {
         storage: Record<string, unknown>;
+        moduleSideEffects?: string[];
         errorHandler?: string | string[];
         externals?: {
             external?: unknown[];

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@holo-js/adapter-nuxt",
   "configKey": "@holo-js/adapter-nuxt",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "unknown"

package/dist/module.mjs

@@ -364,7 +364,7 @@ function finalizeStorageSetup(storageModule, opts, resolver, s3Driver) {
   if (storageModule.hasPublicLocalDisk(normalized)) {
     addServerHandler({
       route: `${normalized.routePrefix}/**`,
-      handler: resolver.resolve("./runtime/server/routes/storage.get")
+      handler: resolver.resolve("./runtime/server/routes/storage")
     });
   }
 }
@@ -373,10 +373,10 @@ function applyStorageRuntimeConfig(runtimeConfig, normalized) {
     runtimeConfig.holoStorage = normalized;
   }
 }
-async function createServerModelImports(sourceDir, modelsRelativePath, generatedSchemaRelativePath) {
-  const modelsDir = resolve(sourceDir, modelsRelativePath);
-  const generatedSchemaPath = resolve(sourceDir, generatedSchemaRelativePath);
-  const modelImportDir = resolve(sourceDir, ".holo-js/generated/nuxt-server-imports");
+async function createServerModelImports(projectRoot, modelsRelativePath, generatedSchemaRelativePath) {
+  const modelsDir = resolve(projectRoot, modelsRelativePath);
+  const generatedSchemaPath = resolve(projectRoot, generatedSchemaRelativePath);
+  const modelImportDir = resolve(projectRoot, ".holo-js/generated/nuxt-server-imports");
   const modelImportFile = resolve(modelImportDir, "models.ts");
   const modelPluginFile = resolve(modelImportDir, "plugin.ts");
   let modelFiles;
@@ -426,7 +426,6 @@ const module$1 = defineNuxtModule({
     const resolver = createResolver(import.meta.url);
     const opts = nuxt.options;
     const rootDir = opts.rootDir ?? opts.srcDir ?? process.cwd();
-    const sourceDir = opts.srcDir ?? rootDir;
     const authTypesPath = resolve(rootDir, ".holo-js/generated/auth.d.ts");
     const authorizationTypesPath = resolve(rootDir, ".holo-js/generated/authorization/types.d.ts");
     const modelRegistryTypesPath = resolve(rootDir, ".holo-js/generated/model-registry.d.ts");
@@ -486,13 +485,14 @@ const module$1 = defineNuxtModule({
       addServerPlugin(resolver.resolve("./runtime/plugins/forms"));
       addServerImportsDir(resolver.resolve("./runtime/server/auto-imports"));
       const serverModelImports = await createServerModelImports(
-        sourceDir,
+        rootDir,
         loaded.app.paths.models,
         loaded.app.paths.generatedSchema
       );
       if (serverModelImports) {
         addServerImportsDir(serverModelImports.importDir);
         addServerPlugin(serverModelImports.pluginFile);
+        opts.nitro.moduleSideEffects = [.../* @__PURE__ */ new Set([...opts.nitro.moduleSideEffects ?? [], resolve(rootDir, loaded.app.paths.generatedSchema)])];
       }
       opts._holoCoreRuntimeRegistered = true;
     }

package/dist/runtime/composables/index.d.ts

@@ -1,4 +1,5 @@
 import type { HoloAdapterProjectAccessors } from '@holo-js/core'
+import type { RuntimeDatabaseConfig } from '@holo-js/db'
 
 export interface HoloRuntimeConnection {
   driver?: 'sqlite' | 'postgres' | 'mysql'
@@ -26,6 +27,16 @@ export interface HoloRuntimeDefaultConnection extends HoloRuntimeConnection {
 }
 
 export declare const holo: HoloAdapterProjectAccessors
+export declare function configureHoloRuntimeConfig(config: {
+  holo: {
+    appEnv: 'production' | 'development' | 'test'
+    appDebug: boolean
+    appUrl?: string
+    projectRoot?: string
+  }
+  db?: RuntimeDatabaseConfig
+}): void
+export declare function resetHoloRuntimeConfig(): void
 export type NuxtAuthRequestEvent = {
   readonly headers?: Pick<Headers, 'get'>
   readonly request?: {

package/dist/runtime/composables/index.js

@@ -39,8 +39,7 @@ export function createNuxtAuthRequestAccessors(requestEvent) {
     }
   }
   async function readHeader(name) {
-    const nitroContext = await loadNitroContextModule();
-    const event = requestEvent ?? nitroContext.useEvent();
+    const event = requestEvent ?? (await loadNitroContextModule()).useEvent();
     if (!event) {
       return void 0;
     }
@@ -82,8 +81,7 @@ export function createNuxtAuthRequestAccessors(requestEvent) {
     return void 0;
   }
   async function appendCookie(cookie) {
-    const nitroContext = await loadNitroContextModule();
-    const event = requestEvent ?? nitroContext.useEvent();
+    const event = requestEvent ?? (await loadNitroContextModule()).useEvent();
     const response = event?.node?.res;
     if (!response) {
       return;
@@ -109,8 +107,7 @@ export function createNuxtAuthRequestAccessors(requestEvent) {
     await appendCookie(cookie);
   };
   const redirectResponse = async (url, status) => {
-    const nitroContext = await loadNitroContextModule();
-    const event = requestEvent ?? nitroContext.useEvent();
+    const event = requestEvent ?? (await loadNitroContextModule()).useEvent();
     if (!event) {
       throw new TypeError("Holo Nuxt auth redirect requires an active Nitro event.");
     }

package/dist/runtime/server/routes/storage.js

@@ -0,0 +1,8 @@
+import { createPublicStorageResponse } from "@holo-js/storage";
+import { defineEventHandler, sendWebResponse, toWebRequest } from "h3";
+import { holo } from "../../composables/index.js";
+export default defineEventHandler(async (event) => {
+  const app = await holo.getApp();
+  const response = await createPublicStorageResponse(app.projectRoot, app.config.storage, toWebRequest(event), app.config.app.key);
+  return sendWebResponse(event, response);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holo-js/adapter-nuxt",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "description": "Holo-JS Framework - Nuxt adapter",
   "type": "module",
   "license": "MIT",
@@ -38,21 +38,21 @@
     "test": "vitest --run"
   },
   "dependencies": {
-    "@holo-js/adapter-shared": "^0.3.16",
+    "@holo-js/adapter-shared": "^0.3.18",
     "@nuxt/kit": "^4.4.4",
-    "@holo-js/config": "^0.3.16",
-    "@holo-js/core": "^0.3.16",
-    "@holo-js/db": "^0.3.16",
-    "@holo-js/validation": "^0.3.16",
+    "@holo-js/config": "^0.3.18",
+    "@holo-js/core": "^0.3.18",
+    "@holo-js/db": "^0.3.18",
+    "@holo-js/validation": "^0.3.18",
     "h3": "^1.15.11",
     "nitropack": "^2.13.4"
   },
   "peerDependencies": {
-    "@holo-js/broadcast": "^0.3.16",
-    "@holo-js/forms": "^0.3.16",
-    "@holo-js/realtime": "^0.3.16",
-    "@holo-js/storage": "^0.3.16",
-    "@holo-js/storage-s3": "^0.3.16"
+    "@holo-js/broadcast": "^0.3.18",
+    "@holo-js/forms": "^0.3.18",
+    "@holo-js/realtime": "^0.3.18",
+    "@holo-js/storage": "^0.3.18",
+    "@holo-js/storage-s3": "^0.3.18"
   },
   "peerDependenciesMeta": {
     "@holo-js/broadcast": {
@@ -72,9 +72,9 @@
     }
   },
   "devDependencies": {
-    "@holo-js/broadcast": "^0.3.16",
-    "@holo-js/realtime": "^0.3.16",
-    "@holo-js/storage-s3": "^0.3.16",
+    "@holo-js/broadcast": "^0.3.18",
+    "@holo-js/realtime": "^0.3.18",
+    "@holo-js/storage-s3": "^0.3.18",
     "@nuxt/module-builder": "^1.0.2",
     "@types/node": "^22.10.2",
     "nuxt": "^4.4.4",

package/dist/runtime/server/routes/storage.get.js

@@ -1,220 +0,0 @@
-import { open, realpath, stat } from "node:fs/promises";
-import { extname, resolve, sep } from "node:path";
-import { createError, defineEventHandler, getRequestURL, setResponseHeader } from "h3";
-import { useRuntimeConfig } from "#imports";
-const NAMED_PUBLIC_DISK_ROUTE_SEGMENT = "__holo";
-function normalizeRequestPath(value) {
-  return value.split("/").map((segment) => {
-    const trimmed = segment.trim();
-    if (!trimmed) {
-      return trimmed;
-    }
-    try {
-      return decodeURIComponent(trimmed);
-    } catch {
-      return trimmed;
-    }
-  }).filter(Boolean);
-}
-function isPublicLocalDisk(disk) {
-  return Boolean(disk && disk.visibility === "public" && disk.driver !== "s3" && typeof disk.root === "string");
-}
-function isMissingFileError(error) {
-  const code = error && typeof error === "object" && "code" in error ? error.code : void 0;
-  return Boolean(
-    error && typeof error === "object" && (code === "ENOENT" || code === "EISDIR" || code === "ENOTDIR")
-  );
-}
-function resolveAbsolutePath(disk, fileSegments) {
-  const root = resolve(disk.root);
-  const absolutePath = resolve(root, ...fileSegments);
-  if (absolutePath !== root && !absolutePath.startsWith(`${root}${sep}`)) {
-    return null;
-  }
-  return absolutePath;
-}
-function resolveContentType(absolutePath) {
-  switch (extname(absolutePath).toLowerCase()) {
-    case ".avif":
-      return "image/avif";
-    case ".css":
-      return "text/css; charset=utf-8";
-    case ".gif":
-      return "image/gif";
-    case ".jpeg":
-    case ".jpg":
-      return "image/jpeg";
-    case ".json":
-      return "application/json; charset=utf-8";
-    case ".mp3":
-      return "audio/mpeg";
-    case ".pdf":
-      return "application/pdf";
-    case ".png":
-      return "image/png";
-    case ".txt":
-      return "text/plain; charset=utf-8";
-    case ".webp":
-      return "image/webp";
-    case ".woff":
-      return "font/woff";
-    case ".woff2":
-      return "font/woff2";
-    default:
-      return "application/octet-stream";
-  }
-}
-function isActiveContentPath(absolutePath) {
-  switch (extname(absolutePath).toLowerCase()) {
-    case ".html":
-    case ".js":
-    case ".mjs":
-    case ".svg":
-      return true;
-    default:
-      return false;
-  }
-}
-function setStorageResponseHeaders(event, absolutePath) {
-  if (isActiveContentPath(absolutePath)) {
-    setResponseHeader(event, "content-disposition", "attachment");
-    setResponseHeader(event, "content-type", "application/octet-stream");
-    setResponseHeader(event, "x-content-type-options", "nosniff");
-    return;
-  }
-  setResponseHeader(event, "content-type", resolveContentType(absolutePath));
-  setResponseHeader(event, "x-content-type-options", "nosniff");
-}
-function createMissingFileError(message) {
-  const error = new Error(message);
-  error.code = "ENOENT";
-  return error;
-}
-function isPathWithinRoot(root, absolutePath) {
-  return absolutePath === root || absolutePath.startsWith(`${root}${sep}`);
-}
-function isSameFile(left, right) {
-  return left.dev === right.dev && left.ino === right.ino;
-}
-async function readPublicFile(event, disk, absolutePath) {
-  const resolvedRoot = await realpath(resolve(disk.root));
-  const file = await open(absolutePath, "r");
-  try {
-    const openedFile = await file.stat();
-    const resolvedPath = await realpath(absolutePath);
-    if (!isPathWithinRoot(resolvedRoot, resolvedPath)) {
-      throw createMissingFileError("Storage file not found.");
-    }
-    const resolvedFile = await stat(resolvedPath);
-    if (!isSameFile(openedFile, resolvedFile)) {
-      throw createMissingFileError("Storage file not found.");
-    }
-    const contents = await file.readFile();
-    setStorageResponseHeaders(event, absolutePath);
-    return contents;
-  } finally {
-    await file.close();
-  }
-}
-function resolveRouteSegments(routePath) {
-  const segments = normalizeRequestPath(routePath);
-  if (segments.length === 0 || segments.includes("..")) {
-    return null;
-  }
-  return segments;
-}
-function resolveDefaultPublicStorageRequest(config, segments) {
-  const disk = isPublicLocalDisk(config.disks.public) ? config.disks.public : void 0;
-  if (!disk) {
-    return null;
-  }
-  const absolutePath = resolveAbsolutePath(disk, segments);
-  if (!absolutePath) {
-    return null;
-  }
-  return { disk, absolutePath };
-}
-function usesReservedNamedDiskNamespace(segments) {
-  return segments[0] === NAMED_PUBLIC_DISK_ROUTE_SEGMENT;
-}
-function resolveNamedPublicStorageRequest(config, segments) {
-  const namedPublicDisks = Object.values(config.disks).filter((disk2) => {
-    return isPublicLocalDisk(disk2) && disk2.name !== "public";
-  });
-  const usesReservedNamespace = segments[0] === NAMED_PUBLIC_DISK_ROUTE_SEGMENT;
-  const diskName = usesReservedNamespace ? segments[1] : segments[0];
-  const disk = diskName ? namedPublicDisks.find((candidate) => candidate.name === diskName) : void 0;
-  if (!disk) {
-    return null;
-  }
-  const fileSegments = usesReservedNamespace ? segments.slice(2) : segments.slice(1);
-  if (fileSegments.length === 0) {
-    return null;
-  }
-  const absolutePath = resolveAbsolutePath(disk, fileSegments);
-  if (!absolutePath) {
-    return null;
-  }
-  return { disk, absolutePath };
-}
-export function resolvePublicStorageRequest(config, routePath) {
-  const segments = resolveRouteSegments(routePath);
-  if (!segments) {
-    return null;
-  }
-  if (usesReservedNamedDiskNamespace(segments)) {
-    return resolveNamedPublicStorageRequest(config, segments) ?? resolveDefaultPublicStorageRequest(config, segments);
-  }
-  return resolveDefaultPublicStorageRequest(config, segments) ?? resolveNamedPublicStorageRequest(config, segments);
-}
-function resolveFallbackPublicStorageRequest(config, segments, attemptedDiskName) {
-  if (usesReservedNamedDiskNamespace(segments)) {
-    return null;
-  }
-  const candidates = [
-    resolveDefaultPublicStorageRequest(config, segments),
-    resolveNamedPublicStorageRequest(config, segments)
-  ];
-  return candidates.find((candidate) => candidate && candidate.disk.name !== attemptedDiskName) ?? null;
-}
-export default defineEventHandler(async (event) => {
-  const runtimeConfig = useRuntimeConfig();
-  const { holoStorage } = runtimeConfig;
-  const pathname = getRequestURL(event).pathname;
-  const routePath = pathname.startsWith(holoStorage.routePrefix) ? pathname.slice(holoStorage.routePrefix.length) : pathname;
-  const segments = resolveRouteSegments(routePath);
-  if (!segments) {
-    throw createError({
-      statusCode: 404,
-      statusMessage: "Storage file not found."
-    });
-  }
-  const resolved = resolvePublicStorageRequest(holoStorage, routePath);
-  if (!resolved) {
-    throw createError({
-      statusCode: 404,
-      statusMessage: "Storage file not found."
-    });
-  }
-  try {
-    return await readPublicFile(event, resolved.disk, resolved.absolutePath);
-  } catch (error) {
-    if (!isMissingFileError(error)) {
-      throw error;
-    }
-    const fallback = resolveFallbackPublicStorageRequest(holoStorage, segments, resolved.disk.name);
-    if (fallback) {
-      try {
-        return await readPublicFile(event, fallback.disk, fallback.absolutePath);
-      } catch (fallbackError) {
-        if (!isMissingFileError(fallbackError)) {
-          throw fallbackError;
-        }
-      }
-    }
-    throw createError({
-      statusCode: 404,
-      statusMessage: "Storage file not found."
-    });
-  }
-});