@eslint-react/shared 1.12.1 → 1.12.2-beta.5

package/dist/index.js

@@ -377,6 +377,25 @@ function boolean(message) {
     }
   };
 }
+function instance(class_, message) {
+  return {
+    kind: "schema",
+    type: "instance",
+    reference: instance,
+    expects: class_.name,
+    async: false,
+    class: class_,
+    message,
+    _run(dataset, config2) {
+      if (dataset.value instanceof this.class) {
+        dataset.typed = true;
+      } else {
+        _addIssue(this, "type", dataset, config2);
+      }
+      return dataset;
+    }
+  };
+}
 function object(entries, message) {
   return {
     kind: "schema",
@@ -550,6 +569,13 @@ var CustomComponentSchema = object({
    */
   attributes: optional(array(CustomAttributeSchema), [])
 });
+var CustomComponentNormalizedSchema = object({
+  name: string(),
+  as: optional(string()),
+  attributes: optional(array(CustomAttributeSchema), []),
+  re: instance(RegExp),
+  selector: optional(string())
+});
 var ESLintReactSettingsSchema = object({
   /**
    * The source where React is imported from.
@@ -1281,52 +1307,48 @@ function createMemoizedFunction(fn, options) {
 var INITIAL_ESLINT_REACT_SETTINGS = {
   skipImportCheck: false
 };
-var DEFAULT_ESLINT_REACT_SETTINGS = {
-  additionalHooks: {
-    useLayoutEffect: ["useIsomorphicLayoutEffect"]
-  },
-  polymorphicPropName: "as",
-  skipImportCheck: false,
-  version: "detect"
-};
-var defineSettings = tools.F.identity;
+function unsafeReadSettings(data) {
+  return tools.Data.struct(data?.["react-x"] ?? {});
+}
 var decodeSettings = createMemoizedFunction((data) => {
   return tools.Data.struct({
     ...INITIAL_ESLINT_REACT_SETTINGS,
     ...parse(ESLintSettingsSchema, data)["react-x"] ?? {}
   });
 }, { isEqual: (a, b) => a === b });
-function unsafeCastSettings(data) {
-  return tools.Data.struct(data?.["react-x"] ?? {});
-}
-var expandSettings = createMemoizedFunction(
-  (settings) => {
-    const additionalComponents = settings.additionalComponents ?? [];
-    return tools.Data.struct({
-      ...settings,
-      additionalComponents: additionalComponents.map((component) => ({
-        ...component,
-        attributes: component.attributes.map((attr) => ({
-          ...attr,
-          as: attr.as ?? attr.name
-        })),
-        re: pm__default.default.makeRe(component.name, { fastpaths: true })
+var normalizeSettings = createMemoizedFunction((settings) => {
+  const additionalComponents = settings.additionalComponents ?? [];
+  return tools.Data.struct({
+    ...settings,
+    additionalComponents: additionalComponents.map((component) => ({
+      ...component,
+      attributes: component.attributes.map((attr) => ({
+        ...attr,
+        as: attr.as ?? attr.name
       })),
-      components: additionalComponents.reduce((acc, component) => {
-        const { name, as, attributes, selector } = component;
-        if (!name || !as || selector || attributes.length > 0) return acc;
-        if (!/^[\w-]+$/u.test(name)) return acc;
-        return acc.set(name, as);
-      }, /* @__PURE__ */ new Map())
-    });
-  },
-  { isEqual: shallowEqual }
-);
+      re: pm__default.default.makeRe(component.name, { fastpaths: true })
+    })),
+    components: additionalComponents.reduce((acc, component) => {
+      const { name, as, attributes, selector } = component;
+      if (!name || !as || selector || attributes.length > 0) return acc;
+      if (!/^[\w-]+$/u.test(name)) return acc;
+      return acc.set(name, as);
+    }, /* @__PURE__ */ new Map())
+  });
+}, { isEqual: shallowEqual });
+function findAttrInCustomAttributes(name, attributes) {
+  return tools.F.pipe(
+    tools.O.fromNullable(attributes.findLast((a) => a.as === name)),
+    tools.O.map((a) => [a.name, a.defaultValue]),
+    tools.O.getOrElse(() => [name])
+  );
+}
+var defineSettings = tools.F.identity;
 
 exports.CustomAttributeSchema = CustomAttributeSchema;
