Merge branch 'master' into dev

This refactor covers the following workflows:

1. Adding a comic from LOCG or ComicVine adds it to the wanted list
2. Downloading that comic from DC++ correctly adds download metadata to the corresponding comic object in mongo
3. Successful download triggers automatic import to library and cover extraction, metadata application

package.json

@@ -44,6 +44,10 @@
     "babel-preset-minify": "^0.5.2",
     "better-docs": "^2.7.2",
     "comlink-loader": "^2.0.0",
+    "compromise": "^13.11.3",
+    "compromise-dates": "^2.2.1",
+    "compromise-numbers": "^1.4.0",
+    "compromise-sentences": "^0.3.0",
     "date-fns": "^2.28.0",
     "dayjs": "^1.10.6",
     "ellipsize": "^0.1.0",
@@ -134,6 +138,7 @@
     "bulma": "^0.9.3",
     "clean-webpack-plugin": "^1.0.0",
     "comlink": "^4.3.0",
+    "compromise-strict": "^0.0.2",
     "concurrently": "^4.0.0",
     "copy-webpack-plugin": "^9.0.1",
     "css-loader": "^5.1.2",

src/client/actions/airdcpp.actions.tsx

@@ -4,10 +4,7 @@ import {
   PriorityEnum,
   SearchResponse,
 } from "threetwo-ui-typings";
