@hywax/cms 3.2.1 → 3.4.0

package/.nuxt/cms/config.ts

@@ -4,6 +4,7 @@ const cmsConfig = {
     "serverDateTime": "YYYY-MM-DD HH:mm:ss"
   },
   "prose": {
+    "enabled": true,
     "uploraImage": {
       "formats": [],
       "sizes": []

package/.nuxt/cms/index.ts

@@ -1,12 +1,13 @@
-export { default as ButtonCopyText } from './button-copy-text'
-export { default as ButtonDeleteConfirm } from './button-delete-confirm'
-export { default as FormPanel } from './form-panel'
-export { default as FormPanelAsideSection } from './form-panel-aside-section'
-export { default as FormPanelSection } from './form-panel-section'
-export { default as FormSeo } from './form-seo'
-export { default as FormSlug } from './form-slug'
-export { default as FormUploraImage } from './form-uplora-image'
-export { default as ModalConfirm } from './modal-confirm'
-export { default as TablePanel } from './table-panel'
-export { default as TableSearchInput } from './table-search-input'
-export { default as UploraImage } from './uplora-image'
+export { default as buttonCopyText } from './button-copy-text'
+export { default as buttonDeleteConfirm } from './button-delete-confirm'
+export { default as formPanel } from './form-panel'
+export { default as formPanelAsideSection } from './form-panel-aside-section'
+export { default as formPanelSection } from './form-panel-section'
+export { default as formSeo } from './form-seo'
+export { default as formSlug } from './form-slug'
+export { default as formUploraImage } from './form-uplora-image'
+export { default as modalConfirm } from './modal-confirm'
+export { default as tablePanel } from './table-panel'
+export { default as tableSearchInput } from './table-search-input'
+export { default as uploraImage } from './uplora-image'
+export * as prose from './prose'

package/.nuxt/cms.css

@@ -1,8 +1,5 @@
-@source "./cms/autocomplete-select.ts";
-@source "./cms/layout.ts";
-@source "./cms/ms.ts";
+@source "./cms/prose";
 @source "./cms/form-panel.ts";
-@source "./cms/editor-full.ts";
 @source "./cms/form-panel-section.ts";
 @source "./cms/form-slug.ts";
 @source "./cms/form-uplora-image.ts";
@@ -11,10 +8,5 @@
 @source "./cms/table-panel.ts";
 @source "./cms/modal-confirm.ts";
 @source "./cms/table-search-input.ts";
-@source "./cms/table-preview-seo.ts";
-@source "./cms/ms-core-options.ts";
-@source "./cms/ms-nuxt-context.ts";
-@source "./cms/date-picker.ts";
-@source "./cms/ss.ts";
 
     

package/dist/module.d.mts

@@ -54,6 +54,7 @@ interface CMSCoreOptions {
      * Prose configuration
      */
     prose?: {
+        enabled?: boolean;
         uploraImage?: {
             formats?: ImageFormat[];
             sizes?: ImageSize[];

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@hywax/cms",
-  "version": "3.2.1",
+  "version": "3.4.0",
   "configKey": "cms",
   "builder": {
     "@nuxt/module-builder": "1.0.2",

package/dist/module.mjs

@@ -3,11 +3,11 @@ import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'pathe';
 import { readFile, writeFile } from 'node:fs/promises';
 import { defu } from 'defu';
-import { pascalCase, kebabCase } from 'scule';
+import { pascalCase, kebabCase, camelCase } from 'scule';
 import { globSync } from 'tinyglobby';
 
 const name = "@hywax/cms";
-const version = "3.2.1";
+const version = "3.4.0";
 
 function createContext(options, nuxt) {
   const { resolve } = createResolver(import.meta.url);
@@ -18,7 +18,8 @@ function createContext(options, nuxt) {
     resolve,
     distDir,
     runtimeDir,
-    nuxt
+    nuxt,
+    detectedComponents: /* @__PURE__ */ new Set()
   };
 }
 
@@ -84,6 +85,7 @@ const defaultModuleOptions = {
     serverDateTime: "YYYY-MM-DD HH:mm:ss"
   },
   prose: {
+    enabled: true,
     uploraImage: {
       formats: [],
       sizes: []
@@ -91,7 +93,7 @@ const defaultModuleOptions = {
   }
 };
 
-function prepareAutoImports({ resolve, options, nuxt }) {
+async function prepareAutoImports({ resolve, options, nuxt }) {
   const cmsConfigPath = resolve(nuxt.options.buildDir, "cms/config");
   const httpStatusesPath = resolve(nuxt.options.buildDir, "cms/http-statuses");
   addComponentsDir({
@@ -217,7 +219,7 @@ function resolveComponentDependencies(component, dependencyGraph, resolved = /*
   }
   return resolved;
 }
-async function detectUsedComponents(dirs, prefix, componentDir, includeComponents) {
+async function detectUsedComponents([dirs, type], prefix, componentDir, includeComponents) {
   const detectedComponents = /* @__PURE__ */ new Set();
   if (includeComponents && includeComponents.length > 0) {
     for (const component of includeComponents) {
@@ -225,15 +227,10 @@ async function detectUsedComponents(dirs, prefix, componentDir, includeComponent
     }
   }
   const componentPattern = new RegExp(`<(?:Lazy)?${prefix}([A-Z][a-zA-Z]+)|\\b(?:Lazy)?${prefix}([A-Z][a-zA-Z]+)\\b`, "g");
-  for (const dir of dirs) {
-    const appFiles = globSync(["**/*.{vue,ts,js,tsx,jsx}"], {
-      cwd: dir,
-      ignore: ["node_modules/**", ".nuxt/**", "dist/**"]
-    });
-    for (const file of appFiles) {
+  if (type === "files") {
+    for (const file of dirs) {
       try {
-        const filePath = join(dir, file);
-        const content = await readFile(filePath, "utf-8");
+        const content = await readFile(file, "utf-8");
         const matches = content.matchAll(componentPattern);
         for (const match of matches) {
           const componentName = match[1] || match[2];
@@ -244,6 +241,27 @@ async function detectUsedComponents(dirs, prefix, componentDir, includeComponent
       } catch {
       }
     }
+  } else if (type === "dirs") {
+    for (const dir of dirs) {
+      const appFiles = globSync(["**/*.{vue,ts,js,tsx,jsx}"], {
+        cwd: dir,
+        ignore: ["node_modules/**", ".nuxt/**", "dist/**"]
+      });
+      for (const file of appFiles) {
+        try {
+          const filePath = join(dir, file);
+          const content = await readFile(filePath, "utf-8");
+          const matches = content.matchAll(componentPattern);
+          for (const match of matches) {
+            const componentName = match[1] || match[2];
+            if (componentName) {
+              detectedComponents.add(componentName);
+            }
+          }
+        } catch {
+        }
+      }
+    }
   }
   if (detectedComponents.size === 0) {
     return void 0;
@@ -259,7 +277,7 @@ async function detectUsedComponents(dirs, prefix, componentDir, includeComponent
   return allComponents;
 }
 
-async function prepareMergeConfigs({ nuxt, options, resolve }) {
+async function prepareMergeConfigs({ nuxt, options, resolve, detectedComponents: contextDetectedComponents }) {
   nuxt.options.experimental = defu(nuxt.options.experimental || {}, {
     typedPages: true
   });
@@ -330,7 +348,7 @@ async function prepareMergeConfigs({ nuxt, options, resolve }) {
     }
   });
   const detectedComponents = await detectUsedComponents(
-    [resolve("./runtime/components"), resolve("./runtime/composables")],
+    [[...contextDetectedComponents].map((component) => resolve(`./runtime/components/${component}.vue`)), "files"],
     "U",
     resolve("./runtime/components")
   );
@@ -362,7 +380,7 @@ async function prepareMergeConfigs({ nuxt, options, resolve }) {
   nuxt.options.vite = defu(nuxt.options.vite || {}, {
     optimizeDeps: {
       include: [
-        "@unovis/vue",
+        ...options.unovis ? ["@unovis/vue"] : [],
         "@tanstack/vue-table",
         "@uplora/formats",
         "@nuxt/ui/utils/editor",
@@ -394,7 +412,7 @@ async function prepareMergeConfigs({ nuxt, options, resolve }) {
   });
 }
 
-function prepareServerRoutes({ resolve }) {
+async function prepareServerRoutes({ resolve }) {
   addServerHandler({
     route: "/api/_uplora",
     method: "post",
@@ -540,22 +558,18 @@ const uploraImage$1 = {
 
 const theme = {
   __proto__: null,
-  ButtonCopyText: buttonCopyText,
-  ButtonDeleteConfirm: buttonDeleteConfirm,
-  FormPanel: formPanel,
-  FormPanelAsideSection: formPanelAsideSection,
-  FormPanelSection: formPanelSection,
-  FormSeo: formSeo,
-  FormSlug: formSlug,
-  FormUploraImage: formUploraImage,
-  ModalConfirm: modalConfirm,
-  TablePanel: tablePanel,
-  TableSearchInput: tableSearchInput,
-  UploraImage: uploraImage$1
-};
-
-const themeEditor = {
-  __proto__: null
+  buttonCopyText: buttonCopyText,
+  buttonDeleteConfirm: buttonDeleteConfirm,
+  formPanel: formPanel,
+  formPanelAsideSection: formPanelAsideSection,
+  formPanelSection: formPanelSection,
+  formSeo: formSeo,
+  formSlug: formSlug,
+  formUploraImage: formUploraImage,
+  modalConfirm: modalConfirm,
+  tablePanel: tablePanel,
+  tableSearchInput: tableSearchInput,
+  uploraImage: uploraImage$1
 };
 
 const uploraImage = {
@@ -569,7 +583,7 @@ const themeProse = {
   uploraImage: uploraImage
 };
 
-function getAppTemplates({ options, resolve, nuxt }) {
+async function getAppTemplates({ options, resolve, nuxt, detectedComponents: contextDetectedComponents }) {
   const templates = [];
   let previousDetectedComponents;
   function writeThemeTemplate(theme2, path) {
@@ -607,11 +621,11 @@ function getAppTemplates({ options, resolve, nuxt }) {
     }
   }
   async function generateSources() {
-    const sources = [];
+    const sources2 = [];
     const layers = getLayerDirectories(nuxt).map((layer) => layer.app);
     if (options.componentDetection) {
       const detectedComponents = await detectUsedComponents(
-        layers,
+        [layers, "dirs"],
         options.componentsPrefix,
         resolve("./runtime/components"),
         Array.isArray(options.componentDetection) ? options.componentDetection : void 0
@@ -628,40 +642,43 @@ function getAppTemplates({ options, resolve, nuxt }) {
           logger.success(`CMS detected ${detectedComponents.size} components in use (including dependencies)`);
         }
         previousDetectedComponents = detectedComponents;
+        if (options.prose?.enabled) {
+          sources2.push('@source "./cms/prose";');
+        }
         for (const component of detectedComponents) {
           const kebabComponent = kebabCase(component);
-          sources.push(`@source "./cms/${kebabComponent}.ts";`);
+          const camelComponent = camelCase(component);
+          if (theme[camelComponent]) {
+            sources2.push(`@source "./cms/${kebabComponent}.ts";`);
+            contextDetectedComponents.add(component);
+          }
         }
       } else {
         if (!previousDetectedComponents || previousDetectedComponents.size > 0) {
           logger.info("CMS detected no components in use, including all components");
         }
         previousDetectedComponents = /* @__PURE__ */ new Set();
-        sources.push('@source "./cms";');
+        sources2.push('@source "./cms";');
       }
     } else {
-      sources.push('@source "./cms";');
+      sources2.push('@source "./cms";');
     }
-    return sources.join("\n");
+    return sources2.join("\n");
+  }
+  if (options.prose?.enabled) {
+    templates.push({
+      filename: `cms/prose/index.ts`,
+      write: true,
+      getContents: () => Object.keys(themeProse).map((component) => `export { default as ${component} } from './${kebabCase(component)}'`).join("\n")
+    });
+    writeThemeTemplate(themeProse, "prose");
   }
-  writeThemeTemplate(themeProse, "prose");
-  writeThemeTemplate(themeProse, "editor");
   writeThemeTemplate(theme);
-  templates.push({
-    filename: `cms/prose/index.ts`,
-    write: true,
-    getContents: () => Object.keys(themeProse).map((component) => `export { default as ${component} } from './${kebabCase(component)}'`).join("\n")
-  });
-  templates.push({
-    filename: `cms/editor/index.ts`,
-    write: true,
-    getContents: () => Object.keys(themeEditor).map((component) => `export { default as ${component} } from './${kebabCase(component)}'`).join("\n")
-  });
+  const sources = await generateSources();
   templates.push({
     filename: "cms.css",
     write: true,
     getContents: async () => {
-      const sources = await generateSources();
       return `${sources}
 ${options.unovis ? `
     @layer components {
@@ -699,24 +716,27 @@ ${options.unovis ? `
   templates.push({
     filename: "cms/index.ts",
     write: true,
-    getContents: () => {
-      return Object.keys(theme).map((component) => `export { default as ${component} } from './${kebabCase(component)}'`).join("\n");
-    }
+    getContents: () => [
+      ...Object.keys(theme).map((component) => `export { default as ${component} } from './${kebabCase(component)}'`),
+      ...options.prose?.enabled ? [`export * as prose from './prose'`] : []
+    ].join("\n")
   });
   templates.push({
     filename: "types/cms.d.ts",
     getContents: () => `import * as cms from '#build/cms'
-import type { TVConfig } from '@nuxt/ui'
+import type { TVConfig } from '@hywax/cms'
 import type { RouteLocationRaw } from 'vue-router'
 
-type AppConfigCMS = TVConfig<typeof cms>
+type AppConfigCMS = {
+
+} & TVConfig<typeof cms>
 
 declare module '@nuxt/schema' {
   interface AppConfigInput {
     /**
      * CMS theme configuration
      */
-    cmsRuntime?: AppConfigCMS
+    cms?: AppConfigCMS
   }
 }
 
@@ -751,8 +771,8 @@ function getServerTemplates(_context) {
   const templates = [];
   return templates;
 }
-function prepareTemplates(context) {
-  const appTemplates = getAppTemplates(context);
+async function prepareTemplates(context) {
+  const appTemplates = await getAppTemplates(context);
   const serverTemplates = getServerTemplates();
   for (const template of appTemplates) {
     if (template.filename.endsWith(".d.ts")) {
@@ -792,11 +812,16 @@ const module$1 = defineNuxtModule({
   defaults: defaultModuleOptions,
   async setup(options, nuxt) {
     const context = createContext(options, nuxt);
-    await prepareMergeConfigs(context);
-    prepareTemplates(context);
-    prepareAutoImports(context);
-    prepareServerRoutes(context);
-    await prepareGenerateEnv(context);
+    const prepareHandlers = [
+      prepareTemplates,
+      prepareMergeConfigs,
+      prepareAutoImports,
+      prepareServerRoutes,
+      prepareGenerateEnv
+    ];
+    for (const handler of prepareHandlers) {
+      await handler(context);
+    }
   }
 });
 

package/dist/runtime/index.css

@@ -1 +1 @@
-@import "@nuxt/ui";@import "#build/cms.css";@source "./components";@source "./editor";@source "./prose";
+@import "@nuxt/ui";@import "#build/cms.css";@source "./components";

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

@@ -39,5 +39,5 @@ export * from './date';
 export * from './image';
 export * from './query';
 export * from './seo';
-export type { ComponentSlots, ComponentVariants } from './tv';
+export * from './tv';
 export * from './utils';

package/dist/runtime/types/index.js

@@ -39,4 +39,5 @@ export * from "./date.js";
 export * from "./image.js";
 export * from "./query.js";
 export * from "./seo.js";
+export * from "./tv.js";
 export * from "./utils.js";

package/dist/runtime/types/tv.d.ts

@@ -4,11 +4,18 @@ import type { ClassValue, TVCompoundVariants, TVDefaultVariants, TVVariants } fr
  */
 export type TVConfig<T extends Record<string, any>> = {
     [P in keyof T]?: {
-        [K in keyof T[P] as K extends 'base' | 'slots' | 'variants' | 'compoundVariants' | 'defaultVariants' ? K : never]?: K extends 'base' ? ClassValue : K extends 'slots' ? {
+        [K in keyof T[P] as K extends 'base' | 'slots' | 'variants' | 'defaultVariants' ? K : never]?: K extends 'base' ? ClassValue : K extends 'slots' ? {
             [S in keyof T[P]['slots']]?: ClassValue;
-        } : K extends 'variants' ? TVVariants<T[P]['slots'], ClassValue, T[P]['variants']> : K extends 'compoundVariants' ? TVCompoundVariants<T[P]['variants'], T[P]['slots'], ClassValue, object, undefined> : K extends 'defaultVariants' ? TVDefaultVariants<T[P]['variants'], T[P]['slots'], object, undefined> : never;
+        } : K extends 'variants' ? TVVariants<T[P]['slots'], ClassValue, WidenVariantsValues<T[P]['variants']>> : K extends 'defaultVariants' ? TVDefaultVariants<WidenVariantsValues<T[P]['variants']>, T[P]['slots'], object, undefined> : never;
+    };
+} & {
+    [P in keyof T]?: {
+        compoundVariants?: TVCompoundVariants<WidenVariantsValues<T[P]['variants']>, T[P]['slots'], ClassValue, object, undefined>;
     };
 };
+type WidenVariantsValues<V extends Record<string, any> | undefined> = V extends Record<string, any> ? V & {
+    [K in keyof V]: V[K] extends Record<string, any> ? V[K] & Record<string & {}, any> : V[K];
+} : V;
 /**
  * Utility type to flatten intersection types for better IDE hover information.
  * @template T The type to flatten.
@@ -26,21 +33,20 @@ export type ComponentSlots<T extends {
 }> = Id<{
     [K in keyof T['slots']]?: ClassValue;
 }>;
+type ComponentUI<T extends {
+    slots?: Record<string, any>;
+}> = Id<{
+    [K in keyof Required<T['slots']>]: (props?: Record<string, any>) => string;
+}>;
 type GetComponentAppConfig<A, U extends string, K extends string> = A extends Record<U, Record<K, any>> ? A[U][K] : object;
-type ComponentAppConfig<T, A extends Record<string, any>, K extends string, U extends string = 'cms' | 'cms.prose' | 'cms.editor'> = A & (U extends 'cms.prose' ? {
+type ComponentAppConfig<T, A extends Record<string, any>, K extends string, U extends string = 'cms' | 'cms.prose'> = A & (U extends 'cms.prose' ? {
     cms?: {
         prose?: {
             [k in K]?: Partial<T>;
         };
     };
-} : U extends 'cms.editor' ? {
-    cms?: {
-        editor?: {
-            [k in K]?: Partial<T>;
-        };
-    };
 } : {
-    [key in Exclude<U, 'cms.prose' | 'cms.editor'>]?: {
+    [key in Exclude<U, 'cms.prose'>]?: {
         [k in K]?: Partial<T>;
     };
 });
@@ -51,9 +57,10 @@ type ComponentAppConfig<T, A extends Record<string, any>, K extends string, U ex
  * @template K The key identifying the component (e.g., 'badge').
  * @template U The top-level key in AppConfig ('cms' or 'cms.prose').
  */
-export type ComponentConfig<T extends Record<string, any>, A extends Record<string, any>, K extends string, U extends 'cms' | 'cms.prose' | 'cms.editor' = 'cms'> = {
+export type ComponentConfig<T extends Record<string, any>, A extends Record<string, any>, K extends string, U extends 'cms' | 'cms.prose' = 'cms'> = {
     AppConfig: ComponentAppConfig<T, A, K, U>;
     variants: ComponentVariants<T & GetComponentAppConfig<A, U, K>>;
     slots: ComponentSlots<T>;
+    ui: ComponentUI<T>;
 };
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hywax/cms",
   "type": "module",
-  "version": "3.2.1",
+  "version": "3.4.0",
   "description": "Hywax CMS. ⚠️ This package is intended for internal use only.",
   "imports": {
     "#build/cms/*": "./.nuxt/cms/*.ts",
@@ -85,8 +85,8 @@
   },
   "devDependencies": {
     "@antfu/eslint-config": "^6.7.3",
-    "@commitlint/cli": "^20.3.0",
-    "@commitlint/config-conventional": "^20.3.0",
+    "@commitlint/cli": "^20.3.1",
+    "@commitlint/config-conventional": "^20.3.1",
     "@nuxt/devtools": "^3.1.1",
     "@nuxt/module-builder": "^1.0.2",
     "@nuxt/schema": "^4.2.2",

package/.nuxt/cms/editor/uplora-image.ts

@@ -1,5 +0,0 @@
-export default {
-  "slots": {
-    "base": ""
-  }
-}