sveltekit-data-plugin 1.2.3 → 1.3.1

package/dist/plugin.js

@@ -37,14 +37,20 @@
       throw new Error(`Failed parsing string to object: ${str}`);
     }
   }
-  async function convert(opts, obj, base, depth = 1) {
+  async function convert(opts, obj, { base, relative, depth = 1 } = {}) {
     if (typeof obj !== "object") {
       if (typeof obj === "string" && REGEX.IMAGE.test(obj)) {
-        const img = await opts.imagetools_plugin.load.call(
-          opts.plugin_context,
-          stampURL(obj, base)
-        );
-        return parseObject(img.slice("export default".length, -1));
+        try {
+          const img = await opts.imagetools_plugin.load.call(
+            opts.plugin_context,
+            stampURL(obj, obj.startsWith("./") && relative ? relative : base)
+          );
+          return parseObject(img.slice("export default".length, -1));
+        } catch (e) {
+          return {
+            src: null
+          };
+        }
       }
       if (typeof obj === "string" && REGEX.YOUTUBE.test(obj)) {
         const oembedData = await oembed("youtube", obj);
@@ -52,14 +58,15 @@
       }
       if (typeof obj === "string" && /^\S*(.md)$/.test(obj) && depth === 1) {
         try {
-          const contents = await fs.readFile(path.resolve(base, obj), "utf-8");
+          const markdownFile = path.resolve(base, obj);
+          const relativeFolder = path.basename(markdownFile);
+          const contents = await fs.readFile(markdownFile, "utf-8");
           const data = fm(contents);
-          const attributes = await convert(
-            opts,
-            data.attributes,
+          const attributes = await convert(opts, data.attributes, {
             base,
-            depth + 1
-          );
+            relative: relativeFolder,
+            depth: depth + 1
+          });
           return {
             attributes: {
               ...attributes,
@@ -77,11 +84,11 @@
       Object.entries(obj).map(async ([key, value]) => {
         if (Array.isArray(value)) {
           const values = await Promise.all(
-            value.map((item) => convert(opts, item, base))
+            value.map((item) => convert(opts, item, { base, depth, relative }))
           );
           return [key, values];
         }
-        const v = await convert(opts, value, base);
+        const v = await convert(opts, value, { base, depth, relative });
         return [key, v];
       })
     );
@@ -115,7 +122,7 @@
         if (/\.(md)$/.test(id)) {
           const base2 = path.resolve(((_a = opts.vite_config) == null ? void 0 : _a.root) ?? "", opts.base);
           const d = fm(src);
-          const attributes = await convert(opts, d.attributes, base2);
+          const attributes = await convert(opts, d.attributes, { base: base2 });
           return `
 ${Object.entries(attributes).map(([key, value]) => `export const ${key} = ${JSON.stringify(value)};`).join("\n")}
 export const body = ${JSON.stringify(d.body)};`;

package/dist/plugin.mjs

@@ -36,14 +36,20 @@ function parseObject(str) {
     throw new Error(`Failed parsing string to object: ${str}`);
   }
 }
-async function convert(opts, obj, base, depth = 1) {
+async function convert(opts, obj, { base, relative, depth = 1 } = {}) {
   if (typeof obj !== "object") {
     if (typeof obj === "string" && REGEX.IMAGE.test(obj)) {
-      const img = await opts.imagetools_plugin.load.call(
-        opts.plugin_context,
-        stampURL(obj, base)
-      );
-      return parseObject(img.slice("export default".length, -1));
+      try {
+        const img = await opts.imagetools_plugin.load.call(
+          opts.plugin_context,
+          stampURL(obj, obj.startsWith("./") && relative ? relative : base)
+        );
+        return parseObject(img.slice("export default".length, -1));
+      } catch (e) {
+        return {
+          src: null
+        };
+      }
     }
     if (typeof obj === "string" && REGEX.YOUTUBE.test(obj)) {
       const oembedData = await oembed("youtube", obj);
@@ -51,14 +57,15 @@ async function convert(opts, obj, base, depth = 1) {
     }
     if (typeof obj === "string" && /^\S*(.md)$/.test(obj) && depth === 1) {
       try {
-        const contents = await fs.readFile(path.resolve(base, obj), "utf-8");
+        const markdownFile = path.resolve(base, obj);
+        const relativeFolder = path.basename(markdownFile);
+        const contents = await fs.readFile(markdownFile, "utf-8");
         const data = fm(contents);
-        const attributes = await convert(
-          opts,
-          data.attributes,
+        const attributes = await convert(opts, data.attributes, {
           base,
-          depth + 1
-        );
+          relative: relativeFolder,
+          depth: depth + 1
+        });
         return {
           attributes: {
             ...attributes,
@@ -76,11 +83,11 @@ async function convert(opts, obj, base, depth = 1) {
     Object.entries(obj).map(async ([key, value]) => {
       if (Array.isArray(value)) {
         const values = await Promise.all(
-          value.map((item) => convert(opts, item, base))
+          value.map((item) => convert(opts, item, { base, depth, relative }))
         );
         return [key, values];
       }
-      const v = await convert(opts, value, base);
+      const v = await convert(opts, value, { base, depth, relative });
       return [key, v];
     })
   );
@@ -114,7 +121,7 @@ function importDataPlugin(imagetools_plugin, { base = "./src/data" } = {}) {
       if (/\.(md)$/.test(id)) {
         const base2 = path.resolve(((_a = opts.vite_config) == null ? void 0 : _a.root) ?? "", opts.base);
         const d = fm(src);
-        const attributes = await convert(opts, d.attributes, base2);
+        const attributes = await convert(opts, d.attributes, { base: base2 });
         return `
 ${Object.entries(attributes).map(([key, value]) => `export const ${key} = ${JSON.stringify(value)};`).join("\n")}
 export const body = ${JSON.stringify(d.body)};`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sveltekit-data-plugin",
-  "version": "1.2.3",
+  "version": "1.3.1",
   "author": {
     "name": "Jonny Thaw",
     "url": "https://jthaw.me"