@fibery/ui-kit 4.0.0 → 4.1.0

package/src/icons/icon.tsx

@@ -4,6 +4,11 @@ import {forwardRef} from "react";
 import {border, iconSize as defaultIconSize, themeVars, viewBoxSize} from "../design-system";
 import {useTheme} from "../theme-provider";
 import DatabaseSvg from "./ast/database";
+import ObjChildSvg from "./ast/obj-child";
+import ObjM2MSvg from "./ast/obj-m2m";
+import ObjO2OSvg from "./ast/obj-o2o";
+import ObjParentSvg from "./ast/obj-parent";
+import ObjSelfSvg from "./ast/obj-self";
 import {generateIconFromAst} from "./generate-icon-from-ast";
 import type {IconProps} from "./types";
 
@@ -44,8 +49,15 @@ export const Icon = forwardRef<SVGSVGElement, IconProps>(function Icon(
 ) {
   const theme = useTheme();
   let resolvedColor: string | null | undefined;
-  if (typeof color === "string" && !colorProcessed && !color.startsWith("var(")) {
-    if (icon === DatabaseSvg) {
+  if (typeof color === "string" && !colorProcessed && !color.startsWith("var(") && color !== "currentColor") {
+    if (
+      icon === DatabaseSvg ||
+      icon === ObjSelfSvg ||
+      icon === ObjO2OSvg ||
+      icon === ObjChildSvg ||
+      icon === ObjParentSvg ||
+      icon === ObjM2MSvg
+    ) {
       resolvedColor = theme.fns.badge(color).bg;
     } else {
       resolvedColor = theme.fns.icon(color).fg;

package/src/icons/icons-integrity.test.ts

@@ -0,0 +1,145 @@
+/// <reference types="node-types-local" />
+import {readdirSync, readFileSync} from "node:fs";
+import path from "node:path";
+import {fileURLToPath} from "node:url";
+
+import {glob} from "glob";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const ICONS_DIR = path.resolve(__dirname);
+const SVG_DIR = path.join(ICONS_DIR, "svg");
+const AST_DIR = path.join(ICONS_DIR, "ast");
+const REACT_DIR = path.join(ICONS_DIR, "react");
+const FIX_CMD = "pnpm -filter ui-kit generate-icons";
+
+const WORD_RE = /[A-Z]+(?![a-z])|[A-Z]?[a-z]+|\d+/g;
+const words = (s: string) => String(s).match(WORD_RE) ?? [];
+const cap = (w: string) => w[0].toUpperCase() + w.slice(1).toLowerCase();
+const pascalCase = (s: string) => words(s).map(cap).join("");
+
+function toFileBase(relativeSvgPath: string): string {
+  return relativeSvgPath.replaceAll("/", "-").replace(".svg", "");
+}
+
+function toIdentifier(relativeSvgPath: string): string {
+  return pascalCase(relativeSvgPath.replaceAll("/", "-").replace(".svg", ""));
+}
+
+function listFiles(dir: string, ext: string): string[] {
+  return readdirSync(dir)
+    .filter((f) => f.endsWith(ext) && f !== `index${ext}` && f !== "index.tsx" && f !== "index.ts")
+    .map((f) => f.slice(0, -ext.length));
+}
+
+function readBarrelExports(dir: string): Map<string, string> {
+  const indexFile = readdirSync(dir).find((f) => f === "index.tsx" || f === "index.ts");
+  if (!indexFile) {
+    return new Map();
+  }
+  const content = readFileSync(path.join(dir, indexFile), "utf-8");
+  const exports = new Map<string, string>();
+  for (const line of content.split("\n")) {
+    const match = line.match(/export\s*\{\s*default\s+as\s+(\w+)\s*\}\s*from\s*["']\.\/([^"']+)["']/);
+    if (match) {
+      exports.set(match[1], match[2]);
+    }
+  }
+  return exports;
+}
+
+const svgPaths: string[] = glob.sync("**/*.svg", {cwd: SVG_DIR});
+const expected = svgPaths.map((p) => ({file: toFileBase(p), id: toIdentifier(p)}));
+
+describe("ui-kit icon generation integrity", () => {
+  test("every SVG has a corresponding AST file", () => {
+    const astFiles = new Set(listFiles(AST_DIR, ".ts"));
+    const missing = expected.filter((e) => !astFiles.has(e.file)).map((e) => e.file);
+    if (missing.length > 0) {
+      throw new Error(`Missing AST files. Run '${FIX_CMD}' to fix.\n${missing.join("\n")}`);
+    }
+  });
+
+  test("every SVG has a corresponding React file", () => {
+    const reactFiles = new Set(listFiles(REACT_DIR, ".tsx"));
+    const missing = expected.filter((e) => !reactFiles.has(e.file)).map((e) => e.file);
+    if (missing.length > 0) {
+      throw new Error(`Missing React files. Run '${FIX_CMD}' to fix.\n${missing.join("\n")}`);
+    }
+  });
+
+  test("no orphan AST files without source SVG", () => {
+    const expectedSet = new Set(expected.map((e) => e.file));
+    const orphans = listFiles(AST_DIR, ".ts").filter((name) => !expectedSet.has(name));
+    if (orphans.length > 0) {
+      throw new Error(`Orphan AST files (no source SVG). Run '${FIX_CMD}' to fix.\n${orphans.join("\n")}`);
+    }
+  });
+
+  test("no orphan React files without source SVG", () => {
+    const expectedSet = new Set(expected.map((e) => e.file));
+    const orphans = listFiles(REACT_DIR, ".tsx").filter((name) => !expectedSet.has(name));
+    if (orphans.length > 0) {
+      throw new Error(`Orphan React files (no source SVG). Run '${FIX_CMD}' to fix.\n${orphans.join("\n")}`);
+    }
+  });
+
+  test("react/index.tsx barrel exports match SVG sources exactly", () => {
+    const exports = readBarrelExports(REACT_DIR);
+    const errors: string[] = [];
+    for (const {id, file} of expected) {
+      if (!exports.has(id)) {
+        errors.push(`Missing export: ${id} from ./${file}`);
+      } else if (exports.get(id) !== file) {
+        errors.push(`Wrong path for ${id}: got ./${exports.get(id)}, expected ./${file}`);
+      }
+    }
+    const expectedIds = new Set(expected.map((e) => e.id));
+    for (const id of exports.keys()) {
+      if (!expectedIds.has(id)) {
+        errors.push(`Extra export: ${id}`);
+      }
+    }
+    if (errors.length > 0) {
+      throw new Error(`react/index.tsx barrel mismatch. Run '${FIX_CMD}' to fix.\n${errors.join("\n")}`);
+    }
+  });
+
+  test("ast/index.tsx barrel exports match SVG sources exactly", () => {
+    const exports = readBarrelExports(AST_DIR);
+    const errors: string[] = [];
+    for (const {id, file} of expected) {
+      if (!exports.has(id)) {
+        errors.push(`Missing export: ${id} from ./${file}`);
+      } else if (exports.get(id) !== file) {
+        errors.push(`Wrong path for ${id}: got ./${exports.get(id)}, expected ./${file}`);
+      }
+    }
+    const expectedIds = new Set(expected.map((e) => e.id));
+    for (const id of exports.keys()) {
+      if (!expectedIds.has(id)) {
+        errors.push(`Extra export: ${id}`);
+      }
+    }
+    if (errors.length > 0) {
+      throw new Error(`ast/index.tsx barrel mismatch. Run '${FIX_CMD}' to fix.\n${errors.join("\n")}`);
+    }
+  });
+
+  test("each React component file imports its matching AST module", () => {
+    const errors: string[] = [];
+    for (const {id, file} of expected) {
+      const reactPath = path.join(REACT_DIR, `${file}.tsx`);
+      const content = readFileSync(reactPath, "utf-8");
+      if (!content.includes(`from "../ast/${file}"`)) {
+        errors.push(`${file}.tsx: missing import from ../ast/${file}`);
+      }
+      if (!content.includes(`export default ${id}`)) {
+        errors.push(`${file}.tsx: missing 'export default ${id}'`);
+      }
+    }
+    if (errors.length > 0) {
+      throw new Error(`React component drift. Run '${FIX_CMD}' to fix.\n${errors.join("\n")}`);
+    }
+  });
+});