+exports.CustomComponentNormalizedSchema = CustomComponentNormalizedSchema;
 exports.CustomComponentSchema = CustomComponentSchema;
 exports.CustomHookSchema = CustomHookSchema;
-exports.DEFAULT_ESLINT_REACT_SETTINGS = DEFAULT_ESLINT_REACT_SETTINGS;
 exports.ESLintReactSettingsSchema = ESLintReactSettingsSchema;
 exports.ESLintSettingsSchema = ESLintSettingsSchema;
 exports.GITHUB_URL = GITHUB_URL;
@@ -1345,5 +1367,6 @@ exports.WEBSITE_URL = WEBSITE_URL;
 exports.createRuleForPlugin = createRuleForPlugin;
 exports.decodeSettings = decodeSettings;
 exports.defineSettings = defineSettings;
-exports.expandSettings = expandSettings;
-exports.unsafeCastSettings = unsafeCastSettings;
+exports.findAttrInCustomAttributes = findAttrInCustomAttributes;
+exports.normalizeSettings = normalizeSettings;
+exports.unsafeReadSettings = unsafeReadSettings;

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { ESLintUtils } from '@typescript-eslint/utils';
-import { F, Data } from '@eslint-react/tools';
+import { F, Data, O } from '@eslint-react/tools';
 import pm from 'picomatch';
 
 // src/constants.ts
@@ -371,6 +371,25 @@ function boolean(message) {
     }
   };
 }
+function instance(class_, message) {
+  return {
+    kind: "schema",
+    type: "instance",
+    reference: instance,
+    expects: class_.name,
+    async: false,
+    class: class_,
+    message,
+    _run(dataset, config2) {
+      if (dataset.value instanceof this.class) {
+        dataset.typed = true;
+      } else {
+        _addIssue(this, "type", dataset, config2);
+      }
+      return dataset;
+    }
+  };
+}
 function object(entries, message) {
   return {
     kind: "schema",
@@ -544,6 +563,13 @@ var CustomComponentSchema = object({
    */
   attributes: optional(array(CustomAttributeSchema), [])
 });
+var CustomComponentNormalizedSchema = object({
+  name: string(),
+  as: optional(string()),
+  attributes: optional(array(CustomAttributeSchema), []),
+  re: instance(RegExp),
+  selector: optional(string())
+});
 var ESLintReactSettingsSchema = object({
   /**
    * The source where React is imported from.
@@ -1275,46 +1301,42 @@ function createMemoizedFunction(fn, options) {
 var INITIAL_ESLINT_REACT_SETTINGS = {
   skipImportCheck: false
 };
-var DEFAULT_ESLINT_REACT_SETTINGS = {
-  additionalHooks: {
-    useLayoutEffect: ["useIsomorphicLayoutEffect"]
-  },
-  polymorphicPropName: "as",
-  skipImportCheck: false,
-  version: "detect"
-};
-var defineSettings = F.identity;
+function unsafeReadSettings(data) {
+  return Data.struct(data?.["react-x"] ?? {});
+}
 var decodeSettings = createMemoizedFunction((data) => {
   return Data.struct({
     ...INITIAL_ESLINT_REACT_SETTINGS,
     ...parse(ESLintSettingsSchema, data)["react-x"] ?? {}
   });
 }, { isEqual: (a, b) => a === b });
-function unsafeCastSettings(data) {
-  return Data.struct(data?.["react-x"] ?? {});
-}
-var expandSettings = createMemoizedFunction(
-  (settings) => {
-    const additionalComponents = settings.additionalComponents ?? [];
-    return Data.struct({
-      ...settings,
-      additionalComponents: additionalComponents.map((component) => ({
-        ...component,
-        attributes: component.attributes.map((attr) => ({
-          ...attr,
-          as: attr.as ?? attr.name
-        })),
-        re: pm.makeRe(component.name, { fastpaths: true })
+var normalizeSettings = createMemoizedFunction((settings) => {
+  const additionalComponents = settings.additionalComponents ?? [];
+  return Data.struct({
+    ...settings,
+    additionalComponents: additionalComponents.map((component) => ({
+      ...component,
+      attributes: component.attributes.map((attr) => ({
+        ...attr,
+        as: attr.as ?? attr.name
       })),
-      components: additionalComponents.reduce((acc, component) => {
-        const { name, as, attributes, selector } = component;
-        if (!name || !as || selector || attributes.length > 0) return acc;
-        if (!/^[\w-]+$/u.test(name)) return acc;
-        return acc.set(name, as);
-      }, /* @__PURE__ */ new Map())
-    });
-  },
-  { isEqual: shallowEqual }
-);
+      re: pm.makeRe(component.name, { fastpaths: true })
+    })),
+    components: additionalComponents.reduce((acc, component) => {
+      const { name, as, attributes, selector } = component;
+      if (!name || !as || selector || attributes.length > 0) return acc;
+      if (!/^[\w-]+$/u.test(name)) return acc;
+      return acc.set(name, as);
+    }, /* @__PURE__ */ new Map())
+  });
+}, { isEqual: shallowEqual });
+function findAttrInCustomAttributes(name, attributes) {
+  return F.pipe(
+    O.fromNullable(attributes.findLast((a) => a.as === name)),
+    O.map((a) => [a.name, a.defaultValue]),
+    O.getOrElse(() => [name])
+  );
+}
+var defineSettings = F.identity;
 
