@xleddyl/nuxt-cms 0.10.1 → 0.11.1

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@xleddyl/nuxt-cms",
   "configKey": "cms",
-  "version": "0.10.1",
+  "version": "0.11.1",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "unknown"

package/dist/module.mjs

@@ -2302,6 +2302,12 @@ ${webhooks.errors.join("\n")}`);
         { name: "useCmsContents", from: entryStub },
         { name: "useCmsContent", from: entryStub },
         { name: "useCmsRoute", from: entryStub },
+        { name: "$cmsSingle", from: entryStub },
+        { name: "$cmsCollection", from: entryStub },
+        { name: "$cmsPage", from: entryStub },
+        { name: "$cmsContents", from: entryStub },
+        { name: "$cmsContent", from: entryStub },
+        { name: "$cmsRoute", from: entryStub },
         {
           name: "useCmsSite",
           from: resolver.resolve("./runtime/app/composables/cms-site-disabled")
@@ -2415,6 +2421,12 @@ ${webhooks.errors.join("\n")}`);
       { name: "useCmsContents", from: entryComposables },
       { name: "useCmsContent", from: entryComposables },
       { name: "useCmsRoute", from: entryComposables },
+      { name: "$cmsSingle", from: entryComposables },
+      { name: "$cmsCollection", from: entryComposables },
+      { name: "$cmsPage", from: entryComposables },
+      { name: "$cmsContents", from: entryComposables },
+      { name: "$cmsContent", from: entryComposables },
+      { name: "$cmsRoute", from: entryComposables },
       {
         name: "useCmsPreviewMode",
         from: resolver.resolve("./runtime/app/composables/cms-preview-mode")

package/dist/runtime/app/composables/cms-entry-disabled.d.ts

@@ -5,26 +5,32 @@ export interface CmsSortInput<Entry> {
     field: Extract<keyof Entry, string>;
     direction?: 'asc' | 'desc';
 }
-export interface CmsSingleOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT> {
+export interface CmsEntryQuery {
     locale?: string;
 }
-export interface CmsPageOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT> {
-    locale?: string;
-}
-export interface CmsCollectionOptions<ResT, DefaultT, Entry> extends CmsAsyncDataOptions<ResT, DefaultT> {
-    locale?: string;
+export interface CmsListQuery<Entry> extends CmsEntryQuery {
     filters?: Record<string, unknown>;
     sort?: CmsSortInput<Entry>[];
     limit?: number;
     offset?: number;
 }
-export interface CmsContentOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT> {
-    locale?: string;
+export interface CmsSingleOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT>, CmsEntryQuery {
+}
+export interface CmsPageOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT>, CmsEntryQuery {
+}
+export interface CmsCollectionOptions<ResT, DefaultT, Entry> extends CmsAsyncDataOptions<ResT, DefaultT>, CmsListQuery<Entry> {
+}
+export interface CmsContentOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT>, CmsEntryQuery {
 }
 export type CmsContentsOptions<ResT, DefaultT, Entry> = CmsCollectionOptions<ResT, DefaultT, Entry>;
-export interface CmsRouteOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT> {
-    locale?: string;
+export interface CmsRouteOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT>, CmsEntryQuery {
 }
+export declare function $cmsSingle<K extends CmsSingleName>(name: K, query?: CmsEntryQuery): Promise<CmsSingleTypes[K] | null>;
+export declare function $cmsCollection<K extends CmsCollectionName>(name: K, query?: CmsListQuery<CmsCollectionTypes[K]>): Promise<CmsCollectionTypes[K][]>;
+export declare function $cmsContents<K extends CmsContentName>(name: K, query?: CmsListQuery<CmsContentTypes[K]>): Promise<CmsContentTypes[K][]>;
+export declare function $cmsContent<K extends CmsContentName>(name: K, slug: string, query?: CmsEntryQuery): Promise<CmsContentTypes[K] | null>;
+export declare function $cmsPage<P extends CmsPagePath>(path: P, query?: CmsEntryQuery): Promise<CmsPageTypes[P] | null>;
+export declare function $cmsRoute(path: string, query?: CmsEntryQuery): Promise<CmsContentRouteMatch | null>;
 export declare function useCmsSingle<K extends CmsSingleName, DefaultT = null>(name: K, options?: CmsSingleOptions<CmsSingleTypes[K] | null, DefaultT>): AsyncData<CmsSingleTypes[K] | DefaultT | null, Error | undefined>;
 export declare function useCmsCollection<K extends CmsCollectionName, DefaultT = CmsCollectionTypes[K][]>(name: K, options?: CmsCollectionOptions<CmsCollectionTypes[K][], DefaultT, CmsCollectionTypes[K]>): AsyncData<CmsCollectionTypes[K][] | DefaultT, Error | undefined>;
 export declare function useCmsContents<K extends CmsContentName, DefaultT = CmsContentTypes[K][]>(name: K, options?: CmsContentsOptions<CmsContentTypes[K][], DefaultT, CmsContentTypes[K]>): AsyncData<CmsContentTypes[K][] | DefaultT, Error | undefined>;

package/dist/runtime/app/composables/cms-entry-disabled.js

@@ -1,4 +1,22 @@
 import { useAsyncData } from "#imports";
+export async function $cmsSingle(name, query = {}) {
+  return null;
+}
+export async function $cmsCollection(name, query = {}) {
+  return [];
+}
+export async function $cmsContents(name, query = {}) {
+  return [];
+}
+export async function $cmsContent(name, slug, query = {}) {
+  return null;
+}
+export async function $cmsPage(path, query = {}) {
+  return null;
+}
+export async function $cmsRoute(path, query = {}) {
+  return null;
+}
 export function useCmsSingle(name, options = {}) {
   const { locale, key, default: fallback } = options;
   return useAsyncData(

package/dist/runtime/app/composables/cms-entry.d.ts

@@ -5,26 +5,32 @@ export interface CmsSortInput<Entry> {
     field: Extract<keyof Entry, string>;
     direction?: 'asc' | 'desc';
 }
-export interface CmsSingleOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT> {
+export interface CmsEntryQuery {
     locale?: string;
 }
-export interface CmsPageOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT> {
-    locale?: string;
-}
-export interface CmsCollectionOptions<ResT, DefaultT, Entry> extends CmsAsyncDataOptions<ResT, DefaultT> {
-    locale?: string;
+export interface CmsListQuery<Entry> extends CmsEntryQuery {
     filters?: Record<string, unknown>;
     sort?: CmsSortInput<Entry>[];
     limit?: number;
     offset?: number;
 }
-export interface CmsContentOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT> {
-    locale?: string;
+export interface CmsSingleOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT>, CmsEntryQuery {
+}
+export interface CmsPageOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT>, CmsEntryQuery {
+}
+export interface CmsCollectionOptions<ResT, DefaultT, Entry> extends CmsAsyncDataOptions<ResT, DefaultT>, CmsListQuery<Entry> {
+}
+export interface CmsContentOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT>, CmsEntryQuery {
 }
 export type CmsContentsOptions<ResT, DefaultT, Entry> = CmsCollectionOptions<ResT, DefaultT, Entry>;
-export interface CmsRouteOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT> {
-    locale?: string;
+export interface CmsRouteOptions<ResT, DefaultT> extends CmsAsyncDataOptions<ResT, DefaultT>, CmsEntryQuery {
 }
+export declare function $cmsSingle<K extends CmsSingleName>(name: K, query?: CmsEntryQuery): Promise<CmsSingleTypes[K] | null>;
+export declare function $cmsCollection<K extends CmsCollectionName>(name: K, query?: CmsListQuery<CmsCollectionTypes[K]>): Promise<CmsCollectionTypes[K][]>;
+export declare function $cmsContents<K extends CmsContentName>(name: K, query?: CmsListQuery<CmsContentTypes[K]>): Promise<CmsContentTypes[K][]>;
+export declare function $cmsContent<K extends CmsContentName>(name: K, slug: string, query?: CmsEntryQuery): Promise<CmsContentTypes[K] | null>;
+export declare function $cmsPage<P extends CmsPagePath>(path: P, query?: CmsEntryQuery): Promise<CmsPageTypes[P] | null>;
+export declare function $cmsRoute(path: string, query?: CmsEntryQuery): Promise<null>;
 export declare function useCmsSingle<K extends CmsSingleName, DefaultT = null>(name: K, options?: CmsSingleOptions<CmsSingleTypes[K] | null, DefaultT>): AsyncData<CmsSingleTypes[K] | DefaultT | null, Error | undefined>;
 export declare function useCmsCollection<K extends CmsCollectionName, DefaultT = CmsCollectionTypes[K][]>(name: K, options?: CmsCollectionOptions<CmsCollectionTypes[K][], DefaultT, CmsCollectionTypes[K]>): AsyncData<CmsCollectionTypes[K][] | DefaultT, Error | undefined>;
 export declare function useCmsContents<K extends CmsContentName, DefaultT = CmsContentTypes[K][]>(name: K, options?: CmsContentsOptions<CmsContentTypes[K][], DefaultT, CmsContentTypes[K]>): AsyncData<CmsContentTypes[K][] | DefaultT, Error | undefined>;

package/dist/runtime/app/composables/cms-entry.js

@@ -12,18 +12,75 @@ import { cmsPreviewKey, cmsPreviewToken, cmsQueryWithPreview } from "./cms-query
 function unknownEntry(name) {
   throw new Error(`[nuxt-cms] no generated query for "${name}"; check cms.config.ts`);
 }
-export function useCmsSingle(name, options = {}) {
-  const { locale, key, default: fallback, ...asyncDataOptions } = options;
+function listVariables({ locale, filters, sort, limit, offset }) {
+  return { locale, filters, sort, limit, offset };
+}
+async function fetchSingle(name, { locale }, preview) {
   const entryName = String(name);
   const query = cmsSingleQueries[entryName];
+  if (!query) unknownEntry(entryName);
+  const result = await cmsQueryWithPreview(query, { locale }, preview);
+  return result?.[entryName] ?? null;
+}
+async function fetchCollection(name, listQuery, preview) {
+  const entryName = String(name);
+  const query = cmsCollectionQueries[entryName];
+  if (!query) unknownEntry(entryName);
+  const result = await cmsQueryWithPreview(query, listVariables(listQuery), preview);
+  return result?.[entryName] ?? [];
+}
+async function fetchContents(name, listQuery, preview) {
+  const entryName = String(name);
+  const query = cmsContentQueries[entryName];
+  if (!query) unknownEntry(entryName);
+  const result = await cmsQueryWithPreview(query, listVariables(listQuery), preview);
+  return result?.[entryName] ?? [];
+}
+async function fetchContent(name, slug, { locale }, preview) {
+  const entryName = String(name);
+  const query = cmsContentItemQueries[entryName];
+  if (!query) unknownEntry(entryName);
+  const result = await cmsQueryWithPreview(query, { slug, locale }, preview);
+  return result?.item ?? null;
+}
+async function fetchPage(path, { locale }, preview) {
+  const pagePath = String(path);
+  const query = cmsPageQueries[pagePath];
+  if (!query) unknownEntry(pagePath);
+  const result = await cmsQueryWithPreview(query, { path: pagePath, locale }, preview);
+  return result?.page ?? null;
+}
+async function fetchRoute(path, { locale }, preview) {
+  if (!cmsRouteQuery) return null;
+  const result = await cmsQueryWithPreview(cmsRouteQuery, { path, locale }, preview);
+  const entry = cmsRouteEntries.find((name) => result?.[name]);
+  if (!entry) return null;
+  return { entry, item: result[entry] };
+}
+export function $cmsSingle(name, query = {}) {
+  return fetchSingle(name, query, cmsPreviewToken());
+}
+export function $cmsCollection(name, query = {}) {
+  return fetchCollection(name, query, cmsPreviewToken());
+}
+export function $cmsContents(name, query = {}) {
+  return fetchContents(name, query, cmsPreviewToken());
+}
+export function $cmsContent(name, slug, query = {}) {
+  return fetchContent(name, slug, query, cmsPreviewToken());
+}
+export function $cmsPage(path, query = {}) {
+  return fetchPage(path, query, cmsPreviewToken());
+}
+export function $cmsRoute(path, query = {}) {
+  return fetchRoute(path, query, cmsPreviewToken());
+}
+export function useCmsSingle(name, options = {}) {
+  const { locale, key, default: fallback, ...asyncDataOptions } = options;
   const preview = cmsPreviewToken();
   return useAsyncData(
-    key ?? cmsPreviewKey(`cms-single:${entryName}:${locale ?? ""}`, preview),
-    async () => {
-      if (!query) unknownEntry(entryName);
-      const result = await cmsQueryWithPreview(query, { locale }, preview);
-      return result?.[entryName] ?? null;
-    },
+    key ?? cmsPreviewKey(`cms-single:${String(name)}:${locale ?? ""}`, preview),
+    () => fetchSingle(name, { locale }, preview),
     {
       default: fallback ?? (() => null),
       ...asyncDataOptions
@@ -41,17 +98,11 @@ export function useCmsCollection(name, options = {}) {
     default: fallback,
     ...asyncDataOptions
   } = options;
-  const entryName = String(name);
-  const query = cmsCollectionQueries[entryName];
   const variables = { locale, filters, sort, limit, offset };
   const preview = cmsPreviewToken();
   return useAsyncData(
-    key ?? cmsPreviewKey(`cms-collection:${entryName}:${JSON.stringify(variables)}`, preview),
-    async () => {
-      if (!query) unknownEntry(entryName);
-      const result = await cmsQueryWithPreview(query, variables, preview);
-      return result?.[entryName] ?? [];
-    },
+    key ?? cmsPreviewKey(`cms-collection:${String(name)}:${JSON.stringify(variables)}`, preview),
+    () => fetchCollection(name, variables, preview),
     {
       default: fallback ?? (() => []),
       ...asyncDataOptions
@@ -69,17 +120,11 @@ export function useCmsContents(name, options = {}) {
     default: fallback,
     ...asyncDataOptions
   } = options;
-  const entryName = String(name);
-  const query = cmsContentQueries[entryName];
   const variables = { locale, filters, sort, limit, offset };
   const preview = cmsPreviewToken();
   return useAsyncData(
-    key ?? cmsPreviewKey(`cms-contents:${entryName}:${JSON.stringify(variables)}`, preview),
-    async () => {
-      if (!query) unknownEntry(entryName);
-      const result = await cmsQueryWithPreview(query, variables, preview);
-      return result?.[entryName] ?? [];
-    },
+    key ?? cmsPreviewKey(`cms-contents:${String(name)}:${JSON.stringify(variables)}`, preview),
+    () => fetchContents(name, variables, preview),
     {
       default: fallback ?? (() => []),
       ...asyncDataOptions
@@ -88,16 +133,10 @@ export function useCmsContents(name, options = {}) {
 }
 export function useCmsContent(name, slug, options = {}) {
   const { locale, key, default: fallback, ...asyncDataOptions } = options;
-  const entryName = String(name);
-  const query = cmsContentItemQueries[entryName];
   const preview = cmsPreviewToken();
   return useAsyncData(
-    key ?? cmsPreviewKey(`cms-content:${entryName}:${slug}:${locale ?? ""}`, preview),
-    async () => {
-      if (!query) unknownEntry(entryName);
-      const result = await cmsQueryWithPreview(query, { slug, locale }, preview);
-      return result?.item ?? null;
-    },
+    key ?? cmsPreviewKey(`cms-content:${String(name)}:${slug}:${locale ?? ""}`, preview),
+    () => fetchContent(name, slug, { locale }, preview),
     {
       default: fallback ?? (() => null),
       ...asyncDataOptions
@@ -106,16 +145,10 @@ export function useCmsContent(name, slug, options = {}) {
 }
 export function useCmsPage(path, options = {}) {
   const { locale, key, default: fallback, ...asyncDataOptions } = options;
-  const pagePath = String(path);
-  const query = cmsPageQueries[pagePath];
   const preview = cmsPreviewToken();
   return useAsyncData(
-    key ?? cmsPreviewKey(`cms-page:${pagePath}:${locale ?? ""}`, preview),
-    async () => {
-      if (!query) unknownEntry(pagePath);
-      const result = await cmsQueryWithPreview(query, { path: pagePath, locale }, preview);
-      return result?.page ?? null;
-    },
+    key ?? cmsPreviewKey(`cms-page:${String(path)}:${locale ?? ""}`, preview),
+    () => fetchPage(path, { locale }, preview),
     {
       default: fallback ?? (() => null),
       ...asyncDataOptions
@@ -127,13 +160,7 @@ export function useCmsRoute(path, options = {}) {
   const preview = cmsPreviewToken();
   return useAsyncData(
     key ?? cmsPreviewKey(`cms-route:${path}:${locale ?? ""}`, preview),
-    async () => {
-      if (!cmsRouteQuery) return null;
-      const result = await cmsQueryWithPreview(cmsRouteQuery, { path, locale }, preview);
-      const entry = cmsRouteEntries.find((name) => result?.[name]);
-      if (!entry) return null;
-      return { entry, item: result[entry] };
-    },
+    () => fetchRoute(path, { locale }, preview),
     {
       default: fallback ?? (() => null),
       ...asyncDataOptions

package/dist/runtime/app/css-inline.d.ts

@@ -0,0 +1,4 @@
+declare module '*.css?inline' {
+   const css: string
+   export default css
+}

package/dist/runtime/app/pages/admin-preview.vue

@@ -86,7 +86,7 @@ import {
   watch
 } from "#imports";
 import { Icon as KIcon } from "@xleddyl/443-components-vue";
-import tokensHref from "@xleddyl/443-components-vue/tokens.css?url";
+import tokensCss from "@xleddyl/443-components-vue/tokens.css?inline";
 import cmsConfig from "#cms-config";
 import { cmsPreviewComponents } from "#cms-blocks";
 import {
@@ -117,7 +117,7 @@ const inline = shallowRef(null);
 useHead({
   title: "Preview",
   meta: [{ name: "robots", content: "noindex, nofollow" }],
-  link: [{ rel: "stylesheet", href: tokensHref }],
+  style: [{ key: "cms-tokens", innerHTML: tokensCss }],
   htmlAttrs: { lang: computed(() => state.value?.locale) }
 });
 const entry = computed(

package/dist/runtime/app/preview/CmsPreviewBanner.vue

@@ -31,19 +31,18 @@
 </template>
 
 <script setup>
-import tokensHref from "@xleddyl/443-components-vue/tokens.css?url";
+import tokensCss from "@xleddyl/443-components-vue/tokens.css?inline";
 import { computed, onMounted, ref, watch } from "vue";
 const props = defineProps({
   mode: { type: Object, required: true }
 });
 const dismissed = ref(false);
 onMounted(() => {
-  if (document.querySelector("link[data-cms-tokens]")) return;
-  const link = document.createElement("link");
-  link.rel = "stylesheet";
-  link.href = tokensHref;
-  link.dataset.cmsTokens = "";
-  document.head.appendChild(link);
+  if (document.querySelector("style[data-cms-tokens]")) return;
+  const style = document.createElement("style");
+  style.textContent = tokensCss;
+  style.dataset.cmsTokens = "";
+  document.head.appendChild(style);
 });
 watch(
   () => props.mode.id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xleddyl/nuxt-cms",
-  "version": "0.10.1",
+  "version": "0.11.1",
   "description": "Lightweight CMS that ships with your Nuxt app: runs on the Nitro server, content types defined in code, /cms admin panel, GraphQL API, SQLite or Postgres. No external CMS needed!",
   "license": "MIT",
   "author": "Edoardo Alberti (https://github.com/xleddyl)",

package/dist/runtime/app/css-url.d.ts

@@ -1,4 +0,0 @@
-declare module '*.css?url' {
-   const href: string
-   export default href
-}