@accelint/design-system 1.1.5 → 1.1.7

package/dist/utils/props/index.d.ts

@@ -1,7 +1,6 @@
 import { AsType } from '../../types/generic.js';
 import { ClassNames } from '../../types/props.js';
 
-type Props<T extends object> = AsType<T> | null | undefined;
 /**
  * Deep merges classNames objects by concatenating class values
  *
@@ -13,7 +12,7 @@ declare function mergeClassNames<T extends ClassNames>(...classNamesToMerge: (T
 /**
  * Extends the base margeProps functionality to also merge styles and handle class/style render props
  */
-declare function mergeProps<T extends object>(...propsToMerge: Props<T>[]): T;
+declare function mergeProps<T extends object>(...propsToMerge: AsType<T>[]): T;
 /**
  * A helper for not having to reimplement the type check for a renderProp value being a function or not everywhere
  */

package/dist/utils/props/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utils/props/index.ts"],"names":["mergePropsWithoutStyles"],"mappings":"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","file":"index.js","sourcesContent":["/*\n * Copyright 2025 Hypergiant Galactic Systems Inc. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport { mergeProps as mergePropsWithoutStyles } from '@react-aria/utils';\nimport { clsx } from 'clsx';\nimport mergeWith from 'lodash/mergeWith';\nimport { composeRenderProps } from 'react-aria-components';\nimport { z } from 'zod';\nimport type { CSSProperties } from 'react';\nimport type { AsType } from '../../types/generic';\nimport type { ClassNames } from '../../types/props';\nimport type {\n  ClassNameRenderProps,\n  RenderProps,\n  StylePropRenderProps,\n} from '../../types/react-aria';\n\ntype Props<T extends object> = AsType<T> | null | undefined;\n\n/**\n * Recursively process merging of all class name render props\n */\nfunction processClassNameRenderProps<T extends RenderProps<object>>(\n  value: string,\n  renderProps: ClassNameRenderProps<object>,\n  ...propsToMerge: Props<T>[]\n): string {\n  if (!propsToMerge.length) {\n    return '';\n  }\n\n  const [props, ...rest] = propsToMerge;\n\n  return clsx(\n    value,\n    composeRenderProps<string, ClassNameRenderProps<object>, string>(\n      props?.className ?? '',\n      (prev) => processClassNameRenderProps(prev, renderProps, ...rest),\n    )(renderProps),\n  );\n}\n\n/**\n * Compose class name render props to be processed and merged\n */\nfunction mergeRenderClassName<T extends RenderProps<object>>(\n  ...propsToMerge: Props<T>[]\n) {\n  return composeRenderProps<string, ClassNameRenderProps<object>, string>(\n    (renderProps) => renderProps.defaultClassName ?? '',\n    (prev, renderProps) =>\n      processClassNameRenderProps(prev, renderProps, ...propsToMerge),\n  );\n}\n\n/**\n * Merge static class names\n */\nfunction mergeStaticClassName<T extends RenderProps<object>>(\n  ...propsToMerge: Props<T>[]\n) {\n  return clsx(\n    propsToMerge.reduce<string[]>((acc, props) => {\n      if (typeof props?.className !== 'string') {\n        return acc;\n      }\n\n      acc.push(props.className);\n\n      return acc;\n    }, []),\n  );\n}\n\n/**\n * Determine if a static or composed merge of class names is necesary based on the presence of functions\n */\nfunction mergeClassNameProps<T extends RenderProps<object>>(\n  ...propsToMerge: Props<T>[]\n) {\n  const anyFunctions = propsToMerge.some(\n    (props) => typeof props?.className === 'function',\n  );\n\n  const anyPrimitives = propsToMerge.some(\n    (props) => typeof props?.className === 'string',\n  );\n\n  if (!(anyFunctions || anyPrimitives)) {\n    return undefined;\n  }\n\n  return anyFunctions\n    ? mergeRenderClassName(...propsToMerge)\n    : mergeStaticClassName(...propsToMerge);\n}\n\nconst classNamesValidator: z.ZodType<ClassNames> = z.record(\n  z.string(),\n  z.union([z.string(), z.lazy(() => classNamesValidator)]),\n);\n\nconst propsValidator = z.object({\n  classNames: classNamesValidator,\n});\n\n/**\n * Deep merges classNames objects within props\n */\nfunction mergeClassNamesProps<T extends object>(...propsToMerge: Props<T>[]) {\n  return propsToMerge.reduce<ClassNames | undefined>((acc, props) => {\n    const result = propsValidator.safeParse(props);\n\n    if (result.success) {\n      return acc\n        ? mergeWith(acc, result.data.classNames, (accValue, srcValue) =>\n            (!accValue || typeof accValue === 'string') &&\n            (!srcValue || typeof srcValue === 'string')\n              ? clsx(accValue, srcValue)\n              : undefined,\n          )\n        : result.data.classNames;\n    }\n\n    return acc;\n  }, undefined);\n}\n\n/**\n * Deep merges classNames objects by concatenating class values\n *\n * @example\n * mergeClassNames({ foo: 'foo' }, { foo: 'FOO', bar: 'bar' })\n * // returns { foo: 'foo FOO', bar: 'bar' }\n */\nexport function mergeClassNames<T extends ClassNames>(\n  ...classNamesToMerge: (T | null | undefined)[]\n) {\n  return mergeClassNamesProps(\n    ...classNamesToMerge.map((classNames) => ({ classNames })),\n  ) as T | undefined;\n}\n\n/**\n * Recursively process merging of all style render props\n */\nfunction processStyleRenderProps<T extends RenderProps<object>>(\n  value: CSSProperties,\n  renderProps: StylePropRenderProps<object>,\n  ...propsToMerge: Props<T>[]\n): CSSProperties {\n  if (!propsToMerge.length) {\n    return {};\n  }\n\n  const [props, ...rest] = propsToMerge;\n\n  return {\n    ...value,\n    ...composeRenderProps<\n      CSSProperties,\n      StylePropRenderProps<object>,\n      CSSProperties\n    >(props?.style ?? {}, (prev) =>\n      processStyleRenderProps(prev, renderProps, ...rest),\n    )(renderProps),\n  };\n}\n\n/**\n * Compose style render props to be processed and merged\n */\nfunction mergeRenderStyle<T extends RenderProps<object>>(\n  ...propsToMerge: Props<T>[]\n) {\n  return composeRenderProps<\n    CSSProperties,\n    StylePropRenderProps<object>,\n    CSSProperties\n  >(\n    (renderProps) => renderProps.defaultStyle ?? {},\n    (prev, renderProps) =>\n      processStyleRenderProps(prev, renderProps, ...propsToMerge),\n  );\n}\n\n/**\n * Merge static styles\n */\nfunction mergeStaticStyle<T extends RenderProps<object>>(\n  ...propsToMerge: Props<T>[]\n) {\n  return propsToMerge.reduce<CSSProperties>((acc, props) => {\n    if (!props?.style) {\n      return acc;\n    }\n\n    return Object.assign({}, acc, props.style);\n  }, {});\n}\n\n/**\n * Determine if a static or composed merge of styles is necesary based on the presence of functions\n */\nfunction mergeStyleProps<T extends RenderProps<object>>(\n  ...propsToMerge: Props<T>[]\n) {\n  const anyFunctions = propsToMerge.some(\n    (props) => typeof props?.style === 'function',\n  );\n\n  const anyObjects = propsToMerge.some(\n    (props) => typeof props?.style === 'object' && props.style != null,\n  );\n\n  if (!(anyFunctions || anyObjects)) {\n    return undefined;\n  }\n\n  return anyFunctions\n    ? mergeRenderStyle(...propsToMerge)\n    : mergeStaticStyle(...propsToMerge);\n}\n\n/**\n * Extends the base margeProps functionality to also merge styles and handle class/style render props\n */\nexport function mergeProps<T extends object>(...propsToMerge: Props<T>[]): T {\n  const className = mergeClassNameProps(...propsToMerge);\n  const classNames = mergeClassNamesProps(...propsToMerge);\n  const style = mergeStyleProps(...propsToMerge);\n\n  return {\n    ...(mergePropsWithoutStyles(...propsToMerge) as T),\n    ...(className ? { className } : {}),\n    ...(classNames ? { classNames } : {}),\n    ...(style ? { style } : {}),\n  };\n}\n\n/**\n * A helper for not having to reimplement the type check for a renderProp value being a function or not everywhere\n */\nexport function callRenderProps<T extends object, R>(\n  value: R | ((renderProps: T) => R),\n  values: T,\n) {\n  if (typeof value === 'function') {\n    return (value as (renderProps: T) => R)(values);\n  }\n\n  return value;\n}\n\n/**\n * A helper function to pair with React Aria's render props. Typically\n * implemented with children, className and styles\n *\n * Allows for the injection of additional renderProps that a component\n * from React Aria may not already provide\n *\n * If the value isn't a renderProp function, then it is passed through unchanged\n */\nexport function wrapRenderProps<T extends object, U extends object, R>(\n  value: R | ((renderProps: T & U) => R),\n  inject?: U,\n) {\n  if (typeof value === 'function') {\n    return (renderProps: T) =>\n      (value as (renderProps: T & U) => R)({\n        ...renderProps,\n        ...inject,\n      } as T & U);\n  }\n\n  return value;\n}\n"]}
+{"version":3,"sources":["../../../src/utils/props/index.ts"],"names":["mergePropsWithoutStyles"],"mappings":"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","file":"index.js","sourcesContent":["/*\n * Copyright 2025 Hypergiant Galactic Systems Inc. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at https://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport { mergeProps as mergePropsWithoutStyles } from '@react-aria/utils';\nimport { clsx } from 'clsx';\nimport mergeWith from 'lodash/mergeWith';\nimport { composeRenderProps } from 'react-aria-components';\nimport { z } from 'zod';\nimport type { CSSProperties } from 'react';\nimport type { AsType } from '../../types/generic';\nimport type { ClassNames } from '../../types/props';\nimport type {\n  ClassNameRenderProps,\n  RenderProps,\n  StylePropRenderProps,\n} from '../../types/react-aria';\n\ntype Props<T extends object> = AsType<T> | null | undefined;\n\n/**\n * Recursively process merging of all class name render props\n */\nfunction processClassNameRenderProps<T extends RenderProps<object>>(\n  value: string,\n  renderProps: ClassNameRenderProps<object>,\n  ...propsToMerge: Props<T>[]\n): string {\n  if (!propsToMerge.length) {\n    return '';\n  }\n\n  const [props, ...rest] = propsToMerge;\n\n  return clsx(\n    value,\n    composeRenderProps<string, ClassNameRenderProps<object>, string>(\n      props?.className ?? '',\n      (prev) => processClassNameRenderProps(prev, renderProps, ...rest),\n    )(renderProps),\n  );\n}\n\n/**\n * Compose class name render props to be processed and merged\n */\nfunction mergeRenderClassName<T extends RenderProps<object>>(\n  ...propsToMerge: Props<T>[]\n) {\n  return composeRenderProps<string, ClassNameRenderProps<object>, string>(\n    (renderProps) => renderProps.defaultClassName ?? '',\n    (prev, renderProps) =>\n      processClassNameRenderProps(prev, renderProps, ...propsToMerge),\n  );\n}\n\n/**\n * Merge static class names\n */\nfunction mergeStaticClassName<T extends RenderProps<object>>(\n  ...propsToMerge: Props<T>[]\n) {\n  return clsx(\n    propsToMerge.reduce<string[]>((acc, props) => {\n      if (typeof props?.className !== 'string') {\n        return acc;\n      }\n\n      acc.push(props.className);\n\n      return acc;\n    }, []),\n  );\n}\n\n/**\n * Determine if a static or composed merge of class names is necesary based on the presence of functions\n */\nfunction mergeClassNameProps<T extends RenderProps<object>>(\n  ...propsToMerge: Props<T>[]\n) {\n  const anyFunctions = propsToMerge.some(\n    (props) => typeof props?.className === 'function',\n  );\n\n  const anyPrimitives = propsToMerge.some(\n    (props) => typeof props?.className === 'string',\n  );\n\n  if (!(anyFunctions || anyPrimitives)) {\n    return undefined;\n  }\n\n  return anyFunctions\n    ? mergeRenderClassName(...propsToMerge)\n    : mergeStaticClassName(...propsToMerge);\n}\n\nconst classNamesValidator: z.ZodType<ClassNames> = z.record(\n  z.string(),\n  z.union([z.string(), z.lazy(() => classNamesValidator)]),\n);\n\nconst propsValidator = z.object({\n  classNames: classNamesValidator,\n});\n\n/**\n * Deep merges classNames objects within props\n */\nfunction mergeClassNamesProps<T extends object>(...propsToMerge: Props<T>[]) {\n  return propsToMerge.reduce<ClassNames | undefined>((acc, props) => {\n    const result = propsValidator.safeParse(props);\n\n    if (result.success) {\n      return acc\n        ? mergeWith(acc, result.data.classNames, (accValue, srcValue) =>\n            (!accValue || typeof accValue === 'string') &&\n            (!srcValue || typeof srcValue === 'string')\n              ? clsx(accValue, srcValue)\n              : undefined,\n          )\n        : result.data.classNames;\n    }\n\n    return acc;\n  }, undefined);\n}\n\n/**\n * Deep merges classNames objects by concatenating class values\n *\n * @example\n * mergeClassNames({ foo: 'foo' }, { foo: 'FOO', bar: 'bar' })\n * // returns { foo: 'foo FOO', bar: 'bar' }\n */\nexport function mergeClassNames<T extends ClassNames>(\n  ...classNamesToMerge: (T | null | undefined)[]\n) {\n  return mergeClassNamesProps(\n    ...classNamesToMerge.map((classNames) => ({ classNames })),\n  ) as T | undefined;\n}\n\n/**\n * Recursively process merging of all style render props\n */\nfunction processStyleRenderProps<T extends RenderProps<object>>(\n  value: CSSProperties,\n  renderProps: StylePropRenderProps<object>,\n  ...propsToMerge: Props<T>[]\n): CSSProperties {\n  if (!propsToMerge.length) {\n    return {};\n  }\n\n  const [props, ...rest] = propsToMerge;\n\n  return {\n    ...value,\n    ...composeRenderProps<\n      CSSProperties,\n      StylePropRenderProps<object>,\n      CSSProperties\n    >(props?.style ?? {}, (prev) =>\n      processStyleRenderProps(prev, renderProps, ...rest),\n    )(renderProps),\n  };\n}\n\n/**\n * Compose style render props to be processed and merged\n */\nfunction mergeRenderStyle<T extends RenderProps<object>>(\n  ...propsToMerge: Props<T>[]\n) {\n  return composeRenderProps<\n    CSSProperties,\n    StylePropRenderProps<object>,\n    CSSProperties\n  >(\n    (renderProps) => renderProps.defaultStyle ?? {},\n    (prev, renderProps) =>\n      processStyleRenderProps(prev, renderProps, ...propsToMerge),\n  );\n}\n\n/**\n * Merge static styles\n */\nfunction mergeStaticStyle<T extends RenderProps<object>>(\n  ...propsToMerge: Props<T>[]\n) {\n  return propsToMerge.reduce<CSSProperties>((acc, props) => {\n    if (!props?.style) {\n      return acc;\n    }\n\n    return Object.assign({}, acc, props.style);\n  }, {});\n}\n\n/**\n * Determine if a static or composed merge of styles is necesary based on the presence of functions\n */\nfunction mergeStyleProps<T extends RenderProps<object>>(\n  ...propsToMerge: Props<T>[]\n) {\n  const anyFunctions = propsToMerge.some(\n    (props) => typeof props?.style === 'function',\n  );\n\n  const anyObjects = propsToMerge.some(\n    (props) => typeof props?.style === 'object' && props.style != null,\n  );\n\n  if (!(anyFunctions || anyObjects)) {\n    return undefined;\n  }\n\n  return anyFunctions\n    ? mergeRenderStyle(...propsToMerge)\n    : mergeStaticStyle(...propsToMerge);\n}\n\n/**\n * Extends the base margeProps functionality to also merge styles and handle class/style render props\n */\nexport function mergeProps<T extends object>(...propsToMerge: AsType<T>[]): T {\n  const className = mergeClassNameProps(...propsToMerge);\n  const classNames = mergeClassNamesProps(...propsToMerge);\n  const style = mergeStyleProps(...propsToMerge);\n\n  return {\n    ...(mergePropsWithoutStyles(...propsToMerge) as T),\n    ...(className ? { className } : {}),\n    ...(classNames ? { classNames } : {}),\n    ...(style ? { style } : {}),\n  };\n}\n\n/**\n * A helper for not having to reimplement the type check for a renderProp value being a function or not everywhere\n */\nexport function callRenderProps<T extends object, R>(\n  value: R | ((renderProps: T) => R),\n  values: T,\n) {\n  if (typeof value === 'function') {\n    return (value as (renderProps: T) => R)(values);\n  }\n\n  return value;\n}\n\n/**\n * A helper function to pair with React Aria's render props. Typically\n * implemented with children, className and styles\n *\n * Allows for the injection of additional renderProps that a component\n * from React Aria may not already provide\n *\n * If the value isn't a renderProp function, then it is passed through unchanged\n */\nexport function wrapRenderProps<T extends object, U extends object, R>(\n  value: R | ((renderProps: T & U) => R),\n  inject?: U,\n) {\n  if (typeof value === 'function') {\n    return (renderProps: T) =>\n      (value as (renderProps: T & U) => R)({\n        ...renderProps,\n        ...inject,\n      } as T & U);\n  }\n\n  return value;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@accelint/design-system",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "private": false,
   "license": "Apache-2.0",
   "repository": {
@@ -42,22 +42,22 @@
     }
   },
   "peerDependencies": {
-    "@internationalized/date": "^3.8.0",
-    "@react-aria/collections": "^3.0.0",
-    "@react-aria/datepicker": "^3.14.5",
-    "@react-aria/dnd": "^3.10.1",
-    "@react-aria/focus": "^3.20.5",
-    "@react-aria/i18n": "^3.12.10",
-    "@react-aria/interactions": "^3.25.3",
-    "@react-aria/menu": "^3.19.3",
-    "@react-aria/overlays": "^3.27.3",
-    "@react-aria/ssr": "^3.9.6",
-    "@react-aria/utils": "^3.29.1",
-    "@react-stately/data": "^3.13.1",
-    "@react-stately/datepicker": "^3.14.2",
-    "@react-stately/overlays": "^3.6.17",
-    "@react-stately/utils": "^3.10.7",
-    "@react-types/shared": "^3.31.0",
+    "@internationalized/date": "^3.9.0",
+    "@react-aria/collections": "~3.0.0",
+    "@react-aria/datepicker": "~3.14.5",
+    "@react-aria/dnd": "~3.11.2",
+    "@react-aria/focus": "~3.20.5",
+    "@react-aria/i18n": "~3.12.10",
+    "@react-aria/interactions": "~3.26.0",
+    "@react-aria/menu": "~3.19.3",
+    "@react-aria/overlays": "~3.29.1",
+    "@react-aria/ssr": "~3.9.10",
+    "@react-aria/utils": "~3.29.1",
+    "@react-stately/data": "~3.13.2",
+    "@react-stately/datepicker": "~3.14.2",
+    "@react-stately/overlays": "~3.6.17",
+    "@react-stately/utils": "~3.10.8",
+    "@react-types/shared": "~3.32.0",
     "react": "19.0.1",
     "react-aria-components": "1.12.1",
     "react-dom": "19.0.1",
@@ -66,39 +66,39 @@
   "devDependencies": {
     "@accelint/biome-config": "1.0.2",
     "@accelint/typescript-config": "0.1.4",
-    "@accelint/vitest-config": "0.1.3",
+    "@accelint/vitest-config": "0.1.6",
     "@fontsource-variable/roboto-flex": "^5.2.8",
     "@fontsource-variable/roboto-mono": "^5.2.8",
     "@ladle/react": "^5.1.1",
-    "@testing-library/dom": "10.4.0",
-    "@testing-library/jest-dom": "6.6.3",
-    "@testing-library/react": "16.3.0",
+    "@testing-library/dom": "10.4.1",
+    "@testing-library/jest-dom": "6.9.1",
+    "@testing-library/react": "16.3.1",
     "@testing-library/user-event": "14.6.1",
     "@types/lodash": "4.17.10",
     "@types/react": "19.0.0",
     "@types/react-dom": "19.0.0",
-    "@vanilla-extract/esbuild-plugin": "^2.3.18",
-    "@vanilla-extract/vite-plugin": "^5.1.1",
-    "autoprefixer": "10.4.20",
-    "esbuild-plugin-file-path-extensions": "2.1.3",
+    "@vanilla-extract/esbuild-plugin": "^2.3.21",
+    "@vanilla-extract/vite-plugin": "^5.1.4",
+    "autoprefixer": "10.4.23",
+    "esbuild-plugin-file-path-extensions": "2.1.4",
     "esbuild-plugin-lodash": "1.2.0",
     "jsdom": "25.0.1",
     "postcss": "8.4.47",
     "react-querybuilder": "^8.10.0",
-    "tsup": "8.5.0",
-    "vite": "^6.4.1",
-    "vitest": "2.1.9"
+    "tsup": "8.5.1",
+    "vite": "~7.3.1",
+    "vitest": "4.0.16"
   },
   "dependencies": {
-    "@accelint/converters": "0.3.4",
-    "@accelint/core": "0.5.0",
-    "@vanilla-extract/css": "1.16.0",
-    "@vanilla-extract/dynamic": "2.1.2",
+    "@accelint/converters": "0.3.6",
+    "@accelint/core": "0.5.2",
+    "@vanilla-extract/css": "1.18.0",
+    "@vanilla-extract/dynamic": "2.1.5",
     "clsx": "2.1.1",
     "lodash": "4.17.21",
     "type-fest": "4.41.0",
     "typescript": "5.9.3",
-    "zod": "4.1.12"
+    "zod": "4.3.5"
   },
   "$schema": "https://json.schemastore.org/package",
   "author": "https://hypergiant.com",
@@ -107,13 +107,13 @@
   },
   "sideEffects": false,
   "scripts": {
-    "bench": "pnpm vitest bench --run --dir src",
+    "bench": "vitest bench --run --dir src",
     "build": "rm -rf dist && pnpm tsup --config=tsup.css.config.ts && rm -f dist/index.js && pnpm tsup",
     "dev": "pnpm tsc --watch",
-    "index": "pnpm zx ../scripts/indexer.mjs design-system --barrels",
-    "lint": "pnpm biome lint",
-    "lint:fix": "pnpm biome lint --write",
-    "preview": "pnpm ladle serve",
-    "test": "pnpm vitest --dir=src"
+    "index": "zx ../scripts/indexer.mjs design-system --barrels && biome check src/index.ts --write",
+    "lint": "biome check .",
+    "lint:fix": "biome check . --write",
+    "preview": "ladle serve",
+    "test": "vitest --dir=src"
   }
 }