-export { CustomAttributeSchema, CustomComponentSchema, CustomHookSchema, DEFAULT_ESLINT_REACT_SETTINGS, ESLintReactSettingsSchema, ESLintSettingsSchema, GITHUB_URL, HOST_HTML_COMPONENT_TYPES, HOST_SVG_COMPONENT_TYPES, INITIAL_ESLINT_REACT_SETTINGS, NPM_SCOPE, REACT_BUILD_IN_HOOKS, RE_CAMEL_CASE, RE_CONSTANT_CASE, RE_JAVASCRIPT_PROTOCOL, RE_KEBAB_CASE, RE_PASCAL_CASE, RE_SNAKE_CASE, WEBSITE_URL, createRuleForPlugin, decodeSettings, defineSettings, expandSettings, unsafeCastSettings };
+export { CustomAttributeSchema, CustomComponentNormalizedSchema, CustomComponentSchema, CustomHookSchema, ESLintReactSettingsSchema, ESLintSettingsSchema, GITHUB_URL, HOST_HTML_COMPONENT_TYPES, HOST_SVG_COMPONENT_TYPES, INITIAL_ESLINT_REACT_SETTINGS, NPM_SCOPE, REACT_BUILD_IN_HOOKS, RE_CAMEL_CASE, RE_CONSTANT_CASE, RE_JAVASCRIPT_PROTOCOL, RE_KEBAB_CASE, RE_PASCAL_CASE, RE_SNAKE_CASE, WEBSITE_URL, createRuleForPlugin, decodeSettings, defineSettings, findAttrInCustomAttributes, normalizeSettings, unsafeReadSettings };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/shared",
-  "version": "1.12.1",
+  "version": "1.12.2-beta.5",
   "description": "ESLint React's Shared constants and functions.",
   "homepage": "https://github.com/rel1cx/eslint-react",
   "bugs": {
@@ -35,9 +35,9 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/utils": "^8.2.0",
+    "@typescript-eslint/utils": "^8.3.0",
     "picomatch": "^4.0.2",
-    "@eslint-react/tools": "1.12.1"
+    "@eslint-react/tools": "1.12.2-beta.5"
   },
   "devDependencies": {
     "@types/picomatch": "^3.0.1",
@@ -45,7 +45,7 @@
     "micro-memoize": "^4.1.2",
     "tsup": "^8.2.4",
     "type-fest": "^4.25.0",
-    "valibot": "^0.38.0"
+    "valibot": "^0.39.0"
   },
   "scripts": {
     "build": "tsup --dts-resolve",