From 0c0491ea17266dc40e4dbcbb0dfbe16c425e8e0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=A9=98?= Date: Wed, 3 Jun 2026 03:13:53 +0000 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=B5=8B=E8=AF=95=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=E4=BB=8E=20bun:test=20=E8=BF=81=E7=A7=BB=E5=88=B0=20vitest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 36 个 test 文件 bun:test → vitest - Bun.spawn() → execFileSync('tsx', ...) - Bun.file() → readFileSync - import.meta.dir → import.meta.dirname (tests) / __dirname (CLI source) - 删除 bun-types devDep - 添加 vitest + tsx devDep - CLI shebang bun → node - 30/36 test files pass, 558/617 tests pass Refs #62 --- bun.lock | 209 +++++++++++++++++- package.json | 5 +- packages/cli/src/index.ts | 15 +- packages/cli/src/prompts/usage-doc.test.ts | 4 +- .../__snapshots__/edge-cases.test.ts.snap | 112 +++++----- .../__snapshots__/put-get-has.test.ts.snap | 15 +- .../tests/__snapshots__/render.test.ts.snap | 2 +- .../schema-validation.test.ts.snap | 4 +- .../verify-refs-walk.test.ts.snap | 25 ++- packages/cli/tests/alias.test.ts | 41 ++-- packages/cli/tests/edge-cases.test.ts | 109 ++++----- packages/cli/tests/gc.test.ts | 45 ++-- packages/cli/tests/get-tag-info.test.ts | 35 ++- packages/cli/tests/helpers.ts | 59 ++--- packages/cli/tests/list-meta-schema.test.ts | 2 +- packages/cli/tests/list-pagination.test.ts | 27 +-- packages/cli/tests/list-tag-filter.test.ts | 68 +++--- packages/cli/tests/pipe.test.ts | 53 ++--- packages/cli/tests/put-get-has.test.ts | 27 ++- packages/cli/tests/render.test.ts | 49 ++-- packages/cli/tests/schema-validation.test.ts | 51 +++-- packages/cli/tests/tag-untag.test.ts | 35 ++- packages/cli/tests/template.test.ts | 41 ++-- packages/cli/tests/variable-history.test.ts | 41 ++-- packages/cli/tests/variable.test.ts | 65 ++---- packages/cli/tests/verify-refs-walk.test.ts | 27 ++- packages/core/src/bootstrap.test.ts | 2 +- packages/core/src/gc.test.ts | 2 +- packages/core/src/index.test.ts | 2 +- packages/core/src/liquid-render.test.ts | 2 +- packages/core/src/list-pagination.test.ts | 2 +- packages/core/src/no-sqlite.test.ts | 4 +- packages/core/src/output-templates.test.ts | 2 +- packages/core/src/render.test.ts | 2 +- packages/core/src/schema.test.ts | 2 +- packages/core/src/store.test.ts | 2 +- packages/core/src/tag-store.test.ts | 2 +- packages/core/src/types-store.test.ts | 4 +- packages/core/src/var-store.test.ts | 2 +- packages/core/src/variable.test.ts | 2 +- packages/core/src/wrap-envelope.test.ts | 2 +- packages/core/tests/schema-validation.test.ts | 2 +- packages/fs/src/sqlite-adapter.ts | 99 +++++++++ packages/fs/src/store.test.ts | 2 +- packages/fs/src/tag-store.test.ts | 2 +- packages/fs/src/var-store.test.ts | 2 +- tsconfig.json | 2 +- vitest.config.ts | 8 + 48 files changed, 790 insertions(+), 527 deletions(-) create mode 100644 packages/fs/src/sqlite-adapter.ts create mode 100644 vitest.config.ts diff --git a/bun.lock b/bun.lock index 6aa4a6e..a8a3c4b 100644 --- a/bun.lock +++ b/bun.lock @@ -6,8 +6,9 @@ "name": "@uncaged/json-cas-workspace", "devDependencies": { "@shazhou/proman": "0.1.1", - "bun-types": "^1.3.14", + "tsx": "^4.22.4", "ulidx": "^2.4.1", + "vitest": "^4.1.8", }, }, "packages/cli": { @@ -59,42 +60,246 @@ "@biomejs/cli-win32-x64": ["@biomejs/cli-win32-x64@2.4.16", "", { "os": "win32", "cpu": "x64" }, "sha512-Kp85jgoBHa05gix6UIRjfCDiUV3w/8VIdZ247VyyO2gEjaw12WEVhdIjlxp/AMzXxqxQwbxNTDVZ3Mwd2RG5rw=="], + "@emnapi/core": ["@emnapi/core@1.10.0", "", { "dependencies": { "@emnapi/wasi-threads": "1.2.1", "tslib": "^2.4.0" } }, "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw=="], + + "@emnapi/runtime": ["@emnapi/runtime@1.10.0", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA=="], + + "@emnapi/wasi-threads": ["@emnapi/wasi-threads@1.2.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w=="], + + "@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.28.0", "", { "os": "aix", "cpu": "ppc64" }, "sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA=="], + + "@esbuild/android-arm": ["@esbuild/android-arm@0.28.0", "", { "os": "android", "cpu": "arm" }, "sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ=="], + + "@esbuild/android-arm64": ["@esbuild/android-arm64@0.28.0", "", { "os": "android", "cpu": "arm64" }, "sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw=="], + + "@esbuild/android-x64": ["@esbuild/android-x64@0.28.0", "", { "os": "android", "cpu": "x64" }, "sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA=="], + + "@esbuild/darwin-arm64": ["@esbuild/darwin-arm64@0.28.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q=="], + + "@esbuild/darwin-x64": ["@esbuild/darwin-x64@0.28.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ=="], + + "@esbuild/freebsd-arm64": ["@esbuild/freebsd-arm64@0.28.0", "", { "os": "freebsd", "cpu": "arm64" }, "sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q=="], + + "@esbuild/freebsd-x64": ["@esbuild/freebsd-x64@0.28.0", "", { "os": "freebsd", "cpu": "x64" }, "sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw=="], + + "@esbuild/linux-arm": ["@esbuild/linux-arm@0.28.0", "", { "os": "linux", "cpu": "arm" }, "sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw=="], + + "@esbuild/linux-arm64": ["@esbuild/linux-arm64@0.28.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A=="], + + "@esbuild/linux-ia32": ["@esbuild/linux-ia32@0.28.0", "", { "os": "linux", "cpu": "ia32" }, "sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ=="], + + "@esbuild/linux-loong64": ["@esbuild/linux-loong64@0.28.0", "", { "os": "linux", "cpu": "none" }, "sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg=="], + + "@esbuild/linux-mips64el": ["@esbuild/linux-mips64el@0.28.0", "", { "os": "linux", "cpu": "none" }, "sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w=="], + + "@esbuild/linux-ppc64": ["@esbuild/linux-ppc64@0.28.0", "", { "os": "linux", "cpu": "ppc64" }, "sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg=="], + + "@esbuild/linux-riscv64": ["@esbuild/linux-riscv64@0.28.0", "", { "os": "linux", "cpu": "none" }, "sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ=="], + + "@esbuild/linux-s390x": ["@esbuild/linux-s390x@0.28.0", "", { "os": "linux", "cpu": "s390x" }, "sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q=="], + + "@esbuild/linux-x64": ["@esbuild/linux-x64@0.28.0", "", { "os": "linux", "cpu": "x64" }, "sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ=="], + + "@esbuild/netbsd-arm64": ["@esbuild/netbsd-arm64@0.28.0", "", { "os": "none", "cpu": "arm64" }, "sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw=="], + + "@esbuild/netbsd-x64": ["@esbuild/netbsd-x64@0.28.0", "", { "os": "none", "cpu": "x64" }, "sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw=="], + + "@esbuild/openbsd-arm64": ["@esbuild/openbsd-arm64@0.28.0", "", { "os": "openbsd", "cpu": "arm64" }, "sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g=="], + + "@esbuild/openbsd-x64": ["@esbuild/openbsd-x64@0.28.0", "", { "os": "openbsd", "cpu": "x64" }, "sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA=="], + + "@esbuild/openharmony-arm64": ["@esbuild/openharmony-arm64@0.28.0", "", { "os": "none", "cpu": "arm64" }, "sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w=="], + + "@esbuild/sunos-x64": ["@esbuild/sunos-x64@0.28.0", "", { "os": "sunos", "cpu": "x64" }, "sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw=="], + + "@esbuild/win32-arm64": ["@esbuild/win32-arm64@0.28.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA=="], + + "@esbuild/win32-ia32": ["@esbuild/win32-ia32@0.28.0", "", { "os": "win32", "cpu": "ia32" }, "sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA=="], + + "@esbuild/win32-x64": ["@esbuild/win32-x64@0.28.0", "", { "os": "win32", "cpu": "x64" }, "sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw=="], + + "@jridgewell/sourcemap-codec": ["@jridgewell/sourcemap-codec@1.5.5", "", {}, "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og=="], + + "@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.1.4", "", { "dependencies": { "@tybys/wasm-util": "^0.10.1" }, "peerDependencies": { "@emnapi/core": "^1.7.1", "@emnapi/runtime": "^1.7.1" } }, "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow=="], + "@ocas/cli": ["@ocas/cli@workspace:packages/cli"], "@ocas/core": ["@ocas/core@workspace:packages/core"], "@ocas/fs": ["@ocas/fs@workspace:packages/fs"], + "@oxc-project/types": ["@oxc-project/types@0.133.0", "", {}, "sha512-KzkdCd6Uxqnf6l3HOw1xfatAlUURA0g14cvBYFyJ5SaNOQbOUvBr9PKArcPcrNIeRsBdgcUzOGrhKveVpvOIGA=="], + + "@rolldown/binding-android-arm64": ["@rolldown/binding-android-arm64@1.0.3", "", { "os": "android", "cpu": "arm64" }, "sha512-454rs7jHngixp/NMxd5srYD57OnzSlZ/eFTETjORQHLwJG1lRtmNOJcBerZlfu4GjKqeq8aCCIQrMdHyhI51Hw=="], + + "@rolldown/binding-darwin-arm64": ["@rolldown/binding-darwin-arm64@1.0.3", "", { "os": "darwin", "cpu": "arm64" }, "sha512-PcAhP+ynjURNyy8SKGl5DQP94aGuB/7JrXJb/t7P+hanXvQVMWzUvRRhBAcg/lNRadBhoUPqSoP4xw5tR/KBEA=="], + + "@rolldown/binding-darwin-x64": ["@rolldown/binding-darwin-x64@1.0.3", "", { "os": "darwin", "cpu": "x64" }, "sha512-9YpfeUvSE2RS7wysJ81uOZkXJz7f7Q55H2Gvp3VEw/EsahqDtrphrZ0EwDLK5vvKOzaCrBsjF8JmnMLcUt78Gg=="], + + "@rolldown/binding-freebsd-x64": ["@rolldown/binding-freebsd-x64@1.0.3", "", { "os": "freebsd", "cpu": "x64" }, "sha512-yB1IlAsSNHncV6SCTL27/MVGR5htvQsoGxIv5KMGXALp+Ll1wYsn+x98M9MW7qa+NdSbvrrY7ANI4wLJ0n1e6g=="], + + "@rolldown/binding-linux-arm-gnueabihf": ["@rolldown/binding-linux-arm-gnueabihf@1.0.3", "", { "os": "linux", "cpu": "arm" }, "sha512-Yi30IVAAfLUCy2MseFjbB1jAMDl1VMCAas5StnYp8da9+CKvMd2H2cbEjWcw5NPaPqzvYkVIaF1nNUG+b7u/sw=="], + + "@rolldown/binding-linux-arm64-gnu": ["@rolldown/binding-linux-arm64-gnu@1.0.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-jsO7R8To+AdlYgUmN5sHSCZbfhtMBkO0WUx8iORQnPcMMdgr7qM2DQmMwgabs3GhNztdmoKkMKQFHD6DTMCIQw=="], + + "@rolldown/binding-linux-arm64-musl": ["@rolldown/binding-linux-arm64-musl@1.0.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-VWkUHwWriDciit80wleYwKILoR/KMvxh/IdwS/paX+ZgpuRpCrKLUdadJbc0NpBEiyhpYawsJ73j9aCvOH+f7Q=="], + + "@rolldown/binding-linux-ppc64-gnu": ["@rolldown/binding-linux-ppc64-gnu@1.0.3", "", { "os": "linux", "cpu": "ppc64" }, "sha512-5f1laC0SlIR0yDbFCd8acUhvJIag6N3zC5P7oUPN6wX0aOma+uKJ0wBDH5aq7I1PVI2ttTlhJwzwRIBnLiSGEg=="], + + "@rolldown/binding-linux-s390x-gnu": ["@rolldown/binding-linux-s390x-gnu@1.0.3", "", { "os": "linux", "cpu": "s390x" }, "sha512-Iq4ko0r4XsgbrF/LunNgHtAGLRRVE2kXonAXQ/MV0mC6jQpMOhW1SvtZja2EhC/kd05++bP78dsqBeIQyYJ6Yg=="], + + "@rolldown/binding-linux-x64-gnu": ["@rolldown/binding-linux-x64-gnu@1.0.3", "", { "os": "linux", "cpu": "x64" }, "sha512-B8m6tD5+/N5FeNQFbKlLA/2yVq9ycQP1SeedyEYYKWBNR3ZQbkvIUcNnDNM03lO1l5F2roiiFJGgvoLLyZXtSg=="], + + "@rolldown/binding-linux-x64-musl": ["@rolldown/binding-linux-x64-musl@1.0.3", "", { "os": "linux", "cpu": "x64" }, "sha512-pSdpdUJHkuCxun9LE7jvgUB9qsRgaiyNNCX7m/AvHTcq67AiT/Yhoxvw5zPfhrM8k/BfP8ce/hMOpthKDpEUow=="], + + "@rolldown/binding-openharmony-arm64": ["@rolldown/binding-openharmony-arm64@1.0.3", "", { "os": "none", "cpu": "arm64" }, "sha512-OXXS3RKJgX2uLwM+gYyuH5omcH8fL1LJs96pZGgtetVCahON57+d4SJHzTgZiOjxgGkSnpXpOsWuPDGAKAigEg=="], + + "@rolldown/binding-wasm32-wasi": ["@rolldown/binding-wasm32-wasi@1.0.3", "", { "dependencies": { "@emnapi/core": "1.10.0", "@emnapi/runtime": "1.10.0", "@napi-rs/wasm-runtime": "^1.1.4" }, "cpu": "none" }, "sha512-JTtb8BWFynicNSoPrehsCzBtOKjZ6jhMiPFEmOiuXg1Fl8dn2KHQob+GuPSGR0dryQa1PQJbzjF3dqO/whhjLg=="], + + "@rolldown/binding-win32-arm64-msvc": ["@rolldown/binding-win32-arm64-msvc@1.0.3", "", { "os": "win32", "cpu": "arm64" }, "sha512-gEdFFEN70A/jxb2svrWsN3aDL7OUtmvlOy+6fa2jxG8K0wQ1ZbdeLGnidov6Yu5/733dI5ySfzFlQ/cb0bSz1g=="], + + "@rolldown/binding-win32-x64-msvc": ["@rolldown/binding-win32-x64-msvc@1.0.3", "", { "os": "win32", "cpu": "x64" }, "sha512-eXB7CHuaQdqmJcc3koCNtNPmT/bj2gc999kUFgBxG8Ac0NdgXc4rkCHhqrgrhN3zddvvvrgzj1e90SuSfmyIXA=="], + + "@rolldown/pluginutils": ["@rolldown/pluginutils@1.0.1", "", {}, "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw=="], + "@shazhou/proman": ["@shazhou/proman@0.1.1", "", { "dependencies": { "@biomejs/biome": "^2.4.16", "typescript": "^5.5.0", "yaml": "^2.9.0" }, "bin": { "proman": "dist/cli.js" } }, "sha512-Ksn1L7rwNj9NnnIlszgmG34z6DrYpBBZcv5TCTnMwWWl29B+dAnpxhMdKPy1SbjEy9hUY5woNuq1kOARWVRr+A=="], + "@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], + + "@tybys/wasm-util": ["@tybys/wasm-util@0.10.2", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg=="], + + "@types/chai": ["@types/chai@5.2.3", "", { "dependencies": { "@types/deep-eql": "*", "assertion-error": "^2.0.1" } }, "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA=="], + + "@types/deep-eql": ["@types/deep-eql@4.0.2", "", {}, "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw=="], + + "@types/estree": ["@types/estree@1.0.9", "", {}, "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg=="], + "@types/node": ["@types/node@25.8.0", "", { "dependencies": { "undici-types": ">=7.24.0 <7.24.7" } }, "sha512-TCFSk8IZh+iLX1xtksoBVtdmgL+1IX0fC9BeU4QqFSuNdN/K+HUlhqOzEmSYYpZUVsLYcPqc9KX+60iDuninSQ=="], + "@vitest/expect": ["@vitest/expect@4.1.8", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", "@vitest/spy": "4.1.8", "@vitest/utils": "4.1.8", "chai": "^6.2.2", "tinyrainbow": "^3.1.0" } }, "sha512-h3nDO677RDLEGlBxyQ5CW8RlMThSKSRLUePLOx09gNIWRL40edgA1GCZSZgf1W55MFAG6/Sw14KeaAnqv0NKdQ=="], + + "@vitest/mocker": ["@vitest/mocker@4.1.8", "", { "dependencies": { "@vitest/spy": "4.1.8", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, "peerDependencies": { "msw": "^2.4.9", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "optionalPeers": ["msw", "vite"] }, "sha512-LEiN/xe4OSIbKe9HQIp5OC24agGD9J5CnmMgsLohVVoOPWL9a2sBoR6VBx43jQZb7Kr1l4RCuyCJzcAa0+dojw=="], + + "@vitest/pretty-format": ["@vitest/pretty-format@4.1.8", "", { "dependencies": { "tinyrainbow": "^3.1.0" } }, "sha512-9GasEBxpZ1VYIpqHf/0+YGg121uSNwCKOJqIrTwWP/TB7DmFCiaBpNl3aPZzoLWfWkuqhbH8vJIVobZkvdo2cA=="], + + "@vitest/runner": ["@vitest/runner@4.1.8", "", { "dependencies": { "@vitest/utils": "4.1.8", "pathe": "^2.0.3" } }, "sha512-EmVxeBAfMJvycdjd6Hm+RbFBbA9fKvo0Kx37hNpBYoYeavH3RNsBXWDooR1mgD52dCrxIIuP7UotpfiwOikvcg=="], + + "@vitest/snapshot": ["@vitest/snapshot@4.1.8", "", { "dependencies": { "@vitest/pretty-format": "4.1.8", "@vitest/utils": "4.1.8", "magic-string": "^0.30.21", "pathe": "^2.0.3" } }, "sha512-acfZboRmAIf05DEKcBQy33VXojFJjtUdLyo7oOmV9kebb2xdU01UknNiPuPZoJZQyO7DF0gZdTGTpeAzET9QPQ=="], + + "@vitest/spy": ["@vitest/spy@4.1.8", "", {}, "sha512-6EevtBp6OZOPF7bmz36HrGMeP3txgVSrgebWxHOafDXGkhIzfXK14f8KF6MuFfgXXUeHxmpD3BQxkV00/3s5mA=="], + + "@vitest/utils": ["@vitest/utils@4.1.8", "", { "dependencies": { "@vitest/pretty-format": "4.1.8", "convert-source-map": "^2.0.0", "tinyrainbow": "^3.1.0" } }, "sha512-uOJamYALNhfJ6iolExyQM40yIQwDqYnkKtQ5VCiSe17E33H0aQ/u+1GlRuz4LZBk6Mm3sg90G9hEbmEt37C1Zg=="], + "ajv": ["ajv@8.20.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA=="], - "bun-types": ["bun-types@1.3.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-4N0ig0fEomHt5R0KCFWjovxow98rIoRwKolrYdCcknNwMekCXRnWEUvgu5soYV8QXtVsrUD8B95MBOZGPvr6KQ=="], + "assertion-error": ["assertion-error@2.0.1", "", {}, "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA=="], "cborg": ["cborg@4.5.8", "", { "bin": { "cborg": "lib/bin.js" } }, "sha512-6/viltD51JklRhq4L7jC3zgy6gryuG5xfZ3kzpE+PravtyeQLeQmCYLREhQH7pWENg5pY4Yu/XCd6a7dKScVlw=="], + "chai": ["chai@6.2.2", "", {}, "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg=="], + "commander": ["commander@10.0.1", "", {}, "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug=="], + "convert-source-map": ["convert-source-map@2.0.0", "", {}, "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="], + + "detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="], + + "es-module-lexer": ["es-module-lexer@2.1.0", "", {}, "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ=="], + + "esbuild": ["esbuild@0.28.0", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.28.0", "@esbuild/android-arm": "0.28.0", "@esbuild/android-arm64": "0.28.0", "@esbuild/android-x64": "0.28.0", "@esbuild/darwin-arm64": "0.28.0", "@esbuild/darwin-x64": "0.28.0", "@esbuild/freebsd-arm64": "0.28.0", "@esbuild/freebsd-x64": "0.28.0", "@esbuild/linux-arm": "0.28.0", "@esbuild/linux-arm64": "0.28.0", "@esbuild/linux-ia32": "0.28.0", "@esbuild/linux-loong64": "0.28.0", "@esbuild/linux-mips64el": "0.28.0", "@esbuild/linux-ppc64": "0.28.0", "@esbuild/linux-riscv64": "0.28.0", "@esbuild/linux-s390x": "0.28.0", "@esbuild/linux-x64": "0.28.0", "@esbuild/netbsd-arm64": "0.28.0", "@esbuild/netbsd-x64": "0.28.0", "@esbuild/openbsd-arm64": "0.28.0", "@esbuild/openbsd-x64": "0.28.0", "@esbuild/openharmony-arm64": "0.28.0", "@esbuild/sunos-x64": "0.28.0", "@esbuild/win32-arm64": "0.28.0", "@esbuild/win32-ia32": "0.28.0", "@esbuild/win32-x64": "0.28.0" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw=="], + + "estree-walker": ["estree-walker@3.0.3", "", { "dependencies": { "@types/estree": "^1.0.0" } }, "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g=="], + + "expect-type": ["expect-type@1.3.0", "", {}, "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA=="], + "fast-deep-equal": ["fast-deep-equal@3.1.3", "", {}, "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="], "fast-uri": ["fast-uri@3.1.2", "", {}, "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ=="], + "fdir": ["fdir@6.5.0", "", { "peerDependencies": { "picomatch": "^3 || ^4" }, "optionalPeers": ["picomatch"] }, "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="], + + "fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="], + "json-schema-traverse": ["json-schema-traverse@1.0.0", "", {}, "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="], "layerr": ["layerr@3.0.0", "", {}, "sha512-tv754Ki2dXpPVApOrjTyRo4/QegVb9eVFq4mjqp4+NM5NaX7syQvN5BBNfV/ZpAHCEHV24XdUVrBAoka4jt3pA=="], + "lightningcss": ["lightningcss@1.32.0", "", { "dependencies": { "detect-libc": "^2.0.3" }, "optionalDependencies": { "lightningcss-android-arm64": "1.32.0", "lightningcss-darwin-arm64": "1.32.0", "lightningcss-darwin-x64": "1.32.0", "lightningcss-freebsd-x64": "1.32.0", "lightningcss-linux-arm-gnueabihf": "1.32.0", "lightningcss-linux-arm64-gnu": "1.32.0", "lightningcss-linux-arm64-musl": "1.32.0", "lightningcss-linux-x64-gnu": "1.32.0", "lightningcss-linux-x64-musl": "1.32.0", "lightningcss-win32-arm64-msvc": "1.32.0", "lightningcss-win32-x64-msvc": "1.32.0" } }, "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ=="], + + "lightningcss-android-arm64": ["lightningcss-android-arm64@1.32.0", "", { "os": "android", "cpu": "arm64" }, "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg=="], + + "lightningcss-darwin-arm64": ["lightningcss-darwin-arm64@1.32.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ=="], + + "lightningcss-darwin-x64": ["lightningcss-darwin-x64@1.32.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w=="], + + "lightningcss-freebsd-x64": ["lightningcss-freebsd-x64@1.32.0", "", { "os": "freebsd", "cpu": "x64" }, "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig=="], + + "lightningcss-linux-arm-gnueabihf": ["lightningcss-linux-arm-gnueabihf@1.32.0", "", { "os": "linux", "cpu": "arm" }, "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw=="], + + "lightningcss-linux-arm64-gnu": ["lightningcss-linux-arm64-gnu@1.32.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ=="], + + "lightningcss-linux-arm64-musl": ["lightningcss-linux-arm64-musl@1.32.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg=="], + + "lightningcss-linux-x64-gnu": ["lightningcss-linux-x64-gnu@1.32.0", "", { "os": "linux", "cpu": "x64" }, "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA=="], + + "lightningcss-linux-x64-musl": ["lightningcss-linux-x64-musl@1.32.0", "", { "os": "linux", "cpu": "x64" }, "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg=="], + + "lightningcss-win32-arm64-msvc": ["lightningcss-win32-arm64-msvc@1.32.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw=="], + + "lightningcss-win32-x64-msvc": ["lightningcss-win32-x64-msvc@1.32.0", "", { "os": "win32", "cpu": "x64" }, "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q=="], + "liquidjs": ["liquidjs@10.27.0", "", { "dependencies": { "commander": "^10.0.0" }, "bin": { "liquidjs": "bin/liquid.js", "liquid": "bin/liquid.js" } }, "sha512-tw/OA59K7aIBlMKIrKlumr37fiZUheShVHXY8cVctWisgY1p9mc5hreOvlreoS0wTiwlWk14Ya7305c2a/Cg5w=="], + "magic-string": ["magic-string@0.30.21", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ=="], + + "nanoid": ["nanoid@3.3.12", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ=="], + + "obug": ["obug@2.1.1", "", {}, "sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ=="], + + "pathe": ["pathe@2.0.3", "", {}, "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w=="], + + "picocolors": ["picocolors@1.1.1", "", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="], + + "picomatch": ["picomatch@4.0.4", "", {}, "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A=="], + + "postcss": ["postcss@8.5.15", "", { "dependencies": { "nanoid": "^3.3.12", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A=="], + "require-from-string": ["require-from-string@2.0.2", "", {}, "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="], + "rolldown": ["rolldown@1.0.3", "", { "dependencies": { "@oxc-project/types": "=0.133.0", "@rolldown/pluginutils": "^1.0.0" }, "optionalDependencies": { "@rolldown/binding-android-arm64": "1.0.3", "@rolldown/binding-darwin-arm64": "1.0.3", "@rolldown/binding-darwin-x64": "1.0.3", "@rolldown/binding-freebsd-x64": "1.0.3", "@rolldown/binding-linux-arm-gnueabihf": "1.0.3", "@rolldown/binding-linux-arm64-gnu": "1.0.3", "@rolldown/binding-linux-arm64-musl": "1.0.3", "@rolldown/binding-linux-ppc64-gnu": "1.0.3", "@rolldown/binding-linux-s390x-gnu": "1.0.3", "@rolldown/binding-linux-x64-gnu": "1.0.3", "@rolldown/binding-linux-x64-musl": "1.0.3", "@rolldown/binding-openharmony-arm64": "1.0.3", "@rolldown/binding-wasm32-wasi": "1.0.3", "@rolldown/binding-win32-arm64-msvc": "1.0.3", "@rolldown/binding-win32-x64-msvc": "1.0.3" }, "bin": { "rolldown": "./bin/cli.mjs" } }, "sha512-i00lAJ2ks1BYr7rjNjKC7BcqAS7nVfiT3QX1SI5aY+AFHblCmaUf9OE9dbdzDvW6dJxbi2ZCZiy9v3CcwOiX3g=="], + + "siginfo": ["siginfo@2.0.0", "", {}, "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g=="], + + "source-map-js": ["source-map-js@1.2.1", "", {}, "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="], + + "stackback": ["stackback@0.0.2", "", {}, "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw=="], + + "std-env": ["std-env@4.1.0", "", {}, "sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ=="], + + "tinybench": ["tinybench@2.9.0", "", {}, "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg=="], + + "tinyexec": ["tinyexec@1.2.4", "", {}, "sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg=="], + + "tinyglobby": ["tinyglobby@0.2.17", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g=="], + + "tinyrainbow": ["tinyrainbow@3.1.0", "", {}, "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw=="], + + "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], + + "tsx": ["tsx@4.22.4", "", { "dependencies": { "esbuild": "~0.28.0" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "bin": { "tsx": "dist/cli.mjs" } }, "sha512-X8EX+XV4QR5xCsrgxaED954zTDfY8KqlDtskKEL0cHhyS/P8b4IFOvGDQpsC9Q1XnLq915wEfwwY/zzskCtmhg=="], + "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="], "ulidx": ["ulidx@2.4.1", "", { "dependencies": { "layerr": "^3.0.0" } }, "sha512-xY7c8LPyzvhvew0Fn+Ek3wBC9STZAuDI/Y5andCKi9AX6/jvfaX45PhsDX8oxgPL0YFp0Jhr8qWMbS/p9375Xg=="], "undici-types": ["undici-types@7.24.6", "", {}, "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg=="], + "vite": ["vite@8.0.16", "", { "dependencies": { "lightningcss": "^1.32.0", "picomatch": "^4.0.4", "postcss": "^8.5.15", "rolldown": "1.0.3", "tinyglobby": "^0.2.17" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "@vitejs/devtools": "^0.1.18", "esbuild": "^0.27.0 || ^0.28.0", "jiti": ">=1.21.0", "less": "^4.0.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "@vitejs/devtools", "esbuild", "jiti", "less", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-h9bXPmJichP5fLmVQo3PyaGSDE2n3aPuomeAlVRm0JLmt4rY6zmPKd59HYI4LNW8oTK7tlTsuC7l/m7awx9Jcw=="], + + "vitest": ["vitest@4.1.8", "", { "dependencies": { "@vitest/expect": "4.1.8", "@vitest/mocker": "4.1.8", "@vitest/pretty-format": "4.1.8", "@vitest/runner": "4.1.8", "@vitest/snapshot": "4.1.8", "@vitest/spy": "4.1.8", "@vitest/utils": "4.1.8", "es-module-lexer": "^2.0.0", "expect-type": "^1.3.0", "magic-string": "^0.30.21", "obug": "^2.1.1", "pathe": "^2.0.3", "picomatch": "^4.0.3", "std-env": "^4.0.0-rc.1", "tinybench": "^2.9.0", "tinyexec": "^1.0.2", "tinyglobby": "^0.2.15", "tinyrainbow": "^3.1.0", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0", "why-is-node-running": "^2.3.0" }, "peerDependencies": { "@edge-runtime/vm": "*", "@opentelemetry/api": "^1.9.0", "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", "@vitest/browser-playwright": "4.1.8", "@vitest/browser-preview": "4.1.8", "@vitest/browser-webdriverio": "4.1.8", "@vitest/coverage-istanbul": "4.1.8", "@vitest/coverage-v8": "4.1.8", "@vitest/ui": "4.1.8", "happy-dom": "*", "jsdom": "*" }, "optionalPeers": ["@edge-runtime/vm", "@opentelemetry/api", "@types/node", "@vitest/browser-playwright", "@vitest/browser-preview", "@vitest/browser-webdriverio", "@vitest/coverage-istanbul", "@vitest/coverage-v8", "@vitest/ui", "happy-dom", "jsdom"], "bin": { "vitest": "vitest.mjs" } }, "sha512-flY6ScbCIt9HThs+C5HS7jvGOB560DJtk/Z15IQROTA6zEy49Nh8T/dofWTQL+n3vswqn87sbJNiuqw1SDp5Ig=="], + + "why-is-node-running": ["why-is-node-running@2.3.0", "", { "dependencies": { "siginfo": "^2.0.0", "stackback": "0.0.2" }, "bin": { "why-is-node-running": "cli.js" } }, "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w=="], + "xxhash-wasm": ["xxhash-wasm@1.1.0", "", {}, "sha512-147y/6YNh+tlp6nd/2pWq38i9h6mz/EuQ6njIrmW8D1BS5nCqs0P6DG+m6zTGnNz5I+uhZ0SHxBs9BsPrwcKDA=="], "yaml": ["yaml@2.9.0", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA=="], diff --git a/package.json b/package.json index f305c87..6ffeef9 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,9 @@ ], "devDependencies": { "@shazhou/proman": "0.1.1", - "bun-types": "^1.3.14", - "ulidx": "^2.4.1" + "tsx": "^4.22.4", + "ulidx": "^2.4.1", + "vitest": "^4.1.8" }, "scripts": { "build": "proman build", diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index f1e0768..6478e1e 100644 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -1,8 +1,11 @@ -#!/usr/bin/env bun +#!/usr/bin/env node import { existsSync, readFileSync } from "node:fs"; +import { fileURLToPath } from "node:url"; import { homedir } from "node:os"; -import { join, resolve } from "node:path"; +import { dirname, join, resolve } from "node:path"; + +const __dirname = dirname(fileURLToPath(import.meta.url)); import type { Hash, ListEntry, ListOptions, Store, TagOp } from "@ocas/core"; import { applyListOptions, @@ -91,7 +94,7 @@ const { flags, positional } = parseArgs(process.argv.slice(2)); // --- Handle --version early --- if (flags.version === true) { - const pkgPath = join(import.meta.dir, "..", "package.json"); + const pkgPath = join(__dirname, "..", "package.json"); const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")); process.stdout.write(`${pkg.version}\n`); process.exit(0); @@ -1064,7 +1067,7 @@ async function cmdListSchema(_args: string[]): Promise { } function printUsage(): void { - const pkgPath = join(import.meta.dir, "..", "package.json"); + const pkgPath = join(__dirname, "..", "package.json"); const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")); console.log(`\ Usage: ocas [--home ] [--json] [args] @@ -1230,7 +1233,7 @@ switch (cmd) { switch (sub) { case "usage": { const content = readFileSync( - join(import.meta.dir, "prompts", "usage.md"), + join(__dirname, "prompts", "usage.md"), "utf-8", ); process.stdout.write(content); @@ -1238,7 +1241,7 @@ switch (cmd) { } case "setup": { const content = readFileSync( - join(import.meta.dir, "prompts", "setup.md"), + join(__dirname, "prompts", "setup.md"), "utf-8", ); process.stdout.write(content); diff --git a/packages/cli/src/prompts/usage-doc.test.ts b/packages/cli/src/prompts/usage-doc.test.ts index 3420b24..9b6a895 100644 --- a/packages/cli/src/prompts/usage-doc.test.ts +++ b/packages/cli/src/prompts/usage-doc.test.ts @@ -1,8 +1,8 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { readFileSync } from "node:fs"; import { join } from "node:path"; -const usagePath = join(import.meta.dir, "usage.md"); +const usagePath = join(import.meta.dirname, "usage.md"); describe("usage.md doc cleanup (D)", () => { test("D3. usage.md does not reference legacy openStoreAndVarStore / createVariableStore", () => { diff --git a/packages/cli/tests/__snapshots__/edge-cases.test.ts.snap b/packages/cli/tests/__snapshots__/edge-cases.test.ts.snap index 988afa7..cb917d0 100644 --- a/packages/cli/tests/__snapshots__/edge-cases.test.ts.snap +++ b/packages/cli/tests/__snapshots__/edge-cases.test.ts.snap @@ -1,58 +1,4 @@ -// Bun Snapshot v1, https://bun.sh/docs/test/snapshots - -exports[`Phase 7: Edge Cases 7.1 get non-existent hash errors gracefully 1`] = `"Node not found: AAAAAAAAAAAAA"`; - -exports[`Phase 7: Edge Cases 7.3 var set empty name errors 1`] = `"Usage: ocas var set [--tag ...]"`; - -exports[`Phase 7: Edge Cases 7.4 var set name with invalid chars errors 1`] = `"Error: Invalid variable name "invalid name!": Name must follow @scope/name format (e.g. @myapp/config)"`; - -exports[`Phase 7: Edge Cases 7.5 no subcommand shows help text 1`] = ` -"Usage: ocas [--home ] [--json] [args] - -All JSON commands emit a { type, value } envelope. The type is the hash of the -command's @ocas/output/* schema (shown in parentheses); pipe any envelope into -\`render -p\` to render its value (ocas_ref hashes are expanded). - -Commands: - put Store node, print envelope (value=hash) (@ocas/output/put) - get Print node as envelope (@ocas/output/get) - has Print envelope (value=boolean) (@ocas/output/has) - verify Verify integrity + schema (value=ok/corrupted/invalid) (@ocas/output/verify) - refs List direct ocas_ref edges (@ocas/output/refs) - walk [--format tree] Recursive traversal (@ocas/output/walk) - hash Compute hash without storing (@ocas/output/hash) - render [options] Render node as text with resolution decay (raw output) - render --pipe/-p [options] Render { type, value } from stdin (raw output) - list --type [--tag ...] List hashes for a type, optionally filtered by tags (@ocas/output/list) - list-meta List meta-schema hashes (value=string[]) (@ocas/output/list-meta) - list-schema List all schema hashes (value=string[]) (@ocas/output/list-schema) - tag ... Apply tags/labels to a target (@ocas/output/tag) - untag ... Remove tags/labels from a target (@ocas/output/untag) - var set [--tag ...] Create/update a variable (@ocas/output/var-set) - var get --schema Get a variable by name + schema (@ocas/output/var-get) - var delete [--schema ] Delete variable(s) (@ocas/output/var-delete) - var list [prefix] [--schema ] [--tag ...] List variables (@ocas/output/var-list) - var history [--schema ] Show value history (LRU) (@ocas/output/var-history) - template set | --inline Set template for schema (@ocas/output/template-set) - template get Get template content (value=string) (@ocas/output/template-get) - template list List all templates (@ocas/output/template-list) - template delete Delete template for schema (@ocas/output/template-delete) - gc Run garbage collection (@ocas/output/gc) - -Flags: - --home Store directory (default: $OCAS_HOME or ~/.ocas) - --json Compact JSON output - --render, -r Render output inline (equivalent to | ocas render -p) - --schema Schema hash filter for var get/delete/tag/list - --tag Tag/label (can be repeated): key:value (tag), name (label), :name (delete) - --inline Inline text content for template set - --resolution Initial resolution for render (default: 1.0) - --decay Decay factor for render (default: 0.5) - --epsilon Cutoff threshold for render (default: 0.01) - --pipe, -p Read from stdin (put/hash: raw JSON payload; render: { type, value } envelope) - -Agent: If you have not installed the ocas skill for this version (0.2.0), run \`ocas prompt setup\` and follow the instructions." -`; +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[`Phase 3: Variable System 3.1 var set creates variable 1`] = ` { @@ -429,6 +375,8 @@ exports[`Phase 3: Variable System 3.10 var delete removes variable 1`] = ` exports[`Phase 3: Variable System 3.11 var get deleted variable returns not found 1`] = `"Error: Variable not found: name=@myapp/config, schema=FRBAB1BF0ZBCS"`; +exports[`Phase 4: Template System > 4.5 template get deleted template returns not found 1`] = `"Unknown command: template,get,FRBAB1BF0ZBCS"`; + exports[`Phase 4: Template System 4.1 template set registers template 1`] = ` { "type": "BJDHPAE4Q8TXM", @@ -468,3 +416,57 @@ exports[`Phase 4: Template System 4.4 template delete removes template 1`] = ` `; exports[`Phase 4: Template System 4.5 template get deleted template returns not found 1`] = `"Error: Template not found for schema: FRBAB1BF0ZBCS"`; + +exports[`Phase 7: Edge Cases 7.1 get non-existent hash errors gracefully 1`] = `"Node not found: AAAAAAAAAAAAA"`; + +exports[`Phase 7: Edge Cases 7.3 var set empty name errors 1`] = `"Usage: ocas var set [--tag ...]"`; + +exports[`Phase 7: Edge Cases 7.4 var set name with invalid chars errors 1`] = `"Error: Invalid variable name "invalid name!": Name must follow @scope/name format (e.g. @myapp/config)"`; + +exports[`Phase 7: Edge Cases 7.5 no subcommand shows help text 1`] = ` +"Usage: ocas [--home ] [--json] [args] + +All JSON commands emit a { type, value } envelope. The type is the hash of the +command's @ocas/output/* schema (shown in parentheses); pipe any envelope into +\`render -p\` to render its value (ocas_ref hashes are expanded). + +Commands: + put Store node, print envelope (value=hash) (@ocas/output/put) + get Print node as envelope (@ocas/output/get) + has Print envelope (value=boolean) (@ocas/output/has) + verify Verify integrity + schema (value=ok/corrupted/invalid) (@ocas/output/verify) + refs List direct ocas_ref edges (@ocas/output/refs) + walk [--format tree] Recursive traversal (@ocas/output/walk) + hash Compute hash without storing (@ocas/output/hash) + render [options] Render node as text with resolution decay (raw output) + render --pipe/-p [options] Render { type, value } from stdin (raw output) + list --type [--tag ...] List hashes for a type, optionally filtered by tags (@ocas/output/list) + list-meta List meta-schema hashes (value=string[]) (@ocas/output/list-meta) + list-schema List all schema hashes (value=string[]) (@ocas/output/list-schema) + tag ... Apply tags/labels to a target (@ocas/output/tag) + untag ... Remove tags/labels from a target (@ocas/output/untag) + var set [--tag ...] Create/update a variable (@ocas/output/var-set) + var get --schema Get a variable by name + schema (@ocas/output/var-get) + var delete [--schema ] Delete variable(s) (@ocas/output/var-delete) + var list [prefix] [--schema ] [--tag ...] List variables (@ocas/output/var-list) + var history [--schema ] Show value history (LRU) (@ocas/output/var-history) + template set | --inline Set template for schema (@ocas/output/template-set) + template get Get template content (value=string) (@ocas/output/template-get) + template list List all templates (@ocas/output/template-list) + template delete Delete template for schema (@ocas/output/template-delete) + gc Run garbage collection (@ocas/output/gc) + +Flags: + --home Store directory (default: $OCAS_HOME or ~/.ocas) + --json Compact JSON output + --render, -r Render output inline (equivalent to | ocas render -p) + --schema Schema hash filter for var get/delete/tag/list + --tag Tag/label (can be repeated): key:value (tag), name (label), :name (delete) + --inline Inline text content for template set + --resolution Initial resolution for render (default: 1.0) + --decay Decay factor for render (default: 0.5) + --epsilon Cutoff threshold for render (default: 0.01) + --pipe, -p Read from stdin (put/hash: raw JSON payload; render: { type, value } envelope) + +Agent: If you have not installed the ocas skill for this version (0.2.0), run \`ocas prompt setup\` and follow the instructions." +`; diff --git a/packages/cli/tests/__snapshots__/put-get-has.test.ts.snap b/packages/cli/tests/__snapshots__/put-get-has.test.ts.snap index addbd57..44c66e1 100644 --- a/packages/cli/tests/__snapshots__/put-get-has.test.ts.snap +++ b/packages/cli/tests/__snapshots__/put-get-has.test.ts.snap @@ -1,4 +1,17 @@ -// Bun Snapshot v1, https://bun.sh/docs/test/snapshots +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html + +exports[`Phase 1: CAS Core > 1.6 get returns node JSON (snapshot) 1`] = ` +{ + "type": "7V5G8E2VW8B2G", + "value": { + "payload": { + "age": 30, + "name": "Alice", + }, + "type": "FRBAB1BF0ZBCS", + }, +} +`; exports[`Phase 1: CAS Core 1.6 get returns node JSON (snapshot) 1`] = ` { diff --git a/packages/cli/tests/__snapshots__/render.test.ts.snap b/packages/cli/tests/__snapshots__/render.test.ts.snap index 4c7e970..99c5c23 100644 --- a/packages/cli/tests/__snapshots__/render.test.ts.snap +++ b/packages/cli/tests/__snapshots__/render.test.ts.snap @@ -1,4 +1,4 @@ -// Bun Snapshot v1, https://bun.sh/docs/test/snapshots +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[`Phase 5: Render 5.1 render fills payload variables 1`] = `"Hello Alice!"`; diff --git a/packages/cli/tests/__snapshots__/schema-validation.test.ts.snap b/packages/cli/tests/__snapshots__/schema-validation.test.ts.snap index 3a357d5..11847c2 100644 --- a/packages/cli/tests/__snapshots__/schema-validation.test.ts.snap +++ b/packages/cli/tests/__snapshots__/schema-validation.test.ts.snap @@ -1,3 +1,5 @@ -// Bun Snapshot v1, https://bun.sh/docs/test/snapshots +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html + +exports[`Phase 2: Schema Validation > 2.3 put against non-existent schema hash fails 1`] = `"Schema not found: AAAAAAAAAAAAA"`; exports[`Phase 2: Schema Validation 2.3 put against non-existent schema hash fails 1`] = `"Schema not found: AAAAAAAAAAAAA"`; diff --git a/packages/cli/tests/__snapshots__/verify-refs-walk.test.ts.snap b/packages/cli/tests/__snapshots__/verify-refs-walk.test.ts.snap index c122007..06bb4a2 100644 --- a/packages/cli/tests/__snapshots__/verify-refs-walk.test.ts.snap +++ b/packages/cli/tests/__snapshots__/verify-refs-walk.test.ts.snap @@ -1,4 +1,27 @@ -// Bun Snapshot v1, https://bun.sh/docs/test/snapshots +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html + +exports[`Phase 1: CAS Core > 1.9 verify returns ok for valid node 1`] = ` +{ + "type": "52HEFB52BD0GF", + "value": "ok", +} +`; + +exports[`Phase 1: CAS Core > 1.10 refs lists direct references (snapshot) 1`] = ` +"{ + "type": "2TKP4RGBJ4V43", + "value": [] +}" +`; + +exports[`Phase 1: CAS Core > 1.11 walk shows traversal tree (snapshot) 1`] = ` +"{ + "type": "4HG6MD3XG5H5C", + "value": [ + "9W3MGR3184QYE" + ] +}" +`; exports[`Phase 1: CAS Core 1.9 verify returns ok for valid node 1`] = ` { diff --git a/packages/cli/tests/alias.test.ts b/packages/cli/tests/alias.test.ts index 038d692..da4b3b3 100644 --- a/packages/cli/tests/alias.test.ts +++ b/packages/cli/tests/alias.test.ts @@ -1,5 +1,6 @@ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { mkdirSync, rmSync, writeFileSync } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join } from "node:path"; @@ -16,7 +17,7 @@ beforeEach(() => { `ocas-cli-test-${Date.now()}-${Math.random().toString(36).slice(2)}`, ); storePath = join(testDir, "store"); - cliPath = join(import.meta.dir, "../src/index.ts"); + cliPath = join(import.meta.dirname, "../src/index.ts"); mkdirSync(testDir, { recursive: true }); mkdirSync(storePath, { recursive: true }); @@ -34,31 +35,17 @@ afterEach(() => { /** * Run CLI command and return stdout, stderr, and exit code */ -async function runCliAlias(...args: string[]): Promise<{ - stdout: string; - stderr: string; - exitCode: number; -}> { - const proc = Bun.spawn( - ["bun", "run", cliPath, "--home", storePath, ...args], - { - stdout: "pipe", - stderr: "pipe", - }, - ); - - const [stdout, stderr] = await Promise.all([ - new Response(proc.stdout).text(), - new Response(proc.stderr).text(), - ]); - - await proc.exited; - - return { - stdout: stdout.trim(), - stderr: stderr.trim(), - exitCode: proc.exitCode ?? 0, - }; +function runCliAlias(...args: string[]): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [cliPath, "--home", storePath, ...args], { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } /** Extract the `value` field from a { type, value } envelope JSON string. */ diff --git a/packages/cli/tests/edge-cases.test.ts b/packages/cli/tests/edge-cases.test.ts index 3cb1956..dd14edd 100644 --- a/packages/cli/tests/edge-cases.test.ts +++ b/packages/cli/tests/edge-cases.test.ts @@ -1,35 +1,33 @@ -import { afterAll, beforeAll, describe, expect, test } from "bun:test"; +import { afterAll, beforeAll, describe, expect, test } from "vitest"; import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join, resolve } from "node:path"; import { envValue, stripVolatile } from "./helpers"; -const entrypoint = resolve(import.meta.dir, "../src/index.ts"); -const pkgPath = resolve(import.meta.dir, "../package.json"); +const entrypoint = resolve(import.meta.dirname, "../src/index.ts"); +const pkgPath = resolve(import.meta.dirname, "../package.json"); // --- ocas command alias tests (from cli.test.ts) --- describe("ocas binary", () => { test("T1: ocas bin entry exists in package.json", async () => { - const pkg = await Bun.file(pkgPath).json(); + const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")); expect(pkg.bin.ocas).toBe("src/index.ts"); }); test("T2: no legacy bin entries (json-cas, ucas)", async () => { - const pkg = await Bun.file(pkgPath).json(); + const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")); expect(pkg.bin["json-cas"]).toBeUndefined(); expect(pkg.bin.ucas).toBeUndefined(); expect(Object.keys(pkg.bin)).toEqual(["ocas"]); }); - test("T3: ocas command is executable and shows help", async () => { - const proc = Bun.spawn(["bun", entrypoint, "--help"], { - stdout: "pipe", - stderr: "pipe", + test("T3: ocas command is executable and shows help", () => { + const stdout = execFileSync("tsx", [entrypoint, "--help"], { + encoding: "utf-8", + timeout: 10000, }); - const exitCode = await proc.exited; - const stdout = await new Response(proc.stdout).text(); - expect(exitCode).toBe(0); expect(stdout.length).toBeGreaterThan(0); }); }); @@ -41,17 +39,17 @@ describe("Phase 7: Edge Cases", () => { let typeHash: string; let nodeHash: string; - async function runCli( - args: string[], - ): Promise<{ stdout: string; stderr: string; exitCode: number }> { - const proc = Bun.spawn(["bun", entrypoint, "--home", tmpStore, ...args], { - stdout: "pipe", - stderr: "pipe", - }); - const exitCode = await proc.exited; - const stdout = (await new Response(proc.stdout).text()).trim(); - const stderr = (await new Response(proc.stderr).text()).trim(); - return { stdout, stderr, exitCode }; + function runCli(...args: string[]): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [entrypoint, "--home", tmpStore, ...args], { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } beforeAll(async () => { @@ -125,17 +123,20 @@ describe("Phase 7: Edge Cases", () => { expect(combined.toLowerCase()).toContain("usage"); }); - test("7.6 --home path is a file errors", async () => { + test("7.6 --home path is a file errors", () => { const fileAsStore = join(tmpStore, "not-a-directory"); writeFileSync(fileAsStore, "test"); - const proc = Bun.spawn( - ["bun", entrypoint, "--home", fileAsStore, "get", "AAAAAAAAAAAAA"], - { stdout: "pipe", stderr: "pipe" }, - ); - const exitCode = await proc.exited; - const stderr = (await new Response(proc.stderr).text()).trim(); - expect(exitCode).not.toBe(0); - expect(stderr).toContain("not a directory"); + try { + execFileSync("tsx", [entrypoint, "--home", fileAsStore, "get", "AAAAAAAAAAAAA"], { + encoding: "utf-8", + timeout: 10000, + }); + expect.unreachable("should have thrown"); + } catch (e: unknown) { + const err = e as { stderr?: string; status?: number }; + expect(err.status).not.toBe(0); + expect((err.stderr ?? "").trim()).toContain("not a directory"); + } }); }); @@ -146,17 +147,17 @@ describe("Phase 3: Variable System", () => { let typeHash: string; let nodeHash: string; - async function runCli( - args: string[], - ): Promise<{ stdout: string; stderr: string; exitCode: number }> { - const proc = Bun.spawn(["bun", entrypoint, "--home", tmpStore, ...args], { - stdout: "pipe", - stderr: "pipe", - }); - const exitCode = await proc.exited; - const stdout = (await new Response(proc.stdout).text()).trim(); - const stderr = (await new Response(proc.stderr).text()).trim(); - return { stdout, stderr, exitCode }; + function runCli(...args: string[]): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [entrypoint, "--home", tmpStore, ...args], { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } beforeAll(async () => { @@ -335,17 +336,17 @@ describe("Phase 4: Template System", () => { let tmpStore: string; let typeHash: string; - async function runCli( - args: string[], - ): Promise<{ stdout: string; stderr: string; exitCode: number }> { - const proc = Bun.spawn(["bun", entrypoint, "--home", tmpStore, ...args], { - stdout: "pipe", - stderr: "pipe", - }); - const exitCode = await proc.exited; - const stdout = (await new Response(proc.stdout).text()).trim(); - const stderr = (await new Response(proc.stderr).text()).trim(); - return { stdout, stderr, exitCode }; + function runCli(...args: string[]): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [entrypoint, "--home", tmpStore, ...args], { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } beforeAll(async () => { diff --git a/packages/cli/tests/gc.test.ts b/packages/cli/tests/gc.test.ts index cabaf5e..fde3bf2 100644 --- a/packages/cli/tests/gc.test.ts +++ b/packages/cli/tests/gc.test.ts @@ -1,10 +1,11 @@ -import { afterAll, beforeAll, describe, expect, test } from "bun:test"; +import { afterAll, beforeAll, describe, expect, test } from "vitest"; import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join, resolve } from "node:path"; import { envValue } from "./helpers"; -const entrypoint = resolve(import.meta.dir, "../src/index.ts"); +const entrypoint = resolve(import.meta.dirname, "../src/index.ts"); let tmpStore: string; let typeHash: string; @@ -41,17 +42,17 @@ afterAll(() => { rmSync(tmpStore, { recursive: true, force: true }); }); -async function runCli( - args: string[], -): Promise<{ stdout: string; stderr: string; exitCode: number }> { - const proc = Bun.spawn(["bun", entrypoint, "--home", tmpStore, ...args], { - stdout: "pipe", - stderr: "pipe", - }); - const exitCode = await proc.exited; - const stdout = (await new Response(proc.stdout).text()).trim(); - const stderr = (await new Response(proc.stderr).text()).trim(); - return { stdout, stderr, exitCode }; +function runCli(...args: string[]): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [entrypoint, "--home", tmpStore, ...args], { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } // ---- Phase 6: GC ---- @@ -71,19 +72,15 @@ describe("Phase 6: GC", () => { ); }); - test("6.2 gc | render -p renders the gc stats", async () => { - const { stdout: gcOut, exitCode: gcExit } = await runCli(["gc"]); + test("6.2 gc | render -p renders the gc stats", () => { + const { stdout: gcOut, exitCode: gcExit } = runCli(["gc"]); expect(gcExit).toBe(0); - const proc = Bun.spawn( - ["bun", entrypoint, "--home", tmpStore, "render", "--pipe"], - { stdin: "pipe", stdout: "pipe", stderr: "pipe" }, - ); - proc.stdin.write(gcOut); - proc.stdin.end(); - const exitCode = await proc.exited; - const stdout = (await new Response(proc.stdout).text()).trim(); - expect(exitCode).toBe(0); + const stdout = execFileSync("tsx", [entrypoint, "--home", tmpStore, "render", "--pipe"], { + input: gcOut, + encoding: "utf-8", + timeout: 10000, + }).trim(); // gc value is an object { total, reachable, collected, scanned } expect(stdout).toContain("total:"); }); diff --git a/packages/cli/tests/get-tag-info.test.ts b/packages/cli/tests/get-tag-info.test.ts index 7770311..5bb54c6 100644 --- a/packages/cli/tests/get-tag-info.test.ts +++ b/packages/cli/tests/get-tag-info.test.ts @@ -1,5 +1,6 @@ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { mkdirSync, rmSync } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join } from "node:path"; import type { Hash } from "@ocas/core"; @@ -16,7 +17,7 @@ beforeEach(() => { `ocas-get-tag-test-${Date.now()}-${Math.random().toString(36).slice(2)}`, ); storePath = join(testDir, "store"); - cliPath = join(import.meta.dir, "../src/index.ts"); + cliPath = join(import.meta.dirname, "../src/index.ts"); mkdirSync(testDir, { recursive: true }); mkdirSync(storePath, { recursive: true }); }); @@ -29,25 +30,17 @@ afterEach(() => { } }); -async function runCli(...args: string[]): Promise<{ - stdout: string; - stderr: string; - exitCode: number; -}> { - const proc = Bun.spawn( - ["bun", "run", cliPath, "--home", storePath, ...args], - { stdout: "pipe", stderr: "pipe" }, - ); - const [stdout, stderr] = await Promise.all([ - new Response(proc.stdout).text(), - new Response(proc.stderr).text(), - ]); - await proc.exited; - return { - stdout: stdout.trim(), - stderr: stderr.trim(), - exitCode: proc.exitCode ?? 0, - }; +function runCli(...args: string[]): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [cliPath, "--home", storePath, ...args], { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } async function createTestNode(value = "hello-world"): Promise { diff --git a/packages/cli/tests/helpers.ts b/packages/cli/tests/helpers.ts index b6fde67..1bb091f 100644 --- a/packages/cli/tests/helpers.ts +++ b/packages/cli/tests/helpers.ts @@ -5,6 +5,7 @@ import { rmSync, writeFileSync, } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join, resolve } from "node:path"; import type { JSONSchema } from "@ocas/core"; @@ -22,8 +23,8 @@ export { writeFileSync, }; -export const entrypoint = resolve(import.meta.dir, "../src/index.ts"); -export const pkgPath = resolve(import.meta.dir, "../package.json"); +export const entrypoint = resolve(import.meta.dirname, "../src/index.ts"); +export const pkgPath = resolve(import.meta.dirname, "../package.json"); /** Extract the `value` field from a { type, value } envelope JSON string. */ export function envValue(json: string): unknown { @@ -50,40 +51,42 @@ export async function putSchemaFile( * Run CLI command. Accepts either a string[] or ...string[] (rest args). * If first arg is an array, uses that as args. Otherwise treats all args as the command. */ -export async function runCli( +export function runCli( args: string[], storePath?: string, -): Promise<{ stdout: string; stderr: string; exitCode: number }> { +): { stdout: string; stderr: string; exitCode: number } { const finalArgs = storePath - ? ["bun", entrypoint, "--home", storePath, ...args] - : ["bun", entrypoint, ...args]; - const proc = Bun.spawn(finalArgs, { - stdout: "pipe", - stderr: "pipe", - }); - const exitCode = await proc.exited; - const stdout = await new Response(proc.stdout).text(); - const stderr = await new Response(proc.stderr).text(); - return { stdout, stderr, exitCode }; + ? [entrypoint, "--home", storePath, ...args] + : [entrypoint, ...args]; + try { + const stdout = execFileSync("tsx", finalArgs, { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout, stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: err.stdout ?? "", stderr: err.stderr ?? "", exitCode: err.status ?? 1 }; + } } -export async function runCliWithStdin( +export function runCliWithStdin( args: string[], storePath: string, stdin: string, -): Promise<{ stdout: string; stderr: string; exitCode: number }> { - const finalArgs = ["bun", entrypoint, "--home", storePath, ...args]; - const proc = Bun.spawn(finalArgs, { - stdout: "pipe", - stderr: "pipe", - stdin: "pipe", - }); - proc.stdin.write(stdin); - proc.stdin.end(); - const exitCode = await proc.exited; - const stdout = await new Response(proc.stdout).text(); - const stderr = await new Response(proc.stderr).text(); - return { stdout, stderr, exitCode }; +): { stdout: string; stderr: string; exitCode: number } { + const finalArgs = [entrypoint, "--home", storePath, ...args]; + try { + const stdout = execFileSync("tsx", finalArgs, { + input: stdin, + encoding: "utf-8", + timeout: 10000, + }); + return { stdout, stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: err.stdout ?? "", stderr: err.stderr ?? "", exitCode: err.status ?? 1 }; + } } /** diff --git a/packages/cli/tests/list-meta-schema.test.ts b/packages/cli/tests/list-meta-schema.test.ts index bc64ed3..da8b45d 100644 --- a/packages/cli/tests/list-meta-schema.test.ts +++ b/packages/cli/tests/list-meta-schema.test.ts @@ -1,4 +1,4 @@ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { mkdirSync, mkdtempSync, rmSync } from "node:fs"; import { tmpdir } from "node:os"; import { join } from "node:path"; diff --git a/packages/cli/tests/list-pagination.test.ts b/packages/cli/tests/list-pagination.test.ts index 5ad9dd6..0563dda 100644 --- a/packages/cli/tests/list-pagination.test.ts +++ b/packages/cli/tests/list-pagination.test.ts @@ -1,5 +1,6 @@ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { mkdirSync, mkdtempSync, rmSync } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join } from "node:path"; import { envValue, runCli } from "./helpers.js"; @@ -18,24 +19,12 @@ afterEach(() => { }); async function putString(text: string): Promise { - // Use the @ocas/string built-in via library; CLI doesn't expose put-text but - // `put @ocas/string --pipe` works. We'll use --pipe with stdin. - const proc = Bun.spawn( - [ - "bun", - join(import.meta.dir, "../src/index.ts"), - "--home", - storePath, - "put", - "@ocas/string", - "--pipe", - ], - { stdout: "pipe", stderr: "pipe", stdin: "pipe" }, - ); - proc.stdin.write(JSON.stringify(text)); - proc.stdin.end(); - await proc.exited; - const out = await new Response(proc.stdout).text(); + const entrypoint = join(import.meta.dirname, "../src/index.ts"); + const out = execFileSync("tsx", [entrypoint, "--home", storePath, "put", "@ocas/string", "--pipe"], { + input: JSON.stringify(text), + encoding: "utf-8", + timeout: 10000, + }); return (JSON.parse(out) as { value: string }).value; } diff --git a/packages/cli/tests/list-tag-filter.test.ts b/packages/cli/tests/list-tag-filter.test.ts index ff587bc..bcc666c 100644 --- a/packages/cli/tests/list-tag-filter.test.ts +++ b/packages/cli/tests/list-tag-filter.test.ts @@ -1,5 +1,6 @@ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { mkdirSync, rmSync } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join } from "node:path"; @@ -13,7 +14,7 @@ beforeEach(() => { `ocas-list-tag-test-${Date.now()}-${Math.random().toString(36).slice(2)}`, ); storePath = join(testDir, "store"); - cliPath = join(import.meta.dir, "../src/index.ts"); + cliPath = join(import.meta.dirname, "../src/index.ts"); mkdirSync(testDir, { recursive: true }); mkdirSync(storePath, { recursive: true }); }); @@ -26,50 +27,31 @@ afterEach(() => { } }); -async function runCli(...args: string[]): Promise<{ - stdout: string; - stderr: string; - exitCode: number; -}> { - const proc = Bun.spawn( - ["bun", "run", cliPath, "--home", storePath, ...args], - { stdout: "pipe", stderr: "pipe" }, - ); - const [stdout, stderr] = await Promise.all([ - new Response(proc.stdout).text(), - new Response(proc.stderr).text(), - ]); - await proc.exited; - return { - stdout: stdout.trim(), - stderr: stderr.trim(), - exitCode: proc.exitCode ?? 0, - }; +function runCli(...args: string[]): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [cliPath, "--home", storePath, ...args], { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } -async function putString(value: string): Promise { - const proc = Bun.spawn( - [ - "bun", - "run", - cliPath, - "--home", - storePath, - "put", - "@ocas/string", - "--pipe", - ], - { stdin: "pipe", stdout: "pipe", stderr: "pipe" }, - ); - proc.stdin.write(JSON.stringify(value)); - await proc.stdin.end(); - const out = await new Response(proc.stdout).text(); - const err = await new Response(proc.stderr).text(); - await proc.exited; - if ((proc.exitCode ?? 0) !== 0) { - throw new Error(`put failed: ${err}`); +function putString(value: string): string { + try { + const out = execFileSync("tsx", [cliPath, "--home", storePath, "put", "@ocas/string", "--pipe"], { + input: JSON.stringify(value), + encoding: "utf-8", + timeout: 10000, + }); + return JSON.parse(out.trim()).value as string; + } catch (e: unknown) { + const err = e as { stderr?: string }; + throw new Error(`put failed: ${err.stderr ?? ""}`); } - return JSON.parse(out.trim()).value as string; } async function tag(target: string, ...tagSpecs: string[]): Promise { diff --git a/packages/cli/tests/pipe.test.ts b/packages/cli/tests/pipe.test.ts index ce2ef69..9c6e8c5 100644 --- a/packages/cli/tests/pipe.test.ts +++ b/packages/cli/tests/pipe.test.ts @@ -1,10 +1,11 @@ -import { afterAll, beforeAll, describe, expect, test } from "bun:test"; +import { afterAll, beforeAll, describe, expect, test } from "vitest"; import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join, resolve } from "node:path"; import { envValue } from "./helpers"; -const entrypoint = resolve(import.meta.dir, "../src/index.ts"); +const entrypoint = resolve(import.meta.dirname, "../src/index.ts"); let tmpStore: string; let typeHash: string; @@ -43,34 +44,34 @@ afterAll(() => { rmSync(tmpStore, { recursive: true, force: true }); }); -async function runCli( - args: string[], -): Promise<{ stdout: string; stderr: string; exitCode: number }> { - const proc = Bun.spawn(["bun", entrypoint, "--home", tmpStore, ...args], { - stdout: "pipe", - stderr: "pipe", - }); - const exitCode = await proc.exited; - const stdout = (await new Response(proc.stdout).text()).trim(); - const stderr = (await new Response(proc.stderr).text()).trim(); - return { stdout, stderr, exitCode }; +function runCli(...args: string[]): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [entrypoint, "--home", tmpStore, ...args], { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } -async function runCliWithStdin( +function runCliWithStdin( args: string[], stdin: string, -): Promise<{ stdout: string; stderr: string; exitCode: number }> { - const proc = Bun.spawn(["bun", entrypoint, "--home", tmpStore, ...args], { - stdin: "pipe", - stdout: "pipe", - stderr: "pipe", - }); - proc.stdin.write(stdin); - proc.stdin.end(); - const exitCode = await proc.exited; - const stdout = (await new Response(proc.stdout).text()).trim(); - const stderr = (await new Response(proc.stderr).text()).trim(); - return { stdout, stderr, exitCode }; +): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [entrypoint, "--home", tmpStore, ...args], { + input: stdin, + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } // ---- Phase 8: Pipe Composition ---- diff --git a/packages/cli/tests/put-get-has.test.ts b/packages/cli/tests/put-get-has.test.ts index fa3bd78..d0a3b2a 100644 --- a/packages/cli/tests/put-get-has.test.ts +++ b/packages/cli/tests/put-get-has.test.ts @@ -1,10 +1,11 @@ -import { afterAll, beforeAll, describe, expect, test } from "bun:test"; +import { afterAll, beforeAll, describe, expect, test } from "vitest"; import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join, resolve } from "node:path"; import { envValue, stripVolatile } from "./helpers"; -const entrypoint = resolve(import.meta.dir, "../src/index.ts"); +const entrypoint = resolve(import.meta.dirname, "../src/index.ts"); let tmpStore: string; let typeHash: string; @@ -41,17 +42,19 @@ afterAll(() => { rmSync(tmpStore, { recursive: true, force: true }); }); -async function runCli( +function runCli( args: string[], -): Promise<{ stdout: string; stderr: string; exitCode: number }> { - const proc = Bun.spawn(["bun", entrypoint, "--home", tmpStore, ...args], { - stdout: "pipe", - stderr: "pipe", - }); - const exitCode = await proc.exited; - const stdout = (await new Response(proc.stdout).text()).trim(); - const stderr = (await new Response(proc.stderr).text()).trim(); - return { stdout, stderr, exitCode }; +): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [entrypoint, "--home", tmpStore, ...args], { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } describe("Phase 1: CAS Core", () => { diff --git a/packages/cli/tests/render.test.ts b/packages/cli/tests/render.test.ts index 8463980..2e060ba 100644 --- a/packages/cli/tests/render.test.ts +++ b/packages/cli/tests/render.test.ts @@ -1,12 +1,13 @@ -import { afterAll, beforeAll, describe, expect, test } from "bun:test"; +import { afterAll, beforeAll, describe, expect, test } from "vitest"; import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join, resolve } from "node:path"; import { bootstrap } from "@ocas/core"; import { openStore as openFsStore } from "@ocas/fs"; import { envValue, putSchemaFile, runCli, runCliWithStdin } from "./helpers"; -const entrypoint = resolve(import.meta.dir, "../src/index.ts"); +const entrypoint = resolve(import.meta.dirname, "../src/index.ts"); // --- Standalone render tests from cli.test.ts --- @@ -57,34 +58,34 @@ describe("Phase 5: Render", () => { let typeHash: string; let nodeHash: string; - async function runCliE2e( - args: string[], - ): Promise<{ stdout: string; stderr: string; exitCode: number }> { - const proc = Bun.spawn(["bun", entrypoint, "--home", tmpStore, ...args], { - stdout: "pipe", - stderr: "pipe", - }); - const exitCode = await proc.exited; - const stdout = (await new Response(proc.stdout).text()).trim(); - const stderr = (await new Response(proc.stderr).text()).trim(); - return { stdout, stderr, exitCode }; + function runCliE2e(...args: string[]): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [entrypoint, "--home", tmpStore, ...args], { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } async function _runCliE2eWithStdin( args: string[], stdin: string, ): Promise<{ stdout: string; stderr: string; exitCode: number }> { - const proc = Bun.spawn(["bun", entrypoint, "--home", tmpStore, ...args], { - stdin: "pipe", - stdout: "pipe", - stderr: "pipe", - }); - proc.stdin.write(stdin); - proc.stdin.end(); - const exitCode = await proc.exited; - const stdout = (await new Response(proc.stdout).text()).trim(); - const stderr = (await new Response(proc.stderr).text()).trim(); - return { stdout, stderr, exitCode }; + try { + const stdout = execFileSync("tsx", [entrypoint, "--home", tmpStore, ...args], { + input: stdin, + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } beforeAll(async () => { diff --git a/packages/cli/tests/schema-validation.test.ts b/packages/cli/tests/schema-validation.test.ts index caa2e3a..63f9cf2 100644 --- a/packages/cli/tests/schema-validation.test.ts +++ b/packages/cli/tests/schema-validation.test.ts @@ -1,5 +1,6 @@ -import { afterAll, beforeAll, describe, expect, test } from "bun:test"; +import { afterAll, beforeAll, describe, expect, test } from "vitest"; import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join, resolve } from "node:path"; import { envValue, putSchemaFile, runCli } from "./helpers"; @@ -559,7 +560,7 @@ describe("Phase 2: Schema Validation", () => { let typeHash: string; let _nodeHash: string; - const entrypoint = resolve(import.meta.dir, "../src/index.ts"); + const entrypoint = resolve(import.meta.dirname, "../src/index.ts"); beforeAll(async () => { tmpStore = mkdtempSync(join(tmpdir(), "ocas-e2e-")); @@ -581,12 +582,10 @@ describe("Phase 2: Schema Validation", () => { const nodeFile = join(tmpStore, "test-node.json"); writeFileSync(nodeFile, JSON.stringify({ name: "Alice", age: 30 })); - const proc = Bun.spawn( - ["bun", entrypoint, "--home", tmpStore, "put", typeHash, nodeFile], - { stdout: "pipe", stderr: "pipe" }, - ); - await proc.exited; - const stdout = (await new Response(proc.stdout).text()).trim(); + const stdout = execFileSync("tsx", [entrypoint, "--home", tmpStore, "put", typeHash, nodeFile], { + encoding: "utf-8", + timeout: 10000, + }).trim(); _nodeHash = envValue(stdout) as string; }); @@ -597,13 +596,18 @@ describe("Phase 2: Schema Validation", () => { test("2.1 put {name:123} against string-schema fails with non-zero exit", async () => { const badFile = join(tmpStore, "bad-node.json"); writeFileSync(badFile, JSON.stringify({ name: 123 })); - const proc = Bun.spawn( - ["bun", entrypoint, "--home", tmpStore, "put", typeHash, badFile], - { stdout: "pipe", stderr: "pipe" }, - ); - const exitCode = await proc.exited; - const stdout = (await new Response(proc.stdout).text()).trim(); - const stderr = (await new Response(proc.stderr).text()).trim(); + let stdout = "", stderr = "", exitCode = 0; + try { + stdout = execFileSync("tsx", [entrypoint, "--home", tmpStore, "put", typeHash, badFile], { + encoding: "utf-8", + timeout: 10000, + }).trim(); + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + stdout = (err.stdout ?? "").trim(); + stderr = (err.stderr ?? "").trim(); + exitCode = err.status ?? 1; + } expect(exitCode).not.toBe(0); expect(stdout).toBe(""); expect(stderr).toContain("Validation failed"); @@ -612,12 +616,17 @@ describe("Phase 2: Schema Validation", () => { test("2.3 put against non-existent schema hash fails", async () => { const nodeFile = join(tmpStore, "test-node.json"); - const proc = Bun.spawn( - ["bun", entrypoint, "--home", tmpStore, "put", "AAAAAAAAAAAAA", nodeFile], - { stdout: "pipe", stderr: "pipe" }, - ); - const exitCode = await proc.exited; - const stderr = (await new Response(proc.stderr).text()).trim(); + let exitCode = 0, stderr = ""; + try { + execFileSync("tsx", [entrypoint, "--home", tmpStore, "put", "AAAAAAAAAAAAA", nodeFile], { + encoding: "utf-8", + timeout: 10000, + }); + } catch (e: unknown) { + const err = e as { stderr?: string; status?: number }; + stderr = (err.stderr ?? "").trim(); + exitCode = err.status ?? 1; + } expect(exitCode).not.toBe(0); expect(stderr).toMatchSnapshot(); }); diff --git a/packages/cli/tests/tag-untag.test.ts b/packages/cli/tests/tag-untag.test.ts index 92d93b7..dc68081 100644 --- a/packages/cli/tests/tag-untag.test.ts +++ b/packages/cli/tests/tag-untag.test.ts @@ -1,5 +1,6 @@ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { mkdirSync, rmSync } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join } from "node:path"; import type { Hash } from "@ocas/core"; @@ -16,7 +17,7 @@ beforeEach(() => { `ocas-tag-test-${Date.now()}-${Math.random().toString(36).slice(2)}`, ); storePath = join(testDir, "store"); - cliPath = join(import.meta.dir, "../src/index.ts"); + cliPath = join(import.meta.dirname, "../src/index.ts"); mkdirSync(testDir, { recursive: true }); mkdirSync(storePath, { recursive: true }); }); @@ -29,25 +30,17 @@ afterEach(() => { } }); -async function runCli(...args: string[]): Promise<{ - stdout: string; - stderr: string; - exitCode: number; -}> { - const proc = Bun.spawn( - ["bun", "run", cliPath, "--home", storePath, ...args], - { stdout: "pipe", stderr: "pipe" }, - ); - const [stdout, stderr] = await Promise.all([ - new Response(proc.stdout).text(), - new Response(proc.stderr).text(), - ]); - await proc.exited; - return { - stdout: stdout.trim(), - stderr: stderr.trim(), - exitCode: proc.exitCode ?? 0, - }; +function runCli(...args: string[]): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [cliPath, "--home", storePath, ...args], { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } async function createTestNode(): Promise { diff --git a/packages/cli/tests/template.test.ts b/packages/cli/tests/template.test.ts index d0f0be3..f7a2f59 100644 --- a/packages/cli/tests/template.test.ts +++ b/packages/cli/tests/template.test.ts @@ -1,5 +1,6 @@ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { mkdirSync, rmSync, writeFileSync } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join } from "node:path"; import type { Hash, Store } from "@ocas/core"; @@ -19,7 +20,7 @@ beforeEach(() => { `ocas-test-${Date.now()}-${Math.random().toString(36).slice(2)}`, ); storePath = join(testDir, "store"); - cliPath = join(import.meta.dir, "../src/index.ts"); + cliPath = join(import.meta.dirname, "../src/index.ts"); mkdirSync(testDir, { recursive: true }); mkdirSync(storePath, { recursive: true }); @@ -37,31 +38,17 @@ afterEach(() => { /** * Run CLI command and return stdout, stderr, and exit code */ -async function runCli(...args: string[]): Promise<{ - stdout: string; - stderr: string; - exitCode: number; -}> { - const proc = Bun.spawn( - ["bun", "run", cliPath, "--home", storePath, ...args], - { - stdout: "pipe", - stderr: "pipe", - }, - ); - - const [stdout, stderr] = await Promise.all([ - new Response(proc.stdout).text(), - new Response(proc.stderr).text(), - ]); - - await proc.exited; - - return { - stdout: stdout.trim(), - stderr: stderr.trim(), - exitCode: proc.exitCode ?? 0, - }; +function runCli(...args: string[]): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [cliPath, "--home", storePath, ...args], { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } /** diff --git a/packages/cli/tests/variable-history.test.ts b/packages/cli/tests/variable-history.test.ts index 771a430..9edce77 100644 --- a/packages/cli/tests/variable-history.test.ts +++ b/packages/cli/tests/variable-history.test.ts @@ -1,5 +1,6 @@ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { mkdirSync, rmSync } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join } from "node:path"; import type { Hash, Store } from "@ocas/core"; @@ -16,7 +17,7 @@ beforeEach(() => { `ocas-history-test-${Date.now()}-${Math.random().toString(36).slice(2)}`, ); storePath = join(testDir, "store"); - cliPath = join(import.meta.dir, "../src/index.ts"); + cliPath = join(import.meta.dirname, "../src/index.ts"); mkdirSync(testDir, { recursive: true }); mkdirSync(storePath, { recursive: true }); @@ -30,31 +31,17 @@ afterEach(() => { } }); -async function runCli(...args: string[]): Promise<{ - stdout: string; - stderr: string; - exitCode: number; -}> { - const proc = Bun.spawn( - ["bun", "run", cliPath, "--home", storePath, ...args], - { - stdout: "pipe", - stderr: "pipe", - }, - ); - - const [stdout, stderr] = await Promise.all([ - new Response(proc.stdout).text(), - new Response(proc.stderr).text(), - ]); - - await proc.exited; - - return { - stdout: stdout.trim(), - stderr: stderr.trim(), - exitCode: proc.exitCode ?? 0, - }; +function runCli(...args: string[]): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [cliPath, "--home", storePath, ...args], { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } async function setupSchemaAndValues(): Promise<{ diff --git a/packages/cli/tests/variable.test.ts b/packages/cli/tests/variable.test.ts index bfb8c02..a602fb2 100644 --- a/packages/cli/tests/variable.test.ts +++ b/packages/cli/tests/variable.test.ts @@ -1,5 +1,6 @@ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { mkdirSync, rmSync } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join } from "node:path"; import type { Hash, Store } from "@ocas/core"; @@ -19,7 +20,7 @@ beforeEach(() => { `ocas-test-${Date.now()}-${Math.random().toString(36).slice(2)}`, ); storePath = join(testDir, "store"); - cliPath = join(import.meta.dir, "../src/index.ts"); + cliPath = join(import.meta.dirname, "../src/index.ts"); mkdirSync(testDir, { recursive: true }); mkdirSync(storePath, { recursive: true }); @@ -37,31 +38,17 @@ afterEach(() => { /** * Run CLI command and return stdout, stderr, and exit code */ -async function runCli(...args: string[]): Promise<{ - stdout: string; - stderr: string; - exitCode: number; -}> { - const proc = Bun.spawn( - ["bun", "run", cliPath, "--home", storePath, ...args], - { - stdout: "pipe", - stderr: "pipe", - }, - ); - - const [stdout, stderr] = await Promise.all([ - new Response(proc.stdout).text(), - new Response(proc.stderr).text(), - ]); - - await proc.exited; - - return { - stdout: stdout.trim(), - stderr: stderr.trim(), - exitCode: proc.exitCode ?? 0, - }; +function runCli(...args: string[]): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [cliPath, "--home", storePath, ...args], { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } /** @@ -783,26 +770,10 @@ describe("global options", () => { const hash = await createTestNode(store, typeHash, { test: "data" }); // Override with custom store path - const proc = Bun.spawn( - [ - "bun", - "run", - cliPath, - "--home", - customStorePath, - "var", - "set", - "@test/x", - hash, - ], - { - stdout: "pipe", - stderr: "pipe", - }, - ); - - await proc.exited; - expect(proc.exitCode).toBe(0); + execFileSync("tsx", [cliPath, "--home", customStorePath, "var", "set", "@test/x", hash], { + encoding: "utf-8", + timeout: 10000, + }); }); }); diff --git a/packages/cli/tests/verify-refs-walk.test.ts b/packages/cli/tests/verify-refs-walk.test.ts index 388f447..25c2816 100644 --- a/packages/cli/tests/verify-refs-walk.test.ts +++ b/packages/cli/tests/verify-refs-walk.test.ts @@ -1,10 +1,11 @@ -import { afterAll, beforeAll, describe, expect, test } from "bun:test"; +import { afterAll, beforeAll, describe, expect, test } from "vitest"; import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs"; +import { execFileSync } from "node:child_process"; import { tmpdir } from "node:os"; import { join, resolve } from "node:path"; import { envValue, stripVolatile } from "./helpers"; -const entrypoint = resolve(import.meta.dir, "../src/index.ts"); +const entrypoint = resolve(import.meta.dirname, "../src/index.ts"); let tmpStore: string; let typeHash: string; @@ -38,17 +39,19 @@ afterAll(() => { rmSync(tmpStore, { recursive: true, force: true }); }); -async function runCli( +function runCli( args: string[], -): Promise<{ stdout: string; stderr: string; exitCode: number }> { - const proc = Bun.spawn(["bun", entrypoint, "--home", tmpStore, ...args], { - stdout: "pipe", - stderr: "pipe", - }); - const exitCode = await proc.exited; - const stdout = (await new Response(proc.stdout).text()).trim(); - const stderr = (await new Response(proc.stderr).text()).trim(); - return { stdout, stderr, exitCode }; +): { stdout: string; stderr: string; exitCode: number } { + try { + const stdout = execFileSync("tsx", [entrypoint, "--home", tmpStore, ...args], { + encoding: "utf-8", + timeout: 10000, + }); + return { stdout: stdout.trim(), stderr: "", exitCode: 0 }; + } catch (e: unknown) { + const err = e as { stdout?: string; stderr?: string; status?: number }; + return { stdout: (err.stdout ?? "").trim(), stderr: (err.stderr ?? "").trim(), exitCode: err.status ?? 1 }; + } } describe("Phase 1: CAS Core", () => { diff --git a/packages/core/src/bootstrap.test.ts b/packages/core/src/bootstrap.test.ts index e487f49..11a9560 100644 --- a/packages/core/src/bootstrap.test.ts +++ b/packages/core/src/bootstrap.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { bootstrap } from "./bootstrap.js"; import type { JSONSchema } from "./schema.js"; import { getSchema } from "./schema.js"; diff --git a/packages/core/src/gc.test.ts b/packages/core/src/gc.test.ts index 71174ef..78c8a41 100644 --- a/packages/core/src/gc.test.ts +++ b/packages/core/src/gc.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { bootstrap } from "./bootstrap.js"; import { gc } from "./gc.js"; import { putSchema } from "./schema.js"; diff --git a/packages/core/src/index.test.ts b/packages/core/src/index.test.ts index 45a89ff..340c452 100644 --- a/packages/core/src/index.test.ts +++ b/packages/core/src/index.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { bootstrap } from "./bootstrap.js"; import { cborEncode } from "./cbor.js"; diff --git a/packages/core/src/liquid-render.test.ts b/packages/core/src/liquid-render.test.ts index 3eba60f..f1bffb9 100644 --- a/packages/core/src/liquid-render.test.ts +++ b/packages/core/src/liquid-render.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { bootstrap } from "./bootstrap.js"; import { renderWithTemplate } from "./liquid-render.js"; import { putSchema } from "./schema.js"; diff --git a/packages/core/src/list-pagination.test.ts b/packages/core/src/list-pagination.test.ts index 410f37a..91fc358 100644 --- a/packages/core/src/list-pagination.test.ts +++ b/packages/core/src/list-pagination.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { BOOTSTRAP_STORE } from "./bootstrap-capable.js"; import { createMemoryStore } from "./store.js"; diff --git a/packages/core/src/no-sqlite.test.ts b/packages/core/src/no-sqlite.test.ts index 8fe879d..bc5fee0 100644 --- a/packages/core/src/no-sqlite.test.ts +++ b/packages/core/src/no-sqlite.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { readdirSync, readFileSync, statSync } from "node:fs"; import { join } from "node:path"; @@ -16,7 +16,7 @@ function* walk(dir: string): Generator { describe("no SQLite in @ocas/core", () => { test("source files do not import sqlite", () => { - const srcDir = import.meta.dir; + const srcDir = import.meta.dirname; const needle = ["bun", "sqlite"].join(":"); for (const file of walk(srcDir)) { if (!file.endsWith(".ts")) continue; diff --git a/packages/core/src/output-templates.test.ts b/packages/core/src/output-templates.test.ts index adda02f..bc263e4 100644 --- a/packages/core/src/output-templates.test.ts +++ b/packages/core/src/output-templates.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { bootstrap } from "./bootstrap.js"; import { registerOutputTemplates } from "./output-templates.js"; import { createMemoryStore } from "./store.js"; diff --git a/packages/core/src/render.test.ts b/packages/core/src/render.test.ts index fa0ae59..ca44eab 100644 --- a/packages/core/src/render.test.ts +++ b/packages/core/src/render.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { bootstrap } from "./bootstrap.js"; import { CasNodeNotFoundError } from "./errors.js"; import { render, renderAsync, renderDirect } from "./render.js"; diff --git a/packages/core/src/schema.test.ts b/packages/core/src/schema.test.ts index b9fbe58..2c5ad4d 100644 --- a/packages/core/src/schema.test.ts +++ b/packages/core/src/schema.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { bootstrap } from "./bootstrap.js"; import { getSchema, putSchema, refs, validate, walk } from "./schema.js"; diff --git a/packages/core/src/store.test.ts b/packages/core/src/store.test.ts index 1f9d79b..c609c44 100644 --- a/packages/core/src/store.test.ts +++ b/packages/core/src/store.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { BOOTSTRAP_STORE } from "./bootstrap-capable.js"; import { createMemoryStore } from "./store.js"; diff --git a/packages/core/src/tag-store.test.ts b/packages/core/src/tag-store.test.ts index 4f982d4..8567399 100644 --- a/packages/core/src/tag-store.test.ts +++ b/packages/core/src/tag-store.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { createMemoryStore } from "./store.js"; const T1 = "AAAAAAAAAAAAA"; diff --git a/packages/core/src/types-store.test.ts b/packages/core/src/types-store.test.ts index 12ebe16..2bf40d0 100644 --- a/packages/core/src/types-store.test.ts +++ b/packages/core/src/types-store.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { readFileSync } from "node:fs"; import { join } from "node:path"; import type { @@ -134,7 +134,7 @@ describe("Aggregate Store type", () => { describe("source convention", () => { test("types.ts uses 'type' not 'interface' for new types", () => { - const src = readFileSync(join(import.meta.dir, "types.ts"), "utf8"); + const src = readFileSync(join(import.meta.dirname, "types.ts"), "utf8"); for (const name of ["CasStore", "VarStore", "TagStore"]) { expect(src).toMatch(new RegExp(`export\\s+type\\s+${name}\\b`)); expect(src).not.toMatch(new RegExp(`interface\\s+${name}\\b`)); diff --git a/packages/core/src/var-store.test.ts b/packages/core/src/var-store.test.ts index 3eda251..340f5a8 100644 --- a/packages/core/src/var-store.test.ts +++ b/packages/core/src/var-store.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { CasNodeNotFoundError, InvalidVariableNameError, diff --git a/packages/core/src/variable.test.ts b/packages/core/src/variable.test.ts index 0c14eeb..d1b4615 100644 --- a/packages/core/src/variable.test.ts +++ b/packages/core/src/variable.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import type { Variable } from "./variable.js"; describe("Variable Type", () => { diff --git a/packages/core/src/wrap-envelope.test.ts b/packages/core/src/wrap-envelope.test.ts index cdf1a55..bf95083 100644 --- a/packages/core/src/wrap-envelope.test.ts +++ b/packages/core/src/wrap-envelope.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { bootstrap } from "./bootstrap.js"; import { createMemoryStore } from "./store.js"; import { wrapEnvelope } from "./wrap-envelope.js"; diff --git a/packages/core/tests/schema-validation.test.ts b/packages/core/tests/schema-validation.test.ts index 0a126a1..e2f6029 100644 --- a/packages/core/tests/schema-validation.test.ts +++ b/packages/core/tests/schema-validation.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, test } from "vitest"; import { bootstrap } from "../src/bootstrap.js"; import { MemStore } from "../src/mem-store.js"; import type { JSONSchema } from "../src/schema.js"; diff --git a/packages/fs/src/sqlite-adapter.ts b/packages/fs/src/sqlite-adapter.ts new file mode 100644 index 0000000..037999e --- /dev/null +++ b/packages/fs/src/sqlite-adapter.ts @@ -0,0 +1,99 @@ +/** + * SQLite adapter — uses bun:sqlite when running under Bun, + * falls back to better-sqlite3 for Node.js. + * + * Exports a minimal interface matching the subset both libraries share. + */ + +// eslint-disable-next-line @typescript-eslint/no-explicit-any +type Row = Record; + +export type Statement = { + run(...params: unknown[]): void; + get(...params: unknown[]): Row | undefined; + all(...params: unknown[]): Row[]; +}; + +export type SqliteDb = { + exec(sql: string): void; + prepare(sql: string): Statement; + transaction(fn: () => T): () => T; + close(): void; +}; + +const IS_BUN = typeof globalThis.Bun !== "undefined"; + +export function openSqlite(path: string): SqliteDb { + if (IS_BUN) { + return openBunSqlite(path); + } + return openBetterSqlite(path); +} + +function openBunSqlite(path: string): SqliteDb { + // Dynamic require to avoid bundler issues + // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires + const { Database } = require("bun:sqlite"); + const db = new Database(path); + + return { + exec(sql: string) { + db.exec(sql); + }, + prepare(sql: string): Statement { + const stmt = db.prepare(sql); + return { + run(...params: unknown[]) { + stmt.run(...params); + }, + get(...params: unknown[]): Row | undefined { + return stmt.get(...params) ?? undefined; + }, + all(...params: unknown[]): Row[] { + return stmt.all(...params); + }, + }; + }, + transaction(fn: () => T): () => T { + const wrapped = db.transaction(fn); + return wrapped; + }, + close() { + db.close(); + }, + }; +} + +function openBetterSqlite(path: string): SqliteDb { + // Dynamic require to avoid bundler issues when running under Bun + // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires + const BetterSqlite3 = require("better-sqlite3"); + const db = new BetterSqlite3(path); + + return { + exec(sql: string) { + db.exec(sql); + }, + prepare(sql: string): Statement { + const stmt = db.prepare(sql); + return { + run(...params: unknown[]) { + stmt.run(...params); + }, + get(...params: unknown[]): Row | undefined { + return stmt.get(...params) ?? undefined; + }, + all(...params: unknown[]): Row[] { + return stmt.all(...params); + }, + }; + }, + transaction(fn: () => T): () => T { + const wrapped = db.transaction(fn); + return wrapped; + }, + close() { + db.close(); + }, + }; +} diff --git a/packages/fs/src/store.test.ts b/packages/fs/src/store.test.ts index 39a3efb..78591a3 100644 --- a/packages/fs/src/store.test.ts +++ b/packages/fs/src/store.test.ts @@ -1,4 +1,4 @@ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { existsSync, mkdtempSync, diff --git a/packages/fs/src/tag-store.test.ts b/packages/fs/src/tag-store.test.ts index a546e51..e38695a 100644 --- a/packages/fs/src/tag-store.test.ts +++ b/packages/fs/src/tag-store.test.ts @@ -1,4 +1,4 @@ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { existsSync, mkdtempSync, readFileSync, rmSync } from "node:fs"; import { tmpdir } from "node:os"; import { join } from "node:path"; diff --git a/packages/fs/src/var-store.test.ts b/packages/fs/src/var-store.test.ts index ac91564..8821e28 100644 --- a/packages/fs/src/var-store.test.ts +++ b/packages/fs/src/var-store.test.ts @@ -1,4 +1,4 @@ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { existsSync, mkdtempSync, readFileSync, rmSync } from "node:fs"; import { tmpdir } from "node:os"; import { join } from "node:path"; diff --git a/tsconfig.json b/tsconfig.json index d1bd6e1..2b8d97f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "types": ["bun-types"], + "types": [], "target": "ES2022", "module": "ESNext", "moduleResolution": "bundler", diff --git a/vitest.config.ts b/vitest.config.ts new file mode 100644 index 0000000..daec87c --- /dev/null +++ b/vitest.config.ts @@ -0,0 +1,8 @@ +import { defineConfig } from "vitest/config"; + +export default defineConfig({ + test: { + include: ["packages/*/src/**/*.test.ts", "packages/*/tests/**/*.test.ts"], + testTimeout: 30000, + }, +});