test: fix tests

Author: wangdicoder

packages/extract/src/extract-tokens.ts

@@ -1,17 +1,17 @@
 import * as fs from 'node:fs';
+import * as path from 'node:path';
 import type { TokenData, ExtractTokensOptions } from './types.js';
 
 // Map variable name prefixes to categories
 const CATEGORY_RULES: Array<{ test: (name: string) => boolean; category: string }> = [
-  { test: (n) => /^(box-)?shadow/.test(n), category: 'shadows' },
+  { test: (n) => /^shadow/.test(n), category: 'shadows' },
   { test: (n) => /^size-(xs|sm|md|lg|xl|xxl)$/.test(n), category: 'breakpoints' },
   { test: (n) => /^(font|line-height|heading|h\d-)/.test(n), category: 'typography' },
   { test: (n) => /^(spacer|height-)/.test(n), category: 'spacing' },
   {
     test: (n) =>
-      /color$/.test(n) ||
+      /^color-/.test(n) ||
       /^(white|black|gray|red|orange|yellow|green|teal|cyan|blue|indigo|purple|magenta)-/.test(n) ||
-      /^(info|success|warning|danger|primary)-/.test(n) ||
       /^(body-bg|body-color)/.test(n),
     category: 'colors',
   },
@@ -25,7 +25,6 @@ function categorize(name: string): string | null {
 }
 
 export function extractTokens(options: ExtractTokensOptions): TokenData {
-  const content = fs.readFileSync(options.variablesPath, 'utf-8');
   const result: TokenData = {
     colors: {},
     typography: {},
@@ -34,11 +33,13 @@ export function extractTokens(options: ExtractTokensOptions): TokenData {
     shadows: {},
   };
 
-  // Match SCSS variable declarations: $name: value !default;
+  const variablesContent = fs.readFileSync(options.variablesPath, 'utf-8');
+
+  // Parse SCSS variable declarations: $name: value !default;
   const varRegex = /^\$([a-z0-9-]+):\s*(.+?)\s*!default\s*;/gm;
   let match: RegExpExecArray | null;
 
-  while ((match = varRegex.exec(content)) !== null) {
+  while ((match = varRegex.exec(variablesContent)) !== null) {
     const name = match[1];
     const value = match[2];
     const category = categorize(name);
@@ -51,5 +52,30 @@ export function extractTokens(options: ExtractTokensOptions): TokenData {
     }
   }
 
+  // Also parse theme map files in the themes/ directory next to _variables.scss
+  const themesDir = path.join(path.dirname(options.variablesPath), 'themes');
+  const lightThemePath = path.join(themesDir, '_light.scss');
+
+  if (fs.existsSync(lightThemePath)) {
+    const themeContent = fs.readFileSync(lightThemePath, 'utf-8');
+
+    // Match map entries: key: value,
+    // Handles multi-value entries like shadows by matching up to the trailing comma
+    const mapEntryRegex = /^\s+([a-z0-9-]+):\s*(.+?),?\s*$/gm;
+
+    while ((match = mapEntryRegex.exec(themeContent)) !== null) {
+      const name = match[1];
+      const value = match[2].replace(/,\s*$/, '');
+      const category = categorize(name);
+
+      if (category && !result[category][name]) {
+        result[category][name] = {
+          variable: `--ty-${name}`,
+          value,
+        };
+      }
+    }
+  }
+
   return result;
 }

packages/mcp/__tests__/extract-tokens.test.ts

@@ -18,13 +18,13 @@ describe('extractTokens', () => {
   it('extracts color tokens', () => {
     const result = extractTokens({ variablesPath: VARIABLES_PATH });
 
-    expect(result.colors['primary-color']).toEqual({
-      variable: '$primary-color',
+    expect(result.colors['color-primary']).toEqual({
+      variable: '--ty-color-primary',
       value: '#6e41bf',
     });
 
-    expect(result.colors['info-color']).toEqual({
-      variable: '$info-color',
+    expect(result.colors['color-info']).toEqual({
+      variable: '--ty-color-info',
       value: '#1890ff',
     });
   });
@@ -33,7 +33,7 @@ describe('extractTokens', () => {
     const result = extractTokens({ variablesPath: VARIABLES_PATH });
 
     expect(result.typography['font-size-base']).toEqual({
-      variable: '$font-size-base',
+      variable: '--ty-font-size-base',
       value: '1rem',
     });
   });
@@ -51,6 +51,6 @@ describe('extractTokens', () => {
     const result = extractTokens({ variablesPath: VARIABLES_PATH });
 
     expect(result.shadows).toBeDefined();
-    expect(result.shadows['box-shadow-sm']).toBeDefined();
+    expect(result.shadows['shadow-sm']).toBeDefined();
   });
 });

packages/react/src/config-provider/scroll-lock.ts

@@ -14,7 +14,7 @@ function resolveScrollLockTarget(container?: HTMLElement | Window | null): HTMLE
     return document.body;
   }
 
-  return container;
+  return container as HTMLElement;
 }
 
 export function acquireScrollLock(container?: HTMLElement | Window | null): () => void {

packages/react/src/config-provider/types.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { StaticConfig } from './static-config';
 import { ConfigContextProps } from './config-context';
 
-export interface ConfigProviderProps extends ConfigContextProps {
+export interface ConfigProviderProps extends Omit<ConfigContextProps, 'theme'> {
   // Props accept both ThemeMode and ThemeConfig so callers can provide token overrides.
   // Context keeps `theme` normalized as ThemeMode and exposes ThemeConfig separately.
   theme?: ConfigContextProps['theme'] | import('./token-utils').ThemeConfig;

packages/react/src/copy-to-clipboard/types.ts

@@ -3,7 +3,7 @@ import { BaseProps } from '../_utils/props';
 
 export interface CopyToClipboardProps
   extends BaseProps,
-    React.PropsWithoutRef<JSX.IntrinsicElements['span']> {
+    Omit<React.PropsWithoutRef<JSX.IntrinsicElements['span']>, 'onCopy'> {
   text: string;
   onCopy?: (copied: boolean, text: string) => void;
   children?: React.ReactNode;