@lupinum/ginko-content 0.1.2 → 0.1.3

package/dist/core/cache-hints.d.ts

@@ -1,3 +1,11 @@
-import type { ContentCacheHint, ContentCacheHintInput } from '../public/provider';
+export interface ContentCacheHint {
+    tags?: string[];
+    paths?: string[];
+    maxAge?: number;
+    swr?: number;
+    etag?: string;
+    lastModified?: Date;
+}
+export type ContentCacheHintInput = ContentCacheHint | false;
 export declare const normalizeContentCacheHint: (hint: ContentCacheHint) => ContentCacheHint;
 export declare const mergeContentCacheHints: (current: ContentCacheHint | false | undefined, next: ContentCacheHintInput | undefined) => ContentCacheHint | false | undefined;

package/dist/core/content/collection.js

@@ -40,7 +40,7 @@ export const resolveCollections = (file, collections = {}, locales = []) => {
     if (isExcluded) {
       continue;
     }
-    for (const source of normalizeCollectionSources(collection.source)) {
+    for (const source of normalizeCollectionSources(collection.source || [])) {
       const isMatch = createSourceMatcher(source);
       if (isMatch(normalizedFile) || isMatch(localeAgnosticFile)) {
         matches.push(name);

package/dist/core/content/path.js

@@ -100,7 +100,7 @@ const isLocalePrefixedPath = (path, locales) => {
 };
 export const prefixPathWithLocale = (path, locale, defaultLocale) => {
   const normalizedPath = normalizeContentPath(path || "/");
-  if (!locale || locale === defaultLocale) {
+  if (!locale || !defaultLocale || locale === defaultLocale) {
     return normalizedPath;
   }
   return normalizedPath === "/" ? `/${locale}` : `/${locale}${normalizedPath}`;

package/dist/core/errors.js

@@ -2,7 +2,11 @@ export class ContentError extends Error {
   code;
   context;
   constructor(code, message, context = {}, options) {
-    super(message, options);
+    super(message);
+    if (options?.cause !== void 0) {
+      ;
+      this.cause = options.cause;
+    }
     this.name = "ContentError";
     this.code = code;
     this.context = context;

package/dist/core/provider-errors

@@ -0,0 +1 @@
+export * from './provider-errors.js'

package/dist/core/provider-errors.d.ts

@@ -0,0 +1,10 @@
+export type ContentProviderErrorCode = 'unknown_provider' | 'unknown_collection' | 'unsupported_provider_operation' | 'unsupported_query_operator' | 'unsupported_query_shape' | 'data_collection_route_access' | 'data_collection_search_access' | 'data_collection_sitemap_access' | 'missing_locale_route' | 'provider_config_missing' | 'provider_module_missing' | 'provider_module_invalid' | 'provider_result_invalid' | 'unsupported_provider_search_index' | 'unsupported_provider_search' | 'unsupported_provider_site_data' | 'unsupported_provider_prerender';
+export declare const statusForProviderError: Record<ContentProviderErrorCode, number>;
+export interface ContentProviderError extends Error {
+    statusCode: number;
+    statusMessage: ContentProviderErrorCode;
+    data: Record<string, unknown> & {
+        code: ContentProviderErrorCode;
+    };
+}
+export declare const createContentProviderError: (code: ContentProviderErrorCode, message: string, details?: Record<string, unknown>) => ContentProviderError;

package/dist/core/provider-errors.js

@@ -0,0 +1,27 @@
+export const statusForProviderError = {
+  unknown_provider: 400,
+  unknown_collection: 400,
+  unsupported_provider_operation: 400,
+  unsupported_query_operator: 400,
+  unsupported_query_shape: 400,
+  data_collection_route_access: 400,
+  data_collection_search_access: 400,
+  data_collection_sitemap_access: 400,
+  missing_locale_route: 404,
+  provider_config_missing: 500,
+  provider_module_missing: 500,
+  provider_module_invalid: 500,
+  provider_result_invalid: 500,
+  unsupported_provider_search_index: 400,
+  unsupported_provider_search: 400,
+  unsupported_provider_site_data: 400,
+  unsupported_provider_prerender: 400
+};
+export const createContentProviderError = (code, message, details = {}) => Object.assign(new Error(message), {
+  statusCode: statusForProviderError[code],
+  statusMessage: code,
+  data: {
+    code,
+    ...details
+  }
+});

package/dist/core/query/execute.js

@@ -1,5 +1,5 @@
 import { resolveGraphCanonicalKey, resolveGraphRouteVariant, resolveGraphVariant, resolveLocaleChain, selectGraphDocuments } from "../content/graph.js";
-import { apply, ensureArray, get, omit, sortList, withKeys, withoutKeys } from "./operators.js";
+import { ensureArray, get, omit, sortList, withKeys, withoutKeys } from "./operators.js";
 import { normalizeRouteMounts, routeToContentPathCandidates } from "../content/path.js";
 const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 const includesEntry = (haystack, entry) => typeof haystack === "string" ? haystack.includes(String(entry)) : haystack.includes(entry);
@@ -91,7 +91,10 @@ const applyQueryPlanSort = (matched, plan) => {
   }
 };
 export const applyQueryPlanProjection = (items, plan) => {
-  return apply(withKeys(plan.projection.only))(apply(withoutKeys(plan.projection.without))(items));
+  return items.map((item) => {
+    const without = withoutKeys(plan.projection.without)(item);
+    return withKeys(plan.projection.only)(without);
+  });
 };
 export const finalizeQueryPlanResponse = (matched, plan) => {
   if (plan.mode === "count") {
@@ -187,6 +190,9 @@ const executeLocalePlan = (graph, plan, options) => {
       _fallback: item._locale !== requestedLocale,
       _availableLocales: availableLocales
     };
+    if (typeof key !== "string") {
+      continue;
+    }
     if (!indexByCanonical.has(key)) {
       indexByCanonical.set(key, merged.length);
       merged.push({ rank, item: enriched });
@@ -222,7 +228,10 @@ const executeVariantPlan = (graph, plan, options) => {
     });
   })() : plan.resolveVariant.route ? (() => {
     const localeChain = plan.resolveVariant.exact ? plan.resolveVariant.locale ? [plan.resolveVariant.locale] : [] : plan.resolveVariant.fallback?.length ? Array.from(new Set([plan.resolveVariant.locale, ...plan.resolveVariant.fallback].filter(Boolean))) : resolveLocaleChain(plan.resolveVariant.locale, defaultLocale, localeFallback || {});
-    const candidateLocales = localeChain.length ? localeChain : [""];
+    const candidateLocales = localeChain.length ? localeChain : Array.from(new Set(Object.values(graph.byCanonical).flatMap((variants) => Object.keys(variants))));
+    if (!candidateLocales.length) {
+      candidateLocales.push("");
+    }
     const candidates = routeToContentPathCandidates(
       plan.resolveVariant.route,
       plan.resolveVariant.locale,

package/dist/core/query/filter.js

@@ -75,8 +75,8 @@ export const compileFallback = (fallback) => {
   return Array.isArray(fallback) ? fallback : [fallback];
 };
 export const compileQueryParams = (input) => {
-  const path = input.by && "path" in input.by ? normalizeContentPath(input.by.path) : void 0;
-  const route = input.by && "route" in input.by ? normalizeContentPath(input.by.route) : void 0;
+  const path = input.by && "path" in input.by && typeof input.by.path === "string" ? normalizeContentPath(input.by.path) : void 0;
+  const route = input.by && "route" in input.by && typeof input.by.route === "string" ? normalizeContentPath(input.by.route) : void 0;
   const ref = input.by && "ref" in input.by ? input.by.ref : void 0;
   const where = compileWhere(input.where);
   const sort = compileSort(input.sort);

package/dist/core/query/lower.js

@@ -77,11 +77,12 @@ const lowerWhereCondition = (condition) => {
 };
 const lowerSort = (sort = []) => {
   return sort.flatMap((option) => {
+    const sortParams = option;
     const meta = {
-      locale: option.$locale,
-      numeric: option.$numeric,
-      caseFirst: option.$caseFirst,
-      sensitivity: option.$sensitivity
+      locale: sortParams.$locale,
+      numeric: sortParams.$numeric,
+      caseFirst: sortParams.$caseFirst,
+      sensitivity: sortParams.$sensitivity
     };
     return Object.entries(option).filter(([key]) => !key.startsWith("$")).map(([field, direction]) => ({
       field,

package/dist/features/navigation/build.js

@@ -33,10 +33,13 @@ const sortCanonicalTree = (items) => {
   return items;
 };
 export const buildCanonicalNavigation = (contents, configs, fields = []) => {
-  const pickNavigationFields = (content) => ({
-    ...pick(["title", ...fields])(content),
-    ...isObject(content?.navigation) ? content.navigation : {}
-  });
+  const pickNavigationFields = (content) => {
+    const navigationFields = isObject(content?.navigation) ? content.navigation : {};
+    return {
+      ...pick(["title", ...fields])(content),
+      ...navigationFields
+    };
+  };
   const navigation = contents.sort((left, right) => left._path.localeCompare(right._path)).reduce((nav, content) => {
     const parts = content._path.substring(1).split("/");
     const idParts = content._id.split(":").slice(1);
@@ -56,7 +59,7 @@ export const buildCanonicalNavigation = (contents, configs, fields = []) => {
       ...content._draft ? { _draft: true } : {}
     };
     if (isIndex) {
-      const dirConfig = configs[navItem._path];
+      const dirConfig = navItem._path ? configs[navItem._path] : void 0;
       if (typeof dirConfig?.navigation !== "undefined" && !dirConfig.navigation) {
         return nav;
       }
@@ -92,7 +95,12 @@ export const buildCanonicalNavigation = (contents, configs, fields = []) => {
         };
         nodes.push(parent);
       }
-      return parent.children;
+      if (!parent) {
+        return [];
+      }
+      const resolvedParent = parent;
+      resolvedParent.children ||= [];
+      return resolvedParent.children;
     }, nav);
     siblings.push(navItem);
     return nav;

package/dist/features/navigation/canonical.js

@@ -14,7 +14,7 @@ const cloneFallbackNode = (node) => ({
 export const mergeCanonicalNavigation = (primary = [], fallback = []) => {
   const merged = primary.map((item) => ({
     ...item,
-    children: item.children ? mergeCanonicalNavigation(item.children, []) : void 0
+    ...item.children ? { children: mergeCanonicalNavigation(item.children, []) } : {}
   }));
   const index = /* @__PURE__ */ new Map();
   for (const item of merged) {

package/dist/features/sitemap/query.js

@@ -1,4 +1,4 @@
-import { createContentProviderError } from "../../public/provider-errors";
+import { createContentProviderError } from "../../core/provider-errors";
 const normalizeSiteUrl = (siteUrl) => siteUrl?.replace(/\/$/, "");
 const resolveSiteUrl = (runtime, explicitSiteUrl) => {
   const normalizedExplicitSiteUrl = normalizeSiteUrl(explicitSiteUrl);
@@ -13,7 +13,7 @@ const resolveSiteUrl = (runtime, explicitSiteUrl) => {
     return runtime.requestSiteUrl;
   }
   if (process.env.NODE_ENV === "production") {
-    throw new Error("Content sitemap generation requires site.url or runtimeConfig.public.siteUrl in production.");
+    throw new Error("Content sitemap generation requires site.url or runtimeConfig.public.content.siteUrl in production.");
   }
   return "http://localhost";
 };

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

@@ -1,7 +1,7 @@
 import type { StorageValue } from 'unstorage';
 import type { ParsedContent } from '../../types/content';
 import type { ParseContentOptions } from '../../types/runtime';
-import type { ContentContext } from '../../types/module';
+import type { ResolvedContentContext } from '../../types/module';
 /**
  * Ingest a single source file into an array of `ParsedContent` variants
  * (one per locale, including the default).
@@ -14,5 +14,5 @@ import type { ContentContext } from '../../types/module';
  * schema violations, and collection-path ambiguity all surface as specific
  * `ContentErrorCode`s so HTTP and build-time callers can branch on them.
  */
-export declare const parseContentVariants: (id: string, content: StorageValue, runtimeContentConfig: ContentContext, opts?: ParseContentOptions) => Promise<ParsedContent[]>;
-export declare const parseContent: (id: string, content: StorageValue, runtimeContentConfig: ContentContext, opts?: ParseContentOptions) => Promise<ParsedContent>;
+export declare const parseContentVariants: (id: string, content: StorageValue, runtimeContentConfig: ResolvedContentContext, opts?: ParseContentOptions) => Promise<ParsedContent[]>;
+export declare const parseContent: (id: string, content: StorageValue, runtimeContentConfig: ResolvedContentContext, opts?: ParseContentOptions) => Promise<ParsedContent>;

package/dist/integrations/nitro/ingest.js

@@ -39,7 +39,7 @@ 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;
-    return expandDataLocaleVariants(document, collection?.i18n);
+    return expandDataLocaleVariants(document, collection?.i18n === true ? void 0 : collection?.i18n);
   } catch (cause) {
     throw new ContentError(
       "TRANSFORM_FAILED",
@@ -86,11 +86,11 @@ export const parseContentVariants = async (id, content, runtimeContentConfig, op
       yaml: runtimeContentConfig.yaml,
       transformers: customTransformers,
       pathMeta: {
-        defaultLocale: runtimeContentConfig.defaultLocale,
+        defaultLocale: runtimeContentConfig.defaultLocale || void 0,
         translatedSlugs: runtimeContentConfig.translatedSlugs,
         locales: runtimeContentConfig.locales,
         respectPathCase: runtimeContentConfig.respectPathCase,
-        collections: runtimeContentConfig.collections
+        collections: runtimeContentConfig.collections || void 0
       }
     }
   );

package/dist/integrations/nitro/storage.js

@@ -42,13 +42,14 @@ const mergeCollectionConfigs = (runtimeCollections = {}, sourceCollections = {})
   return Object.fromEntries(Array.from(names).map((name) => {
     const source = sourceCollections[name] || {};
     const runtime = runtimeCollections[name] || {};
+    const sourceProviders = source.providers;
     return [
       name,
       {
         ...source,
         ...runtime,
         ...source.schema ? { schema: source.schema } : {},
-        ...source.providers ? { providers: source.providers } : {}
+        ...sourceProviders ? { providers: sourceProviders } : {}
       }
     ];
   }));
@@ -58,6 +59,7 @@ export const contentConfig = () => {
   const sourceContent = virtualContentConfig || {};
   return {
     ...runtimeContent,
+    ...sourceContent.agent ? { agent: sourceContent.agent } : {},
     collections: mergeCollectionConfigs(runtimeContent.collections, sourceContent.collections)
   };
 };