@eslint-react/jsx 0.9.8-beta.0 → 0.9.8-beta.2

package/dist/index.js

@@ -1,38 +1,10 @@
 'use strict';
 
-var types = require('@typescript-eslint/types');
 var ast = require('@eslint-react/ast');
-var tools = require('@eslint-react/tools');
 var shared = require('@eslint-react/shared');
+var tools = require('@eslint-react/tools');
 var memo = require('micro-memoize');
-
-function resolveMemberExpressions(object, property) {
-    if (object.type === types.AST_NODE_TYPES.JSXMemberExpression) {
-        return `${resolveMemberExpressions(object.object, object.property)}.${property.name}`;
-    }
-    if (object.type === types.AST_NODE_TYPES.JSXNamespacedName) {
-        return `${object.namespace.name}:${object.name.name}.${property.name}`;
-    }
-    return `${object.name}.${property.name}`;
-}
-/**
- * Returns the tag name associated with a JSXOpeningElement.
- * @param node The visited JSXOpeningElement node object.
- * @returns The element's tag name.
- */ function elementType(node) {
-    if (node.type === types.AST_NODE_TYPES.JSXOpeningFragment) {
-        return "<>";
-    }
-    const { name } = node;
-    if (name.type === types.AST_NODE_TYPES.JSXMemberExpression) {
-        const { object, property } = name;
-        return resolveMemberExpressions(object, property);
-    }
-    if (name.type === types.AST_NODE_TYPES.JSXNamespacedName) {
-        return `${name.namespace.name}:${name.name.name}`;
-    }
-    return name.name;
-}
+var types = require('@typescript-eslint/types');
 
 const RE_JSX_ANNOTATION_REGEX = /@jsx\s+(\S+)/u;
 // Does not check for reserved keywords or unicode characters
