diff --git a/.editorconfig b/.editorconfig index 0f17867..4039ff1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,3 +7,6 @@ indent_size = 2 indent_style = space insert_final_newline = true trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false diff --git a/CHANGELOG.md b/CHANGELOG.md index 8479b47..7a5278d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [5-r.1-beta.1] - 2023-08-17 + +### Added + +* Add Wankoromochi as a model bundled with SDK. + +### Fixed +* Fix blurry image and models on mobile devices. by [@Tsar](https://github.com/Tsar) +* Fix a bug that caused scroll-blocking violations to appear in the log. + + ## [4-r.7] - 2023-05-25 ### Added @@ -192,6 +203,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). * Fix issue with reloading model images in WebKit. +[5-r.1-beta.1]: https://github.com/Live2D/CubismWebSamples/compare/4-r.7...5-r.1-beta.1 [4-r.7]: https://github.com/Live2D/CubismWebSamples/compare/4-r.6.2...4-r.7 [4-r.6.2]: https://github.com/Live2D/CubismWebSamples/compare/4-r.6.1...4-r.6.2 [4-r.6.1]: https://github.com/Live2D/CubismWebSamples/compare/4-r.6...4-r.6.1 diff --git a/Core/CHANGELOG.md b/Core/CHANGELOG.md index fc5b177..3ca60c4 100644 --- a/Core/CHANGELOG.md +++ b/Core/CHANGELOG.md @@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). + +## 2023-08-17 + +### Added + +* Enhance Blend Shape features. + * Please see [here](https://docs.live2d.com/en/cubism-editor-manual/blend-shape/). + +### Changed + +* Upgrade Core version to 05.00.0000. + + +## 2023-05-09 + +### Changed + +* Change the GCC version of the library for Linux from 6.5.0 to 8.3.0. + + ## 2023-03-16 ### Fixed diff --git a/Framework b/Framework index 6971f20..ae7a189 160000 --- a/Framework +++ b/Framework @@ -1 +1 @@ -Subproject commit 6971f204ce5ee42e80283abf712b0385cd7cd961 +Subproject commit ae7a189f98533a67f69dfa756232235648b9611c diff --git a/LICENSE.md b/LICENSE.md index 2d045f3..1ced6cc 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -55,6 +55,7 @@ Samples/Resources/Mao Samples/Resources/Mark Samples/Resources/Natori Samples/Resources/Rice +Samples/Resources/Wanko ``` If you use these models, you must agree to the terms of a contract set [here](https://docs.live2d.com/cubism-editor-manual/sample-model/) for each model. diff --git a/README.ja.md b/README.ja.md index 420b40d..1f0cb51 100644 --- a/README.ja.md +++ b/README.ja.md @@ -4,7 +4,7 @@ # Cubism Web Samples -Live2D Cubism 4 Editor で出力したモデルを表示するアプリケーションのサンプル実装です。 +Live2D Cubism Editor で出力したモデルを表示するアプリケーションのサンプル実装です。 Cubism Web Framework および Live2D Cubism Core と組み合わせて使用します。 @@ -19,6 +19,12 @@ Cubism Web Framework および Live2D Cubism Core と組み合わせて使用し 本 SDK を使用する前に、[お知らせ](NOTICE.ja.md)をご確認ください。 +## Cubism 5新機能や過去バージョンとの互換性について + +本 SDK はCubism 5に対応した製品です。 +Cubism 5 Editorに搭載された新機能のSDK対応については [こちら](https://docs.live2d.com/cubism-sdk-manual/cubism-5-new-functions/)をご確認ください。 +過去バージョンのCubism SDKとの互換性については [こちら](https://docs.live2d.com/cubism-sdk-manual/compatibility-with-cubism-5/)をご確認ください。 + ## ディレクトリ構成 ``` @@ -84,9 +90,9 @@ NOTE: デバック用の設定は、`.vscode/launch.json` に記述していま ### Node.js -* 20.1.0 -* 18.16.0 -* 16.20.0 +* 20.5.1 +* 18.17.1 +* 16.20.2 ## 動作確認環境 diff --git a/README.md b/README.md index 1955efa..7d258ba 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # Cubism Web Samples -This is a sample implementation of an application that displays models output by Live2D Cubism 4 Editor. +This is a sample implementation of an application that displays models output by Live2D Cubism Editor. It is used in conjunction with the Cubism Web Framework and Live2D Cubism Core. @@ -19,6 +19,14 @@ Please check the [license](LICENSE.md) before using this SDK. Please check the [notices](NOTICE.md) before using this SDK. +## Compatibility with Cubism 5 new features and previous Cubism SDK versions + +This SDK is compatible with Cubism 5. +For SDK compatibility with new features in Cubism 5 Editor, please refer to [here](https://docs.live2d.com/en/cubism-sdk-manual/cubism-5-new-functions/). +For compatibility with previous versions of Cubism SDK, please refer to [here](https://docs.live2d.com/en/cubism-sdk-manual/compatibility-with-cubism-5/). + + + ## Directory structure ``` @@ -83,9 +91,9 @@ Please refer to [CHANGELOG.md](CHANGELOG.md) for the changelog of this repositor ### Node.js -* 20.1.0 -* 18.16.0 -* 16.20.0 +* 20.5.1 +* 18.17.1 +* 16.20.2 ## Operation environment diff --git a/Samples/Resources/Wanko/Wanko.1024/texture_00.png b/Samples/Resources/Wanko/Wanko.1024/texture_00.png new file mode 100644 index 0000000..09ee282 Binary files /dev/null and b/Samples/Resources/Wanko/Wanko.1024/texture_00.png differ diff --git a/Samples/Resources/Wanko/Wanko.cdi3.json b/Samples/Resources/Wanko/Wanko.cdi3.json new file mode 100644 index 0000000..5411d28 --- /dev/null +++ b/Samples/Resources/Wanko/Wanko.cdi3.json @@ -0,0 +1,261 @@ +{ + "Version": 3, + "Parameters": [ + { + "Id": "PARAM_ANGLE_X", + "GroupId": "", + "Name": "角度 X" + }, + { + "Id": "PARAM_ANGLE_Y", + "GroupId": "", + "Name": "角度 Y" + }, + { + "Id": "PARAM_ANGLE_Z", + "GroupId": "", + "Name": "角度 Z" + }, + { + "Id": "PARAM_EYE_L_OPEN", + "GroupId": "", + "Name": "左眼　開閉" + }, + { + "Id": "PARAM_EYE_R_OPEN", + "GroupId": "", + "Name": "右眼　開閉" + }, + { + "Id": "PARAM_MOUTH_FORM", + "GroupId": "", + "Name": "口　変形" + }, + { + "Id": "PARAM_MOUTH_OPEN_Y", + "GroupId": "", + "Name": "口　開閉" + }, + { + "Id": "PARAM_TERE", + "GroupId": "", + "Name": "照れ" + }, + { + "Id": "PARAM_BODY_ANGLE_X", + "GroupId": "", + "Name": "体の回転　X" + }, + { + "Id": "PARAM_BODY_ANGLE_Z", + "GroupId": "", + "Name": "体の回転　Z" + }, + { + "Id": "PARAM_BODY_ANGLE_Y", + "GroupId": "", + "Name": "体の回転　Y" + }, + { + "Id": "PARAM_BREATH", + "GroupId": "", + "Name": "呼吸" + }, + { + "Id": "PARAM_BOWL_LID", + "GroupId": "", + "Name": "お椀　ふた" + }, + { + "Id": "PARAM_YUGE_01", + "GroupId": "", + "Name": "湯気" + }, + { + "Id": "PARAM_YUGE_02", + "GroupId": "", + "Name": "湯気" + }, + { + "Id": "PARAM_EFFECT", + "GroupId": "", + "Name": "エフェクト" + }, + { + "Id": "PARAM_EAR_L", + "GroupId": "", + "Name": "左耳" + }, + { + "Id": "PARAM_EAR_R", + "GroupId": "", + "Name": "右耳" + }, + { + "Id": "PARAM_HAND_L", + "GroupId": "", + "Name": "左手" + }, + { + "Id": "PARAM_HAND_R", + "GroupId": "", + "Name": "右手" + }, + { + "Id": "PARAM_SWING", + "GroupId": "", + "Name": "揺れ" + }, + { + "Id": "PARAM_BOWL_SWING", + "GroupId": "", + "Name": "揺れ　お椀" + }, + { + "Id": "PARAM_FACE_01", + "GroupId": "", + "Name": "どや キリッ" + }, + { + "Id": "PARAM_BASE_X", + "GroupId": "", + "Name": "全体の左右" + }, + { + "Id": "PARAM_BASE_Y", + "GroupId": "", + "Name": "全体の上下" + } + ], + "ParameterGroups": [], + "Parts": [ + { + "Id": "PARTS_01_SKETCH", + "Name": "[ 下絵 ]" + }, + { + "Id": "PARTS_01_BACKGROUND", + "Name": "背景" + }, + { + "Id": "PARTS_01_BOWL", + "Name": "お椀" + }, + { + "Id": "PARTS_01_BODY", + "Name": "体" + }, + { + "Id": "PARTS_01_EAR_001", + "Name": "耳" + }, + { + "Id": "PARTS_01_NOSE_001", + "Name": "鼻" + }, + { + "Id": "PARTS_01_MOUTH_001", + "Name": "口" + }, + { + "Id": "PARTS_01_BROW_001", + "Name": "まゆ毛" + }, + { + "Id": "PARTS_01_EYE_BALL_001", + "Name": "目玉" + }, + { + "Id": "PARTS_01_EYE_001", + "Name": "目" + }, + { + "Id": "PARTS_01_FACE_001", + "Name": "顔" + }, + { + "Id": "PARTS_01_HOHO", + "Name": "頬" + }, + { + "Id": "PARTS_01_EFFECT", + "Name": "エフェクト" + }, + { + "Id": "PARTS_01_ITEM_16", + "Name": "蕎麦６杯目" + }, + { + "Id": "PARTS_01_ITEM_15", + "Name": "ベニテングタケ" + }, + { + "Id": "PARTS_01_ITEM_14", + "Name": "蕎麦５杯目" + }, + { + "Id": "PARTS_01_ITEM_13", + "Name": "しいたけ" + }, + { + "Id": "PARTS_01_ITEM_12", + "Name": "みかん" + }, + { + "Id": "PARTS_01_ITEM_11", + "Name": "蕎麦４杯目" + }, + { + "Id": "PARTS_01_ITEM_10", + "Name": "王冠" + }, + { + "Id": "PARTS_01_ITEM_09", + "Name": "まゆげ" + }, + { + "Id": "PARTS_01_ITEM_08", + "Name": "蕎麦３杯目" + }, + { + "Id": "PARTS_01_ITEM_07", + "Name": "アフロ" + }, + { + "Id": "PARTS_01_ITEM_06", + "Name": "リボン" + }, + { + "Id": "PARTS_01_ITEM_05", + "Name": "蕎麦２杯目" + }, + { + "Id": "PARTS_01_ITEM_04", + "Name": "星" + }, + { + "Id": "PARTS_01_ITEM_03", + "Name": "ひげ" + }, + { + "Id": "PARTS_01_ITEM_02", + "Name": "蕎麦１杯目" + }, + { + "Id": "PARTS_01_ITEM_01", + "Name": "たんぽぽ" + }, + { + "Id": "PARTS_01_CORE_ITEM", + "Name": "コア　アイテム" + }, + { + "Id": "PARTS_01_CORE", + "Name": "コア" + }, + { + "Id": "ROUGH", + "Name": "ラフ" + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Wanko/Wanko.moc3 b/Samples/Resources/Wanko/Wanko.moc3 new file mode 100644 index 0000000..b686610 Binary files /dev/null and b/Samples/Resources/Wanko/Wanko.moc3 differ diff --git a/Samples/Resources/Wanko/Wanko.model3.json b/Samples/Resources/Wanko/Wanko.model3.json new file mode 100644 index 0000000..95ffeeb --- /dev/null +++ b/Samples/Resources/Wanko/Wanko.model3.json @@ -0,0 +1,55 @@ +{ + "Version": 3, + "FileReferences": { + "Moc": "Wanko.moc3", + "Textures": [ + "Wanko.1024/texture_00.png" + ], + "Physics": "Wanko.physics3.json", + "DisplayInfo": "Wanko.cdi3.json", + "Motions": { + "Idle": [ + { + "File": "motions/idle_01.motion3.json" + }, + { + "File": "motions/idle_03.motion3.json" + }, + { + "File": "motions/idle_04.motion3.json" + } + ], + "TapBody": [ + { + "File": "motions/touch_02.motion3.json" + }, + { + "File": "motions/touch_04.motion3.json" + } + ] + } + }, + "Groups": [ + { + "Target": "Parameter", + "Name": "EyeBlink", + "Ids": [ + "PARAM_EYE_L_OPEN", + "PARAM_EYE_R_OPEN" + ] + }, + { + "Target": "Parameter", + "Name": "LipSync", + "Ids": [ + "PARAM_MOUTH_OPEN_Y" + ] + } + ], + "HitAreas": [ + { + "Id": "HitArea", + "Name": "Body" + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Wanko/Wanko.physics3.json b/Samples/Resources/Wanko/Wanko.physics3.json new file mode 100644 index 0000000..604bbfb --- /dev/null +++ b/Samples/Resources/Wanko/Wanko.physics3.json @@ -0,0 +1,373 @@ +{ + "Version": 3, + "Meta": { + "PhysicsSettingCount": 4, + "TotalInputCount": 14, + "TotalOutputCount": 4, + "VertexCount": 8, + "EffectiveForces": { + "Gravity": { + "X": 0, + "Y": -1 + }, + "Wind": { + "X": 0, + "Y": 0 + } + }, + "PhysicsDictionary": [ + { + "Id": "PhysicsSetting1", + "Name": "お椀揺れ" + }, + { + "Id": "PhysicsSetting2", + "Name": "揺れ" + }, + { + "Id": "PhysicsSetting3", + "Name": "右耳" + }, + { + "Id": "PhysicsSetting4", + "Name": "左耳" + } + ] + }, + "PhysicsSettings": [ + { + "Id": "PhysicsSetting1", + "Input": [ + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X" + }, + "Weight": 100, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z" + }, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Output": [ + { + "Destination": { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING" + }, + "VertexIndex": 1, + "Scale": 1, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Vertices": [ + { + "Position": { + "X": 0, + "Y": 0 + }, + "Mobility": 1, + "Delay": 1, + "Acceleration": 1, + "Radius": 0 + }, + { + "Position": { + "X": 0, + "Y": 3 + }, + "Mobility": 0.8, + "Delay": 0.9, + "Acceleration": 1.5, + "Radius": 3 + } + ], + "Normalization": { + "Position": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + }, + "Angle": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + } + } + }, + { + "Id": "PhysicsSetting2", + "Input": [ + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y" + }, + "Weight": 100, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z" + }, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Output": [ + { + "Destination": { + "Target": "Parameter", + "Id": "PARAM_SWING" + }, + "VertexIndex": 1, + "Scale": 1, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Vertices": [ + { + "Position": { + "X": 0, + "Y": 0 + }, + "Mobility": 1, + "Delay": 1, + "Acceleration": 1, + "Radius": 0 + }, + { + "Position": { + "X": 0, + "Y": 5 + }, + "Mobility": 0.85, + "Delay": 0.9, + "Acceleration": 1, + "Radius": 5 + } + ], + "Normalization": { + "Position": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + }, + "Angle": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + } + } + }, + { + "Id": "PhysicsSetting3", + "Input": [ + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X" + }, + "Weight": 50, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y" + }, + "Weight": 20, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z" + }, + "Weight": 60, + "Type": "Angle", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X" + }, + "Weight": 30, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z" + }, + "Weight": 40, + "Type": "Angle", + "Reflect": false + } + ], + "Output": [ + { + "Destination": { + "Target": "Parameter", + "Id": "PARAM_EAR_R" + }, + "VertexIndex": 1, + "Scale": 1.5, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Vertices": [ + { + "Position": { + "X": 0, + "Y": 0 + }, + "Mobility": 1, + "Delay": 1, + "Acceleration": 1, + "Radius": 0 + }, + { + "Position": { + "X": 0, + "Y": 5.5 + }, + "Mobility": 0.95, + "Delay": 0.9, + "Acceleration": 1.5, + "Radius": 5.5 + } + ], + "Normalization": { + "Position": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + }, + "Angle": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + } + } + }, + { + "Id": "PhysicsSetting4", + "Input": [ + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X" + }, + "Weight": 50, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y" + }, + "Weight": 20, + "Type": "X", + "Reflect": true + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z" + }, + "Weight": 60, + "Type": "Angle", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X" + }, + "Weight": 30, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z" + }, + "Weight": 40, + "Type": "Angle", + "Reflect": false + } + ], + "Output": [ + { + "Destination": { + "Target": "Parameter", + "Id": "PARAM_EAR_L" + }, + "VertexIndex": 1, + "Scale": 1.5, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Vertices": [ + { + "Position": { + "X": 0, + "Y": 0 + }, + "Mobility": 1, + "Delay": 1, + "Acceleration": 1, + "Radius": 0 + }, + { + "Position": { + "X": 0, + "Y": 5.5 + }, + "Mobility": 0.95, + "Delay": 0.9, + "Acceleration": 1.5, + "Radius": 5.5 + } + ], + "Normalization": { + "Position": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + }, + "Angle": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + } + } + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Wanko/motions/idle_01.motion3.json b/Samples/Resources/Wanko/motions/idle_01.motion3.json new file mode 100644 index 0000000..86982bf --- /dev/null +++ b/Samples/Resources/Wanko/motions/idle_01.motion3.json @@ -0,0 +1,699 @@ +{ + "Version": 3, + "Meta": { + "Duration": 5.967, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 85, + "TotalPointCount": 233, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + -1, + 1, + 0.222, + -1, + 0.444, + 0, + 0.667, + 0, + 1, + 0.911, + 0, + 1.156, + -1, + 1.4, + -1, + 1, + 1.622, + -1, + 1.844, + 0, + 2.067, + 0, + 1, + 2.322, + 0, + 2.578, + -1, + 2.833, + -1, + 1, + 3.067, + -1, + 3.3, + 0, + 3.533, + 0, + 1, + 3.844, + 0, + 4.156, + -1, + 4.467, + -1, + 1, + 4.656, + -1, + 4.844, + 0, + 5.033, + 0, + 1, + 5.333, + 0, + 5.633, + -1, + 5.933, + -1, + 0, + 5.967, + -1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 14, + 1, + 0.222, + 14, + 0.444, + -8, + 0.667, + -8, + 1, + 0.911, + -8, + 1.156, + 14, + 1.4, + 14, + 1, + 1.622, + 14, + 1.844, + -13, + 2.067, + -13, + 1, + 2.322, + -13, + 2.578, + 14, + 2.833, + 14, + 1, + 3.067, + 14, + 3.3, + -8, + 3.533, + -8, + 1, + 3.844, + -8, + 4.156, + 14, + 4.467, + 14, + 1, + 4.656, + 14, + 4.844, + -13, + 5.033, + -13, + 1, + 5.333, + -13, + 5.633, + 14, + 5.933, + 14, + 0, + 5.967, + 14 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + -10, + 1, + 0.467, + -10, + 0.933, + 13, + 1.4, + 13, + 1, + 1.878, + 13, + 2.356, + -10, + 2.833, + -10, + 1, + 3.378, + -10, + 3.922, + 13, + 4.467, + 13, + 1, + 4.956, + 13, + 5.444, + -10, + 5.933, + -10, + 0, + 5.967, + -10 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.622, + 1, + 1.244, + 1, + 1.867, + 1, + 1, + 1.922, + 1, + 1.978, + 0, + 2.033, + 0, + 1, + 2.133, + 0, + 2.233, + 1, + 2.333, + 1, + 1, + 3.533, + 1, + 4.733, + 1, + 5.933, + 1, + 0, + 5.967, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.622, + 1, + 1.244, + 1, + 1.867, + 1, + 1, + 1.922, + 1, + 1.978, + 0, + 2.033, + 0, + 1, + 2.133, + 0, + 2.233, + 1, + 2.333, + 1, + 1, + 3.533, + 1, + 4.733, + 1, + 5.933, + 1, + 0, + 5.967, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 1, + 1, + 0.622, + 1, + 1.244, + 1, + 1.867, + 1, + 1, + 1.922, + 1, + 1.978, + 0, + 2.033, + 0, + 1, + 2.133, + 0, + 2.233, + 1, + 2.333, + 1, + 1, + 3.044, + 1, + 3.756, + 1, + 4.467, + 1, + 1, + 4.656, + 1, + 4.844, + 0, + 5.033, + 0, + 1, + 5.333, + 0, + 5.633, + 1, + 5.933, + 1, + 0, + 5.967, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + -2, + 1, + 0.467, + -2, + 0.933, + 2, + 1.4, + 2, + 1, + 1.878, + 2, + 2.356, + -2, + 2.833, + -2, + 1, + 3.378, + -2, + 3.922, + 4, + 4.467, + 4, + 1, + 4.956, + 4, + 5.444, + -2, + 5.933, + -2, + 0, + 5.967, + -2 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + -5, + 1, + 0.467, + -5, + 0.933, + 6, + 1.4, + 6, + 1, + 1.878, + 6, + 2.356, + -5, + 2.833, + -5, + 1, + 3.378, + -5, + 3.922, + 6, + 4.467, + 6, + 1, + 4.956, + 6, + 5.444, + -5, + 5.933, + -5, + 0, + 5.967, + -5 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 1.978, + 50, + 3.956, + 50, + 5.933, + 50, + 0, + 5.967, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.267, + 0, + 0.533, + 0, + 0.8, + 0, + 1, + 0.867, + 0, + 0.933, + 0.82, + 1, + 0.82, + 1, + 1.056, + 0.82, + 1.111, + -0.72, + 1.167, + -0.72, + 1, + 1.222, + -0.72, + 1.278, + 0.23, + 1.333, + 0.23, + 1, + 1.356, + 0.23, + 1.378, + 0, + 1.4, + 0, + 1, + 2.156, + 0, + 2.911, + 0, + 3.667, + 0, + 1, + 3.722, + 0, + 3.778, + 0.82, + 3.833, + 0.82, + 1, + 3.889, + 0.82, + 3.944, + -0.72, + 4, + -0.72, + 1, + 4.056, + -0.72, + 4.111, + 0.23, + 4.167, + 0.23, + 1, + 4.2, + 0.23, + 4.233, + 0, + 4.267, + 0, + 1, + 4.822, + 0, + 5.378, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 1.978, + 0, + 3.956, + 0, + 5.933, + 0, + 0, + 5.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 5.967, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Wanko/motions/idle_02.motion3.json b/Samples/Resources/Wanko/motions/idle_02.motion3.json new file mode 100644 index 0000000..3493c37 --- /dev/null +++ b/Samples/Resources/Wanko/motions/idle_02.motion3.json @@ -0,0 +1,818 @@ +{ + "Version": 3, + "Meta": { + "Duration": 6.933, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 102, + "TotalPointCount": 284, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.3, + 0, + 0.6, + 0, + 0.9, + 0, + 1, + 1.167, + 0, + 1.433, + -2, + 1.7, + -2, + 1, + 1.889, + -2, + 2.078, + -2, + 2.267, + -2, + 1, + 2.633, + -2, + 3, + 0, + 3.367, + 0, + 1, + 3.567, + 0, + 3.767, + 0, + 3.967, + 0, + 1, + 4.322, + 0, + 4.678, + 0, + 5.033, + 0, + 1, + 5.156, + 0, + 5.278, + 0, + 5.4, + 0, + 1, + 5.9, + 0, + 6.4, + 0, + 6.9, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.3, + 0, + 0.6, + 0, + 0.9, + 0, + 1, + 1.167, + 0, + 1.433, + 15, + 1.7, + 15, + 1, + 1.889, + 15, + 2.078, + 15, + 2.267, + 15, + 1, + 2.633, + 15, + 3, + 0, + 3.367, + 0, + 1, + 3.567, + 0, + 3.767, + 0, + 3.967, + 0, + 1, + 4.322, + 0, + 4.678, + 0, + 5.033, + 0, + 1, + 5.078, + 0, + 5.122, + 11, + 5.167, + 11, + 1, + 5.244, + 11, + 5.322, + 0, + 5.4, + 0, + 1, + 5.9, + 0, + 6.4, + 0, + 6.9, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.3, + 0, + 0.6, + 0, + 0.9, + 0, + 1, + 1.167, + 0, + 1.433, + 23, + 1.7, + 23, + 1, + 1.889, + 23, + 2.078, + 23, + 2.267, + 23, + 1, + 2.633, + 23, + 3, + -7, + 3.367, + -7, + 1, + 3.567, + -7, + 3.767, + 0, + 3.967, + 0, + 1, + 4.322, + 0, + 4.678, + 0, + 5.033, + 0, + 1, + 5.656, + 0, + 6.278, + 0, + 6.9, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.444, + 1, + 0.889, + 1, + 1.333, + 1, + 1, + 1.367, + 1, + 1.4, + 0, + 1.433, + 0, + 1, + 1.5, + 0, + 1.567, + 1, + 1.633, + 1, + 1, + 2.856, + 1, + 4.078, + 1, + 5.3, + 1, + 1, + 5.333, + 1, + 5.367, + 0, + 5.4, + 0, + 1, + 5.467, + 0, + 5.533, + 1, + 5.6, + 1, + 0, + 6.933, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.444, + 1, + 0.889, + 1, + 1.333, + 1, + 1, + 1.367, + 1, + 1.4, + 0, + 1.433, + 0, + 1, + 1.5, + 0, + 1.567, + 1, + 1.633, + 1, + 1, + 2.856, + 1, + 4.078, + 1, + 5.3, + 1, + 1, + 5.333, + 1, + 5.367, + 0, + 5.4, + 0, + 1, + 5.467, + 0, + 5.533, + 1, + 5.6, + 1, + 0, + 6.933, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 1, + 1, + 0.978, + 1, + 1.956, + 1, + 2.933, + 1, + 1, + 3.078, + 1, + 3.222, + 0, + 3.367, + 0, + 1, + 3.8, + 0, + 4.233, + 0, + 4.667, + 0, + 1, + 4.789, + 0, + 4.911, + 0, + 5.033, + 0, + 1, + 5.111, + 0, + 5.189, + 1, + 5.267, + 1, + 1, + 5.4, + 1, + 5.533, + 0, + 5.667, + 0, + 1, + 5.911, + 0, + 6.156, + 0, + 6.4, + 0, + 1, + 6.567, + 0, + 6.733, + 1, + 6.9, + 1, + 0, + 6.933, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.3, + 0, + 0.6, + 0, + 0.9, + 0, + 1, + 2.278, + 0, + 3.656, + 0, + 5.033, + 0, + 1, + 5.656, + 0, + 6.278, + 0, + 6.9, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.3, + 0, + 0.6, + 0, + 0.9, + 0, + 1, + 1.167, + 0, + 1.433, + 10, + 1.7, + 10, + 1, + 1.889, + 10, + 2.078, + 10, + 2.267, + 10, + 1, + 2.833, + 10, + 3.4, + 0, + 3.967, + 0, + 1, + 4.322, + 0, + 4.678, + 0, + 5.033, + 0, + 1, + 5.656, + 0, + 6.278, + 0, + 6.9, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 2, + 0.333, + 2, + 1, + 0.522, + 2, + 0.711, + 0, + 0.9, + 0, + 1, + 1.011, + 0, + 1.122, + 8, + 1.233, + 8, + 1, + 1.389, + 8, + 1.544, + 0, + 1.7, + 0, + 1, + 1.889, + 0, + 2.078, + 0, + 2.267, + 0, + 1, + 2.489, + 0, + 2.711, + 3, + 2.933, + 3, + 1, + 3.078, + 3, + 3.222, + 0, + 3.367, + 0, + 1, + 3.567, + 0, + 3.767, + 0, + 3.967, + 0, + 1, + 4.2, + 0, + 4.433, + 2, + 4.667, + 2, + 1, + 4.789, + 2, + 4.911, + 0, + 5.033, + 0, + 1, + 5.078, + 0, + 5.122, + 8, + 5.167, + 8, + 1, + 5.244, + 8, + 5.322, + -2, + 5.4, + -2, + 1, + 5.456, + -2, + 5.511, + 1, + 5.567, + 1, + 1, + 5.6, + 1, + 5.633, + 0, + 5.667, + 0, + 1, + 5.789, + 0, + 5.911, + 0, + 6.033, + 0, + 1, + 6.156, + 0, + 6.278, + 3, + 6.4, + 3, + 1, + 6.567, + 3, + 6.733, + 0, + 6.9, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 0, + 6.933, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 1.656, + 0, + 3.311, + 0, + 4.967, + 0, + 1, + 5.011, + 0, + 5.056, + -0.57, + 5.1, + -0.57, + 1, + 5.167, + -0.57, + 5.233, + 0.55, + 5.3, + 0.55, + 1, + 5.367, + 0.55, + 5.433, + -0.24, + 5.5, + -0.24, + 1, + 5.556, + -0.24, + 5.611, + 0, + 5.667, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 1.656, + 0, + 3.311, + 0, + 4.967, + 0, + 1, + 5.011, + 0, + 5.056, + 0.5, + 5.1, + 0.5, + 1, + 5.167, + 0.5, + 5.233, + -0.64, + 5.3, + -0.64, + 1, + 5.367, + -0.64, + 5.433, + 0.18, + 5.5, + 0.18, + 1, + 5.556, + 0.18, + 5.611, + 0, + 5.667, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 6.933, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Wanko/motions/idle_03.motion3.json b/Samples/Resources/Wanko/motions/idle_03.motion3.json new file mode 100644 index 0000000..db19098 --- /dev/null +++ b/Samples/Resources/Wanko/motions/idle_03.motion3.json @@ -0,0 +1,783 @@ +{ + "Version": 3, + "Meta": { + "Duration": 6.7, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 97, + "TotalPointCount": 269, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.378, + 0, + 0.756, + -14, + 1.133, + -14, + 1, + 1.344, + -14, + 1.556, + -14, + 1.767, + -14, + 1, + 2.189, + -14, + 2.611, + -14, + 3.033, + -14, + 1, + 3.8, + -14, + 4.567, + -14, + 5.333, + -14, + 1, + 5.678, + -14, + 6.022, + 0, + 6.367, + 0, + 1, + 6.467, + 0, + 6.567, + 0, + 6.667, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.378, + 0, + 0.756, + 16, + 1.133, + 16, + 1, + 1.344, + 16, + 1.556, + 16, + 1.767, + 16, + 1, + 2.956, + 16, + 4.144, + 16, + 5.333, + 16, + 1, + 5.678, + 16, + 6.022, + 0, + 6.367, + 0, + 1, + 6.467, + 0, + 6.567, + 0, + 6.667, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.378, + 0, + 0.756, + 0, + 1.133, + 0, + 1, + 1.344, + 0, + 1.556, + 0, + 1.767, + 0, + 1, + 2.956, + 0, + 4.144, + 0, + 5.333, + 0, + 1, + 5.678, + 0, + 6.022, + 0, + 6.367, + 0, + 1, + 6.467, + 0, + 6.567, + 0, + 6.667, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.478, + 1, + 0.956, + 1, + 1.433, + 1, + 1, + 1.544, + 1, + 1.656, + 0, + 1.767, + 0, + 1, + 2.022, + 0, + 2.278, + 0, + 2.533, + 0, + 1, + 2.689, + 0, + 2.844, + 0, + 3, + 0, + 1, + 3.111, + 0, + 3.222, + 1, + 3.333, + 1, + 1, + 4, + 1, + 4.667, + 1, + 5.333, + 1, + 1, + 5.456, + 1, + 5.578, + 1, + 5.7, + 1, + 1, + 5.733, + 1, + 5.767, + 0, + 5.8, + 0, + 1, + 5.867, + 0, + 5.933, + 1, + 6, + 1, + 0, + 6.7, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.478, + 1, + 0.956, + 1, + 1.433, + 1, + 1, + 1.544, + 1, + 1.656, + 0, + 1.767, + 0, + 1, + 2.022, + 0, + 2.278, + 0, + 2.533, + 0, + 1, + 2.689, + 0, + 2.844, + 0, + 3, + 0, + 1, + 3.111, + 0, + 3.222, + 1, + 3.333, + 1, + 1, + 4, + 1, + 4.667, + 1, + 5.333, + 1, + 1, + 5.456, + 1, + 5.578, + 1, + 5.7, + 1, + 1, + 5.733, + 1, + 5.767, + 0, + 5.8, + 0, + 1, + 5.867, + 0, + 5.933, + 1, + 6, + 1, + 0, + 6.7, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 0, + 1, + 1.422, + 0, + 2.844, + 0, + 4.267, + 0, + 1, + 4.378, + 0, + 4.489, + 0.6, + 4.6, + 0.6, + 1, + 4.733, + 0.6, + 4.867, + 0, + 5, + 0, + 1, + 5.456, + 0, + 5.911, + 0, + 6.367, + 0, + 1, + 6.467, + 0, + 6.567, + 0, + 6.667, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.378, + 0, + 0.756, + -9, + 1.133, + -9, + 1, + 2.533, + -9, + 3.933, + -9, + 5.333, + -9, + 1, + 5.678, + -9, + 6.022, + 0, + 6.367, + 0, + 1, + 6.467, + 0, + 6.567, + 0, + 6.667, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.622, + 0, + 0.878, + -2, + 1.133, + -2, + 1, + 2.533, + -2, + 3.933, + 0, + 5.333, + 0, + 1, + 5.678, + 0, + 6.022, + 0, + 6.367, + 0, + 1, + 6.467, + 0, + 6.567, + 0, + 6.667, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 4, + 0.367, + 4, + 1, + 0.511, + 4, + 0.656, + -1, + 0.8, + -1, + 1, + 0.856, + -1, + 0.911, + 1, + 0.967, + 1, + 1, + 1.044, + 1, + 1.122, + 0, + 1.2, + 0, + 1, + 1.389, + 0, + 1.578, + 0, + 1.767, + 0, + 1, + 1.8, + 0, + 1.833, + 2, + 1.867, + 2, + 1, + 1.911, + 2, + 1.956, + 0, + 2, + 0, + 1, + 2.044, + 0, + 2.089, + 1, + 2.133, + 1, + 1, + 2.178, + 1, + 2.222, + 0, + 2.267, + 0, + 1, + 2.622, + 0, + 2.978, + 0, + 3.333, + 0, + 1, + 3.511, + 0, + 3.689, + 0, + 3.867, + 0, + 1, + 4, + 0, + 4.133, + -1, + 4.267, + -1, + 1, + 4.411, + -1, + 4.556, + 2, + 4.7, + 2, + 1, + 4.911, + 2, + 5.122, + 1.884, + 5.333, + 0, + 1, + 5.489, + -1.388, + 5.644, + -5, + 5.8, + -5, + 1, + 5.989, + -5, + 6.178, + 0, + 6.367, + 0, + 1, + 6.467, + 0, + 6.567, + 0, + 6.667, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 1.778, + 50, + 3.556, + 50, + 5.333, + 50, + 0, + 6.7, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 1.778, + 0, + 3.556, + 0, + 5.333, + 0, + 0, + 6.7, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 6.7, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Wanko/motions/idle_04.motion3.json b/Samples/Resources/Wanko/motions/idle_04.motion3.json new file mode 100644 index 0000000..b54e5a5 --- /dev/null +++ b/Samples/Resources/Wanko/motions/idle_04.motion3.json @@ -0,0 +1,636 @@ +{ + "Version": 3, + "Meta": { + "Duration": 10.367, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 76, + "TotalPointCount": 206, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 2.533, + 0, + 5.067, + -1, + 7.6, + -1, + 1, + 8.511, + -1, + 9.422, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.333, + 0, + 0.667, + 12, + 1, + 12, + 1, + 1.6, + 12, + 2.2, + -1.589, + 2.8, + -1.589, + 1, + 3.178, + -1.589, + 3.556, + 12, + 3.933, + 12, + 1, + 4.656, + 12, + 5.378, + -1.589, + 6.1, + -1.589, + 1, + 6.489, + -1.589, + 6.878, + 13.71, + 7.267, + 13.71, + 1, + 7.378, + 13.71, + 7.489, + -23, + 7.6, + -23, + 1, + 7.678, + -23, + 7.756, + -7.683, + 7.833, + -7.683, + 1, + 7.933, + -7.683, + 8.033, + -10.837, + 8.133, + -10.837, + 1, + 8.867, + -10.837, + 9.6, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + -8, + 1, + 0.333, + -8, + 0.667, + 9, + 1, + 9, + 1, + 1.6, + 9, + 2.2, + -11, + 2.8, + -11, + 1, + 3.178, + -11, + 3.556, + 9, + 3.933, + 9, + 1, + 4.656, + 9, + 5.378, + -11, + 6.1, + -11, + 1, + 6.489, + -11, + 6.878, + 5, + 7.267, + 5, + 1, + 7.378, + 5, + 7.489, + -9, + 7.6, + -9, + 1, + 7.678, + -9, + 7.756, + -1, + 7.833, + -1, + 1, + 7.933, + -1, + 8.033, + -7, + 8.133, + -7, + 1, + 8.478, + -7, + 8.822, + 2, + 9.167, + 2, + 1, + 9.556, + 2, + 9.944, + -8, + 10.333, + -8, + 0, + 10.367, + -8 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 0, + 1, + 0.333, + 0, + 0.667, + 0.42, + 1, + 0.42, + 1, + 1.6, + 0.42, + 2.2, + 0, + 2.8, + 0, + 1, + 3.178, + 0, + 3.556, + 0.42, + 3.933, + 0.42, + 1, + 4.656, + 0.42, + 5.378, + 0, + 6.1, + 0, + 1, + 6.489, + 0, + 6.878, + 0.35, + 7.267, + 0.35, + 1, + 7.6, + 0.35, + 7.933, + 0, + 8.267, + 0, + 1, + 8.567, + 0, + 8.867, + 0.34, + 9.167, + 0.34, + 1, + 9.556, + 0.34, + 9.944, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 2.422, + 0, + 4.844, + 0, + 7.267, + 0, + 1, + 7.378, + 0, + 7.489, + -6, + 7.6, + -6, + 1, + 7.778, + -6, + 7.956, + -6, + 8.133, + -6, + 1, + 8.867, + -6, + 9.6, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.333, + 0, + 0.667, + 0.64, + 1, + 0.64, + 1, + 1.6, + 0.64, + 2.2, + 0, + 2.8, + 0, + 1, + 3.178, + 0, + 3.556, + 0.73, + 3.933, + 0.73, + 1, + 4.656, + 0.73, + 5.378, + 0, + 6.1, + 0, + 1, + 6.489, + 0, + 6.878, + 0.73, + 7.267, + 0.73, + 1, + 7.556, + 0.73, + 7.844, + 0, + 8.133, + 0, + 1, + 8.478, + 0, + 8.822, + 0.39, + 9.167, + 0.39, + 1, + 9.556, + 0.39, + 9.944, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 3.444, + 50, + 6.889, + 50, + 10.333, + 50, + 0, + 10.367, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 3.444, + 0, + 6.889, + 0, + 10.333, + 0, + 0, + 10.367, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 10.367, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Wanko/motions/shake_01.motion3.json b/Samples/Resources/Wanko/motions/shake_01.motion3.json new file mode 100644 index 0000000..a2055bb --- /dev/null +++ b/Samples/Resources/Wanko/motions/shake_01.motion3.json @@ -0,0 +1,748 @@ +{ + "Version": 3, + "Meta": { + "Duration": 2.5, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 92, + "TotalPointCount": 254, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + -9, + 1, + 0.044, + -9, + 0.089, + -7.426, + 0.133, + 0, + 1, + 0.2, + 11.14, + 0.267, + 20, + 0.333, + 20, + 1, + 0.456, + 20, + 0.578, + -18, + 0.7, + -18, + 1, + 0.822, + -18, + 0.944, + 16, + 1.067, + 16, + 1, + 1.178, + 16, + 1.289, + -8, + 1.4, + -8, + 1, + 1.489, + -8, + 1.578, + 0, + 1.667, + 0, + 1, + 1.933, + 0, + 2.2, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 14, + 1, + 0.044, + 14, + 0.089, + 30, + 0.133, + 30, + 1, + 0.2, + 30, + 0.267, + 30, + 0.333, + 30, + 1, + 0.456, + 30, + 0.578, + 23.223, + 0.7, + 13, + 1, + 0.822, + 2.777, + 0.944, + -1, + 1.067, + -1, + 1, + 1.178, + -1, + 1.289, + 3, + 1.4, + 3, + 1, + 1.489, + 3, + 1.578, + 0, + 1.667, + 0, + 1, + 1.933, + 0, + 2.2, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 30, + 0.4, + 30, + 1, + 0.522, + 30, + 0.644, + -25, + 0.767, + -25, + 1, + 0.889, + -25, + 1.011, + 26, + 1.133, + 26, + 1, + 1.222, + 26, + 1.311, + -10, + 1.4, + -10, + 1, + 1.544, + -10, + 1.689, + 0, + 1.833, + 0, + 1, + 2.044, + 0, + 2.256, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.378, + 0, + 0.756, + 0, + 1.133, + 0, + 1, + 1.311, + 0, + 1.489, + 1, + 1.667, + 1, + 1, + 1.933, + 1, + 2.2, + 1, + 2.467, + 1, + 0, + 2.5, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.378, + 0, + 0.756, + 0, + 1.133, + 0, + 1, + 1.311, + 0, + 1.489, + 1, + 1.667, + 1, + 1, + 1.933, + 1, + 2.2, + 1, + 2.467, + 1, + 0, + 2.5, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 1, + 1, + 0.822, + 1, + 1.644, + 1, + 2.467, + 1, + 0, + 2.5, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 4, + 0.333, + 4, + 1, + 0.456, + 4, + 0.578, + -4, + 0.7, + -4, + 1, + 0.822, + -4, + 0.944, + 3, + 1.067, + 3, + 1, + 1.178, + 3, + 1.289, + -1, + 1.4, + -1, + 1, + 1.489, + -1, + 1.578, + 0, + 1.667, + 0, + 1, + 1.767, + 0, + 1.867, + 0, + 1.967, + 0, + 1, + 2.133, + 0, + 2.3, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 10, + 0.4, + 10, + 1, + 0.522, + 10, + 0.644, + -10, + 0.767, + -10, + 1, + 0.889, + -10, + 1.011, + 5, + 1.133, + 5, + 1, + 1.222, + 5, + 1.311, + -3, + 1.4, + -3, + 1, + 1.511, + -3, + 1.622, + 1, + 1.733, + 1, + 1, + 1.978, + 1, + 2.222, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.578, + 0, + 1.156, + 0, + 1.733, + 0, + 1, + 1.978, + 0, + 2.222, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.822, + 0, + 1.644, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.822, + 50, + 1.644, + 50, + 2.467, + 50, + 0, + 2.5, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.822, + 0, + 1.644, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.822, + 0, + 1.644, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.822, + 0, + 1.644, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.044, + 0, + 0.089, + -1, + 0.133, + -1, + 1, + 0.222, + -1, + 0.311, + 1, + 0.4, + 1, + 1, + 0.511, + 1, + 0.622, + -1, + 0.733, + -1, + 1, + 0.811, + -1, + 0.889, + 1, + 0.967, + 1, + 1, + 1.067, + 1, + 1.167, + -1, + 1.267, + -1, + 1, + 1.367, + -1, + 1.467, + 1, + 1.567, + 1, + 1, + 1.667, + 1, + 1.767, + -0.35, + 1.867, + -0.35, + 1, + 1.922, + -0.35, + 1.978, + 0.08, + 2.033, + 0.08, + 1, + 2.1, + 0.08, + 2.167, + -0.08, + 2.233, + -0.08, + 1, + 2.311, + -0.08, + 2.389, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.044, + 0, + 0.089, + -0.96, + 0.133, + -0.96, + 1, + 0.222, + -0.96, + 0.311, + 1, + 0.4, + 1, + 1, + 0.511, + 1, + 0.622, + -1, + 0.733, + -1, + 1, + 0.811, + -1, + 0.889, + 1, + 0.967, + 1, + 1, + 1.067, + 1, + 1.167, + -1, + 1.267, + -1, + 1, + 1.367, + -1, + 1.467, + 1, + 1.567, + 1, + 1, + 1.667, + 1, + 1.767, + -0.32, + 1.867, + -0.32, + 1, + 1.922, + -0.32, + 1.978, + 0.07, + 2.033, + 0.07, + 1, + 2.1, + 0.07, + 2.167, + -0.08, + 2.233, + -0.08, + 1, + 2.311, + -0.08, + 2.389, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.822, + 0, + 1.644, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.822, + 0, + 1.644, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.822, + 0, + 1.644, + 0, + 2.467, + 0, + 0, + 2.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 2.5, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Wanko/motions/shake_02.motion3.json b/Samples/Resources/Wanko/motions/shake_02.motion3.json new file mode 100644 index 0000000..a850a88 --- /dev/null +++ b/Samples/Resources/Wanko/motions/shake_02.motion3.json @@ -0,0 +1,867 @@ +{ + "Version": 3, + "Meta": { + "Duration": 2.533, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 109, + "TotalPointCount": 305, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.411, + 0, + 0.489, + 0, + 0.567, + 0, + 1, + 0.656, + 0, + 0.744, + 0, + 0.833, + 0, + 1, + 1.389, + 0, + 1.944, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 30, + 1, + 0.111, + 30, + 0.222, + 30, + 0.333, + 30, + 1, + 0.411, + 30, + 0.489, + 30, + 0.567, + 30, + 1, + 0.656, + 30, + 0.744, + 30, + 0.833, + 30, + 1, + 1.389, + 30, + 1.944, + 30, + 2.5, + 30, + 0, + 2.533, + 30 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.033, + 0, + 0.067, + -30, + 0.1, + -30, + 1, + 0.211, + -30, + 0.322, + 30, + 0.433, + 30, + 1, + 0.511, + 30, + 0.589, + -11, + 0.667, + -11, + 1, + 0.756, + -11, + 0.844, + 30, + 0.933, + 30, + 1, + 1.011, + 30, + 1.089, + -14, + 1.167, + -14, + 1, + 1.256, + -14, + 1.344, + 9, + 1.433, + 9, + 1, + 1.522, + 9, + 1.611, + -4, + 1.7, + -4, + 1, + 1.8, + -4, + 1.9, + 0, + 2, + 0, + 1, + 2.167, + 0, + 2.333, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 0.844, + 0, + 1.122, + 0, + 1.4, + 0, + 1, + 1.456, + 0, + 1.511, + 1, + 1.567, + 1, + 1, + 1.878, + 1, + 2.189, + 1, + 2.5, + 1, + 0, + 2.533, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 0.844, + 0, + 1.122, + 0, + 1.4, + 0, + 1, + 1.456, + 0, + 1.511, + 1, + 1.567, + 1, + 1, + 1.878, + 1, + 2.189, + 1, + 2.5, + 1, + 0, + 2.533, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 0.811, + 0, + 1.056, + 0, + 1.3, + 0, + 1, + 1.333, + 0, + 1.367, + 1, + 1.4, + 1, + 1, + 1.444, + 1, + 1.489, + 0, + 1.533, + 0, + 1, + 1.856, + 0, + 2.178, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 1.211, + 0, + 1.856, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + -10, + 1, + 0.111, + -10, + 0.222, + 10, + 0.333, + 10, + 1, + 0.411, + 10, + 0.489, + -10, + 0.567, + -10, + 1, + 0.656, + -10, + 0.744, + 10, + 0.833, + 10, + 1, + 0.956, + 10, + 1.078, + -3, + 1.2, + -3, + 1, + 1.333, + -3, + 1.467, + -3, + 1.6, + -3, + 1, + 1.722, + -3, + 1.844, + 0, + 1.967, + 0, + 1, + 2.144, + 0, + 2.322, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 10, + 1, + 0.067, + 10, + 0.133, + -2, + 0.2, + -2, + 1, + 0.244, + -2, + 0.289, + -2.18, + 0.333, + 0, + 1, + 0.411, + 3.815, + 0.489, + 10, + 0.567, + 10, + 1, + 0.622, + 10, + 0.678, + -2, + 0.733, + -2, + 1, + 0.767, + -2, + 0.8, + -1.988, + 0.833, + 0, + 1, + 0.922, + 5.303, + 1.011, + 10, + 1.1, + 10, + 1, + 1.167, + 10, + 1.233, + -2, + 1.3, + -2, + 1, + 1.333, + -2, + 1.367, + 2, + 1.4, + 2, + 1, + 1.444, + 2, + 1.489, + 0, + 1.533, + 0, + 1, + 1.856, + 0, + 2.178, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.833, + 0, + 1.667, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.833, + 50, + 1.667, + 50, + 2.5, + 50, + 0, + 2.533, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.833, + 0, + 1.667, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.833, + 0, + 1.667, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.833, + 0, + 1.667, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.044, + 0, + 0.089, + 0.65, + 0.133, + 0.65, + 1, + 0.211, + 0.65, + 0.289, + -0.76, + 0.367, + -0.76, + 1, + 0.467, + -0.76, + 0.567, + 1, + 0.667, + 1, + 1, + 0.778, + 1, + 0.889, + -1, + 1, + -1, + 1, + 1.089, + -1, + 1.178, + 1, + 1.267, + 1, + 1, + 1.333, + 1, + 1.4, + 0, + 1.467, + 0, + 1, + 1.522, + 0, + 1.578, + 1, + 1.633, + 1, + 1, + 1.711, + 1, + 1.789, + -0.96, + 1.867, + -0.96, + 1, + 1.922, + -0.96, + 1.978, + 0.17, + 2.033, + 0.17, + 1, + 2.1, + 0.17, + 2.167, + 0, + 2.233, + 0, + 1, + 2.322, + 0, + 2.411, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.044, + 0, + 0.089, + 0.81, + 0.133, + 0.81, + 1, + 0.211, + 0.81, + 0.289, + -1, + 0.367, + -1, + 1, + 0.467, + -1, + 0.567, + 1, + 0.667, + 1, + 1, + 0.778, + 1, + 0.889, + -1, + 1, + -1, + 1, + 1.089, + -1, + 1.178, + 1, + 1.267, + 1, + 1, + 1.333, + 1, + 1.4, + 0.721, + 1.467, + 0, + 1, + 1.522, + -0.601, + 1.578, + -1, + 1.633, + -1, + 1, + 1.711, + -1, + 1.789, + 1, + 1.867, + 1, + 1, + 1.922, + 1, + 1.978, + -0.16, + 2.033, + -0.16, + 1, + 2.1, + -0.16, + 2.167, + 0, + 2.233, + 0, + 1, + 2.322, + 0, + 2.411, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 0.822, + 0, + 1.078, + 0, + 1.333, + 0, + 1, + 1.378, + 0, + 1.422, + 1, + 1.467, + 1, + 1, + 1.5, + 1, + 1.533, + 0, + 1.567, + 0, + 1, + 1.878, + 0, + 2.189, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 0.822, + 0, + 1.078, + 0, + 1.333, + 0, + 1, + 1.378, + 0, + 1.422, + 1, + 1.467, + 1, + 1, + 1.5, + 1, + 1.533, + 0, + 1.567, + 0, + 1, + 1.878, + 0, + 2.189, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.833, + 0, + 1.667, + 0, + 2.5, + 0, + 0, + 2.533, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 2.533, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Wanko/motions/touch_01.motion3.json b/Samples/Resources/Wanko/motions/touch_01.motion3.json new file mode 100644 index 0000000..5f0ab46 --- /dev/null +++ b/Samples/Resources/Wanko/motions/touch_01.motion3.json @@ -0,0 +1,594 @@ +{ + "Version": 3, + "Meta": { + "Duration": 2, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 70, + "TotalPointCount": 188, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.622, + 0, + 0.878, + 0, + 1.133, + 0, + 1, + 1.411, + 0, + 1.689, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.422, + 0, + 0.478, + 30, + 0.533, + 30, + 1, + 0.633, + 30, + 0.733, + 0, + 0.833, + 0, + 1, + 0.933, + 0, + 1.033, + 0, + 1.133, + 0, + 1, + 1.411, + 0, + 1.689, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.522, + 0, + 0.678, + 30, + 0.833, + 30, + 1, + 0.933, + 30, + 1.033, + 30, + 1.133, + 30, + 1, + 1.411, + 30, + 1.689, + 30, + 1.967, + 30, + 0, + 2, + 30 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.656, + 1, + 1.311, + 1, + 1.967, + 1, + 0, + 2, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 1, + 1, + 0.656, + 1, + 1.311, + 1, + 1.967, + 1, + 0, + 2, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 1, + 1, + 0.656, + 1, + 1.311, + 1, + 1.967, + 1, + 0, + 2, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.522, + 0, + 0.678, + 2, + 0.833, + 2, + 1, + 0.933, + 2, + 1.033, + 2, + 1.133, + 2, + 1, + 1.411, + 2, + 1.689, + 2, + 1.967, + 2, + 0, + 2, + 2 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.378, + 0, + 0.756, + 0, + 1.133, + 0, + 1, + 1.411, + 0, + 1.689, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.422, + 0, + 0.478, + 6, + 0.533, + 6, + 1, + 0.633, + 6, + 0.733, + 0, + 0.833, + 0, + 1, + 0.933, + 0, + 1.033, + 0, + 1.133, + 0, + 1, + 1.411, + 0, + 1.689, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.656, + 50, + 1.311, + 50, + 1.967, + 50, + 0, + 2, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.444, + 0, + 0.522, + 1, + 0.6, + 1, + 1, + 0.667, + 1, + 0.733, + -1, + 0.8, + -1, + 1, + 0.856, + -1, + 0.911, + 0.31, + 0.967, + 0.31, + 1, + 1.022, + 0.31, + 1.078, + -0.2, + 1.133, + -0.2, + 1, + 1.2, + -0.2, + 1.267, + 0, + 1.333, + 0, + 1, + 1.544, + 0, + 1.756, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.444, + 0, + 0.522, + -1, + 0.6, + -1, + 1, + 0.667, + -1, + 0.733, + 1, + 0.8, + 1, + 1, + 0.856, + 1, + 0.911, + -0.34, + 0.967, + -0.34, + 1, + 1.022, + -0.34, + 1.078, + 0.16, + 1.133, + 0.16, + 1, + 1.2, + 0.16, + 1.267, + 0, + 1.333, + 0, + 1, + 1.544, + 0, + 1.756, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Wanko/motions/touch_02.motion3.json b/Samples/Resources/Wanko/motions/touch_02.motion3.json new file mode 100644 index 0000000..06b11f9 --- /dev/null +++ b/Samples/Resources/Wanko/motions/touch_02.motion3.json @@ -0,0 +1,699 @@ +{ + "Version": 3, + "Meta": { + "Duration": 2, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 85, + "TotalPointCount": 233, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.389, + 0, + 0.444, + 0, + 0.5, + 0, + 1, + 0.589, + 0, + 0.678, + 0, + 0.767, + 0, + 1, + 0.878, + 0, + 0.989, + 0, + 1.1, + 0, + 1, + 1.389, + 0, + 1.678, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.389, + 0, + 0.444, + 25, + 0.5, + 25, + 1, + 0.589, + 25, + 0.678, + 0, + 0.767, + 0, + 1, + 0.878, + 0, + 0.989, + 0, + 1.1, + 0, + 1, + 1.389, + 0, + 1.678, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.389, + 0, + 0.444, + 7, + 0.5, + 7, + 1, + 0.589, + 7, + 0.678, + 0, + 0.767, + 0, + 1, + 0.878, + 0, + 0.989, + 0, + 1.1, + 0, + 1, + 1.389, + 0, + 1.678, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.589, + 0, + 0.844, + 0, + 1.1, + 0, + 1, + 1.389, + 0, + 1.678, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.589, + 0, + 0.844, + 0, + 1.1, + 0, + 1, + 1.389, + 0, + 1.678, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.389, + 0, + 0.444, + 7, + 0.5, + 7, + 1, + 0.589, + 7, + 0.678, + -3, + 0.767, + -3, + 1, + 0.833, + -3, + 0.9, + 1, + 0.967, + 1, + 1, + 1.011, + 1, + 1.056, + -1, + 1.1, + -1, + 1, + 1.178, + -1, + 1.256, + 0, + 1.333, + 0, + 1, + 1.544, + 0, + 1.756, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.389, + 0, + 0.444, + 8, + 0.5, + 8, + 1, + 0.589, + 8, + 0.678, + -3, + 0.767, + -3, + 1, + 0.833, + -3, + 0.9, + 1, + 0.967, + 1, + 1, + 1.011, + 1, + 1.056, + -1, + 1.1, + -1, + 1, + 1.178, + -1, + 1.256, + 0, + 1.333, + 0, + 1, + 1.544, + 0, + 1.756, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.656, + 50, + 1.311, + 50, + 1.967, + 50, + 0, + 2, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.422, + 0, + 0.511, + 1, + 0.6, + 1, + 1, + 0.678, + 1, + 0.756, + -1, + 0.833, + -1, + 1, + 0.911, + -1, + 0.989, + 0.67, + 1.067, + 0.67, + 1, + 1.122, + 0.67, + 1.178, + -0.48, + 1.233, + -0.48, + 1, + 1.3, + -0.48, + 1.367, + 0, + 1.433, + 0, + 1, + 1.611, + 0, + 1.789, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.422, + 0, + 0.511, + -1, + 0.6, + -1, + 1, + 0.678, + -1, + 0.756, + 1, + 0.833, + 1, + 1, + 0.911, + 1, + 0.989, + -0.53, + 1.067, + -0.53, + 1, + 1.122, + -0.53, + 1.178, + 0.47, + 1.233, + 0.47, + 1, + 1.3, + 0.47, + 1.367, + 0, + 1.433, + 0, + 1, + 1.611, + 0, + 1.789, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.589, + 0, + 0.844, + 0, + 1.1, + 0, + 1, + 1.389, + 0, + 1.678, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.589, + 0, + 0.844, + 0, + 1.1, + 0, + 1, + 1.389, + 0, + 1.678, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Wanko/motions/touch_03.motion3.json b/Samples/Resources/Wanko/motions/touch_03.motion3.json new file mode 100644 index 0000000..cdfb4c5 --- /dev/null +++ b/Samples/Resources/Wanko/motions/touch_03.motion3.json @@ -0,0 +1,643 @@ +{ + "Version": 3, + "Meta": { + "Duration": 2, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 77, + "TotalPointCount": 209, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + -3, + 1, + 0.133, + -3, + 0.267, + -3, + 0.4, + -3, + 1, + 0.467, + -3, + 0.533, + 17, + 0.6, + 17, + 1, + 0.656, + 17, + 0.711, + -22, + 0.767, + -22, + 1, + 0.833, + -22, + 0.9, + 9, + 0.967, + 9, + 1, + 1.033, + 9, + 1.1, + 0, + 1.167, + 0, + 1, + 1.433, + 0, + 1.7, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 15, + 1, + 0.133, + 15, + 0.267, + 15, + 0.4, + 15, + 1, + 0.467, + 15, + 0.533, + 17, + 0.6, + 17, + 1, + 0.789, + 17, + 0.978, + 0, + 1.167, + 0, + 1, + 1.433, + 0, + 1.7, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 0, + 0.4, + 0, + 1, + 0.922, + 0, + 1.444, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 0, + 0.4, + 0, + 1, + 0.922, + 0, + 1.444, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 1, + 1, + 0.656, + 1, + 1.311, + 1, + 1.967, + 1, + 0, + 2, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 0, + 0.4, + 0, + 1, + 0.467, + 0, + 0.533, + -3, + 0.6, + -3, + 1, + 0.656, + -3, + 0.711, + 2, + 0.767, + 2, + 1, + 0.833, + 2, + 0.9, + -1, + 0.967, + -1, + 1, + 1.033, + -1, + 1.1, + 0, + 1.167, + 0, + 1, + 1.433, + 0, + 1.7, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 0, + 0.4, + 0, + 1, + 0.467, + 0, + 0.533, + 7, + 0.6, + 7, + 1, + 0.656, + 7, + 0.711, + -2, + 0.767, + -2, + 1, + 0.833, + -2, + 0.9, + 1, + 0.967, + 1, + 1, + 1.033, + 1, + 1.1, + 0, + 1.167, + 0, + 1, + 1.433, + 0, + 1.7, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 0, + 0.4, + 0, + 1, + 0.656, + 0, + 0.911, + -3, + 1.167, + -3, + 1, + 1.433, + -3, + 1.7, + -3, + 1.967, + -3, + 0, + 2, + -3 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.656, + 50, + 1.311, + 50, + 1.967, + 50, + 0, + 2, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 0.611, + 0, + 0.656, + 1, + 0.7, + 1, + 1, + 0.767, + 1, + 0.833, + -0.94, + 0.9, + -0.94, + 1, + 0.956, + -0.94, + 1.011, + 0.49, + 1.067, + 0.49, + 1, + 1.144, + 0.49, + 1.222, + -0.4, + 1.3, + -0.4, + 1, + 1.367, + -0.4, + 1.433, + 0, + 1.5, + 0, + 1, + 1.656, + 0, + 1.811, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.189, + 0, + 0.378, + 0, + 0.567, + 0, + 1, + 0.611, + 0, + 0.656, + -1, + 0.7, + -1, + 1, + 0.767, + -1, + 0.833, + 1, + 0.9, + 1, + 1, + 0.956, + 1, + 1.011, + -0.43, + 1.067, + -0.43, + 1, + 1.144, + -0.43, + 1.222, + 0.34, + 1.3, + 0.34, + 1, + 1.367, + 0.34, + 1.433, + 0, + 1.5, + 0, + 1, + 1.656, + 0, + 1.811, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 0, + 0.4, + 0, + 1, + 0.922, + 0, + 1.444, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.133, + 0, + 0.267, + 0, + 0.4, + 0, + 1, + 0.922, + 0, + 1.444, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Wanko/motions/touch_04.motion3.json b/Samples/Resources/Wanko/motions/touch_04.motion3.json new file mode 100644 index 0000000..e2b7725 --- /dev/null +++ b/Samples/Resources/Wanko/motions/touch_04.motion3.json @@ -0,0 +1,615 @@ +{ + "Version": 3, + "Meta": { + "Duration": 2, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 73, + "TotalPointCount": 197, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.144, + 0, + 0.289, + 0, + 0.433, + 0, + 1, + 0.5, + 0, + 0.567, + 0, + 0.633, + 0, + 1, + 0.844, + 0, + 1.056, + 0, + 1.267, + 0, + 1, + 1.5, + 0, + 1.733, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.144, + 0, + 0.289, + 0, + 0.433, + 0, + 1, + 0.5, + 0, + 0.567, + -11, + 0.633, + -11, + 1, + 0.733, + -11, + 0.833, + 10, + 0.933, + 10, + 1, + 1.044, + 10, + 1.156, + 0, + 1.267, + 0, + 1, + 1.5, + 0, + 1.733, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.144, + 0, + 0.289, + 0, + 0.433, + 0, + 1, + 0.711, + 0, + 0.989, + 0, + 1.267, + 0, + 1, + 1.5, + 0, + 1.733, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.144, + 0, + 0.289, + 0, + 0.433, + 0, + 1, + 0.711, + 0, + 0.989, + 0, + 1.267, + 0, + 1, + 1.5, + 0, + 1.733, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 0, + 1, + 0.144, + 0, + 0.289, + 0, + 0.433, + 0, + 1, + 0.6, + 0, + 0.767, + 0, + 0.933, + 0, + 1, + 1.044, + 0, + 1.156, + 0, + 1.267, + 0, + 1, + 1.5, + 0, + 1.733, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.144, + 0, + 0.289, + 0, + 0.433, + 0, + 1, + 0.5, + 0, + 0.567, + -6, + 0.633, + -6, + 1, + 0.733, + -6, + 0.833, + 4, + 0.933, + 4, + 1, + 1.044, + 4, + 1.156, + 0, + 1.267, + 0, + 1, + 1.5, + 0, + 1.733, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.656, + 50, + 1.311, + 50, + 1.967, + 50, + 0, + 2, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.444, + 0, + 0.522, + 1, + 0.6, + 1, + 1, + 0.678, + 1, + 0.756, + -1, + 0.833, + -1, + 1, + 0.911, + -1, + 0.989, + 0.8, + 1.067, + 0.8, + 1, + 1.122, + 0.8, + 1.178, + -0.13, + 1.233, + -0.13, + 1, + 1.289, + -0.13, + 1.344, + 0, + 1.4, + 0, + 1, + 1.589, + 0, + 1.778, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.122, + 0, + 0.244, + 0, + 0.367, + 0, + 1, + 0.444, + 0, + 0.522, + -1, + 0.6, + -1, + 1, + 0.678, + -1, + 0.756, + 1, + 0.833, + 1, + 1, + 0.911, + 1, + 0.989, + -0.81, + 1.067, + -0.81, + 1, + 1.122, + -0.81, + 1.178, + 0.11, + 1.233, + 0.11, + 1, + 1.289, + 0.11, + 1.344, + 0, + 1.4, + 0, + 1, + 1.589, + 0, + 1.778, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.211, + 0, + 0.422, + 0, + 0.633, + 0, + 1, + 1.078, + 0, + 1.522, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.211, + 0, + 0.422, + 0, + 0.633, + 0, + 1, + 1.078, + 0, + 1.522, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.656, + 0, + 1.311, + 0, + 1.967, + 0, + 0, + 2, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 2, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Wanko/motions/touch_05.motion3.json b/Samples/Resources/Wanko/motions/touch_05.motion3.json new file mode 100644 index 0000000..6e714e0 --- /dev/null +++ b/Samples/Resources/Wanko/motions/touch_05.motion3.json @@ -0,0 +1,510 @@ +{ + "Version": 3, + "Meta": { + "Duration": 1.5, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 58, + "TotalPointCount": 152, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.067, + 0, + 0.133, + 0, + 0.2, + 0, + 1, + 0.4, + 0, + 0.6, + 0, + 0.8, + 0, + 1, + 1.022, + 0, + 1.244, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + -11, + 1, + 0.067, + -11, + 0.133, + -11, + 0.2, + -11, + 1, + 0.3, + -11, + 0.4, + 10, + 0.5, + 10, + 1, + 0.6, + 10, + 0.7, + 0, + 0.8, + 0, + 1, + 1.022, + 0, + 1.244, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.067, + 0, + 0.133, + 0, + 0.2, + 0, + 1, + 0.4, + 0, + 0.6, + 0, + 0.8, + 0, + 1, + 1.022, + 0, + 1.244, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.067, + 0, + 0.133, + 0, + 0.2, + 0, + 1, + 0.4, + 0, + 0.6, + 0, + 0.8, + 0, + 1, + 1.022, + 0, + 1.244, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 0, + 1, + 0.067, + 0, + 0.133, + 0, + 0.2, + 0, + 1, + 0.3, + 0, + 0.4, + 0, + 0.5, + 0, + 1, + 0.6, + 0, + 0.7, + 0, + 0.8, + 0, + 1, + 1.022, + 0, + 1.244, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.067, + 0, + 0.133, + 0, + 0.2, + 0, + 1, + 0.3, + 0, + 0.4, + 4, + 0.5, + 4, + 1, + 0.6, + 4, + 0.7, + 0, + 0.8, + 0, + 1, + 1.022, + 0, + 1.244, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.489, + 50, + 0.978, + 50, + 1.467, + 50, + 0, + 1.5, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.067, + 0, + 0.133, + 0, + 0.2, + 0, + 1, + 0.622, + 0, + 1.044, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.067, + 0, + 0.133, + 0, + 0.2, + 0, + 1, + 0.622, + 0, + 1.044, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.489, + 0, + 0.978, + 0, + 1.467, + 0, + 0, + 1.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 1.5, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Wanko/motions/touch_06.motion3.json b/Samples/Resources/Wanko/motions/touch_06.motion3.json new file mode 100644 index 0000000..3d890c2 --- /dev/null +++ b/Samples/Resources/Wanko/motions/touch_06.motion3.json @@ -0,0 +1,720 @@ +{ + "Version": 3, + "Meta": { + "Duration": 1.867, + "Fps": 30.0, + "Loop": true, + "AreBeziersRestricted": true, + "CurveCount": 22, + "TotalSegmentCount": 88, + "TotalPointCount": 242, + "UserDataCount": 0, + "TotalUserDataSize": 0 + }, + "Curves": [ + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.456, + 0, + 0.578, + 3, + 0.7, + 3, + 1, + 0.778, + 3, + 0.856, + -2, + 0.933, + -2, + 1, + 1.233, + -2, + 1.533, + -2, + 1.833, + -2, + 0, + 1.867, + -2 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.378, + 0, + 0.422, + 18, + 0.467, + 18, + 1, + 0.544, + 18, + 0.622, + -30, + 0.7, + -30, + 1, + 0.778, + -30, + 0.856, + -13, + 0.933, + -13, + 1, + 1.011, + -13, + 1.089, + -30, + 1.167, + -30, + 1, + 1.389, + -30, + 1.611, + -30, + 1.833, + -30, + 0, + 1.867, + -30 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.456, + 0, + 0.578, + -7.716, + 0.7, + -17, + 1, + 0.778, + -22.908, + 0.856, + -24, + 0.933, + -24, + 1, + 1.233, + -24, + 1.533, + -24, + 1.833, + -24, + 0, + 1.867, + -24 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_L_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.456, + 0, + 0.578, + 0, + 0.7, + 0, + 1, + 0.778, + 0, + 0.856, + 0, + 0.933, + 0, + 1, + 1.233, + 0, + 1.533, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EYE_R_OPEN", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.456, + 0, + 0.578, + 0, + 0.7, + 0, + 1, + 0.778, + 0, + 0.856, + 0, + 0.933, + 0, + 1, + 1.233, + 0, + 1.533, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_MOUTH_OPEN_Y", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.456, + 0, + 0.578, + 0, + 0.7, + 0, + 1, + 0.778, + 0, + 0.856, + 0, + 0.933, + 0, + 1, + 1.233, + 0, + 1.533, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_X", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.611, + 0, + 0.889, + -6, + 1.167, + -6, + 1, + 1.389, + -6, + 1.611, + -6, + 1.833, + -6, + 0, + 1.867, + -6 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Z", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.456, + 0, + 0.578, + -2, + 0.7, + -2, + 1, + 0.778, + -2, + 0.856, + -2, + 0.933, + -2, + 1, + 1.233, + -2, + 1.533, + -2, + 1.833, + -2, + 0, + 1.867, + -2 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BODY_ANGLE_Y", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.378, + 0, + 0.422, + 3, + 0.467, + 3, + 1, + 0.544, + 3, + 0.622, + -6, + 0.7, + -6, + 1, + 0.778, + -6, + 0.856, + -6, + 0.933, + -6, + 1, + 1.233, + -6, + 1.533, + -6, + 1.833, + -6, + 0, + 1.867, + -6 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BREATH", + "Segments": [ + 0, + 0, + 1, + 0.611, + 0, + 1.222, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_LID", + "Segments": [ + 0, + 50, + 1, + 0.611, + 50, + 1.222, + 50, + 1.833, + 50, + 0, + 1.867, + 50 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_01", + "Segments": [ + 0, + 0, + 1, + 0.611, + 0, + 1.222, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_YUGE_02", + "Segments": [ + 0, + 0, + 1, + 0.611, + 0, + 1.222, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EFFECT", + "Segments": [ + 0, + 0, + 1, + 0.611, + 0, + 1.222, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_L", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.389, + 0, + 0.444, + -1, + 0.5, + -1, + 1, + 0.556, + -1, + 0.611, + 1, + 0.667, + 1, + 1, + 0.733, + 1, + 0.8, + -0.95, + 0.867, + -0.95, + 1, + 0.922, + -0.95, + 0.978, + 0.45, + 1.033, + 0.45, + 1, + 1.089, + 0.45, + 1.144, + -0.17, + 1.2, + -0.17, + 1, + 1.267, + -0.17, + 1.333, + 0, + 1.4, + 0, + 1, + 1.544, + 0, + 1.689, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_EAR_R", + "Segments": [ + 0, + 0, + 1, + 0.111, + 0, + 0.222, + 0, + 0.333, + 0, + 1, + 0.389, + 0, + 0.444, + 1, + 0.5, + 1, + 1, + 0.556, + 1, + 0.611, + -1, + 0.667, + -1, + 1, + 0.733, + -1, + 0.8, + 1, + 0.867, + 1, + 1, + 0.922, + 1, + 0.978, + -0.39, + 1.033, + -0.39, + 1, + 1.089, + -0.39, + 1.144, + 0.13, + 1.2, + 0.13, + 1, + 1.267, + 0.13, + 1.333, + 0, + 1.4, + 0, + 1, + 1.544, + 0, + 1.689, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_L", + "Segments": [ + 0, + 0, + 1, + 0.233, + 0, + 0.467, + 0, + 0.7, + 0, + 1, + 0.778, + 0, + 0.856, + 0, + 0.933, + 0, + 1, + 1.233, + 0, + 1.533, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_HAND_R", + "Segments": [ + 0, + 0, + 1, + 0.233, + 0, + 0.467, + 0, + 0.7, + 0, + 1, + 0.778, + 0, + 0.856, + 0, + 0.933, + 0, + 1, + 1.233, + 0, + 1.533, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_SWING", + "Segments": [ + 0, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BOWL_SWING", + "Segments": [ + 0, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_FACE_01", + "Segments": [ + 0, + 0, + 1, + 0.611, + 0, + 1.222, + 0, + 1.833, + 0, + 0, + 1.867, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "PARAM_BASE_X", + "Segments": [ + 0, + 0, + 0, + 1.867, + 0 + ] + } + ] +} \ No newline at end of file diff --git a/Samples/TypeScript/Demo/.eslintrc.yml b/Samples/TypeScript/Demo/.eslintrc.yml index fb50b61..78105f2 100644 --- a/Samples/TypeScript/Demo/.eslintrc.yml +++ b/Samples/TypeScript/Demo/.eslintrc.yml @@ -25,3 +25,5 @@ rules: '@typescript-eslint/no-unsafe-assignment': off '@typescript-eslint/no-unsafe-return': off '@typescript-eslint/no-floating-promises': off + '@typescript-eslint/no-unused-vars': off + '@typescript-eslint/no-explicit-any': off diff --git a/Samples/TypeScript/Demo/index.html b/Samples/TypeScript/Demo/index.html index 24ae2bc..9556d66 100644 --- a/Samples/TypeScript/Demo/index.html +++ b/Samples/TypeScript/Demo/index.html @@ -2,13 +2,18 @@ - + TypeScript HTML App diff --git a/Samples/TypeScript/Demo/package-lock.json b/Samples/TypeScript/Demo/package-lock.json index af78c8b..43ea0ab 100644 --- a/Samples/TypeScript/Demo/package-lock.json +++ b/Samples/TypeScript/Demo/package-lock.json @@ -5,27 +5,36 @@ "packages": { "": { "dependencies": { - "whatwg-fetch": "^3.6.2" + "whatwg-fetch": "^3.6.17" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^5.59.5", - "@typescript-eslint/parser": "^5.59.5", - "eslint": "^8.40.0", - "eslint-config-prettier": "^8.8.0", - "eslint-plugin-prettier": "^4.2.1", - "prettier": "^2.8.8", - "rimraf": "^5.0.0", + "@typescript-eslint/eslint-plugin": "^6.4.0", + "@typescript-eslint/parser": "^6.4.0", + "eslint": "^8.47.0", + "eslint-config-prettier": "^9.0.0", + "eslint-plugin-prettier": "^5.0.0", + "prettier": "^3.0.1", + "rimraf": "^5.0.1", "serve": "^14.2.0", - "ts-loader": "^9.4.2", - "typescript": "^5.0.4", - "webpack": "^5.82.1", - "webpack-cli": "^5.1.1", - "webpack-dev-server": "^4.15.0" + "ts-loader": "^9.4.4", + "typescript": "^5.1.6", + "webpack": "^5.88.2", + "webpack-cli": "^5.1.4", + "webpack-dev-server": "^4.15.1" }, "optionalDependencies": { "fsevents": "*" } }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/@discoveryjs/json-ext": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", @@ -51,23 +60,23 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz", - "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz", + "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz", - "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.5.2", + "espree": "^9.6.0", "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -83,18 +92,18 @@ } }, "node_modules/@eslint/js": { - "version": "8.40.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.40.0.tgz", - "integrity": "sha512-ElyB54bJIhXQYVKjDSvCkPO1iU1tSAeVQJbllWJq1XQSmmA4dgFk8CbiBGpiOPxleE48vDogxCtmMYku4HSVLA==", + "version": "8.47.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz", + "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", - "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", + "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==", "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^1.2.1", @@ -154,9 +163,9 @@ } }, "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "dev": true, "dependencies": { "ansi-regex": "^6.0.1" @@ -277,6 +286,56 @@ "node": ">=14" } }, + "node_modules/@pkgr/utils": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz", + "integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "fast-glob": "^3.3.0", + "is-glob": "^4.0.3", + "open": "^9.1.0", + "picocolors": "^1.0.0", + "tslib": "^2.6.0" + }, + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, + "node_modules/@pkgr/utils/node_modules/define-lazy-prop": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", + "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@pkgr/utils/node_modules/open": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz", + "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==", + "dev": true, + "dependencies": { + "default-browser": "^4.0.0", + "define-lazy-prop": "^3.0.0", + "is-inside-container": "^1.0.0", + "is-wsl": "^2.2.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@types/body-parser": { "version": "1.19.2", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", @@ -374,9 +433,9 @@ } }, "node_modules/@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "version": "7.0.12", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", + "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", "dev": true }, "node_modules/@types/mime": { @@ -444,41 +503,42 @@ } }, "node_modules/@types/ws": { - "version": "8.5.3", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz", - "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==", + "version": "8.5.5", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz", + "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.5.tgz", - "integrity": "sha512-feA9xbVRWJZor+AnLNAr7A8JRWeZqHUf4T9tlP+TN04b05pFVhO5eN7/O93Y/1OUlLMHKbnJisgDURs/qvtqdg==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.0.tgz", + "integrity": "sha512-62o2Hmc7Gs3p8SLfbXcipjWAa6qk2wZGChXG2JbBtYpwSRmti/9KHLqfbLs9uDigOexG+3PaQ9G2g3201FWLKg==", "dev": true, "dependencies": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.59.5", - "@typescript-eslint/type-utils": "5.59.5", - "@typescript-eslint/utils": "5.59.5", + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.4.0", + "@typescript-eslint/type-utils": "6.4.0", + "@typescript-eslint/utils": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", "debug": "^4.3.4", - "grapheme-splitter": "^1.0.4", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "graphemer": "^1.4.0", + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -487,25 +547,26 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.5.tgz", - "integrity": "sha512-NJXQC4MRnF9N9yWqQE2/KLRSOLvrrlZb48NGVfBa+RuPMN6B7ZcK5jZOvhuygv4D64fRKnZI4L4p8+M+rfeQuw==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.0.tgz", + "integrity": "sha512-I1Ah1irl033uxjxO9Xql7+biL3YD7w9IU8zF+xlzD/YxY6a4b7DYA08PXUUCbm2sEljwJF6ERFy2kTGAGcNilg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.59.5", - "@typescript-eslint/types": "5.59.5", - "@typescript-eslint/typescript-estree": "5.59.5", + "@typescript-eslint/scope-manager": "6.4.0", + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/typescript-estree": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", "debug": "^4.3.4" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -514,16 +575,16 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.5.tgz", - "integrity": "sha512-jVecWwnkX6ZgutF+DovbBJirZcAxgxC0EOHYt/niMROf8p4PwxxG32Qdhj/iIQQIuOflLjNkxoXyArkcIP7C3A==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz", + "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.5", - "@typescript-eslint/visitor-keys": "5.59.5" + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -531,25 +592,25 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.5.tgz", - "integrity": "sha512-4eyhS7oGym67/pSxA2mmNq7X164oqDYNnZCUayBwJZIRVvKpBCMBzFnFxjeoDeShjtO6RQBHBuwybuX3POnDqg==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.0.tgz", + "integrity": "sha512-TvqrUFFyGY0cX3WgDHcdl2/mMCWCDv/0thTtx/ODMY1QhEiyFtv/OlLaNIiYLwRpAxAtOLOY9SUf1H3Q3dlwAg==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.59.5", - "@typescript-eslint/utils": "5.59.5", + "@typescript-eslint/typescript-estree": "6.4.0", + "@typescript-eslint/utils": "6.4.0", "debug": "^4.3.4", - "tsutils": "^3.21.0" + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "*" + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -558,12 +619,12 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.5.tgz", - "integrity": "sha512-xkfRPHbqSH4Ggx4eHRIO/eGL8XL4Ysb4woL8c87YuAo8Md7AUjyWKa9YMwTL519SyDPrfEgKdewjkxNCVeJW7w==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz", + "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==", "dev": true, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -571,21 +632,21 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.5.tgz", - "integrity": "sha512-+XXdLN2CZLZcD/mO7mQtJMvCkzRfmODbeSKuMY/yXbGkzvA9rJyDY5qDYNoiz2kP/dmyAxXquL2BvLQLJFPQIg==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz", + "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.5", - "@typescript-eslint/visitor-keys": "5.59.5", + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -598,42 +659,41 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.5.tgz", - "integrity": "sha512-sCEHOiw+RbyTii9c3/qN74hYDPNORb8yWCoPLmB7BIflhplJ65u2PBpdRla12e3SSTJ2erRkPjz7ngLHhUegxA==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.0.tgz", + "integrity": "sha512-BvvwryBQpECPGo8PwF/y/q+yacg8Hn/2XS+DqL/oRsOPK+RPt29h5Ui5dqOKHDlbXrAeHUTnyG3wZA0KTDxRZw==", "dev": true, "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.59.5", - "@typescript-eslint/types": "5.59.5", - "@typescript-eslint/typescript-estree": "5.59.5", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.4.0", + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/typescript-estree": "6.4.0", + "semver": "^7.5.4" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^7.0.0 || ^8.0.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.5.tgz", - "integrity": "sha512-qL+Oz+dbeBRTeyJTIy0eniD3uvqU7x+y1QceBismZ41hd4aBSRh8UAw4pZP0+XzLuPZmx4raNMq/I+59W2lXKA==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz", + "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.5", - "eslint-visitor-keys": "^3.3.0" + "@typescript-eslint/types": "6.4.0", + "eslint-visitor-keys": "^3.4.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -787,9 +847,9 @@ } }, "node_modules/@webpack-cli/configtest": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.0.tgz", - "integrity": "sha512-K/vuv72vpfSEZoo5KIU0a2FsEoYdW0DUMtMpB5X3LlUwshetMZRZRxB7sCsVji/lFaSxtQQ3aM9O4eMolXkU9w==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz", + "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==", "dev": true, "engines": { "node": ">=14.15.0" @@ -800,9 +860,9 @@ } }, "node_modules/@webpack-cli/info": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.1.tgz", - "integrity": "sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz", + "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==", "dev": true, "engines": { "node": ">=14.15.0" @@ -813,9 +873,9 @@ } }, "node_modules/@webpack-cli/serve": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.4.tgz", - "integrity": "sha512-0xRgjgDLdz6G7+vvDLlaRpFatJaJ69uTalZLRSMX5B3VUrDmXcrVA3+6fXXQgmYz7bY9AAgs348XQdmtLsK41A==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz", + "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==", "dev": true, "engines": { "node": ">=14.15.0" @@ -862,9 +922,9 @@ } }, "node_modules/acorn": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", - "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -874,9 +934,9 @@ } }, "node_modules/acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", "dev": true, "peerDependencies": { "acorn": "^8" @@ -1092,6 +1152,15 @@ "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", "dev": true }, + "node_modules/big-integer": { + "version": "1.6.51", + "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", + "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", + "dev": true, + "engines": { + "node": ">=0.6" + } + }, "node_modules/binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -1207,6 +1276,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/bplist-parser": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", + "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==", + "dev": true, + "dependencies": { + "big-integer": "^1.6.44" + }, + "engines": { + "node": ">= 5.10.0" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1263,6 +1344,21 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, + "node_modules/bundle-name": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz", + "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==", + "dev": true, + "dependencies": { + "run-applescript": "^5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", @@ -1619,6 +1715,150 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, + "node_modules/default-browser": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz", + "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==", + "dev": true, + "dependencies": { + "bundle-name": "^3.0.0", + "default-browser-id": "^3.0.0", + "execa": "^7.1.1", + "titleize": "^3.0.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser-id": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz", + "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==", + "dev": true, + "dependencies": { + "bplist-parser": "^0.2.0", + "untildify": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser/node_modules/execa": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", + "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.1", + "human-signals": "^4.3.0", + "is-stream": "^3.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^3.0.7", + "strip-final-newline": "^3.0.0" + }, + "engines": { + "node": "^14.18.0 || ^16.14.0 || >=18.0.0" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/default-browser/node_modules/human-signals": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", + "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", + "dev": true, + "engines": { + "node": ">=14.18.0" + } + }, + "node_modules/default-browser/node_modules/is-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser/node_modules/mimic-fn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser/node_modules/npm-run-path": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", + "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", + "dev": true, + "dependencies": { + "path-key": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser/node_modules/onetime": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", + "dev": true, + "dependencies": { + "mimic-fn": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser/node_modules/path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-browser/node_modules/strip-final-newline": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/default-gateway": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", @@ -1741,9 +1981,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.0.tgz", - "integrity": "sha512-+DCows0XNwLDcUhbFJPdlQEVnT2zXlCv7hPxemTz86/O+B/hCQ+mb7ydkPKiflpVraqLPCAfu7lDy+hBXueojw==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -1799,27 +2039,27 @@ } }, "node_modules/eslint": { - "version": "8.40.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.40.0.tgz", - "integrity": "sha512-bvR+TsP9EHL3TqNtj9sCNJVAFK3fBN8Q7g5waghxyRsPLIMwL73XSKnZFK0hk/O2ANC+iAoq6PWMQ+IfBAJIiQ==", + "version": "8.47.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz", + "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.3", - "@eslint/js": "8.40.0", - "@humanwhocodes/config-array": "^0.11.8", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "^8.47.0", + "@humanwhocodes/config-array": "^0.11.10", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", + "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.0", - "eslint-visitor-keys": "^3.4.1", - "espree": "^9.5.2", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -1827,22 +2067,19 @@ "find-up": "^5.0.0", "glob-parent": "^6.0.2", "globals": "^13.19.0", - "grapheme-splitter": "^1.0.4", + "graphemer": "^1.4.0", "ignore": "^5.2.0", - "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", - "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.1", + "optionator": "^0.9.3", "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" }, "bin": { @@ -1856,9 +2093,9 @@ } }, "node_modules/eslint-config-prettier": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz", - "integrity": "sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", + "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==", "dev": true, "bin": { "eslint-config-prettier": "bin/cli.js" @@ -1868,21 +2105,29 @@ } }, "node_modules/eslint-plugin-prettier": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz", - "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0.tgz", + "integrity": "sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w==", "dev": true, "dependencies": { - "prettier-linter-helpers": "^1.0.0" + "prettier-linter-helpers": "^1.0.0", + "synckit": "^0.8.5" }, "engines": { - "node": ">=12.0.0" + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/prettier" }, "peerDependencies": { - "eslint": ">=7.28.0", - "prettier": ">=2.0.0" + "@types/eslint": ">=8.0.0", + "eslint": ">=8.0.0", + "prettier": ">=3.0.0" }, "peerDependenciesMeta": { + "@types/eslint": { + "optional": true + }, "eslint-config-prettier": { "optional": true } @@ -1902,9 +2147,9 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz", - "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1914,9 +2159,9 @@ } }, "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", - "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -1939,12 +2184,12 @@ } }, "node_modules/espree": { - "version": "9.5.2", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz", - "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "dependencies": { - "acorn": "^8.8.0", + "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^3.4.1" }, @@ -2185,9 +2430,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -2407,9 +2652,9 @@ } }, "node_modules/foreground-child/node_modules/signal-exit": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.2.tgz", - "integrity": "sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, "engines": { "node": ">=14" @@ -2532,9 +2777,9 @@ "dev": true }, "node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.21.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", + "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -2572,10 +2817,10 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, - "node_modules/grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, "node_modules/handle-thing": { @@ -2747,9 +2992,9 @@ } }, "node_modules/ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", "dev": true, "engines": { "node": ">= 4" @@ -2908,6 +3153,39 @@ "node": ">=0.10.0" } }, + "node_modules/is-inside-container": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", + "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", + "dev": true, + "dependencies": { + "is-docker": "^3.0.0" + }, + "bin": { + "is-inside-container": "cli.js" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-inside-container/node_modules/is-docker": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", + "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", + "dev": true, + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -3008,9 +3286,9 @@ } }, "node_modules/jackspeak": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.0.tgz", - "integrity": "sha512-r5XBrqIJfwRIjRt/Xr5fv9Wh09qyhHfKnYddDlpM+ibRR20qrYActpCAgU6U+d53EOEjzkvxPMVHSlgR7leXrQ==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.3.tgz", + "integrity": "sha512-pF0kfjmg8DJLxDrizHoCZGUFz4P4czQ3HyfW4BU0ffebYkzAVlBywp5zaxW/TM+r0sGbmrQdi8EQQVTJFxnGsQ==", "dev": true, "dependencies": { "@isaacs/cliui": "^8.0.2" @@ -3054,16 +3332,6 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/js-sdsl": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz", - "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/js-sdsl" - } - }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -3299,12 +3567,12 @@ "dev": true }, "node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", + "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", "dev": true, "engines": { - "node": ">=8" + "node": ">=16 || 14 >=14.17" } }, "node_modules/ms": { @@ -3332,12 +3600,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "node_modules/natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -3467,17 +3729,17 @@ } }, "node_modules/optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "type-check": "^0.4.0" }, "engines": { "node": ">= 0.8.0" @@ -3596,13 +3858,13 @@ "dev": true }, "node_modules/path-scurry": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.8.0.tgz", - "integrity": "sha512-IjTrKseM404/UAWA8bBbL3Qp6O2wXkanuIE3seCxBH7ctRuvH1QRawy1N3nVDHGkdeZsjOsSe/8AQBL/VQCy2g==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", "dev": true, "dependencies": { - "lru-cache": "^9.1.1", - "minipass": "^5.0.0" + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -3612,9 +3874,9 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.1.tgz", - "integrity": "sha512-65/Jky17UwSb0BuB9V+MyDpsOtXKmYwzhyl+cOa9XUiI4uV2Ouy/2voFP3+al0BjZbJgMBD8FojMpAf+Z+qn4A==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", + "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==", "dev": true, "engines": { "node": "14 || >=16.14" @@ -3727,15 +3989,15 @@ } }, "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz", + "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" @@ -4030,12 +4292,12 @@ } }, "node_modules/rimraf": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.0.tgz", - "integrity": "sha512-Jf9llaP+RvaEVS5nPShYFhtXIrb3LRKP281ib3So0KkeZKo2wIKyq0Re7TOSwanasA423PSr6CCIL4bP6T040g==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.1.tgz", + "integrity": "sha512-OfFZdwtd3lZ+XZzYP/6gTACubwFcHdLRqS9UX3UwpU2dnGQYkPFISRwvM3w9IiB2w7bW5qGo/uAwE4SmXXSKvg==", "dev": true, "dependencies": { - "glob": "^10.0.0" + "glob": "^10.2.5" }, "bin": { "rimraf": "dist/cjs/src/bin.js" @@ -4057,16 +4319,16 @@ } }, "node_modules/rimraf/node_modules/glob": { - "version": "10.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.2.3.tgz", - "integrity": "sha512-Kb4rfmBVE3eQTAimgmeqc2LwSnN0wIOkkUL6HmxEFxNJ4fHghYHVbFba/HcGcRjE6s9KoMNK3rSOwkL4PioZjg==", + "version": "10.3.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz", + "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==", "dev": true, "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^2.0.3", - "minimatch": "^9.0.0", - "minipass": "^5.0.0", - "path-scurry": "^1.7.0" + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" }, "bin": { "glob": "dist/cjs/src/bin.js" @@ -4079,9 +4341,9 @@ } }, "node_modules/rimraf/node_modules/minimatch": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.0.tgz", - "integrity": "sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" @@ -4093,6 +4355,21 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/run-applescript": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz", + "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==", + "dev": true, + "dependencies": { + "execa": "^5.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -4129,9 +4406,9 @@ "dev": true }, "node_modules/schema-utils": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz", - "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -4165,9 +4442,9 @@ } }, "node_modules/semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -4741,6 +5018,22 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/synckit": { + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz", + "integrity": "sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==", + "dev": true, + "dependencies": { + "@pkgr/utils": "^2.3.1", + "tslib": "^2.5.0" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -4814,6 +5107,18 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, + "node_modules/titleize": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz", + "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -4835,10 +5140,22 @@ "node": ">=0.6" } }, + "node_modules/ts-api-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.1.tgz", + "integrity": "sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==", + "dev": true, + "engines": { + "node": ">=16.13.0" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, "node_modules/ts-loader": { - "version": "9.4.2", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.2.tgz", - "integrity": "sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==", + "version": "9.4.4", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.4.tgz", + "integrity": "sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==", "dev": true, "dependencies": { "chalk": "^4.1.0", @@ -4855,26 +5172,11 @@ } }, "node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", "dev": true }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - } - }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -4913,16 +5215,16 @@ } }, "node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", + "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=12.20" + "node": ">=14.17" } }, "node_modules/unpipe": { @@ -4934,6 +5236,15 @@ "node": ">= 0.8" } }, + "node_modules/untildify": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", + "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/update-browserslist-db": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz", @@ -5044,9 +5355,9 @@ } }, "node_modules/webpack": { - "version": "5.82.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.82.1.tgz", - "integrity": "sha512-C6uiGQJ+Gt4RyHXXYt+v9f+SN1v83x68URwgxNQ98cvH8kxiuywWGP4XeNZ1paOzZ63aY3cTciCEQJNFUljlLw==", + "version": "5.88.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", + "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", @@ -5055,10 +5366,10 @@ "@webassemblyjs/wasm-edit": "^1.11.5", "@webassemblyjs/wasm-parser": "^1.11.5", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.14.0", + "enhanced-resolve": "^5.15.0", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -5068,7 +5379,7 @@ "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.2", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", "terser-webpack-plugin": "^5.3.7", "watchpack": "^2.4.0", @@ -5091,15 +5402,15 @@ } }, "node_modules/webpack-cli": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.1.tgz", - "integrity": "sha512-OLJwVMoXnXYH2ncNGU8gxVpUtm3ybvdioiTvHgUyBuyMLKiVvWy+QObzBsMtp5pH7qQoEuWgeEUQ/sU3ZJFzAw==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz", + "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==", "dev": true, "dependencies": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^2.1.0", - "@webpack-cli/info": "^2.0.1", - "@webpack-cli/serve": "^2.0.4", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", "colorette": "^2.0.14", "commander": "^10.0.1", "cross-spawn": "^7.0.3", @@ -5230,9 +5541,9 @@ } }, "node_modules/webpack-dev-server": { - "version": "4.15.0", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.0.tgz", - "integrity": "sha512-HmNB5QeSl1KpulTBQ8UT4FPrByYyaLxpJoQ0+s7EvUrMc16m0ZS1sgb1XGqzmgCPk0c9y+aaXxn11tbLzuM7NQ==", + "version": "4.15.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz", + "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==", "dev": true, "dependencies": { "@types/bonjour": "^3.5.9", @@ -5241,7 +5552,7 @@ "@types/serve-index": "^1.9.1", "@types/serve-static": "^1.13.10", "@types/sockjs": "^0.3.33", - "@types/ws": "^8.5.1", + "@types/ws": "^8.5.5", "ansi-html-community": "^0.0.8", "bonjour-service": "^1.0.11", "chokidar": "^3.5.3", @@ -5402,9 +5713,9 @@ } }, "node_modules/whatwg-fetch": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz", - "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==" + "version": "3.6.17", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.17.tgz", + "integrity": "sha512-c4ghIvG6th0eudYwKZY5keb81wtFz9/WeAHAoy8+r18kcWlitUIrmGFQ2rWEl4UCKUilD3zCLHOIPheHx5ypRQ==" }, "node_modules/which": { "version": "2.0.2", @@ -5442,15 +5753,6 @@ "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", "dev": true }, - "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/wrap-ansi": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", @@ -5592,6 +5894,12 @@ } }, "dependencies": { + "@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true + }, "@discoveryjs/json-ext": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", @@ -5608,20 +5916,20 @@ } }, "@eslint-community/regexpp": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz", - "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz", + "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==", "dev": true }, "@eslint/eslintrc": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz", - "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", + "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.5.2", + "espree": "^9.6.0", "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -5631,15 +5939,15 @@ } }, "@eslint/js": { - "version": "8.40.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.40.0.tgz", - "integrity": "sha512-ElyB54bJIhXQYVKjDSvCkPO1iU1tSAeVQJbllWJq1XQSmmA4dgFk8CbiBGpiOPxleE48vDogxCtmMYku4HSVLA==", + "version": "8.47.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz", + "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==", "dev": true }, "@humanwhocodes/config-array": { - "version": "0.11.8", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", - "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", + "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==", "dev": true, "requires": { "@humanwhocodes/object-schema": "^1.2.1", @@ -5680,9 +5988,9 @@ "dev": true }, "strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "dev": true, "requires": { "ansi-regex": "^6.0.1" @@ -5778,6 +6086,40 @@ "dev": true, "optional": true }, + "@pkgr/utils": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz", + "integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.3", + "fast-glob": "^3.3.0", + "is-glob": "^4.0.3", + "open": "^9.1.0", + "picocolors": "^1.0.0", + "tslib": "^2.6.0" + }, + "dependencies": { + "define-lazy-prop": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", + "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", + "dev": true + }, + "open": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz", + "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==", + "dev": true, + "requires": { + "default-browser": "^4.0.0", + "define-lazy-prop": "^3.0.0", + "is-inside-container": "^1.0.0", + "is-wsl": "^2.2.0" + } + } + } + }, "@types/body-parser": { "version": "1.19.2", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz", @@ -5875,9 +6217,9 @@ } }, "@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "version": "7.0.12", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", + "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", "dev": true }, "@types/mime": { @@ -5945,111 +6287,112 @@ } }, "@types/ws": { - "version": "8.5.3", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz", - "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==", + "version": "8.5.5", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz", + "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==", "dev": true, "requires": { "@types/node": "*" } }, "@typescript-eslint/eslint-plugin": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.5.tgz", - "integrity": "sha512-feA9xbVRWJZor+AnLNAr7A8JRWeZqHUf4T9tlP+TN04b05pFVhO5eN7/O93Y/1OUlLMHKbnJisgDURs/qvtqdg==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.0.tgz", + "integrity": "sha512-62o2Hmc7Gs3p8SLfbXcipjWAa6qk2wZGChXG2JbBtYpwSRmti/9KHLqfbLs9uDigOexG+3PaQ9G2g3201FWLKg==", "dev": true, "requires": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.59.5", - "@typescript-eslint/type-utils": "5.59.5", - "@typescript-eslint/utils": "5.59.5", + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.4.0", + "@typescript-eslint/type-utils": "6.4.0", + "@typescript-eslint/utils": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", "debug": "^4.3.4", - "grapheme-splitter": "^1.0.4", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "graphemer": "^1.4.0", + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" } }, "@typescript-eslint/parser": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.5.tgz", - "integrity": "sha512-NJXQC4MRnF9N9yWqQE2/KLRSOLvrrlZb48NGVfBa+RuPMN6B7ZcK5jZOvhuygv4D64fRKnZI4L4p8+M+rfeQuw==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.0.tgz", + "integrity": "sha512-I1Ah1irl033uxjxO9Xql7+biL3YD7w9IU8zF+xlzD/YxY6a4b7DYA08PXUUCbm2sEljwJF6ERFy2kTGAGcNilg==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.59.5", - "@typescript-eslint/types": "5.59.5", - "@typescript-eslint/typescript-estree": "5.59.5", + "@typescript-eslint/scope-manager": "6.4.0", + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/typescript-estree": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", "debug": "^4.3.4" } }, "@typescript-eslint/scope-manager": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.5.tgz", - "integrity": "sha512-jVecWwnkX6ZgutF+DovbBJirZcAxgxC0EOHYt/niMROf8p4PwxxG32Qdhj/iIQQIuOflLjNkxoXyArkcIP7C3A==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz", + "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==", "dev": true, "requires": { - "@typescript-eslint/types": "5.59.5", - "@typescript-eslint/visitor-keys": "5.59.5" + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0" } }, "@typescript-eslint/type-utils": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.5.tgz", - "integrity": "sha512-4eyhS7oGym67/pSxA2mmNq7X164oqDYNnZCUayBwJZIRVvKpBCMBzFnFxjeoDeShjtO6RQBHBuwybuX3POnDqg==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.0.tgz", + "integrity": "sha512-TvqrUFFyGY0cX3WgDHcdl2/mMCWCDv/0thTtx/ODMY1QhEiyFtv/OlLaNIiYLwRpAxAtOLOY9SUf1H3Q3dlwAg==", "dev": true, "requires": { - "@typescript-eslint/typescript-estree": "5.59.5", - "@typescript-eslint/utils": "5.59.5", + "@typescript-eslint/typescript-estree": "6.4.0", + "@typescript-eslint/utils": "6.4.0", "debug": "^4.3.4", - "tsutils": "^3.21.0" + "ts-api-utils": "^1.0.1" } }, "@typescript-eslint/types": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.5.tgz", - "integrity": "sha512-xkfRPHbqSH4Ggx4eHRIO/eGL8XL4Ysb4woL8c87YuAo8Md7AUjyWKa9YMwTL519SyDPrfEgKdewjkxNCVeJW7w==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz", + "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.5.tgz", - "integrity": "sha512-+XXdLN2CZLZcD/mO7mQtJMvCkzRfmODbeSKuMY/yXbGkzvA9rJyDY5qDYNoiz2kP/dmyAxXquL2BvLQLJFPQIg==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz", + "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.59.5", - "@typescript-eslint/visitor-keys": "5.59.5", + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/visitor-keys": "6.4.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" } }, "@typescript-eslint/utils": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.5.tgz", - "integrity": "sha512-sCEHOiw+RbyTii9c3/qN74hYDPNORb8yWCoPLmB7BIflhplJ65u2PBpdRla12e3SSTJ2erRkPjz7ngLHhUegxA==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.0.tgz", + "integrity": "sha512-BvvwryBQpECPGo8PwF/y/q+yacg8Hn/2XS+DqL/oRsOPK+RPt29h5Ui5dqOKHDlbXrAeHUTnyG3wZA0KTDxRZw==", "dev": true, "requires": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.59.5", - "@typescript-eslint/types": "5.59.5", - "@typescript-eslint/typescript-estree": "5.59.5", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.4.0", + "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/typescript-estree": "6.4.0", + "semver": "^7.5.4" } }, "@typescript-eslint/visitor-keys": { - "version": "5.59.5", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.5.tgz", - "integrity": "sha512-qL+Oz+dbeBRTeyJTIy0eniD3uvqU7x+y1QceBismZ41hd4aBSRh8UAw4pZP0+XzLuPZmx4raNMq/I+59W2lXKA==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz", + "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.59.5", - "eslint-visitor-keys": "^3.3.0" + "@typescript-eslint/types": "6.4.0", + "eslint-visitor-keys": "^3.4.1" } }, "@webassemblyjs/ast": { @@ -6199,23 +6542,23 @@ } }, "@webpack-cli/configtest": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.0.tgz", - "integrity": "sha512-K/vuv72vpfSEZoo5KIU0a2FsEoYdW0DUMtMpB5X3LlUwshetMZRZRxB7sCsVji/lFaSxtQQ3aM9O4eMolXkU9w==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz", + "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==", "dev": true, "requires": {} }, "@webpack-cli/info": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.1.tgz", - "integrity": "sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz", + "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==", "dev": true, "requires": {} }, "@webpack-cli/serve": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.4.tgz", - "integrity": "sha512-0xRgjgDLdz6G7+vvDLlaRpFatJaJ69uTalZLRSMX5B3VUrDmXcrVA3+6fXXQgmYz7bY9AAgs348XQdmtLsK41A==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz", + "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==", "dev": true, "requires": {} }, @@ -6248,15 +6591,15 @@ } }, "acorn": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", - "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", "dev": true }, "acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", "dev": true, "requires": {} }, @@ -6416,6 +6759,12 @@ "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", "dev": true }, + "big-integer": { + "version": "1.6.51", + "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", + "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", + "dev": true + }, "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -6507,6 +6856,15 @@ } } }, + "bplist-parser": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", + "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==", + "dev": true, + "requires": { + "big-integer": "^1.6.44" + } + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -6544,6 +6902,15 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, + "bundle-name": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz", + "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==", + "dev": true, + "requires": { + "run-applescript": "^5.0.0" + } + }, "bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", @@ -6800,6 +7167,95 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, + "default-browser": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz", + "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==", + "dev": true, + "requires": { + "bundle-name": "^3.0.0", + "default-browser-id": "^3.0.0", + "execa": "^7.1.1", + "titleize": "^3.0.0" + }, + "dependencies": { + "execa": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", + "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.1", + "human-signals": "^4.3.0", + "is-stream": "^3.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^3.0.7", + "strip-final-newline": "^3.0.0" + } + }, + "human-signals": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", + "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", + "dev": true + }, + "is-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", + "dev": true + }, + "mimic-fn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", + "dev": true + }, + "npm-run-path": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", + "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", + "dev": true, + "requires": { + "path-key": "^4.0.0" + } + }, + "onetime": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", + "dev": true, + "requires": { + "mimic-fn": "^4.0.0" + } + }, + "path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true + }, + "strip-final-newline": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", + "dev": true + } + } + }, + "default-browser-id": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz", + "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==", + "dev": true, + "requires": { + "bplist-parser": "^0.2.0", + "untildify": "^4.0.0" + } + }, "default-gateway": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", @@ -6897,9 +7353,9 @@ "dev": true }, "enhanced-resolve": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.0.tgz", - "integrity": "sha512-+DCows0XNwLDcUhbFJPdlQEVnT2zXlCv7hPxemTz86/O+B/hCQ+mb7ydkPKiflpVraqLPCAfu7lDy+hBXueojw==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, "requires": { "graceful-fs": "^4.2.4", @@ -6937,27 +7393,27 @@ "dev": true }, "eslint": { - "version": "8.40.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.40.0.tgz", - "integrity": "sha512-bvR+TsP9EHL3TqNtj9sCNJVAFK3fBN8Q7g5waghxyRsPLIMwL73XSKnZFK0hk/O2ANC+iAoq6PWMQ+IfBAJIiQ==", + "version": "8.47.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz", + "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.4.0", - "@eslint/eslintrc": "^2.0.3", - "@eslint/js": "8.40.0", - "@humanwhocodes/config-array": "^0.11.8", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "^8.47.0", + "@humanwhocodes/config-array": "^0.11.10", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "ajv": "^6.10.0", + "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.0", - "eslint-visitor-keys": "^3.4.1", - "espree": "^9.5.2", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", "esquery": "^1.4.2", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -6965,29 +7421,26 @@ "find-up": "^5.0.0", "glob-parent": "^6.0.2", "globals": "^13.19.0", - "grapheme-splitter": "^1.0.4", + "graphemer": "^1.4.0", "ignore": "^5.2.0", - "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "is-path-inside": "^3.0.3", - "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.1", + "optionator": "^0.9.3", "strip-ansi": "^6.0.1", - "strip-json-comments": "^3.1.0", "text-table": "^0.2.0" }, "dependencies": { "eslint-scope": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", - "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "requires": { "esrecurse": "^4.3.0", @@ -7003,19 +7456,20 @@ } }, "eslint-config-prettier": { - "version": "8.8.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz", - "integrity": "sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", + "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==", "dev": true, "requires": {} }, "eslint-plugin-prettier": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz", - "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0.tgz", + "integrity": "sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w==", "dev": true, "requires": { - "prettier-linter-helpers": "^1.0.0" + "prettier-linter-helpers": "^1.0.0", + "synckit": "^0.8.5" } }, "eslint-scope": { @@ -7029,18 +7483,18 @@ } }, "eslint-visitor-keys": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz", - "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true }, "espree": { - "version": "9.5.2", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz", - "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "requires": { - "acorn": "^8.8.0", + "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^3.4.1" } @@ -7228,9 +7682,9 @@ "dev": true }, "fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", @@ -7400,9 +7854,9 @@ }, "dependencies": { "signal-exit": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.2.tgz", - "integrity": "sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true } } @@ -7490,9 +7944,9 @@ "dev": true }, "globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.21.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", + "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -7518,10 +7972,10 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, - "grapheme-splitter": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", - "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, "handle-thing": { @@ -7660,9 +8114,9 @@ } }, "ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", "dev": true }, "import-fresh": { @@ -7770,6 +8224,23 @@ "is-extglob": "^2.1.1" } }, + "is-inside-container": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", + "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", + "dev": true, + "requires": { + "is-docker": "^3.0.0" + }, + "dependencies": { + "is-docker": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", + "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", + "dev": true + } + } + }, "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -7837,9 +8308,9 @@ "dev": true }, "jackspeak": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.0.tgz", - "integrity": "sha512-r5XBrqIJfwRIjRt/Xr5fv9Wh09qyhHfKnYddDlpM+ibRR20qrYActpCAgU6U+d53EOEjzkvxPMVHSlgR7leXrQ==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.3.tgz", + "integrity": "sha512-pF0kfjmg8DJLxDrizHoCZGUFz4P4czQ3HyfW4BU0ffebYkzAVlBywp5zaxW/TM+r0sGbmrQdi8EQQVTJFxnGsQ==", "dev": true, "requires": { "@isaacs/cliui": "^8.0.2", @@ -7868,12 +8339,6 @@ } } }, - "js-sdsl": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz", - "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==", - "dev": true - }, "js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -8055,9 +8520,9 @@ "dev": true }, "minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", + "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", "dev": true }, "ms": { @@ -8082,12 +8547,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, "negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -8184,17 +8643,17 @@ } }, "optionator": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", - "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, "requires": { + "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.3" + "type-check": "^0.4.0" } }, "p-limit": { @@ -8277,19 +8736,19 @@ "dev": true }, "path-scurry": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.8.0.tgz", - "integrity": "sha512-IjTrKseM404/UAWA8bBbL3Qp6O2wXkanuIE3seCxBH7ctRuvH1QRawy1N3nVDHGkdeZsjOsSe/8AQBL/VQCy2g==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", "dev": true, "requires": { - "lru-cache": "^9.1.1", - "minipass": "^5.0.0" + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "dependencies": { "lru-cache": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.1.tgz", - "integrity": "sha512-65/Jky17UwSb0BuB9V+MyDpsOtXKmYwzhyl+cOa9XUiI4uV2Ouy/2voFP3+al0BjZbJgMBD8FojMpAf+Z+qn4A==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz", + "integrity": "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==", "dev": true } } @@ -8373,9 +8832,9 @@ "dev": true }, "prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz", + "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==", "dev": true }, "prettier-linter-helpers": { @@ -8594,12 +9053,12 @@ "dev": true }, "rimraf": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.0.tgz", - "integrity": "sha512-Jf9llaP+RvaEVS5nPShYFhtXIrb3LRKP281ib3So0KkeZKo2wIKyq0Re7TOSwanasA423PSr6CCIL4bP6T040g==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.1.tgz", + "integrity": "sha512-OfFZdwtd3lZ+XZzYP/6gTACubwFcHdLRqS9UX3UwpU2dnGQYkPFISRwvM3w9IiB2w7bW5qGo/uAwE4SmXXSKvg==", "dev": true, "requires": { - "glob": "^10.0.0" + "glob": "^10.2.5" }, "dependencies": { "brace-expansion": { @@ -8612,22 +9071,22 @@ } }, "glob": { - "version": "10.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.2.3.tgz", - "integrity": "sha512-Kb4rfmBVE3eQTAimgmeqc2LwSnN0wIOkkUL6HmxEFxNJ4fHghYHVbFba/HcGcRjE6s9KoMNK3rSOwkL4PioZjg==", + "version": "10.3.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz", + "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==", "dev": true, "requires": { "foreground-child": "^3.1.0", "jackspeak": "^2.0.3", - "minimatch": "^9.0.0", - "minipass": "^5.0.0", - "path-scurry": "^1.7.0" + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" } }, "minimatch": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.0.tgz", - "integrity": "sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "requires": { "brace-expansion": "^2.0.1" @@ -8635,6 +9094,15 @@ } } }, + "run-applescript": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz", + "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==", + "dev": true, + "requires": { + "execa": "^5.0.0" + } + }, "run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -8657,9 +9125,9 @@ "dev": true }, "schema-utils": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz", - "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "requires": { "@types/json-schema": "^7.0.8", @@ -8683,9 +9151,9 @@ } }, "semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -9138,6 +9606,16 @@ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true }, + "synckit": { + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz", + "integrity": "sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==", + "dev": true, + "requires": { + "@pkgr/utils": "^2.3.1", + "tslib": "^2.5.0" + } + }, "tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -9181,6 +9659,12 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, + "titleize": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz", + "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==", + "dev": true + }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -9196,10 +9680,17 @@ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true }, + "ts-api-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.1.tgz", + "integrity": "sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==", + "dev": true, + "requires": {} + }, "ts-loader": { - "version": "9.4.2", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.2.tgz", - "integrity": "sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==", + "version": "9.4.4", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.4.tgz", + "integrity": "sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==", "dev": true, "requires": { "chalk": "^4.1.0", @@ -9209,20 +9700,11 @@ } }, "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", "dev": true }, - "tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "requires": { - "tslib": "^1.8.1" - } - }, "type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -9249,9 +9731,9 @@ } }, "typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", + "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", "dev": true }, "unpipe": { @@ -9260,6 +9742,12 @@ "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", "dev": true }, + "untildify": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", + "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", + "dev": true + }, "update-browserslist-db": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz", @@ -9341,9 +9829,9 @@ } }, "webpack": { - "version": "5.82.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.82.1.tgz", - "integrity": "sha512-C6uiGQJ+Gt4RyHXXYt+v9f+SN1v83x68URwgxNQ98cvH8kxiuywWGP4XeNZ1paOzZ63aY3cTciCEQJNFUljlLw==", + "version": "5.88.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", + "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.3", @@ -9352,10 +9840,10 @@ "@webassemblyjs/wasm-edit": "^1.11.5", "@webassemblyjs/wasm-parser": "^1.11.5", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.14.0", + "enhanced-resolve": "^5.15.0", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -9365,7 +9853,7 @@ "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.2", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", "terser-webpack-plugin": "^5.3.7", "watchpack": "^2.4.0", @@ -9373,15 +9861,15 @@ } }, "webpack-cli": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.1.tgz", - "integrity": "sha512-OLJwVMoXnXYH2ncNGU8gxVpUtm3ybvdioiTvHgUyBuyMLKiVvWy+QObzBsMtp5pH7qQoEuWgeEUQ/sU3ZJFzAw==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz", + "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==", "dev": true, "requires": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^2.1.0", - "@webpack-cli/info": "^2.0.1", - "@webpack-cli/serve": "^2.0.4", + "@webpack-cli/configtest": "^2.1.1", + "@webpack-cli/info": "^2.0.2", + "@webpack-cli/serve": "^2.0.5", "colorette": "^2.0.14", "commander": "^10.0.1", "cross-spawn": "^7.0.3", @@ -9462,9 +9950,9 @@ } }, "webpack-dev-server": { - "version": "4.15.0", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.0.tgz", - "integrity": "sha512-HmNB5QeSl1KpulTBQ8UT4FPrByYyaLxpJoQ0+s7EvUrMc16m0ZS1sgb1XGqzmgCPk0c9y+aaXxn11tbLzuM7NQ==", + "version": "4.15.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz", + "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==", "dev": true, "requires": { "@types/bonjour": "^3.5.9", @@ -9473,7 +9961,7 @@ "@types/serve-index": "^1.9.1", "@types/serve-static": "^1.13.10", "@types/sockjs": "^0.3.33", - "@types/ws": "^8.5.1", + "@types/ws": "^8.5.5", "ansi-html-community": "^0.0.8", "bonjour-service": "^1.0.11", "chokidar": "^3.5.3", @@ -9583,9 +10071,9 @@ "dev": true }, "whatwg-fetch": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz", - "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==" + "version": "3.6.17", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.17.tgz", + "integrity": "sha512-c4ghIvG6th0eudYwKZY5keb81wtFz9/WeAHAoy8+r18kcWlitUIrmGFQ2rWEl4UCKUilD3zCLHOIPheHx5ypRQ==" }, "which": { "version": "2.0.2", @@ -9611,12 +10099,6 @@ "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", "dev": true }, - "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true - }, "wrap-ansi": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", diff --git a/Samples/TypeScript/Demo/package.json b/Samples/TypeScript/Demo/package.json index 414ab95..5d7e009 100644 --- a/Samples/TypeScript/Demo/package.json +++ b/Samples/TypeScript/Demo/package.json @@ -11,22 +11,22 @@ "clean": "rimraf dist" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^5.59.5", - "@typescript-eslint/parser": "^5.59.5", - "eslint": "^8.40.0", - "eslint-config-prettier": "^8.8.0", - "eslint-plugin-prettier": "^4.2.1", - "prettier": "^2.8.8", - "rimraf": "^5.0.0", + "@typescript-eslint/eslint-plugin": "^6.4.0", + "@typescript-eslint/parser": "^6.4.0", + "eslint": "^8.47.0", + "eslint-config-prettier": "^9.0.0", + "eslint-plugin-prettier": "^5.0.0", + "prettier": "^3.0.1", + "rimraf": "^5.0.1", "serve": "^14.2.0", - "ts-loader": "^9.4.2", - "typescript": "^5.0.4", - "webpack": "^5.82.1", - "webpack-cli": "^5.1.1", - "webpack-dev-server": "^4.15.0" + "ts-loader": "^9.4.4", + "typescript": "^5.1.6", + "webpack": "^5.88.2", + "webpack-cli": "^5.1.4", + "webpack-dev-server": "^4.15.1" }, "dependencies": { - "whatwg-fetch": "^3.6.2" + "whatwg-fetch": "^3.6.17" }, "optionalDependencies": { "fsevents": "*" diff --git a/Samples/TypeScript/Demo/src/lappdefine.ts b/Samples/TypeScript/Demo/src/lappdefine.ts index e154ef1..b3b50ad 100644 --- a/Samples/TypeScript/Demo/src/lappdefine.ts +++ b/Samples/TypeScript/Demo/src/lappdefine.ts @@ -50,7 +50,8 @@ export const ModelDir: string[] = [ 'Mark', 'Natori', 'Rice', - 'Mao' + 'Mao', + 'Wanko' ]; export const ModelDirSize: number = ModelDir.length; diff --git a/Samples/TypeScript/Demo/src/lappdelegate.ts b/Samples/TypeScript/Demo/src/lappdelegate.ts index 737452b..db44f4c 100644 --- a/Samples/TypeScript/Demo/src/lappdelegate.ts +++ b/Samples/TypeScript/Demo/src/lappdelegate.ts @@ -54,12 +54,6 @@ export class LAppDelegate { public initialize(): boolean { // キャンバスの作成 canvas = document.createElement('canvas'); - if (LAppDefine.CanvasSize === 'auto') { - this._resizeCanvas(); - } else { - canvas.width = LAppDefine.CanvasSize.width; - canvas.height = LAppDefine.CanvasSize.height; - } // glコンテキストを初期化 // @ts-ignore @@ -79,6 +73,13 @@ export class LAppDelegate { // キャンバスを DOM に追加 document.body.appendChild(canvas); + if (LAppDefine.CanvasSize === 'auto') { + this._resizeCanvas(); + } else { + canvas.width = LAppDefine.CanvasSize.width; + canvas.height = LAppDefine.CanvasSize.height; + } + if (!frameBuffer) { frameBuffer = gl.getParameter(gl.FRAMEBUFFER_BINDING); } @@ -91,15 +92,15 @@ export class LAppDelegate { if (supportTouch) { // タッチ関連コールバック関数登録 - canvas.ontouchstart = onTouchBegan; - canvas.ontouchmove = onTouchMoved; - canvas.ontouchend = onTouchEnded; - canvas.ontouchcancel = onTouchCancel; + canvas.addEventListener('touchstart', onTouchBegan, { passive: true }); + canvas.addEventListener('touchmove', onTouchMoved, { passive: true }); + canvas.addEventListener('touchend', onTouchEnded, { passive: true }); + canvas.addEventListener('touchcancel', onTouchCancel, { passive: true }); } else { // マウス関連コールバック関数登録 - canvas.onmousedown = onClickBegan; - canvas.onmousemove = onMouseMoved; - canvas.onmouseup = onClickEnded; + canvas.addEventListener('mousedown', onClickBegan, { passive: true }); + canvas.addEventListener('mousemove', onMouseMoved, { passive: true }); + canvas.addEventListener('mouseup', onClickEnded, { passive: true }); } // AppViewの初期化 @@ -118,11 +119,6 @@ export class LAppDelegate { this._resizeCanvas(); this._view.initialize(); this._view.initializeSprite(); - - // キャンバスサイズを渡す - const viewport: number[] = [0, 0, canvas.width, canvas.height]; - - gl.viewport(viewport[0], viewport[1], viewport[2], viewport[3]); } /** @@ -294,8 +290,9 @@ export class LAppDelegate { * Resize the canvas to fill the screen. */ private _resizeCanvas(): void { - canvas.width = window.innerWidth; - canvas.height = window.innerHeight; + canvas.width = canvas.clientWidth * window.devicePixelRatio; + canvas.height = canvas.clientHeight * window.devicePixelRatio; + gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight); } _cubismOption: Option; // Cubism SDK Option diff --git a/Samples/TypeScript/Demo/src/lappmodel.ts b/Samples/TypeScript/Demo/src/lappmodel.ts index bc3267e..ce150ba 100644 --- a/Samples/TypeScript/Demo/src/lappmodel.ts +++ b/Samples/TypeScript/Demo/src/lappmodel.ts @@ -917,7 +917,7 @@ export class LAppModel extends CubismUserModel { _idParamEyeBallY: CubismIdHandle; // パラメータID: ParamEyeBAllY _idParamBodyAngleX: CubismIdHandle; // パラメータID: ParamBodyAngleX - _state: number; // 現在のステータス管理用 + _state: LoadStep; // 現在のステータス管理用 _expressionCount: number; // 表情データカウント _textureCount: number; // テクスチャカウント _motionCount: number; // モーションデータカウント diff --git a/Samples/TypeScript/Demo/src/lapptexturemanager.ts b/Samples/TypeScript/Demo/src/lapptexturemanager.ts index b43f540..40eb314 100644 --- a/Samples/TypeScript/Demo/src/lapptexturemanager.ts +++ b/Samples/TypeScript/Demo/src/lapptexturemanager.ts @@ -61,7 +61,11 @@ export class LAppTextureManager { // WebKitでは同じImageのonloadを再度呼ぶには再インスタンスが必要 // 詳細：https://stackoverflow.com/a/5024181 ite.ptr().img = new Image(); - ite.ptr().img.onload = (): void => callback(ite.ptr()); + ite + .ptr() + .img.addEventListener('load', (): void => callback(ite.ptr()), { + passive: true + }); ite.ptr().img.src = fileName; return; } @@ -69,48 +73,59 @@ export class LAppTextureManager { // データのオンロードをトリガーにする const img = new Image(); - img.onload = (): void => { - // テクスチャオブジェクトの作成 - const tex: WebGLTexture = gl.createTexture(); - - // テクスチャを選択 - gl.bindTexture(gl.TEXTURE_2D, tex); - - // テクスチャにピクセルを書き込む - gl.texParameteri( - gl.TEXTURE_2D, - gl.TEXTURE_MIN_FILTER, - gl.LINEAR_MIPMAP_LINEAR - ); - gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR); - - // Premult処理を行わせる - if (usePremultiply) { - gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, 1); - } - - // テクスチャにピクセルを書き込む - gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, img); - - // ミップマップを生成 - gl.generateMipmap(gl.TEXTURE_2D); - - // テクスチャをバインド - gl.bindTexture(gl.TEXTURE_2D, null); - - const textureInfo: TextureInfo = new TextureInfo(); - if (textureInfo != null) { - textureInfo.fileName = fileName; - textureInfo.width = img.width; - textureInfo.height = img.height; - textureInfo.id = tex; - textureInfo.img = img; - textureInfo.usePremultply = usePremultiply; - this._textures.pushBack(textureInfo); - } - - callback(textureInfo); - }; + img.addEventListener( + 'load', + (): void => { + // テクスチャオブジェクトの作成 + const tex: WebGLTexture = gl.createTexture(); + + // テクスチャを選択 + gl.bindTexture(gl.TEXTURE_2D, tex); + + // テクスチャにピクセルを書き込む + gl.texParameteri( + gl.TEXTURE_2D, + gl.TEXTURE_MIN_FILTER, + gl.LINEAR_MIPMAP_LINEAR + ); + gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR); + + // Premult処理を行わせる + if (usePremultiply) { + gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, 1); + } + + // テクスチャにピクセルを書き込む + gl.texImage2D( + gl.TEXTURE_2D, + 0, + gl.RGBA, + gl.RGBA, + gl.UNSIGNED_BYTE, + img + ); + + // ミップマップを生成 + gl.generateMipmap(gl.TEXTURE_2D); + + // テクスチャをバインド + gl.bindTexture(gl.TEXTURE_2D, null); + + const textureInfo: TextureInfo = new TextureInfo(); + if (textureInfo != null) { + textureInfo.fileName = fileName; + textureInfo.width = img.width; + textureInfo.height = img.height; + textureInfo.id = tex; + textureInfo.img = img; + textureInfo.usePremultply = usePremultiply; + this._textures.pushBack(textureInfo); + } + + callback(textureInfo); + }, + { passive: true } + ); img.src = fileName; } diff --git a/Samples/TypeScript/Demo/src/lappview.ts b/Samples/TypeScript/Demo/src/lappview.ts index 63a7126..139e7ed 100644 --- a/Samples/TypeScript/Demo/src/lappview.ts +++ b/Samples/TypeScript/Demo/src/lappview.ts @@ -176,7 +176,10 @@ export class LAppView { * @param pointY スクリーンY座標 */ public onTouchesBegan(pointX: number, pointY: number): void { - this._touchManager.touchesBegan(pointX, pointY); + this._touchManager.touchesBegan( + pointX * window.devicePixelRatio, + pointY * window.devicePixelRatio + ); } /** @@ -189,7 +192,10 @@ export class LAppView { const viewX: number = this.transformViewX(this._touchManager.getX()); const viewY: number = this.transformViewY(this._touchManager.getY()); - this._touchManager.touchesMoved(pointX, pointY); + this._touchManager.touchesMoved( + pointX * window.devicePixelRatio, + pointY * window.devicePixelRatio + ); const live2DManager: LAppLive2DManager = LAppLive2DManager.getInstance(); live2DManager.onDrag(viewX, viewY); @@ -221,7 +227,12 @@ export class LAppView { live2DManager.onTap(x, y); // 歯車にタップしたか - if (this._gear.isHit(pointX, pointY)) { + if ( + this._gear.isHit( + pointX * window.devicePixelRatio, + pointY * window.devicePixelRatio + ) + ) { live2DManager.nextScene(); } } diff --git a/Samples/TypeScript/Demo/src/main.ts b/Samples/TypeScript/Demo/src/main.ts index 5616c1c..db7baf9 100644 --- a/Samples/TypeScript/Demo/src/main.ts +++ b/Samples/TypeScript/Demo/src/main.ts @@ -11,25 +11,37 @@ import * as LAppDefine from './lappdefine'; /** * ブラウザロード後の処理 */ -window.onload = (): void => { - // create the application instance - if (LAppDelegate.getInstance().initialize() == false) { - return; - } +window.addEventListener( + 'load', + (): void => { + // create the application instance + if (LAppDelegate.getInstance().initialize() == false) { + return; + } - LAppDelegate.getInstance().run(); -}; + LAppDelegate.getInstance().run(); + }, + { passive: true } +); /** * 終了時の処理 */ -window.onbeforeunload = (): void => LAppDelegate.releaseInstance(); +window.addEventListener( + 'beforeunload', + (): void => LAppDelegate.releaseInstance(), + { passive: true } +); /** * Process when changing screen size. */ -window.onresize = () => { - if (LAppDefine.CanvasSize === 'auto') { - LAppDelegate.getInstance().onResize(); - } -}; +window.addEventListener( + 'resize', + () => { + if (LAppDefine.CanvasSize === 'auto') { + LAppDelegate.getInstance().onResize(); + } + }, + { passive: true } +); diff --git a/Samples/TypeScript/README.ja.md b/Samples/TypeScript/README.ja.md index 47efb4a..70797ab 100644 --- a/Samples/TypeScript/README.ja.md +++ b/Samples/TypeScript/README.ja.md @@ -11,8 +11,8 @@ TypeScript で実装したアプリケーションのサンプル実装です。 | パッケージ | バージョン | | --- | --- | -| TypeScript | 5.0.4 | -| Webpack | 5.82.1 | +| TypeScript | 5.1.6 | +| Webpack | 5.88.2 | その他のパッケージに関しては、各プロジェクトの `package.json` を確認してください。 また、その他の開発環境・動作確認環境はトップディレクトリにある [README.md](/README.ja.md) を参照してください。 diff --git a/Samples/TypeScript/README.md b/Samples/TypeScript/README.md index 91176b3..9ca2c91 100644 --- a/Samples/TypeScript/README.md +++ b/Samples/TypeScript/README.md @@ -11,8 +11,8 @@ This is a sample implementation of an application implemented with TypeScript. | Package | Version | | --- | --- | -| TypeScript | 5.0.4 | -| Webpack | 5.82.1 | +| TypeScript | 5.1.6 | +| Webpack | 5.88.2 | For other packages, check the `package.json` for each project. For other development environments and operation environments, see [README.md](/README.md) in the top directory.