@hywax/cms 3.4.0 → 3.4.1

package/dist/module.json

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

package/dist/module.mjs

@@ -7,7 +7,7 @@ import { pascalCase, kebabCase, camelCase } from 'scule';
 import { globSync } from 'tinyglobby';
 
 const name = "@hywax/cms";
-const version = "3.4.0";
+const version = "3.4.1";
 
 function createContext(options, nuxt) {
   const { resolve } = createResolver(import.meta.url);
@@ -219,7 +219,7 @@ function resolveComponentDependencies(component, dependencyGraph, resolved = /*
   }
   return resolved;
 }
-async function detectUsedComponents([dirs, type], prefix, componentDir, includeComponents) {
+async function detectUsedComponents({ dirs, prefix, componentDir, includeComponents = [], allowComponents = [] }) {
   const detectedComponents = /* @__PURE__ */ new Set();
   if (includeComponents && includeComponents.length > 0) {
     for (const component of includeComponents) {
@@ -227,10 +227,16 @@ async function detectUsedComponents([dirs, type], prefix, componentDir, includeC
     }
   }
   const componentPattern = new RegExp(`<(?:Lazy)?${prefix}([A-Z][a-zA-Z]+)|\\b(?:Lazy)?${prefix}([A-Z][a-zA-Z]+)\\b`, "g");
-  if (type === "files") {
-    for (const file of dirs) {
+  const filesPattern = allowComponents.length ? `**/(${allowComponents.join("|")}).{vue,ts,js,tsx,jsx}` : "**/*.{vue,ts,js,tsx,jsx}";
+  for (const dir of dirs) {
+    const appFiles = globSync([filesPattern], {
+      cwd: dir,
+      ignore: ["node_modules/**", ".nuxt/**", "dist/**"]
+    });
+    for (const file of appFiles) {
       try {
-        const content = await readFile(file, "utf-8");
+        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];
@@ -241,27 +247,6 @@ async function detectUsedComponents([dirs, type], prefix, componentDir, includeC
       } 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;
@@ -269,7 +254,7 @@ async function detectUsedComponents([dirs, type], prefix, componentDir, includeC
   const dependencyGraph = await buildComponentDependencyGraph(componentDir, componentPattern);
   const allComponents = /* @__PURE__ */ new Set();
   for (const component of detectedComponents) {
-    const resolved = resolveComponentDependencies(component, dependencyGraph);
+    const resolved = resolveComponentDependencies(component, dependencyGraph, /* @__PURE__ */ new Set());
     for (const resolvedComponent of resolved) {
       allComponents.add(resolvedComponent);
     }
@@ -347,11 +332,12 @@ async function prepareMergeConfigs({ nuxt, options, resolve, detectedComponents:
       }
     }
   });
-  const detectedComponents = await detectUsedComponents(
-    [[...contextDetectedComponents].map((component) => resolve(`./runtime/components/${component}.vue`)), "files"],
-    "U",
-    resolve("./runtime/components")
-  );
+  const detectedComponents = await detectUsedComponents({
+    dirs: [resolve("./runtime/components"), resolve("./runtime/composables")],
+    prefix: "U",
+    componentDir: resolve("./runtime/components"),
+    allowComponents: [...contextDetectedComponents]
+  });
   nuxt.options.ui = defu(nuxt.options.ui || {}, {
     colorMode: true,
     fonts: true,
@@ -624,12 +610,12 @@ async function getAppTemplates({ options, resolve, nuxt, detectedComponents: con
     const sources2 = [];
     const layers = getLayerDirectories(nuxt).map((layer) => layer.app);
     if (options.componentDetection) {
-      const detectedComponents = await detectUsedComponents(
-        [layers, "dirs"],
-        options.componentsPrefix,
-        resolve("./runtime/components"),
-        Array.isArray(options.componentDetection) ? options.componentDetection : void 0
-      );
+      const detectedComponents = await detectUsedComponents({
+        dirs: layers,
+        prefix: options.componentsPrefix,
+        componentDir: resolve("./runtime/components"),
+        includeComponents: Array.isArray(options.componentDetection) ? options.componentDetection : void 0
+      });
       if (detectedComponents && detectedComponents.size > 0) {
         if (previousDetectedComponents) {
           const newComponents = Array.from(detectedComponents).filter(
@@ -650,8 +636,8 @@ async function getAppTemplates({ options, resolve, nuxt, detectedComponents: con
           const camelComponent = camelCase(component);
           if (theme[camelComponent]) {
             sources2.push(`@source "./cms/${kebabComponent}.ts";`);
-            contextDetectedComponents.add(component);
           }
+          contextDetectedComponents.add(component);
         }
       } else {
         if (!previousDetectedComponents || previousDetectedComponents.size > 0) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hywax/cms",
   "type": "module",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "Hywax CMS. ⚠️ This package is intended for internal use only.",
   "imports": {
     "#build/cms/*": "./.nuxt/cms/*.ts",