vibe-design-system 2.5.27 → 2.5.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibe-design-system",
-  "version": "2.5.27",
+  "version": "2.5.28",
   "description": "Auto-generate design systems for vibe coding projects",
   "type": "module",
   "bin": {

package/vds-core-template/setup-storybook-providers.mjs

@@ -144,41 +144,34 @@ function injectProviderDecorators(projectRoot) {
 
   if (providersToAdd.length > 0) {
     let content = fs.readFileSync(previewPath, "utf-8");
-    const alreadyHas = providersToAdd.every((p) => content.includes(p.name));
-    if (!alreadyHas) {
-      const importLines = [...new Map(providersToAdd.map((p) => [p.name, p])).values()]
-        .map((p) => `import { ${p.name} } from "${p.importPath}";`)
-        .join("\n");
-      const lastImportIdx = content.search(/\nimport\s+.+?;\s*$/m);
-      const insertAt = lastImportIdx >= 0 ? content.indexOf("\n", lastImportIdx) + 1 : content.indexOf("\n") + 1;
-      content = content.slice(0, insertAt) + importLines + "\n" + content.slice(insertAt);
+    const uniqueProviders = [...new Map(providersToAdd.map((p) => [p.name, p])).values()];
+    if (!content.includes("import React") && !content.includes("import React from")) {
+      const firstImport = content.match(/^import\s+/m);
+      const insertAt = firstImport ? content.indexOf(firstImport[0]) : 0;
+      content = content.slice(0, insertAt) + "import React from \"react\";\n" + content.slice(insertAt);
     }
-    const withProvidersCode = buildWithProvidersCode(providersToAdd);
-    const idxPreview = content.indexOf("const preview");
-    const idxWithProviders = content.indexOf("const withProviders");
-    const wrongOrder = idxWithProviders !== -1 && idxPreview !== -1 && idxWithProviders > idxPreview;
-    if (wrongOrder) {
-      const blockMatch = content.match(/const withProviders\s*=[\s\S]+?;\s*\n/);
-      if (blockMatch) {
-        const block = blockMatch[0].trim();
-        content = content.replace(blockMatch[0], "").replace(/\n{3,}/g, "\n\n");
-        content = content.replace(/(\s*)(const preview\s*[^=]*=\s*\{)/, block + "\n\n$1$2");
-      }
-    } else if (!content.includes("withProviders")) {
-      if (!content.includes("import React")) {
-        const firstImport = content.match(/^import\s+/m);
-        const insertAt = firstImport ? content.indexOf(firstImport[0]) : 0;
-        content = content.slice(0, insertAt) + "import React from \"react\";\n" + content.slice(insertAt);
+    for (const p of uniqueProviders) {
+      if (!content.includes(p.name)) {
+        const lastImportIdx = content.search(/\nimport\s+.+?;\s*$/m);
+        const insertAt = lastImportIdx >= 0 ? content.indexOf("\n", lastImportIdx) + 1 : content.indexOf("\n") + 1;
+        content = content.slice(0, insertAt) + `import { ${p.name} } from "${p.importPath}";\n` + content.slice(insertAt);
       }
-      content = content.replace(/(\s*)(const preview\s*[^=]*=\s*\{)/, withProvidersCode + "\n\n$1$2");
+    }
+    content = content.replace(/const withProviders\s*=\s*\([^)]*\)\s*=>\s*[\s\S]+?;\s*\n?/g, "").replace(/\n{3,}/g, "\n\n");
+    const withProvidersCode = buildWithProvidersCode(providersToAdd);
+    const insertBefore = content.indexOf("const preview");
+    if (insertBefore !== -1) {
+      content = content.slice(0, insertBefore) + withProvidersCode + "\n\n" + content.slice(insertBefore);
       if (content.includes("decorators:")) {
-        content = content.replace(/decorators:\s*\[/, "decorators: [withProviders, ");
+        if (!content.includes("decorators: [withProviders")) {
+          content = content.replace(/decorators:\s*\[/, "decorators: [withProviders, ");
+        }
       } else {
         content = content.replace(/(const preview\s*[^=]*=\s*\{\s*)/, "$1\n  decorators: [withProviders],\n  ");
       }
     }
     fs.writeFileSync(previewPath, content, "utf-8");
-    console.log("[VDS] Storybook preview: " + (wrongOrder ? "fixed withProviders order." : "added " + providersToAdd.map((p) => p.name).join(", ")));
+    console.log("[VDS] Storybook preview: " + uniqueProviders.map((p) => p.name).join(", "));
   }
 
   if (hooksWithoutProvider.size > 0) {