nuxt-content-assets 1.4.3 → 1.5.1

package/README.md

@@ -249,7 +249,7 @@ export default defineNuxtConfig({
     imageSize: 'style',
     
     // treat these extensions as content
-    contentExtensions: 'md csv ya?ml json',
+    contentExtensions: 'mdx? csv ya?ml json',
     
     // output debug messages
     debug: false,
@@ -259,6 +259,10 @@ export default defineNuxtConfig({
 
 ### Image size
 
+> [!Note]
+>
+> Since `v1.4.1` image size hints are now opt-in. This was done to maximise compatibiility with Nuxt Image.
+
 You can add one _or more_ image size hints to the generated images:
 
 ```ts
@@ -284,22 +288,22 @@ img {
 }
 ```
 
-> [!Note]
-> 
-> Since `v1.4.1` image size hints are now opt-in. This was done to maximise compatibiility with Nuxt Image.  
-
 ### Content extensions
 
 > [!NOTE]
 > Generally, you shouldn't need to touch this setting
 
-This setting tells Nuxt Content to ignore anything that is **not** one of these file extensions:
+This setting tells Nuxt Content to ignore anything that is **not** one of the supported content types:
 
 ```
-md csv ya?ml json
+mdx? csv ya?ml json
 ```
 
-This way, you can use any **other** file type as an asset, without needing to explicitly configure extensions.
+This way, you can use any **other** file type as an asset, without needing to explicitly configure Nuxt Content's [ignores](https://content.nuxt.com/get-started/configuration#ignores) list.
+
+Without this, Nuxt Content would warn about unsupported file types: 
+
+> [WARN] .jpg files are not supported, "content:path:to:some-asset.jpg" falling back to raw content
 
 ### Debug
 

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>;
+declare const _default: any;
 
 export { _default as default };

package/dist/module.json

@@ -2,7 +2,11 @@
   "name": "nuxt-content-assets",
   "configKey": "contentAssets",
   "compatibility": {
-    "nuxt": "^3.0.0"
+    "nuxt": ">=3.0.0"
   },
-  "version": "1.4.3"
+  "version": "1.5.1",
+  "builder": {
+    "@nuxt/module-builder": "1.0.2",
+    "unbuild": "3.6.1"
+  }
 }

package/dist/module.mjs

@@ -1,200 +1,12 @@
 import * as Fs from 'fs';
-import Fs__default from 'fs';
 import Path from 'crosspath';
 import { useNuxt, createResolver, defineNuxtModule, addPlugin } from '@nuxt/kit';
-import { visit, SKIP, CONTINUE } from 'unist-util-visit';
+import { isObject, log, warn, removeEntry, makeIgnores, matchTokens, list, isImage, toPath } from '../dist/runtime/utils/index.js';
 import { listen } from 'listhen';
 import { WebSocketServer, WebSocket } from 'ws';
-import githubDriver from 'unstorage/drivers/github';
-import fsDriver from 'unstorage/drivers/fs';
-import { createStorage } from 'unstorage';
-import getImageSize from 'image-size';
-import debounce from 'debounce';
-import 'ohash';
-
-function matchTokens(value) {
-  let tokens = [];
-  if (typeof value === "string") {
-    tokens = value.match(/[^\s,|]+/g) || [];
-  } else if (Array.isArray(value)) {
-    tokens = value.filter((value2) => typeof value2 === "string").reduce((output, input) => {
-      return [...output, ...matchTokens(input)];
-    }, []);
-  } else if (!!value && typeof value === "object") {
-    tokens = Object.values(value).reduce((output, value2) => {
-      return [...output, ...matchTokens(value2)];
-    }, []);
-  }
-  return tokens.length ? Array.from(new Set(tokens)) : tokens;
-}
-function toPath(key) {
-  return key.replaceAll(":", "/");
-}
-function deKey(path) {
-  return path.replace(/^[^:]+:/, "");
-}
-
-const extensions = {
-  // used to get image size
-  image: matchTokens("png jpg jpeg gif svg webp ico"),
-  // unused for now
-  media: matchTokens("mp3 m4a wav mp4 mov webm ogg avi flv avchd")
-};
-function makeIgnores(extensions2) {
-  const included = matchTokens(extensions2).join("|");
-  return `^(?:(?!(${included})).)+$`;
-}
-
-function removeQuery(path) {
-  return path.replace(/\?.*$/, "");
-}
-function isExcluded(path) {
-  return path.split("/").some((segment) => segment.startsWith(".") || segment.startsWith("_"));
-}
-function isImage(path) {
-  const ext = Path.extname(path).substring(1);
-  return extensions.image.includes(ext);
-}
-function isArticle(path) {
-  return removeQuery(path).endsWith(".md");
-}
-function isAsset(path) {
-  return !isArticle(path);
-}
-
-function walk(node, callback, filter) {
-  function visit(node2, callback2, parent, key) {
-    if (filter) {
-      const result = filter(node2, key);
-      if (result === false) {
-        return;
-      }
-    }
-    if (Array.isArray(node2)) {
-      node2.forEach((value, index) => {
-        visit(value, callback2, node2, index);
-      });
-    } else if (isObject(node2)) {
-      Object.keys(node2).forEach((key2) => {
-        visit(node2[key2], callback2, node2, key2);
-      });
-    } else {
-      callback2(node2, parent, key);
-    }
-  }
-  visit(node, callback, { node }, "node");
-}
-function isObject(data) {
-  return data && typeof data === "object" && !Array.isArray(data);
-}
-
-function walkMeta(content, callback) {
-  walk(content, callback, (value, key) => !(String(key).startsWith("_") || key === "body"));
-}
-function walkBody(content, callback) {
-  visit(content.body, (node) => node.type === "element", (node) => {
-    const { tag, props } = node;
-    const excluded = tags.exclude.includes(tag);
-    if (excluded) {
-      return SKIP;
-    }
-    const included = tags.include.includes(tag);
-    if (included || !props) {
-      return CONTINUE;
-    }
-    callback(node);
-  });
-}
-const tags = {
-  // unlikely to contain assets
-  exclude: matchTokens({
-    container: "pre code code-inline",
-    formatting: "acronym abbr address bdi bdo big center cite del dfn font ins kbd mark meter progress q rp rt ruby s samp small strike sub sup time tt u var wbr",
-    headers: "h1 h2 h3 h4 h5 h6",
-    controls: "input textarea button select optgroup option label legend datalist output",
-    media: "map area canvas svg",
-    other: "style script noscript template",
-    empty: "hr br"
-  }),
-  // may contain assets
-  include: matchTokens({
-    content: "main header footer section article aside details dialog summary data object nav blockquote div span p",
-    table: "table caption th tr td thead tbody tfoot col colgroup",
-    media: "figcaption figure picture",
-    form: "form fieldset",
-    list: "ul ol li dir dl dt dd",
-    formatting: "strong b em i"
-  }),
-  // assets
-  assets: "a img audio source track video embed"
-};
-
-const label = "[content-assets]";
-function log(...data) {
-  console.info(label, ...data);
-}
-function warn(...data) {
-  console.warn(label, ...data);
-}
-function list(message, items) {
-  log(`${message}:
-
-${items.map((item) => `   - ${item}`).join("\n")}
-`);
-}
-
-function buildQuery(...expr) {
-  const output = expr.map((expr2) => expr2.replace(/^[?&]+|&+$/g, "")).filter((s) => s);
-  if (output.length) {
-    const [first, ...rest] = output;
-    const isParam = (expr2) => /^[^?]+=[^=]+$/.test(expr2);
-    return !isParam(first) ? rest.length > 0 ? first + (first.includes("?") ? "&" : "?") + rest.join("&") : first : "?" + output.join("&");
-  }
-  return "";
-}
-
-function readFile(path, asJson = false) {
-  const text = Fs__default.readFileSync(path, { encoding: "utf8" });
-  return asJson ? JSON.parse(text) : text;
-}
-function writeFile(path, data) {
-  const text = typeof data === "object" ? JSON.stringify(data, null, "  ") : String(data);
-  createFolder(Path.dirname(path));
-  Fs__default.writeFileSync(path, text, { encoding: "utf8" });
-}
-async function writeBlob(path, data) {
-  const buffer = Buffer.from(await data.arrayBuffer());
-  createFolder(Path.dirname(path));
-  Fs__default.writeFileSync(path, buffer);
-}
-function copyFile(src, trg) {
-  createFolder(Path.dirname(trg));
-  Fs__default.copyFileSync(src, trg);
-}
-function removeFile(src) {
-  Fs__default.rmSync(src);
-}
-function createFolder(path) {
-  Fs__default.mkdirSync(path, { recursive: true });
-}
-function removeFolder(path) {
-  const isDownstream = path.startsWith(Path.resolve());
-  if (isDownstream) {
-    Fs__default.rmSync(path, { recursive: true, force: true });
-  }
-}
-function removeEntry(path) {
-  if (Fs__default.existsSync(path)) {
-    if (isFile(path)) {
-      removeFile(path);
-    } else {
-      removeFolder(path);
-    }
-  }
-}
-function isFile(path) {
-  return Fs__default.lstatSync(path).isFile();
-}
+import { makeSourceManager } from '../dist/runtime/assets/source.js';
+import { makeAssetsManager } from '../dist/runtime/assets/public.js';
+import { rewriteContent } from '../dist/runtime/content/parsed.js';
 
 function createWebSocket() {
   const wss = new WebSocketServer({ noServer: true });
@@ -216,7 +28,7 @@ function createWebSocket() {
       let data;
       try {
         data = JSON.parse(event.data || "{}");
-      } catch (err) {
+      } catch {
       }
       if (data) {
         handlers.forEach((callback) => callback(data));
@@ -296,258 +108,22 @@ async function setupSocketServer(channel, handler) {
       return this;
     }
   };
-  if (handler) {
-    instance.addHandler(handler);
-  }
   return instance;
 }
 
-function isAssetId(id) {
-  const path = toPath(id);
-  return !isExcluded(path) && isAsset(path);
-}
-function makeSourceStorage(source, key = "") {
-  const storage = createStorage();
-  const options = typeof source === "string" ? { driver: "fs", base: source } : source;
-  switch (options.driver) {
-    case "fs":
-      storage.mount(key, fsDriver({
-        ...options,
-        ignore: [
-          "[^:]+?\\.md",
-          "_dir\\.yml"
-        ]
-      }));
-      break;
-    case "github":
-      storage.mount(key, githubDriver({
-        branch: "main",
-        dir: "/",
-        ...options
-      }));
-      break;
-  }
-  return storage;
-}
-function makeSourceManager(key, source, publicPath, callback) {
-  async function onWatch(event, key2) {
-    if (isAssetId(key2)) {
-      const path = event === "update" ? await copyItem(key2) : removeItem(key2);
-      if (callback) {
-        callback(event, path);
-      }
-    }
-  }
-  function getRelSrc(key2) {
-    return toPath(key2).replace(/\w+/, "").replace(source.prefix || "", "");
-  }
-  function getAbsSrc(key2) {
-    return Path.join(source.base, getRelSrc(key2));
-  }
-  function getRelTrg(key2) {
-    return Path.join(source.prefix || "", toPath(deKey(key2)));
-  }
-  function getAbsTrg(key2) {
-    return Path.join(publicPath, getRelTrg(key2));
-  }
-  function removeItem(key2) {
-    const absTrg = getAbsTrg(key2);
-    removeFile(absTrg);
-    return absTrg;
-  }
-  async function copyItem(key2) {
-    const absTrg = getAbsTrg(key2);
-    const driver = source.driver;
-    if (driver === "fs") {
-      const absSrc = getAbsSrc(key2);
-      copyFile(absSrc, absTrg);
-    } else if (driver === "github") {
-      try {
-        const data = await storage.getItem(key2);
-        if (data) {
-          data?.constructor.name === "Blob" ? await writeBlob(absTrg, data) : writeFile(absTrg, data);
-        } else {
-          warn(`No data for key "${key2}"`);
-        }
-      } catch (err) {
-        warn(err.message);
-      }
-    }
-    return absTrg;
-  }
-  async function getKeys() {
-    const keys = await storage.getKeys();
-    return keys.filter(isAssetId);
-  }
-  async function init() {
-    const keys = await getKeys();
-    const paths = [];
-    for (const key2 of keys) {
-      const path = await copyItem(key2);
-      paths.push(path);
-    }
-    return paths;
-  }
-  const storage = makeSourceStorage(source, key);
-  void storage.watch(onWatch);
-  async function dispose() {
-    await storage.unwatch();
-    await storage.dispose();
-  }
-  return {
-    storage,
-    init,
-    keys: getKeys,
-    dispose
-  };
-}
-
-function makeAssetsManager(publicPath, shouldWatch = true) {
-  const assetsKey = "assets.json";
-  const assetsPath = Path.join(publicPath, "..");
-  const storage = makeSourceStorage(assetsPath);
-  if (shouldWatch) {
-    void storage.watch(async (event, key) => {
-      if (event === "update" && key === assetsKey) {
-        await load();
-      }
-    });
-  }
-  const assets = {};
-  async function load() {
-    const data = await storage.getItem(assetsKey);
-    Object.assign(assets, data || {});
-  }
-  const save = debounce(function() {
-    void storage.setItem(assetsKey, assets);
-  }, 50);
-  function resolveAsset(content, relAsset, registerContent = false) {
-    const srcDir = Path.dirname(content._file);
-    const srcAsset = Path.join(srcDir, relAsset);
-    const asset = assets[srcAsset];
-    if (asset && registerContent) {
-      const { _id } = content;
-      if (!asset.content.includes(_id)) {
-        asset.content.push(_id);
-        save();
-      }
-    }
-    return asset || {};
-  }
-  function setAsset(path) {
-    const { srcRel, srcAttr } = getAssetPaths(publicPath, path);
-    const { width, height } = getAssetSize(path);
-    const oldAsset = assets[srcRel];
-    const newAsset = {
-      srcAttr,
-      content: oldAsset?.content || [],
-      width,
-      height
-    };
-    assets[srcRel] = newAsset;
-    save();
-    return newAsset;
-  }
-  function getAsset(path) {
-    const { srcRel } = getAssetPaths(publicPath, path);
-    return srcRel ? { ...assets[srcRel] } : void 0;
-  }
-  function removeAsset(path) {
-    const { srcRel } = getAssetPaths(publicPath, path);
-    const asset = assets[srcRel];
-    if (asset) {
-      delete assets[srcRel];
-      save();
-    }
-    return asset;
-  }
-  const init = () => {
-    if (Fs.existsSync(publicPath)) {
-      const names = Fs.readdirSync(publicPath);
-      for (const name of names) {
-        if (!/^\.git(ignore|keep)$/.test(name)) {
-          removeEntry(Path.join(publicPath, name));
-        }
-      }
-    }
-  };
-  void load();
-  return {
-    init,
-    setAsset,
-    getAsset,
-    removeAsset,
-    resolveAsset,
-    dispose: async () => {
-      await storage.unwatch();
-      await storage.dispose();
-    }
-  };
-}
-function getAssetPaths(srcDir, srcAbs) {
-  const srcRel = Path.relative(srcDir, srcAbs);
-  const srcAttr = "/" + srcRel;
-  return {
-    srcRel,
-    srcAttr
-  };
-}
-function getAssetSize(srcAbs) {
-  if (isImage(srcAbs)) {
-    try {
-      return getImageSize(srcAbs);
-    } catch (err) {
-      warn(`could not read image "${srcAbs}`);
-    }
-  }
-  return {};
-}
-
-function rewriteContent(path, asset) {
-  const { parsed } = readFile(path, true);
-  const { srcAttr, width, height } = asset;
-  walkMeta(parsed, (value, parent, key) => {
-    if (value.startsWith(srcAttr)) {
-      parent[key] = parent[key].replace(/width=\d+&height=\d+/, `width=${width}&height=${height}`);
-    }
-  });
-  walkBody(parsed, function(node) {
-    const { tag, props } = node;
-    if (tag === "img" && props?.src?.startsWith(srcAttr)) {
-      props.src = buildQuery(srcAttr, `time=${Date.now()}`);
-      if (props.width) {
-        props.width = width;
-      }
-      if (props.height) {
-        props.height = height;
-      }
-      if (props.style) {
-        const ratio = `${width}/${height}`;
-        if (typeof props.style === "string") {
-          props.style = props.style.replace(/aspect-ratio: \d+\/\d+/, `aspect-ratio: ${ratio}`);
-        } else if (props.style.aspectRatio) {
-          props.style.aspectRatio = ratio;
-        }
-      }
-    }
-  });
-  writeFile(path, { module: true, parsed });
-  return parsed;
-}
-
 const resolve = createResolver(import.meta.url).resolve;
 const meta = {
   name: "nuxt-content-assets",
   configKey: "contentAssets",
   compatibility: {
-    nuxt: "^3.0.0"
+    nuxt: ">=3.0.0"
   }
 };
-const module = defineNuxtModule({
+const module$1 = defineNuxtModule({
   meta,
   defaults: {
     imageSize: "",
-    contentExtensions: "md csv ya?ml json",
+    contentExtensions: "mdx? csv ya?ml json",
     debug: false
   },
   async setup(options, nuxt) {
@@ -555,7 +131,7 @@ const module = defineNuxtModule({
     const modulesPath = nuxt.options.modulesDir.find((path) => Fs.existsSync(`${path}/nuxt-content-assets/cache`)) || "";
     if (!modulesPath) {
       warn("Unable to find cache folder!");
-      if (nuxt.options.srcDir.endsWith("/playground")) {
+      if (nuxt.options.rootDir.endsWith("/playground")) {
         warn('Run "npm run dev:setup" to generate a new cache folder');
       }
     }
@@ -586,7 +162,7 @@ const module = defineNuxtModule({
       return output;
     }, {});
     if (Object.keys(sources).length === 0 || !sources.content) {
-      const content = nuxt.options.srcDir + "/content";
+      const content = nuxt.options.rootDir + "/content";
       if (Fs.existsSync(content)) {
         sources.content = {
           driver: "fs",
@@ -672,4 +248,4 @@ const module = defineNuxtModule({
   }
 });
 
-export { module as default };
+export { module$1 as default };

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

@@ -1,4 +1,4 @@
-import type { ParsedContent, AssetConfig } from '../../types';
+import type { ParsedContent, AssetConfig } from '../../types.js';
 /**
  * Manages the public assets
  */

package/dist/runtime/assets/{public.mjs → public.js}

@@ -3,8 +3,8 @@ import Path from "crosspath";
 import getImageSize from "image-size";
 import debounce from "debounce";
 import { hash } from "ohash";
-import { makeSourceStorage } from "./source.mjs";
-import { isImage, warn, log, removeEntry } from "../utils/index.mjs";
+import { makeSourceStorage } from "./source.js";
+import { isImage, warn, log, removeEntry } from "../utils/index.js";
 export function makeAssetsManager(publicPath, shouldWatch = true) {
   const assetsKey = "assets.json";
   const assetsPath = Path.join(publicPath, "..");
@@ -53,7 +53,7 @@ export function makeAssetsManager(publicPath, shouldWatch = true) {
   }
   function getAsset(path) {
     const { srcRel } = getAssetPaths(publicPath, path);
-    return srcRel ? { ...assets[srcRel] } : void 0;
+    return srcRel && assets[srcRel] ? { ...assets[srcRel] } : void 0;
   }
   function removeAsset(path) {
     const { srcRel } = getAssetPaths(publicPath, path);
@@ -122,7 +122,7 @@ export function getAssetSize(srcAbs) {
   if (isImage(srcAbs)) {
     try {
       return getImageSize(srcAbs);
-    } catch (err) {
+    } catch {
       warn(`could not read image "${srcAbs}`);
     }
   }

package/dist/runtime/assets/{source.mjs → source.js}

@@ -2,7 +2,7 @@ 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.mjs";
+import { warn, isAsset, toPath, removeFile, copyFile, writeBlob, writeFile, deKey, isExcluded } from "../utils/index.js";
 function isAssetId(id) {
   const path = toPath(id);
   return !isExcluded(path) && isAsset(path);

package/dist/runtime/content/parsed.d.ts

@@ -1,4 +1,4 @@
-import type { AssetConfig, ParsedContent } from '../../types';
+import type { AssetConfig, ParsedContent } from '../../types.js';
 /**
  * Rewrite cached content with updated image sizes
  */

package/dist/runtime/content/{parsed.mjs → parsed.js}

@@ -1,4 +1,4 @@
-import { walkBody, walkMeta, buildQuery, readFile, writeFile } from "../utils/index.mjs";
+import { walkBody, walkMeta, buildQuery, readFile, writeFile } from "../utils/index.js";
 export function rewriteContent(path, asset) {
   const { parsed } = readFile(path, true);
   const { srcAttr, width, height } = asset;

package/dist/runtime/content/{plugin.mjs → plugin.js}

@@ -1,5 +1,5 @@
-import { buildQuery, buildStyle, isValidAsset, list, parseQuery, removeQuery, walkBody, walkMeta } from "../utils/index.mjs";
-import { makeAssetsManager } from "../assets/public.mjs";
+import { buildQuery, buildStyle, isValidAsset, list, parseQuery, removeQuery, walkBody, walkMeta } from "../utils/index.js";
+import { makeAssetsManager } from "../assets/public.js";
 import { debug, imageSizes, publicPath } from "#nuxt-content-assets";
 const plugin = async (nitro) => {
   function processMeta(content, imageSizes2 = [], updated = []) {

package/dist/runtime/sockets/factory.d.ts

@@ -1,4 +1,4 @@
-import type { Callback } from '../../types';
+import type { Callback } from '../../types.js';
 export interface Logger {
     log: (...args: any[]) => void;
     warn: (...args: any[]) => void;

package/dist/runtime/sockets/{factory.mjs → factory.js}

@@ -29,7 +29,7 @@ export function createWebSocket(url, logger = { log, warn: log }) {
     let data;
     try {
       data = JSON.parse(message.data);
-    } catch (err) {
+    } catch {
       logger.warn("Error parsing message:", message.data);
       return;
     }
@@ -55,7 +55,7 @@ export function createWebSocket(url, logger = { log, warn: log }) {
     if (ws) {
       try {
         ws.close();
-      } catch (err) {
+      } catch {
       }
       ws = void 0;
     }

package/dist/runtime/sockets/plugin.d.ts

@@ -1,5 +1,5 @@
 /**
  * Client-side plugin to support asset live-reload
  */
-declare const _default: any;
+declare const _default: import("nuxt/app").Plugin<Record<string, unknown>> & import("nuxt/app").ObjectPlugin<Record<string, unknown>>;
 export default _default;

package/dist/runtime/sockets/{plugin.mjs → plugin.js}

@@ -2,7 +2,7 @@ import { defineNuxtPlugin, refreshNuxtData, useRuntimeConfig } from "#imports";
 export default defineNuxtPlugin(async () => {
   if (import.meta.client) {
     const url = useRuntimeConfig().public.sockets?.wsUrl;
-    const socket = await import("./setup.mjs").then(({ setupSocketClient }) => {
+    const socket = await import("./setup.js").then(({ setupSocketClient }) => {
       return setupSocketClient(url, "content-assets");
     });
     if (socket) {

package/dist/runtime/sockets/setup.d.ts

@@ -1,2 +1,2 @@
-import type { Callback, SocketInstance } from '../../types';
+import type { Callback, SocketInstance } from '../../types.js';
 export declare function setupSocketClient(url: string, channel: string, callback?: Callback): SocketInstance | null;

package/dist/runtime/sockets/{setup.mjs → setup.js}

@@ -1,4 +1,4 @@
-import { createWebSocket } from "./factory.mjs";
+import { createWebSocket } from "./factory.js";
 let client;
 const plugin = "[Content Assets]";
 const logger = {

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

@@ -5,4 +5,4 @@ export declare function buildStyle(...expr: string[]): string;
 /**
  * Build a query string by passing multiple independent expressions
  */
-export declare function buildQuery(...expr: string[]): string;
+export declare function buildQuery(...expr: string[]): string | undefined;

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

@@ -3,6 +3,7 @@
  */
 export declare const extensions: {
     image: string[];
+    content: string[];
     media: string[];
 };
 /**

package/dist/runtime/utils/{config.mjs → config.js}

@@ -1,7 +1,9 @@
-import { matchTokens } from "./string.mjs";
+import { matchTokens } from "./string.js";
 export const extensions = {
   // used to get image size
   image: matchTokens("png jpg jpeg gif svg webp ico"),
+  // used to recognise content
+  content: matchTokens("md mdx json yml yaml csv"),
   // unused for now
   media: matchTokens("mp3 m4a wav mp4 mov webm ogg avi flv avchd")
 };

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

@@ -1,5 +1,5 @@
-import type { ParsedContent } from '../../types';
-import { type WalkCallback } from './object';
+import type { ParsedContent } from '../../types.js';
+import { type WalkCallback } from './object.js';
 /**
  * Walk parsed content meta, only processing relevant properties
  *

package/dist/runtime/utils/{content.mjs → content.js}

@@ -1,6 +1,6 @@
 import { CONTINUE, SKIP, visit } from "unist-util-visit";
-import { walk } from "./object.mjs";
-import { matchTokens } from "./string.mjs";
+import { walk } from "./object.js";
+import { matchTokens } from "./string.js";
 export function walkMeta(content, callback) {
   walk(content, callback, (value, key) => !(String(key).startsWith("_") || key === "body"));
 }

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

@@ -6,4 +6,4 @@ export declare function removeFile(src: string): void;
 export declare function createFolder(path: string): void;
 export declare function removeFolder(path: string): void;
 export declare function removeEntry(path: string): void;
-export declare function isFile(path: string): any;
+export declare function isFile(path: string): boolean;

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

@@ -1,8 +1,8 @@
-export * from './path';
-export * from './content';
-export * from './config';
-export * from './debug';
-export * from './build';
-export * from './fs';
-export * from './string';
-export * from './object';
+export * from './path.js';
+export * from './content.js';
+export * from './config.js';
+export * from './debug.js';
+export * from './build.js';
+export * from './fs.js';
+export * from './string.js';
+export * from './object.js';

package/dist/runtime/utils/index.js

@@ -0,0 +1,8 @@
+export * from "./path.js";
+export * from "./content.js";
+export * from "./config.js";
+export * from "./debug.js";
+export * from "./build.js";
+export * from "./fs.js";
+export * from "./string.js";
+export * from "./object.js";

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

@@ -6,6 +6,11 @@ export declare function parseQuery(path: string): string;
  * Removes the query string from a path
  */
 export declare function removeQuery(path: string): string;
+/**
+ * Gets the extension of a path
+ * @param path
+ */
+export declare function getExt(path: string): string;
 /**
  * Test path to be relative
  */
@@ -20,7 +25,7 @@ export declare function isExcluded(path: string): boolean;
  */
 export declare function isImage(path: string): boolean;
 /**
- * Test path is markdown
+ * Test path is markdown or data
  */
 export declare function isArticle(path: string): boolean;
 /**

package/dist/runtime/utils/{path.mjs → path.js}

@@ -1,5 +1,5 @@
 import Path from "crosspath";
-import { extensions } from "./config.mjs";
+import { extensions } from "./config.js";
 export function parseQuery(path) {
   const matches = path.match(/\?.+$/);
   return matches ? matches[0] : "";
@@ -7,6 +7,9 @@ export function parseQuery(path) {
 export function removeQuery(path) {
   return path.replace(/\?.*$/, "");
 }
+export function getExt(path) {
+  return Path.extname(removeQuery(path)).substring(1);
+}
 export function isRelative(path) {
   return !(path.startsWith("http") || Path.isAbsolute(path));
 }
@@ -14,11 +17,10 @@ export function isExcluded(path) {
   return path.split("/").some((segment) => segment.startsWith(".") || segment.startsWith("_"));
 }
 export function isImage(path) {
-  const ext = Path.extname(path).substring(1);
-  return extensions.image.includes(ext);
+  return extensions.image.includes(getExt(path));
 }
 export function isArticle(path) {
-  return removeQuery(path).endsWith(".md");
+  return extensions.content.includes(getExt(path));
 }
 export function isAsset(path) {
   return !isArticle(path);

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

@@ -5,5 +5,5 @@
  */
 export declare function matchTokens(value: any): string[];
 export declare function toPath(key: string): string;
-export declare function toKey(path: string): any;
+export declare function toKey(path: string): string;
 export declare function deKey(path: string): string;

package/dist/types.d.mts

@@ -1,8 +1,7 @@
+import type { NuxtModule } from '@nuxt/schema'
 
-import type {  } from './module.js'
+import type { default as Module } from './module.mjs'
 
+export type ModuleOptions = typeof Module extends NuxtModule<infer O> ? Partial<O> : Record<string, any>
 
-
-
-
-export type { default } from './module.js'
+export { default } from './module.mjs'

package/package.json

@@ -1,19 +1,20 @@
 {
   "name": "nuxt-content-assets",
-  "version": "1.4.3",
+  "version": "1.5.1",
   "description": "Enable locally-located assets in Nuxt Content",
-  "repository": "davestewart/nuxt-content-assets",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/davestewart/nuxt-content-assets.git"
+  },
   "license": "MIT",
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/types.d.ts",
-      "import": "./dist/module.mjs",
-      "require": "./dist/module.cjs"
+      "types": "./dist/types.d.mts",
+      "import": "./dist/module.mjs"
     }
   },
-  "main": "./dist/module.cjs",
-  "types": "./dist/types.d.ts",
+  "main": "./dist/module.mjs",
   "files": [
     "cache",
     "dist"
@@ -37,33 +38,32 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.11.2",
+    "@nuxt/kit": "^3.20.2",
     "crosspath": "^2.0.0",
-    "debounce": "^1.2.1",
-    "image-size": "^1.0.2",
-    "listhen": "^1.7.2",
-    "ohash": "^1.0.0",
-    "unist-util-visit": "^4.1.2",
-    "unstorage": "^1.4.1",
-    "ws": "^8.13.0"
+    "debounce": "^3.0.0",
+    "image-size": "^1.1.1",
+    "listhen": "^1.9.0",
+    "ohash": "^2.0.11",
+    "unist-util-visit": "^5.0.0",
+    "unstorage": "^1.17.3",
+    "ws": "^8.19.0"
   },
   "peerDependencies": {
-    "@nuxt/content": "^2.0.0"
+    "@nuxt/content": "^2.13.0"
   },
   "devDependencies": {
-    "@nuxt/devtools": "latest",
-    "@nuxt/eslint-config": "^0.2.0",
-    "@nuxt/module-builder": "^0.5.5",
-    "@nuxt/schema": "^3.11.2",
-    "@nuxt/test-utils": "^3.12.0",
-    "@types/debounce": "^1.2.1",
-    "@types/node": "^20.12.4",
-    "@types/ws": "^8.5.10",
-    "changelogen": "^0.5.5",
-    "cpy-cli": "^5.0.0",
-    "eslint": "^8.57.0",
-    "nuxt": "^3.11.2",
-    "vitest": "^1.4.0"
+    "@nuxt/devtools": "^1.7.0",
+    "@nuxt/eslint-config": "^0.7.6",
+    "@nuxt/module-builder": "^1.0.2",
+    "@nuxt/schema": "^3.20.2",
+    "@nuxt/test-utils": "^3.23.0",
+    "@types/debounce": "^1.2.4",
+    "@types/node": "^25.0.3",
+    "@types/ws": "^8.18.1",
+    "cpy-cli": "^6.0.0",
+    "eslint": "^8.39.2",
+    "nuxt": "^3.20.2",
+    "vitest": "^3.2.4"
   },
   "engines": {
     "node": ">=16.0.0"

package/dist/module.cjs

@@ -1,5 +0,0 @@
-module.exports = function(...args) {
-  return import('./module.mjs').then(m => m.default.call(this, ...args))
-}
-const _meta = module.exports.meta = require('./module.json')
-module.exports.getMeta = () => Promise.resolve(_meta)

package/dist/module.d.ts

@@ -1,29 +0,0 @@
-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>;
-
-export { _default as default };

package/dist/runtime/utils/index.mjs

@@ -1,8 +0,0 @@
-export * from "./path.mjs";
-export * from "./content.mjs";
-export * from "./config.mjs";
-export * from "./debug.mjs";
-export * from "./build.mjs";
-export * from "./fs.mjs";
-export * from "./string.mjs";
-export * from "./object.mjs";

package/dist/types.d.ts

@@ -1,8 +0,0 @@
-
-import type {  } from './module'
-
-
-
-
-
-export type { default } from './module'