diff --git a/components/inspector.tsx b/components/inspector.tsx index b662169..dc39b18 100644 --- a/components/inspector.tsx +++ b/components/inspector.tsx @@ -4,7 +4,7 @@ import { Component } from 'react'; import { Engine } from './engine'; import { Glyph, GlyphStream } from './glyph-stream'; import { Match, MatchStream } from './match-stream'; -import { StateTree } from './state-tree'; +import { StateGraph } from './state-graph'; import { Welcome } from './welcome'; const padAll = (padding) => ({ @@ -75,7 +75,7 @@ export class Inspector extends Component { )} - + ); diff --git a/components/state-tree.tsx b/components/state-graph.tsx similarity index 83% rename from components/state-tree.tsx rename to components/state-graph.tsx index dfcb07e..e98426e 100644 --- a/components/state-tree.tsx +++ b/components/state-graph.tsx @@ -1,8 +1,29 @@ +import { when } from 'iter-tools-es'; import { useRef, useEffect } from 'react'; import * as d3 from 'd3'; -import { when } from 'iter-tools-es'; -// @ts-ignore-error -import { debugPrint } from '@iter-tools/regex/internal/debug'; + +function* alternatives(match) { + let alternative = match.head.worse; + + while (alternative) { + yield alternative.data; + alternative = alternative.worse; + } +} + +// export const StateList = ({ engine, style }) => { +// if (!engine) return null; + +// engine.root, engine.index, engine.width; + +// const nodes = [ +// ...map((alternative) => { +// return
  • Hello: {debugPrint(alternative.next)}
    • ; +// }, alternatives(engine.root)), +// ]; + +// return
      {nodes}
    ; +// }; const computeViewbox = (svg) => { const parentBox = svg.node().parentElement.getBoundingClientRect(); @@ -87,6 +108,7 @@ function Tree( Gs .selectAll('text') .data(d => { + debugger; const type = Object.getPrototypeOf(d.data).constructor.name; const isUnmatchedSequence = d.data.next?.name === 'unmatched'; return [ @@ -117,7 +139,7 @@ function Tree( return svg.node(); } -export const StateTree = ({ engine, style }) => { +export const StateGraph = ({ engine, style }) => { if (!engine) return null; const ref = useRef(null); @@ -127,7 +149,11 @@ export const StateTree = ({ engine, style }) => { computeViewbox(d3.select(ref.current)); }; window.addEventListener('resize', onResize); - Tree(d3.select(ref.current), engine.root); + Tree(d3.select(ref.current), engine.root, { + children(node) { + return node.head ? alternatives(node) : []; + }, + }); return () => { window.removeEventListener('resize', onResize); }; diff --git a/package.json b/package.json index f7b8ab8..cd9f6fc 100644 --- a/package.json +++ b/package.json @@ -9,14 +9,14 @@ "lint": "next lint" }, "dependencies": { - "@iter-tools/regex": "iter-tools/regex#9bab6c40e70141252bac88aae8ecf1debb51c37a", + "@iter-tools/regex": "iter-tools/regex#a35a0259bf288ccece2a1f6ffebcfdb7ac953517", "d3": "^7.4.2", "grommet": "^2.17.2", "grommet-icons": "^4.5.0", "iter-tools-es": "^7.3.1", - "next": "latest", - "react": "17.0.2", - "react-dom": "17.0.2", + "next": "13.1.6", + "react": "18.2.0", + "react-dom": "18.2.0", "react-is": "17.0.2", "styled-components": "^5.3.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f531a0f..1bf5336 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,7 +1,7 @@ lockfileVersion: 5.4 specifiers: - '@iter-tools/regex': iter-tools/regex#9bab6c40e70141252bac88aae8ecf1debb51c37a + '@iter-tools/regex': iter-tools/regex#a35a0259bf288ccece2a1f6ffebcfdb7ac953517 '@types/d3': 7.1.0 '@types/node': 17.0.23 '@types/react': 17.0.43 @@ -12,25 +12,25 @@ specifiers: grommet: ^2.17.2 grommet-icons: ^4.5.0 iter-tools-es: ^7.3.1 - next: latest + next: 13.1.6 prettier: 2.6.2 - react: 17.0.2 - react-dom: 17.0.2 + react: 18.2.0 + react-dom: 18.2.0 react-is: 17.0.2 styled-components: ^5.3.0 typescript: 4.6.3 dependencies: - '@iter-tools/regex': github.com/iter-tools/regex/9bab6c40e70141252bac88aae8ecf1debb51c37a - d3: 7.4.4 - grommet: 2.23.0_zxhai4qal7ezfht52cx4u672cu - grommet-icons: 4.7.0_zxhai4qal7ezfht52cx4u672cu + '@iter-tools/regex': link:../iter-tools-regex + d3: 7.8.2 + grommet: 2.23.0_2qpntmkb2tecmgal3aq2m37jiu + grommet-icons: 4.7.0_2qpntmkb2tecmgal3aq2m37jiu iter-tools-es: 7.3.1 - next: 12.1.6_sfoxds7t5ydpegc3knd667wn6m - react: 17.0.2 - react-dom: 17.0.2_react@17.0.2 + next: 13.1.6_biqbaboplfbrettd7655fr4n2y + react: 18.2.0 + react-dom: 18.2.0_react@18.2.0 react-is: 17.0.2 - styled-components: 5.3.5_fane7jikarojcev26y27hpbhu4 + styled-components: 5.3.5_pumtretovylab5lwhztzjp2kuy devDependencies: '@types/d3': 7.1.0 @@ -160,10 +160,6 @@ packages: /@emotion/unitless/0.7.5: resolution: {integrity: sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==} - /@iter-tools/imm-stack/1.1.0: - resolution: {integrity: sha512-5wCL8xt4sZ3v0buB3HrzqL2FTkaYB+ZVwkACo1G80zXWWG/8tSGgRiz7EQSkgDRrPQtpoGXRdOKW+GAVmG/Uyg==} - dev: false - /@jridgewell/gen-mapping/0.3.1: resolution: {integrity: sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==} engines: {node: '>=6.0.0'} @@ -189,12 +185,12 @@ packages: '@jridgewell/resolve-uri': 3.0.7 '@jridgewell/sourcemap-codec': 1.4.13 - /@next/env/12.1.6: - resolution: {integrity: sha512-Te/OBDXFSodPU6jlXYPAXpmZr/AkG6DCATAxttQxqOWaq6eDFX25Db3dK0120GZrSZmv4QCe9KsZmJKDbWs4OA==} + /@next/env/13.1.6: + resolution: {integrity: sha512-s+W9Fdqh5MFk6ECrbnVmmAOwxKQuhGMT7xXHrkYIBMBcTiOqNWhv5KbJIboKR5STXxNXl32hllnvKaffzFaWQg==} dev: false - /@next/swc-android-arm-eabi/12.1.6: - resolution: {integrity: sha512-BxBr3QAAAXWgk/K7EedvzxJr2dE014mghBSA9iOEAv0bMgF+MRq4PoASjuHi15M2zfowpcRG8XQhMFtxftCleQ==} + /@next/swc-android-arm-eabi/13.1.6: + resolution: {integrity: sha512-F3/6Z8LH/pGlPzR1AcjPFxx35mPqjE5xZcf+IL+KgbW9tMkp7CYi1y7qKrEWU7W4AumxX/8OINnDQWLiwLasLQ==} engines: {node: '>= 10'} cpu: [arm] os: [android] @@ -202,8 +198,8 @@ packages: dev: false optional: true - /@next/swc-android-arm64/12.1.6: - resolution: {integrity: sha512-EboEk3ROYY7U6WA2RrMt/cXXMokUTXXfnxe2+CU+DOahvbrO8QSWhlBl9I9ZbFzJx28AGB9Yo3oQHCvph/4Lew==} + /@next/swc-android-arm64/13.1.6: + resolution: {integrity: sha512-cMwQjnB8vrYkWyK/H0Rf2c2pKIH4RGjpKUDvbjVAit6SbwPDpmaijLio0LWFV3/tOnY6kvzbL62lndVA0mkYpw==} engines: {node: '>= 10'} cpu: [arm64] os: [android] @@ -211,8 +207,8 @@ packages: dev: false optional: true - /@next/swc-darwin-arm64/12.1.6: - resolution: {integrity: sha512-P0EXU12BMSdNj1F7vdkP/VrYDuCNwBExtRPDYawgSUakzi6qP0iKJpya2BuLvNzXx+XPU49GFuDC5X+SvY0mOw==} + /@next/swc-darwin-arm64/13.1.6: + resolution: {integrity: sha512-KKRQH4DDE4kONXCvFMNBZGDb499Hs+xcFAwvj+rfSUssIDrZOlyfJNy55rH5t2Qxed1e4K80KEJgsxKQN1/fyw==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] @@ -220,8 +216,8 @@ packages: dev: false optional: true - /@next/swc-darwin-x64/12.1.6: - resolution: {integrity: sha512-9FptMnbgHJK3dRDzfTpexs9S2hGpzOQxSQbe8omz6Pcl7rnEp9x4uSEKY51ho85JCjL4d0tDLBcXEJZKKLzxNg==} + /@next/swc-darwin-x64/13.1.6: + resolution: {integrity: sha512-/uOky5PaZDoaU99ohjtNcDTJ6ks/gZ5ykTQDvNZDjIoCxFe3+t06bxsTPY6tAO6uEAw5f6vVFX5H5KLwhrkZCA==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] @@ -229,8 +225,17 @@ packages: dev: false optional: true - /@next/swc-linux-arm-gnueabihf/12.1.6: - resolution: {integrity: sha512-PvfEa1RR55dsik/IDkCKSFkk6ODNGJqPY3ysVUZqmnWMDSuqFtf7BPWHFa/53znpvVB5XaJ5Z1/6aR5CTIqxPw==} + /@next/swc-freebsd-x64/13.1.6: + resolution: {integrity: sha512-qaEALZeV7to6weSXk3Br80wtFQ7cFTpos/q+m9XVRFggu+8Ib895XhMWdJBzew6aaOcMvYR6KQ6JmHA2/eMzWw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: false + optional: true + + /@next/swc-linux-arm-gnueabihf/13.1.6: + resolution: {integrity: sha512-OybkbC58A1wJ+JrJSOjGDvZzrVEQA4sprJejGqMwiZyLqhr9Eo8FXF0y6HL+m1CPCpPhXEHz/2xKoYsl16kNqw==} engines: {node: '>= 10'} cpu: [arm] os: [linux] @@ -238,8 +243,8 @@ packages: dev: false optional: true - /@next/swc-linux-arm64-gnu/12.1.6: - resolution: {integrity: sha512-53QOvX1jBbC2ctnmWHyRhMajGq7QZfl974WYlwclXarVV418X7ed7o/EzGY+YVAEKzIVaAB9JFFWGXn8WWo0gQ==} + /@next/swc-linux-arm64-gnu/13.1.6: + resolution: {integrity: sha512-yCH+yDr7/4FDuWv6+GiYrPI9kcTAO3y48UmaIbrKy8ZJpi7RehJe3vIBRUmLrLaNDH3rY1rwoHi471NvR5J5NQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -247,8 +252,8 @@ packages: dev: false optional: true - /@next/swc-linux-arm64-musl/12.1.6: - resolution: {integrity: sha512-CMWAkYqfGdQCS+uuMA1A2UhOfcUYeoqnTW7msLr2RyYAys15pD960hlDfq7QAi8BCAKk0sQ2rjsl0iqMyziohQ==} + /@next/swc-linux-arm64-musl/13.1.6: + resolution: {integrity: sha512-ECagB8LGX25P9Mrmlc7Q/TQBb9rGScxHbv/kLqqIWs2fIXy6Y/EiBBiM72NTwuXUFCNrWR4sjUPSooVBJJ3ESQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -256,8 +261,8 @@ packages: dev: false optional: true - /@next/swc-linux-x64-gnu/12.1.6: - resolution: {integrity: sha512-AC7jE4Fxpn0s3ujngClIDTiEM/CQiB2N2vkcyWWn6734AmGT03Duq6RYtPMymFobDdAtZGFZd5nR95WjPzbZAQ==} + /@next/swc-linux-x64-gnu/13.1.6: + resolution: {integrity: sha512-GT5w2mruk90V/I5g6ScuueE7fqj/d8Bui2qxdw6lFxmuTgMeol5rnzAv4uAoVQgClOUO/MULilzlODg9Ib3Y4Q==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -265,8 +270,8 @@ packages: dev: false optional: true - /@next/swc-linux-x64-musl/12.1.6: - resolution: {integrity: sha512-c9Vjmi0EVk0Kou2qbrynskVarnFwfYIi+wKufR9Ad7/IKKuP6aEhOdZiIIdKsYWRtK2IWRF3h3YmdnEa2WLUag==} + /@next/swc-linux-x64-musl/13.1.6: + resolution: {integrity: sha512-keFD6KvwOPzmat4TCnlnuxJCQepPN+8j3Nw876FtULxo8005Y9Ghcl7ACcR8GoiKoddAq8gxNBrpjoxjQRHeAQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -274,8 +279,8 @@ packages: dev: false optional: true - /@next/swc-win32-arm64-msvc/12.1.6: - resolution: {integrity: sha512-3UTOL/5XZSKFelM7qN0it35o3Cegm6LsyuERR3/OoqEExyj3aCk7F025b54/707HTMAnjlvQK3DzLhPu/xxO4g==} + /@next/swc-win32-arm64-msvc/13.1.6: + resolution: {integrity: sha512-OwertslIiGQluFvHyRDzBCIB07qJjqabAmINlXUYt7/sY7Q7QPE8xVi5beBxX/rxTGPIbtyIe3faBE6Z2KywhQ==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] @@ -283,8 +288,8 @@ packages: dev: false optional: true - /@next/swc-win32-ia32-msvc/12.1.6: - resolution: {integrity: sha512-8ZWoj6nCq6fI1yCzKq6oK0jE6Mxlz4MrEsRyu0TwDztWQWe7rh4XXGLAa2YVPatYcHhMcUL+fQQbqd1MsgaSDA==} + /@next/swc-win32-ia32-msvc/13.1.6: + resolution: {integrity: sha512-g8zowiuP8FxUR9zslPmlju7qYbs2XBtTLVSxVikPtUDQedhcls39uKYLvOOd1JZg0ehyhopobRoH1q+MHlIN/w==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] @@ -292,8 +297,8 @@ packages: dev: false optional: true - /@next/swc-win32-x64-msvc/12.1.6: - resolution: {integrity: sha512-4ZEwiRuZEicXhXqmhw3+de8Z4EpOLQj/gp+D9fFWo6ii6W1kBkNNvvEx4A90ugppu+74pT1lIJnOuz3A9oQeJA==} + /@next/swc-win32-x64-msvc/13.1.6: + resolution: {integrity: sha512-Ls2OL9hi3YlJKGNdKv8k3X/lLgc3VmLG3a/DeTkAd+lAituJp8ZHmRmm9f9SL84fT3CotlzcgbdaCDfFwFA6bA==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -301,6 +306,12 @@ packages: dev: false optional: true + /@swc/helpers/0.4.14: + resolution: {integrity: sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==} + dependencies: + tslib: 2.5.0 + dev: false + /@types/d3-array/3.0.3: resolution: {integrity: sha512-Reoy+pKnvsksN0lQUlcH6dOGjRZ/3WRwXR//m+/8lt1BXeI4xyaUZoqULNjyXXRuh0Mj4LNpkCvhUpQlY3X5xQ==} dev: true @@ -540,7 +551,7 @@ packages: '@babel/helper-module-imports': 7.16.7 babel-plugin-syntax-jsx: 6.18.0 lodash: 4.17.21 - styled-components: 5.3.5_fane7jikarojcev26y27hpbhu4 + styled-components: 5.3.5_pumtretovylab5lwhztzjp2kuy /babel-plugin-syntax-jsx/6.18.0: resolution: {integrity: sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==} @@ -548,8 +559,8 @@ packages: /camelize/1.0.0: resolution: {integrity: sha512-W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg==} - /caniuse-lite/1.0.30001342: - resolution: {integrity: sha512-bn6sOCu7L7jcbBbyNhLg0qzXdJ/PMbybZTH/BA6Roet9wxYRm6Tr9D0s0uhLkOZ6MSG+QU6txUgdpr3MXIVqjA==} + /caniuse-lite/1.0.30001457: + resolution: {integrity: sha512-SDIV6bgE1aVbK6XyxdURbUE89zY7+k1BBBaOwYwkNCglXlel/E7mELiHC64HQ+W0xSKlqWhV9Wh7iHxUjMs4fA==} dev: false /chalk/2.4.2: @@ -560,6 +571,10 @@ packages: escape-string-regexp: 1.0.5 supports-color: 5.5.0 + /client-only/0.0.1: + resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==} + dev: false + /color-convert/1.9.3: resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} dependencies: @@ -588,8 +603,8 @@ packages: resolution: {integrity: sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==} dev: true - /d3-array/3.1.6: - resolution: {integrity: sha512-DCbBBNuKOeiR9h04ySRBMW52TFVc91O9wJziuyXw6Ztmy8D3oZbmCkOO3UHKC7ceNJsN2Mavo9+vwV8EAEUXzA==} + /d3-array/3.2.2: + resolution: {integrity: sha512-yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ==} engines: {node: '>=12'} dependencies: internmap: 2.0.3 @@ -615,7 +630,7 @@ packages: resolution: {integrity: sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==} engines: {node: '>=12'} dependencies: - d3-path: 3.0.1 + d3-path: 3.1.0 dev: false /d3-color/3.1.0: @@ -623,11 +638,11 @@ packages: engines: {node: '>=12'} dev: false - /d3-contour/3.0.1: - resolution: {integrity: sha512-0Oc4D0KyhwhM7ZL0RMnfGycLN7hxHB8CMmwZ3+H26PWAG0ozNuYG5hXSDNgmP1SgJkQMrlG6cP20HoaSbvcJTQ==} + /d3-contour/4.0.2: + resolution: {integrity: sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==} engines: {node: '>=12'} dependencies: - d3-array: 3.1.6 + d3-array: 3.2.2 dev: false /d3-delaunay/6.0.2: @@ -686,11 +701,11 @@ packages: engines: {node: '>=12'} dev: false - /d3-geo/3.0.1: - resolution: {integrity: sha512-Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA==} + /d3-geo/3.1.0: + resolution: {integrity: sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==} engines: {node: '>=12'} dependencies: - d3-array: 3.1.6 + d3-array: 3.2.2 dev: false /d3-hierarchy/3.1.2: @@ -705,8 +720,8 @@ packages: d3-color: 3.1.0 dev: false - /d3-path/3.0.1: - resolution: {integrity: sha512-gq6gZom9AFZby0YLduxT1qmrp4xpBA1YZr19OI717WIdKE2OM5ETq5qrHLb301IgxhLwcuxvGZVLeeWc/k1I6w==} + /d3-path/3.1.0: + resolution: {integrity: sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==} engines: {node: '>=12'} dev: false @@ -737,10 +752,10 @@ packages: resolution: {integrity: sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==} engines: {node: '>=12'} dependencies: - d3-array: 3.1.6 + d3-array: 3.2.2 d3-format: 3.1.0 d3-interpolate: 3.0.1 - d3-time: 3.0.0 + d3-time: 3.1.0 d3-time-format: 4.1.0 dev: false @@ -749,25 +764,25 @@ packages: engines: {node: '>=12'} dev: false - /d3-shape/3.1.0: - resolution: {integrity: sha512-tGDh1Muf8kWjEDT/LswZJ8WF85yDZLvVJpYU9Nq+8+yW1Z5enxrmXOhTArlkaElU+CTn0OTVNli+/i+HP45QEQ==} + /d3-shape/3.2.0: + resolution: {integrity: sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==} engines: {node: '>=12'} dependencies: - d3-path: 3.0.1 + d3-path: 3.1.0 dev: false /d3-time-format/4.1.0: resolution: {integrity: sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==} engines: {node: '>=12'} dependencies: - d3-time: 3.0.0 + d3-time: 3.1.0 dev: false - /d3-time/3.0.0: - resolution: {integrity: sha512-zmV3lRnlaLI08y9IMRXSDshQb5Nj77smnfpnd2LrBa/2K281Jijactokeak14QacHs/kKq0AQ121nidNYlarbQ==} + /d3-time/3.1.0: + resolution: {integrity: sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==} engines: {node: '>=12'} dependencies: - d3-array: 3.1.6 + d3-array: 3.2.2 dev: false /d3-timer/3.0.1: @@ -800,16 +815,16 @@ packages: d3-transition: 3.0.1_d3-selection@3.0.0 dev: false - /d3/7.4.4: - resolution: {integrity: sha512-97FE+MYdAlV3R9P74+R3Uar7wUKkIFu89UWMjEaDhiJ9VxKvqaMxauImy8PC2DdBkdM2BxJOIoLxPrcZUyrKoQ==} + /d3/7.8.2: + resolution: {integrity: sha512-WXty7qOGSHb7HR7CfOzwN1Gw04MUOzN8qh9ZUsvwycIMb4DYMpY9xczZ6jUorGtO6bR9BPMPaueIKwiDxu9uiQ==} engines: {node: '>=12'} dependencies: - d3-array: 3.1.6 + d3-array: 3.2.2 d3-axis: 3.0.0 d3-brush: 3.0.0 d3-chord: 3.0.1 d3-color: 3.1.0 - d3-contour: 3.0.1 + d3-contour: 4.0.2 d3-delaunay: 6.0.2 d3-dispatch: 3.0.1 d3-drag: 3.0.0 @@ -818,18 +833,18 @@ packages: d3-fetch: 3.0.1 d3-force: 3.0.0 d3-format: 3.1.0 - d3-geo: 3.0.1 + d3-geo: 3.1.0 d3-hierarchy: 3.1.2 d3-interpolate: 3.0.1 - d3-path: 3.0.1 + d3-path: 3.1.0 d3-polygon: 3.0.1 d3-quadtree: 3.0.1 d3-random: 3.0.1 d3-scale: 4.0.2 d3-scale-chromatic: 3.0.0 d3-selection: 3.0.0 - d3-shape: 3.1.0 - d3-time: 3.0.0 + d3-shape: 3.2.0 + d3-time: 3.1.0 d3-time-format: 4.1.0 d3-timer: 3.0.1 d3-transition: 3.0.1_d3-selection@3.0.0 @@ -858,28 +873,24 @@ packages: resolution: {integrity: sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=} engines: {node: '>=0.8.0'} - /functional-red-black-tree/1.0.1: - resolution: {integrity: sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=} - dev: false - /globals/11.12.0: resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} engines: {node: '>=4'} - /grommet-icons/4.7.0_zxhai4qal7ezfht52cx4u672cu: + /grommet-icons/4.7.0_2qpntmkb2tecmgal3aq2m37jiu: resolution: {integrity: sha512-ptw8x86Age/Yz6SplCLtJ8q1z/4ZLktMruCOnE6oTgc7hcIV/8ieOucTrLbu+PDi7rKxoP321O3OG3Zo/3qXjw==} peerDependencies: react: '>= 16.6.0' react-dom: '>= 16.6.0' styled-components: '>= 5.x' dependencies: - grommet-styles: 0.2.0_zxhai4qal7ezfht52cx4u672cu - react: 17.0.2 - react-dom: 17.0.2_react@17.0.2 - styled-components: 5.3.5_fane7jikarojcev26y27hpbhu4 + grommet-styles: 0.2.0_2qpntmkb2tecmgal3aq2m37jiu + react: 18.2.0 + react-dom: 18.2.0_react@18.2.0 + styled-components: 5.3.5_pumtretovylab5lwhztzjp2kuy dev: false - /grommet-styles/0.2.0_zxhai4qal7ezfht52cx4u672cu: + /grommet-styles/0.2.0_2qpntmkb2tecmgal3aq2m37jiu: resolution: {integrity: sha512-0OMSYuGeyifYKpg4Gv2HzL8rUdd0ddnJ5LbCBKgDuloC71XIwr9g/Fxa6rs737MbPV7OZ4pEm4wvrjH4epzf1A==} engines: {node: '>= 8'} peerDependencies: @@ -887,12 +898,12 @@ packages: react-dom: '>= 16.4.1' styled-components: '>= 4.X' dependencies: - react: 17.0.2 - react-dom: 17.0.2_react@17.0.2 - styled-components: 5.3.5_fane7jikarojcev26y27hpbhu4 + react: 18.2.0 + react-dom: 18.2.0_react@18.2.0 + styled-components: 5.3.5_pumtretovylab5lwhztzjp2kuy dev: false - /grommet/2.23.0_zxhai4qal7ezfht52cx4u672cu: + /grommet/2.23.0_2qpntmkb2tecmgal3aq2m37jiu: resolution: {integrity: sha512-1iA7W/u2Q4+B/2I5ri2PV9PPdxkthgK3rVDtw6xIeAkO0DKa9DCr6zTnuXAPNnm8dZJDzO8Du0d04UQYmaK26Q==} engines: {node: '>= 14'} peerDependencies: @@ -900,13 +911,13 @@ packages: react-dom: ^16.6.1 || ^17.0.0 || ^18.0.0 styled-components: '>= 5.1' dependencies: - grommet-icons: 4.7.0_zxhai4qal7ezfht52cx4u672cu + grommet-icons: 4.7.0_2qpntmkb2tecmgal3aq2m37jiu hoist-non-react-statics: 3.3.2 - markdown-to-jsx: 7.1.7_react@17.0.2 + markdown-to-jsx: 7.1.7_react@18.2.0 prop-types: 15.8.1 - react: 17.0.2 - react-dom: 17.0.2_react@17.0.2 - styled-components: 5.3.5_fane7jikarojcev26y27hpbhu4 + react: 18.2.0 + react-dom: 18.2.0_react@18.2.0 + styled-components: 5.3.5_pumtretovylab5lwhztzjp2kuy dev: false /has-flag/3.0.0: @@ -951,13 +962,13 @@ packages: dependencies: js-tokens: 4.0.0 - /markdown-to-jsx/7.1.7_react@17.0.2: + /markdown-to-jsx/7.1.7_react@18.2.0: resolution: {integrity: sha512-VI3TyyHlGkO8uFle0IOibzpO1c1iJDcXcS/zBrQrXQQvJ2tpdwVzVZ7XdKsyRz1NdRmre4dqQkMZzUHaKIG/1w==} engines: {node: '>= 10'} peerDependencies: react: '>= 0.14.0' dependencies: - react: 17.0.2 + react: 18.2.0 dev: false /ms/2.1.2: @@ -969,15 +980,15 @@ packages: hasBin: true dev: false - /next/12.1.6_sfoxds7t5ydpegc3knd667wn6m: - resolution: {integrity: sha512-cebwKxL3/DhNKfg9tPZDQmbRKjueqykHHbgaoG4VBRH3AHQJ2HO0dbKFiS1hPhe1/qgc2d/hFeadsbPicmLD+A==} - engines: {node: '>=12.22.0'} + /next/13.1.6_biqbaboplfbrettd7655fr4n2y: + resolution: {integrity: sha512-hHlbhKPj9pW+Cymvfzc15lvhaOZ54l+8sXDXJWm3OBNBzgrVj6hwGPmqqsXg40xO1Leq+kXpllzRPuncpC0Phw==} + engines: {node: '>=14.6.0'} hasBin: true peerDependencies: fibers: '>= 3.1.0' node-sass: ^6.0.0 || ^7.0.0 - react: ^17.0.2 || ^18.0.0-0 - react-dom: ^17.0.2 || ^18.0.0-0 + react: ^18.2.0 + react-dom: ^18.2.0 sass: ^1.3.0 peerDependenciesMeta: fibers: @@ -987,25 +998,27 @@ packages: sass: optional: true dependencies: - '@next/env': 12.1.6 - caniuse-lite: 1.0.30001342 - postcss: 8.4.5 - react: 17.0.2 - react-dom: 17.0.2_react@17.0.2 - styled-jsx: 5.0.2_react@17.0.2 + '@next/env': 13.1.6 + '@swc/helpers': 0.4.14 + caniuse-lite: 1.0.30001457 + postcss: 8.4.14 + react: 18.2.0 + react-dom: 18.2.0_react@18.2.0 + styled-jsx: 5.1.1_react@18.2.0 optionalDependencies: - '@next/swc-android-arm-eabi': 12.1.6 - '@next/swc-android-arm64': 12.1.6 - '@next/swc-darwin-arm64': 12.1.6 - '@next/swc-darwin-x64': 12.1.6 - '@next/swc-linux-arm-gnueabihf': 12.1.6 - '@next/swc-linux-arm64-gnu': 12.1.6 - '@next/swc-linux-arm64-musl': 12.1.6 - '@next/swc-linux-x64-gnu': 12.1.6 - '@next/swc-linux-x64-musl': 12.1.6 - '@next/swc-win32-arm64-msvc': 12.1.6 - '@next/swc-win32-ia32-msvc': 12.1.6 - '@next/swc-win32-x64-msvc': 12.1.6 + '@next/swc-android-arm-eabi': 13.1.6 + '@next/swc-android-arm64': 13.1.6 + '@next/swc-darwin-arm64': 13.1.6 + '@next/swc-darwin-x64': 13.1.6 + '@next/swc-freebsd-x64': 13.1.6 + '@next/swc-linux-arm-gnueabihf': 13.1.6 + '@next/swc-linux-arm64-gnu': 13.1.6 + '@next/swc-linux-arm64-musl': 13.1.6 + '@next/swc-linux-x64-gnu': 13.1.6 + '@next/swc-linux-x64-musl': 13.1.6 + '@next/swc-win32-arm64-msvc': 13.1.6 + '@next/swc-win32-ia32-msvc': 13.1.6 + '@next/swc-win32-x64-msvc': 13.1.6 transitivePeerDependencies: - '@babel/core' - babel-plugin-macros @@ -1014,6 +1027,7 @@ packages: /object-assign/4.1.1: resolution: {integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=} engines: {node: '>=0.10.0'} + dev: false /picocolors/1.0.0: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} @@ -1022,8 +1036,8 @@ packages: /postcss-value-parser/4.2.0: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} - /postcss/8.4.5: - resolution: {integrity: sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==} + /postcss/8.4.14: + resolution: {integrity: sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.4 @@ -1045,15 +1059,14 @@ packages: react-is: 16.13.1 dev: false - /react-dom/17.0.2_react@17.0.2: - resolution: {integrity: sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==} + /react-dom/18.2.0_react@18.2.0: + resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==} peerDependencies: - react: 17.0.2 + react: ^18.2.0 dependencies: loose-envify: 1.4.0 - object-assign: 4.1.1 - react: 17.0.2 - scheduler: 0.20.2 + react: 18.2.0 + scheduler: 0.23.0 /react-is/16.13.1: resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} @@ -1061,35 +1074,28 @@ packages: /react-is/17.0.2: resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==} - /react/17.0.2: - resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==} + /react/18.2.0: + resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==} engines: {node: '>=0.10.0'} dependencies: loose-envify: 1.4.0 - object-assign: 4.1.1 - - /regexpp/3.2.0: - resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==} - engines: {node: '>=8'} - dev: false /robust-predicates/3.0.1: resolution: {integrity: sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g==} dev: false /rw/1.3.3: - resolution: {integrity: sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=} + resolution: {integrity: sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==} dev: false /safer-buffer/2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} dev: false - /scheduler/0.20.2: - resolution: {integrity: sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==} + /scheduler/0.23.0: + resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==} dependencies: loose-envify: 1.4.0 - object-assign: 4.1.1 /shallowequal/1.1.0: resolution: {integrity: sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==} @@ -1099,7 +1105,7 @@ packages: engines: {node: '>=0.10.0'} dev: false - /styled-components/5.3.5_fane7jikarojcev26y27hpbhu4: + /styled-components/5.3.5_pumtretovylab5lwhztzjp2kuy: resolution: {integrity: sha512-ndETJ9RKaaL6q41B69WudeqLzOpY1A/ET/glXkNZ2T7dPjPqpPCXXQjDFYZWwNnE5co0wX+gTCqx9mfxTmSIPg==} engines: {node: '>=10'} requiresBuild: true @@ -1116,14 +1122,14 @@ packages: babel-plugin-styled-components: 1.13.3_styled-components@5.3.5 css-to-react-native: 3.0.0 hoist-non-react-statics: 3.3.2 - react: 17.0.2 - react-dom: 17.0.2_react@17.0.2 + react: 18.2.0 + react-dom: 18.2.0_react@18.2.0 react-is: 17.0.2 shallowequal: 1.1.0 supports-color: 5.5.0 - /styled-jsx/5.0.2_react@17.0.2: - resolution: {integrity: sha512-LqPQrbBh3egD57NBcHET4qcgshPks+yblyhPlH2GY8oaDgKs8SK4C3dBh3oSJjgzJ3G5t1SYEZGHkP+QEpX9EQ==} + /styled-jsx/5.1.1_react@18.2.0: + resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==} engines: {node: '>= 12.0.0'} peerDependencies: '@babel/core': '*' @@ -1135,7 +1141,8 @@ packages: babel-plugin-macros: optional: true dependencies: - react: 17.0.2 + client-only: 0.0.1 + react: 18.2.0 dev: false /supports-color/5.5.0: @@ -1148,20 +1155,12 @@ packages: resolution: {integrity: sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=} engines: {node: '>=4'} + /tslib/2.5.0: + resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} + dev: false + /typescript/4.6.3: resolution: {integrity: sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==} engines: {node: '>=4.2.0'} hasBin: true dev: true - - github.com/iter-tools/regex/9bab6c40e70141252bac88aae8ecf1debb51c37a: - resolution: {tarball: https://codeload.github.com/iter-tools/regex/tar.gz/9bab6c40e70141252bac88aae8ecf1debb51c37a} - name: '@iter-tools/regex' - version: 0.2.0 - engines: {node: '>=12.0.0'} - dependencies: - '@iter-tools/imm-stack': 1.1.0 - functional-red-black-tree: 1.0.1 - iter-tools-es: 7.3.1 - regexpp: 3.2.0 - dev: false