@@ -40,7 +12,7 @@ const RE_JS_IDENTIFIER_REGEX = /^[$A-Z_a-z][\w$]*$/u;
 function getFragmentFromContext(context) {
     const settings = shared.parse(shared.ESLintSettingsSchema, context.settings);
     const fragment = settings.eslintReact?.jsx?.fragment;
-    if (tools.P.isString(fragment) && RE_JS_IDENTIFIER_REGEX.test(fragment)) {
+    if (tools._.isString(fragment) && RE_JS_IDENTIFIER_REGEX.test(fragment)) {
         return fragment;
     }
     return "Fragment";
@@ -53,6 +25,8 @@ const getPragmaFromContext = memo((context)=>{
     return tools.F.pipe(tools.O.orElse(tools.O.fromNullable(pragma), ()=>tools.F.pipe(tools.O.fromNullable(pragmaNode), tools.O.map(({ value })=>RE_JSX_ANNOTATION_REGEX.exec(value)), tools.O.flatMapNullable((matches)=>matches?.[1]?.split(".")[0]))), tools.O.flatMap(tools.O.liftPredicate((x)=>RE_JS_IDENTIFIER_REGEX.test(x))), tools.O.getOrElse(tools.F.constant("React")));
 });
 
+const t=Symbol.for("@ts-pattern/matcher"),e=Symbol.for("@ts-pattern/isVariadic"),n="@ts-pattern/anonymous-select-key",r=t=>Boolean(t&&"object"==typeof t),i=e=>e&&!!e[t],s=(n,o,c)=>{if(i(n)){const e=n[t](),{matched:r,selections:i}=e.match(o);return r&&i&&Object.keys(i).forEach(t=>c(t,i[t])),r}if(r(n)){if(!r(o))return !1;if(Array.isArray(n)){if(!Array.isArray(o))return !1;let t=[],r=[],a=[];for(const s of n.keys()){const o=n[s];i(o)&&o[e]?a.push(o):a.length?r.push(o):t.push(o);}if(a.length){if(a.length>1)throw new Error("Pattern error: Using `...P.array(...)` several times in a single pattern is not allowed.");if(o.length<t.length+r.length)return !1;const e=o.slice(0,t.length),n=0===r.length?[]:o.slice(-r.length),i=o.slice(t.length,0===r.length?Infinity:-r.length);return t.every((t,n)=>s(t,e[n],c))&&r.every((t,e)=>s(t,n[e],c))&&(0===a.length||s(a[0],i,c))}return n.length===o.length&&n.every((t,e)=>s(t,o[e],c))}return Object.keys(n).every(e=>{const r=n[e];return (e in o||i(a=r)&&"optional"===a[t]().matcherType)&&s(r,o[e],c);var a;})}return Object.is(o,n)},o=e=>{var n,s,a;return r(e)?i(e)?null!=(n=null==(s=(a=e[t]()).getSelectionKeys)?void 0:s.call(a))?n:[]:Array.isArray(e)?c(e,o):c(Object.values(e),o):[]},c=(t,e)=>t.reduce((t,n)=>t.concat(e(n)),[]);function a(...t){if(1===t.length){const[e]=t;return t=>s(e,t,()=>{})}if(2===t.length){const[e,n]=t;return s(e,n,()=>{})}throw new Error(`isMatching wasn't given the right number of arguments: expected 1 or 2, received ${t.length}.`)}function u(t){return Object.assign(t,{optional:()=>l(t),and:e=>m(t,e),or:e=>y(t,e),select:e=>void 0===e?p(t):p(e,t)})}function h(t){return Object.assign((t=>Object.assign(t,{*[Symbol.iterator](){yield Object.assign(t,{[e]:!0});}}))(t),{optional:()=>h(l(t)),select:e=>h(void 0===e?p(t):p(e,t))})}function l(e){return u({[t]:()=>({match:t=>{let n={};const r=(t,e)=>{n[t]=e;};return void 0===t?(o(e).forEach(t=>r(t,void 0)),{matched:!0,selections:n}):{matched:s(e,t,r),selections:n}},getSelectionKeys:()=>o(e),matcherType:"optional"})})}const f=(t,e)=>{for(const n of t)if(!e(n))return !1;return !0},g=(t,e)=>{for(const[n,r]of t.entries())if(!e(r,n))return !1;return !0};function m(...e){return u({[t]:()=>({match:t=>{let n={};const r=(t,e)=>{n[t]=e;};return {matched:e.every(e=>s(e,t,r)),selections:n}},getSelectionKeys:()=>c(e,o),matcherType:"and"})})}function y(...e){return u({[t]:()=>({match:t=>{let n={};const r=(t,e)=>{n[t]=e;};return c(e,o).forEach(t=>r(t,void 0)),{matched:e.some(e=>s(e,t,r)),selections:n}},getSelectionKeys:()=>c(e,o),matcherType:"or"})})}function d(e){return {[t]:()=>({match:t=>({matched:Boolean(e(t))})})}}function p(...e){const r="string"==typeof e[0]?e[0]:void 0,i=2===e.length?e[1]:"string"==typeof e[0]?void 0:e[0];return u({[t]:()=>({match:t=>{let e={[null!=r?r:n]:t};return {matched:void 0===i||s(i,t,(t,n)=>{e[t]=n;}),selections:e}},getSelectionKeys:()=>[null!=r?r:n].concat(void 0===i?[]:o(i))})})}function v(t){return "number"==typeof t}function b(t){return "string"==typeof t}function w(t){return "bigint"==typeof t}const S=u(d(function(t){return !0})),O=S,j=t=>Object.assign(u(t),{startsWith:e=>{return j(m(t,(n=e,d(t=>b(t)&&t.startsWith(n)))));var n;},endsWith:e=>{return j(m(t,(n=e,d(t=>b(t)&&t.endsWith(n)))));var n;},minLength:e=>j(m(t,(t=>d(e=>b(e)&&e.length>=t))(e))),maxLength:e=>j(m(t,(t=>d(e=>b(e)&&e.length<=t))(e))),includes:e=>{return j(m(t,(n=e,d(t=>b(t)&&t.includes(n)))));var n;},regex:e=>{return j(m(t,(n=e,d(t=>b(t)&&Boolean(t.match(n))))));var n;}}),E=j(d(b)),K=t=>Object.assign(u(t),{between:(e,n)=>K(m(t,((t,e)=>d(n=>v(n)&&t<=n&&e>=n))(e,n))),lt:e=>K(m(t,(t=>d(e=>v(e)&&e<t))(e))),gt:e=>K(m(t,(t=>d(e=>v(e)&&e>t))(e))),lte:e=>K(m(t,(t=>d(e=>v(e)&&e<=t))(e))),gte:e=>K(m(t,(t=>d(e=>v(e)&&e>=t))(e))),int:()=>K(m(t,d(t=>v(t)&&Number.isInteger(t)))),finite:()=>K(m(t,d(t=>v(t)&&Number.isFinite(t)))),positive:()=>K(m(t,d(t=>v(t)&&t>0))),negative:()=>K(m(t,d(t=>v(t)&&t<0)))}),A=K(d(v)),x=t=>Object.assign(u(t),{between:(e,n)=>x(m(t,((t,e)=>d(n=>w(n)&&t<=n&&e>=n))(e,n))),lt:e=>x(m(t,(t=>d(e=>w(e)&&e<t))(e))),gt:e=>x(m(t,(t=>d(e=>w(e)&&e>t))(e))),lte:e=>x(m(t,(t=>d(e=>w(e)&&e<=t))(e))),gte:e=>x(m(t,(t=>d(e=>w(e)&&e>=t))(e))),positive:()=>x(m(t,d(t=>w(t)&&t>0))),negative:()=>x(m(t,d(t=>w(t)&&t<0)))}),P=x(d(w)),T=u(d(function(t){return "boolean"==typeof t})),k=u(d(function(t){return "symbol"==typeof t})),B=u(d(function(t){return null==t}));var _={__proto__:null,matcher:t,optional:l,array:function(...e){return h({[t]:()=>({match:t=>{if(!Array.isArray(t))return {matched:!1};if(0===e.length)return {matched:!0};const n=e[0];let r={};if(0===t.length)return o(n).forEach(t=>{r[t]=[];}),{matched:!0,selections:r};const i=(t,e)=>{r[t]=(r[t]||[]).concat([e]);};return {matched:t.every(t=>s(n,t,i)),selections:r}},getSelectionKeys:()=>0===e.length?[]:o(e[0])})})},set:function(...e){return u({[t]:()=>({match:t=>{if(!(t instanceof Set))return {matched:!1};let n={};if(0===t.size)return {matched:!0,selections:n};if(0===e.length)return {matched:!0};const r=(t,e)=>{n[t]=(n[t]||[]).concat([e]);},i=e[0];return {matched:f(t,t=>s(i,t,r)),selections:n}},getSelectionKeys:()=>0===e.length?[]:o(e[0])})})},map:function(...e){return u({[t]:()=>({match:t=>{if(!(t instanceof Map))return {matched:!1};let n={};if(0===t.size)return {matched:!0,selections:n};const r=(t,e)=>{n[t]=(n[t]||[]).concat([e]);};if(0===e.length)return {matched:!0};var i;if(1===e.length)throw new Error(`\`P.map\` wasn't given enough arguments. Expected (key, value), received ${null==(i=e[0])?void 0:i.toString()}`);const[o,c]=e;return {matched:g(t,(t,e)=>{const n=s(o,e,r),i=s(c,t,r);return n&&i}),selections:n}},getSelectionKeys:()=>0===e.length?[]:[...o(e[0]),...o(e[1])]})})},intersection:m,union:y,not:function(e){return u({[t]:()=>({match:t=>({matched:!s(e,t,()=>{})}),getSelectionKeys:()=>[],matcherType:"not"})})},when:d,select:p,any:S,_:O,string:E,number:A,bigint:P,boolean:T,symbol:k,nullish:B,instanceOf:function(t){return u(d(function(t){return e=>e instanceof t}(t)))},shape:function(t){return u(d(a(t)))}};const W={matched:!1,value:void 0};function N(t){return new $(t,W)}class ${constructor(t,e){this.input=void 0,this.state=void 0,this.input=t,this.state=e;}with(...t){if(this.state.matched)return this;const e=t[t.length-1],r=[t[0]];let i;3===t.length&&"function"==typeof t[1]?i=t[1]:t.length>2&&r.push(...t.slice(1,t.length-1));let o=!1,c={};const a=(t,e)=>{o=!0,c[t]=e;},u=!r.some(t=>s(t,this.input,a))||i&&!Boolean(i(this.input))?W:{matched:!0,value:e(o?n in c?c[n]:c:this.input,this.input)};return new $(this.input,u)}when(t,e){if(this.state.matched)return this;const n=Boolean(t(this.input));return new $(this.input,n?{matched:!0,value:e(this.input,this.input)}:W)}otherwise(t){return this.state.matched?this.state.value:t(this.input)}exhaustive(){if(this.state.matched)return this.state.value;let t;try{t=JSON.stringify(this.input);}catch(e){t=this.input;}throw new Error(`Pattern matching error: no pattern matches value ${t}`)}run(){return this.exhaustive()}returnType(){return this}}
+
 function isInitializedFromPragma(variableName, context, initialScope, pragma = getPragmaFromContext(context)) {
     const variables = ast.getVariablesUpToGlobal(initialScope);
     const maybeVariable = ast.findVariableByName(variableName)(variables);
@@ -65,7 +39,7 @@ function isInitializedFromPragma(variableName, context, initialScope, pragma = g
     if (node.type === ast.NodeType.VariableDeclarator && node.init) {
         const { init } = node;
         // check for: `variable = pragma.variable`
-        if (tools.M.isMatching({
+        if (a({
             type: "MemberExpression",
             object: {
                 type: "Identifier",
@@ -75,14 +49,14 @@ function isInitializedFromPragma(variableName, context, initialScope, pragma = g
             return true;
         }
         // check for: `{ variable } = pragma`
-        if (tools.M.isMatching({
+        if (a({
             type: "Identifier",
             name: pragma
         }, init)) {
             return true;
         }
         // check if from a require call: `require("react")`
-        const maybeRequireExpression = tools.M.match(init).with({
+        const maybeRequireExpression = N(init).with({
             type: ast.NodeType.CallExpression,
             callee: {
                 type: ast.NodeType.Identifier,
@@ -109,7 +83,7 @@ function isInitializedFromPragma(variableName, context, initialScope, pragma = g
         return firstArg.value === pragma.toLowerCase();
     }
     // latest definition is an import declaration: import { variable } from 'react'
-    return tools.M.isMatching({
+    return a({
         type: "ImportDeclaration",
         source: {
             value: pragma.toLowerCase()
@@ -117,7 +91,7 @@ function isInitializedFromPragma(variableName, context, initialScope, pragma = g
     }, parent);
 }
 function isPropertyOfPragma(name, context, pragma = getPragmaFromContext(context)) {
-    const isMatch = tools.M.isMatching({
+    const isMatch = a({
         type: ast.NodeType.MemberExpression,
         object: {
             type: ast.NodeType.Identifier,
@@ -133,34 +107,106 @@ function isPropertyOfPragma(name, context, pragma = getPragmaFromContext(context
  * Checks if the given node is a call expression to the given function or method of the pragma
  * @param name The name of the function or method to check
  * @returns A predicate that checks if the given node is a call expression to the given function or method
- */ function isCallFromPragma(name) {
+ */ function isFromPragma(name) {
     return (node, context)=>{
         const initialScope = context.sourceCode.getScope?.(node) ?? context.getScope();
-        if (node.type !== ast.NodeType.CallExpression || !("callee" in node)) {
+        if (node.type === ast.NodeType.MemberExpression) {
+            return isPropertyOfPragma(name, context)(node);
+        }
+        if (node.name === name) {
+            return isInitializedFromPragma(name, context, initialScope);
+        }
+        return false;
+    };
+}
+/**
+ * @internal
+ * @param pragmaMemberName
+ * @param name
+ * @returns A function that checks if a given node is a member expression of a Pragma member.
+ */ function isFromPragmaMember(pragmaMemberName, name) {
+    return (node, context, pragma = getPragmaFromContext(context))=>{
+        const initialScope = context.sourceCode.getScope?.(node) ?? context.getScope();
+        if (node.property.type !== ast.NodeType.Identifier || node.property.name !== name) {
             return false;
         }
-        if (node.callee.type === ast.NodeType.MemberExpression) {
-            return isPropertyOfPragma(name, context)(node.callee);
+        if (node.object.type === ast.NodeType.Identifier && node.object.name === pragmaMemberName) {
+            return isInitializedFromPragma(node.object.name, context, initialScope, pragma);
         }
-        if ("name" in node.callee && node.callee.name === name) {
-            return isInitializedFromPragma(name, context, initialScope);
+        if (node.object.type === ast.NodeType.MemberExpression && node.object.object.type === ast.NodeType.Identifier && node.object.object.name === pragma && node.object.property.type === ast.NodeType.Identifier) {
+            return node.object.property.name === pragmaMemberName;
         }
         return false;
     };
 }
+function isCallFromPragma(name) {
+    return (node, context)=>{
+        if (!ast.isOneOf([
+            ast.NodeType.Identifier,
+            ast.NodeType.MemberExpression
+        ])(node.callee)) {
+            return false;
+        }
+        return isFromPragma(name)(node.callee, context);
+    };
+}
+function isCallFromPragmaMember(pragmaMemberName, name) {
+    return (node, context)=>{
+        if (!ast.is(ast.NodeType.MemberExpression)(node.callee)) {
+            return false;
+        }
+        return isFromPragmaMember(pragmaMemberName, name)(node.callee, context);
+    };
+}
 
+const isCreateElement = isFromPragma("createElement");
+const isCreateElementCall = (node, context)=>{
+    if (!ast.isOneOf([
+        ast.NodeType.Identifier,
+        ast.NodeType.MemberExpression
+    ])(node.callee)) {
+        return false;
+    }
+    return isCreateElement(node.callee, context);
+};
+const isCloneElement = isFromPragma("cloneElement");
+const isCloneElementCall = (node, context)=>{
+    if (!ast.isOneOf([
+        ast.NodeType.Identifier,
+        ast.NodeType.MemberExpression
+    ])(node.callee)) {
+        return false;
+    }
+    return isCloneElement(node.callee, context);
+};
+
+function resolveMemberExpressions(object, property) {
+    if (object.type === types.AST_NODE_TYPES.JSXMemberExpression) {
+        return `${resolveMemberExpressions(object.object, object.property)}.${property.name}`;
+    }
+    if (object.type === types.AST_NODE_TYPES.JSXNamespacedName) {
+        return `${object.namespace.name}:${object.name.name}.${property.name}`;
+    }
+    return `${object.name}.${property.name}`;
+}
 /**
- * Checks if the given node is a call expression to `createElement`
- * @param node The AST node to check
- * @param context The rule context
- * @returns `true` if the node is a call expression to `createElement`
- */ const isCreateElementCall = isCallFromPragma("createElement");
-/**
- * Checks if the given node is a call expression to `cloneElement`
- * @param node The AST node to check
- * @param context The rule context
- * @returns `true` if the node is a call expression to `cloneElement`
- */ const isCloneElementCall = isCallFromPragma("cloneElement");
+ * Returns the tag name associated with a JSXOpeningElement.
+ * @param node The visited JSXOpeningElement node object.
+ * @returns The element's tag name.
+ */ function elementType(node) {
+    if (node.type === types.AST_NODE_TYPES.JSXOpeningFragment) {
+        return "<>";
+    }
+    const { name } = node;
+    if (name.type === types.AST_NODE_TYPES.JSXMemberExpression) {
+        const { object, property } = name;
+        return resolveMemberExpressions(object, property);
+    }
+    if (name.type === types.AST_NODE_TYPES.JSXNamespacedName) {
+        return `${name.namespace.name}:${name.name.name}`;
+    }
+    return name.name;
+}
 
 /**
  * Determines whether inside createElement's props.
@@ -168,14 +214,10 @@ function isPropertyOfPragma(name, context, pragma = getPragmaFromContext(context
  * @param context The rule context
  * @returns `true` if the node is inside createElement's props
  */ function isInsideCreateElementProps(node, context) {
-    return tools.F.pipe(ast.traverseUp(node, (n)=>isCreateElementCall(n, context)), tools.O.filter(ast.is(ast.NodeType.CallExpression)), tools.O.flatMapNullable((c)=>c.arguments.at(1)), tools.O.filter(ast.is(ast.NodeType.ObjectExpression)), tools.O.zipWith(ast.traverseUp(node, ast.is(ast.NodeType.ObjectExpression)), (a, b)=>a === b), tools.O.getOrElse(tools.F.constFalse));
+    return tools.F.pipe(ast.traverseUp(node, (n)=>ast.is(ast.NodeType.CallExpression)(n) && isCreateElementCall(n, context)), tools.O.filter(ast.is(ast.NodeType.CallExpression)), tools.O.flatMapNullable((c)=>c.arguments.at(1)), tools.O.filter(ast.is(ast.NodeType.ObjectExpression)), tools.O.zipWith(ast.traverseUp(node, ast.is(ast.NodeType.ObjectExpression)), (a, b)=>a === b), tools.O.getOrElse(tools.F.constFalse));
 }
 function isChildrenOfCreateElement(node, context) {
-    const maybeCallExpression = node.parent;
-    if (!maybeCallExpression || !isCreateElementCall(maybeCallExpression, context)) {
-        return false;
-    }
-    return maybeCallExpression.arguments.slice(2).some((child)=>child === node);
+    return tools.F.pipe(tools.O.fromNullable(node.parent), tools.O.filter(ast.is(ast.NodeType.CallExpression)), tools.O.filter((n)=>isCreateElementCall(n, context)), tools.O.exists((n)=>n.arguments.slice(2).some((arg)=>arg === node)));
 }
 /**
  * Check if a `JSXElement` or `JSXFragment` has children
@@ -387,7 +429,7 @@ const isFragment = (node, pragma, fragment)=>{
     if (!node) {
         return false;
     }
-    return tools.M.match(node).with({
+    return N(node).with({
         type: ast.NodeType.JSXElement
     }, tools.F.constTrue).with({
         type: ast.NodeType.JSXFragment
@@ -398,7 +440,7 @@ const isFragment = (node, pragma, fragment)=>{
     }, tools.F.constTrue).with({
         type: ast.NodeType.Literal
     }, (node)=>{
-        return tools.M.match(node.value).with(null, ()=>!(hint & JSXValueCheckHint.SkipNullLiteral)).with(tools.M.P.boolean, ()=>!(hint & JSXValueCheckHint.SkipBooleanLiteral)).with(tools.M.P.string, ()=>!(hint & JSXValueCheckHint.SkipStringLiteral)).with(tools.M.P.number, ()=>!(hint & JSXValueCheckHint.SkipNumberLiteral)).otherwise(tools.F.constFalse);
+        return N(node.value).with(null, ()=>!(hint & JSXValueCheckHint.SkipNullLiteral)).with(_.boolean, ()=>!(hint & JSXValueCheckHint.SkipBooleanLiteral)).with(_.string, ()=>!(hint & JSXValueCheckHint.SkipStringLiteral)).with(_.number, ()=>!(hint & JSXValueCheckHint.SkipNumberLiteral)).otherwise(tools.F.constFalse);
     }).with({
         type: ast.NodeType.TemplateLiteral
     }, ()=>{
@@ -475,12 +517,13 @@ const isFragment = (node, pragma, fragment)=>{
     return statements.some((statement)=>isJSXValue(statement.argument, context, hint));
 }
 
+const { getStaticValue } = ast.ESLintCommunityESLintUtils;
 /**
  * Get the name of a JSX attribute with namespace
  * @param node The JSX attribute node
  * @returns string
  */ function getPropName(node) {
-    return tools.M.match(node.name).when(ast.is(ast.NodeType.JSXIdentifier), (n)=>n.name).when(ast.is(ast.NodeType.JSXNamespacedName), (n)=>`${n.namespace.name}:${n.name.name}`).exhaustive();
+    return N(node.name).when(ast.is(ast.NodeType.JSXIdentifier), (n)=>n.name).when(ast.is(ast.NodeType.JSXNamespacedName), (n)=>`${n.namespace.name}:${n.name.name}`).exhaustive();
 }
 function getProp(props, propName, context, initialScope) {
     return findPropInAttributes(props, context, initialScope)(propName);
@@ -498,15 +541,15 @@ function getProp(props, propName, context, initialScope) {
             return tools.O.none();
         }
         if (value.type === ast.NodeType.Literal) {
-            return tools.O.some(ast.getStaticValue(value, initialScope));
+            return tools.O.some(getStaticValue(value, initialScope));
         }
         if (value.type === ast.NodeType.JSXExpressionContainer) {
-            return tools.O.some(ast.getStaticValue(value.expression, initialScope));
+            return tools.O.some(getStaticValue(value.expression, initialScope));
         }
         return tools.O.none();
     }
     const { argument } = attribute;
-    return tools.O.some(ast.getStaticValue(argument, initialScope));
+    return tools.O.some(getStaticValue(argument, initialScope));
 }
 /**
  * @param properties The properties to search in
@@ -521,10 +564,10 @@ function getProp(props, propName, context, initialScope) {
    * @returns The property if found
    */ return (propName)=>{
         return tools.O.fromNullable(properties.find((prop)=>{
-            return tools.M.match(prop).when(ast.is(ast.NodeType.Property), (prop)=>{
+            return N(prop).when(ast.is(ast.NodeType.Property), (prop)=>{
                 return "name" in prop.key && prop.key.name === propName;
             }).when(ast.is(ast.NodeType.SpreadElement), (prop)=>{
-                return tools.M.match(prop.argument).when(ast.is(ast.NodeType.Identifier), (argument)=>{
+                return N(prop.argument).when(ast.is(ast.NodeType.Identifier), (argument)=>{
                     const { name } = argument;
                     const maybeInit = tools.O.flatMap(ast.findVariableByNameUpToGlobal(name, initialScope), ast.getVariableInit(0));
                     if (tools.O.isNone(maybeInit)) {
@@ -567,8 +610,8 @@ function getProp(props, propName, context, initialScope) {
    * @returns The property if found
    */ return (propName)=>{
         return tools.O.fromNullable(attributes.find((attr)=>{
-            return tools.M.match(attr).when(ast.is(ast.NodeType.JSXAttribute), (attr)=>getPropName(attr) === propName).when(ast.is(ast.NodeType.JSXSpreadAttribute), (attr)=>{
-                return tools.M.match(attr.argument).with({
+            return N(attr).when(ast.is(ast.NodeType.JSXAttribute), (attr)=>getPropName(attr) === propName).when(ast.is(ast.NodeType.JSXSpreadAttribute), (attr)=>{
+                return N(attr.argument).with({
                     type: ast.NodeType.Identifier
                 }, (argument)=>{
                     const { name } = argument;
@@ -662,7 +705,7 @@ function getProp(props, propName, context, initialScope) {
  * @param node The AST node to check
  * @returns boolean `true` if the node is whitespace
  */ function isWhiteSpace(node) {
-    return tools.P.isString(node.value) && node.value.trim() === "";
+    return tools._.isString(node.value) && node.value.trim() === "";
 }
 /**
  * Check if a Literal or JSXText node is a line break
@@ -708,13 +751,18 @@ exports.hdlTouch = hdlTouch;
 exports.hdlTransition = hdlTransition;
 exports.hdlWheel = hdlWheel;
 exports.isCallFromPragma = isCallFromPragma;
+exports.isCallFromPragmaMember = isCallFromPragmaMember;
 exports.isChildOfJSXElement = isChildOfJSXElement;
 exports.isChildrenOfCreateElement = isChildrenOfCreateElement;
+exports.isCloneElement = isCloneElement;
 exports.isCloneElementCall = isCloneElementCall;
+exports.isCreateElement = isCreateElement;
 exports.isCreateElementCall = isCreateElementCall;
 exports.isFragment = isFragment;
 exports.isFragmentElement = isFragmentElement;
 exports.isFragmentSyntax = isFragmentSyntax;
+exports.isFromPragma = isFromPragma;
+exports.isFromPragmaMember = isFromPragmaMember;
 exports.isFunctionReturningJSXValue = isFunctionReturningJSXValue;
 exports.isInitializedFromPragma = isInitializedFromPragma;
 exports.isInsideCreateElementProps = isInsideCreateElementProps;