@dr.pogodin/react-utils 1.33.2 → 1.33.4

package/build/types-code/server/index.d.ts

@@ -4,9 +4,9 @@ import 'source-map-support/register';
 import http from 'http';
 import 'raf/polyfill';
 import { type Configuration } from 'webpack';
-import { type OptionsT as ServerOptionsT } from './server';
-export { getDefaultCspSettings, } from './server';
-export { errors } from './utils';
+import { type OptionsT as ServerOptionsT, getDefaultCspSettings } from './server';
+import { errors } from './utils';
+export { errors, getDefaultCspSettings };
 type OptionsT = ServerOptionsT & {
     https?: {
         cert: string;
@@ -141,5 +141,7 @@ declare function launchServer(webpackConfig: Configuration, options: OptionsT):
 }>;
 declare namespace launchServer {
     var SCRIPT_LOCATIONS: typeof import("./renderer").SCRIPT_LOCATIONS;
+    var getDefaultCspSettings: typeof import("./server").getDefaultCspSettings;
+    var errors: typeof import("./utils/errors");
 }
 export default launchServer;

package/build/types-code/shared/components/selectors/CustomDropdown/Options/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { type OptionT, type OptionsT } from '../../common';
+import { type OptionT, type OptionsT, type ValueT } from '../../common';
 export type ContainerPosT = {
     left: number;
     top: number;
@@ -12,11 +12,11 @@ export type RefT = {
 type PropsT = {
     containerClass: string;
     containerStyle?: ContainerPosT;
-    filter?: (item: OptionT<React.ReactNode> | string) => boolean;
+    filter?: (item: OptionT<React.ReactNode> | ValueT) => boolean;
     optionClass: string;
     options: OptionsT<React.ReactNode>;
     onCancel: () => void;
-    onChange: (value: string) => void;
+    onChange: (value: ValueT) => void;
 };
 declare const Options: React.ForwardRefExoticComponent<PropsT & React.RefAttributes<RefT>>;
 export default Options;

package/build/types-code/shared/components/selectors/CustomDropdown/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-import { type PropsT } from '../common';
-declare const ThemedCustomDropdown: import("@dr.pogodin/react-themes").ThemedComponent<PropsT<React.ReactNode, (value: string) => void>>;
+import { type PropsT, type ValueT } from '../common';
+declare const ThemedCustomDropdown: import("@dr.pogodin/react-themes").ThemedComponent<PropsT<React.ReactNode, (value: ValueT) => void>>;
 export default ThemedCustomDropdown;

package/build/types-code/shared/components/selectors/Switch/index.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="react" />
 import { type Theme } from '@dr.pogodin/react-themes';
-import { type OptionsT } from '../common';
+import { type OptionsT, type ValueT } from '../common';
 declare const validThemeKeys: readonly ["container", "label", "option", "options", "selected"];
 type PropsT = {
     label?: React.ReactNode;
-    onChange?: (value: string) => void;
+    onChange?: (value: ValueT) => void;
     options?: Readonly<OptionsT<React.ReactNode>>;
     theme: Theme<typeof validThemeKeys>;
-    value?: string;
+    value?: ValueT;
 };
 declare const ThemedSwitch: import("@dr.pogodin/react-themes").ThemedComponent<PropsT>;
 export default ThemedSwitch;

package/build/types-code/shared/components/selectors/common.d.ts

@@ -2,22 +2,24 @@
 import PT from 'prop-types';
 import type { Theme } from '@dr.pogodin/react-themes';
 export declare const validThemeKeys: readonly ["active", "arrow", "container", "dropdown", "hiddenOption", "label", "option", "select", "upward"];
+export type ValueT = number | string;
+export declare const valueValidator: PT.Requireable<ValueT>;
 export type OptionT<NameT> = {
     name?: NameT | null;
-    value: string;
+    value: ValueT;
 };
-export type OptionsT<NameT> = Array<OptionT<NameT> | string>;
+export type OptionsT<NameT> = Array<OptionT<NameT> | ValueT>;
 export type PropsT<NameT, OnChangeT = React.ChangeEventHandler<HTMLSelectElement>> = {
-    filter?: (item: OptionT<NameT> | string) => boolean;
+    filter?: (item: OptionT<NameT> | ValueT) => boolean;
     label?: React.ReactNode;
     onChange?: OnChangeT;
     options?: OptionsT<NameT>;
     theme: Theme<typeof validThemeKeys>;
-    value?: string;
+    value?: ValueT;
 };
-export declare const optionValidator: PT.Requireable<OptionT<React.ReactNode> | string>;
-export declare const optionsValidator: PT.Requireable<NonNullable<string | OptionT<React.ReactNode>>[]>;
-export declare const stringOptionValidator: PT.Requireable<OptionT<string> | string>;
-export declare const stringOptionsValidator: PT.Requireable<NonNullable<string | OptionT<string>>[]>;
+export declare const optionValidator: PT.Requireable<OptionT<React.ReactNode> | ValueT>;
+export declare const optionsValidator: PT.Requireable<NonNullable<ValueT | OptionT<React.ReactNode>>[]>;
+export declare const stringOptionValidator: PT.Requireable<OptionT<string> | ValueT>;
+export declare const stringOptionsValidator: PT.Requireable<NonNullable<ValueT | OptionT<string>>[]>;
 /** Returns option value and name as a tuple. */
-export declare function optionValueName<NameT>(option: OptionT<NameT> | string): [string, NameT | string];
+export declare function optionValueName<NameT>(option: OptionT<NameT> | ValueT): [ValueT, NameT | ValueT];

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.33.2",
+  "version": "1.33.4",
   "bin": {
     "react-utils-build": "bin/build.js",
     "react-utils-setup": "bin/setup.js"
@@ -88,7 +88,7 @@
     "babel-loader": "^9.1.3",
     "babel-plugin-module-resolver": "^5.0.0",
     "core-js": "^3.36.1",
-    "css-loader": "^7.0.0",
+    "css-loader": "^7.1.0",
     "css-minimizer-webpack-plugin": "^6.0.0",
     "eslint": "^8.57.0",
     "eslint-config-airbnb": "^19.0.4",
@@ -123,7 +123,7 @@
     "tsc-alias": "^1.8.8",
     "typed-scss-modules": "^8.0.1",
     "typescript": "^5.4.4",
-    "typescript-eslint": "^7.5.0",
+    "typescript-eslint": "^7.6.0",
     "webpack": "^5.91.0",
     "webpack-dev-middleware": "^7.2.1",
     "webpack-hot-middleware": "^2.26.1",

package/src/server/index.ts

@@ -17,14 +17,16 @@ import 'raf/polyfill';
 
 import { type Configuration } from 'webpack';
 
-import serverFactory, { type OptionsT as ServerOptionsT } from './server';
-import { SCRIPT_LOCATIONS, newDefaultLogger } from './renderer';
-
-export {
+import serverFactory, {
+  type OptionsT as ServerOptionsT,
   getDefaultCspSettings,
 } from './server';
 
-export { errors } from './utils';
+import { SCRIPT_LOCATIONS, newDefaultLogger } from './renderer';
+
+import { errors } from './utils';
+
+export { errors, getDefaultCspSettings };
 
 /**
  * Normalizes a port into a number, string, or false.
@@ -228,3 +230,5 @@ export default async function launchServer(webpackConfig: Configuration, options
 }
 
 launchServer.SCRIPT_LOCATIONS = SCRIPT_LOCATIONS;
+launchServer.getDefaultCspSettings = getDefaultCspSettings;
+launchServer.errors = errors;

package/src/shared/components/selectors/CustomDropdown/Options/index.tsx

@@ -8,6 +8,7 @@ import S from './style.scss';
 import {
   type OptionT,
   type OptionsT,
+  type ValueT,
   optionsValidator,
   optionValueName,
 } from '../../common';
@@ -29,11 +30,11 @@ export type RefT = {
 type PropsT = {
   containerClass: string;
   containerStyle?: ContainerPosT;
-  filter?: (item: OptionT<React.ReactNode> | string) => boolean;
+  filter?: (item: OptionT<React.ReactNode> | ValueT) => boolean;
   optionClass: string;
   options: OptionsT<React.ReactNode>;
   onCancel: () => void;
-  onChange: (value: string) => void;
+  onChange: (value: ValueT) => void;
 };
 
 const Options = forwardRef<RefT, PropsT>(({

package/src/shared/components/selectors/CustomDropdown/index.tsx

@@ -9,13 +9,15 @@ import defaultTheme from './theme.scss';
 
 import {
   type PropsT,
+  type ValueT,
   optionValidator,
   optionValueName,
   validThemeKeys,
+  valueValidator,
 } from '../common';
 
 const BaseCustomDropdown: React.FunctionComponent<
-PropsT<React.ReactNode, (value: string) => void>
+PropsT<React.ReactNode, (value: ValueT) => void>
 > = ({
   filter,
   label,
@@ -166,7 +168,7 @@ BaseCustomDropdown.propTypes = {
   onChange: PT.func,
   options: PT.arrayOf(optionValidator.isRequired),
   theme: ThemedCustomDropdown.themeType.isRequired,
-  value: PT.string,
+  value: valueValidator,
 };
 
 BaseCustomDropdown.defaultProps = {

package/src/shared/components/selectors/NativeDropdown/index.tsx

@@ -11,6 +11,7 @@ import {
   optionValueName,
   stringOptionsValidator,
   validThemeKeys,
+  valueValidator,
 } from '../common';
 
 /**
@@ -104,7 +105,7 @@ Dropdown.propTypes = {
   onChange: PT.func,
   options: stringOptionsValidator,
   theme: ThemedDropdown.themeType.isRequired,
-  value: PT.string,
+  value: valueValidator,
 };
 
 Dropdown.defaultProps = {

package/src/shared/components/selectors/Switch/index.tsx

@@ -1,7 +1,13 @@
 import PT from 'prop-types';
 import themed, { type Theme } from '@dr.pogodin/react-themes';
 
-import { type OptionsT, optionsValidator, optionValueName } from '../common';
+import {
+  type OptionsT,
+  type ValueT,
+  optionsValidator,
+  optionValueName,
+  valueValidator,
+} from '../common';
 
 import defaultTheme from './theme.scss';
 
@@ -15,10 +21,10 @@ const validThemeKeys = [
 
 type PropsT = {
   label?: React.ReactNode;
-  onChange?: (value: string) => void;
+  onChange?: (value: ValueT) => void;
   options?: Readonly<OptionsT<React.ReactNode>>;
   theme: Theme<typeof validThemeKeys>;
-  value?: string;
+  value?: ValueT;
 };
 
 const BaseSwitch: React.FunctionComponent<PropsT> = ({
@@ -81,7 +87,7 @@ BaseSwitch.propTypes = {
   onChange: PT.func,
   options: optionsValidator,
   theme: ThemedSwitch.themeType.isRequired,
-  value: PT.string,
+  value: valueValidator,
 };
 
 BaseSwitch.defaultProps = {

package/src/shared/components/selectors/common.ts

@@ -19,52 +19,66 @@ export const validThemeKeys = [
   'upward',
 ] as const;
 
+export type ValueT = number | string;
+
+export const valueValidator: PT.Requireable<ValueT> = PT.oneOfType([
+  PT.number.isRequired,
+  PT.string.isRequired,
+]);
+
 export type OptionT<NameT> = {
   name?: NameT | null;
-  value: string;
+  value: ValueT;
 };
 
-export type OptionsT<NameT> = Array<OptionT<NameT> | string>;
+export type OptionsT<NameT> = Array<OptionT<NameT> | ValueT>;
 
 export type PropsT<
   NameT,
   OnChangeT = React.ChangeEventHandler<HTMLSelectElement>,
 > = {
-  filter?: (item: OptionT<NameT> | string) => boolean;
+  filter?: (item: OptionT<NameT> | ValueT) => boolean;
   label?: React.ReactNode;
   onChange?: OnChangeT;
   options?: OptionsT<NameT>;
   theme: Theme<typeof validThemeKeys>;
-  value?: string;
+  value?: ValueT;
 };
 
 export const optionValidator:
-PT.Requireable<OptionT<React.ReactNode> | string> = PT.oneOfType([
+PT.Requireable<OptionT<React.ReactNode> | ValueT> = PT.oneOfType([
   PT.shape({
     name: PT.node,
-    value: PT.string.isRequired,
+    value: valueValidator.isRequired,
   }).isRequired,
+  PT.number.isRequired,
   PT.string.isRequired,
 ]);
 
 export const optionsValidator = PT.arrayOf(optionValidator.isRequired);
 
 export const stringOptionValidator:
-PT.Requireable<OptionT<string> | string> = PT.oneOfType([
+PT.Requireable<OptionT<string> | ValueT> = PT.oneOfType([
   PT.shape({
     name: PT.string,
-    value: PT.string.isRequired,
+    value: valueValidator.isRequired,
   }).isRequired,
+  PT.number.isRequired,
   PT.string.isRequired,
 ]);
 
 export const stringOptionsValidator = PT.arrayOf(stringOptionValidator.isRequired);
 
+function isValue<T>(x: OptionT<T> | ValueT): x is ValueT {
+  const type = typeof x;
+  return type === 'number' || type === 'string';
+}
+
 /** Returns option value and name as a tuple. */
 export function optionValueName<NameT>(
-  option: OptionT<NameT> | string,
-): [string, NameT | string] {
-  return typeof option === 'string'
+  option: OptionT<NameT> | ValueT,
+): [ValueT, NameT | ValueT] {
+  return isValue(option)
     ? [option, option]
     : [option.value, option.name ?? option.value];
 }

package/src/shared/utils/webpack.ts

@@ -23,8 +23,11 @@ export function requireWeak(
     if (!def) return named;
 
     Object.entries(named).forEach(([key, value]) => {
-      if (def[key]) throw Error('Conflict between default and named exports');
-      def[key] = value;
+      if (def[key]) {
+        if (def[key] !== value) {
+          throw Error('Conflict between default and named exports');
+        }
+      } else def[key] = value;
     });
     return def;
   } catch {