@lupinum/ginko-content 0.1.6 → 0.2.0

package/dist/integrations/nitro/ingest.js

@@ -5,18 +5,7 @@ import { transformContent } from "../../parsers";
 import { resolveCollection, resolveCollections } from "../../core/content/collection";
 import { expandDataLocaleVariants } from "../../core/content/locale";
 import { createContentError, validateCollectionDocument } from "../../storage/validation";
-const loadCustomTransformers = async () => {
-  try {
-    const specifier = "#content/virtual/transformers";
-    const module = await import(
-      /* @vite-ignore */
-      specifier
-    );
-    return module.transformers || [];
-  } catch {
-    return [];
-  }
-};
+import { transformers as customContentTransformers } from "#content/virtual/transformers";
 const invalidContentError = (id, cause) => new ContentError("INVALID_CONTENT", `Failed to ingest content "${id}"`, { id }, { cause });
 const parseSource = async (id, body, options) => {
   try {
@@ -38,13 +27,13 @@ const parseSource = async (id, body, options) => {
 };
 const expandLocaleVariants = async (document, options) => {
   try {
-    const collection = document._collection && options.pathMeta?.collections ? options.pathMeta.collections[document._collection] : void 0;
+    const collection = document.collection && options.pathMeta?.collections ? options.pathMeta.collections[document.collection] : void 0;
     return expandDataLocaleVariants(document, collection?.i18n === true ? void 0 : collection?.i18n);
   } catch (cause) {
     throw new ContentError(
       "TRANSFORM_FAILED",
-      `Failed to transform content "${document._file || document._id}"`,
-      { id: document._id, file: document._file },
+      `Failed to transform content "${document.file?.path || document.id}"`,
+      { id: document.id, file: document.file?.path },
       { cause }
     );
   }
@@ -69,7 +58,7 @@ const validateVariants = (id, variants, options) => {
       "VALIDATION_FAILED",
       "Failed to validate parsed content",
       {
-        files: variants.map((document) => document._file || document._id)
+        files: variants.map((document) => document.file?.path || document.id)
       },
       { cause }
     ));
@@ -77,7 +66,7 @@ const validateVariants = (id, variants, options) => {
 };
 export const parseContentVariants = async (id, content, runtimeContentConfig, opts = {}) => {
   const nitroApp = useNitroApp();
-  const customTransformers = await loadCustomTransformers();
+  const customTransformers = customContentTransformers || [];
   const options = defu(
     opts,
     {
@@ -94,16 +83,16 @@ export const parseContentVariants = async (id, content, runtimeContentConfig, op
       }
     }
   );
-  const file = { _id: id, body: typeof content === "string" ? content.replace(/\r\n|\r/g, "\n") : content };
+  const file = { id, body: typeof content === "string" ? content.replace(/\r\n|\r/g, "\n") : content };
   await nitroApp.hooks.callHook("content:file:beforeParse", file);
   const parsedDocument = await parseSource(id, file.body, options);
   const variants = validateVariants(id, await expandLocaleVariants(parsedDocument, options), options);
   const parsed = variants[0];
-  const matchedCollections = resolveCollections(parsed?._file || id, options.pathMeta?.collections, options.pathMeta?.locales || []);
+  const matchedCollections = resolveCollections(parsed?.file?.path || id, options.pathMeta?.collections, options.pathMeta?.locales || []);
   if (matchedCollections.length > 1) {
     throw createContentError(
       "CONFLICTING_COLLECTION_MATCH",
-      parsed?._file || id,
+      parsed?.file?.path || id,
       "conflicting collection matches",
       matchedCollections.join(", "),
       { collections: matchedCollections }

package/dist/integrations/nitro/storage.d.ts

@@ -6,4 +6,5 @@ export declare const cacheParsedStorage: (event?: H3Event) => Storage<import("un
 export declare const contentConfig: () => any;
 export declare const contentIgnorePredicate: (key: string) => boolean;
 export declare const getContentsIds: (event: H3Event, prefix?: string) => Promise<string[]>;
+export declare const getSourceContentIds: (event: H3Event, prefix?: string) => Promise<string[]>;
 export declare const resolveStorageId: (event: H3Event, id: string) => Promise<string>;

package/dist/integrations/nitro/storage.js

@@ -1,5 +1,6 @@
 import { prefixStorage } from "unstorage";
 import { useStorage } from "nitropack/runtime";
+import authoredContentConfig from "#content/virtual/config";
 import { makeIgnored } from "../../core/content/ignore";
 import { getContentRuntimeContext } from "./context.js";
 import { getPreview, isPreview } from "./preview.js";
@@ -33,8 +34,23 @@ export const cacheParsedStorage = (event) => {
   }
   return createScopedStorage("cache:content:parsed");
 };
+const liveCollections = authoredContentConfig?.collections || {};
 export const contentConfig = () => {
-  return getContentRuntimeConfig().content;
+  const runtimeContent = getContentRuntimeConfig().content;
+  const runtimeCollections = runtimeContent.collections;
+  if (!runtimeCollections) {
+    return runtimeContent;
+  }
+  let hasLiveSchemas = false;
+  const collections = Object.fromEntries(Object.entries(runtimeCollections).map(([name, collection]) => {
+    const schema = liveCollections[name]?.schema;
+    if (!schema) {
+      return [name, collection];
+    }
+    hasLiveSchemas = true;
+    return [name, { ...collection, schema }];
+  }));
+  return hasLiveSchemas ? { ...runtimeContent, collections } : runtimeContent;
 };
 export const contentIgnorePredicate = (key) => {
   const isIgnored = makeIgnored(contentConfig().ignores);
@@ -48,14 +64,8 @@ export const contentIgnorePredicate = (key) => {
   return true;
 };
 export const getContentsIds = async (event, prefix) => {
-  let keys = [];
-  if (process.env.NODE_ENV === "production") {
-    keys = await cacheParsedStorage(event).getKeys(prefix);
-  }
   const source = sourceStorage(event);
-  if (keys.length === 0) {
-    keys = await source.getKeys(prefix);
-  }
+  let keys = await source.getKeys(prefix);
   if (isPreview(event)) {
     const { key } = getPreview(event);
     const previewNamespace = `preview:${key}:`;
@@ -77,6 +87,10 @@ export const getContentsIds = async (event, prefix) => {
   }
   return keys.filter(contentIgnorePredicate);
 };
+export const getSourceContentIds = async (event, prefix) => {
+  const keys = await sourceStorage(event).getKeys(prefix);
+  return keys.filter(contentIgnorePredicate);
+};
 export const resolveStorageId = async (event, id) => {
   if (!isPreview(event)) {
     return id;