-import {
+import { LIBRARY_SERVICE_BASE_URI, SEARCH_SERVICE_BASE_URI } from "../constants/endpoints";
-  LIBRARY_SERVICE_BASE_URI,
-  SEARCH_SERVICE_BASE_URI,
-} from "../constants/endpoints";
 import {
   AIRDCPP_SEARCH_RESULTS_ADDED,
   AIRDCPP_SEARCH_RESULTS_UPDATED,
@@ -21,8 +18,6 @@ import {
   IMS_COMIC_BOOK_DB_OBJECT_FETCHED,
   AIRDCPP_TRANSFERS_FETCHED,
   LIBRARY_ISSUE_BUNDLES,
-  AIRDCPP_SOCKET_CONNECTED,
-  AIRDCPP_SOCKET_DISCONNECTED,
 } from "../constants/action-types";
 import { isNil } from "lodash";
 import axios from "axios";
@@ -37,34 +32,16 @@ function sleep(ms: number): Promise<NodeJS.Timeout> {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
-export const toggleAirDCPPSocketConnectionStatus =
-  (status: String, payload?: any) => async (dispatch) => {
-    switch (status) {
-      case "connected":
-        dispatch({
-          type: AIRDCPP_SOCKET_CONNECTED,
-          data: payload,
-        });
-        break;
-
-      case "disconnected":
-        dispatch({
-          type: AIRDCPP_SOCKET_DISCONNECTED,
-          data: payload,
-        });
-        break;
-
-      default:
-        console.log("Can't set AirDC++ socket status.");
-        break;
-    }
-  };
 export const search =
   (data: SearchData, ADCPPSocket: any, credentials: any) =>
     async (dispatch) => {
       try {
         if (!ADCPPSocket.isConnected()) {
-        await ADCPPSocket();
+          await ADCPPSocket.connect(
+            credentials.username,
+            credentials.password,
+            true,
+          );
         }
         const instance: SearchInstance = await ADCPPSocket.post("search");
         dispatch({
@@ -137,20 +114,21 @@ export const search =
     };
 
 export const downloadAirDCPPItem =
-  (
+  (searchInstanceId: Number,
-    searchInstanceId: Number,
     resultId: String,
     comicObjectId: String,
-    name: String,
+    name: String, size: Number, type: any,
-    size: Number,
-    type: any,
     ADCPPSocket: any,
     credentials: any,
   ): void =>
     async (dispatch) => {
       try {
         if (!ADCPPSocket.isConnected()) {
-        await ADCPPSocket.connect();
+          await ADCPPSocket.connect(
+            `${credentials.username}`,
+            `${credentials.password}`,
+            true,
+          );
         }
         let bundleDBImportResult = {};
         const downloadResult = await ADCPPSocket.post(
@@ -184,6 +162,7 @@ export const downloadAirDCPPItem =
             comicBookDetail: bundleDBImportResult.data,
             IMS_inProgress: false,
           });
+
         }
       } catch (error) {
         throw error;
@@ -195,7 +174,11 @@ export const getBundlesForComic =
     async (dispatch) => {
       try {
         if (!ADCPPSocket.isConnected()) {
-        await ADCPPSocket.connect();
+          await ADCPPSocket.connect(
+            `${credentials.username}`,
+            `${credentials.password}`,
+            true,
+          );
         }
         const comicObject = await axios({
           method: "POST",
@@ -209,8 +192,7 @@ export const getBundlesForComic =
         });
         // get only the bundles applicable for the comic
         if (comicObject.data.acquisition.directconnect) {
-        const filteredBundles =
+          const filteredBundles = comicObject.data.acquisition.directconnect.downloads.map(
-          comicObject.data.acquisition.directconnect.downloads.map(
             async ({ bundleId }) => {
               return await ADCPPSocket.get(`queue/bundles/${bundleId}`);
             },
@@ -229,7 +211,11 @@ export const getTransfers =
   (ADCPPSocket: any, credentials: any) => async (dispatch) => {
     try {
       if (!ADCPPSocket.isConnected()) {
-        await ADCPPSocket.connect();
+        await ADCPPSocket.connect(
+          `${credentials.username}`,
+          `${credentials.password}`,
+          true,
+        );
       }
       const bundles = await ADCPPSocket.get("queue/bundles/1/85", {});
       if (!isNil(bundles)) {
@@ -248,6 +234,7 @@ export const getTransfers =
           type: LIBRARY_ISSUE_BUNDLES,
           issue_bundles,
         });
+
       }
     } catch (err) {
       throw err;

src/client/assets/scss/App.scss

@@ -62,10 +62,6 @@ pre {
     margin-left: -300px;
     min-width: 500px;
   }
-  .airdcpp-status {
-    min-width: 300px;
-    line-height: 1.7rem;
-  }
   body {
     background: #454a59;
   }

src/client/components/Dashboard/RecentlyImported.tsx

@@ -2,6 +2,7 @@ import React, { ReactElement } from "react";
 import Card from "../Carda";
 import { Link } from "react-router-dom";
 import ellipsize from "ellipsize";
+import { escapePoundSymbol } from "../../shared/utils/formatting.utils";
 import { isEmpty, isNil, isUndefined, map } from "lodash";
 import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";
 import Masonry from "react-masonry-css";
@@ -51,6 +52,7 @@ export const RecentlyImported = ({
             },
             idx,
           ) => {
+            console.log(comicvine);
             const { issueName, url } = determineCoverFile({
               rawFileDetails,
               comicvine,
@@ -62,6 +64,7 @@ export const RecentlyImported = ({
               comicInfo,
               locg,
             });
+            console.log(name);
             const isComicBookMetadataAvailable =
               !isUndefined(comicvine) &&
               !isUndefined(comicvine.volumeInformation);

src/client/components/Library/Library.tsx

@@ -8,6 +8,7 @@ import { useDispatch, useSelector } from "react-redux";
 import { searchIssue } from "../../actions/fileops.actions";
 import ellipsize from "ellipsize";
 
+
 /**
  * Component that tabulates the contents of the user's ThreeTwo Library.
  * 
@@ -19,10 +20,9 @@ export const Library = (): ReactElement => {
   const searchResults = useSelector(
     (state: RootState) => state.fileOps.libraryComics,
   );
-  const searchError = useSelector((state: RootState) => {
+  const searchError = useSelector(
-    console.log(state);
+    (state: RootState) => state.fileOps.librarySearchError,
-    return state.fileOps.librarySearchError;
+  );
-  });
   const dispatch = useDispatch();
   useEffect(() => {
     dispatch(
@@ -36,7 +36,7 @@ export const Library = (): ReactElement => {
             from: 0,
           },
           type: "all",
-          trigger: "libraryPage",
+          trigger: "libraryPage"
         },
       ),
     );
@@ -89,8 +89,7 @@ export const Library = (): ReactElement => {
   const WantedStatus = ({ value }) => {
     return !value ? <span className="tag is-info is-light">Wanted</span> : null;
   };
-  const columns = useMemo(
+  const columns = useMemo(() => [
-    () => [
     {
       header: "Comic Metadata",
       footer: 1,
@@ -100,7 +99,7 @@ export const Library = (): ReactElement => {
           id: "fileDetails",
           minWidth: 400,
           accessorKey: "_source",
-            cell: (info) => {
+          cell: info => {
             return <MetadataPanel data={info.getValue()} />;
           },
         },
@@ -109,7 +108,7 @@ export const Library = (): ReactElement => {
           accessorKey: "_source.sourcedMetadata.comicInfo",
           align: "center",
           minWidth: 250,
-            cell: (info) =>
+          cell: info =>
             !isEmpty(info.getValue()) ? (
               <ComicInfoXML data={info.getValue()} />
             ) : (
@@ -123,8 +122,9 @@ export const Library = (): ReactElement => {
       columns: [
         {
           header: "Publisher",
-            accessorKey: "_source.sourcedMetadata.comicvine.volumeInformation",
+          accessorKey:
-            cell: (info) => {
+            "_source.sourcedMetadata.comicvine.volumeInformation",
+          cell: info => {
             return (
               !isNil(info.getValue()) && (
                 <h6 className="is-size-7 has-text-weight-bold">
@@ -137,19 +137,15 @@ export const Library = (): ReactElement => {
         {
           header: "Something",
           accessorKey: "_source.acquisition.source.wanted",
-            cell: (info) => {
+          cell: info => {
-              !isUndefined(info.getValue()) ? (
+            !isUndefined(info.getValue()) ?
-                <WantedStatus value={info.getValue().toString()} />
+              <WantedStatus value={info.getValue().toString()} /> : "Nothing";
-              ) : (
-                "Nothing"
-              );
           },
         },
       ],
-      },
+    }
-    ],
+  ], []);
-    [],
+
-  );
 
   /**
    * Pagination control that fetches the next x (pageSize) items
@@ -177,6 +173,7 @@ export const Library = (): ReactElement => {
     );
   }, []);
 
+
   /**
    * Pagination control that fetches the previous x (pageSize) items
    * based on the y (pageIndex) offset from the ThreeTwo Elasticsearch index
@@ -202,7 +199,7 @@ export const Library = (): ReactElement => {
             from,
           },
           type: "all",
-          trigger: "libraryPage",
+          trigger: "libraryPage"
         },
       ),
     );
@@ -211,13 +208,14 @@ export const Library = (): ReactElement => {
   // ImportStatus.propTypes = {
   //   value: PropTypes.bool.isRequired,
   // };
+
   return (
     <section className="container">
       <div className="section">
         <div className="header-area">
           <h1 className="title">Library</h1>
         </div>
-        {!isEmpty(searchResults) ? (
+        {!isUndefined(searchResults.hits) && (
           <div>
             <div className="library">
               <T2Table
@@ -232,26 +230,6 @@ export const Library = (): ReactElement => {
               />
             </div>
           </div>
-        ) : (
-          <div className="columns">
-            <div className="column is-two-thirds">
-              <article className="message is-link">
-                <div className="message-body">
-                  No comics were found in the library, Elasticsearch reports no
-                  indices. Try importing a few comics into the library and come
-                  back.
-                </div>
-              </article>
-              <pre>
-                {!isUndefined(searchError.data) &&
-                  JSON.stringify(
-                    searchError.data.meta.body.error.root_cause,
-                    null,
-                    4,
-                  )}
-              </pre>
-            </div>
-          </div>
         )}
       </div>
     </section>

src/client/components/Navbar.tsx

@@ -1,25 +1,15 @@
-import React, { useContext } from "react";
+import React from "react";
 import { SearchBar } from "./GlobalSearchBar/SearchBar";
 import { DownloadProgressTick } from "./ComicDetail/DownloadProgressTick";
 import { Link } from "react-router-dom";
 import { useSelector } from "react-redux";
 import { isUndefined } from "lodash";
-import { format, fromUnixTime } from "date-fns";
 
 const Navbar: React.FunctionComponent = (props) => {
   const downloadProgressTick = useSelector(
     (state: RootState) => state.airdcpp.downloadProgressData,
   );
 
-  const airDCPPSocketConnectionStatus = useSelector(
-    (state: RootState) => state.airdcpp.isAirDCPPSocketConnected,
-  );
-  const airDCPPSessionInfo = useSelector(
-    (state: RootState) => state.airdcpp.airDCPPSessionInfo,
-  );
-  const socketDisconnectionReason = useSelector(
-    (state: RootState) => state.airdcpp.socketDisconnectionReason,
-  );
   return (
     <nav className="navbar is-fixed-top">
       <div className="navbar-brand">
@@ -82,66 +72,18 @@ const Navbar: React.FunctionComponent = (props) => {
           <div className="navbar-item has-dropdown is-hoverable">
             <a className="navbar-link is-arrowless">
               <i className="fa-solid fa-download"></i>
-              {downloadProgressTick && <div className="pulsating-circle"></div>}
+              {downloadProgressTick && (
+                <div className="pulsating-circle"></div>
+              )}
             </a>
             {!isUndefined(downloadProgressTick) ? (
-              <div className="navbar-dropdown is-right">
+              <div className="navbar-dropdown download-progress-meter">
                 <a className="navbar-item">
                   <DownloadProgressTick data={downloadProgressTick} />
-                </a>              </div>
+                </a>
+              </div>
             ) : null}
           </div>
-          {/* AirDC++ socket connection status */}
-          <div className="navbar-item has-dropdown is-hoverable">
-            {airDCPPSocketConnectionStatus ? (
-              <>
-                <a className="navbar-link is-arrowless has-text-success">
-                  <i className="fa-solid fa-bolt"></i>
-                </a>
-                <div className="navbar-dropdown pt-4 pr-2 pl-2 is-right airdcpp-status">
-                  {/* AirDC++ Session Information */}
-
-                  <p>
-                    Last login was{" "}
-                    <span className="tag">
-                      {format(
-                        fromUnixTime(airDCPPSessionInfo.user.last_login),
-                        "dd MMMM, yyyy",
-                      )}
-                    </span>
-                  </p>
-                  <hr className="navbar-divider" />
-                  <p>
-                    <span className="tag has-text-success">
-                      {airDCPPSessionInfo.user.username}
-                    </span>
-                    connected to{" "}
-                    <span className="tag has-text-success">
-                      {airDCPPSessionInfo.system_info.client_version}
-                    </span>{" "}
-                    with session ID{" "}
-                    <span className="tag has-text-success">
-                      {airDCPPSessionInfo.session_id}
-                    </span>
-                  </p>
-
-                  {/* <pre>{JSON.stringify(airDCPPSessionInfo, null, 2)}</pre> */}
-                </div>
-              </>
-            ) : (
-              <>
-                <a className="navbar-link is-arrowless has-text-danger">
-                  <i className="fa-solid fa-bolt"></i>
-                </a>
-                <div className="navbar-dropdown pr-2 pl-2 is-right">
-                  <pre>
-                    {JSON.stringify(socketDisconnectionReason, null, 2)}
-                  </pre>
-                </div>
-              </>
-            )}
-          </div>
-
           <div className="navbar-item has-dropdown is-hoverable is-mega">
             <div className="navbar-link flex">Blog</div>
             <div id="blogDropdown" className="navbar-dropdown">

src/client/constants/action-types.ts

@@ -115,8 +115,6 @@ export const AIRDCPP_FILE_DOWNLOAD_COMPLETED =
 export const LS_SINGLE_IMPORT = "LS_SINGLE_IMPORT";
 export const AIRDCPP_BUNDLES_FETCHED = "AIRDCPP_BUNDLES_FETCHED";
 export const AIRDCPP_DOWNLOAD_PROGRESS_TICK = "AIRDCPP_DOWNLOAD_PROGRESS_TICK";
-export const AIRDCPP_SOCKET_CONNECTED = "AIRDCPP_SOCKET_CONNECTED";
-export const AIRDCPP_SOCKET_DISCONNECTED = "AIRDCPP_SOCKET_DISCONNECTED";
 
 // Transfers
 export const AIRDCPP_TRANSFERS_FETCHED = "AIRDCPP_TRANSFERS_FETCHED";

src/client/context/AirDCPPSocket.tsx

@@ -1,9 +1,7 @@
 import { isEmpty, isUndefined } from "lodash";
 import React, { createContext, useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import { toggleAirDCPPSocketConnectionStatus } from "../actions/airdcpp.actions";
 import { getSettings } from "../actions/settings.actions";
-
 import AirDCPPSocket from "../services/DcppSearchService";
 
 const AirDCPPSocketContextProvider = ({ children }) => {
@@ -14,7 +12,7 @@ const AirDCPPSocketContextProvider = ({ children }) => {
       airDCPPState: {
         settings: settingsObject,
         socket: {},
-        socketConectionInformation: {},
+        socketConnectionInformation: {},
       },
     });
   };
@@ -53,35 +51,16 @@ const AirDCPPSocketContextProvider = ({ children }) => {
         client: { host },
       },
     } = configuration;
-
     const initializedAirDCPPSocket = new AirDCPPSocket({
       protocol: `${host.protocol}`,
       hostname: `${host.hostname}:${host.port}`,
-      username: `${host.username}`,
-      password: `${host.password}`,
     });
 
-    // connect and disconnect handlers
+    const socketConnectionInformation = await initializedAirDCPPSocket.connect(
-    initializedAirDCPPSocket.onConnected = (sessionInfo) => {
+      `${host.username}`,
-      dispatch(toggleAirDCPPSocketConnectionStatus("connected", sessionInfo));
+      `${host.password}`,
-    };
+      true,
-    initializedAirDCPPSocket.onDisconnected = async (
-      reason,
-      code,
-      wasClean,
-    ) => {
-      dispatch(
-        toggleAirDCPPSocketConnectionStatus("disconnected", {
-          reason,
-          code,
-          wasClean,
-        }),
     );
-    };
-
-    const socketConnectionInformation = await initializedAirDCPPSocket.connect();
-
-    // update the state with the new socket connection information
     persistSettings({
       ...airDCPPState,
       airDCPPState: {

src/client/reducers/airdcpp.reducer.ts

@@ -9,8 +9,6 @@ import {
   AIRDCPP_BUNDLES_FETCHED,
   AIRDCPP_TRANSFERS_FETCHED,
   LIBRARY_ISSUE_BUNDLES,
-  AIRDCPP_SOCKET_CONNECTED,
-  AIRDCPP_SOCKET_DISCONNECTED,
 } from "../constants/action-types";
 import { LOCATION_CHANGE } from "redux-first-history";
 import { isNil, isUndefined } from "lodash";
@@ -26,9 +24,6 @@ const initialState = {
   downloadFileStatus: {},
   bundles: [],
   transfers: [],
-  isAirDCPPSocketConnected: false,
-  airDCPPSessionInfo: {},
-  socketDisconnectionReason: {},
 };
 
 function airdcppReducer(state = initialState, action) {
@@ -100,23 +95,8 @@ function airdcppReducer(state = initialState, action) {
         ...state,
         transfers: action.bundles,
       };
-
-    case AIRDCPP_SOCKET_CONNECTED:
-      return {
-        ...state,
-        isAirDCPPSocketConnected: true,
-        airDCPPSessionInfo: action.data,
-      };
-
-    case AIRDCPP_SOCKET_DISCONNECTED:
-      return {
-        ...state,
-        isAirDCPPSocketConnected: false,
-        socketDisconnectionReason: action.data,
-      };
     case LOCATION_CHANGE:
       return {
-        ...state,
         searchResults: [],
         isAirDCPPSearchInProgress: false,
         searchInfo: null,
@@ -125,6 +105,7 @@ function airdcppReducer(state = initialState, action) {
         bundleDBImportResult: null,
         // bundles: [],
       };
+
     default:
       return state;
   }

src/client/services/DcppSearchService.ts

@@ -10,7 +10,7 @@ class AirDCPPSocket {
     }
     const options = {
       url: `${socketProtocol}://${configuration.hostname}/api/v1/`,
-      autoReconnect: true,
+      autoReconnect: false,
       reconnectInterval: 5,
       logLevel: "verbose",
       ignoredListenerEvents: [
@@ -18,8 +18,6 @@ class AirDCPPSocket {
         "hash_statistics",
         "hub_counts_updated",
       ],
-      username: `${configuration.username}`,
-      password: `${configuration.password}`,
     };
     const AirDCPPSocketInstance = Socket(options, window.WebSocket as any);
     return AirDCPPSocketInstance;

src/client/services/api/SearchApi.ts

@@ -18,7 +18,7 @@ function sleep(ms: number): Promise<NodeJS.Timeout> {
 }
 
 export const search = async (data: SearchData) => {
-  await SocketService.connect();
+  await SocketService.connect("admin", "password");
   const instance: SearchInstance = await SocketService.post("search");
   const unsubscribe = await SocketService.addListener(
     "search",

src/funding.yml

@@ -1 +0,0 @@
-github: [rishighan]

yarn.lock

@@ -6686,6 +6686,13 @@ character-reference-invalid@^1.0.0:
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
   integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
 
+chevrotain@7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/chevrotain/-/chevrotain-7.0.3.tgz#f9621971a726eba804f7763edace2183d157c5d7"
+  integrity sha512-G634q7M5EiqNNv+0MKcQES2jmqabbi4PvUDpzjG2t+i1XQFaMCz0o8BZ8lbQbZex4RqkzJ3pOy+UwNLFlQm4eg==
+  dependencies:
+    regexp-to-ast "0.5.0"
+
 chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -7113,7 +7120,14 @@ compromise-sentences@^0.3.0:
   resolved "https://registry.yarnpkg.com/compromise-sentences/-/compromise-sentences-0.3.0.tgz#61d34039323155bc20dad10f24340daaabf86e26"
   integrity sha512-L6d5PXmmyPyWRMoJURYOM0yILhtV37zCOy9ZW8Xd6KgY+2qQBTwuokekaGL9MDpSH3/grRDL+AHKytYpGrTEmA==
 
-compromise@^13.11.4:
+compromise-strict@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/compromise-strict/-/compromise-strict-0.0.2.tgz#e4bf4cc386e8795c6408d3606ebb2cd31cab9fbd"
+  integrity sha512-1ApkPa6kjmyS1ZFhDRZgttDcnVv+Ci8U0kIIsxRBLCN0vautyPm6FROvBwoLimlU3pgIH3hMIpdNdVfe2yj3Gw==
+  dependencies:
+    chevrotain "7.0.3"
+
+compromise@^13.11.3, compromise@^13.11.4:
   version "13.11.4"
   resolved "https://registry.yarnpkg.com/compromise/-/compromise-13.11.4.tgz#3136e6d2c2cca822ba7cebd140c9f27f405b67f1"
   integrity sha512-nBITcNdqIHSVDDluaG6guyFFCSNXN+Hu87fU8VlhkE5Z0PwTZN1nro2O7a8JcUH88nB5EOzrxd9zKfXLSNFqcg==
@@ -11993,9 +12007,9 @@ json2mq@^0.2.0:
     string-convert "^0.2.0"
 
 json5@^1.0.1:
-  version "1.0.2"
+  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
   dependencies:
     minimist "^1.2.0"
 
@@ -12959,9 +12973,9 @@ minimist-options@4.1.0:
     kind-of "^6.0.3"
 
 minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
-  version "1.2.7"
+  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
 minipass-collect@^1.0.2:
   version "1.0.2"
@@ -15841,6 +15855,11 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
+regexp-to-ast@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/regexp-to-ast/-/regexp-to-ast-0.5.0.tgz#56c73856bee5e1fef7f73a00f1473452ab712a24"
+  integrity sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==
+
 regexp.prototype.flags@^1.4.1, regexp.prototype.flags@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"