diff --git a/packages/hey-api/package.json b/packages/hey-api/package.json index 34d5274ab..19ad591a9 100644 --- a/packages/hey-api/package.json +++ b/packages/hey-api/package.json @@ -39,6 +39,6 @@ "@orpc/shared": "workspace:*" }, "devDependencies": { - "@hey-api/openapi-ts": "^0.80.18" + "@hey-api/openapi-ts": "^0.95.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3989b10aa..7bb9d9ad4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -367,8 +367,8 @@ importers: version: link:../shared devDependencies: '@hey-api/openapi-ts': - specifier: ^0.80.18 - version: 0.80.18(magicast@0.3.5)(typescript@5.8.3) + specifier: ^0.95.0 + version: 0.95.0(magicast@0.5.2)(typescript@5.8.3) packages/interop: devDependencies: @@ -3569,17 +3569,31 @@ packages: peerDependencies: vue: ^3.2.0 - '@hey-api/json-schema-ref-parser@1.0.6': - resolution: {integrity: sha512-yktiFZoWPtEW8QKS65eqKwA5MTKp88CyiL8q72WynrBs/73SAaxlSWlA2zW/DZlywZ5hX1OYzrCC0wFdvO9c2w==} - engines: {node: '>= 16'} + '@hey-api/codegen-core@0.7.4': + resolution: {integrity: sha512-DGd9yeSQzflOWO3Y5mt1GRXkXH9O/yIMgbxPjwLI3jwu/3nAjoXXD26lEeFb6tclYlg0JAqTIs5d930G/qxHeA==} + engines: {node: '>=20.19.0'} + + '@hey-api/json-schema-ref-parser@1.3.1': + resolution: {integrity: sha512-7atnpUkT8TyUPHYPLk91j/GyaqMuwTEHanLOe50Dlx0EEvNuQqFD52Yjg8x4KU0UFL1mWlyhE+sUE/wAtQ1N2A==} + engines: {node: '>=20.19.0'} - '@hey-api/openapi-ts@0.80.18': - resolution: {integrity: sha512-YCcRdw+OmD/WgBk5ZNaSblEb94PfqBKp4gDvfEYtEdRVS76etdgVOD0CPz72Tus+6zeSzGDVlWE8GOfcib0C6g==} - engines: {node: ^18.18.0 || ^20.9.0 || >=22.10.0} + '@hey-api/openapi-ts@0.95.0': + resolution: {integrity: sha512-lk5C+WKl5yqEmliQihEyhX/jNcWlAykTSEqkDeKa9xSq5YDAzOFvx7oos8YTqiIzdc4TemtlEaB8Rns7+8A0qg==} + engines: {node: '>=20.19.0'} hasBin: true peerDependencies: typescript: ~5.8.3 + '@hey-api/shared@0.3.0': + resolution: {integrity: sha512-G+4GPojdLEh9bUwRG88teMPM1HdqMm/IsJ38cbnNxhyDu1FkFGwilkA1EqnULCzfTam/ZoZkaLdmAd8xEh4Xsw==} + engines: {node: '>=20.19.0'} + + '@hey-api/spec-types@0.1.0': + resolution: {integrity: sha512-StS4RrAO5pyJCBwe6uF9MAuPflkztriW+FPnVb7oEjzDYv1sxPwP+f7fL6u6D+UVrKpZ/9bPNx/xXVdkeWPU6A==} + + '@hey-api/types@0.1.4': + resolution: {integrity: sha512-thWfawrDIP7wSI9ioT13I5soaaqB5vAPIiZmgD8PbeEVKNrkonc0N/Sjj97ezl7oQgusZmaNphGdMKipPO6IBg==} + '@hono/node-server@1.19.11': resolution: {integrity: sha512-dr8/3zEaB+p0D2n/IUrlPF1HZm586qgJNXK1a9fhg/PzdtkK7Ksd5l312tJX2yBuALqDYBlG20QEbayqPyxn+g==} engines: {node: '>=18.14.1'} @@ -8460,14 +8474,6 @@ packages: magicast: optional: true - c12@2.0.1: - resolution: {integrity: sha512-Z4JgsKXHG37C6PYUtIxCfLJZvo6FyhHJoClwwb9ftUkLpPSkuYqn6Tr+vnaN8hymm0kIbcg6Ey3kv/Q71k5w/A==} - peerDependencies: - magicast: ^0.3.5 - peerDependenciesMeta: - magicast: - optional: true - c12@3.3.3: resolution: {integrity: sha512-750hTRvgBy5kcMNPdh95Qo+XUBeGo8C7nsKSmedDmaQI+E0r82DwHeM6vBewDe4rGFbnxoa4V9pw+sPh5+Iz8Q==} peerDependencies: @@ -8756,10 +8762,6 @@ packages: resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==} engines: {node: '>=16'} - commander@13.0.0: - resolution: {integrity: sha512-oPYleIY8wmTVzkvQq10AEok6YcTC4sRUBl8F9gVuwchGVUCTbl/vhLTaQqutuuySYOsu8YTgV+OxKc/8Yvx+mQ==} - engines: {node: '>=18'} - commander@14.0.3: resolution: {integrity: sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==} engines: {node: '>=20'} @@ -9334,10 +9336,6 @@ packages: resolution: {integrity: sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==} engines: {node: '>=18'} - default-browser@5.4.0: - resolution: {integrity: sha512-XDuvSq38Hr1MdN47EDvYtx3U0MTqpCEn+F6ft8z2vYDzMrvQhVp0ui9oQdqW3MvK3vqUETglt1tVGgjLuJ5izg==} - engines: {node: '>=18'} - default-browser@5.5.0: resolution: {integrity: sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==} engines: {node: '>=18'} @@ -9372,8 +9370,8 @@ packages: defu@6.1.4: resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==} - defu@6.1.6: - resolution: {integrity: sha512-f8mefEW4WIVg4LckePx3mALjQSPQgFlg9U8yaPdlsbdYcHQyj9n2zL2LJEA52smeYxOvmd/nB7TpMtHGMTHcug==} + defu@6.1.7: + resolution: {integrity: sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==} delaunator@5.0.1: resolution: {integrity: sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==} @@ -9505,10 +9503,6 @@ packages: resolution: {integrity: sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA==} engines: {node: '>=12'} - dotenv@17.4.0: - resolution: {integrity: sha512-kCKF62fwtzwYm0IGBNjRUjtJgMfGapII+FslMHIjMR5KTnwEmBmWLDRSnc3XSNP8bNy34tekgQyDT0hr7pERRQ==} - engines: {node: '>=12'} - dset@3.1.4: resolution: {integrity: sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==} engines: {node: '>=4'} @@ -10438,6 +10432,9 @@ packages: get-tsconfig@4.13.6: resolution: {integrity: sha512-shZT/QMiSHc/YBLxxOkMtgSid5HFoauqCE3/exfsEcwg1WkeqjG+V40yBbBrsD+jW2HDXcs28xOfcbm2jI8Ddw==} + get-tsconfig@4.13.7: + resolution: {integrity: sha512-7tN6rFgBlMgpBML5j8typ92BKFi2sFQvIdpAqLA2beia5avZDrMs0FLZiM5etShWq5irVyGcGMEA1jcDaK7A/Q==} + giget@1.2.5: resolution: {integrity: sha512-r1ekGw/Bgpi3HLV3h1MRBIlSAdHoIMklpaQ3OQLFcRw9PwAj2rqigvIbg+dBUI51OxVI2jsEtDywDBjSiuf7Ug==} hasBin: true @@ -10601,11 +10598,6 @@ packages: hachure-fill@0.5.2: resolution: {integrity: sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==} - handlebars@4.7.8: - resolution: {integrity: sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==} - engines: {node: '>=0.4.7'} - hasBin: true - has-flag@4.0.0: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} @@ -11177,10 +11169,6 @@ packages: resolution: {integrity: sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==} hasBin: true - js-yaml@4.1.0: - resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} - hasBin: true - js-yaml@4.1.1: resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==} hasBin: true @@ -12372,10 +12360,6 @@ packages: oniguruma-to-es@4.3.5: resolution: {integrity: sha512-Zjygswjpsewa0NLTsiizVuMQZbp0MDyM6lIt66OxsF21npUDlzpHi1Mgb/qhQdkb+dWFTzJmFbEWdvZgRho8eQ==} - open@10.1.2: - resolution: {integrity: sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw==} - engines: {node: '>=18'} - open@10.2.0: resolution: {integrity: sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==} engines: {node: '>=18'} @@ -13602,11 +13586,6 @@ packages: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} hasBin: true - semver@7.7.2: - resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==} - engines: {node: '>=10'} - hasBin: true - semver@7.7.3: resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==} engines: {node: '>=10'} @@ -14348,6 +14327,10 @@ packages: resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} engines: {node: '>=12.0.0'} + tinyglobby@0.2.16: + resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==} + engines: {node: '>=12.0.0'} + tinypool@1.1.1: resolution: {integrity: sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==} engines: {node: ^18.0.0 || >=20.0.0} @@ -14577,11 +14560,6 @@ packages: ufo@1.6.3: resolution: {integrity: sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q==} - uglify-js@3.19.3: - resolution: {integrity: sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==} - engines: {node: '>=0.8.0'} - hasBin: true - uhyphen@0.2.0: resolution: {integrity: sha512-qz3o9CHXmJJPGBdqzab7qAYuW8kQGKNEuoHFYrBwV6hWIMcpAmxDLXojcHfFr9US1Pe6zUswEIJIbLI610fuqA==} @@ -15569,9 +15547,6 @@ packages: resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} engines: {node: '>=0.10.0'} - wordwrap@1.0.0: - resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==} - workerd@1.20260312.1: resolution: {integrity: sha512-nNpPkw9jaqo79B+iBCOiksx+N62xC+ETIfyzofUEdY3cSOHJg6oNnVSHm7vHevzVblfV76c8Gr0cXHEapYMBEg==} engines: {node: '>=16'} @@ -17685,28 +17660,55 @@ snapshots: '@tanstack/vue-virtual': 3.13.22(vue@3.5.32(typescript@5.8.3)) vue: 3.5.32(typescript@5.8.3) - '@hey-api/json-schema-ref-parser@1.0.6': + '@hey-api/codegen-core@0.7.4(magicast@0.5.2)': + dependencies: + '@hey-api/types': 0.1.4 + ansi-colors: 4.1.3 + c12: 3.3.3(magicast@0.5.2) + color-support: 1.1.3 + transitivePeerDependencies: + - magicast + + '@hey-api/json-schema-ref-parser@1.3.1': dependencies: '@jsdevtools/ono': 7.1.3 '@types/json-schema': 7.0.15 js-yaml: 4.1.1 - lodash: 4.17.23 - '@hey-api/openapi-ts@0.80.18(magicast@0.3.5)(typescript@5.8.3)': + '@hey-api/openapi-ts@0.95.0(magicast@0.5.2)(typescript@5.8.3)': dependencies: - '@hey-api/json-schema-ref-parser': 1.0.6 + '@hey-api/codegen-core': 0.7.4(magicast@0.5.2) + '@hey-api/json-schema-ref-parser': 1.3.1 + '@hey-api/shared': 0.3.0(magicast@0.5.2) + '@hey-api/spec-types': 0.1.0 + '@hey-api/types': 0.1.4 ansi-colors: 4.1.3 - c12: 2.0.1(magicast@0.3.5) color-support: 1.1.3 - commander: 13.0.0 - handlebars: 4.7.8 - js-yaml: 4.1.0 - open: 10.1.2 - semver: 7.7.2 + commander: 14.0.3 + get-tsconfig: 4.13.6 typescript: 5.8.3 transitivePeerDependencies: - magicast + '@hey-api/shared@0.3.0(magicast@0.5.2)': + dependencies: + '@hey-api/codegen-core': 0.7.4(magicast@0.5.2) + '@hey-api/json-schema-ref-parser': 1.3.1 + '@hey-api/spec-types': 0.1.0 + '@hey-api/types': 0.1.4 + ansi-colors: 4.1.3 + cross-spawn: 7.0.6 + open: 11.0.0 + semver: 7.7.3 + transitivePeerDependencies: + - magicast + + '@hey-api/spec-types@0.1.0': + dependencies: + '@hey-api/types': 0.1.4 + + '@hey-api/types@0.1.4': {} + '@hono/node-server@1.19.11(hono@4.10.7)': dependencies: hono: 4.10.7 @@ -18405,7 +18407,7 @@ snapshots: dependencies: '@bomb.sh/tab': 0.0.14(cac@6.7.14)(citty@0.2.1) '@clack/prompts': 1.1.0 - c12: 3.3.3(magicast@0.5.2) + c12: 3.3.4(magicast@0.5.2) citty: 0.2.1 confbox: 0.2.4 consola: 3.4.2 @@ -18505,7 +18507,7 @@ snapshots: dependencies: c12: 3.3.4(magicast@0.5.2) consola: 3.4.2 - defu: 6.1.6 + defu: 6.1.7 destr: 2.0.5 errx: 0.1.0 exsolve: 1.0.8 @@ -18520,7 +18522,7 @@ snapshots: rc9: 2.1.2 scule: 1.3.0 semver: 7.7.4 - tinyglobby: 0.2.15 + tinyglobby: 0.2.16 ufo: 1.6.3 unctx: 2.5.0 untyped: 2.0.0 @@ -18530,7 +18532,7 @@ snapshots: '@nuxt/kit@4.4.2(magicast@0.5.2)': dependencies: - c12: 3.3.3(magicast@0.5.2) + c12: 3.3.4(magicast@0.5.2) consola: 3.4.2 defu: 6.1.4 destr: 2.0.5 @@ -23814,23 +23816,6 @@ snapshots: optionalDependencies: magicast: 0.3.5 - c12@2.0.1(magicast@0.3.5): - dependencies: - chokidar: 4.0.3 - confbox: 0.1.8 - defu: 6.1.4 - dotenv: 16.6.1 - giget: 1.2.5 - jiti: 2.6.1 - mlly: 1.8.1 - ohash: 1.1.6 - pathe: 1.1.2 - perfect-debounce: 1.0.0 - pkg-types: 1.3.1 - rc9: 2.1.2 - optionalDependencies: - magicast: 0.3.5 - c12@3.3.3(magicast@0.3.5): dependencies: chokidar: 5.0.0 @@ -23869,8 +23854,8 @@ snapshots: dependencies: chokidar: 5.0.0 confbox: 0.2.4 - defu: 6.1.6 - dotenv: 17.4.0 + defu: 6.1.7 + dotenv: 17.3.1 exsolve: 1.0.8 giget: 3.2.0 jiti: 2.6.1 @@ -23881,7 +23866,6 @@ snapshots: rc9: 3.0.1 optionalDependencies: magicast: 0.5.2 - optional: true cac@6.7.14: {} @@ -24211,8 +24195,6 @@ snapshots: commander@11.1.0: {} - commander@13.0.0: {} - commander@14.0.3: {} commander@2.20.3: {} @@ -24798,11 +24780,6 @@ snapshots: default-browser-id@5.0.1: {} - default-browser@5.4.0: - dependencies: - bundle-name: 4.1.0 - default-browser-id: 5.0.1 - default-browser@5.5.0: dependencies: bundle-name: 4.1.0 @@ -24836,8 +24813,7 @@ snapshots: defu@6.1.4: {} - defu@6.1.6: - optional: true + defu@6.1.7: {} delaunator@5.0.1: dependencies: @@ -24965,9 +24941,6 @@ snapshots: dotenv@17.3.1: {} - dotenv@17.4.0: - optional: true - dset@3.1.4: {} dunder-proto@1.0.1: @@ -25439,7 +25412,7 @@ snapshots: enhanced-resolve: 5.19.0 eslint: 10.0.0(jiti@2.6.1) eslint-plugin-es-x: 7.8.0(eslint@10.0.0(jiti@2.6.1)) - get-tsconfig: 4.13.6 + get-tsconfig: 4.13.7 globals: 15.15.0 globrex: 0.1.2 ignore: 5.3.2 @@ -26257,6 +26230,10 @@ snapshots: dependencies: resolve-pkg-maps: 1.0.0 + get-tsconfig@4.13.7: + dependencies: + resolve-pkg-maps: 1.0.0 + giget@1.2.5: dependencies: citty: 0.1.6 @@ -26278,8 +26255,7 @@ snapshots: giget@3.1.2: {} - giget@3.2.0: - optional: true + giget@3.2.0: {} github-from-package@0.0.0: {} @@ -26485,15 +26461,6 @@ snapshots: hachure-fill@0.5.2: {} - handlebars@4.7.8: - dependencies: - minimist: 1.2.8 - neo-async: 2.6.2 - source-map: 0.6.1 - wordwrap: 1.0.0 - optionalDependencies: - uglify-js: 3.19.3 - has-flag@4.0.0: {} has-property-descriptors@1.0.2: @@ -27077,10 +27044,6 @@ snapshots: argparse: 1.0.10 esprima: 4.0.1 - js-yaml@4.1.0: - dependencies: - argparse: 2.0.1 - js-yaml@4.1.1: dependencies: argparse: 2.0.1 @@ -28338,7 +28301,7 @@ snapshots: '@rollup/plugin-terser': 0.4.4(rollup@4.57.0) '@vercel/nft': 1.3.0(encoding@0.1.13)(rollup@4.57.0) archiver: 7.0.1 - c12: 3.3.3(magicast@0.5.2) + c12: 3.3.4(magicast@0.5.2) chokidar: 5.0.0 citty: 0.1.6 compatx: 0.2.0 @@ -28766,13 +28729,6 @@ snapshots: regex: 6.1.0 regex-recursion: 6.0.2 - open@10.1.2: - dependencies: - default-browser: 5.4.0 - define-lazy-prop: 3.0.0 - is-inside-container: 1.0.0 - is-wsl: 3.1.1 - open@10.2.0: dependencies: default-browser: 5.5.0 @@ -29678,9 +29634,8 @@ snapshots: rc9@3.0.1: dependencies: - defu: 6.1.6 + defu: 6.1.7 destr: 2.0.5 - optional: true rc@1.2.8: dependencies: @@ -30281,8 +30236,6 @@ snapshots: semver@6.3.1: {} - semver@7.7.2: {} - semver@7.7.3: {} semver@7.7.4: {} @@ -31127,6 +31080,12 @@ snapshots: fdir: 6.5.0(picomatch@4.0.4) picomatch: 4.0.4 + tinyglobby@0.2.16: + dependencies: + fdir: 6.5.0(picomatch@4.0.4) + picomatch: 4.0.4 + optional: true + tinypool@1.1.1: {} tinyrainbow@2.0.0: {} @@ -31341,9 +31300,6 @@ snapshots: ufo@1.6.3: {} - uglify-js@3.19.3: - optional: true - uhyphen@0.2.0: {} uid@2.0.2: @@ -32540,8 +32496,6 @@ snapshots: word-wrap@1.2.5: {} - wordwrap@1.0.0: {} - workerd@1.20260312.1: optionalDependencies: '@cloudflare/workerd-darwin-64': 1.20260312.1