@emulsify/core 4.2.0 → 4.3.0

package/src/storybook/twig/resolver.js

@@ -91,9 +91,26 @@ function findGroupedComponentEntry(map, candidates, env) {
 
   for (const { rootRel, suffix } of groupedComponentSuffixes(candidates, env)) {
     const rootPrefix = `${rootRel}/`;
-    const match = entries.find(
-      ([key]) => key.startsWith(rootPrefix) && key.endsWith(suffix),
-    );
+    const matches = entries
+      .filter(([key]) => key.startsWith(rootPrefix) && key.endsWith(suffix))
+      .sort(([leftKey], [rightKey]) => {
+        const leftGroupingPath = leftKey.slice(
+          rootPrefix.length,
+          -suffix.length,
+        );
+        const rightGroupingPath = rightKey.slice(
+          rootPrefix.length,
+          -suffix.length,
+        );
+        const leftDepth = leftGroupingPath.split('/').filter(Boolean).length;
+        const rightDepth = rightGroupingPath.split('/').filter(Boolean).length;
+
+        if (leftDepth !== rightDepth) {
+          return leftDepth - rightDepth;
+        }
+        return leftKey === rightKey ? 0 : leftKey < rightKey ? -1 : 1;
+      });
+    const match = matches[0];
     if (match) {
       return { key: match[0], value: match[1] };
     }

package/src/storybook/twig/setup.js

@@ -3,7 +3,8 @@
  */
 
 import { registerTwigExtensions } from '../../extensions/twig/index.js';
-import twigInclude from './include.js';
+import { createTwigIncludeFunction } from './include-function.js';
+import resolveTemplate from './resolver.js';
 import twigSource from './source.js';
 
 /**
@@ -35,5 +36,14 @@ export function setupTwig(twig, options = {}) {
   return twig;
 }
 
-export { default as twigInclude } from './include.js';
+/**
+ * Twig `include()` runtime helper.
+ *
+ * @param {Object} Twig - Twig.js module.
+ * @returns {undefined}
+ */
+export function twigInclude(Twig) {
+  Twig.extendFunction('include', createTwigIncludeFunction(resolveTemplate));
+}
+
 export { default as twigSource } from './source.js';

package/src/storybook/twig/source-function.js

@@ -8,8 +8,11 @@ import {
   isAssetTextLoading,
   whenAssetTextLoaded,
 } from 'virtual:emulsify-twig-asset-sources';
-import { IMAGE_ASSET_EXTS, INLINE_ASSET_EXTS } from './source-extensions.js';
-import { TWIG_SOURCE_LOADED_EVENT } from './source-events.js';
+import {
+  IMAGE_ASSET_EXTS,
+  INLINE_ASSET_EXTS,
+  TWIG_SOURCE_LOADED_EVENT,
+} from './constants.js';
 
 const DEFAULT_ENV =
   (typeof __EMULSIFY_ENV__ !== 'undefined' && __EMULSIFY_ENV__) || {};

package/config/vite/utils/unique.js

@@ -1,36 +0,0 @@
-/**
- * @file Shared array de-duplication helpers.
- */
-
-/**
- * Return values in first-seen order with duplicates removed.
- *
- * @template T
- * @param {T[]} values - Values to deduplicate.
- * @returns {T[]} Unique values.
- */
-export function unique(values = []) {
-  return Array.from(new Set(values));
-}
-
-/**
- * Return values in first-seen order with duplicates removed by key.
- *
- * @template T
- * @param {T[]} values - Values to deduplicate.
- * @param {(value: T) => *} keyFn - Function that returns a comparable key.
- * @returns {T[]} Unique values.
- */
-export function uniqueBy(values = [], keyFn) {
-  const seen = new Set();
-  const result = [];
-
-  for (const value of values) {
-    const key = keyFn(value);
-    if (seen.has(key)) continue;
-    seen.add(key);
-    result.push(value);
-  }
-
-  return result;
-}

package/src/storybook/twig/include.js

@@ -1,28 +0,0 @@
-/**
- * @file Twig include() runtime helper for Storybook-rendered templates.
- */
-
-import { createTwigIncludeFunction as createIncludeFunction } from './include-function.js';
-import resolveTemplate from './resolver.js';
-
-/**
- * Create a Twig.js `include()` function with the Storybook template resolver.
- *
- * @param {Function} resolver - Template resolver.
- * @returns {Function} Twig.js function implementation.
- */
-export function createTwigIncludeFunction(resolver = resolveTemplate) {
-  return createIncludeFunction(resolver);
-}
-
-/**
- * Twig `include()` runtime helper.
- *
- * @param {Object} Twig - Twig.js module.
- * @returns {undefined}
- */
-function twigInclude(Twig) {
-  Twig.extendFunction('include', createIncludeFunction(resolveTemplate));
-}
-
-export default twigInclude;

package/src/storybook/twig/source-events.js

@@ -1,5 +0,0 @@
-/**
- * @file Shared events for lazy Twig source loading.
- */
-
-export const TWIG_SOURCE_LOADED_EVENT = 'emulsify:twig-source-loaded';