nuxt-content-assets 1.6.0 → 1.8.0

package/README.md

@@ -317,7 +317,7 @@ If you want to see what the module does as it runs, set `debug` to true:
 
 ## How it works
 
-When Nuxt builds, the module scans all content sources for assets, copies them to a temporary layer folder (`nuxt_modules/nuxt-content-assets/cache`), and indexes path and image metadata.
+When Nuxt builds, the module scans all content sources for assets, copies them to a temporary layer folder (`node_modules/nuxt-content-assets/cache`), and indexes path and image metadata.
 
 After Nuxt Content has run, the parsed content (`.nuxt/content-cache`) is traversed, and both element attributes and frontmatter properties are checked to see if they resolve to the previously-indexed asset paths.
 

package/dist/module.d.mts

@@ -1,29 +1,3 @@
-import * as _nuxt_schema from '@nuxt/schema';
-
-interface ModuleOptions {
-    /**
-     * Image size hints
-     *
-     * @example 'attrs style url'
-     * @default 'style'
-     */
-    imageSize?: string | string[] | false;
-    /**
-     * List of content extensions; anything else as an asset
-     *
-     * @example 'md'
-     * @default 'md csv ya?ml json'
-     */
-    contentExtensions?: string | string[];
-    /**
-     * Display debug messages
-     *
-     * @example true
-     * @default false
-     */
-    debug?: boolean;
-}
-
-declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, false>;
+declare const _default: any;
 
 export { _default as default };

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.0.0"
   },
-  "version": "1.6.0",
+  "version": "1.8.0",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -221,7 +221,7 @@ const module$1 = defineNuxtModule({
     nuxt.hook("close", async () => {
       await assets.dispose();
       for (const key in managers) {
-        await managers[key].dispose();
+        await managers[key]?.dispose();
       }
     });
     const pluginPath = resolve("./runtime/content/plugin");

package/dist/runtime/assets/public.d.ts

@@ -1,4 +1,4 @@
-import type { ParsedContent, AssetConfig } from '../../types.js';
+import type { AssetConfig, ParsedContent } from '../../types.js';
 /**
  * Manages the public assets
  */
@@ -7,7 +7,7 @@ export declare function makeAssetsManager(publicPath: string, shouldWatch?: bool
     setAsset: (path: string) => AssetConfig;
     getAsset: (path: string) => AssetConfig | undefined;
     removeAsset: (path: string) => AssetConfig | undefined;
-    resolveAsset: (content: ParsedContent, relAsset: string, registerContent?: boolean) => Partial<AssetConfig>;
+    resolveAsset: (content: ParsedContent, relAsset: string, registerContent?: boolean) => AssetConfig;
     dispose: () => Promise<void>;
 };
 /**

package/dist/runtime/assets/public.js

@@ -4,7 +4,7 @@ import getImageSize from "image-size";
 import debounce from "debounce";
 import { hash } from "ohash";
 import { makeSourceStorage } from "./source.js";
-import { isImage, warn, log, removeEntry } from "../utils/index.js";
+import { isImage, log, removeEntry, removeOrdering, removeQuery, warn } from "../utils/index.js";
 export function makeAssetsManager(publicPath, shouldWatch = true) {
   const assetsKey = "assets.json";
   const assetsPath = Path.join(publicPath, "..");
@@ -26,7 +26,8 @@ export function makeAssetsManager(publicPath, shouldWatch = true) {
   }, 50);
   function resolveAsset(content, relAsset, registerContent = false) {
     const srcDir = Path.dirname(content._file);
-    const srcAsset = Path.join(srcDir, relAsset);
+    const relAssetNoQuery = removeQuery(relAsset);
+    const srcAsset = removeOrdering(Path.join(srcDir, relAssetNoQuery));
     const asset = assets[srcAsset];
     if (asset && registerContent) {
       const { _id } = content;
@@ -35,7 +36,16 @@ export function makeAssetsManager(publicPath, shouldWatch = true) {
         save();
       }
     }
-    return asset || {};
+    if (asset) {
+      if (relAsset.includes("?")) {
+        return {
+          ...asset,
+          srcAttr: asset.srcAttr + "?" + relAsset.split("?").pop() || ""
+        };
+      }
+      return asset;
+    }
+    return { srcAttr: "", content: [] };
   }
   function setAsset(path) {
     const { srcRel, srcAttr } = getAssetPaths(publicPath, path);

package/dist/runtime/assets/source.d.ts

@@ -1,5 +1,5 @@
 import { type MountOptions } from '@nuxt/content';
-import { type WatchEvent, type Storage } from 'unstorage';
+import { type Storage, type WatchEvent } from 'unstorage';
 /**
  * Make a Storage instance that monitors assets from a single source
  */

package/dist/runtime/assets/source.js

@@ -2,7 +2,18 @@ import Path from "crosspath";
 import githubDriver from "unstorage/drivers/github";
 import fsDriver from "unstorage/drivers/fs";
 import { createStorage } from "unstorage";
-import { warn, isAsset, toPath, removeFile, copyFile, writeBlob, writeFile, deKey, isExcluded } from "../utils/index.js";
+import {
+  copyFile,
+  deKey,
+  isAsset,
+  isExcluded,
+  removeFile,
+  removeOrdering,
+  toPath,
+  warn,
+  writeBlob,
+  writeFile
+} from "../utils/index.js";
 function isAssetId(id) {
   const path = toPath(id);
   return !isExcluded(path) && isAsset(path);
@@ -46,7 +57,7 @@ export function makeSourceManager(key, source, publicPath, callback) {
     return Path.join(source.base, getRelSrc(key2));
   }
   function getRelTrg(key2) {
-    return Path.join(source.prefix || "", toPath(deKey(key2)));
+    return Path.join(source.prefix || "", removeOrdering(toPath(deKey(key2))));
   }
   function getAbsTrg(key2) {
     return Path.join(publicPath, getRelTrg(key2));

package/dist/runtime/utils/path.d.ts

@@ -6,6 +6,10 @@ export declare function parseQuery(path: string): string;
  * Removes the query string from a path
  */
 export declare function removeQuery(path: string): string;
+/**
+ * Remove ordering from a path
+ */
+export declare function removeOrdering(path: string): string;
 /**
  * Gets the extension of a path
  * @param path

package/dist/runtime/utils/path.js

@@ -7,6 +7,9 @@ export function parseQuery(path) {
 export function removeQuery(path) {
   return path.replace(/\?.*$/, "");
 }
+export function removeOrdering(path) {
+  return path.split("/").map((segment) => segment.replace(/^\d+\./, "")).join("/");
+}
 export function getExt(path) {
   return Path.extname(removeQuery(path)).substring(1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-content-assets",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "description": "Enable locally-located assets in Nuxt Content",
   "repository": {
     "type": "git",