From 8b607e998351a1702e030881bffb826e09df3c86 Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 9 Nov 2026 06:22:13 +0000 Subject: [PATCH] build: migrate from tsc to tsdown Build every package with tsdown from one shared root tsdown.config.ts. Each package's prepack runs `tsdown`, which finds the root config; entries come from the package's exports. unbundle keeps one output file per source module, as tsc did, relative imports such as ../package.json are bundled in, and packages stay external. - Generate declarations with oxc. tsdown's default tsgo generator drops the DecoratedProcedure import from @orpc/effect's extensions/effect.d.ts, used only inside a module augmentation, so .effect() procedures lost their types for consumers. The regex constants in @orpc/shared get explicit types, and the ORPCModule and TmpFile.path JSDoc move to where oxc keeps them. - Turn rolldown's `import { a } from 'x'; export { a }` back into `export { a } from 'x'` with a small renderChunk hook, so Expo's tree shaking can drop unused re-exports again. - Fail the build when dist imports a package that isn't in the package's dependencies or peerDependencies (deps.onlyImport). - Switch the root tsconfig to module preserve with bundler resolution and drop the .ts extension from relative imports. - Remove the tsc-only tsconfig options and the bun, cloudflare and nest tsconfig.build.json files. - Bump oxlint, oxlint-tsgolint, oxfmt and @oxc-project/runtime. - Bump CodSpeedHQ/action to v5. v4 installs a CodSpeed runner that exits with "Unsupported system" on the ubuntu-26.04 image ubuntu-latest now uses; openapi-spec already runs v5 there. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01VVaw7RpPRpasxuSAB8fbND --- .github/workflows/codspeed.yaml | 2 +- apps/content/blume.config.ts | 6 +- apps/content/sponsors/ads.ts | 2 +- apps/content/sponsors/client.ts | 4 +- apps/content/sponsors/data.ts | 2 +- apps/content/tsconfig.json | 1 - benches/openapi-link-handler.bench.ts | 2 +- benches/openapi-serializer.bench.ts | 2 +- benches/rpc-link-handler.bench.ts | 2 +- benches/rpc-serializer.bench.ts | 2 +- benches/static-file-handler.bench.ts | 2 +- package.json | 7 +- packages/ai-sdk/package.json | 2 +- packages/ai-sdk/src/index.test.ts | 2 +- packages/ai-sdk/src/index.ts | 4 +- packages/ai-sdk/src/tool-meta.test-d.ts | 2 +- packages/ai-sdk/src/tool-meta.test.ts | 2 +- packages/ai-sdk/src/tool-meta.ts | 2 +- packages/ai-sdk/src/tool.test-d.ts | 2 +- packages/ai-sdk/src/tool.test.ts | 4 +- packages/ai-sdk/src/tool.ts | 4 +- packages/arktype/package.json | 2 +- packages/arktype/src/converter.test.ts | 2 +- packages/arktype/src/index.test.ts | 2 +- packages/arktype/src/index.ts | 2 +- packages/bun/package.json | 2 +- packages/bun/src/index.test.ts | 2 +- packages/bun/src/index.ts | 6 +- packages/bun/src/redis-lock.test.ts | 2 +- packages/bun/src/redis-publisher.test.ts | 6 +- packages/bun/src/redis-ratelimit.test.ts | 2 +- .../lock-redis-adapters-compatibility.test.ts | 2 +- ...isher-redis-adapters-compatibility.test.ts | 4 +- ...limit-redis-adapters-compatibility.test.ts | 2 +- .../rpc/__shared__/client-server.bun-fetch.ts | 4 +- .../__shared__/client-server.bun-websocket.ts | 4 +- .../client-server.compression-bun-fetch.ts | 4 +- ...client-server.compression-bun-websocket.ts | 4 +- .../bun/tests/rpc/cancel-and-abort.test.ts | 8 +- packages/bun/tests/rpc/data-transfer.test.ts | 12 +- packages/bun/tsconfig.build.json | 6 - packages/client/package.json | 2 +- .../client/src/adapters/fetch/index.test.ts | 2 +- packages/client/src/adapters/fetch/index.ts | 4 +- .../src/adapters/fetch/rpc-link.test-d.ts | 2 +- .../src/adapters/fetch/rpc-link.test.ts | 4 +- .../client/src/adapters/fetch/rpc-link.ts | 10 +- .../client/src/adapters/fetch/transport.ts | 4 +- .../src/adapters/message-port/index.test.ts | 2 +- .../client/src/adapters/message-port/index.ts | 6 +- .../message-port/message-port.test.ts | 2 +- .../adapters/message-port/rpc-link.test.ts | 4 +- .../src/adapters/message-port/rpc-link.ts | 10 +- .../src/adapters/message-port/transport.ts | 8 +- .../client/src/adapters/standard/codec.ts | 2 +- .../src/adapters/standard/index.test.ts | 2 +- .../client/src/adapters/standard/index.ts | 10 +- .../client/src/adapters/standard/link.test.ts | 8 +- packages/client/src/adapters/standard/link.ts | 10 +- .../src/adapters/standard/plugin.test.ts | 4 +- .../client/src/adapters/standard/plugin.ts | 4 +- .../adapters/standard/rpc-link-codec.test.ts | 6 +- .../src/adapters/standard/rpc-link-codec.ts | 10 +- .../client/src/adapters/standard/transport.ts | 2 +- .../src/adapters/websocket/index.test.ts | 2 +- .../client/src/adapters/websocket/index.ts | 4 +- .../src/adapters/websocket/rpc-link.test.ts | 4 +- .../client/src/adapters/websocket/rpc-link.ts | 10 +- .../src/adapters/websocket/transport.ts | 4 +- .../client/src/async-iterator-object.test.ts | 2 +- packages/client/src/client-safe.test-d.ts | 6 +- packages/client/src/client-safe.test.ts | 2 +- packages/client/src/client-safe.ts | 8 +- packages/client/src/client.test-d.ts | 6 +- packages/client/src/client.test.ts | 4 +- packages/client/src/client.ts | 6 +- packages/client/src/dynamic-link.test-d.ts | 4 +- packages/client/src/dynamic-link.test.ts | 4 +- packages/client/src/dynamic-link.ts | 2 +- packages/client/src/error-utils.test-d.ts | 4 +- packages/client/src/error-utils.test.ts | 4 +- packages/client/src/error-utils.ts | 4 +- packages/client/src/error.test-d.ts | 2 +- packages/client/src/error.test.ts | 2 +- packages/client/src/index.test.ts | 2 +- packages/client/src/index.ts | 26 +- packages/client/src/plugins/batch.test.ts | 6 +- packages/client/src/plugins/batch.ts | 4 +- .../client/src/plugins/cookie-jar.test.ts | 14 +- packages/client/src/plugins/cookie-jar.ts | 6 +- packages/client/src/plugins/dedupe.test.ts | 6 +- packages/client/src/plugins/dedupe.ts | 4 +- packages/client/src/plugins/index.test.ts | 2 +- packages/client/src/plugins/index.ts | 24 +- .../src/plugins/request-compression.test.ts | 4 +- .../client/src/plugins/request-compression.ts | 4 +- .../src/plugins/response-compression.test.ts | 4 +- .../src/plugins/response-compression.ts | 4 +- .../client/src/plugins/retry-after.test.ts | 6 +- packages/client/src/plugins/retry-after.ts | 6 +- packages/client/src/plugins/retry.test.ts | 10 +- packages/client/src/plugins/retry.ts | 6 +- packages/client/src/plugins/timeout.test.ts | 6 +- packages/client/src/plugins/timeout.ts | 4 +- .../client/src/rpc-json-serializer.test.ts | 6 +- packages/client/src/rpc-serializer.test.ts | 6 +- packages/client/src/rpc-serializer.ts | 8 +- packages/client/src/types.test-d.ts | 4 +- packages/client/src/utils.test-d.ts | 8 +- packages/client/src/utils.test.ts | 4 +- packages/client/src/utils.ts | 6 +- packages/cloudflare/package.json | 2 +- packages/cloudflare/src/index.test.ts | 2 +- packages/cloudflare/src/index.ts | 14 +- packages/cloudflare/src/lock-object.test.ts | 2 +- packages/cloudflare/src/lock.test.ts | 2 +- packages/cloudflare/src/publisher.test.ts | 4 +- packages/cloudflare/src/ratelimit.test.ts | 4 +- packages/cloudflare/src/tracer.test.ts | 2 +- packages/cloudflare/tests/__shared__/main.ts | 4 +- packages/cloudflare/tsconfig.build.json | 9 - packages/contract/package.json | 2 +- .../contract/src/builder-variants.test-d.ts | 8 +- packages/contract/src/builder-variants.ts | 12 +- packages/contract/src/builder.test-d.ts | 16 +- packages/contract/src/builder.test.ts | 16 +- packages/contract/src/builder.ts | 26 +- .../contract/src/client-factory.test-d.ts | 6 +- packages/contract/src/client-factory.test.ts | 4 +- packages/contract/src/client-factory.ts | 8 +- packages/contract/src/error-factory.test-d.ts | 8 +- packages/contract/src/error-factory.test.ts | 6 +- packages/contract/src/error-factory.ts | 8 +- packages/contract/src/error-utils.test-d.ts | 2 +- packages/contract/src/error-utils.test.ts | 4 +- packages/contract/src/error-utils.ts | 2 +- packages/contract/src/error.test-d.ts | 2 +- packages/contract/src/error.test.ts | 2 +- packages/contract/src/error.ts | 2 +- packages/contract/src/index.test.ts | 2 +- packages/contract/src/index.ts | 48 +- packages/contract/src/meta-built-in.test.ts | 4 +- packages/contract/src/meta-built-in.ts | 10 +- packages/contract/src/meta-utils.test.ts | 6 +- packages/contract/src/meta-utils.ts | 6 +- packages/contract/src/meta.test.ts | 4 +- packages/contract/src/meta.ts | 4 +- packages/contract/src/plugins/index.test.ts | 2 +- packages/contract/src/plugins/index.ts | 8 +- .../src/plugins/request-validation.test.ts | 6 +- .../src/plugins/request-validation.ts | 6 +- .../src/plugins/response-validation.test.ts | 14 +- .../src/plugins/response-validation.ts | 8 +- .../contract/src/procedure-client.test-d.ts | 2 +- packages/contract/src/procedure-client.ts | 4 +- packages/contract/src/procedure.test.ts | 2 +- packages/contract/src/procedure.ts | 6 +- packages/contract/src/router-client.test-d.ts | 4 +- packages/contract/src/router-client.ts | 6 +- packages/contract/src/router-utils.test-d.ts | 10 +- packages/contract/src/router-utils.test.ts | 10 +- packages/contract/src/router-utils.ts | 16 +- packages/contract/src/router.test-d.ts | 4 +- packages/contract/src/router.ts | 6 +- packages/contract/src/schema-built-in.test.ts | 4 +- packages/contract/src/schema-built-in.ts | 4 +- packages/contract/src/schema-utils.test.ts | 2 +- packages/contract/src/schema-utils.ts | 2 +- packages/contract/src/schema.test-d.ts | 8 +- packages/effect/package.json | 2 +- packages/effect/src/client.test-d.ts | 6 +- packages/effect/src/client.test.ts | 2 +- packages/effect/src/context.test-d.ts | 2 +- packages/effect/src/converter.test.ts | 4 +- packages/effect/src/error.test-d.ts | 2 +- packages/effect/src/error.test.ts | 2 +- .../effect/src/extensions/effect.test-d.ts | 2 +- packages/effect/src/extensions/effect.test.ts | 4 +- packages/effect/src/extensions/effect.ts | 6 +- .../effect/src/extensions/schema.test-d.ts | 2 +- packages/effect/src/extensions/schema.test.ts | 4 +- packages/effect/src/extensions/schema.ts | 2 +- packages/effect/src/handler.test-d.ts | 4 +- packages/effect/src/handler.test.ts | 6 +- packages/effect/src/handler.ts | 4 +- packages/effect/src/index.test.ts | 2 +- packages/effect/src/index.ts | 12 +- packages/effect/src/middleware.test-d.ts | 4 +- packages/effect/src/middleware.test.ts | 8 +- packages/effect/src/middleware.ts | 4 +- packages/effect/src/runtime.test.ts | 2 +- packages/effect/src/schema.test.ts | 2 +- packages/evlog/package.json | 2 +- packages/evlog/src/adapters/node.test.ts | 2 +- packages/evlog/src/context.test.ts | 2 +- packages/evlog/src/handler-plugin.test.ts | 4 +- packages/evlog/src/handler-plugin.ts | 2 +- packages/evlog/src/index.test.ts | 2 +- packages/evlog/src/index.ts | 4 +- packages/hibernation/package.json | 2 +- packages/hibernation/src/encode-event.test.ts | 2 +- .../hibernation/src/handler-plugin.test.ts | 4 +- packages/hibernation/src/index.test.ts | 2 +- packages/hibernation/src/index.ts | 6 +- packages/json-schema/package.json | 2 +- packages/json-schema/src/coercer.test.ts | 4 +- packages/json-schema/src/coercer.ts | 6 +- .../json-schema/src/composition-utils.test.ts | 6 +- packages/json-schema/src/composition-utils.ts | 10 +- packages/json-schema/src/constants.ts | 2 +- packages/json-schema/src/convert.test.ts | 4 +- packages/json-schema/src/convert.ts | 2 +- packages/json-schema/src/index.test.ts | 2 +- packages/json-schema/src/index.ts | 18 +- packages/json-schema/src/ref-utils.test.ts | 4 +- packages/json-schema/src/ref-utils.ts | 4 +- .../src/smart-coercion-handler-plugin.test.ts | 2 +- .../src/smart-coercion-handler-plugin.ts | 12 +- .../src/smart-coercion-link-plugin.test.ts | 2 +- .../src/smart-coercion-link-plugin.ts | 12 +- .../standard-json-schema-converter.test.ts | 2 +- .../src/standard-json-schema-converter.ts | 4 +- packages/json-schema/src/utils.test.ts | 4 +- packages/json-schema/src/utils.ts | 6 +- packages/lock/package.json | 2 +- packages/lock/src/adapters/base-redis.ts | 4 +- packages/lock/src/adapters/memory.test.ts | 4 +- packages/lock/src/adapters/memory.ts | 4 +- packages/lock/src/adapters/redis.test.ts | 6 +- packages/lock/src/adapters/redis.ts | 4 +- packages/lock/src/adapters/upstash.test.ts | 6 +- packages/lock/src/adapters/upstash.ts | 4 +- packages/lock/src/index.test.ts | 2 +- packages/lock/src/index.ts | 6 +- packages/lock/src/middleware.test-d.ts | 4 +- packages/lock/src/middleware.test.ts | 6 +- packages/lock/src/middleware.ts | 4 +- packages/lock/tests/e2e.test.ts | 6 +- packages/mcp/package.json | 2 +- packages/mcp/src/__tests__/utils.ts | 2 +- packages/mcp/src/index.test.ts | 2 +- packages/mcp/src/index.ts | 4 +- packages/mcp/src/meta.test-d.ts | 2 +- packages/mcp/src/meta.test.ts | 2 +- packages/mcp/src/registrar.test-d.ts | 4 +- packages/mcp/src/registrar.test.ts | 6 +- packages/mcp/src/registrar.ts | 8 +- packages/mcp/src/utils.test.ts | 2 +- packages/msw/package.json | 2 +- .../src/http-procedure-utils.openapi.test.ts | 2 +- .../msw/src/http-procedure-utils.test-d.ts | 2 +- packages/msw/src/http-procedure-utils.test.ts | 2 +- packages/msw/src/http-router-utils.test-d.ts | 6 +- packages/msw/src/http-router-utils.test.ts | 2 +- packages/msw/src/http-router-utils.ts | 4 +- packages/msw/src/index.test.ts | 2 +- packages/msw/src/index.ts | 6 +- packages/nest/package.json | 4 +- packages/nest/src/implement.test-d.ts | 2 +- packages/nest/src/implement.test.ts | 8 +- packages/nest/src/implement.ts | 4 +- packages/nest/src/index.test.ts | 2 +- packages/nest/src/index.ts | 8 +- packages/nest/src/module.test.ts | 4 +- packages/nest/src/module.ts | 7 +- packages/nest/tsconfig.build.json | 9 - packages/next/package.json | 2 +- .../next/src/deferred-interceptors.test.ts | 2 +- .../next/src/extensions/actionable.test-d.ts | 4 +- .../next/src/extensions/actionable.test.ts | 4 +- packages/next/src/extensions/actionable.ts | 4 +- packages/next/src/hooks/index.test.ts | 2 +- packages/next/src/hooks/index.ts | 8 +- .../optimistic-server-function.test-d.ts | 4 +- .../hooks/optimistic-server-function.test.tsx | 4 +- .../src/hooks/optimistic-server-function.ts | 6 +- .../next/src/hooks/server-function.test-d.ts | 4 +- .../next/src/hooks/server-function.test.tsx | 4 +- packages/next/src/hooks/server-function.ts | 2 +- packages/next/src/index.test.ts | 2 +- packages/next/src/index.ts | 12 +- .../next/src/server-form-function.test.ts | 2 +- .../src/server-form-functionable.test-d.ts | 4 +- .../next/src/server-form-functionable.test.ts | 4 +- packages/next/src/server-form-functionable.ts | 4 +- .../src/server-function.action-state.test.tsx | 2 +- packages/next/src/server-function.test-d.ts | 2 +- packages/next/src/server-function.test.ts | 2 +- .../next/src/server-functionable.test-d.ts | 4 +- packages/next/src/server-functionable.test.ts | 4 +- packages/next/src/server-functionable.ts | 4 +- packages/node/package.json | 2 +- ...esponse-compression-handler-plugin.test.ts | 4 +- packages/node/src/index.ts | 6 +- packages/node/src/multipart.test.ts | 4 +- .../src/static-file-handler-plugin.test.ts | 4 +- .../tmp-file-upload-handler-plugin.test.ts | 2 +- .../src/tmp-file-upload-handler-plugin.ts | 24 +- .../node/tests/serves-static-files.test.ts | 2 +- .../node/tests/uploads-large-files.test.ts | 2 +- .../works-with-response-compression.test.ts | 2 +- packages/openapi/package.json | 2 +- .../src/adapters/aws-lambda/index.test.ts | 2 +- .../openapi/src/adapters/aws-lambda/index.ts | 2 +- .../aws-lambda/openapi-handler.test.ts | 4 +- .../adapters/aws-lambda/openapi-handler.ts | 4 +- .../src/adapters/fastify/index.test.ts | 2 +- .../openapi/src/adapters/fastify/index.ts | 2 +- .../adapters/fastify/openapi-handler.test.ts | 4 +- .../src/adapters/fastify/openapi-handler.ts | 4 +- .../openapi/src/adapters/fetch/index.test.ts | 2 +- packages/openapi/src/adapters/fetch/index.ts | 4 +- .../adapters/fetch/openapi-handler.test.ts | 6 +- .../src/adapters/fetch/openapi-handler.ts | 4 +- .../src/adapters/fetch/openapi-link.test.ts | 6 +- .../src/adapters/fetch/openapi-link.ts | 4 +- .../openapi/src/adapters/node/index.test.ts | 2 +- packages/openapi/src/adapters/node/index.ts | 2 +- .../src/adapters/node/openapi-handler.test.ts | 4 +- .../src/adapters/node/openapi-handler.ts | 4 +- .../src/adapters/standard/index.test.ts | 2 +- .../openapi/src/adapters/standard/index.ts | 6 +- .../standard/openapi-handler-codec.test.ts | 4 +- .../standard/openapi-handler-codec.ts | 19 +- .../standard/openapi-link-codec.test.ts | 6 +- .../adapters/standard/openapi-link-codec.ts | 12 +- .../adapters/standard/openapi-matcher.test.ts | 4 +- .../src/adapters/standard/openapi-matcher.ts | 4 +- .../src/adapters/standard/utils.test.ts | 4 +- .../openapi/src/adapters/standard/utils.ts | 2 +- packages/openapi/src/bracket-notation.test.ts | 2 +- packages/openapi/src/client-factory.test-d.ts | 2 +- packages/openapi/src/client-factory.test.ts | 2 +- packages/openapi/src/client-factory.ts | 2 +- packages/openapi/src/constants.test.ts | 2 +- packages/openapi/src/extensions/route.test.ts | 4 +- packages/openapi/src/extensions/route.ts | 4 +- .../openapi/src/helpers/form-data.test.ts | 2 +- packages/openapi/src/helpers/form-data.ts | 2 +- packages/openapi/src/helpers/index.test.ts | 2 +- packages/openapi/src/helpers/index.ts | 2 +- packages/openapi/src/index.test.ts | 2 +- packages/openapi/src/index.ts | 20 +- packages/openapi/src/meta.test.ts | 2 +- packages/openapi/src/meta.ts | 2 +- .../src/openapi-generator-components.test.ts | 4 +- .../src/openapi-generator-components.ts | 2 +- .../src/openapi-generator-operation.test.ts | 12 +- .../src/openapi-generator-operation.ts | 12 +- .../openapi/src/openapi-generator.test-d.ts | 4 +- .../openapi/src/openapi-generator.test.ts | 10 +- packages/openapi/src/openapi-generator.ts | 22 +- .../src/openapi-json-serializer.test-d.ts | 4 +- .../src/openapi-json-serializer.test.ts | 2 +- .../openapi/src/openapi-serializer.test.ts | 2 +- packages/openapi/src/openapi-serializer.ts | 8 +- packages/openapi/src/plugins/index.test.ts | 2 +- packages/openapi/src/plugins/index.ts | 2 +- .../src/plugins/openapi-reference.test.ts | 4 +- .../openapi/src/plugins/openapi-reference.ts | 2 +- packages/openapi/src/router-utils.test.ts | 4 +- packages/openapi/src/router-utils.ts | 2 +- packages/openapi/src/types.test-d.ts | 2 +- packages/openapi/src/utils.test.ts | 2 +- .../composed-schemas.test.ts | 4 +- .../tests/openapi-generator/crud.test.ts | 4 +- .../openapi-generator/detailed-http.test.ts | 4 +- .../openapi-generator/event-streaming.test.ts | 4 +- .../openapi-generator/file-transfer.test.ts | 4 +- .../reusable-components.test.ts | 4 +- .../schema-libraries.test.ts | 4 +- .../openapi-generator/typed-errors.test.ts | 4 +- packages/opentelemetry/package.json | 2 +- packages/opentelemetry/src/index.ts | 4 +- .../opentelemetry/src/instrumentation.test.ts | 4 +- packages/opentelemetry/src/instrumentation.ts | 4 +- .../src/tracer.no-context-manager.test.ts | 2 +- packages/opentelemetry/src/tracer.test.ts | 4 +- packages/pinia-colada/package.json | 2 +- .../pinia-colada/src/contract-utils.test-d.ts | 11 +- .../pinia-colada/src/contract-utils.test.ts | 7 +- packages/pinia-colada/src/contract-utils.ts | 4 +- packages/pinia-colada/src/index.test.ts | 2 +- packages/pinia-colada/src/index.ts | 28 +- packages/pinia-colada/src/key.test.ts | 2 +- packages/pinia-colada/src/key.ts | 4 +- packages/pinia-colada/src/live-query.test.tsx | 4 +- packages/pinia-colada/src/live-query.ts | 4 +- packages/pinia-colada/src/meta.test-d.ts | 4 +- packages/pinia-colada/src/meta.test.ts | 4 +- packages/pinia-colada/src/meta.ts | 8 +- packages/pinia-colada/src/plugin.test.ts | 4 +- packages/pinia-colada/src/plugin.ts | 4 +- .../src/procedure-utils.test-d.ts | 4 +- .../pinia-colada/src/procedure-utils.test.ts | 10 +- packages/pinia-colada/src/procedure-utils.ts | 12 +- .../pinia-colada/src/router-utils.test-d.ts | 8 +- .../pinia-colada/src/router-utils.test.ts | 14 +- packages/pinia-colada/src/router-utils.ts | 12 +- .../pinia-colada/src/shared-utils.test-d.ts | 2 +- .../pinia-colada/src/shared-utils.test.ts | 4 +- packages/pinia-colada/src/shared-utils.ts | 6 +- packages/pinia-colada/src/ssr.test.ts | 6 +- packages/pinia-colada/src/ssr.ts | 6 +- .../pinia-colada/src/stream-query.test.tsx | 4 +- packages/pinia-colada/src/stream-query.ts | 2 +- packages/pinia-colada/src/types.ts | 2 +- .../pinia-colada/tests/__shared__/orpc.ts | 2 +- packages/pinia-colada/tests/e2e.test-d.ts | 2 +- packages/pinia-colada/tests/e2e.test.tsx | 4 +- packages/pinia-colada/tests/ssr.test.tsx | 6 +- packages/pino/package.json | 2 +- packages/pino/src/context.test.ts | 2 +- packages/pino/src/handler-plugin.test.ts | 4 +- packages/pino/src/handler-plugin.ts | 4 +- packages/pino/src/index.test.ts | 2 +- packages/pino/src/index.ts | 4 +- packages/publisher/package.json | 2 +- packages/publisher/src/adapters/base-redis.ts | 4 +- .../publisher/src/adapters/memory.test.ts | 2 +- packages/publisher/src/adapters/memory.ts | 4 +- packages/publisher/src/adapters/redis.test.ts | 4 +- packages/publisher/src/adapters/redis.ts | 4 +- .../publisher/src/adapters/upstash.test.ts | 4 +- packages/publisher/src/adapters/upstash.ts | 4 +- packages/publisher/src/index.test.ts | 2 +- packages/publisher/src/index.ts | 2 +- packages/publisher/src/publisher.test-d.ts | 2 +- packages/publisher/src/publisher.test.ts | 4 +- .../redis-adapters-compatibility.test.ts | 6 +- packages/ratelimit/package.json | 2 +- packages/ratelimit/src/adapters/base-redis.ts | 4 +- .../ratelimit/src/adapters/memory.test.ts | 2 +- packages/ratelimit/src/adapters/memory.ts | 4 +- packages/ratelimit/src/adapters/redis.test.ts | 2 +- packages/ratelimit/src/adapters/redis.ts | 4 +- .../ratelimit/src/adapters/upstash.test.ts | 2 +- packages/ratelimit/src/adapters/upstash.ts | 4 +- packages/ratelimit/src/handler-plugin.test.ts | 5 +- packages/ratelimit/src/handler-plugin.ts | 2 +- packages/ratelimit/src/index.test.ts | 2 +- packages/ratelimit/src/index.ts | 6 +- packages/ratelimit/src/middleware.test-d.ts | 4 +- packages/ratelimit/src/middleware.test.ts | 6 +- packages/ratelimit/src/middleware.ts | 6 +- packages/ratelimit/src/utils.ts | 2 +- packages/ratelimit/tests/e2e.test.ts | 6 +- packages/server/package.json | 2 +- .../server/src/adapters/aws-lambda/handler.ts | 6 +- .../src/adapters/aws-lambda/index.test.ts | 2 +- .../server/src/adapters/aws-lambda/index.ts | 4 +- .../adapters/aws-lambda/rpc-handler.test.ts | 6 +- .../src/adapters/aws-lambda/rpc-handler.ts | 12 +- .../server/src/adapters/crossws/handler.ts | 6 +- .../server/src/adapters/crossws/index.test.ts | 2 +- packages/server/src/adapters/crossws/index.ts | 4 +- .../src/adapters/crossws/rpc-handler.test.ts | 4 +- .../src/adapters/crossws/rpc-handler.ts | 12 +- .../server/src/adapters/fastify/handler.ts | 6 +- .../server/src/adapters/fastify/index.test.ts | 2 +- packages/server/src/adapters/fastify/index.ts | 4 +- .../src/adapters/fastify/rpc-handler.test.ts | 6 +- .../src/adapters/fastify/rpc-handler.ts | 12 +- packages/server/src/adapters/fetch/handler.ts | 6 +- .../server/src/adapters/fetch/index.test.ts | 2 +- packages/server/src/adapters/fetch/index.ts | 6 +- .../src/adapters/fetch/rpc-handler.test.ts | 6 +- .../server/src/adapters/fetch/rpc-handler.ts | 12 +- .../src/adapters/message-port/handler.ts | 6 +- .../src/adapters/message-port/index.test.ts | 2 +- .../server/src/adapters/message-port/index.ts | 4 +- .../adapters/message-port/rpc-handler.test.ts | 4 +- .../src/adapters/message-port/rpc-handler.ts | 12 +- packages/server/src/adapters/node/handler.ts | 6 +- .../server/src/adapters/node/index.test.ts | 2 +- packages/server/src/adapters/node/index.ts | 6 +- .../src/adapters/node/rpc-handler.test.ts | 6 +- .../server/src/adapters/node/rpc-handler.ts | 12 +- .../src/adapters/standard-peer/index.test.ts | 2 +- .../src/adapters/standard-peer/index.ts | 2 +- .../src/adapters/standard-peer/utils.test.ts | 2 +- .../src/adapters/standard-peer/utils.ts | 6 +- .../server/src/adapters/standard/codec.ts | 6 +- .../src/adapters/standard/handler.test.ts | 6 +- .../server/src/adapters/standard/handler.ts | 12 +- .../src/adapters/standard/index.test.ts | 2 +- .../server/src/adapters/standard/index.ts | 12 +- .../src/adapters/standard/plugin.test.ts | 4 +- .../server/src/adapters/standard/plugin.ts | 4 +- .../standard/rpc-handler-codec.test.ts | 6 +- .../adapters/standard/rpc-handler-codec.ts | 14 +- .../src/adapters/standard/rpc-matcher.test.ts | 12 +- .../src/adapters/standard/rpc-matcher.ts | 12 +- .../src/adapters/standard/utils.test.ts | 2 +- .../server/src/adapters/standard/utils.ts | 4 +- .../src/adapters/websocket/handler.test-d.ts | 2 +- .../server/src/adapters/websocket/handler.ts | 6 +- .../src/adapters/websocket/index.test.ts | 2 +- .../server/src/adapters/websocket/index.ts | 4 +- .../adapters/websocket/rpc-handler.test.ts | 4 +- .../src/adapters/websocket/rpc-handler.ts | 12 +- .../server/src/builder-variants.test-d.ts | 16 +- packages/server/src/builder-variants.ts | 18 +- packages/server/src/builder.test-d.ts | 20 +- packages/server/src/builder.test.ts | 12 +- packages/server/src/builder.ts | 22 +- packages/server/src/constants.test.ts | 2 +- packages/server/src/context.test-d.ts | 2 +- .../server/src/extensions/callable.test-d.ts | 2 +- .../server/src/extensions/callable.test.ts | 6 +- packages/server/src/extensions/callable.ts | 10 +- packages/server/src/helpers/base64url.test.ts | 2 +- packages/server/src/helpers/cookie.test.ts | 2 +- .../server/src/helpers/encryption.test.ts | 2 +- packages/server/src/helpers/encryption.ts | 2 +- packages/server/src/helpers/index.test.ts | 2 +- packages/server/src/helpers/index.ts | 8 +- packages/server/src/helpers/signing.test.ts | 4 +- packages/server/src/helpers/signing.ts | 2 +- .../src/implementer-procedure.test-d.ts | 6 +- .../server/src/implementer-procedure.test.ts | 2 +- packages/server/src/implementer-procedure.ts | 10 +- .../server/src/implementer-router.test-d.ts | 16 +- .../server/src/implementer-router.test.ts | 18 +- packages/server/src/implementer-router.ts | 24 +- packages/server/src/implementer.test-d.ts | 4 +- packages/server/src/implementer.test.ts | 6 +- packages/server/src/implementer.ts | 10 +- packages/server/src/index.test.ts | 2 +- packages/server/src/index.ts | 42 +- packages/server/src/lazy.test.ts | 2 +- .../server/src/middleware-decorated.test-d.ts | 6 +- .../server/src/middleware-decorated.test.ts | 2 +- packages/server/src/middleware-decorated.ts | 4 +- packages/server/src/middleware.test-d.ts | 2 +- packages/server/src/middleware.ts | 4 +- packages/server/src/plugins/batch.test.ts | 16 +- packages/server/src/plugins/batch.ts | 4 +- packages/server/src/plugins/cors.test.ts | 6 +- packages/server/src/plugins/cors.ts | 4 +- .../get-method-csrf-protection.test.ts | 10 +- .../src/plugins/get-method-csrf-protection.ts | 4 +- .../server/src/plugins/head-method.test.ts | 12 +- packages/server/src/plugins/head-method.ts | 4 +- packages/server/src/plugins/index.test.ts | 2 +- packages/server/src/plugins/index.ts | 36 +- .../src/plugins/method-override.test.ts | 6 +- .../server/src/plugins/method-override.ts | 4 +- .../src/plugins/request-compression.test.ts | 8 +- .../server/src/plugins/request-compression.ts | 4 +- .../src/plugins/request-headers.test.ts | 8 +- .../server/src/plugins/request-headers.ts | 2 +- .../server/src/plugins/request-limit.test.ts | 10 +- packages/server/src/plugins/request-limit.ts | 4 +- .../src/plugins/response-compression.test.ts | 8 +- .../src/plugins/response-compression.ts | 4 +- .../src/plugins/response-headers.test.ts | 8 +- .../server/src/plugins/response-headers.ts | 2 +- packages/server/src/plugins/rethrow.test.ts | 6 +- packages/server/src/plugins/rethrow.ts | 4 +- .../server/src/plugins/signal-sync.test.ts | 10 +- packages/server/src/plugins/signal-sync.ts | 6 +- packages/server/src/plugins/timeout.test.ts | 8 +- packages/server/src/plugins/timeout.ts | 4 +- .../server/src/procedure-client.test-d.ts | 2 +- packages/server/src/procedure-client.test.ts | 4 +- packages/server/src/procedure-client.ts | 10 +- .../server/src/procedure-decorated.test-d.ts | 6 +- .../server/src/procedure-decorated.test.ts | 6 +- packages/server/src/procedure-decorated.ts | 6 +- packages/server/src/procedure-utils.test-d.ts | 4 +- packages/server/src/procedure-utils.test.ts | 10 +- packages/server/src/procedure-utils.ts | 14 +- packages/server/src/procedure.test.ts | 2 +- packages/server/src/procedure.ts | 4 +- packages/server/src/router-client.test-d.ts | 6 +- packages/server/src/router-client.test.ts | 10 +- packages/server/src/router-client.ts | 16 +- packages/server/src/router-hidden.test.ts | 4 +- packages/server/src/router-hidden.ts | 4 +- packages/server/src/router-utils.test-d.ts | 8 +- packages/server/src/router-utils.test.ts | 8 +- packages/server/src/router-utils.ts | 18 +- packages/server/src/router.test-d.ts | 6 +- packages/server/src/router.ts | 6 +- packages/shared/package.json | 2 +- packages/shared/src/args.test-d.ts | 2 +- packages/shared/src/args.test.ts | 2 +- packages/shared/src/array.test.ts | 2 +- packages/shared/src/bigint.test.ts | 2 +- packages/shared/src/bigint.ts | 2 +- packages/shared/src/buffer.test.ts | 2 +- packages/shared/src/compare.test.ts | 2 +- packages/shared/src/compare.ts | 2 +- packages/shared/src/error.test.ts | 2 +- packages/shared/src/function.test.ts | 2 +- packages/shared/src/http.test.ts | 2 +- packages/shared/src/id.test.ts | 2 +- packages/shared/src/index.test.ts | 2 +- packages/shared/src/index.ts | 48 +- packages/shared/src/interceptor.test-d.ts | 6 +- packages/shared/src/interceptor.test.ts | 4 +- packages/shared/src/interceptor.ts | 8 +- packages/shared/src/iterator.test-d.ts | 4 +- packages/shared/src/iterator.test.ts | 6 +- packages/shared/src/iterator.ts | 10 +- packages/shared/src/object.test.ts | 2 +- packages/shared/src/object.ts | 2 +- packages/shared/src/plugin.test.ts | 4 +- packages/shared/src/promise.test.ts | 2 +- packages/shared/src/proxy.test.ts | 2 +- packages/shared/src/proxy.ts | 4 +- packages/shared/src/queue.test.ts | 2 +- packages/shared/src/regex.test.ts | 2 +- packages/shared/src/regex.ts | 4 +- packages/shared/src/signal.test.ts | 2 +- packages/shared/src/signal.ts | 2 +- packages/shared/src/stream.test.ts | 6 +- packages/shared/src/stream.ts | 12 +- packages/shared/src/tracing.test.ts | 2 +- packages/shared/src/tracing.ts | 2 +- packages/shared/src/types.test-d.ts | 2 +- packages/shared/src/value.test-d.ts | 4 +- packages/shared/src/value.test.ts | 2 +- packages/swr/package.json | 2 +- packages/swr/src/index.test.ts | 2 +- packages/swr/src/index.ts | 16 +- packages/swr/src/key.test.ts | 2 +- packages/swr/src/procedure-utils.test-d.ts | 4 +- packages/swr/src/procedure-utils.test.ts | 6 +- packages/swr/src/procedure-utils.ts | 10 +- packages/swr/src/router-utils.test-d.ts | 8 +- packages/swr/src/router-utils.test.ts | 10 +- packages/swr/src/router-utils.ts | 6 +- packages/swr/src/shared-utils.test-d.ts | 2 +- packages/swr/src/shared-utils.test.ts | 2 +- packages/swr/src/shared-utils.ts | 8 +- packages/swr/src/types.ts | 2 +- packages/swr/src/utils.test.ts | 2 +- packages/swr/tests/__shared__/orpc.ts | 2 +- packages/swr/tests/e2e.test-d.ts | 2 +- packages/swr/tests/e2e.test.tsx | 2 +- packages/tanstack-query/package.json | 2 +- .../src/contract-utils.test-d.ts | 11 +- .../tanstack-query/src/contract-utils.test.ts | 7 +- packages/tanstack-query/src/contract-utils.ts | 4 +- packages/tanstack-query/src/index.test.ts | 2 +- packages/tanstack-query/src/index.ts | 28 +- packages/tanstack-query/src/key.test.ts | 2 +- packages/tanstack-query/src/key.ts | 4 +- .../tanstack-query/src/live-query.test.ts | 2 +- packages/tanstack-query/src/live-query.ts | 2 +- packages/tanstack-query/src/meta.test-d.ts | 4 +- packages/tanstack-query/src/meta.test.ts | 4 +- packages/tanstack-query/src/meta.ts | 8 +- packages/tanstack-query/src/plugin.test.ts | 4 +- packages/tanstack-query/src/plugin.ts | 4 +- .../src/procedure-utils.angular.test-d.ts | 2 +- .../src/procedure-utils.react.test-d.ts | 2 +- .../src/procedure-utils.solid.test-d.ts | 2 +- .../src/procedure-utils.svelte.test-d.ts | 2 +- .../src/procedure-utils.test-d.ts | 4 +- .../src/procedure-utils.test.ts | 10 +- .../tanstack-query/src/procedure-utils.ts | 14 +- .../src/procedure-utils.vue.test-d.ts | 2 +- .../tanstack-query/src/router-utils.test-d.ts | 8 +- .../tanstack-query/src/router-utils.test.ts | 14 +- packages/tanstack-query/src/router-utils.ts | 12 +- .../tanstack-query/src/shared-utils.test-d.ts | 2 +- .../tanstack-query/src/shared-utils.test.ts | 4 +- packages/tanstack-query/src/shared-utils.ts | 6 +- packages/tanstack-query/src/ssr.test-d.ts | 4 +- packages/tanstack-query/src/ssr.test.ts | 6 +- packages/tanstack-query/src/ssr.ts | 6 +- .../tanstack-query/src/stream-query.test.ts | 4 +- .../src/structural-sharing.test.ts | 2 +- packages/tanstack-query/src/types.ts | 2 +- .../tanstack-query/tests/__shared__/orpc.tsx | 2 +- packages/tanstack-query/tests/e2e.test-d.ts | 2 +- packages/tanstack-query/tests/e2e.test.tsx | 2 +- packages/trpc/package.json | 2 +- packages/trpc/src/index.ts | 4 +- packages/trpc/src/to-orpc-router.test-d.ts | 2 +- packages/trpc/src/to-orpc-router.test.ts | 2 +- packages/trpc/src/to-trpc-meta.test.ts | 4 +- packages/valibot/package.json | 2 +- packages/valibot/src/converter.test.ts | 2 +- packages/valibot/src/index.test.ts | 2 +- packages/valibot/src/index.ts | 2 +- packages/zod/package.json | 2 +- packages/zod/src/converter.test.ts | 4 +- packages/zod/src/converter.ts | 2 +- packages/zod/src/index.test.ts | 2 +- packages/zod/src/index.ts | 4 +- packages/zod/src/registries.test-d.ts | 2 +- pnpm-lock.yaml | 830 +++++++++++++----- .../client-server.compression-hono-fetch.ts | 4 +- .../client-server.compression-node-http.ts | 4 +- .../__shared__/client-server.hono-fetch.ts | 4 +- .../__shared__/client-server.node-http.ts | 4 +- tests/batch/__shared__/client-server.ts | 2 +- tests/batch/batch-plugin.test.ts | 8 +- .../__shared__/client-server.hono-fetch.ts | 4 +- .../__shared__/client-server.node-http.ts | 4 +- tests/openapi/cancel-and-abort.test.ts | 4 +- tests/openapi/data-transfer.test.ts | 6 +- .../client-server.compression-crossws.ts | 4 +- .../client-server.compression-hono-fetch.ts | 4 +- ...erver.compression-message-port-transfer.ts | 4 +- .../client-server.compression-message-port.ts | 4 +- .../client-server.compression-node-http.ts | 4 +- .../client-server.compression-node-ws.ts | 4 +- tests/rpc/__shared__/client-server.crossws.ts | 4 +- .../__shared__/client-server.hono-fetch.ts | 4 +- .../client-server.message-port-transfer.ts | 4 +- .../__shared__/client-server.message-port.ts | 4 +- .../rpc/__shared__/client-server.node-http.ts | 4 +- tests/rpc/__shared__/client-server.node-ws.ts | 4 +- tests/rpc/cancel-and-abort.test.ts | 24 +- tests/rpc/data-transfer.test.ts | 28 +- tsconfig.json | 4 +- tsconfig.lib.json | 6 +- tsdown.config.ts | 123 +++ 723 files changed, 2605 insertions(+), 2105 deletions(-) delete mode 100644 packages/bun/tsconfig.build.json delete mode 100644 packages/cloudflare/tsconfig.build.json delete mode 100644 packages/nest/tsconfig.build.json create mode 100644 tsdown.config.ts diff --git a/.github/workflows/codspeed.yaml b/.github/workflows/codspeed.yaml index c7f89e7204..e6b4dcda5d 100644 --- a/.github/workflows/codspeed.yaml +++ b/.github/workflows/codspeed.yaml @@ -24,7 +24,7 @@ jobs: - run: pnpm i - - uses: CodSpeedHQ/action@v4 + - uses: CodSpeedHQ/action@v5 with: mode: simulation run: pnpm run bench diff --git a/apps/content/blume.config.ts b/apps/content/blume.config.ts index ab0d32ba6e..0280a0bdcd 100644 --- a/apps/content/blume.config.ts +++ b/apps/content/blume.config.ts @@ -5,9 +5,9 @@ import { posthog } from 'blume/analytics' import { cloudflare } from 'blume/deploy' import { filesystem } from 'blume/sources' -import { serverSourcemapsPlugin } from './dev/server-sourcemaps.ts' -import { searchCodeIndexPlugin } from './search/code-index.ts' -import { sponsorAdsInjectPlugin } from './sponsors/inject.ts' +import { serverSourcemapsPlugin } from './dev/server-sourcemaps' +import { searchCodeIndexPlugin } from './search/code-index' +import { sponsorAdsInjectPlugin } from './sponsors/inject' export default defineConfig({ title: 'oRPC', diff --git a/apps/content/sponsors/ads.ts b/apps/content/sponsors/ads.ts index 12491857f5..2864d9c5e7 100644 --- a/apps/content/sponsors/ads.ts +++ b/apps/content/sponsors/ads.ts @@ -10,7 +10,7 @@ * the sponsor wall's data has no business in the browser bundle — slots.ts * carries only the handful of sponsors that bought a position. */ -import slots from './slots.ts' +import slots from './slots' export interface AdSponsor { name: string diff --git a/apps/content/sponsors/client.ts b/apps/content/sponsors/client.ts index 936e416487..596ed6f383 100644 --- a/apps/content/sponsors/client.ts +++ b/apps/content/sponsors/client.ts @@ -1,5 +1,5 @@ -import type { AdSponsor } from './ads.ts' -import { relAttribute, soldSponsors, tintStyle } from './ads.ts' +import type { AdSponsor } from './ads' +import { relAttribute, soldSponsors, tintStyle } from './ads' // Only the inline slots rotate. The grid is static and carries no // [data-sponsor-slot], so nothing here touches it. diff --git a/apps/content/sponsors/data.ts b/apps/content/sponsors/data.ts index fb543ddcea..7827072d85 100644 --- a/apps/content/sponsors/data.ts +++ b/apps/content/sponsors/data.ts @@ -1,6 +1,6 @@ // The GitHub Sponsors wall behind the landing page and the /sponsors table. // Paid ad slots are a separate concern and live in ads.ts. -import sponsors from './sponsors.ts' +import sponsors from './sponsors' export const GITHUB_SPONSORS_URL = 'https://github.com/sponsors/dinwwwh' export const OPEN_COLLECTIVE_URL = 'https://opencollective.com/middleapi' diff --git a/apps/content/tsconfig.json b/apps/content/tsconfig.json index a4a14cfabb..4c79b8b098 100644 --- a/apps/content/tsconfig.json +++ b/apps/content/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.json", "compilerOptions": { "lib": ["ES2023", "DOM", "DOM.Iterable"], - "module": "preserve", "types": ["node"] }, "include": [ diff --git a/benches/openapi-link-handler.bench.ts b/benches/openapi-link-handler.bench.ts index 60a98f0d5b..7f25932353 100644 --- a/benches/openapi-link-handler.bench.ts +++ b/benches/openapi-link-handler.bench.ts @@ -13,7 +13,7 @@ import { EVENTS_10KB, handlers, PAYLOAD_10KB, -} from './__shared__/payloads.ts' +} from './__shared__/payloads' const serializer = new OpenAPISerializer({ handlers }) diff --git a/benches/openapi-serializer.bench.ts b/benches/openapi-serializer.bench.ts index ca9467f8f0..0d379879aa 100644 --- a/benches/openapi-serializer.bench.ts +++ b/benches/openapi-serializer.bench.ts @@ -7,7 +7,7 @@ import { PAYLOAD_5MB, PAYLOAD_5MB_WITH_FILES, PAYLOAD_100KB, -} from './__shared__/payloads.ts' +} from './__shared__/payloads' const serializer = new OpenAPISerializer({ handlers }) diff --git a/benches/rpc-link-handler.bench.ts b/benches/rpc-link-handler.bench.ts index 129f0d1b62..566eb33869 100644 --- a/benches/rpc-link-handler.bench.ts +++ b/benches/rpc-link-handler.bench.ts @@ -11,7 +11,7 @@ import { EVENTS_10KB, handlers, PAYLOAD_10KB, -} from './__shared__/payloads.ts' +} from './__shared__/payloads' const serializer = new RPCSerializer({ handlers }) diff --git a/benches/rpc-serializer.bench.ts b/benches/rpc-serializer.bench.ts index d15bad65a6..d12ad4b6b0 100644 --- a/benches/rpc-serializer.bench.ts +++ b/benches/rpc-serializer.bench.ts @@ -7,7 +7,7 @@ import { PAYLOAD_5MB, PAYLOAD_5MB_WITH_FILES, PAYLOAD_100KB, -} from './__shared__/payloads.ts' +} from './__shared__/payloads' const serializer = new RPCSerializer({ handlers }) diff --git a/benches/static-file-handler.bench.ts b/benches/static-file-handler.bench.ts index 5d74498469..19cb2b844c 100644 --- a/benches/static-file-handler.bench.ts +++ b/benches/static-file-handler.bench.ts @@ -8,7 +8,7 @@ import { RPCHandlerCodec, StandardHandler } from '@orpc/server/standard' import type { StandardLazyRequest } from '@standard-server/core' import { bench } from 'vitest' -import { drainBody } from './__shared__/payloads.ts' +import { drainBody } from './__shared__/payloads' const rootDir = mkdtempSync(path.join(tmpdir(), 'orpc-static-file-bench-')) diff --git a/package.json b/package.json index c6f07c9bc6..fa2fcae104 100644 --- a/package.json +++ b/package.json @@ -59,14 +59,15 @@ "crossws": "^0.4.17", "github-slugger": "^2.0.0", "jsdom": "^29.1.1", - "oxfmt": "^0.76.0", - "oxlint": "^1.91.0", - "oxlint-tsgolint": "^7.0.2005", + "oxfmt": "^0.77.0", + "oxlint": "^1.92.0", + "oxlint-tsgolint": "^7.0.2006", "pino": "^10.4.0", "pkg-pr-new": "^0.0.93", "react": "^19.3.1", "sherif": "^1.13.0", "supertest": "^7.3.1", + "tsdown": "^0.23.7", "typescript": "^7.0.2", "typescript-6": "npm:typescript@^6.0.3", "valibot": "^1.5.0", diff --git a/packages/ai-sdk/package.json b/packages/ai-sdk/package.json index 65675afc90..01556c001a 100644 --- a/packages/ai-sdk/package.json +++ b/packages/ai-sdk/package.json @@ -43,7 +43,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/client": "workspace:*", diff --git a/packages/ai-sdk/src/index.test.ts b/packages/ai-sdk/src/index.test.ts index 64ecc8f18f..d6d1bc8789 100644 --- a/packages/ai-sdk/src/index.test.ts +++ b/packages/ai-sdk/src/index.test.ts @@ -1,3 +1,3 @@ it('exports createToolFactory', async () => { - expect(Object.keys(await import('./index.ts'))).toContain('createToolFactory') + expect(Object.keys(await import('./index'))).toContain('createToolFactory') }) diff --git a/packages/ai-sdk/src/index.ts b/packages/ai-sdk/src/index.ts index 83b12b4429..3ea9187bd9 100644 --- a/packages/ai-sdk/src/index.ts +++ b/packages/ai-sdk/src/index.ts @@ -1,2 +1,2 @@ -export * from './tool.ts' -export * from './tool-meta.ts' +export * from './tool' +export * from './tool-meta' diff --git a/packages/ai-sdk/src/tool-meta.test-d.ts b/packages/ai-sdk/src/tool-meta.test-d.ts index 14556e5581..87eda4727c 100644 --- a/packages/ai-sdk/src/tool-meta.test-d.ts +++ b/packages/ai-sdk/src/tool-meta.test-d.ts @@ -2,7 +2,7 @@ import { asyncIteratorObject, oc } from '@orpc/contract' import { os } from '@orpc/server' import { z } from 'zod' -import { aiSdkTool } from './tool-meta.ts' +import { aiSdkTool } from './tool-meta' describe('aiSdkTool meta', () => { it('infer input and output types from the contract', () => { diff --git a/packages/ai-sdk/src/tool-meta.test.ts b/packages/ai-sdk/src/tool-meta.test.ts index b6f7b0640d..6b186cb25c 100644 --- a/packages/ai-sdk/src/tool-meta.test.ts +++ b/packages/ai-sdk/src/tool-meta.test.ts @@ -1,6 +1,6 @@ import { oc } from '@orpc/contract' -import { aiSdkTool, getAiSdkToolMeta } from './tool-meta.ts' +import { aiSdkTool, getAiSdkToolMeta } from './tool-meta' describe('aiSdkTool meta', () => { it('returns a plugin with name ~ai-sdk/tool', () => { diff --git a/packages/ai-sdk/src/tool-meta.ts b/packages/ai-sdk/src/tool-meta.ts index a159e70f62..a43d044778 100644 --- a/packages/ai-sdk/src/tool-meta.ts +++ b/packages/ai-sdk/src/tool-meta.ts @@ -9,7 +9,7 @@ import type { import type { Lazy } from '@orpc/server' import type { JSONValue, Tool } from 'ai' -import type { ToolOutput } from './tool.ts' +import type { ToolOutput } from './tool' /** * The [function tool](https://ai-sdk.dev/docs/foundations/tools) member of the AI SDK `Tool` union, diff --git a/packages/ai-sdk/src/tool.test-d.ts b/packages/ai-sdk/src/tool.test-d.ts index cdb553bf92..81851afe92 100644 --- a/packages/ai-sdk/src/tool.test-d.ts +++ b/packages/ai-sdk/src/tool.test-d.ts @@ -4,7 +4,7 @@ import type { InferToolInput, InferToolOutput } from 'ai' import { generateText } from 'ai' import { z } from 'zod' -import { createToolFactory, implementToolFactory } from './tool.ts' +import { createToolFactory, implementToolFactory } from './tool' describe('implementToolFactory', () => { it('can use as a tool', () => { diff --git a/packages/ai-sdk/src/tool.test.ts b/packages/ai-sdk/src/tool.test.ts index 2d8f9060f8..1d3c11a699 100644 --- a/packages/ai-sdk/src/tool.test.ts +++ b/packages/ai-sdk/src/tool.test.ts @@ -5,8 +5,8 @@ import { generateText } from 'ai' import { MockLanguageModelV4 } from 'ai/test' import * as z from 'zod' -import { aiSdkTool } from './tool-meta.ts' -import { createToolFactory, implementToolFactory } from './tool.ts' +import { createToolFactory, implementToolFactory } from './tool' +import { aiSdkTool } from './tool-meta' function toolCallModel(toolName: string, args: unknown) { return new MockLanguageModelV4({ diff --git a/packages/ai-sdk/src/tool.ts b/packages/ai-sdk/src/tool.ts index b746b23e75..e132489bfe 100644 --- a/packages/ai-sdk/src/tool.ts +++ b/packages/ai-sdk/src/tool.ts @@ -26,8 +26,8 @@ import { import type { FlexibleSchema, JSONValue, Tool, ToolResultPart } from 'ai' import { tool } from 'ai' -import type { FunctionTool } from './tool-meta.ts' -import { getAiSdkToolMeta } from './tool-meta.ts' +import type { FunctionTool } from './tool-meta' +import { getAiSdkToolMeta } from './tool-meta' const ANY_SCHEMA: FlexibleSchema = { '~standard': { diff --git a/packages/arktype/package.json b/packages/arktype/package.json index 8f577405dc..283100a0a4 100644 --- a/packages/arktype/package.json +++ b/packages/arktype/package.json @@ -42,7 +42,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/json-schema": "workspace:*" diff --git a/packages/arktype/src/converter.test.ts b/packages/arktype/src/converter.test.ts index c1c1144c0f..dee6a9aef5 100644 --- a/packages/arktype/src/converter.test.ts +++ b/packages/arktype/src/converter.test.ts @@ -1,7 +1,7 @@ import { type } from 'arktype' import * as z from 'zod' -import { ArkTypeToJsonSchemaConverter } from './converter.ts' +import { ArkTypeToJsonSchemaConverter } from './converter' describe('arkTypeToJsonSchemaConverter', () => { const converter = new ArkTypeToJsonSchemaConverter() diff --git a/packages/arktype/src/index.test.ts b/packages/arktype/src/index.test.ts index f598bec340..ce45c67e6c 100644 --- a/packages/arktype/src/index.test.ts +++ b/packages/arktype/src/index.test.ts @@ -1,5 +1,5 @@ it('exports ArkTypeToJsonSchemaConverter', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ ArkTypeToJsonSchemaConverter: expect.any(Function), }) }) diff --git a/packages/arktype/src/index.ts b/packages/arktype/src/index.ts index 60fa772e72..b235d80052 100644 --- a/packages/arktype/src/index.ts +++ b/packages/arktype/src/index.ts @@ -1,3 +1,3 @@ -export * from './converter.ts' +export * from './converter' export type { JsonSchema } from '@orpc/json-schema' diff --git a/packages/bun/package.json b/packages/bun/package.json index e068b7b51a..a94717b9b3 100644 --- a/packages/bun/package.json +++ b/packages/bun/package.json @@ -42,7 +42,7 @@ } }, "scripts": { - "prepack": "tsc -p tsconfig.build.json", + "prepack": "tsdown", "test": "bun --env-file=../../.env test", "test:coverage": "bun --env-file=../../.env test --coverage" }, diff --git a/packages/bun/src/index.test.ts b/packages/bun/src/index.test.ts index 7db937bffb..128424dc7f 100644 --- a/packages/bun/src/index.test.ts +++ b/packages/bun/src/index.test.ts @@ -1,7 +1,7 @@ import { expect, it } from 'bun:test' it('exports BunRedisRateLimiter, BunRedisPublisher, experimental_BunRedisLocker', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ BunRedisRateLimiter: expect.any(Function), BunRedisPublisher: expect.any(Function), experimental_BunRedisLocker: expect.any(Function), diff --git a/packages/bun/src/index.ts b/packages/bun/src/index.ts index 5ccb961a64..0479105699 100644 --- a/packages/bun/src/index.ts +++ b/packages/bun/src/index.ts @@ -1,3 +1,3 @@ -export * from './redis-lock.ts' -export * from './redis-publisher.ts' -export * from './redis-ratelimit.ts' +export * from './redis-lock' +export * from './redis-publisher' +export * from './redis-ratelimit' diff --git a/packages/bun/src/redis-lock.test.ts b/packages/bun/src/redis-lock.test.ts index b913d32d06..31bf5c74aa 100644 --- a/packages/bun/src/redis-lock.test.ts +++ b/packages/bun/src/redis-lock.test.ts @@ -5,7 +5,7 @@ import { LockTimeoutError } from '@orpc/experimental-lock' import { promiseWithResolvers, sleep } from '@orpc/shared' import { RedisClient } from 'bun' -import { experimental_BunRedisLocker as BunRedisLocker } from './redis-lock.ts' +import { experimental_BunRedisLocker as BunRedisLocker } from './redis-lock' const REDIS_URL = Bun.env.REDIS_URL diff --git a/packages/bun/src/redis-publisher.test.ts b/packages/bun/src/redis-publisher.test.ts index 444adc2aae..33276a7cd5 100644 --- a/packages/bun/src/redis-publisher.test.ts +++ b/packages/bun/src/redis-publisher.test.ts @@ -5,9 +5,9 @@ import { getOrBind, promiseWithResolvers, sleep } from '@orpc/shared' import { getEventMeta, withEventMeta } from '@standard-server/core' import { RedisClient } from 'bun' -import { waitFor } from '../tests/__shared__/utils.ts' -import type { BunRedisPublisherOptions } from './redis-publisher.ts' -import { BunRedisPublisher } from './redis-publisher.ts' +import { waitFor } from '../tests/__shared__/utils' +import type { BunRedisPublisherOptions } from './redis-publisher' +import { BunRedisPublisher } from './redis-publisher' const REDIS_URL = process.env.REDIS_URL diff --git a/packages/bun/src/redis-ratelimit.test.ts b/packages/bun/src/redis-ratelimit.test.ts index 91c8f33ac9..0cef4f5704 100644 --- a/packages/bun/src/redis-ratelimit.test.ts +++ b/packages/bun/src/redis-ratelimit.test.ts @@ -3,7 +3,7 @@ import { afterAll, beforeAll, describe, expect, it } from 'bun:test' import { sleep } from '@orpc/shared' import { RedisClient } from 'bun' -import { BunRedisRateLimiter } from './redis-ratelimit.ts' +import { BunRedisRateLimiter } from './redis-ratelimit' const REDIS_URL = Bun.env.REDIS_URL diff --git a/packages/bun/tests/lock-redis-adapters-compatibility.test.ts b/packages/bun/tests/lock-redis-adapters-compatibility.test.ts index 59950fbcd4..c4ee47998c 100644 --- a/packages/bun/tests/lock-redis-adapters-compatibility.test.ts +++ b/packages/bun/tests/lock-redis-adapters-compatibility.test.ts @@ -6,7 +6,7 @@ import { promiseWithResolvers } from '@orpc/shared' import { RedisClient } from 'bun' import { createClient } from 'redis' -import { experimental_BunRedisLocker as BunRedisLocker } from '../src/index.ts' +import { experimental_BunRedisLocker as BunRedisLocker } from '../src/index' const REDIS_URL = Bun.env.REDIS_URL diff --git a/packages/bun/tests/publisher-redis-adapters-compatibility.test.ts b/packages/bun/tests/publisher-redis-adapters-compatibility.test.ts index 4d2839b889..2da7dc10e8 100644 --- a/packages/bun/tests/publisher-redis-adapters-compatibility.test.ts +++ b/packages/bun/tests/publisher-redis-adapters-compatibility.test.ts @@ -6,8 +6,8 @@ import { getEventMeta, withEventMeta } from '@standard-server/core' import { RedisClient } from 'bun' import { createClient } from 'redis' -import { BunRedisPublisher } from '../src/redis-publisher.ts' -import { waitFor } from './__shared__/utils.ts' +import { BunRedisPublisher } from '../src/redis-publisher' +import { waitFor } from './__shared__/utils' const REDIS_URL = process.env.REDIS_URL diff --git a/packages/bun/tests/ratelimit-redis-adapters-compatibility.test.ts b/packages/bun/tests/ratelimit-redis-adapters-compatibility.test.ts index 7ca9c423c2..270f69ff32 100644 --- a/packages/bun/tests/ratelimit-redis-adapters-compatibility.test.ts +++ b/packages/bun/tests/ratelimit-redis-adapters-compatibility.test.ts @@ -5,7 +5,7 @@ import { RedisRateLimiter } from '@orpc/ratelimit/redis' import { RedisClient } from 'bun' import { createClient } from 'redis' -import { BunRedisRateLimiter } from '../src/index.ts' +import { BunRedisRateLimiter } from '../src/index' const REDIS_URL = Bun.env.REDIS_URL diff --git a/packages/bun/tests/rpc/__shared__/client-server.bun-fetch.ts b/packages/bun/tests/rpc/__shared__/client-server.bun-fetch.ts index b404b8bca2..d8c7f4c843 100644 --- a/packages/bun/tests/rpc/__shared__/client-server.bun-fetch.ts +++ b/packages/bun/tests/rpc/__shared__/client-server.bun-fetch.ts @@ -4,8 +4,8 @@ import { createORPCClient } from '@orpc/client' import { RPCLink } from '@orpc/client/fetch' import { RPCHandler } from '@orpc/server/fetch' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createBunFetchClientServerTest: CreateClientServerTest = ( router, diff --git a/packages/bun/tests/rpc/__shared__/client-server.bun-websocket.ts b/packages/bun/tests/rpc/__shared__/client-server.bun-websocket.ts index ce687e355b..e59f91291a 100644 --- a/packages/bun/tests/rpc/__shared__/client-server.bun-websocket.ts +++ b/packages/bun/tests/rpc/__shared__/client-server.bun-websocket.ts @@ -4,8 +4,8 @@ import { createORPCClient } from '@orpc/client' import { RPCLink } from '@orpc/client/websocket' import { RPCHandler } from '@orpc/server/websocket' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createBunWebSocketClientServerTest: CreateClientServerTest = ( router, diff --git a/packages/bun/tests/rpc/__shared__/client-server.compression-bun-fetch.ts b/packages/bun/tests/rpc/__shared__/client-server.compression-bun-fetch.ts index 467ad889ed..8d8147d34b 100644 --- a/packages/bun/tests/rpc/__shared__/client-server.compression-bun-fetch.ts +++ b/packages/bun/tests/rpc/__shared__/client-server.compression-bun-fetch.ts @@ -9,8 +9,8 @@ import { ResponseCompressionHandlerPlugin, } from '@orpc/server/plugins' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createCompressionBunFetchClientServerTest: CreateClientServerTest = ( router, diff --git a/packages/bun/tests/rpc/__shared__/client-server.compression-bun-websocket.ts b/packages/bun/tests/rpc/__shared__/client-server.compression-bun-websocket.ts index e6e9158497..d80e2b7f73 100644 --- a/packages/bun/tests/rpc/__shared__/client-server.compression-bun-websocket.ts +++ b/packages/bun/tests/rpc/__shared__/client-server.compression-bun-websocket.ts @@ -9,8 +9,8 @@ import { } from '@orpc/server/plugins' import { RPCHandler } from '@orpc/server/websocket' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createCompressionBunWebSocketClientServerTest: CreateClientServerTest = ( router, diff --git a/packages/bun/tests/rpc/cancel-and-abort.test.ts b/packages/bun/tests/rpc/cancel-and-abort.test.ts index 378df4f4de..ec2ec11ff2 100644 --- a/packages/bun/tests/rpc/cancel-and-abort.test.ts +++ b/packages/bun/tests/rpc/cancel-and-abort.test.ts @@ -4,10 +4,10 @@ import { AsyncIteratorClass, os } from '@orpc/server' import { sleep } from 'bun' import { z } from 'zod' -import { createBunFetchClientServerTest } from './__shared__/client-server.bun-fetch.ts' -import { createBunWebSocketClientServerTest } from './__shared__/client-server.bun-websocket.ts' -import { createCompressionBunFetchClientServerTest } from './__shared__/client-server.compression-bun-fetch.ts' -import { createCompressionBunWebSocketClientServerTest } from './__shared__/client-server.compression-bun-websocket.ts' +import { createBunFetchClientServerTest } from './__shared__/client-server.bun-fetch' +import { createBunWebSocketClientServerTest } from './__shared__/client-server.bun-websocket' +import { createCompressionBunFetchClientServerTest } from './__shared__/client-server.compression-bun-fetch' +import { createCompressionBunWebSocketClientServerTest } from './__shared__/client-server.compression-bun-websocket' describe.each([ ['bun-fetch', createBunFetchClientServerTest], diff --git a/packages/bun/tests/rpc/data-transfer.test.ts b/packages/bun/tests/rpc/data-transfer.test.ts index 4de9b1d87f..8121b239c6 100644 --- a/packages/bun/tests/rpc/data-transfer.test.ts +++ b/packages/bun/tests/rpc/data-transfer.test.ts @@ -4,12 +4,12 @@ import { os } from '@orpc/server' import { promiseWithResolvers } from '@orpc/shared' import { z } from 'zod' -import { builtInRPCSupportDataTypes } from './__shared__/built-in-support-data-types.ts' -import { createBunFetchClientServerTest } from './__shared__/client-server.bun-fetch.ts' -import { createBunWebSocketClientServerTest } from './__shared__/client-server.bun-websocket.ts' -import { createCompressionBunFetchClientServerTest } from './__shared__/client-server.compression-bun-fetch.ts' -import { createCompressionBunWebSocketClientServerTest } from './__shared__/client-server.compression-bun-websocket.ts' -import { Person } from './__shared__/client-server.ts' +import { builtInRPCSupportDataTypes } from './__shared__/built-in-support-data-types' +import { Person } from './__shared__/client-server' +import { createBunFetchClientServerTest } from './__shared__/client-server.bun-fetch' +import { createBunWebSocketClientServerTest } from './__shared__/client-server.bun-websocket' +import { createCompressionBunFetchClientServerTest } from './__shared__/client-server.compression-bun-fetch' +import { createCompressionBunWebSocketClientServerTest } from './__shared__/client-server.compression-bun-websocket' describe.each([ ['bun-fetch', createBunFetchClientServerTest], diff --git a/packages/bun/tsconfig.build.json b/packages/bun/tsconfig.build.json deleted file mode 100644 index e852723d91..0000000000 --- a/packages/bun/tsconfig.build.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../tsconfig.lib.json", - "compilerOptions": { - "types": ["bun"] - } -} diff --git a/packages/client/package.json b/packages/client/package.json index d6dc3973ad..1624146d2b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -74,7 +74,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/shared": "workspace:*", diff --git a/packages/client/src/adapters/fetch/index.test.ts b/packages/client/src/adapters/fetch/index.test.ts index 27067b6ced..f7f5fafcdb 100644 --- a/packages/client/src/adapters/fetch/index.test.ts +++ b/packages/client/src/adapters/fetch/index.test.ts @@ -1,3 +1,3 @@ it('exports RPCLink', async () => { - await expect(import('./index.ts')).resolves.toHaveProperty('RPCLink') + await expect(import('./index')).resolves.toHaveProperty('RPCLink') }) diff --git a/packages/client/src/adapters/fetch/index.ts b/packages/client/src/adapters/fetch/index.ts index 478aa2ad4b..9a7dc93c19 100644 --- a/packages/client/src/adapters/fetch/index.ts +++ b/packages/client/src/adapters/fetch/index.ts @@ -1,2 +1,2 @@ -export * from './rpc-link.ts' -export * from './transport.ts' +export * from './rpc-link' +export * from './transport' diff --git a/packages/client/src/adapters/fetch/rpc-link.test-d.ts b/packages/client/src/adapters/fetch/rpc-link.test-d.ts index 267dc02113..2feffa252d 100644 --- a/packages/client/src/adapters/fetch/rpc-link.test-d.ts +++ b/packages/client/src/adapters/fetch/rpc-link.test-d.ts @@ -1,4 +1,4 @@ -import { RPCLink } from './rpc-link.ts' +import { RPCLink } from './rpc-link' describe('RPCLink', () => { it('accepts QUERY only for body-bearing request methods', () => { diff --git a/packages/client/src/adapters/fetch/rpc-link.test.ts b/packages/client/src/adapters/fetch/rpc-link.test.ts index e030e6593e..138ac881f5 100644 --- a/packages/client/src/adapters/fetch/rpc-link.test.ts +++ b/packages/client/src/adapters/fetch/rpc-link.test.ts @@ -1,7 +1,7 @@ import { toFetchBody } from '@standard-server/fetch' -import { createORPCClient } from '../../client.ts' -import { RPCLink } from './rpc-link.ts' +import { createORPCClient } from '../../client' +import { RPCLink } from './rpc-link' vi.mock('@orpc/shared', async (loadOrigin) => { const origin = (await loadOrigin()) as any diff --git a/packages/client/src/adapters/fetch/rpc-link.ts b/packages/client/src/adapters/fetch/rpc-link.ts index 0f7785cfc1..b3112c78b7 100644 --- a/packages/client/src/adapters/fetch/rpc-link.ts +++ b/packages/client/src/adapters/fetch/rpc-link.ts @@ -1,8 +1,8 @@ -import type { ClientContext } from '../../types.ts' -import type { RPCLinkCodecOptions, StandardLinkOptions } from '../standard/index.ts' -import { RPCLinkCodec, StandardLink } from '../standard/index.ts' -import type { FetchLinkTransportOptions } from './transport.ts' -import { FetchLinkTransport } from './transport.ts' +import type { ClientContext } from '../../types' +import type { RPCLinkCodecOptions, StandardLinkOptions } from '../standard/index' +import { RPCLinkCodec, StandardLink } from '../standard/index' +import type { FetchLinkTransportOptions } from './transport' +import { FetchLinkTransport } from './transport' export interface RPCLinkOptions extends StandardLinkOptions, FetchLinkTransportOptions, RPCLinkCodecOptions {} diff --git a/packages/client/src/adapters/fetch/transport.ts b/packages/client/src/adapters/fetch/transport.ts index 5526e54c6f..26344bc1af 100644 --- a/packages/client/src/adapters/fetch/transport.ts +++ b/packages/client/src/adapters/fetch/transport.ts @@ -4,8 +4,8 @@ import type { StandardLazyResponse, StandardRequest } from '@standard-server/cor import type { ToFetchBodyOptions } from '@standard-server/fetch' import { toFetchBody, toFetchHeaders, toStandardLazyResponse } from '@standard-server/fetch' -import type { ClientContext, ClientOptions } from '../../types.ts' -import type { StandardLinkTransport } from '../standard/index.ts' +import type { ClientContext, ClientOptions } from '../../types' +import type { StandardLinkTransport } from '../standard/index' const GET_SUPPORTED_DUPLEX_MODE = /* @__PURE__ */ once(() => { // TODO: Try `duplex: 'full'` when it is widely supported. diff --git a/packages/client/src/adapters/message-port/index.test.ts b/packages/client/src/adapters/message-port/index.test.ts index 27067b6ced..f7f5fafcdb 100644 --- a/packages/client/src/adapters/message-port/index.test.ts +++ b/packages/client/src/adapters/message-port/index.test.ts @@ -1,3 +1,3 @@ it('exports RPCLink', async () => { - await expect(import('./index.ts')).resolves.toHaveProperty('RPCLink') + await expect(import('./index')).resolves.toHaveProperty('RPCLink') }) diff --git a/packages/client/src/adapters/message-port/index.ts b/packages/client/src/adapters/message-port/index.ts index 65bc1054c4..32a17d0359 100644 --- a/packages/client/src/adapters/message-port/index.ts +++ b/packages/client/src/adapters/message-port/index.ts @@ -1,3 +1,3 @@ -export * from './message-port.ts' -export * from './rpc-link.ts' -export * from './transport.ts' +export * from './message-port' +export * from './rpc-link' +export * from './transport' diff --git a/packages/client/src/adapters/message-port/message-port.test.ts b/packages/client/src/adapters/message-port/message-port.test.ts index 4568aba653..3b451a6a66 100644 --- a/packages/client/src/adapters/message-port/message-port.test.ts +++ b/packages/client/src/adapters/message-port/message-port.test.ts @@ -1,4 +1,4 @@ -import { onMessagePortClose, onMessagePortMessage, postMessagePortMessage } from './message-port.ts' +import { onMessagePortClose, onMessagePortMessage, postMessagePortMessage } from './message-port' describe('postMessagePortMessage', () => { it('posts message without transfer', () => { diff --git a/packages/client/src/adapters/message-port/rpc-link.test.ts b/packages/client/src/adapters/message-port/rpc-link.test.ts index ad6abb4fea..a5ac335b72 100644 --- a/packages/client/src/adapters/message-port/rpc-link.test.ts +++ b/packages/client/src/adapters/message-port/rpc-link.test.ts @@ -1,8 +1,8 @@ import { AbortError, sleep } from '@orpc/shared' import { decodePeerMessage, encodePeerMessage } from '@standard-server/peer' -import { createORPCClient } from '../../client.ts' -import { RPCLink } from './rpc-link.ts' +import { createORPCClient } from '../../client' +import { RPCLink } from './rpc-link' describe('rpcLink', () => { beforeEach(() => { diff --git a/packages/client/src/adapters/message-port/rpc-link.ts b/packages/client/src/adapters/message-port/rpc-link.ts index 6feab105f3..ffbc313cb2 100644 --- a/packages/client/src/adapters/message-port/rpc-link.ts +++ b/packages/client/src/adapters/message-port/rpc-link.ts @@ -1,8 +1,8 @@ -import type { ClientContext } from '../../types.ts' -import type { RPCLinkCodecOptions, StandardLinkOptions } from '../standard/index.ts' -import { RPCLinkCodec, StandardLink } from '../standard/index.ts' -import type { MessagePortLinkTransportOptions } from './transport.ts' -import { MessagePortLinkTransport } from './transport.ts' +import type { ClientContext } from '../../types' +import type { RPCLinkCodecOptions, StandardLinkOptions } from '../standard/index' +import { RPCLinkCodec, StandardLink } from '../standard/index' +import type { MessagePortLinkTransportOptions } from './transport' +import { MessagePortLinkTransport } from './transport' export interface RPCLinkOptions extends StandardLinkOptions, MessagePortLinkTransportOptions, RPCLinkCodecOptions {} diff --git a/packages/client/src/adapters/message-port/transport.ts b/packages/client/src/adapters/message-port/transport.ts index dd492a28d2..87aa60cb5c 100644 --- a/packages/client/src/adapters/message-port/transport.ts +++ b/packages/client/src/adapters/message-port/transport.ts @@ -14,10 +14,10 @@ import { isServerPeerSendMessage, } from '@standard-server/peer' -import type { ClientContext, ClientOptions } from '../../types.ts' -import type { StandardLinkTransport } from '../standard/index.ts' -import type { SupportedMessagePort } from './message-port.ts' -import { onMessagePortClose, onMessagePortMessage, postMessagePortMessage } from './message-port.ts' +import type { ClientContext, ClientOptions } from '../../types' +import type { StandardLinkTransport } from '../standard/index' +import type { SupportedMessagePort } from './message-port' +import { onMessagePortClose, onMessagePortMessage, postMessagePortMessage } from './message-port' type DecodedRequestMessage = ConstructorParameters[0] extends ( message: infer TMessage, diff --git a/packages/client/src/adapters/standard/codec.ts b/packages/client/src/adapters/standard/codec.ts index d3f18ef84e..11de3b956f 100644 --- a/packages/client/src/adapters/standard/codec.ts +++ b/packages/client/src/adapters/standard/codec.ts @@ -1,7 +1,7 @@ import type { Promisable } from '@orpc/shared' import type { StandardLazyResponse, StandardRequest } from '@standard-server/core' -import type { ClientContext, ClientOptions } from '../../types.ts' +import type { ClientContext, ClientOptions } from '../../types' export type StandardLinkCodecDecodedResponse = | { kind: 'output'; output: unknown } diff --git a/packages/client/src/adapters/standard/index.test.ts b/packages/client/src/adapters/standard/index.test.ts index 7c9bafb7c7..db74b4a233 100644 --- a/packages/client/src/adapters/standard/index.test.ts +++ b/packages/client/src/adapters/standard/index.test.ts @@ -1,5 +1,5 @@ it('exports StandardLink, RPCLinkCodec', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ StandardLink: expect.any(Function), RPCLinkCodec: expect.any(Function), }) diff --git a/packages/client/src/adapters/standard/index.ts b/packages/client/src/adapters/standard/index.ts index ef31e67d40..b2a051e923 100644 --- a/packages/client/src/adapters/standard/index.ts +++ b/packages/client/src/adapters/standard/index.ts @@ -1,5 +1,5 @@ -export * from './codec.ts' -export * from './link.ts' -export type { StandardLinkPlugin } from './plugin.ts' -export * from './rpc-link-codec.ts' -export * from './transport.ts' +export * from './codec' +export * from './link' +export type { StandardLinkPlugin } from './plugin' +export * from './rpc-link-codec' +export * from './transport' diff --git a/packages/client/src/adapters/standard/link.test.ts b/packages/client/src/adapters/standard/link.test.ts index 91efc77270..0436ba03de 100644 --- a/packages/client/src/adapters/standard/link.test.ts +++ b/packages/client/src/adapters/standard/link.test.ts @@ -1,10 +1,10 @@ import { getTracer, isAsyncIteratorObject, setTracer } from '@orpc/shared' import type { StandardLazyResponse, StandardRequest } from '@standard-server/core' -import { ORPCError } from '../../error.ts' -import type { StandardLinkCodec } from './codec.ts' -import { StandardLink } from './link.ts' -import type { StandardLinkTransport } from './transport.ts' +import { ORPCError } from '../../error' +import type { StandardLinkCodec } from './codec' +import { StandardLink } from './link' +import type { StandardLinkTransport } from './transport' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/client/src/adapters/standard/link.ts b/packages/client/src/adapters/standard/link.ts index 459ffae050..3f7156cfed 100644 --- a/packages/client/src/adapters/standard/link.ts +++ b/packages/client/src/adapters/standard/link.ts @@ -11,11 +11,11 @@ import { } from '@orpc/shared' import type { StandardLazyResponse, StandardRequest } from '@standard-server/core' -import type { ClientContext, ClientLink, ClientOptions } from '../../types.ts' -import type { StandardLinkCodec } from './codec.ts' -import type { StandardLinkPlugin } from './plugin.ts' -import { CompositeStandardLinkPlugin } from './plugin.ts' -import type { StandardLinkTransport } from './transport.ts' +import type { ClientContext, ClientLink, ClientOptions } from '../../types' +import type { StandardLinkCodec } from './codec' +import type { StandardLinkPlugin } from './plugin' +import { CompositeStandardLinkPlugin } from './plugin' +import type { StandardLinkTransport } from './transport' export interface StandardLinkInterceptorOptions extends ClientOptions { path: string[] diff --git a/packages/client/src/adapters/standard/plugin.test.ts b/packages/client/src/adapters/standard/plugin.test.ts index d477240951..cddd9cb002 100644 --- a/packages/client/src/adapters/standard/plugin.test.ts +++ b/packages/client/src/adapters/standard/plugin.test.ts @@ -1,5 +1,5 @@ -import type { StandardLinkPlugin } from './plugin.ts' -import { CompositeStandardLinkPlugin } from './plugin.ts' +import type { StandardLinkPlugin } from './plugin' +import { CompositeStandardLinkPlugin } from './plugin' describe('compositeStandardLinkPlugin', () => { beforeEach(() => { diff --git a/packages/client/src/adapters/standard/plugin.ts b/packages/client/src/adapters/standard/plugin.ts index 8b976f49fe..078981bf05 100644 --- a/packages/client/src/adapters/standard/plugin.ts +++ b/packages/client/src/adapters/standard/plugin.ts @@ -1,8 +1,8 @@ import type { OrderablePlugin } from '@orpc/shared' import { sortPlugins } from '@orpc/shared' -import type { ClientContext } from '../../types.ts' -import type { StandardLinkOptions } from './link.ts' +import type { ClientContext } from '../../types' +import type { StandardLinkOptions } from './link' export interface StandardLinkPlugin extends OrderablePlugin { /** diff --git a/packages/client/src/adapters/standard/rpc-link-codec.test.ts b/packages/client/src/adapters/standard/rpc-link-codec.test.ts index d566e4c5a6..7cf7a854b9 100644 --- a/packages/client/src/adapters/standard/rpc-link-codec.test.ts +++ b/packages/client/src/adapters/standard/rpc-link-codec.test.ts @@ -1,8 +1,8 @@ import type { StandardUrl } from '@standard-server/core' -import { MalformedResponseError, ORPCError, ResponseError } from '../../error.ts' -import { RPCSerializer } from '../../rpc-serializer.ts' -import { RPCLinkCodec } from './rpc-link-codec.ts' +import { MalformedResponseError, ORPCError, ResponseError } from '../../error' +import { RPCSerializer } from '../../rpc-serializer' +import { RPCLinkCodec } from './rpc-link-codec' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/client/src/adapters/standard/rpc-link-codec.ts b/packages/client/src/adapters/standard/rpc-link-codec.ts index 9b9ef66b37..bb68c23fdb 100644 --- a/packages/client/src/adapters/standard/rpc-link-codec.ts +++ b/packages/client/src/adapters/standard/rpc-link-codec.ts @@ -15,11 +15,11 @@ import type { import { mergeStandardHeaders, parseStandardUrl } from '@standard-server/core' import { toStandardHeaders } from '@standard-server/fetch' -import { createORPCErrorFromJson, isORPCErrorJson } from '../../error-utils.ts' -import { MalformedResponseError, ResponseError } from '../../error.ts' -import { RPCSerializer } from '../../rpc-serializer.ts' -import type { ClientContext, ClientOptions } from '../../types.ts' -import type { StandardLinkCodec, StandardLinkCodecDecodedResponse } from '../standard/index.ts' +import { MalformedResponseError, ResponseError } from '../../error' +import { createORPCErrorFromJson, isORPCErrorJson } from '../../error-utils' +import { RPCSerializer } from '../../rpc-serializer' +import type { ClientContext, ClientOptions } from '../../types' +import type { StandardLinkCodec, StandardLinkCodecDecodedResponse } from '../standard/index' export interface RPCLinkCodecOptions { /** diff --git a/packages/client/src/adapters/standard/transport.ts b/packages/client/src/adapters/standard/transport.ts index c052b9bfba..782a7a3dba 100644 --- a/packages/client/src/adapters/standard/transport.ts +++ b/packages/client/src/adapters/standard/transport.ts @@ -1,6 +1,6 @@ import type { StandardLazyResponse, StandardRequest } from '@standard-server/core' -import type { ClientContext, ClientOptions } from '../../types.ts' +import type { ClientContext, ClientOptions } from '../../types' /** * Handles the transport layer for sending requests and receiving responses. diff --git a/packages/client/src/adapters/websocket/index.test.ts b/packages/client/src/adapters/websocket/index.test.ts index 27067b6ced..f7f5fafcdb 100644 --- a/packages/client/src/adapters/websocket/index.test.ts +++ b/packages/client/src/adapters/websocket/index.test.ts @@ -1,3 +1,3 @@ it('exports RPCLink', async () => { - await expect(import('./index.ts')).resolves.toHaveProperty('RPCLink') + await expect(import('./index')).resolves.toHaveProperty('RPCLink') }) diff --git a/packages/client/src/adapters/websocket/index.ts b/packages/client/src/adapters/websocket/index.ts index 478aa2ad4b..9a7dc93c19 100644 --- a/packages/client/src/adapters/websocket/index.ts +++ b/packages/client/src/adapters/websocket/index.ts @@ -1,2 +1,2 @@ -export * from './rpc-link.ts' -export * from './transport.ts' +export * from './rpc-link' +export * from './transport' diff --git a/packages/client/src/adapters/websocket/rpc-link.test.ts b/packages/client/src/adapters/websocket/rpc-link.test.ts index 8834ee7309..34d73f3ab5 100644 --- a/packages/client/src/adapters/websocket/rpc-link.test.ts +++ b/packages/client/src/adapters/websocket/rpc-link.test.ts @@ -5,8 +5,8 @@ import { AbortError, promiseWithResolvers } from '@orpc/shared' import { decodePeerMessage, encodePeerMessage } from '@standard-server/peer' import { WebSocketServer, WebSocket as WsWebSocket } from 'ws' -import { createORPCClient } from '../../client.ts' -import { RPCLink } from './rpc-link.ts' +import { createORPCClient } from '../../client' +import { RPCLink } from './rpc-link' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/client/src/adapters/websocket/rpc-link.ts b/packages/client/src/adapters/websocket/rpc-link.ts index 79db74ea5e..7779bd5e57 100644 --- a/packages/client/src/adapters/websocket/rpc-link.ts +++ b/packages/client/src/adapters/websocket/rpc-link.ts @@ -1,8 +1,8 @@ -import type { ClientContext } from '../../types.ts' -import type { RPCLinkCodecOptions, StandardLinkOptions } from '../standard/index.ts' -import { RPCLinkCodec, StandardLink } from '../standard/index.ts' -import type { WebSocketLinkTransportOptions } from './transport.ts' -import { WebSocketLinkTransport } from './transport.ts' +import type { ClientContext } from '../../types' +import type { RPCLinkCodecOptions, StandardLinkOptions } from '../standard/index' +import { RPCLinkCodec, StandardLink } from '../standard/index' +import type { WebSocketLinkTransportOptions } from './transport' +import { WebSocketLinkTransport } from './transport' export interface RPCLinkOptions extends StandardLinkOptions, WebSocketLinkTransportOptions, RPCLinkCodecOptions {} diff --git a/packages/client/src/adapters/websocket/transport.ts b/packages/client/src/adapters/websocket/transport.ts index 02d4af0a92..1787d4b07a 100644 --- a/packages/client/src/adapters/websocket/transport.ts +++ b/packages/client/src/adapters/websocket/transport.ts @@ -17,8 +17,8 @@ import { isServerPeerSendMessage, } from '@standard-server/peer' -import type { ClientContext, ClientOptions } from '../../types.ts' -import type { StandardLinkTransport } from '../standard/index.ts' +import type { ClientContext, ClientOptions } from '../../types' +import type { StandardLinkTransport } from '../standard/index' /** * Some env maybe not available WebSocket global, like node 20 diff --git a/packages/client/src/async-iterator-object.test.ts b/packages/client/src/async-iterator-object.test.ts index d351e1544f..5e672d2d44 100644 --- a/packages/client/src/async-iterator-object.test.ts +++ b/packages/client/src/async-iterator-object.test.ts @@ -1,6 +1,6 @@ import { getEventMeta, withEventMeta } from '@standard-server/core' -import { wrapAsyncIteratorPreservingEventMeta } from './async-iterator-object.ts' +import { wrapAsyncIteratorPreservingEventMeta } from './async-iterator-object' describe('wrapAsyncIteratorPreservingEventMeta', () => { it('preserves metadata when mapping yielded and returned values', async () => { diff --git a/packages/client/src/client-safe.test-d.ts b/packages/client/src/client-safe.test-d.ts index 25887dccc4..8580038be0 100644 --- a/packages/client/src/client-safe.test-d.ts +++ b/packages/client/src/client-safe.test-d.ts @@ -1,6 +1,6 @@ -import type { SafeClient } from './client-safe.ts' -import type { ORPCError } from './error.ts' -import type { Client, ClientContext } from './types.ts' +import type { SafeClient } from './client-safe' +import type { ORPCError } from './error' +import type { Client, ClientContext } from './types' it('SafeClient', async () => { const client = {} as { diff --git a/packages/client/src/client-safe.test.ts b/packages/client/src/client-safe.test.ts index 026eab18b6..0b419be690 100644 --- a/packages/client/src/client-safe.test.ts +++ b/packages/client/src/client-safe.test.ts @@ -1,4 +1,4 @@ -import { createSafeClient } from './client-safe.ts' +import { createSafeClient } from './client-safe' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/client/src/client-safe.ts b/packages/client/src/client-safe.ts index 8a94fc25cb..46a11ba15b 100644 --- a/packages/client/src/client-safe.ts +++ b/packages/client/src/client-safe.ts @@ -1,9 +1,9 @@ import { isNonPrimitive } from '@orpc/shared' -import { RECURSIVE_CLIENT_UNWRAP_KEYS } from './consts.ts' -import type { AnyNestedClient, Client, ClientRest } from './types.ts' -import type { SafeResult } from './utils.ts' -import { safe } from './utils.ts' +import { RECURSIVE_CLIENT_UNWRAP_KEYS } from './consts' +import type { AnyNestedClient, Client, ClientRest } from './types' +import type { SafeResult } from './utils' +import { safe } from './utils' export type SafeClient = T extends Client diff --git a/packages/client/src/client.test-d.ts b/packages/client/src/client.test-d.ts index f6237b9943..f480a470de 100644 --- a/packages/client/src/client.test-d.ts +++ b/packages/client/src/client.test-d.ts @@ -3,9 +3,9 @@ import type { RouterClient } from '@orpc/server' import { os, type } from '@orpc/server' import type { PromiseWithError } from '@orpc/shared' -import { createORPCClient } from './client.ts' -import type { ORPCError } from './error.ts' -import type { ClientLink } from './types.ts' +import { createORPCClient } from './client' +import type { ORPCError } from './error' +import type { ClientLink } from './types' const router = { ping: os.input(type()).handler(() => 'pong'), diff --git a/packages/client/src/client.test.ts b/packages/client/src/client.test.ts index 2943fd90c3..9bd90026f9 100644 --- a/packages/client/src/client.test.ts +++ b/packages/client/src/client.test.ts @@ -1,5 +1,5 @@ -import { createORPCClient } from './client.ts' -import type { ClientContext, ClientLink } from './types.ts' +import { createORPCClient } from './client' +import type { ClientContext, ClientLink } from './types' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/client/src/client.ts b/packages/client/src/client.ts index c0c139e1a3..b026ca4532 100644 --- a/packages/client/src/client.ts +++ b/packages/client/src/client.ts @@ -1,7 +1,7 @@ import type { Interceptor, PromiseWithError } from '@orpc/shared' import { intercept, toArray } from '@orpc/shared' -import { RECURSIVE_CLIENT_UNWRAP_KEYS } from './consts.ts' +import { RECURSIVE_CLIENT_UNWRAP_KEYS } from './consts' import type { AnyNestedClient, Client, @@ -10,8 +10,8 @@ import type { ClientOptions, InferClientContext, InferClientError, -} from './types.ts' -import { resolveClientRest } from './utils.ts' +} from './types' +import { resolveClientRest } from './utils' export interface ORPCClientInterceptorOptions< TClientContext extends ClientContext, diff --git a/packages/client/src/dynamic-link.test-d.ts b/packages/client/src/dynamic-link.test-d.ts index e4761d68d2..75a7570e9e 100644 --- a/packages/client/src/dynamic-link.test-d.ts +++ b/packages/client/src/dynamic-link.test-d.ts @@ -1,5 +1,5 @@ -import { DynamicLink } from './dynamic-link.ts' -import type { ClientLink } from './types.ts' +import { DynamicLink } from './dynamic-link' +import type { ClientLink } from './types' describe('dynamicLink', () => { it('pass correct context', () => { diff --git a/packages/client/src/dynamic-link.test.ts b/packages/client/src/dynamic-link.test.ts index b4387b8106..52ec8b1499 100644 --- a/packages/client/src/dynamic-link.test.ts +++ b/packages/client/src/dynamic-link.test.ts @@ -1,5 +1,5 @@ -import { DynamicLink } from './dynamic-link.ts' -import type { ClientOptions } from './types.ts' +import { DynamicLink } from './dynamic-link' +import type { ClientOptions } from './types' it('dynamicLink', async () => { const mockedLink = { call: vi.fn().mockResolvedValue('__mocked__') } diff --git a/packages/client/src/dynamic-link.ts b/packages/client/src/dynamic-link.ts index b64c2b61c9..06aafbd1b9 100644 --- a/packages/client/src/dynamic-link.ts +++ b/packages/client/src/dynamic-link.ts @@ -1,6 +1,6 @@ import type { Promisable } from '@orpc/shared' -import type { ClientContext, ClientLink, ClientOptions } from './types.ts' +import type { ClientContext, ClientLink, ClientOptions } from './types' /** * DynamicLink provides a way to dynamically resolve and delegate calls to other ClientLinks diff --git a/packages/client/src/error-utils.test-d.ts b/packages/client/src/error-utils.test-d.ts index d68bf111ce..320158e982 100644 --- a/packages/client/src/error-utils.test-d.ts +++ b/packages/client/src/error-utils.test-d.ts @@ -1,5 +1,5 @@ -import { isDefinedError } from './error-utils.ts' -import type { ORPCError } from './error.ts' +import type { ORPCError } from './error' +import { isDefinedError } from './error-utils' describe('isDefinedError', () => { it('normal', () => { diff --git a/packages/client/src/error-utils.test.ts b/packages/client/src/error-utils.test.ts index e90b5b47a6..30805d6e79 100644 --- a/packages/client/src/error-utils.test.ts +++ b/packages/client/src/error-utils.test.ts @@ -1,13 +1,13 @@ import type { Writable } from '@orpc/shared' +import { ORPCError } from './error' import { cloneORPCError, createORPCErrorFromJson, isDefinedError, isORPCErrorJson, toORPCError, -} from './error-utils.ts' -import { ORPCError } from './error.ts' +} from './error-utils' it('isDefinedError', () => { const definedError = new ORPCError('BAD_REQUEST') diff --git a/packages/client/src/error-utils.ts b/packages/client/src/error-utils.ts index 63c92953b4..cf2b47592d 100644 --- a/packages/client/src/error-utils.ts +++ b/packages/client/src/error-utils.ts @@ -1,8 +1,8 @@ import type { Writable } from '@orpc/shared' import { isPlainObject } from '@orpc/shared' -import type { AnyORPCError, ORPCErrorCode, ORPCErrorJSON } from './error.ts' -import { ORPCError } from './error.ts' +import type { AnyORPCError, ORPCErrorCode, ORPCErrorJSON } from './error' +import { ORPCError } from './error' /** * Checks if an error is an `ORPCError` that matches a definition in the procedure's `.errors` map, diff --git a/packages/client/src/error.test-d.ts b/packages/client/src/error.test-d.ts index cb64812087..5bdcac6439 100644 --- a/packages/client/src/error.test-d.ts +++ b/packages/client/src/error.test-d.ts @@ -1,4 +1,4 @@ -import { ORPCError } from './error.ts' +import { ORPCError } from './error' describe('ORPCError', () => { it('constructor', () => { diff --git a/packages/client/src/error.test.ts b/packages/client/src/error.test.ts index 04b7b82bcc..79629e8e2a 100644 --- a/packages/client/src/error.test.ts +++ b/packages/client/src/error.test.ts @@ -1,6 +1,6 @@ import { NullProtoObj } from '@orpc/shared' -import { MalformedResponseError, ORPCError, ResponseError } from './error.ts' +import { MalformedResponseError, ORPCError, ResponseError } from './error' describe('oRPCError', () => { it('works', () => { diff --git a/packages/client/src/index.test.ts b/packages/client/src/index.test.ts index 65b1ed0a90..1a6f0e9000 100644 --- a/packages/client/src/index.test.ts +++ b/packages/client/src/index.test.ts @@ -1,5 +1,5 @@ it('exports createORPCClient, ORPCError, DynamicLink, RPCJsonSerializer, RPCSerializer', async () => { - await expect(import('./index.ts')).resolves.toEqual( + await expect(import('./index')).resolves.toEqual( expect.objectContaining({ createORPCClient: expect.any(Function), ORPCError: expect.any(Function), diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts index 25ebe16ea5..95ac349a00 100644 --- a/packages/client/src/index.ts +++ b/packages/client/src/index.ts @@ -1,21 +1,21 @@ -export * from './async-iterator-object.ts' -export * from './client.ts' -export * from './client-safe.ts' -export * from './consts.ts' -export * from './dynamic-link.ts' -export * from './error.ts' -export * from './error-utils.ts' -export * from './rpc-json-serializer.ts' -export * from './rpc-serializer.ts' -export * from './types.ts' +export * from './async-iterator-object' +export * from './client' +export * from './client-safe' +export * from './consts' +export * from './dynamic-link' +export * from './error' +export * from './error-utils' +export * from './rpc-json-serializer' +export * from './rpc-serializer' +export * from './types' export type { /** * @deprecated Use `InferClientError` instead. */ InferClientError as InferClientErrorUnion, -} from './types.ts' -export { resolveClientRest, safe } from './utils.ts' -export type { SafeResult } from './utils.ts' +} from './types' +export { resolveClientRest, safe } from './utils' +export type { SafeResult } from './utils' export type { AsyncCleanupFn, diff --git a/packages/client/src/plugins/batch.test.ts b/packages/client/src/plugins/batch.test.ts index 6c02973fcc..bee9b91258 100644 --- a/packages/client/src/plugins/batch.test.ts +++ b/packages/client/src/plugins/batch.test.ts @@ -4,9 +4,9 @@ import { promiseWithResolvers, sleep } from '@orpc/shared' import type { StandardLazyResponse, StandardRequest } from '@standard-server/core' import { encodePeerMessage } from '@standard-server/peer' -import type { StandardLinkCodec, StandardLinkTransport } from '../adapters/standard/index.ts' -import { StandardLink } from '../adapters/standard/index.ts' -import { BatchLinkPlugin } from './batch.ts' +import type { StandardLinkCodec, StandardLinkTransport } from '../adapters/standard/index' +import { StandardLink } from '../adapters/standard/index' +import { BatchLinkPlugin } from './batch' interface TestContext { tag?: string diff --git a/packages/client/src/plugins/batch.ts b/packages/client/src/plugins/batch.ts index 0312e6d9e7..ebc0256c43 100644 --- a/packages/client/src/plugins/batch.ts +++ b/packages/client/src/plugins/batch.ts @@ -32,8 +32,8 @@ import type { StandardLinkPlugin, StandardLinkTransportInterceptor, StandardLinkTransportInterceptorOptions, -} from '../adapters/standard/index.ts' -import type { ClientContext } from '../types.ts' +} from '../adapters/standard/index' +import type { ClientContext } from '../types' /** * Header that marks a request as a batch, set by the Batch Link Plugin and detected by the Batch Handler Plugin. diff --git a/packages/client/src/plugins/cookie-jar.test.ts b/packages/client/src/plugins/cookie-jar.test.ts index 2b6750c4ed..913be935ae 100644 --- a/packages/client/src/plugins/cookie-jar.test.ts +++ b/packages/client/src/plugins/cookie-jar.test.ts @@ -1,12 +1,12 @@ import type { StandardHeaders, StandardLazyResponse } from '@standard-server/core' -import { RPCLink } from '../adapters/fetch/index.ts' -import type { StandardLinkCodec, StandardLinkTransport } from '../adapters/standard/index.ts' -import { StandardLink } from '../adapters/standard/index.ts' -import { createORPCClient } from '../client.ts' -import { BatchLinkPlugin } from './batch.ts' -import type { CookieJarLinkPluginOptions } from './cookie-jar.ts' -import { CookieJar, CookieJarLinkPlugin } from './cookie-jar.ts' +import { RPCLink } from '../adapters/fetch/index' +import type { StandardLinkCodec, StandardLinkTransport } from '../adapters/standard/index' +import { StandardLink } from '../adapters/standard/index' +import { createORPCClient } from '../client' +import { BatchLinkPlugin } from './batch' +import type { CookieJarLinkPluginOptions } from './cookie-jar' +import { CookieJar, CookieJarLinkPlugin } from './cookie-jar' const origin = 'https://api.example.com' diff --git a/packages/client/src/plugins/cookie-jar.ts b/packages/client/src/plugins/cookie-jar.ts index 9b9dee295c..8cef5ebc62 100644 --- a/packages/client/src/plugins/cookie-jar.ts +++ b/packages/client/src/plugins/cookie-jar.ts @@ -2,14 +2,14 @@ import type { Value } from '@orpc/shared' import { matchesHttpPathPrefix, toArray, value } from '@orpc/shared' import type { StandardHeaders } from '@standard-server/core' -import type { FetchLinkTransportOptions } from '../adapters/fetch/index.ts' +import type { FetchLinkTransportOptions } from '../adapters/fetch/index' import type { StandardLinkOptions, StandardLinkPlugin, StandardLinkTransportInterceptor, StandardLinkTransportInterceptorOptions, -} from '../adapters/standard/index.ts' -import type { ClientContext } from '../types.ts' +} from '../adapters/standard/index' +import type { ClientContext } from '../types' export interface CookieJarLinkPluginOptions { /** diff --git a/packages/client/src/plugins/dedupe.test.ts b/packages/client/src/plugins/dedupe.test.ts index a88962b56a..c5bc4392b9 100644 --- a/packages/client/src/plugins/dedupe.test.ts +++ b/packages/client/src/plugins/dedupe.test.ts @@ -10,9 +10,9 @@ import { } from '@orpc/shared' import type { StandardBody, StandardLazyResponse, StandardRequest } from '@standard-server/core' -import type { StandardLinkCodec, StandardLinkTransport } from '../adapters/standard/index.ts' -import { StandardLink } from '../adapters/standard/index.ts' -import { DedupeLinkPlugin } from './dedupe.ts' +import type { StandardLinkCodec, StandardLinkTransport } from '../adapters/standard/index' +import { StandardLink } from '../adapters/standard/index' +import { DedupeLinkPlugin } from './dedupe' interface TestContext { group?: boolean diff --git a/packages/client/src/plugins/dedupe.ts b/packages/client/src/plugins/dedupe.ts index fba88965d1..ce9fff7feb 100644 --- a/packages/client/src/plugins/dedupe.ts +++ b/packages/client/src/plugins/dedupe.ts @@ -26,8 +26,8 @@ import type { StandardLinkPlugin, StandardLinkTransportInterceptor, StandardLinkTransportInterceptorOptions, -} from '../adapters/standard/index.ts' -import type { ClientContext } from '../types.ts' +} from '../adapters/standard/index' +import type { ClientContext } from '../types' export interface DedupeLinkPluginGroup { condition: Value]> diff --git a/packages/client/src/plugins/index.test.ts b/packages/client/src/plugins/index.test.ts index b5d8329fd9..95b6e36d0c 100644 --- a/packages/client/src/plugins/index.test.ts +++ b/packages/client/src/plugins/index.test.ts @@ -1,5 +1,5 @@ it('exports plugins', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ BatchLinkPlugin: expect.any(Function), BATCH_HEADER: 'orpc-batch', DEFAULT_BATCH_MAX_SIZE: 10, diff --git a/packages/client/src/plugins/index.ts b/packages/client/src/plugins/index.ts index 0a73343443..7f820b30a0 100644 --- a/packages/client/src/plugins/index.ts +++ b/packages/client/src/plugins/index.ts @@ -1,32 +1,32 @@ -export * from './batch.ts' -export * from './cookie-jar.ts' -export * from './dedupe.ts' +export * from './batch' +export * from './cookie-jar' +export * from './dedupe' export { /** * @deprecated Use `DedupeLinkPlugin` instead. */ DedupeLinkPlugin as DedupeRequestsPlugin, -} from './dedupe.ts' -export * from './request-compression.ts' -export * from './response-compression.ts' -export * from './retry.ts' +} from './dedupe' +export * from './request-compression' +export * from './response-compression' +export * from './retry' export { /** * @deprecated Use `RetryLinkPlugin` instead. */ RetryLinkPlugin as ClientRetryPlugin, -} from './retry.ts' +} from './retry' export type { /** * @deprecated Use `RetryLinkPluginContext` instead. */ RetryLinkPluginContext as ClientRetryPluginContext, -} from './retry.ts' -export * from './retry-after.ts' +} from './retry' +export * from './retry-after' export { /** * @deprecated Use `RetryAfterLinkPlugin` instead. */ RetryAfterLinkPlugin as RetryAfterPlugin, -} from './retry-after.ts' -export * from './timeout.ts' +} from './retry-after' +export * from './timeout' diff --git a/packages/client/src/plugins/request-compression.test.ts b/packages/client/src/plugins/request-compression.test.ts index 9a550c8b23..075f8c5b36 100644 --- a/packages/client/src/plugins/request-compression.test.ts +++ b/packages/client/src/plugins/request-compression.test.ts @@ -1,7 +1,7 @@ import { RPCLink } from '@orpc/client/fetch' -import type { StandardLinkTransportInterceptor } from '../adapters/standard/index.ts' -import { RequestCompressionLinkPlugin } from './request-compression.ts' +import type { StandardLinkTransportInterceptor } from '../adapters/standard/index' +import { RequestCompressionLinkPlugin } from './request-compression' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/client/src/plugins/request-compression.ts b/packages/client/src/plugins/request-compression.ts index 10f97001fe..a4dcb7761c 100644 --- a/packages/client/src/plugins/request-compression.ts +++ b/packages/client/src/plugins/request-compression.ts @@ -15,8 +15,8 @@ import type { StandardLinkPlugin, StandardLinkTransportInterceptor, StandardLinkTransportInterceptorOptions, -} from '../adapters/standard/index.ts' -import type { ClientContext } from '../types.ts' +} from '../adapters/standard/index' +import type { ClientContext } from '../types' export interface RequestCompressionLinkPluginOptions { /** diff --git a/packages/client/src/plugins/response-compression.test.ts b/packages/client/src/plugins/response-compression.test.ts index da0a65846e..6e7fa80f6a 100644 --- a/packages/client/src/plugins/response-compression.test.ts +++ b/packages/client/src/plugins/response-compression.test.ts @@ -5,8 +5,8 @@ import type { StandardLinkOptions, StandardLinkPlugin, StandardLinkTransportInterceptor, -} from '../adapters/standard/index.ts' -import { ResponseCompressionLinkPlugin } from './response-compression.ts' +} from '../adapters/standard/index' +import { ResponseCompressionLinkPlugin } from './response-compression' async function compressAsync( data: string, diff --git a/packages/client/src/plugins/response-compression.ts b/packages/client/src/plugins/response-compression.ts index fbd19fbedd..e93aaa49b9 100644 --- a/packages/client/src/plugins/response-compression.ts +++ b/packages/client/src/plugins/response-compression.ts @@ -7,8 +7,8 @@ import type { StandardLinkOptions, StandardLinkPlugin, StandardLinkTransportInterceptor, -} from '../adapters/standard/index.ts' -import type { ClientContext } from '../types.ts' +} from '../adapters/standard/index' +import type { ClientContext } from '../types' /** * Each coding adds a decompressor to the chain, so an unbounded list lets a tiny diff --git a/packages/client/src/plugins/retry-after.test.ts b/packages/client/src/plugins/retry-after.test.ts index 9c1844dacf..99548d934d 100644 --- a/packages/client/src/plugins/retry-after.test.ts +++ b/packages/client/src/plugins/retry-after.test.ts @@ -1,8 +1,8 @@ import type { StandardLazyResponse, StandardRequest } from '@standard-server/core' -import type { StandardLinkCodec, StandardLinkTransport } from '../adapters/standard/index.ts' -import { StandardLink } from '../adapters/standard/index.ts' -import { RetryAfterLinkPlugin } from './retry-after.ts' +import type { StandardLinkCodec, StandardLinkTransport } from '../adapters/standard/index' +import { StandardLink } from '../adapters/standard/index' +import { RetryAfterLinkPlugin } from './retry-after' function makeCodec(): StandardLinkCodec { return { diff --git a/packages/client/src/plugins/retry-after.ts b/packages/client/src/plugins/retry-after.ts index d8be273e68..1e1d7c61c1 100644 --- a/packages/client/src/plugins/retry-after.ts +++ b/packages/client/src/plugins/retry-after.ts @@ -8,9 +8,9 @@ import type { StandardLinkPlugin, StandardLinkTransportInterceptor, StandardLinkTransportInterceptorOptions, -} from '../adapters/standard/index.ts' -import { COMMON_ERROR_STATUS_MAP } from '../error.ts' -import type { ClientContext } from '../types.ts' +} from '../adapters/standard/index' +import { COMMON_ERROR_STATUS_MAP } from '../error' +import type { ClientContext } from '../types' export interface RetryAfterLinkPluginOptions { /** diff --git a/packages/client/src/plugins/retry.test.ts b/packages/client/src/plugins/retry.test.ts index c31fbfc4f4..ecd6ea1893 100644 --- a/packages/client/src/plugins/retry.test.ts +++ b/packages/client/src/plugins/retry.test.ts @@ -2,11 +2,11 @@ import { promiseWithResolvers } from '@orpc/shared' import type { StandardLazyResponse, StandardRequest } from '@standard-server/core' import { withEventMeta } from '@standard-server/core' -import type { StandardLinkCodec, StandardLinkTransport } from '../adapters/standard/index.ts' -import { StandardLink } from '../adapters/standard/index.ts' -import { MalformedResponseError, ORPCError, ResponseError } from '../error.ts' -import type { RetryLinkPluginContext } from './retry.ts' -import { isRetryableError, RetryLinkPlugin } from './retry.ts' +import type { StandardLinkCodec, StandardLinkTransport } from '../adapters/standard/index' +import { StandardLink } from '../adapters/standard/index' +import { MalformedResponseError, ORPCError, ResponseError } from '../error' +import type { RetryLinkPluginContext } from './retry' +import { isRetryableError, RetryLinkPlugin } from './retry' interface TestContext extends RetryLinkPluginContext { tag?: string diff --git a/packages/client/src/plugins/retry.ts b/packages/client/src/plugins/retry.ts index 0cbbc1db8c..7a4e5de3bb 100644 --- a/packages/client/src/plugins/retry.ts +++ b/packages/client/src/plugins/retry.ts @@ -14,9 +14,9 @@ import type { StandardLinkInterceptorOptions, StandardLinkOptions, StandardLinkPlugin, -} from '../adapters/standard/index.ts' -import { COMMON_ERROR_STATUS_MAP, ORPCError, ResponseError } from '../error.ts' -import type { ClientContext } from '../types.ts' +} from '../adapters/standard/index' +import { COMMON_ERROR_STATUS_MAP, ORPCError, ResponseError } from '../error' +import type { ClientContext } from '../types' export interface RetryLinkPluginAttemptOptions< T extends RetryLinkPluginContext, diff --git a/packages/client/src/plugins/timeout.test.ts b/packages/client/src/plugins/timeout.test.ts index 04071b04ef..234cbccf81 100644 --- a/packages/client/src/plugins/timeout.test.ts +++ b/packages/client/src/plugins/timeout.test.ts @@ -1,9 +1,9 @@ import { AbortError } from '@orpc/shared' import type { StandardLazyResponse, StandardRequest } from '@standard-server/core' -import type { StandardLinkCodec, StandardLinkTransport } from '../adapters/standard/index.ts' -import { StandardLink } from '../adapters/standard/index.ts' -import { TimeoutLinkPlugin } from './timeout.ts' +import type { StandardLinkCodec, StandardLinkTransport } from '../adapters/standard/index' +import { StandardLink } from '../adapters/standard/index' +import { TimeoutLinkPlugin } from './timeout' function makeCodec(): StandardLinkCodec { return { diff --git a/packages/client/src/plugins/timeout.ts b/packages/client/src/plugins/timeout.ts index 94c65f812c..c4af912273 100644 --- a/packages/client/src/plugins/timeout.ts +++ b/packages/client/src/plugins/timeout.ts @@ -6,8 +6,8 @@ import type { StandardLinkInterceptorOptions, StandardLinkOptions, StandardLinkPlugin, -} from '../adapters/standard/index.ts' -import type { ClientContext } from '../types.ts' +} from '../adapters/standard/index' +import type { ClientContext } from '../types' export interface TimeoutLinkPluginOptions { /** diff --git a/packages/client/src/rpc-json-serializer.test.ts b/packages/client/src/rpc-json-serializer.test.ts index 17b2f7df0a..fbe9e6d1ed 100644 --- a/packages/client/src/rpc-json-serializer.test.ts +++ b/packages/client/src/rpc-json-serializer.test.ts @@ -1,6 +1,6 @@ -import { builtInRPCSupportDataTypes } from '../../../tests/rpc/__shared__/built-in-support-data-types.ts' -import type { RPCJsonSerialization } from './rpc-json-serializer.ts' -import { RPCJsonSerializer } from './rpc-json-serializer.ts' +import { builtInRPCSupportDataTypes } from '../../../tests/rpc/__shared__/built-in-support-data-types' +import type { RPCJsonSerialization } from './rpc-json-serializer' +import { RPCJsonSerializer } from './rpc-json-serializer' class Person { constructor( diff --git a/packages/client/src/rpc-serializer.test.ts b/packages/client/src/rpc-serializer.test.ts index 6c98f52591..aaf8b7e621 100644 --- a/packages/client/src/rpc-serializer.test.ts +++ b/packages/client/src/rpc-serializer.test.ts @@ -1,9 +1,9 @@ import { isAsyncIteratorObject, parseEmptyableJSON } from '@orpc/shared' import { EventStreamErrorEvent, getEventMeta, withEventMeta } from '@standard-server/core' -import { builtInRPCSupportDataTypes } from '../../../tests/rpc/__shared__/built-in-support-data-types.ts' -import { ORPCError } from './error.ts' -import { RPCSerializer } from './rpc-serializer.ts' +import { builtInRPCSupportDataTypes } from '../../../tests/rpc/__shared__/built-in-support-data-types' +import { ORPCError } from './error' +import { RPCSerializer } from './rpc-serializer' describe('rpcSerializer', () => { describe.each(builtInRPCSupportDataTypes)('$name', ({ value, expected }) => { diff --git a/packages/client/src/rpc-serializer.ts b/packages/client/src/rpc-serializer.ts index 55d16d6e28..1e554be248 100644 --- a/packages/client/src/rpc-serializer.ts +++ b/packages/client/src/rpc-serializer.ts @@ -7,10 +7,10 @@ import { import type { StandardBody } from '@standard-server/core' import { EventStreamErrorEvent } from '@standard-server/core' -import { wrapAsyncIteratorPreservingEventMeta } from './async-iterator-object.ts' -import { createORPCErrorFromJson, isORPCErrorJson, toORPCError } from './error-utils.ts' -import type { RPCJsonSerialization, RPCJsonSerializerOptions } from './rpc-json-serializer.ts' -import { RPCJsonSerializer } from './rpc-json-serializer.ts' +import { wrapAsyncIteratorPreservingEventMeta } from './async-iterator-object' +import { createORPCErrorFromJson, isORPCErrorJson, toORPCError } from './error-utils' +import type { RPCJsonSerialization, RPCJsonSerializerOptions } from './rpc-json-serializer' +import { RPCJsonSerializer } from './rpc-json-serializer' export interface RPCSerializerSerializeOptions { /** diff --git a/packages/client/src/types.test-d.ts b/packages/client/src/types.test-d.ts index af7b75464e..05d842a456 100644 --- a/packages/client/src/types.test-d.ts +++ b/packages/client/src/types.test-d.ts @@ -1,4 +1,4 @@ -import type { ORPCError } from './error.ts' +import type { ORPCError } from './error' import type { Client, ClientContext, @@ -9,7 +9,7 @@ import type { InferClientErrors, InferClientInputs, InferClientOutputs, -} from './types.ts' +} from './types' describe('client', () => { const client: Client< diff --git a/packages/client/src/utils.test-d.ts b/packages/client/src/utils.test-d.ts index 2120cd62e1..3c52545186 100644 --- a/packages/client/src/utils.test-d.ts +++ b/packages/client/src/utils.test-d.ts @@ -1,7 +1,7 @@ -import { isDefinedError } from './error-utils.ts' -import type { ORPCError } from './error.ts' -import type { Client, ClientContext } from './types.ts' -import { safe } from './utils.ts' +import type { ORPCError } from './error' +import { isDefinedError } from './error-utils' +import type { Client, ClientContext } from './types' +import { safe } from './utils' describe('safe', async () => { const client = {} as Client< diff --git a/packages/client/src/utils.test.ts b/packages/client/src/utils.test.ts index 0a06f73bf4..1396afce28 100644 --- a/packages/client/src/utils.test.ts +++ b/packages/client/src/utils.test.ts @@ -1,5 +1,5 @@ -import { ORPCError } from './error.ts' -import { resolveClientRest, resolveFriendlyClientOptions, safe } from './utils.ts' +import { ORPCError } from './error' +import { resolveClientRest, resolveFriendlyClientOptions, safe } from './utils' describe('resolveFriendlyClientOptions', () => { it('works', () => { diff --git a/packages/client/src/utils.ts b/packages/client/src/utils.ts index 0421887e5c..3fc22ec212 100644 --- a/packages/client/src/utils.ts +++ b/packages/client/src/utils.ts @@ -1,8 +1,8 @@ import type { PromiseWithError, ThrowableError } from '@orpc/shared' -import { isDefinedError } from './error-utils.ts' -import type { AnyORPCError } from './error.ts' -import type { ClientContext, ClientOptions, ClientRest, FriendlyClientOptions } from './types.ts' +import type { AnyORPCError } from './error' +import { isDefinedError } from './error-utils' +import type { ClientContext, ClientOptions, ClientRest, FriendlyClientOptions } from './types' export function resolveFriendlyClientOptions( options: FriendlyClientOptions, diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json index 7764bbc258..498f0c8aeb 100644 --- a/packages/cloudflare/package.json +++ b/packages/cloudflare/package.json @@ -46,7 +46,7 @@ }, "scripts": { "prepare": "wrangler types", - "prepack": "tsc -p tsconfig.build.json", + "prepack": "tsdown", "test": "vitest run", "test:coverage": "vitest run --coverage" }, diff --git a/packages/cloudflare/src/index.test.ts b/packages/cloudflare/src/index.test.ts index 5f9888e8f3..06947744c4 100644 --- a/packages/cloudflare/src/index.test.ts +++ b/packages/cloudflare/src/index.test.ts @@ -1,7 +1,7 @@ import { expect, it } from 'vitest' it('exports CloudflareRateLimiter, experimental_CloudflareTracer, DurablePublisher, DurablePublisherObject, experimental_DurableLocker, experimental_DurableLockObject', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ CloudflareRateLimiter: expect.any(Function), experimental_CloudflareTracer: expect.any(Function), DurablePublisher: expect.any(Function), diff --git a/packages/cloudflare/src/index.ts b/packages/cloudflare/src/index.ts index ed1d05eeaa..d044112670 100644 --- a/packages/cloudflare/src/index.ts +++ b/packages/cloudflare/src/index.ts @@ -1,10 +1,10 @@ -export * from './lock.ts' -export * from './lock-object.ts' -export * from './publisher.ts' -export * from './publisher-object.ts' -export * from './ratelimit.ts' +export * from './lock' +export * from './lock-object' +export * from './publisher' +export * from './publisher-object' +export * from './ratelimit' export type { experimental_CloudflarePropagationOptions, experimental_CloudflareTracerOptions, -} from './tracer.ts' -export { experimental_CloudflareTracer } from './tracer.ts' +} from './tracer' +export { experimental_CloudflareTracer } from './tracer' diff --git a/packages/cloudflare/src/lock-object.test.ts b/packages/cloudflare/src/lock-object.test.ts index e7449ef40a..fa4ebd477f 100644 --- a/packages/cloudflare/src/lock-object.test.ts +++ b/packages/cloudflare/src/lock-object.test.ts @@ -3,7 +3,7 @@ import { evictDurableObject, runInDurableObject } from 'cloudflare:test' import { env } from 'cloudflare:workers' import { describe, expect, it, vi } from 'vitest' -import type { experimental_DurableLockObject as DurableLockObject } from './lock-object.ts' +import type { experimental_DurableLockObject as DurableLockObject } from './lock-object' describe('durableLockObject', () => { function createStub() { diff --git a/packages/cloudflare/src/lock.test.ts b/packages/cloudflare/src/lock.test.ts index 399a1e6862..48e14c568b 100644 --- a/packages/cloudflare/src/lock.test.ts +++ b/packages/cloudflare/src/lock.test.ts @@ -5,7 +5,7 @@ import { runInDurableObject } from 'cloudflare:test' import { env } from 'cloudflare:workers' import { describe, expect, it, vi } from 'vitest' -import { experimental_DurableLocker as DurableLocker } from './lock.ts' +import { experimental_DurableLocker as DurableLocker } from './lock' describe('durableLocker', () => { function createTestingLocker( diff --git a/packages/cloudflare/src/publisher.test.ts b/packages/cloudflare/src/publisher.test.ts index 4e3e3f0512..05ab010e10 100644 --- a/packages/cloudflare/src/publisher.test.ts +++ b/packages/cloudflare/src/publisher.test.ts @@ -4,8 +4,8 @@ import { getEventMeta, withEventMeta } from '@standard-server/core' import { env } from 'cloudflare:workers' import { describe, expect, it, vi } from 'vitest' -import type { DurablePublisherOptions } from './publisher.ts' -import { DurablePublisher } from './publisher.ts' +import type { DurablePublisherOptions } from './publisher' +import { DurablePublisher } from './publisher' type MockSocket = WebSocket & EventTarget & { diff --git a/packages/cloudflare/src/ratelimit.test.ts b/packages/cloudflare/src/ratelimit.test.ts index 91c92631ef..54c0a87408 100644 --- a/packages/cloudflare/src/ratelimit.test.ts +++ b/packages/cloudflare/src/ratelimit.test.ts @@ -1,8 +1,8 @@ import { env } from 'cloudflare:workers' import { describe, expect, it, vi } from 'vitest' -import type { CloudflareRateLimiterOptions } from './ratelimit.ts' -import { CloudflareRateLimiter } from './ratelimit.ts' +import type { CloudflareRateLimiterOptions } from './ratelimit' +import { CloudflareRateLimiter } from './ratelimit' describe('cloudflareRateLimiter', () => { const PERIOD_MS = 10_000 diff --git a/packages/cloudflare/src/tracer.test.ts b/packages/cloudflare/src/tracer.test.ts index 57c862e47d..706b7870cf 100644 --- a/packages/cloudflare/src/tracer.test.ts +++ b/packages/cloudflare/src/tracer.test.ts @@ -5,7 +5,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import { experimental_CloudflareSpan as CloudflareSpan, experimental_CloudflareTracer as CloudflareTracer, -} from './tracer.ts' +} from './tracer' function createFakeSpan() { return { diff --git a/packages/cloudflare/tests/__shared__/main.ts b/packages/cloudflare/tests/__shared__/main.ts index 8a40485353..c505fd5d80 100644 --- a/packages/cloudflare/tests/__shared__/main.ts +++ b/packages/cloudflare/tests/__shared__/main.ts @@ -1,5 +1,5 @@ -import { experimental_DurableLockObject as DurableLockObject } from '../../src/lock-object.ts' -import { DurablePublisherObject } from '../../src/publisher-object.ts' +import { experimental_DurableLockObject as DurableLockObject } from '../../src/lock-object' +import { DurablePublisherObject } from '../../src/publisher-object' export class PublisherDO extends DurablePublisherObject {} diff --git a/packages/cloudflare/tsconfig.build.json b/packages/cloudflare/tsconfig.build.json deleted file mode 100644 index 85fb18b6e8..0000000000 --- a/packages/cloudflare/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.lib.json", - "compilerOptions": { - "lib": ["ES2022"], - "types": ["node"], - // worker-configuration.d.ts imports the tests, so type checking runs with tsconfig.json only - "noCheck": true - } -} diff --git a/packages/contract/package.json b/packages/contract/package.json index e5cae5519a..966b844d75 100644 --- a/packages/contract/package.json +++ b/packages/contract/package.json @@ -50,7 +50,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/client": "workspace:*", diff --git a/packages/contract/src/builder-variants.test-d.ts b/packages/contract/src/builder-variants.test-d.ts index 16ff217db7..ec3bf6f6ec 100644 --- a/packages/contract/src/builder-variants.test-d.ts +++ b/packages/contract/src/builder-variants.test-d.ts @@ -5,10 +5,10 @@ import type { ProcedureContractBuilderWithInput, ProcedureContractBuilderWithInputOutput, ProcedureContractBuilderWithOutput, -} from './builder-variants.ts' -import type { MergedErrorMap } from './error-utils.ts' -import type { Meta } from './meta.ts' -import type { MergedSchema, Schema } from './schema.ts' +} from './builder-variants' +import type { MergedErrorMap } from './error-utils' +import type { Meta } from './meta' +import type { MergedSchema, Schema } from './schema' const errorMap = { BASE: { diff --git a/packages/contract/src/builder-variants.ts b/packages/contract/src/builder-variants.ts index 35cc299c61..9d5c7a79d2 100644 --- a/packages/contract/src/builder-variants.ts +++ b/packages/contract/src/builder-variants.ts @@ -1,9 +1,9 @@ -import type { InitialInputSchema, InitialOutputSchema } from './builder.ts' -import type { MergedErrorMap } from './error-utils.ts' -import type { ErrorMap } from './error.ts' -import type { MetaPlugin } from './meta.ts' -import type { ProcedureContract } from './procedure.ts' -import type { AnySchema, MergedSchema } from './schema.ts' +import type { InitialInputSchema, InitialOutputSchema } from './builder' +import type { ErrorMap } from './error' +import type { MergedErrorMap } from './error-utils' +import type { MetaPlugin } from './meta' +import type { ProcedureContract } from './procedure' +import type { AnySchema, MergedSchema } from './schema' /** * The contract builder variant returned after `.input` is called. diff --git a/packages/contract/src/builder.test-d.ts b/packages/contract/src/builder.test-d.ts index 60f92e76d5..5f8b079b56 100644 --- a/packages/contract/src/builder.test-d.ts +++ b/packages/contract/src/builder.test-d.ts @@ -1,17 +1,17 @@ import { describe, expectTypeOf, it } from 'vitest' import { z } from 'zod' +import type { ContractBuilder } from './builder' +import { oc } from './builder' import type { ProcedureContractBuilderWithInput, ProcedureContractBuilderWithOutput, -} from './builder-variants.ts' -import type { ContractBuilder } from './builder.ts' -import { oc } from './builder.ts' -import type { MergedErrorMap } from './error-utils.ts' -import type { Meta, MetaPlugin } from './meta.ts' -import type { ProcedureContract } from './procedure.ts' -import type { AugmentedContractRouter } from './router-utils.ts' -import type { Schema } from './schema.ts' +} from './builder-variants' +import type { MergedErrorMap } from './error-utils' +import type { Meta, MetaPlugin } from './meta' +import type { ProcedureContract } from './procedure' +import type { AugmentedContractRouter } from './router-utils' +import type { Schema } from './schema' const errorMap = { BASE: { diff --git a/packages/contract/src/builder.test.ts b/packages/contract/src/builder.test.ts index c41ff37a0b..8b76e0b4a1 100644 --- a/packages/contract/src/builder.test.ts +++ b/packages/contract/src/builder.test.ts @@ -1,13 +1,13 @@ import * as z from 'zod' -import { ContractBuilder, oc } from './builder.ts' -import * as ErrorUtilsModule from './error-utils.ts' -import type { ErrorMap } from './error.ts' -import * as MetaUtilsModule from './meta-utils.ts' -import type { AnyMetaPlugin } from './meta.ts' -import { setHiddenMetaPlugins } from './meta.ts' -import { ProcedureContract } from './procedure.ts' -import * as RouterUtilsModule from './router-utils.ts' +import { ContractBuilder, oc } from './builder' +import type { ErrorMap } from './error' +import * as ErrorUtilsModule from './error-utils' +import type { AnyMetaPlugin } from './meta' +import { setHiddenMetaPlugins } from './meta' +import * as MetaUtilsModule from './meta-utils' +import { ProcedureContract } from './procedure' +import * as RouterUtilsModule from './router-utils' const resolveMetaPluginsSpy = vi.spyOn(MetaUtilsModule, 'resolveMetaPlugins') const mergeErrorMapSpy = vi.spyOn(ErrorUtilsModule, 'mergeErrorMap') diff --git a/packages/contract/src/builder.ts b/packages/contract/src/builder.ts index c70f2ccbff..cd48e26375 100644 --- a/packages/contract/src/builder.ts +++ b/packages/contract/src/builder.ts @@ -3,19 +3,19 @@ import { toArray } from '@orpc/shared' import type { ProcedureContractBuilderWithInput, ProcedureContractBuilderWithOutput, -} from './builder-variants.ts' -import type { MergedErrorMap } from './error-utils.ts' -import { mergeErrorMap } from './error-utils.ts' -import type { ErrorMap } from './error.ts' -import { resolveMetaPlugins } from './meta-utils.ts' -import type { MetaPlugin } from './meta.ts' -import { getHiddenMetaPlugins } from './meta.ts' -import type { ProcedureContractDefinition } from './procedure.ts' -import { ProcedureContract } from './procedure.ts' -import type { AugmentedContractRouter } from './router-utils.ts' -import { augmentContractRouter } from './router-utils.ts' -import type { RouterContract } from './router.ts' -import type { AnySchema, Schema } from './schema.ts' +} from './builder-variants' +import type { ErrorMap } from './error' +import type { MergedErrorMap } from './error-utils' +import { mergeErrorMap } from './error-utils' +import type { MetaPlugin } from './meta' +import { getHiddenMetaPlugins } from './meta' +import { resolveMetaPlugins } from './meta-utils' +import type { ProcedureContractDefinition } from './procedure' +import { ProcedureContract } from './procedure' +import type { RouterContract } from './router' +import type { AugmentedContractRouter } from './router-utils' +import { augmentContractRouter } from './router-utils' +import type { AnySchema, Schema } from './schema' /** * The input schema type used before `.input` is called. diff --git a/packages/contract/src/client-factory.test-d.ts b/packages/contract/src/client-factory.test-d.ts index f3183ba0a6..05da1e2220 100644 --- a/packages/contract/src/client-factory.test-d.ts +++ b/packages/contract/src/client-factory.test-d.ts @@ -1,9 +1,9 @@ import type { ClientLink, ORPCError } from '@orpc/client' import type { PromiseWithError } from '@orpc/shared' -import { oc } from './builder.ts' -import { createContractClientFactory } from './client-factory.ts' -import { type } from './schema-utils.ts' +import { oc } from './builder' +import { createContractClientFactory } from './client-factory' +import { type } from './schema-utils' const contract = { ping: oc, diff --git a/packages/contract/src/client-factory.test.ts b/packages/contract/src/client-factory.test.ts index cada0e0a74..31fd47b25d 100644 --- a/packages/contract/src/client-factory.test.ts +++ b/packages/contract/src/client-factory.test.ts @@ -1,7 +1,7 @@ import type { ClientContext, ClientLink } from '@orpc/client' -import { createContractClientFactory } from './client-factory.ts' -import { ProcedureContract } from './procedure.ts' +import { createContractClientFactory } from './client-factory' +import { ProcedureContract } from './procedure' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/contract/src/client-factory.ts b/packages/contract/src/client-factory.ts index fc103e74d8..137e1ec0e2 100644 --- a/packages/contract/src/client-factory.ts +++ b/packages/contract/src/client-factory.ts @@ -2,10 +2,10 @@ import type { ClientContext, ClientLink, ORPCClientOptions } from '@orpc/client' import { createORPCClient } from '@orpc/client' import { get, isNonPrimitive, set } from '@orpc/shared' -import { resolveBasePathMeta } from './meta-built-in.ts' -import { ProcedureContract } from './procedure.ts' -import type { RouterContractClient } from './router-client.ts' -import type { RouterContract } from './router.ts' +import { resolveBasePathMeta } from './meta-built-in' +import { ProcedureContract } from './procedure' +import type { RouterContract } from './router' +import type { RouterContractClient } from './router-client' export interface ContractClientFactory { (contract: T): RouterContractClient diff --git a/packages/contract/src/error-factory.test-d.ts b/packages/contract/src/error-factory.test-d.ts index f5060debb7..6bfe4bf303 100644 --- a/packages/contract/src/error-factory.test-d.ts +++ b/packages/contract/src/error-factory.test-d.ts @@ -1,10 +1,10 @@ import type { ORPCError } from '@orpc/client' import * as z from 'zod' -import type { ORPCErrorConstructorMap, ORPCErrorFactory } from './error-factory.ts' -import { error } from './error-factory.ts' -import type { ErrorMap, ORPCErrorFromErrorMap } from './error.ts' -import type { Schema } from './schema.ts' +import type { ErrorMap, ORPCErrorFromErrorMap } from './error' +import type { ORPCErrorConstructorMap, ORPCErrorFactory } from './error-factory' +import { error } from './error-factory' +import type { Schema } from './schema' describe('error factory', () => { const TestError = error('TEST', { diff --git a/packages/contract/src/error-factory.test.ts b/packages/contract/src/error-factory.test.ts index ab42f78cc3..4fe8b0c4ec 100644 --- a/packages/contract/src/error-factory.test.ts +++ b/packages/contract/src/error-factory.test.ts @@ -1,9 +1,9 @@ import { ORPCError } from '@orpc/client' import * as z from 'zod' -import { createORPCErrorConstructorMap, error } from './error-factory.ts' -import { ValidationError } from './error.ts' -import type { Schema } from './schema.ts' +import { ValidationError } from './error' +import { createORPCErrorConstructorMap, error } from './error-factory' +import type { Schema } from './schema' describe('error factory', () => { const dataSchema = z.object({ value: z.number() }) diff --git a/packages/contract/src/error-factory.ts b/packages/contract/src/error-factory.ts index d9e12d3adf..108cc17e94 100644 --- a/packages/contract/src/error-factory.ts +++ b/packages/contract/src/error-factory.ts @@ -3,10 +3,10 @@ import { ORPCError, RECURSIVE_CLIENT_UNWRAP_KEYS } from '@orpc/client' import type { MaybeOptionalOptions, Writable } from '@orpc/shared' import { getOwn, resolveMaybeOptionalOptions } from '@orpc/shared' -import type { ErrorMap, ErrorMapItem } from './error.ts' -import { ValidationError } from './error.ts' -import { type } from './schema-utils.ts' -import type { AnySchema, InferSchemaInput, Schema } from './schema.ts' +import type { ErrorMap, ErrorMapItem } from './error' +import { ValidationError } from './error' +import type { AnySchema, InferSchemaInput, Schema } from './schema' +import { type } from './schema-utils' export interface ORPCErrorFactoryOptions { /** diff --git a/packages/contract/src/error-utils.test-d.ts b/packages/contract/src/error-utils.test-d.ts index 20c5855ee8..fb4c7bfb39 100644 --- a/packages/contract/src/error-utils.test-d.ts +++ b/packages/contract/src/error-utils.test-d.ts @@ -1,6 +1,6 @@ import { expectTypeOf, it } from 'vitest' -import type { MergedErrorMap } from './error-utils.ts' +import type { MergedErrorMap } from './error-utils' it('MergedErrorMap', () => { expectTypeOf< diff --git a/packages/contract/src/error-utils.test.ts b/packages/contract/src/error-utils.test.ts index 91c442d260..7d86670fb3 100644 --- a/packages/contract/src/error-utils.test.ts +++ b/packages/contract/src/error-utils.test.ts @@ -1,8 +1,8 @@ import * as ClientModule from '@orpc/client' import * as z from 'zod' -import { mergeErrorMap, reconcileORPCError } from './error-utils.ts' -import type { ErrorMap } from './error.ts' +import type { ErrorMap } from './error' +import { mergeErrorMap, reconcileORPCError } from './error-utils' const ORPCError = ClientModule.ORPCError const cloneORPCErrorSpy = vi.spyOn(ClientModule, 'cloneORPCError') diff --git a/packages/contract/src/error-utils.ts b/packages/contract/src/error-utils.ts index 005d6492dc..dae3b3e9f2 100644 --- a/packages/contract/src/error-utils.ts +++ b/packages/contract/src/error-utils.ts @@ -3,7 +3,7 @@ import { cloneORPCError } from '@orpc/client' import type { Writable } from '@orpc/shared' import { getOwn } from '@orpc/shared' -import type { ErrorMap } from './error.ts' +import type { ErrorMap } from './error' export type MergedErrorMap = keyof T1 extends // oxlint-disable-next-line typescript/no-redundant-type-constituents diff --git a/packages/contract/src/error.test-d.ts b/packages/contract/src/error.test-d.ts index f6602ac154..37ec4cfe2b 100644 --- a/packages/contract/src/error.test-d.ts +++ b/packages/contract/src/error.test-d.ts @@ -1,7 +1,7 @@ import type { ORPCError } from '@orpc/client' import * as z from 'zod' -import type { ORPCErrorFromErrorMap } from './error.ts' +import type { ORPCErrorFromErrorMap } from './error' describe('ORPCErrorFromErrorMap', () => { it('converts an error map to an ORPCError union and defaults to unknown when schema is undefined', () => { diff --git a/packages/contract/src/error.test.ts b/packages/contract/src/error.test.ts index e04d5a9cb2..8bf046d742 100644 --- a/packages/contract/src/error.test.ts +++ b/packages/contract/src/error.test.ts @@ -1,4 +1,4 @@ -import { ValidationError } from './error.ts' +import { ValidationError } from './error' it('validationError', () => { const issues = [{ path: ['a'], message: 'invalid' }] as any diff --git a/packages/contract/src/error.ts b/packages/contract/src/error.ts index 6fc473f8a9..c8cfb6a1cd 100644 --- a/packages/contract/src/error.ts +++ b/packages/contract/src/error.ts @@ -1,6 +1,6 @@ import type { ORPCError, ORPCErrorCode } from '@orpc/client' -import type { AnySchema, InferSchemaOutput, SchemaIssue } from './schema.ts' +import type { AnySchema, InferSchemaOutput, SchemaIssue } from './schema' export interface ErrorMapItem { /** diff --git a/packages/contract/src/index.test.ts b/packages/contract/src/index.test.ts index 12cdbe15d3..1a98e575e8 100644 --- a/packages/contract/src/index.test.ts +++ b/packages/contract/src/index.test.ts @@ -1,5 +1,5 @@ it('exports oc', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ oc: expect.any(Object), }) }) diff --git a/packages/contract/src/index.ts b/packages/contract/src/index.ts index 7eb5d6e867..395f849c3b 100644 --- a/packages/contract/src/index.ts +++ b/packages/contract/src/index.ts @@ -1,21 +1,21 @@ -export * from './builder.ts' -export * from './builder-variants.ts' -export * from './client-factory.ts' -export * from './error.ts' -export * from './error-factory.ts' -export * from './error-utils.ts' -export * from './meta.ts' -export * from './meta-built-in.ts' -export * from './meta-utils.ts' -export * from './procedure.ts' +export * from './builder' +export * from './builder-variants' +export * from './client-factory' +export * from './error' +export * from './error-factory' +export * from './error-utils' +export * from './meta' +export * from './meta-built-in' +export * from './meta-utils' +export * from './procedure' export type { /** * @deprecated Use `AnyProcedureContract` instead. */ AnyProcedureContract as AnyContractProcedure, -} from './procedure.ts' -export * from './procedure-client.ts' -export * from './router.ts' +} from './procedure' +export * from './procedure-client' +export * from './router' export type { /** * @deprecated Use `RouterContract` instead. @@ -33,20 +33,20 @@ export type { * @deprecated Use `InferRouterContractOutputs` instead. */ InferRouterContractOutputs as InferContractRouterOutputs, -} from './router.ts' -export * from './router-client.ts' +} from './router' +export * from './router-client' export type { /** * @deprecated Use `RouterContractClient` instead. */ RouterContractClient as ContractRouterClient, -} from './router-client.ts' +} from './router-client' export { getProcedureContractOrThrow, getRouterContract, minifyRouterContract, -} from './router-utils.ts' -export type { AugmentContractRouterOptions, AugmentedContractRouter } from './router-utils.ts' +} from './router-utils' +export type { AugmentContractRouterOptions, AugmentedContractRouter } from './router-utils' export { /** * @deprecated Use `getRouterContract` instead. @@ -56,17 +56,17 @@ export { * @deprecated Use `minifyRouterContract` instead. */ minifyRouterContract as minifyContractRouter, -} from './router-utils.ts' -export * from './schema.ts' -export { asyncIteratorObject, getAsyncIteratorObjectSchemasDetails } from './schema-built-in.ts' -export type { AsyncIteratorObjectSchemasDetails } from './schema-built-in.ts' +} from './router-utils' +export * from './schema' +export { asyncIteratorObject, getAsyncIteratorObjectSchemasDetails } from './schema-built-in' +export type { AsyncIteratorObjectSchemasDetails } from './schema-built-in' export { /** * @deprecated Use `asyncIteratorObject` instead. */ asyncIteratorObject as eventIterator, -} from './schema-built-in.ts' -export * from './schema-utils.ts' +} from './schema-built-in' +export * from './schema-utils' export type { Client, diff --git a/packages/contract/src/meta-built-in.test.ts b/packages/contract/src/meta-built-in.test.ts index 5d206b1a35..4cfd2cea96 100644 --- a/packages/contract/src/meta-built-in.test.ts +++ b/packages/contract/src/meta-built-in.test.ts @@ -1,5 +1,5 @@ -import { getPathMeta, meta, resolveBasePathMeta } from './meta-built-in.ts' -import { ProcedureContract } from './procedure.ts' +import { getPathMeta, meta, resolveBasePathMeta } from './meta-built-in' +import { ProcedureContract } from './procedure' describe('meta.path', () => { it('returns plugin with correct name', () => { diff --git a/packages/contract/src/meta-built-in.ts b/packages/contract/src/meta-built-in.ts index 204a69816d..e173435c49 100644 --- a/packages/contract/src/meta-built-in.ts +++ b/packages/contract/src/meta-built-in.ts @@ -1,10 +1,10 @@ import { isNonPrimitive } from '@orpc/shared' -import type { ErrorMap } from './error.ts' -import type { Meta, MetaPlugin } from './meta.ts' -import { ProcedureContract } from './procedure.ts' -import type { RouterContract } from './router.ts' -import type { AnySchema } from './schema.ts' +import type { ErrorMap } from './error' +import type { Meta, MetaPlugin } from './meta' +import { ProcedureContract } from './procedure' +import type { RouterContract } from './router' +import type { AnySchema } from './schema' export interface PathMetaPlugin< TInputSchema extends AnySchema, diff --git a/packages/contract/src/meta-utils.test.ts b/packages/contract/src/meta-utils.test.ts index a02e6536bb..d77a76e5a4 100644 --- a/packages/contract/src/meta-utils.test.ts +++ b/packages/contract/src/meta-utils.test.ts @@ -1,6 +1,6 @@ -import { oc } from './builder.ts' -import { defineMeta, resolveMetaPlugins } from './meta-utils.ts' -import type { AnyMetaPlugin } from './meta.ts' +import { oc } from './builder' +import type { AnyMetaPlugin } from './meta' +import { defineMeta, resolveMetaPlugins } from './meta-utils' it('resolveMetaPlugins', () => { const baseMeta = { mode: 'base' } diff --git a/packages/contract/src/meta-utils.ts b/packages/contract/src/meta-utils.ts index 36059cac02..eec9d70cdb 100644 --- a/packages/contract/src/meta-utils.ts +++ b/packages/contract/src/meta-utils.ts @@ -1,8 +1,8 @@ import { toArray } from '@orpc/shared' -import type { ErrorMap } from './error.ts' -import type { AnyMetaPlugin, Meta, MetaPlugin } from './meta.ts' -import type { AnySchema } from './schema.ts' +import type { ErrorMap } from './error' +import type { AnyMetaPlugin, Meta, MetaPlugin } from './meta' +import type { AnySchema } from './schema' export function resolveMetaPlugins< TInputSchema extends AnySchema, diff --git a/packages/contract/src/meta.test.ts b/packages/contract/src/meta.test.ts index 92d40b1615..702c478eb9 100644 --- a/packages/contract/src/meta.test.ts +++ b/packages/contract/src/meta.test.ts @@ -1,5 +1,5 @@ -import type { AnyMetaPlugin } from './meta.ts' -import { getHiddenMetaPlugins, setHiddenMetaPlugins } from './meta.ts' +import type { AnyMetaPlugin } from './meta' +import { getHiddenMetaPlugins, setHiddenMetaPlugins } from './meta' describe('getHiddenMetaPlugins', () => { const metaPlugins: AnyMetaPlugin[] = [ diff --git a/packages/contract/src/meta.ts b/packages/contract/src/meta.ts index 255f7e173c..c84287b29f 100644 --- a/packages/contract/src/meta.ts +++ b/packages/contract/src/meta.ts @@ -1,7 +1,7 @@ import { isNonPrimitive } from '@orpc/shared' -import type { ErrorMap } from './error.ts' -import type { AnySchema } from './schema.ts' +import type { ErrorMap } from './error' +import type { AnySchema } from './schema' /** * Arbitrary metadata attached to a procedure. diff --git a/packages/contract/src/plugins/index.test.ts b/packages/contract/src/plugins/index.test.ts index a9a42ec028..24c9cd2fec 100644 --- a/packages/contract/src/plugins/index.test.ts +++ b/packages/contract/src/plugins/index.test.ts @@ -1,5 +1,5 @@ it('exports RequestValidationLinkPlugin, ResponseValidationLinkPlugin', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ RequestValidationLinkPlugin: expect.any(Function), ResponseValidationLinkPlugin: expect.any(Function), }) diff --git a/packages/contract/src/plugins/index.ts b/packages/contract/src/plugins/index.ts index df6c53284d..72792ca106 100644 --- a/packages/contract/src/plugins/index.ts +++ b/packages/contract/src/plugins/index.ts @@ -1,14 +1,14 @@ -export * from './request-validation.ts' +export * from './request-validation' export { /** * @deprecated Use `RequestValidationLinkPlugin` instead. */ RequestValidationLinkPlugin as RequestValidationPlugin, -} from './request-validation.ts' -export * from './response-validation.ts' +} from './request-validation' +export * from './response-validation' export { /** * @deprecated Use `ResponseValidationLinkPlugin` instead. */ ResponseValidationLinkPlugin as ResponseValidationPlugin, -} from './response-validation.ts' +} from './response-validation' diff --git a/packages/contract/src/plugins/request-validation.test.ts b/packages/contract/src/plugins/request-validation.test.ts index 4ed600335a..bfd410f06b 100644 --- a/packages/contract/src/plugins/request-validation.test.ts +++ b/packages/contract/src/plugins/request-validation.test.ts @@ -2,9 +2,9 @@ import { ORPCError } from '@orpc/client' import { StandardLink } from '@orpc/client/standard' import * as z from 'zod' -import { ValidationError } from '../error.ts' -import { ProcedureContract } from '../procedure.ts' -import { RequestValidationLinkPlugin } from './request-validation.ts' +import { ValidationError } from '../error' +import { ProcedureContract } from '../procedure' +import { RequestValidationLinkPlugin } from './request-validation' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/contract/src/plugins/request-validation.ts b/packages/contract/src/plugins/request-validation.ts index 0cc11c5d34..e5f8767046 100644 --- a/packages/contract/src/plugins/request-validation.ts +++ b/packages/contract/src/plugins/request-validation.ts @@ -3,9 +3,9 @@ import { ORPCError } from '@orpc/client' import type { StandardLinkOptions, StandardLinkPlugin } from '@orpc/client/standard' import { mergeTwoLevels, toArray } from '@orpc/shared' -import { ValidationError } from '../error.ts' -import { getProcedureContractOrThrow } from '../router-utils.ts' -import type { RouterContract } from '../router.ts' +import { ValidationError } from '../error' +import type { RouterContract } from '../router' +import { getProcedureContractOrThrow } from '../router-utils' export interface RequestValidationLinkPluginOptions<_T extends ClientContext> { /** diff --git a/packages/contract/src/plugins/response-validation.test.ts b/packages/contract/src/plugins/response-validation.test.ts index 1fd87d4498..a6177ba558 100644 --- a/packages/contract/src/plugins/response-validation.test.ts +++ b/packages/contract/src/plugins/response-validation.test.ts @@ -2,13 +2,13 @@ import { getEventMeta, ORPCError, withEventMeta } from '@orpc/client' import { StandardLink } from '@orpc/client/standard' import * as z from 'zod' -import { reconcileORPCError } from '../error-utils.ts' -import { ValidationError } from '../error.ts' -import { ProcedureContract } from '../procedure.ts' -import { asyncIteratorObject } from '../schema-built-in.ts' -import { ResponseValidationLinkPlugin } from './response-validation.ts' +import { ValidationError } from '../error' +import { reconcileORPCError } from '../error-utils' +import { ProcedureContract } from '../procedure' +import { asyncIteratorObject } from '../schema-built-in' +import { ResponseValidationLinkPlugin } from './response-validation' -vi.mock('../error-utils.ts', async (original) => ({ +vi.mock('../error-utils', async (original) => ({ ...(await original()), reconcileORPCError: vi.fn(), })) @@ -245,7 +245,7 @@ describe('responseValidationLinkPlugin', () => { it('marks mid-stream errors as defined and applies the error data schema', async () => { const { reconcileORPCError: actualReconcileORPCError } = - await vi.importActual('../error-utils.ts') + await vi.importActual('../error-utils') vi.mocked(reconcileORPCError).mockImplementation(actualReconcileORPCError) onTestFinished(() => { vi.mocked(reconcileORPCError).mockReset() diff --git a/packages/contract/src/plugins/response-validation.ts b/packages/contract/src/plugins/response-validation.ts index 756453800a..6ce63e8927 100644 --- a/packages/contract/src/plugins/response-validation.ts +++ b/packages/contract/src/plugins/response-validation.ts @@ -4,10 +4,10 @@ import type { StandardLinkOptions, StandardLinkPlugin } from '@orpc/client/stand import type { ThrowableError } from '@orpc/shared' import { isAsyncIteratorObject, override, toArray } from '@orpc/shared' -import { reconcileORPCError } from '../error-utils.ts' -import { ValidationError } from '../error.ts' -import { getProcedureContractOrThrow } from '../router-utils.ts' -import type { RouterContract } from '../router.ts' +import { ValidationError } from '../error' +import { reconcileORPCError } from '../error-utils' +import type { RouterContract } from '../router' +import { getProcedureContractOrThrow } from '../router-utils' /** * Validates server responses against contract schemas before your application uses them. diff --git a/packages/contract/src/procedure-client.test-d.ts b/packages/contract/src/procedure-client.test-d.ts index fa20f93481..6e9a4aa807 100644 --- a/packages/contract/src/procedure-client.test-d.ts +++ b/packages/contract/src/procedure-client.test-d.ts @@ -1,7 +1,7 @@ import type { Client, ORPCError, ThrowableError } from '@orpc/client' import { z } from 'zod' -import type { ProcedureContractClient } from './procedure-client.ts' +import type { ProcedureContractClient } from './procedure-client' // Schemas should have distinct TInput and TOutput types to ensure correct inference. const inputSchema = z.object({ input: z.number().transform((n) => `${n}`) }) diff --git a/packages/contract/src/procedure-client.ts b/packages/contract/src/procedure-client.ts index 22c1a856d7..5f069ccacc 100644 --- a/packages/contract/src/procedure-client.ts +++ b/packages/contract/src/procedure-client.ts @@ -1,8 +1,8 @@ import type { Client, ClientContext } from '@orpc/client' import type { ThrowableError } from '@orpc/shared' -import type { ErrorMap, ORPCErrorFromErrorMap } from './error.ts' -import type { AnySchema, InferSchemaInput, InferSchemaOutput } from './schema.ts' +import type { ErrorMap, ORPCErrorFromErrorMap } from './error' +import type { AnySchema, InferSchemaInput, InferSchemaOutput } from './schema' export type ProcedureContractClient< TClientContext extends ClientContext, diff --git a/packages/contract/src/procedure.test.ts b/packages/contract/src/procedure.test.ts index 77fc889b51..fd3d16a45e 100644 --- a/packages/contract/src/procedure.test.ts +++ b/packages/contract/src/procedure.test.ts @@ -1,4 +1,4 @@ -import { ProcedureContract } from './procedure.ts' +import { ProcedureContract } from './procedure' describe('procedureContract', () => { const procedure = new ProcedureContract({ diff --git a/packages/contract/src/procedure.ts b/packages/contract/src/procedure.ts index 1b8f7cd419..529153b8fe 100644 --- a/packages/contract/src/procedure.ts +++ b/packages/contract/src/procedure.ts @@ -1,8 +1,8 @@ import { getConstructor, isNonPrimitive } from '@orpc/shared' -import type { ErrorMap } from './error.ts' -import type { AnyMetaPlugin, Meta } from './meta.ts' -import type { AnySchema } from './schema.ts' +import type { ErrorMap } from './error' +import type { AnyMetaPlugin, Meta } from './meta' +import type { AnySchema } from './schema' export interface ProcedureContractDefinition< TInputSchema extends AnySchema, diff --git a/packages/contract/src/router-client.test-d.ts b/packages/contract/src/router-client.test-d.ts index 2035973086..cd06e88a3c 100644 --- a/packages/contract/src/router-client.test-d.ts +++ b/packages/contract/src/router-client.test-d.ts @@ -1,8 +1,8 @@ import type { Client, ClientContext, NestedClient, ORPCError, ThrowableError } from '@orpc/client' import { z } from 'zod' -import { oc } from './builder.ts' -import type { RouterContractClient } from './router-client.ts' +import { oc } from './builder' +import type { RouterContractClient } from './router-client' // Schemas should have distinct TInput and TOutput types to ensure correct inference. const ping = oc.input(z.object({ input: z.number().transform((n) => `${n}`) })) diff --git a/packages/contract/src/router-client.ts b/packages/contract/src/router-client.ts index e548f170ae..c3690da800 100644 --- a/packages/contract/src/router-client.ts +++ b/packages/contract/src/router-client.ts @@ -1,8 +1,8 @@ import type { ClientContext } from '@orpc/client' -import type { ProcedureContractClient } from './procedure-client.ts' -import type { ProcedureContract } from './procedure.ts' -import type { RouterContract } from './router.ts' +import type { ProcedureContract } from './procedure' +import type { ProcedureContractClient } from './procedure-client' +import type { RouterContract } from './router' /** * Client type inferred from a router contract, preserving its shape. diff --git a/packages/contract/src/router-utils.test-d.ts b/packages/contract/src/router-utils.test-d.ts index 34eaaaebf4..d7280866fe 100644 --- a/packages/contract/src/router-utils.test-d.ts +++ b/packages/contract/src/router-utils.test-d.ts @@ -1,11 +1,11 @@ import { describe, expectTypeOf, it } from 'vitest' import { z } from 'zod' -import { oc } from './builder.ts' -import type { MergedErrorMap } from './error-utils.ts' -import type { ProcedureContract } from './procedure.ts' -import type { AugmentedContractRouter } from './router-utils.ts' -import type { Schema } from './schema.ts' +import { oc } from './builder' +import type { MergedErrorMap } from './error-utils' +import type { ProcedureContract } from './procedure' +import type { AugmentedContractRouter } from './router-utils' +import type { Schema } from './schema' // Schemas should have distinct TInput and TOutput types to ensure correct inference. const inputSchema = z.object({ input: z.number().transform((n) => `${n}`) }) diff --git a/packages/contract/src/router-utils.test.ts b/packages/contract/src/router-utils.test.ts index 60c277172d..92fcba7224 100644 --- a/packages/contract/src/router-utils.test.ts +++ b/packages/contract/src/router-utils.test.ts @@ -1,16 +1,16 @@ import { getOwn } from '@orpc/shared' import { z } from 'zod' -import * as ErrorUtilsModule from './error-utils.ts' -import * as MetaUtilsModule from './meta-utils.ts' -import type { AnyMetaPlugin } from './meta.ts' -import { ProcedureContract } from './procedure.ts' +import * as ErrorUtilsModule from './error-utils' +import type { AnyMetaPlugin } from './meta' +import * as MetaUtilsModule from './meta-utils' +import { ProcedureContract } from './procedure' import { augmentContractRouter, getProcedureContractOrThrow, getRouterContract, minifyRouterContract, -} from './router-utils.ts' +} from './router-utils' const mergeErrorMapSpy = vi.spyOn(ErrorUtilsModule, 'mergeErrorMap') const resolveMetaPluginsSpy = vi.spyOn(MetaUtilsModule, 'resolveMetaPlugins') diff --git a/packages/contract/src/router-utils.ts b/packages/contract/src/router-utils.ts index 61dd8c55f0..e407c9735f 100644 --- a/packages/contract/src/router-utils.ts +++ b/packages/contract/src/router-utils.ts @@ -1,13 +1,13 @@ import { getOwn, isNonPrimitive, setOwn } from '@orpc/shared' -import type { MergedErrorMap } from './error-utils.ts' -import { mergeErrorMap } from './error-utils.ts' -import type { ErrorMap } from './error.ts' -import { resolveMetaPlugins } from './meta-utils.ts' -import type { AnyMetaPlugin, Meta } from './meta.ts' -import type { AnyProcedureContract } from './procedure.ts' -import { ProcedureContract } from './procedure.ts' -import type { RouterContract } from './router.ts' +import type { ErrorMap } from './error' +import type { MergedErrorMap } from './error-utils' +import { mergeErrorMap } from './error-utils' +import type { AnyMetaPlugin, Meta } from './meta' +import { resolveMetaPlugins } from './meta-utils' +import type { AnyProcedureContract } from './procedure' +import { ProcedureContract } from './procedure' +import type { RouterContract } from './router' export type AugmentedContractRouter = T extends ProcedureContract diff --git a/packages/contract/src/router.test-d.ts b/packages/contract/src/router.test-d.ts index fb5579690e..a159365f7e 100644 --- a/packages/contract/src/router.test-d.ts +++ b/packages/contract/src/router.test-d.ts @@ -3,14 +3,14 @@ import type { ThrowableError } from '@orpc/shared' import { expectTypeOf, it } from 'vitest' import { z } from 'zod' -import { oc } from './builder.ts' +import { oc } from './builder' import type { InferRouterContractError, InferRouterContractErrorMap, InferRouterContractErrors, InferRouterContractInputs, InferRouterContractOutputs, -} from './router.ts' +} from './router' // Schemas should have distinct TInput and TOutput types to ensure correct inference. const schema1 = z.object({ schema1: z.string().transform((n) => Number(n)) }) diff --git a/packages/contract/src/router.ts b/packages/contract/src/router.ts index e5a506e176..153c72fa24 100644 --- a/packages/contract/src/router.ts +++ b/packages/contract/src/router.ts @@ -1,8 +1,8 @@ import type { ThrowableError } from '@orpc/shared' -import type { ORPCErrorFromErrorMap } from './error.ts' -import type { AnyProcedureContract, ProcedureContract } from './procedure.ts' -import type { InferSchemaInput, InferSchemaOutput } from './schema.ts' +import type { ORPCErrorFromErrorMap } from './error' +import type { AnyProcedureContract, ProcedureContract } from './procedure' +import type { InferSchemaInput, InferSchemaOutput } from './schema' /** * A router contract: a single procedure contract or a nested record of them. diff --git a/packages/contract/src/schema-built-in.test.ts b/packages/contract/src/schema-built-in.test.ts index ac37ba6d31..823a87351b 100644 --- a/packages/contract/src/schema-built-in.test.ts +++ b/packages/contract/src/schema-built-in.test.ts @@ -3,12 +3,12 @@ import { ORPCError } from '@orpc/client' import { getEventMeta, withEventMeta } from '@standard-server/core' import * as z from 'zod' -import { ValidationError } from './error.ts' +import { ValidationError } from './error' import { asyncIteratorObject, getAsyncIteratorObjectSchemaDetails, getAsyncIteratorObjectSchemasDetails, -} from './schema-built-in.ts' +} from './schema-built-in' const ORDER_SCHEMA = z.object({ order: z.number() }) diff --git a/packages/contract/src/schema-built-in.ts b/packages/contract/src/schema-built-in.ts index c1466274f4..805dbe4e8b 100644 --- a/packages/contract/src/schema-built-in.ts +++ b/packages/contract/src/schema-built-in.ts @@ -2,8 +2,8 @@ import { ORPCError, wrapAsyncIteratorPreservingEventMeta } from '@orpc/client' import type { AsyncIteratorClass } from '@orpc/shared' import { isAsyncIteratorObject, ORPC_NAME, override } from '@orpc/shared' -import { ValidationError } from './error.ts' -import type { AnySchema, Schema } from './schema.ts' +import { ValidationError } from './error' +import type { AnySchema, Schema } from './schema' const ASYNC_ITERATOR_OBJECT_SCHEMA_DETAILS_SYMBOL = /* @__PURE__ */ Symbol.for( 'ORPC_ASYNC_ITERATOR_OBJECT_SCHEMA_DETAILS', diff --git a/packages/contract/src/schema-utils.test.ts b/packages/contract/src/schema-utils.test.ts index 5caa69bf43..129cd9f668 100644 --- a/packages/contract/src/schema-utils.test.ts +++ b/packages/contract/src/schema-utils.test.ts @@ -2,7 +2,7 @@ import * as arktype from 'arktype' import * as v from 'valibot' import * as z from 'zod' -import { isSchemaIssue, type } from './schema-utils.ts' +import { isSchemaIssue, type } from './schema-utils' describe('type', async () => { it('without map', async () => { diff --git a/packages/contract/src/schema-utils.ts b/packages/contract/src/schema-utils.ts index ad5f524b55..dbf15d3893 100644 --- a/packages/contract/src/schema-utils.ts +++ b/packages/contract/src/schema-utils.ts @@ -1,7 +1,7 @@ import type { IsEqual, Promisable } from '@orpc/shared' import { isPropertyKey, isNonPrimitive, ORPC_NAME } from '@orpc/shared' -import type { Schema, SchemaIssue } from './schema.ts' +import type { Schema, SchemaIssue } from './schema' export type TypeRest = | [map: (input: TInput) => Promisable] diff --git a/packages/contract/src/schema.test-d.ts b/packages/contract/src/schema.test-d.ts index 9d8f10c03a..1703fd2835 100644 --- a/packages/contract/src/schema.test-d.ts +++ b/packages/contract/src/schema.test-d.ts @@ -2,13 +2,7 @@ import { type as arktypeType } from 'arktype' import * as v from 'valibot' import * as z from 'zod' -import type { - AnySchema, - InferSchemaInput, - InferSchemaOutput, - MergedSchema, - Schema, -} from './schema.ts' +import type { AnySchema, InferSchemaInput, InferSchemaOutput, MergedSchema, Schema } from './schema' // Schemas should have distinct TInput and TOutput types to ensure correct inference. const inputSchema = z.object({ input: z.number().transform((n) => `${n}`) }) diff --git a/packages/effect/package.json b/packages/effect/package.json index b094d3b52e..3d7206f380 100644 --- a/packages/effect/package.json +++ b/packages/effect/package.json @@ -56,7 +56,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/client": "workspace:*", diff --git a/packages/effect/src/client.test-d.ts b/packages/effect/src/client.test-d.ts index 4f69d33039..82fb624919 100644 --- a/packages/effect/src/client.test-d.ts +++ b/packages/effect/src/client.test-d.ts @@ -2,9 +2,9 @@ import type { Client, ClientContext, ORPCError } from '@orpc/client' import { isDefinedError } from '@orpc/client' import { Effect } from 'effect' -import type { EffectClient } from './client.ts' -import { createEffectClient } from './client.ts' -import { catchORPCErrorCodes } from './error.ts' +import type { EffectClient } from './client' +import { createEffectClient } from './client' +import { catchORPCErrorCodes } from './error' describe('createEffectClient', () => { const client = {} as { diff --git a/packages/effect/src/client.test.ts b/packages/effect/src/client.test.ts index 322e392a1d..b93ef1e242 100644 --- a/packages/effect/src/client.test.ts +++ b/packages/effect/src/client.test.ts @@ -2,7 +2,7 @@ import type { Client, ClientContext, ORPCError } from '@orpc/client' import { sleep } from '@orpc/shared' import { Effect, Exit, Schedule } from 'effect' -import { createEffectClient } from './client.ts' +import { createEffectClient } from './client' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/effect/src/context.test-d.ts b/packages/effect/src/context.test-d.ts index 5348e5d481..b389e8b00b 100644 --- a/packages/effect/src/context.test-d.ts +++ b/packages/effect/src/context.test-d.ts @@ -8,7 +8,7 @@ import type { EffectWrapOptions, InferEffectServices, WithEffectContext, -} from './context.ts' +} from './context' class Service1 extends Context.Service< Service1, diff --git a/packages/effect/src/converter.test.ts b/packages/effect/src/converter.test.ts index ba7e5ada46..0190a42aa1 100644 --- a/packages/effect/src/converter.test.ts +++ b/packages/effect/src/converter.test.ts @@ -1,8 +1,8 @@ import { Effect, Schema } from 'effect' import { z } from 'zod' -import { EffectSchemaToJsonSchemaConverter } from './converter.ts' -import { toStandardSchema } from './schema.ts' +import { EffectSchemaToJsonSchemaConverter } from './converter' +import { toStandardSchema } from './schema' describe('effectSchemaToJsonSchemaConverter', () => { const converter = new EffectSchemaToJsonSchemaConverter() diff --git a/packages/effect/src/error.test-d.ts b/packages/effect/src/error.test-d.ts index 5542e17183..1666081111 100644 --- a/packages/effect/src/error.test-d.ts +++ b/packages/effect/src/error.test-d.ts @@ -2,7 +2,7 @@ import type { AnyORPCError, ORPCErrorCode } from '@orpc/client' import { ORPCError } from '@orpc/client' import { Effect } from 'effect' -import { catchORPCError, catchORPCErrorCode, catchORPCErrorCodes } from './error.ts' +import { catchORPCError, catchORPCErrorCode, catchORPCErrorCodes } from './error' class Service1 { declare id: 'Service1' diff --git a/packages/effect/src/error.test.ts b/packages/effect/src/error.test.ts index 3a46742ead..6f18101315 100644 --- a/packages/effect/src/error.test.ts +++ b/packages/effect/src/error.test.ts @@ -1,7 +1,7 @@ import { ORPCError } from '@orpc/client' import { Cause, Effect, Exit } from 'effect' -import { catchORPCError, catchORPCErrorCode, catchORPCErrorCodes } from './error.ts' +import { catchORPCError, catchORPCErrorCode, catchORPCErrorCodes } from './error' describe('catchORPCError', () => { it('catches any ORPCError failure (data-last)', async () => { diff --git a/packages/effect/src/extensions/effect.test-d.ts b/packages/effect/src/extensions/effect.test-d.ts index 0feb79551c..582fcb837a 100644 --- a/packages/effect/src/extensions/effect.test-d.ts +++ b/packages/effect/src/extensions/effect.test-d.ts @@ -10,7 +10,7 @@ import type { } from '@orpc/server' import { z } from 'zod' -import './effect.ts' +import './effect' import '@orpc/server/extensions/callable' // not sure why, but we need import this to make type work const errorMap = { diff --git a/packages/effect/src/extensions/effect.test.ts b/packages/effect/src/extensions/effect.test.ts index 731081643b..bbcba27ad2 100644 --- a/packages/effect/src/extensions/effect.test.ts +++ b/packages/effect/src/extensions/effect.test.ts @@ -2,10 +2,10 @@ import { oc } from '@orpc/contract' import { call, DecoratedProcedure, implement, ImplementedProcedure, os } from '@orpc/server' import { z } from 'zod' -import * as Handler from '../handler.ts' +import * as Handler from '../handler' import '@orpc/server/extensions/callable' // not sure why, but we need import this to make type work -import './effect.ts' +import './effect' const handlerGen = vi.spyOn(Handler, 'handlerGen') diff --git a/packages/effect/src/extensions/effect.ts b/packages/effect/src/extensions/effect.ts index 461150a98c..159f445bc8 100644 --- a/packages/effect/src/extensions/effect.ts +++ b/packages/effect/src/extensions/effect.ts @@ -16,9 +16,9 @@ import type { import { Builder, ProcedureImplementer } from '@orpc/server' import type { Effect } from 'effect' -import type { InferEffectServices } from '../context.ts' -import type { HandlerGen } from '../handler.ts' -import { handlerGen } from '../handler.ts' +import type { InferEffectServices } from '../context' +import type { HandlerGen } from '../handler' +import { handlerGen } from '../handler' declare module '@orpc/server' { interface Builder { diff --git a/packages/effect/src/extensions/schema.test-d.ts b/packages/effect/src/extensions/schema.test-d.ts index 431871693a..f5e56e0a94 100644 --- a/packages/effect/src/extensions/schema.test-d.ts +++ b/packages/effect/src/extensions/schema.test-d.ts @@ -19,7 +19,7 @@ import type { import { Schema as EffectSchema } from 'effect' import { z } from 'zod' -import './schema.ts' +import './schema' const errorMap = { BASE: { diff --git a/packages/effect/src/extensions/schema.test.ts b/packages/effect/src/extensions/schema.test.ts index 789f47096d..0c2cd0a6e3 100644 --- a/packages/effect/src/extensions/schema.test.ts +++ b/packages/effect/src/extensions/schema.test.ts @@ -4,8 +4,8 @@ import { call, os } from '@orpc/server' import { Schema as EffectSchema } from 'effect' import { z } from 'zod' -import * as SchemaModule from '../schema.ts' -import './schema.ts' +import * as SchemaModule from '../schema' +import './schema' const toStandardSchemaSpy = vi.spyOn(SchemaModule, 'toStandardSchema') diff --git a/packages/effect/src/extensions/schema.ts b/packages/effect/src/extensions/schema.ts index 181fc2b980..9b0bfa844d 100644 --- a/packages/effect/src/extensions/schema.ts +++ b/packages/effect/src/extensions/schema.ts @@ -12,7 +12,7 @@ import type { Context } from '@orpc/server' import { Builder, DecoratedProcedure } from '@orpc/server' import { Schema as EffectSchema } from 'effect' -import { toStandardSchema } from '../schema.ts' +import { toStandardSchema } from '../schema' /** * Like `ErrorMapItem`, but `data` can also be an Effect Schema. diff --git a/packages/effect/src/handler.test-d.ts b/packages/effect/src/handler.test-d.ts index c6be99db4b..f4447b3c62 100644 --- a/packages/effect/src/handler.test-d.ts +++ b/packages/effect/src/handler.test-d.ts @@ -9,8 +9,8 @@ import { ORPCError, os } from '@orpc/server' import { Context, Effect } from 'effect' import { z } from 'zod' -import type { WithEffectContext } from './context.ts' -import { handlerGen } from './handler.ts' +import type { WithEffectContext } from './context' +import { handlerGen } from './handler' class Service1 extends Context.Service< Service1, diff --git a/packages/effect/src/handler.test.ts b/packages/effect/src/handler.test.ts index 3d10127b51..94629b9975 100644 --- a/packages/effect/src/handler.test.ts +++ b/packages/effect/src/handler.test.ts @@ -2,9 +2,9 @@ import { call, ORPCError, os, type } from '@orpc/server' import { Cause, Context, Effect, Option, Tracer } from 'effect' import { z } from 'zod' -import type { EffectWrapOptions, WithEffectContext } from './context.ts' -import { handlerGen } from './handler.ts' -import * as EffectModule from './runtime.ts' +import type { EffectWrapOptions, WithEffectContext } from './context' +import { handlerGen } from './handler' +import * as EffectModule from './runtime' const runPromiseSpy = vi.spyOn(EffectModule, 'runPromise') diff --git a/packages/effect/src/handler.ts b/packages/effect/src/handler.ts index f6044bacbb..9a440a12c6 100644 --- a/packages/effect/src/handler.ts +++ b/packages/effect/src/handler.ts @@ -6,8 +6,8 @@ import type { } from '@orpc/server' import { Effect, Context as EffectContext } from 'effect' -import type { InferEffectServices, WithEffectContext } from './context.ts' -import { runPromise } from './runtime.ts' +import type { InferEffectServices, WithEffectContext } from './context' +import { runPromise } from './runtime' export interface HandlerGen< TCurrentContext extends Context, diff --git a/packages/effect/src/index.test.ts b/packages/effect/src/index.test.ts index 5e7bb051fd..181640da9c 100644 --- a/packages/effect/src/index.test.ts +++ b/packages/effect/src/index.test.ts @@ -1,5 +1,5 @@ it('exports', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ handlerGen: expect.any(Function), middlewareGen: expect.any(Function), EffectSchemaToJsonSchemaConverter: expect.any(Function), diff --git a/packages/effect/src/index.ts b/packages/effect/src/index.ts index 388b1af720..4383737e49 100644 --- a/packages/effect/src/index.ts +++ b/packages/effect/src/index.ts @@ -1,8 +1,8 @@ -export * from './client.ts' -export * from './context.ts' -export * from './converter.ts' -export * from './error.ts' -export * from './handler.ts' -export * from './middleware.ts' +export * from './client' +export * from './context' +export * from './converter' +export * from './error' +export * from './handler' +export * from './middleware' export type { JsonSchema } from '@orpc/json-schema' diff --git a/packages/effect/src/middleware.test-d.ts b/packages/effect/src/middleware.test-d.ts index 3df78284a0..515f1664bc 100644 --- a/packages/effect/src/middleware.test-d.ts +++ b/packages/effect/src/middleware.test-d.ts @@ -3,8 +3,8 @@ import { os } from '@orpc/server' import { Context, Effect } from 'effect' import { z } from 'zod' -import type { WithEffectContext } from './context.ts' -import { middlewareGen } from './middleware.ts' +import type { WithEffectContext } from './context' +import { middlewareGen } from './middleware' class Service1 extends Context.Service< Service1, diff --git a/packages/effect/src/middleware.test.ts b/packages/effect/src/middleware.test.ts index b674e72140..0c78142892 100644 --- a/packages/effect/src/middleware.test.ts +++ b/packages/effect/src/middleware.test.ts @@ -3,10 +3,10 @@ import { sleep } from '@orpc/shared' import { Cause, Context, Effect, Option, References } from 'effect' import { z } from 'zod' -import type { EffectWrapOptions, WithEffectContext } from './context.ts' -import { handlerGen } from './handler.ts' -import { middlewareGen } from './middleware.ts' -import * as EffectModule from './runtime.ts' +import type { EffectWrapOptions, WithEffectContext } from './context' +import { handlerGen } from './handler' +import { middlewareGen } from './middleware' +import * as EffectModule from './runtime' const runPromiseSpy = vi.spyOn(EffectModule, 'runPromise') diff --git a/packages/effect/src/middleware.ts b/packages/effect/src/middleware.ts index 02dc3511d0..257d80d583 100644 --- a/packages/effect/src/middleware.ts +++ b/packages/effect/src/middleware.ts @@ -12,8 +12,8 @@ import type { MaybeOptionalOptions } from '@orpc/shared' import { anyAbortSignal, resolveMaybeOptionalOptions } from '@orpc/shared' import { Effect, Context as EffectContext } from 'effect' -import type { InferEffectServices, WithEffectContext } from './context.ts' -import { runPromise } from './runtime.ts' +import type { InferEffectServices, WithEffectContext } from './context' +import { runPromise } from './runtime' export interface MiddlewareGenNext { ( diff --git a/packages/effect/src/runtime.test.ts b/packages/effect/src/runtime.test.ts index f81392f128..f7211a6c42 100644 --- a/packages/effect/src/runtime.test.ts +++ b/packages/effect/src/runtime.test.ts @@ -2,7 +2,7 @@ import { AbortError } from '@orpc/shared' import { Cause, Context, Effect, Option, Scheduler } from 'effect' import { describe, expect, it, vi } from 'vitest' -import { runPromise } from './runtime.ts' +import { runPromise } from './runtime' describe('runPromise & extractErrorFromCause', () => { describe('success', () => { diff --git a/packages/effect/src/schema.test.ts b/packages/effect/src/schema.test.ts index 0272116322..6302fbb8c1 100644 --- a/packages/effect/src/schema.test.ts +++ b/packages/effect/src/schema.test.ts @@ -1,7 +1,7 @@ import { getHiddenMetaPlugins, setHiddenMetaPlugins } from '@orpc/contract' import { Schema } from 'effect' -import { toStandardSchema } from './schema.ts' +import { toStandardSchema } from './schema' describe('toStandardSchema', () => { it('convert to standard schema', () => { diff --git a/packages/evlog/package.json b/packages/evlog/package.json index 4afc785fbe..a8e8a7fd05 100644 --- a/packages/evlog/package.json +++ b/packages/evlog/package.json @@ -47,7 +47,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/client": "workspace:*", diff --git a/packages/evlog/src/adapters/node.test.ts b/packages/evlog/src/adapters/node.test.ts index 6bc3eaaa9f..d16944accd 100644 --- a/packages/evlog/src/adapters/node.test.ts +++ b/packages/evlog/src/adapters/node.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import { createLoggerStorage } from './node.ts' +import { createLoggerStorage } from './node' describe('createLoggerStorage', () => { it('exposes useLogger backed by the storage', () => { diff --git a/packages/evlog/src/context.test.ts b/packages/evlog/src/context.test.ts index b90cc81c7a..40f4040706 100644 --- a/packages/evlog/src/context.test.ts +++ b/packages/evlog/src/context.test.ts @@ -1,6 +1,6 @@ import { createRequestLogger } from 'evlog' -import { getLogger, LOGGER_CONTEXT_SYMBOL } from './context.ts' +import { getLogger, LOGGER_CONTEXT_SYMBOL } from './context' it('getLogger', async () => { expect(getLogger({})).toBeUndefined() diff --git a/packages/evlog/src/handler-plugin.test.ts b/packages/evlog/src/handler-plugin.test.ts index c7cdaf2739..257e5b4401 100644 --- a/packages/evlog/src/handler-plugin.test.ts +++ b/packages/evlog/src/handler-plugin.test.ts @@ -4,8 +4,8 @@ import { EventStreamErrorEvent } from '@standard-server/core' import type { LogLevel } from 'evlog' import { beforeEach, describe, expect, it, vi } from 'vitest' -import { LOGGER_CONTEXT_SYMBOL } from './context.ts' -import { EvlogHandlerPlugin } from './handler-plugin.ts' +import { LOGGER_CONTEXT_SYMBOL } from './context' +import { EvlogHandlerPlugin } from './handler-plugin' const mocks = vi.hoisted(() => ({ defineFrameworkIntegration: vi.fn(), diff --git a/packages/evlog/src/handler-plugin.ts b/packages/evlog/src/handler-plugin.ts index e0dfd405f2..cb506243d3 100644 --- a/packages/evlog/src/handler-plugin.ts +++ b/packages/evlog/src/handler-plugin.ts @@ -29,7 +29,7 @@ import type { } from 'evlog/toolkit' import { defineFrameworkIntegration } from 'evlog/toolkit' -import { getLogger, LOGGER_CONTEXT_SYMBOL } from './context.ts' +import { getLogger, LOGGER_CONTEXT_SYMBOL } from './context' export interface EvlogHandlerPluginOptions<_T extends Context> extends BaseEvlogOptions { /** diff --git a/packages/evlog/src/index.test.ts b/packages/evlog/src/index.test.ts index 5e7003e252..7a805f3a3f 100644 --- a/packages/evlog/src/index.test.ts +++ b/packages/evlog/src/index.test.ts @@ -1,3 +1,3 @@ it('exports EvlogHandlerPlugin', async () => { - expect(Object.keys(await import('./index.ts'))).toContain('EvlogHandlerPlugin') + expect(Object.keys(await import('./index'))).toContain('EvlogHandlerPlugin') }) diff --git a/packages/evlog/src/index.ts b/packages/evlog/src/index.ts index b70e727a08..baf5a0d9be 100644 --- a/packages/evlog/src/index.ts +++ b/packages/evlog/src/index.ts @@ -1,2 +1,2 @@ -export * from './context.ts' -export * from './handler-plugin.ts' +export * from './context' +export * from './handler-plugin' diff --git a/packages/hibernation/package.json b/packages/hibernation/package.json index 43ae6b2d62..9be6b69fe4 100644 --- a/packages/hibernation/package.json +++ b/packages/hibernation/package.json @@ -41,7 +41,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/client": "workspace:*", diff --git a/packages/hibernation/src/encode-event.test.ts b/packages/hibernation/src/encode-event.test.ts index a6419bccd9..fcd6560294 100644 --- a/packages/hibernation/src/encode-event.test.ts +++ b/packages/hibernation/src/encode-event.test.ts @@ -3,7 +3,7 @@ import { ORPCError, RPCSerializer } from '@orpc/client' import { getEventMeta, withEventMeta } from '@standard-server/core' import { encodePeerMessage } from '@standard-server/peer' -import { encodeHibernationRPCEvent } from './encode-event.ts' +import { encodeHibernationRPCEvent } from './encode-event' class Planet { constructor( diff --git a/packages/hibernation/src/handler-plugin.test.ts b/packages/hibernation/src/handler-plugin.test.ts index 3e6cd9984d..eedba082b7 100644 --- a/packages/hibernation/src/handler-plugin.test.ts +++ b/packages/hibernation/src/handler-plugin.test.ts @@ -9,8 +9,8 @@ import { } from '@standard-server/peer' import * as z from 'zod' -import { encodeHibernationRPCEvent } from './encode-event.ts' -import { HibernationHandlerPlugin } from './handler-plugin.ts' +import { encodeHibernationRPCEvent } from './encode-event' +import { HibernationHandlerPlugin } from './handler-plugin' beforeEach(() => { vi.resetAllMocks() diff --git a/packages/hibernation/src/index.test.ts b/packages/hibernation/src/index.test.ts index 16dc2bbbb3..1906f0b858 100644 --- a/packages/hibernation/src/index.test.ts +++ b/packages/hibernation/src/index.test.ts @@ -1,5 +1,5 @@ it('exports encodeHibernationRPCEvent, HibernationHandlerPlugin', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ encodeHibernationRPCEvent: expect.any(Function), HibernationHandlerPlugin: expect.any(Function), }) diff --git a/packages/hibernation/src/index.ts b/packages/hibernation/src/index.ts index 9ebe084b5d..9aee985fe8 100644 --- a/packages/hibernation/src/index.ts +++ b/packages/hibernation/src/index.ts @@ -1,11 +1,11 @@ -export * from './encode-event.ts' -export * from './handler-plugin.ts' +export * from './encode-event' +export * from './handler-plugin' export { /** * @deprecated Use `HibernationHandlerPlugin` instead. */ HibernationHandlerPlugin as HibernationPlugin, -} from './handler-plugin.ts' +} from './handler-plugin' export { /** * An async iterator designed for the Hibernation APIs. Instead of streaming diff --git a/packages/json-schema/package.json b/packages/json-schema/package.json index d9c7e8a530..1e02100c41 100644 --- a/packages/json-schema/package.json +++ b/packages/json-schema/package.json @@ -41,7 +41,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@openapi-spec/types": "~0.7.1", diff --git a/packages/json-schema/src/coercer.test.ts b/packages/json-schema/src/coercer.test.ts index 8020176b7a..5cb1166374 100644 --- a/packages/json-schema/src/coercer.test.ts +++ b/packages/json-schema/src/coercer.test.ts @@ -1,5 +1,5 @@ -import { JsonSchemaCoercer } from './coercer.ts' -import type { JsonSchema } from './types.ts' +import { JsonSchemaCoercer } from './coercer' +import type { JsonSchema } from './types' const coercer = new JsonSchemaCoercer() diff --git a/packages/json-schema/src/coercer.ts b/packages/json-schema/src/coercer.ts index 48f1c84dc1..69d89b38f4 100644 --- a/packages/json-schema/src/coercer.ts +++ b/packages/json-schema/src/coercer.ts @@ -10,9 +10,9 @@ import { tryOrUndefined, } from '@orpc/shared' -import { resolveJsonSchemaLocalPointer } from './ref-utils.ts' -import type { JsonSchema } from './types.ts' -import { JsonSchemaXNativeType } from './types.ts' +import { resolveJsonSchemaLocalPointer } from './ref-utils' +import type { JsonSchema } from './types' +import { JsonSchemaXNativeType } from './types' /** * How well a value matches a schema, used to pick the best union branch. diff --git a/packages/json-schema/src/composition-utils.test.ts b/packages/json-schema/src/composition-utils.test.ts index ffa5ef2977..bdd5022abf 100644 --- a/packages/json-schema/src/composition-utils.test.ts +++ b/packages/json-schema/src/composition-utils.test.ts @@ -7,9 +7,9 @@ import { flattenJsonUnionSchema, isJsonObjectLikeSchema, matchArrayableJsonSchema, -} from './composition-utils.ts' -import type { JsonSchema } from './types.ts' -import type { JsonObjectSchema } from './utils.ts' +} from './composition-utils' +import type { JsonSchema } from './types' +import type { JsonObjectSchema } from './utils' describe('extractJsonObjectSchemaEntries', () => { it('returns undefined for non object-able schemas', () => { diff --git a/packages/json-schema/src/composition-utils.ts b/packages/json-schema/src/composition-utils.ts index 70fa127ad5..5e32ebebca 100644 --- a/packages/json-schema/src/composition-utils.ts +++ b/packages/json-schema/src/composition-utils.ts @@ -5,17 +5,17 @@ import { get, isDeepEqual, omit, toArray } from '@orpc/shared' -import { JSON_SCHEMA_LOGIC_KEYWORDS } from './constants.ts' +import { JSON_SCHEMA_LOGIC_KEYWORDS } from './constants' import { decodeJsonPointerSegment, encodeJsonPointerSegment, hoistRecursiveRefToDef, mapJsonSchemaRefs, resolveJsonSchemaRootLocalRef, -} from './ref-utils.ts' -import type { JsonSchema } from './types.ts' -import type { JsonArraySchema, JsonObjectSchema } from './utils.ts' -import { ensureJsonSchemaObject, isJsonArraySchema, isUnconstrainedSchema } from './utils.ts' +} from './ref-utils' +import type { JsonSchema } from './types' +import type { JsonArraySchema, JsonObjectSchema } from './utils' +import { ensureJsonSchemaObject, isJsonArraySchema, isUnconstrainedSchema } from './utils' /** * Moves a schema's `$defs` into the shared root map, renaming only the names whose bodies diff --git a/packages/json-schema/src/constants.ts b/packages/json-schema/src/constants.ts index d30b8480ae..bb60fd6ab5 100644 --- a/packages/json-schema/src/constants.ts +++ b/packages/json-schema/src/constants.ts @@ -1,4 +1,4 @@ -import type { JsonSchemaKeywords } from './types.ts' +import type { JsonSchemaKeywords } from './types' export const JSON_SCHEMA_LOGIC_KEYWORDS: Set = /* @__PURE__ */ new Set([ diff --git a/packages/json-schema/src/convert.test.ts b/packages/json-schema/src/convert.test.ts index 00ac83dffd..ab49eeec48 100644 --- a/packages/json-schema/src/convert.test.ts +++ b/packages/json-schema/src/convert.test.ts @@ -1,8 +1,8 @@ import { type } from '@orpc/contract' import * as z from 'zod' -import type { JsonSchemaConverter } from './convert.ts' -import { DelegatingJsonSchemaConverter } from './convert.ts' +import type { JsonSchemaConverter } from './convert' +import { DelegatingJsonSchemaConverter } from './convert' describe('delegatingJsonSchemaConverter', () => { it('uses the first matching custom converter', () => { diff --git a/packages/json-schema/src/convert.ts b/packages/json-schema/src/convert.ts index 2d250f3ec4..3b10412ac4 100644 --- a/packages/json-schema/src/convert.ts +++ b/packages/json-schema/src/convert.ts @@ -1,6 +1,6 @@ import type { AnySchema } from '@orpc/contract' -import type { JsonSchema } from './types.ts' +import type { JsonSchema } from './types' /** * The conversion direction: `input` targets the schema's input type, `output` targets its output type. diff --git a/packages/json-schema/src/index.test.ts b/packages/json-schema/src/index.test.ts index 213f48518e..c04e062c05 100644 --- a/packages/json-schema/src/index.test.ts +++ b/packages/json-schema/src/index.test.ts @@ -1,5 +1,5 @@ it('exports utils, DelegatingJsonSchemaConverter, StandardJsonSchemaConverter, JsonSchemaCoercer, SmartCoercionHandlerPlugin, SmartCoercionLinkPlugin', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ isJsonObjectSchema: expect.any(Function), combineJsonSchemasWithComposition: expect.any(Function), ensureJsonSchemaObject: expect.any(Function), diff --git a/packages/json-schema/src/index.ts b/packages/json-schema/src/index.ts index cbea55b703..7e040b8041 100644 --- a/packages/json-schema/src/index.ts +++ b/packages/json-schema/src/index.ts @@ -1,11 +1,11 @@ -export * from './coercer.ts' -export * from './composition-utils.ts' -export * from './convert.ts' -export * from './ref-utils.ts' -export * from './smart-coercion-handler-plugin.ts' -export * from './smart-coercion-link-plugin.ts' -export * from './standard-json-schema-converter.ts' -export * from './types.ts' -export * from './utils.ts' +export * from './coercer' +export * from './composition-utils' +export * from './convert' +export * from './ref-utils' +export * from './smart-coercion-handler-plugin' +export * from './smart-coercion-link-plugin' +export * from './standard-json-schema-converter' +export * from './types' +export * from './utils' export type { AnySchema, Schema } from '@orpc/contract' diff --git a/packages/json-schema/src/ref-utils.test.ts b/packages/json-schema/src/ref-utils.test.ts index 05a6bb3fc8..bacfd193ba 100644 --- a/packages/json-schema/src/ref-utils.test.ts +++ b/packages/json-schema/src/ref-utils.test.ts @@ -6,8 +6,8 @@ import { resolveJsonSchemaLocalPointer, resolveJsonSchemaRootLocalRef, visitJsonSchemaRefs, -} from './ref-utils.ts' -import type { JsonSchema } from './types.ts' +} from './ref-utils' +import type { JsonSchema } from './types' describe('visitJsonSchemaRefs', () => { it('visits refs under the same keywords mapJsonSchemaRefs rewrites, and skips non-schema keywords', () => { diff --git a/packages/json-schema/src/ref-utils.ts b/packages/json-schema/src/ref-utils.ts index 82d2100fc6..9d1f7971ca 100644 --- a/packages/json-schema/src/ref-utils.ts +++ b/packages/json-schema/src/ref-utils.ts @@ -9,8 +9,8 @@ import { JSON_SCHEMA_LITERAL_KEYWORDS, JSON_SCHEMA_LOGIC_KEYWORDS, JSON_SCHEMA_RECORD_KEYWORDS, -} from './constants.ts' -import type { JsonSchema } from './types.ts' +} from './constants' +import type { JsonSchema } from './types' /** * Encodes a JSON Pointer segment according to RFC 6901. diff --git a/packages/json-schema/src/smart-coercion-handler-plugin.test.ts b/packages/json-schema/src/smart-coercion-handler-plugin.test.ts index da4554ee6b..de57b109aa 100644 --- a/packages/json-schema/src/smart-coercion-handler-plugin.test.ts +++ b/packages/json-schema/src/smart-coercion-handler-plugin.test.ts @@ -1,7 +1,7 @@ import { oc } from '@orpc/contract' import * as z from 'zod' -import { SmartCoercionHandlerPlugin } from './smart-coercion-handler-plugin.ts' +import { SmartCoercionHandlerPlugin } from './smart-coercion-handler-plugin' describe('smartCoercionHandlerPlugin', () => { it('prepends its interceptor and skips coercion when input schemas are missing', async () => { diff --git a/packages/json-schema/src/smart-coercion-handler-plugin.ts b/packages/json-schema/src/smart-coercion-handler-plugin.ts index 6960376a29..2f533fbf68 100644 --- a/packages/json-schema/src/smart-coercion-handler-plugin.ts +++ b/packages/json-schema/src/smart-coercion-handler-plugin.ts @@ -3,12 +3,12 @@ import type { Context } from '@orpc/server' import type { StandardHandlerOptions, StandardHandlerPlugin } from '@orpc/server/standard' import { toArray } from '@orpc/shared' -import type { JsonSchemaCoercerOptions } from './coercer.ts' -import { JsonSchemaCoercer } from './coercer.ts' -import type { JsonSchemaConverter } from './convert.ts' -import { DelegatingJsonSchemaConverter } from './convert.ts' -import { StandardJsonSchemaConverter } from './standard-json-schema-converter.ts' -import type { JsonSchema } from './types.ts' +import type { JsonSchemaCoercerOptions } from './coercer' +import { JsonSchemaCoercer } from './coercer' +import type { JsonSchemaConverter } from './convert' +import { DelegatingJsonSchemaConverter } from './convert' +import { StandardJsonSchemaConverter } from './standard-json-schema-converter' +import type { JsonSchema } from './types' export interface SmartCoercionHandlerPluginOptions extends JsonSchemaCoercerOptions { converters?: JsonSchemaConverter[] | undefined diff --git a/packages/json-schema/src/smart-coercion-link-plugin.test.ts b/packages/json-schema/src/smart-coercion-link-plugin.test.ts index c0a41e5daf..2a5ac97b8a 100644 --- a/packages/json-schema/src/smart-coercion-link-plugin.test.ts +++ b/packages/json-schema/src/smart-coercion-link-plugin.test.ts @@ -3,7 +3,7 @@ import { ORPCError } from '@orpc/client' import { oc } from '@orpc/contract' import * as z from 'zod' -import { SmartCoercionLinkPlugin } from './smart-coercion-link-plugin.ts' +import { SmartCoercionLinkPlugin } from './smart-coercion-link-plugin' describe('smartCoercionLinkPlugin', () => { beforeEach(() => { diff --git a/packages/json-schema/src/smart-coercion-link-plugin.ts b/packages/json-schema/src/smart-coercion-link-plugin.ts index f19942a6e4..951eb82b58 100644 --- a/packages/json-schema/src/smart-coercion-link-plugin.ts +++ b/packages/json-schema/src/smart-coercion-link-plugin.ts @@ -5,12 +5,12 @@ import type { AnySchema, ErrorMap, RouterContract } from '@orpc/contract' import { getProcedureContractOrThrow } from '@orpc/contract' import { getOwn, toArray } from '@orpc/shared' -import type { JsonSchemaCoercerOptions } from './coercer.ts' -import { JsonSchemaCoercer } from './coercer.ts' -import type { JsonSchemaConverter } from './convert.ts' -import { DelegatingJsonSchemaConverter } from './convert.ts' -import { StandardJsonSchemaConverter } from './standard-json-schema-converter.ts' -import type { JsonSchema } from './types.ts' +import type { JsonSchemaCoercerOptions } from './coercer' +import { JsonSchemaCoercer } from './coercer' +import type { JsonSchemaConverter } from './convert' +import { DelegatingJsonSchemaConverter } from './convert' +import { StandardJsonSchemaConverter } from './standard-json-schema-converter' +import type { JsonSchema } from './types' export interface SmartCoercionLinkPluginOptions extends JsonSchemaCoercerOptions { converters?: JsonSchemaConverter[] | undefined diff --git a/packages/json-schema/src/standard-json-schema-converter.test.ts b/packages/json-schema/src/standard-json-schema-converter.test.ts index c860cf5018..f03c03ec12 100644 --- a/packages/json-schema/src/standard-json-schema-converter.test.ts +++ b/packages/json-schema/src/standard-json-schema-converter.test.ts @@ -5,7 +5,7 @@ import * as z from 'zod' import { isStandardSchemaOptional, StandardJsonSchemaConverter, -} from './standard-json-schema-converter.ts' +} from './standard-json-schema-converter' function withStandardOverrides( schema: TSchema, diff --git a/packages/json-schema/src/standard-json-schema-converter.ts b/packages/json-schema/src/standard-json-schema-converter.ts index 131a4cc6ac..b6ecc70740 100644 --- a/packages/json-schema/src/standard-json-schema-converter.ts +++ b/packages/json-schema/src/standard-json-schema-converter.ts @@ -3,8 +3,8 @@ import { isNonPrimitive } from '@orpc/shared' // oxlint-disable-next-line no-restricted-imports import type { StandardJSONSchemaV1 } from '@standard-schema/spec' -import type { JsonSchemaConverter, JsonSchemaConverterDirection } from './convert.ts' -import type { JsonSchema } from './types.ts' +import type { JsonSchemaConverter, JsonSchemaConverterDirection } from './convert' +import type { JsonSchema } from './types' /** * Returns true when the schema accepts `undefined` in the given direction, diff --git a/packages/json-schema/src/utils.test.ts b/packages/json-schema/src/utils.test.ts index 54addd96f7..1539a74bbf 100644 --- a/packages/json-schema/src/utils.test.ts +++ b/packages/json-schema/src/utils.test.ts @@ -1,4 +1,4 @@ -import type { JsonSchema } from './types.ts' +import type { JsonSchema } from './types' import { containsJsonFileSchema, ensureJsonSchemaObject, @@ -7,7 +7,7 @@ import { isJsonObjectSchema, isJsonPrimitiveSchema, isUnconstrainedSchema, -} from './utils.ts' +} from './utils' it('isJsonPrimitiveSchema', () => { expect(isJsonPrimitiveSchema({ type: 'string' })).toBe(true) diff --git a/packages/json-schema/src/utils.ts b/packages/json-schema/src/utils.ts index 0e40315835..340192e96d 100644 --- a/packages/json-schema/src/utils.ts +++ b/packages/json-schema/src/utils.ts @@ -7,9 +7,9 @@ import { JSON_SCHEMA_LOGIC_KEYWORDS, JSON_SCHEMA_PRIMITIVE_TYPES, JSON_SCHEMA_RECORD_KEYWORDS, -} from './constants.ts' -import { resolveJsonSchemaLocalPointer } from './ref-utils.ts' -import type { JsonSchema } from './types.ts' +} from './constants' +import { resolveJsonSchemaLocalPointer } from './ref-utils' +import type { JsonSchema } from './types' /** * Returns true when the schema only describes primitive values, by a primitive `type` diff --git a/packages/lock/package.json b/packages/lock/package.json index 9f8ec82c77..f0cb8f14ff 100644 --- a/packages/lock/package.json +++ b/packages/lock/package.json @@ -68,7 +68,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/server": "workspace:*", diff --git a/packages/lock/src/adapters/base-redis.ts b/packages/lock/src/adapters/base-redis.ts index e041844012..c2b40586a3 100644 --- a/packages/lock/src/adapters/base-redis.ts +++ b/packages/lock/src/adapters/base-redis.ts @@ -1,8 +1,8 @@ import type { Promisable } from '@orpc/shared' import { sleep, throwIfAborted } from '@orpc/shared' -import { LockTimeoutError } from '../error.ts' -import type { LockCallbackOptions, Locker, LockOptions } from '../types.ts' +import { LockTimeoutError } from '../error' +import type { LockCallbackOptions, Locker, LockOptions } from '../types' const RELEASE_LOCK_SCRIPT = ` if redis.call('GET', KEYS[1]) == ARGV[1] then diff --git a/packages/lock/src/adapters/memory.test.ts b/packages/lock/src/adapters/memory.test.ts index f593114b9e..f27031f9b2 100644 --- a/packages/lock/src/adapters/memory.test.ts +++ b/packages/lock/src/adapters/memory.test.ts @@ -1,7 +1,7 @@ import { promiseWithResolvers, sleep } from '@orpc/shared' -import { LockTimeoutError } from '../error.ts' -import { MemoryLocker } from './memory.ts' +import { LockTimeoutError } from '../error' +import { MemoryLocker } from './memory' describe('memoryLocker', () => { it('runs the callback right away when the lock is free and releases it afterwards', async () => { diff --git a/packages/lock/src/adapters/memory.ts b/packages/lock/src/adapters/memory.ts index 8a05f9c718..501ceacafa 100644 --- a/packages/lock/src/adapters/memory.ts +++ b/packages/lock/src/adapters/memory.ts @@ -1,8 +1,8 @@ import type { Promisable } from '@orpc/shared' import { promiseWithResolvers, throwIfAborted } from '@orpc/shared' -import { LockTimeoutError } from '../error.ts' -import type { LockCallbackOptions, Locker, LockOptions } from '../types.ts' +import { LockTimeoutError } from '../error' +import type { LockCallbackOptions, Locker, LockOptions } from '../types' export interface MemoryLockerOptions { /** diff --git a/packages/lock/src/adapters/redis.test.ts b/packages/lock/src/adapters/redis.test.ts index a0567a500f..4baf7ffe7e 100644 --- a/packages/lock/src/adapters/redis.test.ts +++ b/packages/lock/src/adapters/redis.test.ts @@ -1,9 +1,9 @@ import { promiseWithResolvers, sleep } from '@orpc/shared' import { createClient } from 'redis' -import { LockTimeoutError } from '../error.ts' -import type { Locker, LockOptions } from '../types.ts' -import { RedisLocker } from './redis.ts' +import { LockTimeoutError } from '../error' +import type { Locker, LockOptions } from '../types' +import { RedisLocker } from './redis' const REDIS_URL = process.env.REDIS_URL diff --git a/packages/lock/src/adapters/redis.ts b/packages/lock/src/adapters/redis.ts index 9f4d97ca1b..bc340379fa 100644 --- a/packages/lock/src/adapters/redis.ts +++ b/packages/lock/src/adapters/redis.ts @@ -1,7 +1,7 @@ import type { RedisClientType } from 'redis' -import type { BaseRedisLockerOptions } from './base-redis.ts' -import { BaseRedisLocker } from './base-redis.ts' +import type { BaseRedisLockerOptions } from './base-redis' +import { BaseRedisLocker } from './base-redis' /** * Locker adapter for Redis. Acquires locks with `SET NX PX` and releases them diff --git a/packages/lock/src/adapters/upstash.test.ts b/packages/lock/src/adapters/upstash.test.ts index 7a224e7d09..f13828e922 100644 --- a/packages/lock/src/adapters/upstash.test.ts +++ b/packages/lock/src/adapters/upstash.test.ts @@ -1,9 +1,9 @@ import { promiseWithResolvers, sleep } from '@orpc/shared' import { Redis } from '@upstash/redis' -import { LockTimeoutError } from '../error.ts' -import type { Locker, LockOptions } from '../types.ts' -import { UpstashLocker } from './upstash.ts' +import { LockTimeoutError } from '../error' +import type { Locker, LockOptions } from '../types' +import { UpstashLocker } from './upstash' const UPSTASH_REDIS_REST_URL = process.env.UPSTASH_REDIS_REST_URL const UPSTASH_REDIS_REST_TOKEN = process.env.UPSTASH_REDIS_REST_TOKEN diff --git a/packages/lock/src/adapters/upstash.ts b/packages/lock/src/adapters/upstash.ts index 3a2def8745..db677f6b5c 100644 --- a/packages/lock/src/adapters/upstash.ts +++ b/packages/lock/src/adapters/upstash.ts @@ -1,7 +1,7 @@ import type { Redis } from '@upstash/redis' -import type { BaseRedisLockerOptions } from './base-redis.ts' -import { BaseRedisLocker } from './base-redis.ts' +import type { BaseRedisLockerOptions } from './base-redis' +import { BaseRedisLocker } from './base-redis' /** * Locker adapter for Upstash Redis. Acquires locks with `SET NX PX` and releases diff --git a/packages/lock/src/index.test.ts b/packages/lock/src/index.test.ts index bb4ee6a55b..f5948f4a6f 100644 --- a/packages/lock/src/index.test.ts +++ b/packages/lock/src/index.test.ts @@ -1,5 +1,5 @@ it('exports middleware factory and error', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ lock: expect.any(Function), LockTimeoutError: expect.any(Function), }) diff --git a/packages/lock/src/index.ts b/packages/lock/src/index.ts index cc708514ae..863938a3f4 100644 --- a/packages/lock/src/index.ts +++ b/packages/lock/src/index.ts @@ -1,3 +1,3 @@ -export * from './error.ts' -export * from './middleware.ts' -export * from './types.ts' +export * from './error' +export * from './middleware' +export * from './types' diff --git a/packages/lock/src/middleware.test-d.ts b/packages/lock/src/middleware.test-d.ts index 2b99bf49a3..3dfe230d3c 100644 --- a/packages/lock/src/middleware.test-d.ts +++ b/packages/lock/src/middleware.test-d.ts @@ -1,7 +1,7 @@ import { os, type } from '@orpc/server' -import { lock } from './middleware.ts' -import type { Locker } from './types.ts' +import { lock } from './middleware' +import type { Locker } from './types' describe('lock', () => { it('can infer context & input & meta types', () => { diff --git a/packages/lock/src/middleware.test.ts b/packages/lock/src/middleware.test.ts index 36173f3c06..beaed3ffc5 100644 --- a/packages/lock/src/middleware.test.ts +++ b/packages/lock/src/middleware.test.ts @@ -1,8 +1,8 @@ import { call, ORPCError, os, type } from '@orpc/server' -import { LockTimeoutError } from './error.ts' -import { lock, LOCK_MIDDLEWARE_CONTEXT_SYMBOL } from './middleware.ts' -import type { Locker } from './types.ts' +import { LockTimeoutError } from './error' +import { lock, LOCK_MIDDLEWARE_CONTEXT_SYMBOL } from './middleware' +import type { Locker } from './types' describe('lock', () => { const createLocker = (waited = false): Locker => ({ diff --git a/packages/lock/src/middleware.ts b/packages/lock/src/middleware.ts index 08a84c4048..1242fe5873 100644 --- a/packages/lock/src/middleware.ts +++ b/packages/lock/src/middleware.ts @@ -3,8 +3,8 @@ import { ORPCError } from '@orpc/server' import type { Promisable, Value } from '@orpc/shared' import { toArray, value } from '@orpc/shared' -import { LockTimeoutError } from './error.ts' -import type { Locker } from './types.ts' +import { LockTimeoutError } from './error' +import type { Locker } from './types' export const LOCK_MIDDLEWARE_CONTEXT_SYMBOL: unique symbol = /* @__PURE__ */ Symbol.for( 'ORPC_LOCK_MIDDLEWARE_CONTEXT', diff --git a/packages/lock/tests/e2e.test.ts b/packages/lock/tests/e2e.test.ts index 7e8843f7aa..d558ed8d09 100644 --- a/packages/lock/tests/e2e.test.ts +++ b/packages/lock/tests/e2e.test.ts @@ -3,9 +3,9 @@ import { RPCHandler } from '@orpc/server/fetch' import { promiseWithResolvers, sleep } from '@orpc/shared' import { z } from 'zod' -import { MemoryLocker } from '../src/adapters/memory.ts' -import type { Locker } from '../src/index.ts' -import { lock } from '../src/index.ts' +import { MemoryLocker } from '../src/adapters/memory' +import type { Locker } from '../src/index' +import { lock } from '../src/index' it('works', async () => { let active = 0 diff --git a/packages/mcp/package.json b/packages/mcp/package.json index 0f5776a581..cb88e4db04 100644 --- a/packages/mcp/package.json +++ b/packages/mcp/package.json @@ -44,7 +44,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/client": "workspace:*", diff --git a/packages/mcp/src/__tests__/utils.ts b/packages/mcp/src/__tests__/utils.ts index b385a3774e..e071eea3b6 100644 --- a/packages/mcp/src/__tests__/utils.ts +++ b/packages/mcp/src/__tests__/utils.ts @@ -1,7 +1,7 @@ import { Client, StreamableHTTPClientTransport } from '@modelcontextprotocol/client' import { createMcpHandler, InMemoryTransport, McpServer } from '@modelcontextprotocol/server' -import type { McpRegistrar, McpRegistrarRegisterOptions } from '../registrar.ts' +import type { McpRegistrar, McpRegistrarRegisterOptions } from '../registrar' export type ProtocolEra = 'legacy' | 'modern' diff --git a/packages/mcp/src/index.test.ts b/packages/mcp/src/index.test.ts index aa22b905d6..7163e59286 100644 --- a/packages/mcp/src/index.test.ts +++ b/packages/mcp/src/index.test.ts @@ -1,5 +1,5 @@ it('exports McpRegistrar and mcp', async () => { - expect(Object.keys(await import('./index.ts'))).toEqual( + expect(Object.keys(await import('./index'))).toEqual( expect.arrayContaining(['McpRegistrar', 'mcp', 'getMcpToolMeta']), ) }) diff --git a/packages/mcp/src/index.ts b/packages/mcp/src/index.ts index e1f3841b1a..cfaa0b04c4 100644 --- a/packages/mcp/src/index.ts +++ b/packages/mcp/src/index.ts @@ -1,2 +1,2 @@ -export * from './meta.ts' -export * from './registrar.ts' +export * from './meta' +export * from './registrar' diff --git a/packages/mcp/src/meta.test-d.ts b/packages/mcp/src/meta.test-d.ts index 96d2054ed6..8f9ca49c4c 100644 --- a/packages/mcp/src/meta.test-d.ts +++ b/packages/mcp/src/meta.test-d.ts @@ -2,7 +2,7 @@ import { oc } from '@orpc/contract' import { os } from '@orpc/server' import { z } from 'zod' -import { mcp } from './meta.ts' +import { mcp } from './meta' describe('mcp.tool meta', () => { it('can be used with contracts and procedures', () => { diff --git a/packages/mcp/src/meta.test.ts b/packages/mcp/src/meta.test.ts index d5947c0a5f..9591b21997 100644 --- a/packages/mcp/src/meta.test.ts +++ b/packages/mcp/src/meta.test.ts @@ -1,7 +1,7 @@ import { oc } from '@orpc/contract' import { os } from '@orpc/server' -import { getMcpToolMeta, mcp } from './meta.ts' +import { getMcpToolMeta, mcp } from './meta' describe('mcp.tool meta', () => { it('returns a plugin with name ~mcp/tool', () => { diff --git a/packages/mcp/src/registrar.test-d.ts b/packages/mcp/src/registrar.test-d.ts index 59aeeffa75..8aa64e8797 100644 --- a/packages/mcp/src/registrar.test-d.ts +++ b/packages/mcp/src/registrar.test-d.ts @@ -8,8 +8,8 @@ import type { AnyProcedure, StandardLazyRequest } from '@orpc/server' import { implement, os } from '@orpc/server' import { z } from 'zod' -import type { McpRegistered } from './registrar.ts' -import { McpRegistrar } from './registrar.ts' +import type { McpRegistered } from './registrar' +import { McpRegistrar } from './registrar' const server = new McpServer({ name: 'test-server', version: '1.0.0' }) diff --git a/packages/mcp/src/registrar.test.ts b/packages/mcp/src/registrar.test.ts index 737dfb5876..72c62eb1a1 100644 --- a/packages/mcp/src/registrar.test.ts +++ b/packages/mcp/src/registrar.test.ts @@ -12,9 +12,9 @@ import { ResponseHeadersHandlerPlugin } from '@orpc/server/plugins' import { ZodToJsonSchemaConverter } from '@orpc/zod' import { z } from 'zod' -import { createTestClient, createTestServer, PROTOCOL_ERAS } from './__tests__/utils.ts' -import { mcp } from './meta.ts' -import { McpRegistrar } from './registrar.ts' +import { createTestClient, createTestServer, PROTOCOL_ERAS } from './__tests__/utils' +import { mcp } from './meta' +import { McpRegistrar } from './registrar' const planetSchema = z.object({ id: z.number(), name: z.string() }) diff --git a/packages/mcp/src/registrar.ts b/packages/mcp/src/registrar.ts index c61a573420..55feb1364f 100644 --- a/packages/mcp/src/registrar.ts +++ b/packages/mcp/src/registrar.ts @@ -64,15 +64,15 @@ import { } from '@orpc/shared' import { flattenStandardHeader, parseStandardUrl } from '@standard-server/core' -import type { McpToolMeta } from './meta.ts' -import { getMcpToolMeta } from './meta.ts' -import type { ToolInputJsonSchema } from './utils.ts' +import type { McpToolMeta } from './meta' +import { getMcpToolMeta } from './meta' +import type { ToolInputJsonSchema } from './utils' import { resolveToolInput, resolveToolInputJsonSchema, resolveToolOutputJsonSchema, toPassthroughStandardSchema, -} from './utils.ts' +} from './utils' /** * Options for {@link McpRegistrar}. Tool calls run through a standard handler, diff --git a/packages/mcp/src/utils.test.ts b/packages/mcp/src/utils.test.ts index d709aa556a..7c62513c1f 100644 --- a/packages/mcp/src/utils.test.ts +++ b/packages/mcp/src/utils.test.ts @@ -7,7 +7,7 @@ import { resolveToolInputJsonSchema, resolveToolOutputJsonSchema, toPassthroughStandardSchema, -} from './utils.ts' +} from './utils' function createConverter(...results: [any, boolean][]): JsonSchemaConverter { let index = 0 diff --git a/packages/msw/package.json b/packages/msw/package.json index 257c743da4..acb3e730c5 100644 --- a/packages/msw/package.json +++ b/packages/msw/package.json @@ -38,7 +38,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/client": "workspace:*", diff --git a/packages/msw/src/http-procedure-utils.openapi.test.ts b/packages/msw/src/http-procedure-utils.openapi.test.ts index 152cca47e5..0613617515 100644 --- a/packages/msw/src/http-procedure-utils.openapi.test.ts +++ b/packages/msw/src/http-procedure-utils.openapi.test.ts @@ -8,7 +8,7 @@ import { http, HttpResponse } from 'msw' import { setupServer } from 'msw/node' import * as z from 'zod' -import { createHTTPUtils } from './index.ts' +import { createHTTPUtils } from './index' const contract = { planet: { diff --git a/packages/msw/src/http-procedure-utils.test-d.ts b/packages/msw/src/http-procedure-utils.test-d.ts index cac313a9b8..e5bd98db02 100644 --- a/packages/msw/src/http-procedure-utils.test-d.ts +++ b/packages/msw/src/http-procedure-utils.test-d.ts @@ -4,7 +4,7 @@ import { RPCHandler } from '@orpc/server/fetch' import type { HttpHandler } from 'msw' import * as z from 'zod' -import { createHTTPUtils } from './http-router-utils.ts' +import { createHTTPUtils } from './http-router-utils' const inputSchema = z.object({ input: z.number().transform((n) => `${n}`) }) const outputSchema = z.object({ output: z.number().transform((n) => `${n}`) }) diff --git a/packages/msw/src/http-procedure-utils.test.ts b/packages/msw/src/http-procedure-utils.test.ts index 8eef5050db..111df0bfac 100644 --- a/packages/msw/src/http-procedure-utils.test.ts +++ b/packages/msw/src/http-procedure-utils.test.ts @@ -13,7 +13,7 @@ import { http, HttpResponse } from 'msw' import { setupServer } from 'msw/node' import * as z from 'zod' -import { createHTTPUtils } from './index.ts' +import { createHTTPUtils } from './index' const contract = { planet: { diff --git a/packages/msw/src/http-router-utils.test-d.ts b/packages/msw/src/http-router-utils.test-d.ts index ce011314f0..67d5ad3c85 100644 --- a/packages/msw/src/http-router-utils.test-d.ts +++ b/packages/msw/src/http-router-utils.test-d.ts @@ -3,9 +3,9 @@ import { os } from '@orpc/server' import { RPCHandler } from '@orpc/server/fetch' import * as z from 'zod' -import type { HTTPProcedureUtils } from './http-procedure-utils.ts' -import type { HTTPRouterUtils } from './http-router-utils.ts' -import { createHTTPUtils } from './http-router-utils.ts' +import type { HTTPProcedureUtils } from './http-procedure-utils' +import type { HTTPRouterUtils } from './http-router-utils' +import { createHTTPUtils } from './http-router-utils' const inputSchema = z.object({ input: z.number().transform((n) => `${n}`) }) const outputSchema = z.object({ output: z.number().transform((n) => `${n}`) }) diff --git a/packages/msw/src/http-router-utils.test.ts b/packages/msw/src/http-router-utils.test.ts index 986e65c45b..d4381daaff 100644 --- a/packages/msw/src/http-router-utils.test.ts +++ b/packages/msw/src/http-router-utils.test.ts @@ -7,7 +7,7 @@ import { RPCHandler } from '@orpc/server/fetch' import { setupServer } from 'msw/node' import * as z from 'zod' -import { createHTTPUtils } from './http-router-utils.ts' +import { createHTTPUtils } from './http-router-utils' const contract = { ping: oc.input(z.object({ value: z.number() })).output(z.object({ value: z.number() })), diff --git a/packages/msw/src/http-router-utils.ts b/packages/msw/src/http-router-utils.ts index c8310f56d8..c8a11a0f70 100644 --- a/packages/msw/src/http-router-utils.ts +++ b/packages/msw/src/http-router-utils.ts @@ -3,8 +3,8 @@ import { ProcedureContract } from '@orpc/contract' import type { Context } from '@orpc/server' import { isNonPrimitive } from '@orpc/shared' -import type { HTTPProcedureUtilsOptions } from './http-procedure-utils.ts' -import { HTTPProcedureUtils } from './http-procedure-utils.ts' +import type { HTTPProcedureUtilsOptions } from './http-procedure-utils' +import { HTTPProcedureUtils } from './http-procedure-utils' export type HTTPRouterUtils = T extends ProcedureContract diff --git a/packages/msw/src/index.test.ts b/packages/msw/src/index.test.ts index 2c78937f41..d72bfb7e38 100644 --- a/packages/msw/src/index.test.ts +++ b/packages/msw/src/index.test.ts @@ -1,5 +1,5 @@ it('exports createHTTPUtils', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ createHTTPUtils: expect.any(Function), }) }) diff --git a/packages/msw/src/index.ts b/packages/msw/src/index.ts index 11d762a62c..48c94b2f53 100644 --- a/packages/msw/src/index.ts +++ b/packages/msw/src/index.ts @@ -1,3 +1,3 @@ -export { HTTPProcedureUtils } from './http-procedure-utils.ts' -export type { HTTPProcedureUtilsOptions } from './http-procedure-utils.ts' -export * from './http-router-utils.ts' +export { HTTPProcedureUtils } from './http-procedure-utils' +export type { HTTPProcedureUtilsOptions } from './http-procedure-utils' +export * from './http-router-utils' diff --git a/packages/nest/package.json b/packages/nest/package.json index cd3a1057f5..9c92192807 100644 --- a/packages/nest/package.json +++ b/packages/nest/package.json @@ -43,7 +43,7 @@ } }, "scripts": { - "prepack": "tsc -p tsconfig.build.json" + "prepack": "tsdown" }, "dependencies": { "@orpc/client": "workspace:*", @@ -51,7 +51,7 @@ "@orpc/openapi": "workspace:*", "@orpc/server": "workspace:*", "@orpc/shared": "workspace:*", - "@oxc-project/runtime": "^0.155.0", + "@oxc-project/runtime": "^0.157.0", "@standard-server/core": "~0.15.0", "@standard-server/node": "~0.15.0" }, diff --git a/packages/nest/src/implement.test-d.ts b/packages/nest/src/implement.test-d.ts index 0e9a704580..35a342fa17 100644 --- a/packages/nest/src/implement.test-d.ts +++ b/packages/nest/src/implement.test-d.ts @@ -3,7 +3,7 @@ import { implement, os } from '@orpc/server' import { describe, it } from 'vitest' import { z } from 'zod' -import { Implement } from './implement.ts' +import { Implement } from './implement' const inputSchema = z.object({ input: z.number().transform((n) => `${n}`) }) diff --git a/packages/nest/src/implement.test.ts b/packages/nest/src/implement.test.ts index 59e8d70993..bb305dc3b7 100644 --- a/packages/nest/src/implement.test.ts +++ b/packages/nest/src/implement.test.ts @@ -30,9 +30,9 @@ import supertest from 'supertest' import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest' import * as z from 'zod' -import { Implement } from './implement.ts' -import type { NestStandardLazyRequest } from './module.ts' -import { ORPCModule } from './module.ts' +import { Implement } from './implement' +import type { NestStandardLazyRequest } from './module' +import { ORPCModule } from './module' beforeEach(() => { vi.clearAllMocks() @@ -71,7 +71,7 @@ describe('requirements', () => { }) try { - const { Implement: ImplementWithoutQueryMethod } = await import('./implement.ts') + const { Implement: ImplementWithoutQueryMethod } = await import('./implement') const contract = oc.meta( openapi({ diff --git a/packages/nest/src/implement.ts b/packages/nest/src/implement.ts index ca156752d0..b5415c035c 100644 --- a/packages/nest/src/implement.ts +++ b/packages/nest/src/implement.ts @@ -60,8 +60,8 @@ import type { FastifyReply, FastifyRequest } from 'fastify' import type { Observable } from 'rxjs' import { mergeMap } from 'rxjs' -import { ORPC_MODULE_CONFIG_SYMBOL } from './constants.ts' -import type { NestStandardLazyRequest, ORPCModuleConfig } from './module.ts' +import { ORPC_MODULE_CONFIG_SYMBOL } from './constants' +import type { NestStandardLazyRequest, ORPCModuleConfig } from './module' // Namespace access so NestJS < 11.2 (no QueryMethod export) loads without a SyntaxError const QueryMethod = NestCommon.QueryMethod as typeof NestCommon.QueryMethod | undefined diff --git a/packages/nest/src/index.test.ts b/packages/nest/src/index.test.ts index cad67ab816..e66cdd450b 100644 --- a/packages/nest/src/index.test.ts +++ b/packages/nest/src/index.test.ts @@ -1,7 +1,7 @@ import { expect, it } from 'vitest' it('exports ORPCModule, Impl, Implement', async () => { - await expect(import('../src/index.ts')).resolves.toMatchObject({ + await expect(import('../src/index')).resolves.toMatchObject({ ORPCModule: expect.any(Function), Impl: expect.any(Function), Implement: expect.any(Function), diff --git a/packages/nest/src/index.ts b/packages/nest/src/index.ts index a2a5be92e4..222720f5e7 100644 --- a/packages/nest/src/index.ts +++ b/packages/nest/src/index.ts @@ -1,9 +1,9 @@ -export * from './constants.ts' -export * from './implement.ts' +export * from './constants' +export * from './implement' export { /** * @alias Implement */ Implement as Impl, -} from './implement.ts' -export * from './module.ts' +} from './implement' +export * from './module' diff --git a/packages/nest/src/module.test.ts b/packages/nest/src/module.test.ts index 8d18baf9c3..fa95efa144 100644 --- a/packages/nest/src/module.test.ts +++ b/packages/nest/src/module.test.ts @@ -8,8 +8,8 @@ import { implement } from '@orpc/server' import supertest from 'supertest' import { beforeEach, describe, expect, it, vi } from 'vitest' -import { Implement } from './implement.ts' -import { ORPCModule } from './module.ts' +import { Implement } from './implement' +import { ORPCModule } from './module' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/nest/src/module.ts b/packages/nest/src/module.ts index a8fcc2b88b..6eaa64b847 100644 --- a/packages/nest/src/module.ts +++ b/packages/nest/src/module.ts @@ -7,8 +7,8 @@ import type { Promisable, Value } from '@orpc/shared' import type { StandardLazyRequest } from '@standard-server/core' import type { ToEventStreamOptions } from '@standard-server/node' -import { ORPC_MODULE_CONFIG_SYMBOL } from './constants.ts' -import { ImplementInterceptor } from './implement.ts' +import { ORPC_MODULE_CONFIG_SYMBOL } from './constants' +import { ImplementInterceptor } from './implement' /** * A standard lazy request extended with NestJS route parameters, @@ -54,9 +54,10 @@ export type ORPCModuleConfig = OpenAPIHandlerCodecCoreOptions { it('on success', async () => { diff --git a/packages/next/src/extensions/actionable.test-d.ts b/packages/next/src/extensions/actionable.test-d.ts index a63c4928f0..94f9d27153 100644 --- a/packages/next/src/extensions/actionable.test-d.ts +++ b/packages/next/src/extensions/actionable.test-d.ts @@ -1,8 +1,8 @@ import type { DecoratedProcedure, Procedure } from '@orpc/server' import { z } from 'zod' -import type { ProcedureServerFunction } from '../server-function.ts' -import './actionable.ts' +import type { ProcedureServerFunction } from '../server-function' +import './actionable' const errorMap = { BASE: { diff --git a/packages/next/src/extensions/actionable.test.ts b/packages/next/src/extensions/actionable.test.ts index a6ba2ce27d..773f4145c4 100644 --- a/packages/next/src/extensions/actionable.test.ts +++ b/packages/next/src/extensions/actionable.test.ts @@ -1,8 +1,8 @@ import { os, Procedure } from '@orpc/server' import { z } from 'zod' -import * as ServerFunctionModule from '../server-function.ts' -import './actionable.ts' +import * as ServerFunctionModule from '../server-function' +import './actionable' const createServerFunctionSpy = vi.spyOn(ServerFunctionModule, 'createServerFunction') diff --git a/packages/next/src/extensions/actionable.ts b/packages/next/src/extensions/actionable.ts index 320be64807..95f99273c1 100644 --- a/packages/next/src/extensions/actionable.ts +++ b/packages/next/src/extensions/actionable.ts @@ -2,8 +2,8 @@ import type { AnySchema, Context, ErrorMap, Procedure, ProcedureClientOptions } import { DecoratedProcedure } from '@orpc/server' import type { MaybeOptionalOptions } from '@orpc/shared' -import type { ProcedureServerFunction } from '../server-function.ts' -import { createServerFunction } from '../server-function.ts' +import type { ProcedureServerFunction } from '../server-function' +import { createServerFunction } from '../server-function' declare module '@orpc/server' { interface DecoratedProcedure< diff --git a/packages/next/src/hooks/index.test.ts b/packages/next/src/hooks/index.test.ts index 111fc52e0d..c7ba7ae9be 100644 --- a/packages/next/src/hooks/index.test.ts +++ b/packages/next/src/hooks/index.test.ts @@ -1,5 +1,5 @@ it('exports useServerFunction and useOptimisticServerFunction', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ useServerFunction: expect.any(Function), useOptimisticServerFunction: expect.any(Function), }) diff --git a/packages/next/src/hooks/index.ts b/packages/next/src/hooks/index.ts index 20f785009a..8f6968c6c6 100644 --- a/packages/next/src/hooks/index.ts +++ b/packages/next/src/hooks/index.ts @@ -1,14 +1,14 @@ -export * from './optimistic-server-function.ts' +export * from './optimistic-server-function' export { /** * @deprecated Use `useOptimisticServerFunction` instead. */ useOptimisticServerFunction as useOptimisticServerAction, -} from './optimistic-server-function.ts' -export * from './server-function.ts' +} from './optimistic-server-function' +export * from './server-function' export { /** * @deprecated Use `useServerFunction` instead. */ useServerFunction as useServerAction, -} from './server-function.ts' +} from './server-function' diff --git a/packages/next/src/hooks/optimistic-server-function.test-d.ts b/packages/next/src/hooks/optimistic-server-function.test-d.ts index b0f9066395..28e7bafdd4 100644 --- a/packages/next/src/hooks/optimistic-server-function.test-d.ts +++ b/packages/next/src/hooks/optimistic-server-function.test-d.ts @@ -1,8 +1,8 @@ import { os } from '@orpc/server' import { z } from 'zod' -import { createServerFunction } from '../server-function.ts' -import { useOptimisticServerFunction } from './optimistic-server-function.ts' +import { createServerFunction } from '../server-function' +import { useOptimisticServerFunction } from './optimistic-server-function' const inputSchema = z.object({ input: z.number().transform((v) => v.toString()) }) diff --git a/packages/next/src/hooks/optimistic-server-function.test.tsx b/packages/next/src/hooks/optimistic-server-function.test.tsx index 2515a4a03c..2223cf0f20 100644 --- a/packages/next/src/hooks/optimistic-server-function.test.tsx +++ b/packages/next/src/hooks/optimistic-server-function.test.tsx @@ -3,8 +3,8 @@ import { act, renderHook, waitFor } from '@testing-library/react' import { useState } from 'react' import { z } from 'zod' -import { createServerFunction } from '../server-function.ts' -import { useOptimisticServerFunction } from './optimistic-server-function.ts' +import { createServerFunction } from '../server-function' +import { useOptimisticServerFunction } from './optimistic-server-function' export const inputSchema = z.object({ input: z.number().transform((n) => `${n}`) }) diff --git a/packages/next/src/hooks/optimistic-server-function.ts b/packages/next/src/hooks/optimistic-server-function.ts index 7a30c69873..cb661b3a53 100644 --- a/packages/next/src/hooks/optimistic-server-function.ts +++ b/packages/next/src/hooks/optimistic-server-function.ts @@ -2,9 +2,9 @@ import type { AnyORPCErrorJSON } from '@orpc/client' import { onStart, toArray } from '@orpc/shared' import { useMemo, useOptimistic } from 'react' -import type { ServerFunction, ServerFunctionError } from '../server-function.ts' -import type { UseServerFunctionOptions, UseServerFunctionResult } from './server-function.ts' -import { useServerFunction } from './server-function.ts' +import type { ServerFunction, ServerFunctionError } from '../server-function' +import type { UseServerFunctionOptions, UseServerFunctionResult } from './server-function' +import { useServerFunction } from './server-function' export interface UseOptimisticServerFunctionOptions< TInput, diff --git a/packages/next/src/hooks/server-function.test-d.ts b/packages/next/src/hooks/server-function.test-d.ts index 3e2d81e18d..ced27da64b 100644 --- a/packages/next/src/hooks/server-function.test-d.ts +++ b/packages/next/src/hooks/server-function.test-d.ts @@ -2,8 +2,8 @@ import type { ORPCError } from '@orpc/server' import { os, safe } from '@orpc/server' import * as z from 'zod' -import { createServerFunction } from '../server-function.ts' -import { useServerFunction } from './server-function.ts' +import { createServerFunction } from '../server-function' +import { useServerFunction } from './server-function' export const inputSchema = z.object({ input: z.number().transform((n) => `${n}`) }) diff --git a/packages/next/src/hooks/server-function.test.tsx b/packages/next/src/hooks/server-function.test.tsx index e4ed50d004..f36cb31759 100644 --- a/packages/next/src/hooks/server-function.test.tsx +++ b/packages/next/src/hooks/server-function.test.tsx @@ -2,8 +2,8 @@ import { ORPCError, os } from '@orpc/server' import { act, renderHook, waitFor } from '@testing-library/react' import { z } from 'zod' -import { createServerFunction } from '../server-function.ts' -import { useServerFunction } from './server-function.ts' +import { createServerFunction } from '../server-function' +import { useServerFunction } from './server-function' export const inputSchema = z.object({ input: z.number().transform((n) => `${n}`) }) diff --git a/packages/next/src/hooks/server-function.ts b/packages/next/src/hooks/server-function.ts index 2e9699588e..91f8d17dda 100644 --- a/packages/next/src/hooks/server-function.ts +++ b/packages/next/src/hooks/server-function.ts @@ -4,7 +4,7 @@ import type { Interceptor, PromiseWithError } from '@orpc/shared' import { intercept, toArray } from '@orpc/shared' import { useCallback, useMemo, useRef, useState, useTransition } from 'react' -import type { ServerFunction, ServerFunctionError } from '../server-function.ts' +import type { ServerFunction, ServerFunctionError } from '../server-function' export interface UseServerFunctionOptions { interceptors?: Interceptor<{ input: TInput }, PromiseWithError>[] | undefined diff --git a/packages/next/src/index.test.ts b/packages/next/src/index.test.ts index a482eb5418..b6b44800d5 100644 --- a/packages/next/src/index.test.ts +++ b/packages/next/src/index.test.ts @@ -1,5 +1,5 @@ it('exports server function and server functionable, deferred interceptors, form helpers', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ createServerFunction: expect.any(Function), createServerFunctionable: expect.any(Function), createServerFormFunction: expect.any(Function), diff --git a/packages/next/src/index.ts b/packages/next/src/index.ts index 8a79fb51a2..9f33efebc8 100644 --- a/packages/next/src/index.ts +++ b/packages/next/src/index.ts @@ -1,13 +1,13 @@ -export * from './deferred-interceptors.ts' -export * from './server-form-function.ts' +export * from './deferred-interceptors' +export * from './server-form-function' export { /** * @deprecated Use `createServerFormFunction` instead. */ createServerFormFunction as createFormAction, -} from './server-form-function.ts' -export * from './server-form-functionable.ts' -export * from './server-function.ts' -export * from './server-functionable.ts' +} from './server-form-function' +export * from './server-form-functionable' +export * from './server-function' +export * from './server-functionable' export { getIssueMessage, parseFormData } from '@orpc/openapi/helpers' diff --git a/packages/next/src/server-form-function.test.ts b/packages/next/src/server-form-function.test.ts index 263ebfa7a3..1c5f71f1b5 100644 --- a/packages/next/src/server-form-function.test.ts +++ b/packages/next/src/server-form-function.test.ts @@ -1,6 +1,6 @@ import * as ServerModule from '@orpc/server' -import { createServerFormFunction } from './server-form-function.ts' +import { createServerFormFunction } from './server-form-function' const createProcedureClientSpy = vi.spyOn(ServerModule, 'createProcedureClient') const { os, type } = ServerModule diff --git a/packages/next/src/server-form-functionable.test-d.ts b/packages/next/src/server-form-functionable.test-d.ts index 3a3c74909e..e50012c343 100644 --- a/packages/next/src/server-form-functionable.test-d.ts +++ b/packages/next/src/server-form-functionable.test-d.ts @@ -2,8 +2,8 @@ import type { Procedure } from '@orpc/server' import { os } from '@orpc/server' import { z } from 'zod' -import type { ServerFormFunction } from './server-form-function.ts' -import { createServerFormFunctionable } from './server-form-functionable.ts' +import type { ServerFormFunction } from './server-form-function' +import { createServerFormFunctionable } from './server-form-functionable' const errorMap = { BASE: { diff --git a/packages/next/src/server-form-functionable.test.ts b/packages/next/src/server-form-functionable.test.ts index 5aeb059e91..fd7240a979 100644 --- a/packages/next/src/server-form-functionable.test.ts +++ b/packages/next/src/server-form-functionable.test.ts @@ -1,7 +1,7 @@ import * as ServerModule from '@orpc/server' -import * as ServerFormFunctionModule from './server-form-function.ts' -import { createServerFormFunctionable } from './server-form-functionable.ts' +import * as ServerFormFunctionModule from './server-form-function' +import { createServerFormFunctionable } from './server-form-functionable' const createServerFormFunctionSpy = vi.spyOn(ServerFormFunctionModule, 'createServerFormFunction') const { os, type } = ServerModule diff --git a/packages/next/src/server-form-functionable.ts b/packages/next/src/server-form-functionable.ts index 20a6a86f33..5178c171bb 100644 --- a/packages/next/src/server-form-functionable.ts +++ b/packages/next/src/server-form-functionable.ts @@ -9,8 +9,8 @@ import type { import type { MaybeOptionalOptions } from '@orpc/shared' import { resolveMaybeOptionalOptions } from '@orpc/shared' -import type { ServerFormFunction } from './server-form-function.ts' -import { createServerFormFunction } from './server-form-function.ts' +import type { ServerFormFunction } from './server-form-function' +import { createServerFormFunction } from './server-form-function' export interface ServerFormFunctionable { < diff --git a/packages/next/src/server-function.action-state.test.tsx b/packages/next/src/server-function.action-state.test.tsx index 443edbe505..ab25154bb5 100644 --- a/packages/next/src/server-function.action-state.test.tsx +++ b/packages/next/src/server-function.action-state.test.tsx @@ -3,7 +3,7 @@ import { act, renderHook } from '@testing-library/react' import { startTransition, useActionState } from 'react' import { z } from 'zod' -import { createServerFunction } from './server-function.ts' +import { createServerFunction } from './server-function' describe('createServerFunction with useActionState', () => { const fn = createServerFunction( diff --git a/packages/next/src/server-function.test-d.ts b/packages/next/src/server-function.test-d.ts index a2ebe834b8..d17bf9e270 100644 --- a/packages/next/src/server-function.test-d.ts +++ b/packages/next/src/server-function.test-d.ts @@ -3,7 +3,7 @@ import { os } from '@orpc/server' import { useActionState } from 'react' import { z } from 'zod' -import { createServerFunction } from './server-function.ts' +import { createServerFunction } from './server-function' const errorMap = { BASE: { diff --git a/packages/next/src/server-function.test.ts b/packages/next/src/server-function.test.ts index a3578aee25..99d64a2397 100644 --- a/packages/next/src/server-function.test.ts +++ b/packages/next/src/server-function.test.ts @@ -2,7 +2,7 @@ import { ORPCError } from '@orpc/server' import * as ServerModule from '@orpc/server' import * as next from 'next/navigation.js' -import { createServerFunction } from './server-function.ts' +import { createServerFunction } from './server-function' const createProcedureClientSpy = vi.spyOn(ServerModule, 'createProcedureClient') const { os, type } = ServerModule diff --git a/packages/next/src/server-functionable.test-d.ts b/packages/next/src/server-functionable.test-d.ts index 3bdf62f865..7c1505f854 100644 --- a/packages/next/src/server-functionable.test-d.ts +++ b/packages/next/src/server-functionable.test-d.ts @@ -2,8 +2,8 @@ import type { Procedure } from '@orpc/server' import { os } from '@orpc/server' import { z } from 'zod' -import type { ProcedureServerFunction } from './server-function.ts' -import { createServerFunctionable } from './server-functionable.ts' +import type { ProcedureServerFunction } from './server-function' +import { createServerFunctionable } from './server-functionable' const errorMap = { BASE: { diff --git a/packages/next/src/server-functionable.test.ts b/packages/next/src/server-functionable.test.ts index 2fef0cb29b..9d91954726 100644 --- a/packages/next/src/server-functionable.test.ts +++ b/packages/next/src/server-functionable.test.ts @@ -1,7 +1,7 @@ import * as ServerModule from '@orpc/server' -import * as ServerFunctionModule from './server-function.ts' -import { createServerFunctionable } from './server-functionable.ts' +import * as ServerFunctionModule from './server-function' +import { createServerFunctionable } from './server-functionable' const createServerFunctionSpy = vi.spyOn(ServerFunctionModule, 'createServerFunction') const { os, type } = ServerModule diff --git a/packages/next/src/server-functionable.ts b/packages/next/src/server-functionable.ts index e4cf045623..0fcb200dbc 100644 --- a/packages/next/src/server-functionable.ts +++ b/packages/next/src/server-functionable.ts @@ -9,8 +9,8 @@ import type { import type { MaybeOptionalOptions } from '@orpc/shared' import { resolveMaybeOptionalOptions } from '@orpc/shared' -import type { ProcedureServerFunction } from './server-function.ts' -import { createServerFunction } from './server-function.ts' +import type { ProcedureServerFunction } from './server-function' +import { createServerFunction } from './server-function' export interface ServerFunctionable { < diff --git a/packages/node/package.json b/packages/node/package.json index 546f3c4790..2d4436162a 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -42,7 +42,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/server": "workspace:*", diff --git a/packages/node/src/batch-response-compression-handler-plugin.test.ts b/packages/node/src/batch-response-compression-handler-plugin.test.ts index 65d1651ddc..d931f10dab 100644 --- a/packages/node/src/batch-response-compression-handler-plugin.test.ts +++ b/packages/node/src/batch-response-compression-handler-plugin.test.ts @@ -10,8 +10,8 @@ import { } from '@orpc/server/plugins' import { promiseWithResolvers } from '@orpc/shared' -import type { BatchResponseCompressionHandlerPluginOptions } from './batch-response-compression-handler-plugin.ts' -import { BatchResponseCompressionHandlerPlugin } from './batch-response-compression-handler-plugin.ts' +import type { BatchResponseCompressionHandlerPluginOptions } from './batch-response-compression-handler-plugin' +import { BatchResponseCompressionHandlerPlugin } from './batch-response-compression-handler-plugin' // Long enough that a compressed body is unmistakably smaller than the identity one const largeValue = 'batched-payload-'.repeat(64) diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts index 7adeb50d73..8a6506cddf 100644 --- a/packages/node/src/index.ts +++ b/packages/node/src/index.ts @@ -1,3 +1,3 @@ -export * from './batch-response-compression-handler-plugin.ts' -export * from './static-file-handler-plugin.ts' -export * from './tmp-file-upload-handler-plugin.ts' +export * from './batch-response-compression-handler-plugin' +export * from './static-file-handler-plugin' +export * from './tmp-file-upload-handler-plugin' diff --git a/packages/node/src/multipart.test.ts b/packages/node/src/multipart.test.ts index d48f0fb8ad..006ffd343d 100644 --- a/packages/node/src/multipart.test.ts +++ b/packages/node/src/multipart.test.ts @@ -1,8 +1,8 @@ import { Buffer } from 'node:buffer' import { setTimeout as sleep } from 'node:timers/promises' -import type { MultipartPart } from './multipart.ts' -import { parseHeaderParameters, parseMultipart } from './multipart.ts' +import type { MultipartPart } from './multipart' +import { parseHeaderParameters, parseMultipart } from './multipart' interface CollectedPart extends MultipartPart { content: Buffer diff --git a/packages/node/src/static-file-handler-plugin.test.ts b/packages/node/src/static-file-handler-plugin.test.ts index cb74c6ee53..3f4c190417 100644 --- a/packages/node/src/static-file-handler-plugin.test.ts +++ b/packages/node/src/static-file-handler-plugin.test.ts @@ -23,8 +23,8 @@ import { ResponseCompressionHandlerPlugin } from '@orpc/server/plugins' import * as sharedModule from '@orpc/shared' import request from 'supertest' -import type { StaticFileHandlerPluginOptions } from './static-file-handler-plugin.ts' -import { StaticFileHandlerPlugin } from './static-file-handler-plugin.ts' +import type { StaticFileHandlerPluginOptions } from './static-file-handler-plugin' +import { StaticFileHandlerPlugin } from './static-file-handler-plugin' describe('staticFileHandlerPlugin', () => { let baseDir: string diff --git a/packages/node/src/tmp-file-upload-handler-plugin.test.ts b/packages/node/src/tmp-file-upload-handler-plugin.test.ts index 140456a464..db49d9a9e6 100644 --- a/packages/node/src/tmp-file-upload-handler-plugin.test.ts +++ b/packages/node/src/tmp-file-upload-handler-plugin.test.ts @@ -13,7 +13,7 @@ import type { StandardBodyHint, StandardLazyRequest } from '@standard-server/cor import { generateContentDisposition } from '@standard-server/core' import request from 'supertest' -import { TmpFile, TmpFileUploadHandlerPlugin } from './tmp-file-upload-handler-plugin.ts' +import { TmpFile, TmpFileUploadHandlerPlugin } from './tmp-file-upload-handler-plugin' describe('tmpFileUploadHandlerPlugin', () => { let tmpDir: string diff --git a/packages/node/src/tmp-file-upload-handler-plugin.ts b/packages/node/src/tmp-file-upload-handler-plugin.ts index 650a803105..125aedf30e 100644 --- a/packages/node/src/tmp-file-upload-handler-plugin.ts +++ b/packages/node/src/tmp-file-upload-handler-plugin.ts @@ -35,7 +35,7 @@ import { } from '@standard-server/core' import { toFetchHeaders, toStandardBody } from '@standard-server/fetch' -import { parseHeaderParameters, parseMultipart } from './multipart.ts' +import { parseHeaderParameters, parseMultipart } from './multipart' export interface TmpFileUploadHandlerPluginMaxBodySize { /** @@ -122,19 +122,17 @@ export interface TmpFileUploadHandlerPluginOptions { * @see {@link https://orpc.dev/docs/plugins/tmp-file-upload | Tmp File Upload Plugin} */ export class TmpFile extends File { - constructor( - blob: Blob, - /** - * Absolute path of the temporary file holding this file's content. - * The file is removed when the request finishes, so move or copy it - * to keep the content. The `File` reads from this path, so it must - * not be read after the file is moved or removed. - */ - readonly path: string, - name: string, - options?: FilePropertyBag, - ) { + /** + * Absolute path of the temporary file holding this file's content. + * The file is removed when the request finishes, so move or copy it + * to keep the content. The `File` reads from this path, so it must + * not be read after the file is moved or removed. + */ + readonly path: string + + constructor(blob: Blob, path: string, name: string, options?: FilePropertyBag) { super([blob], name, options) + this.path = path } } diff --git a/packages/node/tests/serves-static-files.test.ts b/packages/node/tests/serves-static-files.test.ts index 5d73385f0f..6c1c3b7731 100644 --- a/packages/node/tests/serves-static-files.test.ts +++ b/packages/node/tests/serves-static-files.test.ts @@ -7,7 +7,7 @@ import path from 'node:path' import { os } from '@orpc/server' import { RPCHandler } from '@orpc/server/node' -import { StaticFileHandlerPlugin } from '../src/index.ts' +import { StaticFileHandlerPlugin } from '../src/index' it('serves static files', async ({ onTestFinished }) => { const rootDir = mkdtempSync(path.join(tmpdir(), 'orpc-node-e2e-')) diff --git a/packages/node/tests/uploads-large-files.test.ts b/packages/node/tests/uploads-large-files.test.ts index a975c5afc8..aacb91c5a7 100644 --- a/packages/node/tests/uploads-large-files.test.ts +++ b/packages/node/tests/uploads-large-files.test.ts @@ -16,7 +16,7 @@ import { os, type } from '@orpc/server' import { RPCHandler } from '@orpc/server/node' import { RequestCompressionHandlerPlugin, RequestLimitHandlerPlugin } from '@orpc/server/plugins' -import { TmpFile, TmpFileUploadHandlerPlugin } from '../src/index.ts' +import { TmpFile, TmpFileUploadHandlerPlugin } from '../src/index' /** * Driven through a real http server and `RPCLink`, so uploads take the exact diff --git a/packages/node/tests/works-with-response-compression.test.ts b/packages/node/tests/works-with-response-compression.test.ts index bc2bbca0f2..e6b115366d 100644 --- a/packages/node/tests/works-with-response-compression.test.ts +++ b/packages/node/tests/works-with-response-compression.test.ts @@ -9,7 +9,7 @@ import { brotliCompressSync, brotliDecompressSync, gunzipSync } from 'node:zlib' import { RPCHandler } from '@orpc/server/node' import { ResponseCompressionHandlerPlugin } from '@orpc/server/plugins' -import { StaticFileHandlerPlugin } from '../src/index.ts' +import { StaticFileHandlerPlugin } from '../src/index' /** * Driven over a raw socket rather than `fetch`, which negotiates its own encoding and diff --git a/packages/openapi/package.json b/packages/openapi/package.json index 71b283cb6e..6c00280a79 100644 --- a/packages/openapi/package.json +++ b/packages/openapi/package.json @@ -95,7 +95,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@openapi-spec/downgrader": "~0.7.1", diff --git a/packages/openapi/src/adapters/aws-lambda/index.test.ts b/packages/openapi/src/adapters/aws-lambda/index.test.ts index 180a443432..e5697da98c 100644 --- a/packages/openapi/src/adapters/aws-lambda/index.test.ts +++ b/packages/openapi/src/adapters/aws-lambda/index.test.ts @@ -1,5 +1,5 @@ it('exports OpenAPIHandler', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ OpenAPIHandler: expect.any(Function), }) }) diff --git a/packages/openapi/src/adapters/aws-lambda/index.ts b/packages/openapi/src/adapters/aws-lambda/index.ts index 97f227e39d..b23afc0b93 100644 --- a/packages/openapi/src/adapters/aws-lambda/index.ts +++ b/packages/openapi/src/adapters/aws-lambda/index.ts @@ -1,4 +1,4 @@ -export * from './openapi-handler.ts' +export * from './openapi-handler' export type { AnyAPIGatewayProxyEvent, diff --git a/packages/openapi/src/adapters/aws-lambda/openapi-handler.test.ts b/packages/openapi/src/adapters/aws-lambda/openapi-handler.test.ts index 394479c938..010eb0038e 100644 --- a/packages/openapi/src/adapters/aws-lambda/openapi-handler.test.ts +++ b/packages/openapi/src/adapters/aws-lambda/openapi-handler.test.ts @@ -9,8 +9,8 @@ import type { HttpResponseStream, } from '@standard-server/aws-lambda' -import { openapi } from '../../meta.ts' -import { OpenAPIHandler } from './openapi-handler.ts' +import { openapi } from '../../meta' +import { OpenAPIHandler } from './openapi-handler' class TestResponseStream extends Writable implements HttpResponseStream { chunks: Buffer[] = [] diff --git a/packages/openapi/src/adapters/aws-lambda/openapi-handler.ts b/packages/openapi/src/adapters/aws-lambda/openapi-handler.ts index bb434bafc0..b2b5c82077 100644 --- a/packages/openapi/src/adapters/aws-lambda/openapi-handler.ts +++ b/packages/openapi/src/adapters/aws-lambda/openapi-handler.ts @@ -4,8 +4,8 @@ import { AwsLambdaHandler } from '@orpc/server/aws-lambda' import type { StandardHandlerOptions } from '@orpc/server/standard' import { StandardHandler } from '@orpc/server/standard' -import type { OpenAPIHandlerCodecOptions } from '../standard/index.ts' -import { OpenAPIHandlerCodec } from '../standard/index.ts' +import type { OpenAPIHandlerCodecOptions } from '../standard/index' +import { OpenAPIHandlerCodec } from '../standard/index' export interface OpenAPIHandlerOptions extends AwsLambdaHandlerOptions, StandardHandlerOptions, OpenAPIHandlerCodecOptions {} diff --git a/packages/openapi/src/adapters/fastify/index.test.ts b/packages/openapi/src/adapters/fastify/index.test.ts index 180a443432..e5697da98c 100644 --- a/packages/openapi/src/adapters/fastify/index.test.ts +++ b/packages/openapi/src/adapters/fastify/index.test.ts @@ -1,5 +1,5 @@ it('exports OpenAPIHandler', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ OpenAPIHandler: expect.any(Function), }) }) diff --git a/packages/openapi/src/adapters/fastify/index.ts b/packages/openapi/src/adapters/fastify/index.ts index e70c9b07d5..a2825c287e 100644 --- a/packages/openapi/src/adapters/fastify/index.ts +++ b/packages/openapi/src/adapters/fastify/index.ts @@ -1 +1 @@ -export * from './openapi-handler.ts' +export * from './openapi-handler' diff --git a/packages/openapi/src/adapters/fastify/openapi-handler.test.ts b/packages/openapi/src/adapters/fastify/openapi-handler.test.ts index 229f0cdeb3..1b6df8f59c 100644 --- a/packages/openapi/src/adapters/fastify/openapi-handler.test.ts +++ b/packages/openapi/src/adapters/fastify/openapi-handler.test.ts @@ -4,8 +4,8 @@ import type { FastifyInstance } from 'fastify' import Fastify from 'fastify' import request from 'supertest' -import { openapi } from '../../meta.ts' -import { OpenAPIHandler } from './openapi-handler.ts' +import { openapi } from '../../meta' +import { OpenAPIHandler } from './openapi-handler' describe('openapiHandler', () => { let app: FastifyInstance diff --git a/packages/openapi/src/adapters/fastify/openapi-handler.ts b/packages/openapi/src/adapters/fastify/openapi-handler.ts index d14e8f9bcf..bbf0a179e1 100644 --- a/packages/openapi/src/adapters/fastify/openapi-handler.ts +++ b/packages/openapi/src/adapters/fastify/openapi-handler.ts @@ -4,8 +4,8 @@ import { FastifyHandler } from '@orpc/server/fastify' import type { StandardHandlerOptions } from '@orpc/server/standard' import { StandardHandler } from '@orpc/server/standard' -import type { OpenAPIHandlerCodecOptions } from '../standard/index.ts' -import { OpenAPIHandlerCodec } from '../standard/index.ts' +import type { OpenAPIHandlerCodecOptions } from '../standard/index' +import { OpenAPIHandlerCodec } from '../standard/index' export interface OpenAPIHandlerOptions extends FastifyHandlerOptions, StandardHandlerOptions, OpenAPIHandlerCodecOptions {} diff --git a/packages/openapi/src/adapters/fetch/index.test.ts b/packages/openapi/src/adapters/fetch/index.test.ts index 201d6e494b..94c6f2d7e1 100644 --- a/packages/openapi/src/adapters/fetch/index.test.ts +++ b/packages/openapi/src/adapters/fetch/index.test.ts @@ -1,5 +1,5 @@ it('exports OpenAPIHandler and OpenAPILink', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ OpenAPIHandler: expect.any(Function), OpenAPILink: expect.any(Function), }) diff --git a/packages/openapi/src/adapters/fetch/index.ts b/packages/openapi/src/adapters/fetch/index.ts index 05e5ba503b..8e9995cf64 100644 --- a/packages/openapi/src/adapters/fetch/index.ts +++ b/packages/openapi/src/adapters/fetch/index.ts @@ -1,2 +1,2 @@ -export * from './openapi-handler.ts' -export * from './openapi-link.ts' +export * from './openapi-handler' +export * from './openapi-link' diff --git a/packages/openapi/src/adapters/fetch/openapi-handler.test.ts b/packages/openapi/src/adapters/fetch/openapi-handler.test.ts index 1a9afbf67a..974140c39b 100644 --- a/packages/openapi/src/adapters/fetch/openapi-handler.test.ts +++ b/packages/openapi/src/adapters/fetch/openapi-handler.test.ts @@ -2,9 +2,9 @@ import { createORPCClient } from '@orpc/client' import { os } from '@orpc/server' import type { StandardHandlerPlugin } from '@orpc/server/standard' -import { openapi } from '../../meta.ts' -import { OpenAPIHandler } from './openapi-handler.ts' -import { OpenAPILink } from './openapi-link.ts' +import { openapi } from '../../meta' +import { OpenAPIHandler } from './openapi-handler' +import { OpenAPILink } from './openapi-link' describe('openapiHandler', () => { beforeEach(() => { diff --git a/packages/openapi/src/adapters/fetch/openapi-handler.ts b/packages/openapi/src/adapters/fetch/openapi-handler.ts index 2254dc1316..3bcb901434 100644 --- a/packages/openapi/src/adapters/fetch/openapi-handler.ts +++ b/packages/openapi/src/adapters/fetch/openapi-handler.ts @@ -4,8 +4,8 @@ import { FetchHandler } from '@orpc/server/fetch' import type { StandardHandlerOptions } from '@orpc/server/standard' import { StandardHandler } from '@orpc/server/standard' -import type { OpenAPIHandlerCodecOptions } from '../standard/index.ts' -import { OpenAPIHandlerCodec } from '../standard/index.ts' +import type { OpenAPIHandlerCodecOptions } from '../standard/index' +import { OpenAPIHandlerCodec } from '../standard/index' export interface OpenAPIHandlerOptions extends FetchHandlerOptions, StandardHandlerOptions, OpenAPIHandlerCodecOptions {} diff --git a/packages/openapi/src/adapters/fetch/openapi-link.test.ts b/packages/openapi/src/adapters/fetch/openapi-link.test.ts index 984e052cb6..93baa7dead 100644 --- a/packages/openapi/src/adapters/fetch/openapi-link.test.ts +++ b/packages/openapi/src/adapters/fetch/openapi-link.test.ts @@ -2,9 +2,9 @@ import { createORPCClient } from '@orpc/client' import type { StandardLinkPlugin } from '@orpc/client/standard' import { os } from '@orpc/server' -import { openapi } from '../../meta.ts' -import { OpenAPIHandler } from './openapi-handler.ts' -import { OpenAPILink } from './openapi-link.ts' +import { openapi } from '../../meta' +import { OpenAPIHandler } from './openapi-handler' +import { OpenAPILink } from './openapi-link' describe('openapiLink', () => { const date = new Date('2024-01-02T03:04:05.000Z') diff --git a/packages/openapi/src/adapters/fetch/openapi-link.ts b/packages/openapi/src/adapters/fetch/openapi-link.ts index dd52157615..362ea22695 100644 --- a/packages/openapi/src/adapters/fetch/openapi-link.ts +++ b/packages/openapi/src/adapters/fetch/openapi-link.ts @@ -5,8 +5,8 @@ import type { StandardLinkOptions } from '@orpc/client/standard' import { StandardLink } from '@orpc/client/standard' import type { RouterContract } from '@orpc/contract' -import type { OpenAPILinkCodecOptions } from '../standard/index.ts' -import { OpenAPILinkCodec } from '../standard/index.ts' +import type { OpenAPILinkCodecOptions } from '../standard/index' +import { OpenAPILinkCodec } from '../standard/index' export interface OpenAPILinkOptions extends StandardLinkOptions, FetchLinkTransportOptions, OpenAPILinkCodecOptions {} diff --git a/packages/openapi/src/adapters/node/index.test.ts b/packages/openapi/src/adapters/node/index.test.ts index 180a443432..e5697da98c 100644 --- a/packages/openapi/src/adapters/node/index.test.ts +++ b/packages/openapi/src/adapters/node/index.test.ts @@ -1,5 +1,5 @@ it('exports OpenAPIHandler', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ OpenAPIHandler: expect.any(Function), }) }) diff --git a/packages/openapi/src/adapters/node/index.ts b/packages/openapi/src/adapters/node/index.ts index e70c9b07d5..a2825c287e 100644 --- a/packages/openapi/src/adapters/node/index.ts +++ b/packages/openapi/src/adapters/node/index.ts @@ -1 +1 @@ -export * from './openapi-handler.ts' +export * from './openapi-handler' diff --git a/packages/openapi/src/adapters/node/openapi-handler.test.ts b/packages/openapi/src/adapters/node/openapi-handler.test.ts index 1f417b5f3b..2643697bbf 100644 --- a/packages/openapi/src/adapters/node/openapi-handler.test.ts +++ b/packages/openapi/src/adapters/node/openapi-handler.test.ts @@ -4,8 +4,8 @@ import { os } from '@orpc/server' import type { StandardHandlerPlugin } from '@orpc/server/standard' import request from 'supertest' -import { openapi } from '../../meta.ts' -import { OpenAPIHandler } from './openapi-handler.ts' +import { openapi } from '../../meta' +import { OpenAPIHandler } from './openapi-handler' describe('openapiHandler', () => { beforeEach(() => { diff --git a/packages/openapi/src/adapters/node/openapi-handler.ts b/packages/openapi/src/adapters/node/openapi-handler.ts index c6be6f6957..2a3b3b0445 100644 --- a/packages/openapi/src/adapters/node/openapi-handler.ts +++ b/packages/openapi/src/adapters/node/openapi-handler.ts @@ -4,8 +4,8 @@ import { NodeHttpHandler } from '@orpc/server/node' import type { StandardHandlerOptions } from '@orpc/server/standard' import { StandardHandler } from '@orpc/server/standard' -import type { OpenAPIHandlerCodecOptions } from '../standard/index.ts' -import { OpenAPIHandlerCodec } from '../standard/index.ts' +import type { OpenAPIHandlerCodecOptions } from '../standard/index' +import { OpenAPIHandlerCodec } from '../standard/index' export interface OpenAPIHandlerOptions extends NodeHttpHandlerOptions, StandardHandlerOptions, OpenAPIHandlerCodecOptions {} diff --git a/packages/openapi/src/adapters/standard/index.test.ts b/packages/openapi/src/adapters/standard/index.test.ts index 5794975110..bc5406ae14 100644 --- a/packages/openapi/src/adapters/standard/index.test.ts +++ b/packages/openapi/src/adapters/standard/index.test.ts @@ -1,5 +1,5 @@ it('exports OpenAPIMatcher, OpenAPIHandlerCodec, OpenAPILinkCodec', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ OpenAPIMatcher: expect.any(Function), OpenAPIHandlerCodec: expect.any(Function), OpenAPILinkCodec: expect.any(Function), diff --git a/packages/openapi/src/adapters/standard/index.ts b/packages/openapi/src/adapters/standard/index.ts index 46ee51c543..a754da32a1 100644 --- a/packages/openapi/src/adapters/standard/index.ts +++ b/packages/openapi/src/adapters/standard/index.ts @@ -1,3 +1,3 @@ -export * from './openapi-handler-codec.ts' -export * from './openapi-link-codec.ts' -export * from './openapi-matcher.ts' +export * from './openapi-handler-codec' +export * from './openapi-link-codec' +export * from './openapi-matcher' diff --git a/packages/openapi/src/adapters/standard/openapi-handler-codec.test.ts b/packages/openapi/src/adapters/standard/openapi-handler-codec.test.ts index b8844bb35c..7953d4dd41 100644 --- a/packages/openapi/src/adapters/standard/openapi-handler-codec.test.ts +++ b/packages/openapi/src/adapters/standard/openapi-handler-codec.test.ts @@ -2,8 +2,8 @@ import { ORPCError } from '@orpc/client' import { DEFAULT_ERROR_STATUS, os } from '@orpc/server' import type { StandardLazyRequest } from '@standard-server/core' -import { openapi } from '../../meta.ts' -import { OpenAPIHandlerCodec } from './openapi-handler-codec.ts' +import { openapi } from '../../meta' +import { OpenAPIHandlerCodec } from './openapi-handler-codec' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/openapi/src/adapters/standard/openapi-handler-codec.ts b/packages/openapi/src/adapters/standard/openapi-handler-codec.ts index 1a047cd41d..a0b3d1ed6e 100644 --- a/packages/openapi/src/adapters/standard/openapi-handler-codec.ts +++ b/packages/openapi/src/adapters/standard/openapi-handler-codec.ts @@ -19,17 +19,14 @@ import { import type { StandardLazyRequest, StandardResponse } from '@standard-server/core' import { parseStandardUrl } from '@standard-server/core' -import { - DEFAULT_OPENAPI_INPUT_STRUCTURE, - DEFAULT_OPENAPI_OUTPUT_STRUCTURE, -} from '../../constants.ts' -import type { OpenAPIMeta } from '../../meta.ts' -import { getOpenAPIMeta } from '../../meta.ts' -import { OpenAPISerializer } from '../../openapi-serializer.ts' -import { isBodylessMethod } from '../../utils.ts' -import type { OpenAPIMatcherOptions } from './openapi-matcher.ts' -import { OpenAPIMatcher } from './openapi-matcher.ts' -import { serializeHeaders } from './utils.ts' +import { DEFAULT_OPENAPI_INPUT_STRUCTURE, DEFAULT_OPENAPI_OUTPUT_STRUCTURE } from '../../constants' +import type { OpenAPIMeta } from '../../meta' +import { getOpenAPIMeta } from '../../meta' +import { OpenAPISerializer } from '../../openapi-serializer' +import { isBodylessMethod } from '../../utils' +import type { OpenAPIMatcherOptions } from './openapi-matcher' +import { OpenAPIMatcher } from './openapi-matcher' +import { serializeHeaders } from './utils' export interface OpenAPIHandlerCodecCoreOptions<_T extends Context> { /** diff --git a/packages/openapi/src/adapters/standard/openapi-link-codec.test.ts b/packages/openapi/src/adapters/standard/openapi-link-codec.test.ts index 873ad38bd3..4a899f628d 100644 --- a/packages/openapi/src/adapters/standard/openapi-link-codec.test.ts +++ b/packages/openapi/src/adapters/standard/openapi-link-codec.test.ts @@ -1,9 +1,9 @@ import { MalformedResponseError, ORPCError, ResponseError } from '@orpc/client' import { oc } from '@orpc/contract' -import { openapi } from '../../meta.ts' -import { OpenAPISerializer } from '../../openapi-serializer.ts' -import { OpenAPILinkCodec } from './openapi-link-codec.ts' +import { openapi } from '../../meta' +import { OpenAPISerializer } from '../../openapi-serializer' +import { OpenAPILinkCodec } from './openapi-link-codec' const serializer = new OpenAPISerializer() diff --git a/packages/openapi/src/adapters/standard/openapi-link-codec.ts b/packages/openapi/src/adapters/standard/openapi-link-codec.ts index 0c40a04619..5b35d8e1d1 100644 --- a/packages/openapi/src/adapters/standard/openapi-link-codec.ts +++ b/packages/openapi/src/adapters/standard/openapi-link-codec.ts @@ -35,12 +35,12 @@ import { DEFAULT_OPENAPI_INPUT_STRUCTURE, DEFAULT_OPENAPI_METHOD, DEFAULT_OPENAPI_OUTPUT_STRUCTURE, -} from '../../constants.ts' -import type { OpenAPIMeta } from '../../meta.ts' -import { getOpenAPIMeta } from '../../meta.ts' -import { OpenAPISerializer } from '../../openapi-serializer.ts' -import { getDynamicPathParams, isBodylessMethod } from '../../utils.ts' -import { serializeHeaders } from './utils.ts' +} from '../../constants' +import type { OpenAPIMeta } from '../../meta' +import { getOpenAPIMeta } from '../../meta' +import { OpenAPISerializer } from '../../openapi-serializer' +import { getDynamicPathParams, isBodylessMethod } from '../../utils' +import { serializeHeaders } from './utils' export interface OpenAPILinkCodecOptions { /** diff --git a/packages/openapi/src/adapters/standard/openapi-matcher.test.ts b/packages/openapi/src/adapters/standard/openapi-matcher.test.ts index b323231126..10cc3bfe25 100644 --- a/packages/openapi/src/adapters/standard/openapi-matcher.test.ts +++ b/packages/openapi/src/adapters/standard/openapi-matcher.test.ts @@ -2,8 +2,8 @@ import { oc } from '@orpc/contract' import { call, implement, os } from '@orpc/server' import { z } from 'zod' -import { getOpenAPIMeta, openapi } from '../../meta.ts' -import { OpenAPIMatcher } from './openapi-matcher.ts' +import { getOpenAPIMeta, openapi } from '../../meta' +import { OpenAPIMatcher } from './openapi-matcher' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/openapi/src/adapters/standard/openapi-matcher.ts b/packages/openapi/src/adapters/standard/openapi-matcher.ts index 76b24d0013..6a82053849 100644 --- a/packages/openapi/src/adapters/standard/openapi-matcher.ts +++ b/packages/openapi/src/adapters/standard/openapi-matcher.ts @@ -10,8 +10,8 @@ import { import type { Value } from '@orpc/shared' import { mergeHttpPath, pathToHttpPath, stripHttpPathPrefix, value } from '@orpc/shared' -import { DEFAULT_OPENAPI_METHOD } from '../../constants.ts' -import { getOpenAPIMeta } from '../../meta.ts' +import { DEFAULT_OPENAPI_METHOD } from '../../constants' +import { getOpenAPIMeta } from '../../meta' export interface OpenAPIMatcherOptions { /** diff --git a/packages/openapi/src/adapters/standard/utils.test.ts b/packages/openapi/src/adapters/standard/utils.test.ts index 1867bb0445..277b8f7ad7 100644 --- a/packages/openapi/src/adapters/standard/utils.test.ts +++ b/packages/openapi/src/adapters/standard/utils.test.ts @@ -1,5 +1,5 @@ -import { OpenAPISerializer } from '../../openapi-serializer.ts' -import { serializeHeaders } from './utils.ts' +import { OpenAPISerializer } from '../../openapi-serializer' +import { serializeHeaders } from './utils' const serializer = new OpenAPISerializer() diff --git a/packages/openapi/src/adapters/standard/utils.ts b/packages/openapi/src/adapters/standard/utils.ts index e7b68bce8b..ea3c7fd020 100644 --- a/packages/openapi/src/adapters/standard/utils.ts +++ b/packages/openapi/src/adapters/standard/utils.ts @@ -2,7 +2,7 @@ import type { Public } from '@orpc/shared' import { isNonPrimitive, NullProtoObj } from '@orpc/shared' import type { StandardHeaders } from '@standard-server/core' -import type { OpenAPIJsonSerializer } from '../../openapi-json-serializer.ts' +import type { OpenAPIJsonSerializer } from '../../openapi-json-serializer' export function serializeHeaders( headers: object, diff --git a/packages/openapi/src/bracket-notation.test.ts b/packages/openapi/src/bracket-notation.test.ts index c215db32a9..0e0bd619ef 100644 --- a/packages/openapi/src/bracket-notation.test.ts +++ b/packages/openapi/src/bracket-notation.test.ts @@ -1,6 +1,6 @@ import { setFlagsFromString } from 'node:v8' -import { BracketNotationSerializer } from './bracket-notation.ts' +import { BracketNotationSerializer } from './bracket-notation' describe('bracket notation serializer', () => { const serializer = new BracketNotationSerializer() diff --git a/packages/openapi/src/client-factory.test-d.ts b/packages/openapi/src/client-factory.test-d.ts index 5c359c647d..df2c814d60 100644 --- a/packages/openapi/src/client-factory.test-d.ts +++ b/packages/openapi/src/client-factory.test-d.ts @@ -2,7 +2,7 @@ import type { ClientLink, ORPCError } from '@orpc/client' import { oc, type } from '@orpc/contract' import type { PromiseWithError } from '@orpc/shared' -import { createContractJsonifiedClientFactory } from './client-factory.ts' +import { createContractJsonifiedClientFactory } from './client-factory' const contract = { ping: oc, diff --git a/packages/openapi/src/client-factory.test.ts b/packages/openapi/src/client-factory.test.ts index 723d22c6bd..5a8a267c04 100644 --- a/packages/openapi/src/client-factory.test.ts +++ b/packages/openapi/src/client-factory.test.ts @@ -1,7 +1,7 @@ import type { ClientContext, ClientLink } from '@orpc/client' import { createContractClientFactory } from '@orpc/contract' -import { createContractJsonifiedClientFactory } from './client-factory.ts' +import { createContractJsonifiedClientFactory } from './client-factory' vi.mock('@orpc/contract', () => ({ createContractClientFactory: vi.fn(), diff --git a/packages/openapi/src/client-factory.ts b/packages/openapi/src/client-factory.ts index 363ed8d411..e4ce737079 100644 --- a/packages/openapi/src/client-factory.ts +++ b/packages/openapi/src/client-factory.ts @@ -2,7 +2,7 @@ import type { ClientContext, ClientLink, ORPCClientOptions } from '@orpc/client' import type { RouterContract, RouterContractClient } from '@orpc/contract' import { createContractClientFactory } from '@orpc/contract' -import type { JsonifiedClient } from './types.ts' +import type { JsonifiedClient } from './types' export interface ContractJsonifiedClientFactory { (contract: T): JsonifiedClient> diff --git a/packages/openapi/src/constants.test.ts b/packages/openapi/src/constants.test.ts index a3d858a7ca..9b6cd7f250 100644 --- a/packages/openapi/src/constants.test.ts +++ b/packages/openapi/src/constants.test.ts @@ -1,5 +1,5 @@ it('exports', async () => { - await expect(import('./constants.ts')).resolves.toMatchObject({ + await expect(import('./constants')).resolves.toMatchObject({ DEFAULT_OPENAPI_METHOD: expect.any(String), DEFAULT_OPENAPI_SUCCESS_DESCRIPTION: expect.any(String), DEFAULT_OPENAPI_INPUT_STRUCTURE: expect.any(String), diff --git a/packages/openapi/src/extensions/route.test.ts b/packages/openapi/src/extensions/route.test.ts index 46c3fee01c..4e602213d6 100644 --- a/packages/openapi/src/extensions/route.test.ts +++ b/packages/openapi/src/extensions/route.test.ts @@ -2,8 +2,8 @@ import { oc, ProcedureContract } from '@orpc/contract' import { DecoratedProcedure, os } from '@orpc/server' import * as z from 'zod' -import { getOpenAPIMeta } from '../meta.ts' -import './route.ts' +import { getOpenAPIMeta } from '../meta' +import './route' it('adds .route metadata through contract builder variants', () => { const procedure = oc diff --git a/packages/openapi/src/extensions/route.ts b/packages/openapi/src/extensions/route.ts index 9919e0a89d..108345468c 100644 --- a/packages/openapi/src/extensions/route.ts +++ b/packages/openapi/src/extensions/route.ts @@ -3,8 +3,8 @@ import { ContractBuilder } from '@orpc/contract' import type { Context } from '@orpc/server' import { Builder, DecoratedProcedure } from '@orpc/server' -import type { OpenAPIMeta } from '../meta.ts' -import { openapi } from '../meta.ts' +import type { OpenAPIMeta } from '../meta' +import { openapi } from '../meta' declare module '@orpc/contract' { interface ContractBuilder { diff --git a/packages/openapi/src/helpers/form-data.test.ts b/packages/openapi/src/helpers/form-data.test.ts index 59498e45fd..15342a40c1 100644 --- a/packages/openapi/src/helpers/form-data.test.ts +++ b/packages/openapi/src/helpers/form-data.test.ts @@ -1,4 +1,4 @@ -import { getIssueMessage, parseFormData } from './form-data.ts' +import { getIssueMessage, parseFormData } from './form-data' it('parseFormData', () => { expect(parseFormData(new FormData())).toEqual({}) diff --git a/packages/openapi/src/helpers/form-data.ts b/packages/openapi/src/helpers/form-data.ts index 8312ec6b99..1d4a10d8ee 100644 --- a/packages/openapi/src/helpers/form-data.ts +++ b/packages/openapi/src/helpers/form-data.ts @@ -1,7 +1,7 @@ import { isSchemaIssue } from '@orpc/contract' import { isNonPrimitive, NON_NEGATIVE_INTEGER_REGEX } from '@orpc/shared' -import { BracketNotationSerializer } from '../bracket-notation.ts' +import { BracketNotationSerializer } from '../bracket-notation' /** * Parse a form data with [bracket notation](https://orpc.dev/docs/openapi/bracket-notation) syntax diff --git a/packages/openapi/src/helpers/index.test.ts b/packages/openapi/src/helpers/index.test.ts index 354690bd48..2e94302b0b 100644 --- a/packages/openapi/src/helpers/index.test.ts +++ b/packages/openapi/src/helpers/index.test.ts @@ -1,5 +1,5 @@ it('exports helpers', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ parseFormData: expect.any(Function), }) }) diff --git a/packages/openapi/src/helpers/index.ts b/packages/openapi/src/helpers/index.ts index f70898ea57..2a918a3196 100644 --- a/packages/openapi/src/helpers/index.ts +++ b/packages/openapi/src/helpers/index.ts @@ -1 +1 @@ -export * from './form-data.ts' +export * from './form-data' diff --git a/packages/openapi/src/index.test.ts b/packages/openapi/src/index.test.ts index 143ab62220..703a549dca 100644 --- a/packages/openapi/src/index.test.ts +++ b/packages/openapi/src/index.test.ts @@ -1,5 +1,5 @@ it('exports openapi meta, OpenAPIGenerator, OpenAPISerializer, OpenAPIJsonSerializer, BracketNotationSerializer', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ openapi: expect.any(Function), OpenAPIGenerator: expect.any(Function), OpenAPISerializer: expect.any(Function), diff --git a/packages/openapi/src/index.ts b/packages/openapi/src/index.ts index af19f27730..9294bbe2c2 100644 --- a/packages/openapi/src/index.ts +++ b/packages/openapi/src/index.ts @@ -1,13 +1,13 @@ -export * from './bracket-notation.ts' -export * from './client-factory.ts' -export { DEFAULT_OPENAPI_METHOD } from './constants.ts' -export * from './meta.ts' -export * from './openapi-generator.ts' -export * from './openapi-json-serializer.ts' -export * from './openapi-serializer.ts' -export * from './router-utils.ts' -export * from './types.ts' -export { getDynamicPathParams } from './utils.ts' +export * from './bracket-notation' +export * from './client-factory' +export { DEFAULT_OPENAPI_METHOD } from './constants' +export * from './meta' +export * from './openapi-generator' +export * from './openapi-json-serializer' +export * from './openapi-serializer' +export * from './router-utils' +export * from './types' +export { getDynamicPathParams } from './utils' export { COMMON_ERROR_STATUS_MAP } from '@orpc/client' diff --git a/packages/openapi/src/meta.test.ts b/packages/openapi/src/meta.test.ts index 048610cd2a..3db956bcf3 100644 --- a/packages/openapi/src/meta.test.ts +++ b/packages/openapi/src/meta.test.ts @@ -1,6 +1,6 @@ import { oc } from '@orpc/contract' -import { getOpenAPIMeta, openapi } from './meta.ts' +import { getOpenAPIMeta, openapi } from './meta' describe('openapi meta', () => { describe('openapi() function', () => { diff --git a/packages/openapi/src/meta.ts b/packages/openapi/src/meta.ts index 6aa8409b3a..219711c064 100644 --- a/packages/openapi/src/meta.ts +++ b/packages/openapi/src/meta.ts @@ -4,7 +4,7 @@ import type { Value } from '@orpc/shared' import { mergeHttpPath } from '@orpc/shared' import type { StandardBodyHint } from '@standard-server/core' -import type { OpenAPIV3_2 } from './types.ts' +import type { OpenAPIV3_2 } from './types' export interface OpenAPIMeta { /** diff --git a/packages/openapi/src/openapi-generator-components.test.ts b/packages/openapi/src/openapi-generator-components.test.ts index f4e5e24a90..d067363f7f 100644 --- a/packages/openapi/src/openapi-generator-components.test.ts +++ b/packages/openapi/src/openapi-generator-components.test.ts @@ -1,7 +1,7 @@ import type { JsonSchema } from '@orpc/json-schema' -import { OpenAPIComponentRegistry } from './openapi-generator-components.ts' -import type { OpenAPIV3_2 } from './types.ts' +import { OpenAPIComponentRegistry } from './openapi-generator-components' +import type { OpenAPIV3_2 } from './types' describe('openAPIComponentRegistry', () => { function createRegistry( diff --git a/packages/openapi/src/openapi-generator-components.ts b/packages/openapi/src/openapi-generator-components.ts index b2b162f28d..21cd030dbc 100644 --- a/packages/openapi/src/openapi-generator-components.ts +++ b/packages/openapi/src/openapi-generator-components.ts @@ -8,7 +8,7 @@ import { } from '@orpc/json-schema' import { getOwn, isDeepEqual, isPlainObject, isPlainObjectOrArray, setOwn } from '@orpc/shared' -import type { OpenAPIV3_2 } from './types.ts' +import type { OpenAPIV3_2 } from './types' const DEFS_REF_PREFIX = '#/$defs/' const COMPONENTS_REF_PREFIX = '#/components/schemas/' diff --git a/packages/openapi/src/openapi-generator-operation.test.ts b/packages/openapi/src/openapi-generator-operation.test.ts index c7f60d6a9a..d918731477 100644 --- a/packages/openapi/src/openapi-generator-operation.test.ts +++ b/packages/openapi/src/openapi-generator-operation.test.ts @@ -3,17 +3,17 @@ import type { AnyProcedureContract, AnySchema, ErrorMap } from '@orpc/contract' import { asyncIteratorObject, error } from '@orpc/contract' import { combineJsonSchemasWithComposition, DelegatingJsonSchemaConverter } from '@orpc/json-schema' -import { testSchema, testSchemaConverter } from '../tests/__shared__/schema.ts' -import { OpenAPIComponentRegistry } from './openapi-generator-components.ts' -import type { OpenAPIOperationContext } from './openapi-generator-operation.ts' +import { testSchema, testSchemaConverter } from '../tests/__shared__/schema' +import { OpenAPIComponentRegistry } from './openapi-generator-components' +import type { OpenAPIOperationContext } from './openapi-generator-operation' import { buildErrorResponse, buildRequest, buildSuccessResponse, toOpenAPIPath, -} from './openapi-generator-operation.ts' -import type { OpenAPIV3_2 } from './types.ts' -import { getDynamicPathParams } from './utils.ts' +} from './openapi-generator-operation' +import type { OpenAPIV3_2 } from './types' +import { getDynamicPathParams } from './utils' describe('openAPIGenerator operation builders', () => { function createContext( diff --git a/packages/openapi/src/openapi-generator-operation.ts b/packages/openapi/src/openapi-generator-operation.ts index cdf7430c64..3b523a6000 100644 --- a/packages/openapi/src/openapi-generator-operation.ts +++ b/packages/openapi/src/openapi-generator-operation.ts @@ -27,12 +27,12 @@ import { DEFAULT_OPENAPI_METHOD, DEFAULT_OPENAPI_OUTPUT_STRUCTURE, DEFAULT_OPENAPI_SUCCESS_DESCRIPTION, -} from './constants.ts' -import type { OpenAPIMeta } from './meta.ts' -import type { OpenAPIComponentRegistry } from './openapi-generator-components.ts' -import type { OpenAPIV3_2 } from './types.ts' -import type { getDynamicPathParams } from './utils.ts' -import { isBodylessMethod } from './utils.ts' +} from './constants' +import type { OpenAPIMeta } from './meta' +import type { OpenAPIComponentRegistry } from './openapi-generator-components' +import type { OpenAPIV3_2 } from './types' +import type { getDynamicPathParams } from './utils' +import { isBodylessMethod } from './utils' export type DynamicPathParam = NonNullable>[number] diff --git a/packages/openapi/src/openapi-generator.test-d.ts b/packages/openapi/src/openapi-generator.test-d.ts index 3425c2e581..8c14a7c7a6 100644 --- a/packages/openapi/src/openapi-generator.test-d.ts +++ b/packages/openapi/src/openapi-generator.test-d.ts @@ -1,11 +1,11 @@ -import { OpenAPIGenerator } from './openapi-generator.ts' +import { OpenAPIGenerator } from './openapi-generator' import type { OpenAPIDocument, OpenAPIV3_0, OpenAPIV3_1, OpenAPIV3_2, OpenAPIVersion, -} from './types.ts' +} from './types' describe('openAPIGenerator.generate', () => { const generator = new OpenAPIGenerator() diff --git a/packages/openapi/src/openapi-generator.test.ts b/packages/openapi/src/openapi-generator.test.ts index 452762fd0b..bc104a5a9f 100644 --- a/packages/openapi/src/openapi-generator.test.ts +++ b/packages/openapi/src/openapi-generator.test.ts @@ -4,13 +4,9 @@ import { visitJsonSchemaRefs } from '@orpc/json-schema' import * as arktype from 'arktype' import * as z from 'zod' -import { - testSchema, - testSchemaConverter, - zodJsonSchemaConverter, -} from '../tests/__shared__/schema.ts' -import { openapi } from './meta.ts' -import { OpenAPIGenerator, OpenAPIGeneratorError } from './openapi-generator.ts' +import { testSchema, testSchemaConverter, zodJsonSchemaConverter } from '../tests/__shared__/schema' +import { openapi } from './meta' +import { OpenAPIGenerator, OpenAPIGeneratorError } from './openapi-generator' describe('openAPIGenerator basic & options', () => { const generator = new OpenAPIGenerator({ converters: [zodJsonSchemaConverter] }) diff --git a/packages/openapi/src/openapi-generator.ts b/packages/openapi/src/openapi-generator.ts index aef2aa7638..632f827d2d 100644 --- a/packages/openapi/src/openapi-generator.ts +++ b/packages/openapi/src/openapi-generator.ts @@ -17,27 +17,27 @@ import { walkProcedureContractsAsync } from '@orpc/server' import type { Public, Value } from '@orpc/shared' import { clone, mergeHttpPath, pathToHttpPath, toArray, value } from '@orpc/shared' -import { DEFAULT_OPENAPI_METHOD } from './constants.ts' -import type { OpenAPIMeta } from './meta.ts' -import { getOpenAPIMeta } from './meta.ts' -import { OpenAPIComponentRegistry } from './openapi-generator-components.ts' +import { DEFAULT_OPENAPI_METHOD } from './constants' +import type { OpenAPIMeta } from './meta' +import { getOpenAPIMeta } from './meta' +import { OpenAPIComponentRegistry } from './openapi-generator-components' import type { OpenAPIErrorBodyDefinition, OpenAPIOperationContext, -} from './openapi-generator-operation.ts' +} from './openapi-generator-operation' import { buildErrorResponse, buildRequest, buildSuccessResponse, OpenAPIGeneratorError, toOpenAPIPath, -} from './openapi-generator-operation.ts' -import { OpenAPIJsonSerializer } from './openapi-json-serializer.ts' -import type { OpenAPIDocument, OpenAPIV3_2, OpenAPIVersion } from './types.ts' -import { getDynamicPathParams } from './utils.ts' +} from './openapi-generator-operation' +import { OpenAPIJsonSerializer } from './openapi-json-serializer' +import type { OpenAPIDocument, OpenAPIV3_2, OpenAPIVersion } from './types' +import { getDynamicPathParams } from './utils' -export { OpenAPIGeneratorError } from './openapi-generator-operation.ts' -export type { OpenAPIErrorBodyDefinition } from './openapi-generator-operation.ts' +export { OpenAPIGeneratorError } from './openapi-generator-operation' +export type { OpenAPIErrorBodyDefinition } from './openapi-generator-operation' export interface OpenAPIGeneratorOptions { converters?: JsonSchemaConverter[] | undefined diff --git a/packages/openapi/src/openapi-json-serializer.test-d.ts b/packages/openapi/src/openapi-json-serializer.test-d.ts index 050a1eaca0..f6f1ff93a1 100644 --- a/packages/openapi/src/openapi-json-serializer.test-d.ts +++ b/packages/openapi/src/openapi-json-serializer.test-d.ts @@ -1,8 +1,8 @@ import type { RPCJsonSerialization, RPCJsonSerializer } from '@orpc/client' import type { Public } from '@orpc/shared' -import type { OpenAPIJsonSerialization, OpenAPIJsonSerializer } from './openapi-json-serializer.ts' -import type { OpenAPISerializer } from './openapi-serializer.ts' +import type { OpenAPIJsonSerialization, OpenAPIJsonSerializer } from './openapi-json-serializer' +import type { OpenAPISerializer } from './openapi-serializer' describe('openAPIJsonSerializer', () => { it('is assignable to RPCJsonSerializer', () => { diff --git a/packages/openapi/src/openapi-json-serializer.test.ts b/packages/openapi/src/openapi-json-serializer.test.ts index 1c48860b86..a58f41e0fd 100644 --- a/packages/openapi/src/openapi-json-serializer.test.ts +++ b/packages/openapi/src/openapi-json-serializer.test.ts @@ -1,4 +1,4 @@ -import { OpenAPIJsonSerializer } from './openapi-json-serializer.ts' +import { OpenAPIJsonSerializer } from './openapi-json-serializer' class Person { constructor( diff --git a/packages/openapi/src/openapi-serializer.test.ts b/packages/openapi/src/openapi-serializer.test.ts index 06c58f8f5e..8c33d2af87 100644 --- a/packages/openapi/src/openapi-serializer.test.ts +++ b/packages/openapi/src/openapi-serializer.test.ts @@ -2,7 +2,7 @@ import { createORPCErrorFromJson, ORPCError } from '@orpc/client' import { isAsyncIteratorObject } from '@orpc/shared' import { EventStreamErrorEvent } from '@standard-server/core' -import { OpenAPISerializer } from './openapi-serializer.ts' +import { OpenAPISerializer } from './openapi-serializer' describe('openAPISerializer', () => { const serializer = new OpenAPISerializer() diff --git a/packages/openapi/src/openapi-serializer.ts b/packages/openapi/src/openapi-serializer.ts index 10321069ab..bd3e6ca659 100644 --- a/packages/openapi/src/openapi-serializer.ts +++ b/packages/openapi/src/openapi-serializer.ts @@ -8,10 +8,10 @@ import { isAsyncIteratorObject } from '@orpc/shared' import type { StandardBody } from '@standard-server/core' import { EventStreamErrorEvent } from '@standard-server/core' -import type { BracketNotationSerializerOptions } from './bracket-notation.ts' -import { BracketNotationSerializer } from './bracket-notation.ts' -import type { OpenAPIJsonSerializerOptions } from './openapi-json-serializer.ts' -import { OpenAPIJsonSerializer } from './openapi-json-serializer.ts' +import type { BracketNotationSerializerOptions } from './bracket-notation' +import { BracketNotationSerializer } from './bracket-notation' +import type { OpenAPIJsonSerializerOptions } from './openapi-json-serializer' +import { OpenAPIJsonSerializer } from './openapi-json-serializer' export interface OpenAPISerializerSerializeOptions { /** diff --git a/packages/openapi/src/plugins/index.test.ts b/packages/openapi/src/plugins/index.test.ts index 89678ed026..8992a57789 100644 --- a/packages/openapi/src/plugins/index.test.ts +++ b/packages/openapi/src/plugins/index.test.ts @@ -1,5 +1,5 @@ it('exports OpenAPIReferenceHandlerPlugin', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ OpenAPIReferenceHandlerPlugin: expect.any(Function), }) }) diff --git a/packages/openapi/src/plugins/index.ts b/packages/openapi/src/plugins/index.ts index 8e36e57400..89b47969eb 100644 --- a/packages/openapi/src/plugins/index.ts +++ b/packages/openapi/src/plugins/index.ts @@ -1 +1 @@ -export * from './openapi-reference.ts' +export * from './openapi-reference' diff --git a/packages/openapi/src/plugins/openapi-reference.test.ts b/packages/openapi/src/plugins/openapi-reference.test.ts index 0ca866752f..a44c2785a6 100644 --- a/packages/openapi/src/plugins/openapi-reference.test.ts +++ b/packages/openapi/src/plugins/openapi-reference.test.ts @@ -1,5 +1,5 @@ -import type { OpenAPIDocument, OpenAPIVersion } from '../types.ts' -import { OpenAPIReferenceHandlerPlugin } from './openapi-reference.ts' +import type { OpenAPIDocument, OpenAPIVersion } from '../types' +import { OpenAPIReferenceHandlerPlugin } from './openapi-reference' describe('openAPIReferenceHandlerPlugin', () => { beforeEach(() => { diff --git a/packages/openapi/src/plugins/openapi-reference.ts b/packages/openapi/src/plugins/openapi-reference.ts index 0d1a0f8ff4..a732493865 100644 --- a/packages/openapi/src/plugins/openapi-reference.ts +++ b/packages/openapi/src/plugins/openapi-reference.ts @@ -17,7 +17,7 @@ import type { ApiReferenceConfiguration as ScalarProviderConfig } from '@scalar/ import type { StandardUrl } from '@standard-server/core' import type { SwaggerUIOptions } from 'swagger-ui' -import type { OpenAPIDocument, OpenAPIVersion } from '../types.ts' +import type { OpenAPIDocument, OpenAPIVersion } from '../types' export type OpenAPIReferenceHandlerPluginProvider = 'scalar' | 'swagger' diff --git a/packages/openapi/src/router-utils.test.ts b/packages/openapi/src/router-utils.test.ts index bcbaa7dbd7..a64a78ac31 100644 --- a/packages/openapi/src/router-utils.test.ts +++ b/packages/openapi/src/router-utils.test.ts @@ -1,8 +1,8 @@ import { oc } from '@orpc/contract' import * as z from 'zod' -import { getOpenAPIMeta, openapi } from './meta.ts' -import { populateRouterContractOpenAPIPaths } from './router-utils.ts' +import { getOpenAPIMeta, openapi } from './meta' +import { populateRouterContractOpenAPIPaths } from './router-utils' export const inputSchema = z.object({ input: z.number().transform((n) => `${n}`) }) diff --git a/packages/openapi/src/router-utils.ts b/packages/openapi/src/router-utils.ts index 948cc89fbb..19194249d5 100644 --- a/packages/openapi/src/router-utils.ts +++ b/packages/openapi/src/router-utils.ts @@ -2,7 +2,7 @@ import type { RouterContract } from '@orpc/contract' import { ProcedureContract, resolveMetaPlugins } from '@orpc/contract' import { isNonPrimitive, pathToHttpPath, toArray } from '@orpc/shared' -import { getOpenAPIMeta, openapi } from './meta.ts' +import { getOpenAPIMeta, openapi } from './meta' export type PopulatedContractRouterOpenAPIPaths = T extends ProcedureContract diff --git a/packages/openapi/src/types.test-d.ts b/packages/openapi/src/types.test-d.ts index 3122d4bac4..bdcd63455a 100644 --- a/packages/openapi/src/types.test-d.ts +++ b/packages/openapi/src/types.test-d.ts @@ -11,7 +11,7 @@ import type { OpenAPIV3_0, OpenAPIV3_1, OpenAPIV3_2, -} from './types.ts' +} from './types' describe('OpenAPIDocument', () => { it('resolves the document type of a version, patch segment ignored', () => { diff --git a/packages/openapi/src/utils.test.ts b/packages/openapi/src/utils.test.ts index cb6cfbfe6d..44117be465 100644 --- a/packages/openapi/src/utils.test.ts +++ b/packages/openapi/src/utils.test.ts @@ -1,4 +1,4 @@ -import { getDynamicPathParams, isBodylessMethod } from './utils.ts' +import { getDynamicPathParams, isBodylessMethod } from './utils' describe('isBodylessMethod', () => { it('treats GET and HEAD as bodyless', () => { diff --git a/packages/openapi/tests/openapi-generator/composed-schemas.test.ts b/packages/openapi/tests/openapi-generator/composed-schemas.test.ts index e4d2b00120..2976798c59 100644 --- a/packages/openapi/tests/openapi-generator/composed-schemas.test.ts +++ b/packages/openapi/tests/openapi-generator/composed-schemas.test.ts @@ -1,8 +1,8 @@ import { oc } from '@orpc/contract' import * as z from 'zod' -import { openapi, OpenAPIGenerator } from '../../src/index.ts' -import { zodJsonSchemaConverter } from '../__shared__/schema.ts' +import { openapi, OpenAPIGenerator } from '../../src/index' +import { zodJsonSchemaConverter } from '../__shared__/schema' describe('openAPIGenerator e2e: composed schemas', () => { const generator = new OpenAPIGenerator({ converters: [zodJsonSchemaConverter] }) diff --git a/packages/openapi/tests/openapi-generator/crud.test.ts b/packages/openapi/tests/openapi-generator/crud.test.ts index fded40dfc8..e00ee60ee4 100644 --- a/packages/openapi/tests/openapi-generator/crud.test.ts +++ b/packages/openapi/tests/openapi-generator/crud.test.ts @@ -1,8 +1,8 @@ import { oc } from '@orpc/contract' import * as z from 'zod' -import { openapi, OpenAPIGenerator } from '../../src/index.ts' -import { zodJsonSchemaConverter } from '../__shared__/schema.ts' +import { openapi, OpenAPIGenerator } from '../../src/index' +import { zodJsonSchemaConverter } from '../__shared__/schema' describe('openAPIGenerator e2e: crud api', () => { const generator = new OpenAPIGenerator({ converters: [zodJsonSchemaConverter] }) diff --git a/packages/openapi/tests/openapi-generator/detailed-http.test.ts b/packages/openapi/tests/openapi-generator/detailed-http.test.ts index 6cedd0d711..a9a818bf1b 100644 --- a/packages/openapi/tests/openapi-generator/detailed-http.test.ts +++ b/packages/openapi/tests/openapi-generator/detailed-http.test.ts @@ -1,8 +1,8 @@ import { oc } from '@orpc/contract' import * as z from 'zod' -import { openapi, OpenAPIGenerator } from '../../src/index.ts' -import { zodJsonSchemaConverter } from '../__shared__/schema.ts' +import { openapi, OpenAPIGenerator } from '../../src/index' +import { zodJsonSchemaConverter } from '../__shared__/schema' describe('openAPIGenerator e2e: webhook endpoint with full http control', () => { const generator = new OpenAPIGenerator({ converters: [zodJsonSchemaConverter] }) diff --git a/packages/openapi/tests/openapi-generator/event-streaming.test.ts b/packages/openapi/tests/openapi-generator/event-streaming.test.ts index f8ac9327e5..e35b0f27e3 100644 --- a/packages/openapi/tests/openapi-generator/event-streaming.test.ts +++ b/packages/openapi/tests/openapi-generator/event-streaming.test.ts @@ -1,8 +1,8 @@ import { asyncIteratorObject, oc } from '@orpc/contract' import * as z from 'zod' -import { openapi, OpenAPIGenerator } from '../../src/index.ts' -import { zodJsonSchemaConverter } from '../__shared__/schema.ts' +import { openapi, OpenAPIGenerator } from '../../src/index' +import { zodJsonSchemaConverter } from '../__shared__/schema' describe('openAPIGenerator e2e: server-sent event streaming', () => { const generator = new OpenAPIGenerator({ converters: [zodJsonSchemaConverter] }) diff --git a/packages/openapi/tests/openapi-generator/file-transfer.test.ts b/packages/openapi/tests/openapi-generator/file-transfer.test.ts index 6cc5fdc209..eb4c268d4d 100644 --- a/packages/openapi/tests/openapi-generator/file-transfer.test.ts +++ b/packages/openapi/tests/openapi-generator/file-transfer.test.ts @@ -1,8 +1,8 @@ import { oc } from '@orpc/contract' import * as z from 'zod' -import { openapi, OpenAPIGenerator } from '../../src/index.ts' -import { zodJsonSchemaConverter } from '../__shared__/schema.ts' +import { openapi, OpenAPIGenerator } from '../../src/index' +import { zodJsonSchemaConverter } from '../__shared__/schema' describe('openAPIGenerator e2e: file upload and download', () => { const generator = new OpenAPIGenerator({ converters: [zodJsonSchemaConverter] }) diff --git a/packages/openapi/tests/openapi-generator/reusable-components.test.ts b/packages/openapi/tests/openapi-generator/reusable-components.test.ts index caab393df7..ff726f3fdc 100644 --- a/packages/openapi/tests/openapi-generator/reusable-components.test.ts +++ b/packages/openapi/tests/openapi-generator/reusable-components.test.ts @@ -1,8 +1,8 @@ import { eventIterator, oc } from '@orpc/contract' import * as z from 'zod' -import { openapi, OpenAPIGenerator } from '../../src/index.ts' -import { zodJsonSchemaConverter } from '../__shared__/schema.ts' +import { openapi, OpenAPIGenerator } from '../../src/index' +import { zodJsonSchemaConverter } from '../__shared__/schema' describe('openAPIGenerator e2e: reusable component schemas', () => { const generator = new OpenAPIGenerator({ converters: [zodJsonSchemaConverter] }) diff --git a/packages/openapi/tests/openapi-generator/schema-libraries.test.ts b/packages/openapi/tests/openapi-generator/schema-libraries.test.ts index be49ee9f7c..27e58542ed 100644 --- a/packages/openapi/tests/openapi-generator/schema-libraries.test.ts +++ b/packages/openapi/tests/openapi-generator/schema-libraries.test.ts @@ -2,8 +2,8 @@ import { oc } from '@orpc/contract' import * as arktype from 'arktype' import * as z from 'zod' -import { openapi, OpenAPIGenerator } from '../../src/index.ts' -import { testSchema, testSchemaConverter, zodJsonSchemaConverter } from '../__shared__/schema.ts' +import { openapi, OpenAPIGenerator } from '../../src/index' +import { testSchema, testSchemaConverter, zodJsonSchemaConverter } from '../__shared__/schema' describe('openAPIGenerator e2e: schema library agnosticism', () => { const generator = new OpenAPIGenerator({ diff --git a/packages/openapi/tests/openapi-generator/typed-errors.test.ts b/packages/openapi/tests/openapi-generator/typed-errors.test.ts index 5c19a7c1f6..5130e03de9 100644 --- a/packages/openapi/tests/openapi-generator/typed-errors.test.ts +++ b/packages/openapi/tests/openapi-generator/typed-errors.test.ts @@ -1,8 +1,8 @@ import { oc } from '@orpc/contract' import * as z from 'zod' -import { openapi, OpenAPIGenerator } from '../../src/index.ts' -import { zodJsonSchemaConverter } from '../__shared__/schema.ts' +import { openapi, OpenAPIGenerator } from '../../src/index' +import { zodJsonSchemaConverter } from '../__shared__/schema' describe('openAPIGenerator e2e: typed errors', () => { const generator = new OpenAPIGenerator({ converters: [zodJsonSchemaConverter] }) diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json index f55540ed6e..e611609f30 100644 --- a/packages/opentelemetry/package.json +++ b/packages/opentelemetry/package.json @@ -41,7 +41,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/shared": "workspace:*" diff --git a/packages/opentelemetry/src/index.ts b/packages/opentelemetry/src/index.ts index 45b2c7bf79..46a982f85a 100644 --- a/packages/opentelemetry/src/index.ts +++ b/packages/opentelemetry/src/index.ts @@ -1,2 +1,2 @@ -export * from './instrumentation.ts' -export type { OpenTelemetryPropagationOptions } from './tracer.ts' +export * from './instrumentation' +export type { OpenTelemetryPropagationOptions } from './tracer' diff --git a/packages/opentelemetry/src/instrumentation.test.ts b/packages/opentelemetry/src/instrumentation.test.ts index 20da31ab5f..7f57429bd5 100644 --- a/packages/opentelemetry/src/instrumentation.test.ts +++ b/packages/opentelemetry/src/instrumentation.test.ts @@ -8,8 +8,8 @@ import { import { getTracer, setTracer } from '@orpc/shared' import pkg from '../package.json' with { type: 'json' } -import { ORPCInstrumentation } from './instrumentation.ts' -import { OpenTelemetryTracer } from './tracer.ts' +import { ORPCInstrumentation } from './instrumentation' +import { OpenTelemetryTracer } from './tracer' const getTracerSpy = vi.spyOn(trace, 'getTracer') diff --git a/packages/opentelemetry/src/instrumentation.ts b/packages/opentelemetry/src/instrumentation.ts index e795508705..b5bae87abd 100644 --- a/packages/opentelemetry/src/instrumentation.ts +++ b/packages/opentelemetry/src/instrumentation.ts @@ -3,8 +3,8 @@ import { InstrumentationBase } from '@opentelemetry/instrumentation' import { getTracer, setTracer } from '@orpc/shared' import pkg from '../package.json' with { type: 'json' } -import type { OpenTelemetryPropagationOptions } from './tracer.ts' -import { OpenTelemetryTracer } from './tracer.ts' +import type { OpenTelemetryPropagationOptions } from './tracer' +import { OpenTelemetryTracer } from './tracer' export interface ORPCInstrumentationConfig extends InstrumentationConfig { /** diff --git a/packages/opentelemetry/src/tracer.no-context-manager.test.ts b/packages/opentelemetry/src/tracer.no-context-manager.test.ts index a85c42acc0..d2f76f98f1 100644 --- a/packages/opentelemetry/src/tracer.no-context-manager.test.ts +++ b/packages/opentelemetry/src/tracer.no-context-manager.test.ts @@ -6,7 +6,7 @@ import { } from '@opentelemetry/sdk-trace-node' import type { TracingHeaders } from '@orpc/shared' -import { OpenTelemetryTracer } from './tracer.ts' +import { OpenTelemetryTracer } from './tracer' /** * Some setups (e.g. browsers or React Native without a context manager) cannot activate spans, diff --git a/packages/opentelemetry/src/tracer.test.ts b/packages/opentelemetry/src/tracer.test.ts index f604f3d4cd..b1780041ef 100644 --- a/packages/opentelemetry/src/tracer.test.ts +++ b/packages/opentelemetry/src/tracer.test.ts @@ -6,8 +6,8 @@ import { } from '@opentelemetry/sdk-trace-node' import type { TracingHeaders } from '@orpc/shared' -import { OpenTelemetrySpan, OpenTelemetryTracer } from './tracer.ts' -import type { OpenTelemetryTracerOptions } from './tracer.ts' +import { OpenTelemetrySpan, OpenTelemetryTracer } from './tracer' +import type { OpenTelemetryTracerOptions } from './tracer' const exporter = new InMemorySpanExporter() const provider = new NodeTracerProvider({ diff --git a/packages/pinia-colada/package.json b/packages/pinia-colada/package.json index e627f264da..c8df4f7897 100644 --- a/packages/pinia-colada/package.json +++ b/packages/pinia-colada/package.json @@ -43,7 +43,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/client": "workspace:*", diff --git a/packages/pinia-colada/src/contract-utils.test-d.ts b/packages/pinia-colada/src/contract-utils.test-d.ts index 3fef095f73..6371c6d874 100644 --- a/packages/pinia-colada/src/contract-utils.test-d.ts +++ b/packages/pinia-colada/src/contract-utils.test-d.ts @@ -4,13 +4,10 @@ import { meta, oc, type } from '@orpc/contract' import type { ContractJsonifiedClientFactory } from '@orpc/openapi' import type { PromiseWithError } from '@orpc/shared' -import { - createContractJsonifiedUtilsFactory, - createContractUtilsFactory, -} from './contract-utils.ts' -import type { ProcedureUtils } from './procedure-utils.ts' -import type { SharedUtils } from './shared-utils.ts' -import type { OperationContext } from './types.ts' +import { createContractJsonifiedUtilsFactory, createContractUtilsFactory } from './contract-utils' +import type { ProcedureUtils } from './procedure-utils' +import type { SharedUtils } from './shared-utils' +import type { OperationContext } from './types' const contract = { ping: oc.meta(meta.path(['ping'])), diff --git a/packages/pinia-colada/src/contract-utils.test.ts b/packages/pinia-colada/src/contract-utils.test.ts index 155e7de371..32826f5b40 100644 --- a/packages/pinia-colada/src/contract-utils.test.ts +++ b/packages/pinia-colada/src/contract-utils.test.ts @@ -1,10 +1,7 @@ import { ProcedureContract } from '@orpc/contract' -import { - createContractJsonifiedUtilsFactory, - createContractUtilsFactory, -} from './contract-utils.ts' -import * as routerUtilsModule from './router-utils.ts' +import { createContractJsonifiedUtilsFactory, createContractUtilsFactory } from './contract-utils' +import * as routerUtilsModule from './router-utils' const createRouterUtilsSpy = vi.spyOn(routerUtilsModule, 'createRouterUtils') diff --git a/packages/pinia-colada/src/contract-utils.ts b/packages/pinia-colada/src/contract-utils.ts index edfca23fa2..c4adb4d709 100644 --- a/packages/pinia-colada/src/contract-utils.ts +++ b/packages/pinia-colada/src/contract-utils.ts @@ -4,8 +4,8 @@ import { resolveBasePathMeta } from '@orpc/contract' import type { ContractJsonifiedClientFactory, JsonifiedClient } from '@orpc/openapi' import { get } from '@orpc/shared' -import type { RouterUtils, RouterUtilsOptions } from './router-utils.ts' -import { createRouterUtils } from './router-utils.ts' +import type { RouterUtils, RouterUtilsOptions } from './router-utils' +import { createRouterUtils } from './router-utils' export interface ContractUtilsFactory { (contract: T): RouterUtils> diff --git a/packages/pinia-colada/src/index.test.ts b/packages/pinia-colada/src/index.test.ts index 63c901e5b0..b561a7647b 100644 --- a/packages/pinia-colada/src/index.test.ts +++ b/packages/pinia-colada/src/index.test.ts @@ -1,5 +1,5 @@ it('exports createPiniaColadaUtils, PINIA_COLADA_OPERATION_CONTEXT_SYMBOL, StreamQuerySSRUtilsPlugin', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ createPiniaColadaUtils: expect.any(Function), createRouterUtils: expect.any(Function), PINIA_COLADA_OPERATION_CONTEXT_SYMBOL: expect.any(Symbol), diff --git a/packages/pinia-colada/src/index.ts b/packages/pinia-colada/src/index.ts index 274d44fc12..189595acd2 100644 --- a/packages/pinia-colada/src/index.ts +++ b/packages/pinia-colada/src/index.ts @@ -1,13 +1,13 @@ -export * from './contract-utils.ts' +export * from './contract-utils' export type { OperationKey, OperationKeyBaseOptions, OperationKeyOptions, OperationKeyPrefixOptions, -} from './key.ts' -export * from './meta.ts' -export type { RouterUtilsPlugin } from './plugin.ts' -export { mergeProcedureUtilsOptions, ProcedureUtils } from './procedure-utils.ts' +} from './key' +export * from './meta' +export type { RouterUtilsPlugin } from './plugin' +export { mergeProcedureUtilsOptions, ProcedureUtils } from './procedure-utils' export type { ProcedureUtilsInfiniteInterceptor, ProcedureUtilsInfiniteInterceptorOptions, @@ -21,23 +21,23 @@ export type { ProcedureUtilsQueryInterceptorOptions, ProcedureUtilsStreamedInterceptor, ProcedureUtilsStreamedInterceptorOptions, -} from './procedure-utils.ts' -export * from './router-utils.ts' +} from './procedure-utils' +export * from './router-utils' export { /** * @deprecated Use `createRouterUtils` instead. */ createRouterUtils as createORPCVueColadaUtils, -} from './router-utils.ts' -export { createRouterUtils as createPiniaColadaUtils } from './router-utils.ts' -export { SharedUtils } from './shared-utils.ts' -export * from './ssr.ts' -export type { SerializableStreamedQueryOptions, SettleOnFirstDataOptions } from './stream-query.ts' -export * from './types.ts' +} from './router-utils' +export { createRouterUtils as createPiniaColadaUtils } from './router-utils' +export { SharedUtils } from './shared-utils' +export * from './ssr' +export type { SerializableStreamedQueryOptions, SettleOnFirstDataOptions } from './stream-query' +export * from './types' export { OPERATION_CONTEXT_SYMBOL as PINIA_COLADA_OPERATION_CONTEXT_SYMBOL, type OperationContext as PiniaColadaOperationContext, -} from './types.ts' +} from './types' export type { AnyNestedClient } from '@orpc/client' diff --git a/packages/pinia-colada/src/key.test.ts b/packages/pinia-colada/src/key.test.ts index e22585b049..c8594a56aa 100644 --- a/packages/pinia-colada/src/key.test.ts +++ b/packages/pinia-colada/src/key.test.ts @@ -3,7 +3,7 @@ import { OpenAPIJsonSerializer } from '@orpc/openapi' import { useQueryCache } from '@pinia/colada' import { createPinia } from 'pinia' -import { generateOperationKey } from './key.ts' +import { generateOperationKey } from './key' it('generateOperationKey', () => { expect(generateOperationKey(['path'])).toEqual([['path'], {}]) diff --git a/packages/pinia-colada/src/key.ts b/packages/pinia-colada/src/key.ts index 339d66590f..c151d6cd6d 100644 --- a/packages/pinia-colada/src/key.ts +++ b/packages/pinia-colada/src/key.ts @@ -3,8 +3,8 @@ import type { PartialDeep, Public } from '@orpc/shared' import { stringifyJSON } from '@orpc/shared' import type { EntryKey } from '@pinia/colada' -import type { SerializableStreamedQueryOptions } from './stream-query.ts' -import type { OperationType } from './types.ts' +import type { SerializableStreamedQueryOptions } from './stream-query' +import type { OperationType } from './types' export interface OperationKeyPrefixOptions { /** diff --git a/packages/pinia-colada/src/live-query.test.tsx b/packages/pinia-colada/src/live-query.test.tsx index 749928764d..4a45444a91 100644 --- a/packages/pinia-colada/src/live-query.test.tsx +++ b/packages/pinia-colada/src/live-query.test.tsx @@ -1,8 +1,8 @@ import { promiseWithResolvers } from '@orpc/shared' import { effectScope, watch } from 'vue' -import { createChunkController, createQueryCache, mountQuery } from '../tests/__shared__/utils.ts' -import { liveQuery } from './live-query.ts' +import { createChunkController, createQueryCache, mountQuery } from '../tests/__shared__/utils' +import { liveQuery } from './live-query' describe('liveQuery', () => { it('publishes each chunk to the cache, replacing the previous value', async () => { diff --git a/packages/pinia-colada/src/live-query.ts b/packages/pinia-colada/src/live-query.ts index 6729d1d7b1..642e79b6f1 100644 --- a/packages/pinia-colada/src/live-query.ts +++ b/packages/pinia-colada/src/live-query.ts @@ -1,8 +1,8 @@ import type { Promisable } from '@orpc/shared' import { listenAbort, stringifyJSON, throwIfAborted } from '@orpc/shared' -import type { SettleOnFirstDataOptions } from './stream-query.ts' -import type { UseQueryFnContext } from './types.ts' +import type { SettleOnFirstDataOptions } from './stream-query' +import type { UseQueryFnContext } from './types' /** * A Pinia Colada query function that publishes each streamed chunk to the diff --git a/packages/pinia-colada/src/meta.test-d.ts b/packages/pinia-colada/src/meta.test-d.ts index c736737568..ce671784af 100644 --- a/packages/pinia-colada/src/meta.test-d.ts +++ b/packages/pinia-colada/src/meta.test-d.ts @@ -2,8 +2,8 @@ import type { ClientContext, ORPCError } from '@orpc/client' import { oc, type } from '@orpc/contract' import type { PromiseWithError } from '@orpc/shared' -import { piniaColada } from './meta.ts' -import type { OperationContext } from './types.ts' +import { piniaColada } from './meta' +import type { OperationContext } from './types' describe('piniaColada', () => { it('infers input, output and error types from the contract', () => { diff --git a/packages/pinia-colada/src/meta.test.ts b/packages/pinia-colada/src/meta.test.ts index 4946e0642f..dae09b105c 100644 --- a/packages/pinia-colada/src/meta.test.ts +++ b/packages/pinia-colada/src/meta.test.ts @@ -1,7 +1,7 @@ import { oc } from '@orpc/contract' -import { ContractOptionsUtilsPlugin, getPiniaColadaMeta, piniaColada } from './meta.ts' -import { createRouterUtils } from './router-utils.ts' +import { ContractOptionsUtilsPlugin, getPiniaColadaMeta, piniaColada } from './meta' +import { createRouterUtils } from './router-utils' describe('piniaColada', () => { it('stores options readable via getPiniaColadaMeta', () => { diff --git a/packages/pinia-colada/src/meta.ts b/packages/pinia-colada/src/meta.ts index 1a31e15d38..e64f83e2d3 100644 --- a/packages/pinia-colada/src/meta.ts +++ b/packages/pinia-colada/src/meta.ts @@ -17,10 +17,10 @@ import type { import { getRouterContract, ProcedureContract } from '@orpc/contract' import type { ThrowableError } from '@orpc/shared' -import type { OperationKeyBaseOptions } from './key.ts' -import type { RouterUtilsPlugin } from './plugin.ts' -import type { ProcedureUtilsOptions } from './procedure-utils.ts' -import { mergeProcedureUtilsOptions } from './procedure-utils.ts' +import type { OperationKeyBaseOptions } from './key' +import type { RouterUtilsPlugin } from './plugin' +import type { ProcedureUtilsOptions } from './procedure-utils' +import { mergeProcedureUtilsOptions } from './procedure-utils' export type PiniaColadaMetaOptions< TClientContext extends ClientContext, diff --git a/packages/pinia-colada/src/plugin.test.ts b/packages/pinia-colada/src/plugin.test.ts index 8ef2108184..3eb6f6441f 100644 --- a/packages/pinia-colada/src/plugin.test.ts +++ b/packages/pinia-colada/src/plugin.test.ts @@ -1,5 +1,5 @@ -import type { RouterUtilsPlugin } from './plugin.ts' -import { CompositeRouterUtilsPlugin } from './plugin.ts' +import type { RouterUtilsPlugin } from './plugin' +import { CompositeRouterUtilsPlugin } from './plugin' describe('compositeRouterUtilsPlugin', () => { beforeEach(() => { diff --git a/packages/pinia-colada/src/plugin.ts b/packages/pinia-colada/src/plugin.ts index ec82fc4d90..336eaca5ea 100644 --- a/packages/pinia-colada/src/plugin.ts +++ b/packages/pinia-colada/src/plugin.ts @@ -2,8 +2,8 @@ import type { AnyNestedClient, InferClientContext, InferClientError } from '@orp import type { OrderablePlugin } from '@orpc/shared' import { sortPlugins } from '@orpc/shared' -import type { ProcedureUtilsOptions } from './procedure-utils.ts' -import type { RouterUtilsOptions } from './router-utils.ts' +import type { ProcedureUtilsOptions } from './procedure-utils' +import type { RouterUtilsOptions } from './router-utils' export interface RouterUtilsPlugin extends OrderablePlugin { /** diff --git a/packages/pinia-colada/src/procedure-utils.test-d.ts b/packages/pinia-colada/src/procedure-utils.test-d.ts index 98767ed044..da8978f12a 100644 --- a/packages/pinia-colada/src/procedure-utils.test-d.ts +++ b/packages/pinia-colada/src/procedure-utils.test-d.ts @@ -6,7 +6,7 @@ import { useInfiniteQuery, useMutation, useQuery, useQueryCache } from '@pinia/c import { computed } from 'vue' import * as z from 'zod' -import type { ProcedureUtils, ProcedureUtilsOptions } from './procedure-utils.ts' +import type { ProcedureUtils, ProcedureUtilsOptions } from './procedure-utils' import type { InfiniteOptionsIn, LiveOptionsIn, @@ -18,7 +18,7 @@ import type { StreamedOptionsIn, UseMutationFnContext, UseQueryFnContext, -} from './types.ts' +} from './types' const outputSchema = z.object({ output: z.number().transform((n) => `${n}`) }) diff --git a/packages/pinia-colada/src/procedure-utils.test.ts b/packages/pinia-colada/src/procedure-utils.test.ts index 20362d7b58..89a6161394 100644 --- a/packages/pinia-colada/src/procedure-utils.test.ts +++ b/packages/pinia-colada/src/procedure-utils.test.ts @@ -1,14 +1,14 @@ import { RPCJsonSerializer } from '@orpc/client' -import * as KeyModule from './key.ts' -import * as LiveQueryModule from './live-query.ts' +import * as KeyModule from './key' +import * as LiveQueryModule from './live-query' import { isProcedureUtilsOptions, mergeProcedureUtilsOptions, ProcedureUtils, -} from './procedure-utils.ts' -import * as StreamQueryModule from './stream-query.ts' -import { OPERATION_CONTEXT_SYMBOL } from './types.ts' +} from './procedure-utils' +import * as StreamQueryModule from './stream-query' +import { OPERATION_CONTEXT_SYMBOL } from './types' const generateOperationKeySpy = vi.spyOn(KeyModule, 'generateOperationKey') const streamedQuerySpy = vi.spyOn(StreamQueryModule, 'serializableStreamedQuery') diff --git a/packages/pinia-colada/src/procedure-utils.ts b/packages/pinia-colada/src/procedure-utils.ts index ea93ce12e8..cad4cf7586 100644 --- a/packages/pinia-colada/src/procedure-utils.ts +++ b/packages/pinia-colada/src/procedure-utils.ts @@ -13,10 +13,10 @@ import type { UseInfiniteQueryFnContext, } from '@pinia/colada' -import type { OperationKeyBaseOptions } from './key.ts' -import { liveQuery } from './live-query.ts' -import { SharedUtils } from './shared-utils.ts' -import { serializableStreamedQuery } from './stream-query.ts' +import type { OperationKeyBaseOptions } from './key' +import { liveQuery } from './live-query' +import { SharedUtils } from './shared-utils' +import { serializableStreamedQuery } from './stream-query' import type { InferLiveQueryOutput, InferStreamedQueryOutput, @@ -36,8 +36,8 @@ import type { StreamedOptionsOut, UseMutationFnContext, UseQueryFnContext, -} from './types.ts' -import { OPERATION_CONTEXT_SYMBOL } from './types.ts' +} from './types' +import { OPERATION_CONTEXT_SYMBOL } from './types' export interface ProcedureUtilsQueryInterceptorOptions< TClientContext extends ClientContext, diff --git a/packages/pinia-colada/src/router-utils.test-d.ts b/packages/pinia-colada/src/router-utils.test-d.ts index af5182cfd1..6d2ac335e1 100644 --- a/packages/pinia-colada/src/router-utils.test-d.ts +++ b/packages/pinia-colada/src/router-utils.test-d.ts @@ -6,10 +6,10 @@ import { os } from '@orpc/server' import type { Public } from '@orpc/shared' import * as z from 'zod' -import type { ProcedureUtils } from './procedure-utils.ts' -import type { RouterUtils } from './router-utils.ts' -import { createRouterUtils } from './router-utils.ts' -import type { SharedUtils } from './shared-utils.ts' +import type { ProcedureUtils } from './procedure-utils' +import type { RouterUtils } from './router-utils' +import { createRouterUtils } from './router-utils' +import type { SharedUtils } from './shared-utils' const inputSchema = z.object({ input: z.number().transform((n) => `${n}`) }) const outputSchema = z.object({ output: z.number().transform((n) => `${n}`) }) diff --git a/packages/pinia-colada/src/router-utils.test.ts b/packages/pinia-colada/src/router-utils.test.ts index 137dfcccdd..49f5bc7812 100644 --- a/packages/pinia-colada/src/router-utils.test.ts +++ b/packages/pinia-colada/src/router-utils.test.ts @@ -1,15 +1,15 @@ import { RPCJsonSerializer } from '@orpc/client' -import * as KeyModule from './key.ts' -import type { RouterUtilsPlugin } from './plugin.ts' -import { ProcedureUtils } from './procedure-utils.ts' -import { createRouterUtils } from './router-utils.ts' +import * as KeyModule from './key' +import type { RouterUtilsPlugin } from './plugin' +import { ProcedureUtils } from './procedure-utils' +import { createRouterUtils } from './router-utils' -vi.mock('./procedure-utils.ts', async (importOriginal) => { - const { SharedUtils } = await import('./shared-utils.ts') +vi.mock('./procedure-utils', async (importOriginal) => { + const { SharedUtils } = await import('./shared-utils') return { - ...(await importOriginal()), + ...(await importOriginal()), ProcedureUtils: vi.fn( class extends SharedUtils { call = vi.fn() diff --git a/packages/pinia-colada/src/router-utils.ts b/packages/pinia-colada/src/router-utils.ts index 11deeef701..51aa97d961 100644 --- a/packages/pinia-colada/src/router-utils.ts +++ b/packages/pinia-colada/src/router-utils.ts @@ -3,9 +3,9 @@ import { RECURSIVE_CLIENT_UNWRAP_KEYS } from '@orpc/client' import type { Public } from '@orpc/shared' import { bindMethods, isNonPrimitive, pick, toArray } from '@orpc/shared' -import type { OperationKeyBaseOptions } from './key.ts' -import type { RouterUtilsPlugin } from './plugin.ts' -import { CompositeRouterUtilsPlugin } from './plugin.ts' +import type { OperationKeyBaseOptions } from './key' +import type { RouterUtilsPlugin } from './plugin' +import { CompositeRouterUtilsPlugin } from './plugin' import type { ProcedureUtilsInfiniteInterceptor, ProcedureUtilsLiveInterceptor, @@ -13,13 +13,13 @@ import type { ProcedureUtilsOptions, ProcedureUtilsQueryInterceptor, ProcedureUtilsStreamedInterceptor, -} from './procedure-utils.ts' +} from './procedure-utils' import { isProcedureUtilsOptions, mergeProcedureUtilsOptions, ProcedureUtils, -} from './procedure-utils.ts' -import { SharedUtils } from './shared-utils.ts' +} from './procedure-utils' +import { SharedUtils } from './shared-utils' /** * The utils shape derived from a client: procedure clients map to procedure diff --git a/packages/pinia-colada/src/shared-utils.test-d.ts b/packages/pinia-colada/src/shared-utils.test-d.ts index 7ab719d82a..69d87e1252 100644 --- a/packages/pinia-colada/src/shared-utils.test-d.ts +++ b/packages/pinia-colada/src/shared-utils.test-d.ts @@ -1,7 +1,7 @@ import type { Public } from '@orpc/shared' import { ref } from 'vue' -import type { SharedUtils } from './shared-utils.ts' +import type { SharedUtils } from './shared-utils' describe('SharedUtils', () => { const utils = {} as Public> diff --git a/packages/pinia-colada/src/shared-utils.test.ts b/packages/pinia-colada/src/shared-utils.test.ts index 1eb9a7a3c9..a41764f0d0 100644 --- a/packages/pinia-colada/src/shared-utils.test.ts +++ b/packages/pinia-colada/src/shared-utils.test.ts @@ -1,7 +1,7 @@ import { RPCJsonSerializer } from '@orpc/client' -import * as KeyModule from './key.ts' -import { SharedUtils } from './shared-utils.ts' +import * as KeyModule from './key' +import { SharedUtils } from './shared-utils' const generateOperationKeySpy = vi.spyOn(KeyModule, 'generateOperationKey') diff --git a/packages/pinia-colada/src/shared-utils.ts b/packages/pinia-colada/src/shared-utils.ts index 6d6de74435..47e1a5477f 100644 --- a/packages/pinia-colada/src/shared-utils.ts +++ b/packages/pinia-colada/src/shared-utils.ts @@ -1,6 +1,6 @@ -import type { OperationKey, OperationKeyBaseOptions, OperationKeyOptions } from './key.ts' -import { generateOperationKey } from './key.ts' -import type { OperationType } from './types.ts' +import type { OperationKey, OperationKeyBaseOptions, OperationKeyOptions } from './key' +import { generateOperationKey } from './key' +import type { OperationType } from './types' export class SharedUtils { constructor( diff --git a/packages/pinia-colada/src/ssr.test.ts b/packages/pinia-colada/src/ssr.test.ts index 551758c04e..1d02a9c765 100644 --- a/packages/pinia-colada/src/ssr.test.ts +++ b/packages/pinia-colada/src/ssr.test.ts @@ -1,8 +1,8 @@ import type { Client } from '@orpc/client' -import { createQueryCache } from '../tests/__shared__/utils.ts' -import { createRouterUtils } from './router-utils.ts' -import { StreamQuerySSRUtilsPlugin } from './ssr.ts' +import { createQueryCache } from '../tests/__shared__/utils' +import { createRouterUtils } from './router-utils' +import { StreamQuerySSRUtilsPlugin } from './ssr' describe('streamQuerySSRUtilsPlugin', () => { afterEach(() => { diff --git a/packages/pinia-colada/src/ssr.ts b/packages/pinia-colada/src/ssr.ts index a131dda8ac..452ce77ddf 100644 --- a/packages/pinia-colada/src/ssr.ts +++ b/packages/pinia-colada/src/ssr.ts @@ -1,8 +1,8 @@ import type { AnyNestedClient, InferClientContext, InferClientError } from '@orpc/client' -import type { RouterUtilsPlugin } from './plugin.ts' -import type { ProcedureUtilsOptions } from './procedure-utils.ts' -import { mergeProcedureUtilsOptions } from './procedure-utils.ts' +import type { RouterUtilsPlugin } from './plugin' +import type { ProcedureUtilsOptions } from './procedure-utils' +import { mergeProcedureUtilsOptions } from './procedure-utils' export interface StreamQuerySSRUtilsPluginOptions { /** diff --git a/packages/pinia-colada/src/stream-query.test.tsx b/packages/pinia-colada/src/stream-query.test.tsx index eb2b53aa1e..cd007ce015 100644 --- a/packages/pinia-colada/src/stream-query.test.tsx +++ b/packages/pinia-colada/src/stream-query.test.tsx @@ -1,8 +1,8 @@ import { promiseWithResolvers } from '@orpc/shared' import { effectScope, watch } from 'vue' -import { createChunkController, createQueryCache, mountQuery } from '../tests/__shared__/utils.ts' -import { serializableStreamedQuery } from './stream-query.ts' +import { createChunkController, createQueryCache, mountQuery } from '../tests/__shared__/utils' +import { serializableStreamedQuery } from './stream-query' describe('serializableStreamedQuery', () => { it('publishes each chunk to the cache as it arrives on first fetch', async () => { diff --git a/packages/pinia-colada/src/stream-query.ts b/packages/pinia-colada/src/stream-query.ts index e96c504a6d..39b0160339 100644 --- a/packages/pinia-colada/src/stream-query.ts +++ b/packages/pinia-colada/src/stream-query.ts @@ -1,7 +1,7 @@ import type { Promisable } from '@orpc/shared' import { listenAbort, takeLast, throwIfAborted } from '@orpc/shared' -import type { UseQueryFnContext } from './types.ts' +import type { UseQueryFnContext } from './types' export interface SerializableStreamedQueryOptions { /** diff --git a/packages/pinia-colada/src/types.ts b/packages/pinia-colada/src/types.ts index 73d83a6807..cdf9b344a8 100644 --- a/packages/pinia-colada/src/types.ts +++ b/packages/pinia-colada/src/types.ts @@ -12,7 +12,7 @@ import type { UseQueryOptions, } from '@pinia/colada' -import type { SerializableStreamedQueryOptions, SettleOnFirstDataOptions } from './stream-query.ts' +import type { SerializableStreamedQueryOptions, SettleOnFirstDataOptions } from './stream-query' export type InferStreamedQueryOutput = TOutput extends AsyncIterable ? U[] : never export type InferLiveQueryOutput = TOutput extends AsyncIterable ? U : never diff --git a/packages/pinia-colada/tests/__shared__/orpc.ts b/packages/pinia-colada/tests/__shared__/orpc.ts index 30aa5925eb..72e7f780e6 100644 --- a/packages/pinia-colada/tests/__shared__/orpc.ts +++ b/packages/pinia-colada/tests/__shared__/orpc.ts @@ -8,7 +8,7 @@ import { mount as baseMount } from '@vue/test-utils' import { createPinia } from 'pinia' import * as z from 'zod' -import { createPiniaColadaUtils } from '../../src/index.ts' +import { createPiniaColadaUtils } from '../../src/index' export const router = { ping: os diff --git a/packages/pinia-colada/tests/e2e.test-d.ts b/packages/pinia-colada/tests/e2e.test-d.ts index 7cd0caebee..6e76f6d297 100644 --- a/packages/pinia-colada/tests/e2e.test-d.ts +++ b/packages/pinia-colada/tests/e2e.test-d.ts @@ -2,7 +2,7 @@ import { isDefinedError } from '@orpc/client' import { useInfiniteQuery, useMutation, useQuery, useQueryCache } from '@pinia/colada' import { computed } from 'vue' -import { client, orpc } from './__shared__/orpc.ts' +import { client, orpc } from './__shared__/orpc' it('.key', () => { const queryCache = useQueryCache() diff --git a/packages/pinia-colada/tests/e2e.test.tsx b/packages/pinia-colada/tests/e2e.test.tsx index 8a166add93..81cd2eb658 100644 --- a/packages/pinia-colada/tests/e2e.test.tsx +++ b/packages/pinia-colada/tests/e2e.test.tsx @@ -2,8 +2,8 @@ import { isDefinedError, ORPCError } from '@orpc/client' import { useInfiniteQuery, useMutation, useQuery, useQueryCache } from '@pinia/colada' import { defineComponent, ref } from 'vue' -import { createPiniaColadaUtils, PINIA_COLADA_OPERATION_CONTEXT_SYMBOL } from '../src/index.ts' -import { client, mount, orpc, router } from './__shared__/orpc.ts' +import { createPiniaColadaUtils, PINIA_COLADA_OPERATION_CONTEXT_SYMBOL } from '../src/index' +import { client, mount, orpc, router } from './__shared__/orpc' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/pinia-colada/tests/ssr.test.tsx b/packages/pinia-colada/tests/ssr.test.tsx index 0003f078c9..3995215189 100644 --- a/packages/pinia-colada/tests/ssr.test.tsx +++ b/packages/pinia-colada/tests/ssr.test.tsx @@ -11,9 +11,9 @@ import { createPinia } from 'pinia' import { createSSRApp, defineComponent, h, nextTick, ref, watch } from 'vue' import { renderToString } from 'vue/server-renderer' -import type { RouterUtils } from '../src/index.ts' -import { createRouterUtils, StreamQuerySSRUtilsPlugin } from '../src/index.ts' -import { createChunkController } from './__shared__/utils.ts' +import type { RouterUtils } from '../src/index' +import { createRouterUtils, StreamQuerySSRUtilsPlugin } from '../src/index' +import { createChunkController } from './__shared__/utils' type StreamClient = { stream: Client, Error> } diff --git a/packages/pino/package.json b/packages/pino/package.json index 567cce02f7..e5521be25c 100644 --- a/packages/pino/package.json +++ b/packages/pino/package.json @@ -41,7 +41,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/client": "workspace:*", diff --git a/packages/pino/src/context.test.ts b/packages/pino/src/context.test.ts index 32e0684786..c34420da48 100644 --- a/packages/pino/src/context.test.ts +++ b/packages/pino/src/context.test.ts @@ -1,6 +1,6 @@ import pino from 'pino' -import { getLogger, LOGGER_CONTEXT_SYMBOL } from './context.ts' +import { getLogger, LOGGER_CONTEXT_SYMBOL } from './context' it('getLogger', async () => { expect(getLogger({})).toBeUndefined() diff --git a/packages/pino/src/handler-plugin.test.ts b/packages/pino/src/handler-plugin.test.ts index 0c0d527720..f809f6b329 100644 --- a/packages/pino/src/handler-plugin.test.ts +++ b/packages/pino/src/handler-plugin.test.ts @@ -4,8 +4,8 @@ import { AbortError } from '@orpc/shared' import type { StandardLazyRequest } from '@standard-server/core' import { beforeEach, describe, expect, it, vi } from 'vitest' -import { getLogger, LOGGER_CONTEXT_SYMBOL } from './context.ts' -import { PinoHandlerPlugin } from './handler-plugin.ts' +import { getLogger, LOGGER_CONTEXT_SYMBOL } from './context' +import { PinoHandlerPlugin } from './handler-plugin' const globalSpies = { child: vi.fn(), diff --git a/packages/pino/src/handler-plugin.ts b/packages/pino/src/handler-plugin.ts index b48f8ed8bd..acb223162d 100644 --- a/packages/pino/src/handler-plugin.ts +++ b/packages/pino/src/handler-plugin.ts @@ -19,8 +19,8 @@ import { flattenStandardHeader } from '@standard-server/core' import type { Logger } from 'pino' import pino from 'pino' -import type { LoggerContext } from './context.ts' -import { getLogger, LOGGER_CONTEXT_SYMBOL } from './context.ts' +import type { LoggerContext } from './context' +import { getLogger, LOGGER_CONTEXT_SYMBOL } from './context' export interface PinoHandlerPluginOptions { /** diff --git a/packages/pino/src/index.test.ts b/packages/pino/src/index.test.ts index 21296dce25..7e3b199e09 100644 --- a/packages/pino/src/index.test.ts +++ b/packages/pino/src/index.test.ts @@ -1,3 +1,3 @@ it('exports PinoHandlerPlugin', async () => { - expect(Object.keys(await import('./index.ts'))).toContain('PinoHandlerPlugin') + expect(Object.keys(await import('./index'))).toContain('PinoHandlerPlugin') }) diff --git a/packages/pino/src/index.ts b/packages/pino/src/index.ts index b70e727a08..baf5a0d9be 100644 --- a/packages/pino/src/index.ts +++ b/packages/pino/src/index.ts @@ -1,2 +1,2 @@ -export * from './context.ts' -export * from './handler-plugin.ts' +export * from './context' +export * from './handler-plugin' diff --git a/packages/publisher/package.json b/packages/publisher/package.json index ada6187cce..7d0d5218a5 100644 --- a/packages/publisher/package.json +++ b/packages/publisher/package.json @@ -68,7 +68,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/client": "workspace:*", diff --git a/packages/publisher/src/adapters/base-redis.ts b/packages/publisher/src/adapters/base-redis.ts index 36bcd680da..a1c7fa39de 100644 --- a/packages/publisher/src/adapters/base-redis.ts +++ b/packages/publisher/src/adapters/base-redis.ts @@ -9,8 +9,8 @@ import type { PublisherOptions, PublisherResumeOptions, PublisherSubscribeListenerOptions, -} from '../publisher.ts' -import { Publisher } from '../publisher.ts' +} from '../publisher' +import { Publisher } from '../publisher' /** * Adds `ARGV[1]` to stream `KEYS[1]` and publishes it with its ID to the channel of the same name, diff --git a/packages/publisher/src/adapters/memory.test.ts b/packages/publisher/src/adapters/memory.test.ts index a63051cd8c..74420f9d14 100644 --- a/packages/publisher/src/adapters/memory.test.ts +++ b/packages/publisher/src/adapters/memory.test.ts @@ -1,6 +1,6 @@ import { getEventMeta, withEventMeta } from '@standard-server/core' -import { MemoryPublisher } from './memory.ts' +import { MemoryPublisher } from './memory' type TestEvents = { message: { text: string } diff --git a/packages/publisher/src/adapters/memory.ts b/packages/publisher/src/adapters/memory.ts index 9382f170ab..6cfe2342b0 100644 --- a/packages/publisher/src/adapters/memory.ts +++ b/packages/publisher/src/adapters/memory.ts @@ -6,8 +6,8 @@ import type { PublisherOptions, PublisherResumeOptions, PublisherSubscribeListenerOptions, -} from '../publisher.ts' -import { Publisher } from '../publisher.ts' +} from '../publisher' +import { Publisher } from '../publisher' export interface MemoryPublisherOptions extends PublisherOptions { /** diff --git a/packages/publisher/src/adapters/redis.test.ts b/packages/publisher/src/adapters/redis.test.ts index 68f9403655..74ccea63e7 100644 --- a/packages/publisher/src/adapters/redis.test.ts +++ b/packages/publisher/src/adapters/redis.test.ts @@ -6,8 +6,8 @@ import { getEventMeta, withEventMeta } from '@standard-server/core' import type { RedisClientType } from 'redis' import { createClient } from 'redis' -import type { RedisPublisherOptions } from './redis.ts' -import { RedisPublisher } from './redis.ts' +import type { RedisPublisherOptions } from './redis' +import { RedisPublisher } from './redis' const REDIS_URL = process.env.REDIS_URL diff --git a/packages/publisher/src/adapters/redis.ts b/packages/publisher/src/adapters/redis.ts index b8e6fe5fee..8f12261f41 100644 --- a/packages/publisher/src/adapters/redis.ts +++ b/packages/publisher/src/adapters/redis.ts @@ -1,8 +1,8 @@ import type { ThrowableError } from '@orpc/shared' import type { RedisClientType } from 'redis' -import type { BaseRedisPublisherOptions, RedisStreamEntry } from './base-redis.ts' -import { BaseRedisPublisher } from './base-redis.ts' +import type { BaseRedisPublisherOptions, RedisStreamEntry } from './base-redis' +import { BaseRedisPublisher } from './base-redis' export interface RedisPublisherOptions extends BaseRedisPublisherOptions { /** diff --git a/packages/publisher/src/adapters/upstash.test.ts b/packages/publisher/src/adapters/upstash.test.ts index caa5d5dca7..8ac797c5cd 100644 --- a/packages/publisher/src/adapters/upstash.test.ts +++ b/packages/publisher/src/adapters/upstash.test.ts @@ -3,8 +3,8 @@ import { getOrBind, promiseWithResolvers, sleep } from '@orpc/shared' import { getEventMeta, withEventMeta } from '@standard-server/core' import { Redis } from '@upstash/redis' -import type { UpstashPublisherOptions } from './upstash.ts' -import { UpstashPublisher } from './upstash.ts' +import type { UpstashPublisherOptions } from './upstash' +import { UpstashPublisher } from './upstash' const UPSTASH_REDIS_REST_URL = process.env.UPSTASH_REDIS_REST_URL const UPSTASH_REDIS_REST_TOKEN = process.env.UPSTASH_REDIS_REST_TOKEN diff --git a/packages/publisher/src/adapters/upstash.ts b/packages/publisher/src/adapters/upstash.ts index 85b339c10d..e709dcf6e6 100644 --- a/packages/publisher/src/adapters/upstash.ts +++ b/packages/publisher/src/adapters/upstash.ts @@ -2,8 +2,8 @@ import type { ThrowableError } from '@orpc/shared' import { promiseWithResolvers, tryOrUndefined } from '@orpc/shared' import type { Redis } from '@upstash/redis' -import type { BaseRedisPublisherOptions, RedisStreamEntry } from './base-redis.ts' -import { BaseRedisPublisher } from './base-redis.ts' +import type { BaseRedisPublisherOptions, RedisStreamEntry } from './base-redis' +import { BaseRedisPublisher } from './base-redis' export interface UpstashPublisherOptions extends BaseRedisPublisherOptions {} diff --git a/packages/publisher/src/index.test.ts b/packages/publisher/src/index.test.ts index f05458d0a5..ba222e1ab5 100644 --- a/packages/publisher/src/index.test.ts +++ b/packages/publisher/src/index.test.ts @@ -1,5 +1,5 @@ it('exports Publisher', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ Publisher: expect.any(Function), }) }) diff --git a/packages/publisher/src/index.ts b/packages/publisher/src/index.ts index 2d6baa48c8..b08c8eab1e 100644 --- a/packages/publisher/src/index.ts +++ b/packages/publisher/src/index.ts @@ -1,3 +1,3 @@ -export * from './publisher.ts' +export * from './publisher' export type { AsyncIteratorClass } from '@orpc/shared' diff --git a/packages/publisher/src/publisher.test-d.ts b/packages/publisher/src/publisher.test-d.ts index 84f96b54d0..1a17797631 100644 --- a/packages/publisher/src/publisher.test-d.ts +++ b/packages/publisher/src/publisher.test-d.ts @@ -1,4 +1,4 @@ -import type { Publisher } from './publisher.ts' +import type { Publisher } from './publisher' describe('publisher', () => { it('key-value types', async () => { diff --git a/packages/publisher/src/publisher.test.ts b/packages/publisher/src/publisher.test.ts index f914f54bfe..cacf3a17ef 100644 --- a/packages/publisher/src/publisher.test.ts +++ b/packages/publisher/src/publisher.test.ts @@ -1,7 +1,7 @@ import { promiseWithResolvers, sleep } from '@orpc/shared' -import type { PublisherSubscribeListenerOptions } from './publisher.ts' -import { Publisher } from './publisher.ts' +import type { PublisherSubscribeListenerOptions } from './publisher' +import { Publisher } from './publisher' // Concrete implementation for testing class TestPublisher> extends Publisher { diff --git a/packages/publisher/tests/redis-adapters-compatibility.test.ts b/packages/publisher/tests/redis-adapters-compatibility.test.ts index 92cf0e8a98..b877bd6a15 100644 --- a/packages/publisher/tests/redis-adapters-compatibility.test.ts +++ b/packages/publisher/tests/redis-adapters-compatibility.test.ts @@ -2,9 +2,9 @@ import { getEventMeta, withEventMeta } from '@standard-server/core' import { Redis } from '@upstash/redis' import { createClient } from 'redis' -import { RedisPublisher } from '../src/adapters/redis.ts' -import { UpstashPublisher } from '../src/adapters/upstash.ts' -import type { Publisher } from '../src/index.ts' +import { RedisPublisher } from '../src/adapters/redis' +import { UpstashPublisher } from '../src/adapters/upstash' +import type { Publisher } from '../src/index' const UPSTASH_REDIS_REST_URL = process.env.UPSTASH_REDIS_REST_URL const UPSTASH_REDIS_REST_TOKEN = process.env.UPSTASH_REDIS_REST_TOKEN diff --git a/packages/ratelimit/package.json b/packages/ratelimit/package.json index 32750a43f9..d66265d654 100644 --- a/packages/ratelimit/package.json +++ b/packages/ratelimit/package.json @@ -67,7 +67,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/server": "workspace:*", diff --git a/packages/ratelimit/src/adapters/base-redis.ts b/packages/ratelimit/src/adapters/base-redis.ts index 3936b5f9ec..2da3ae43fc 100644 --- a/packages/ratelimit/src/adapters/base-redis.ts +++ b/packages/ratelimit/src/adapters/base-redis.ts @@ -1,5 +1,5 @@ -import type { RateLimiter, RateLimitOptions, RateLimitResult } from '../types.ts' -import { blockUntilReady, resolveWeight } from '../utils.ts' +import type { RateLimiter, RateLimitOptions, RateLimitResult } from '../types' +import { blockUntilReady, resolveWeight } from '../utils' /** * Consumes `ARGV[1]` points from the counter at `KEYS[1]`, starts a window of diff --git a/packages/ratelimit/src/adapters/memory.test.ts b/packages/ratelimit/src/adapters/memory.test.ts index 3db7a54fff..54c1d142e0 100644 --- a/packages/ratelimit/src/adapters/memory.test.ts +++ b/packages/ratelimit/src/adapters/memory.test.ts @@ -1,4 +1,4 @@ -import { MemoryRateLimiter } from './memory.ts' +import { MemoryRateLimiter } from './memory' describe('memoryRateLimiter', () => { beforeEach(() => { diff --git a/packages/ratelimit/src/adapters/memory.ts b/packages/ratelimit/src/adapters/memory.ts index f688d83d32..6834d003b0 100644 --- a/packages/ratelimit/src/adapters/memory.ts +++ b/packages/ratelimit/src/adapters/memory.ts @@ -1,5 +1,5 @@ -import type { RateLimiter, RateLimitOptions, RateLimitResult } from '../types.ts' -import { blockUntilReady, resolveWeight } from '../utils.ts' +import type { RateLimiter, RateLimitOptions, RateLimitResult } from '../types' +import { blockUntilReady, resolveWeight } from '../utils' export interface MemoryRateLimiterOptions { /** diff --git a/packages/ratelimit/src/adapters/redis.test.ts b/packages/ratelimit/src/adapters/redis.test.ts index e1ae19e40f..3cbe02a455 100644 --- a/packages/ratelimit/src/adapters/redis.test.ts +++ b/packages/ratelimit/src/adapters/redis.test.ts @@ -1,7 +1,7 @@ import { sleep } from '@orpc/shared' import { createClient } from 'redis' -import { RedisRateLimiter } from './redis.ts' +import { RedisRateLimiter } from './redis' const REDIS_URL = process.env.REDIS_URL diff --git a/packages/ratelimit/src/adapters/redis.ts b/packages/ratelimit/src/adapters/redis.ts index 8f02c5acb0..e1f7c77af5 100644 --- a/packages/ratelimit/src/adapters/redis.ts +++ b/packages/ratelimit/src/adapters/redis.ts @@ -1,7 +1,7 @@ import type { RedisClientType } from 'redis' -import type { BaseRedisRateLimiterOptions } from './base-redis.ts' -import { BaseRedisRateLimiter } from './base-redis.ts' +import type { BaseRedisRateLimiterOptions } from './base-redis' +import { BaseRedisRateLimiter } from './base-redis' export interface RedisRateLimiterOptions extends BaseRedisRateLimiterOptions {} diff --git a/packages/ratelimit/src/adapters/upstash.test.ts b/packages/ratelimit/src/adapters/upstash.test.ts index 5f896c6348..c239b1891a 100644 --- a/packages/ratelimit/src/adapters/upstash.test.ts +++ b/packages/ratelimit/src/adapters/upstash.test.ts @@ -1,7 +1,7 @@ import { sleep } from '@orpc/shared' import { Redis } from '@upstash/redis' -import { UpstashRateLimiter } from './upstash.ts' +import { UpstashRateLimiter } from './upstash' const UPSTASH_REDIS_REST_URL = process.env.UPSTASH_REDIS_REST_URL const UPSTASH_REDIS_REST_TOKEN = process.env.UPSTASH_REDIS_REST_TOKEN diff --git a/packages/ratelimit/src/adapters/upstash.ts b/packages/ratelimit/src/adapters/upstash.ts index 1ea7bb5788..d960216c29 100644 --- a/packages/ratelimit/src/adapters/upstash.ts +++ b/packages/ratelimit/src/adapters/upstash.ts @@ -1,7 +1,7 @@ import type { Redis } from '@upstash/redis' -import type { BaseRedisRateLimiterOptions } from './base-redis.ts' -import { BaseRedisRateLimiter } from './base-redis.ts' +import type { BaseRedisRateLimiterOptions } from './base-redis' +import { BaseRedisRateLimiter } from './base-redis' export interface UpstashRateLimiterOptions extends BaseRedisRateLimiterOptions {} diff --git a/packages/ratelimit/src/handler-plugin.test.ts b/packages/ratelimit/src/handler-plugin.test.ts index 3f7fed6902..85cf46cfe8 100644 --- a/packages/ratelimit/src/handler-plugin.test.ts +++ b/packages/ratelimit/src/handler-plugin.test.ts @@ -1,10 +1,7 @@ import { ORPCError, os } from '@orpc/server' import { RPCHandler } from '@orpc/server/fetch' -import { - RATELIMIT_HANDLER_PLUGIN_CONTEXT_SYMBOL, - RateLimitHandlerPlugin, -} from './handler-plugin.ts' +import { RATELIMIT_HANDLER_PLUGIN_CONTEXT_SYMBOL, RateLimitHandlerPlugin } from './handler-plugin' describe('ratelimitHandlerPlugin', () => { const handlerFn = vi.fn() diff --git a/packages/ratelimit/src/handler-plugin.ts b/packages/ratelimit/src/handler-plugin.ts index 7ef50fc175..494ab595c8 100644 --- a/packages/ratelimit/src/handler-plugin.ts +++ b/packages/ratelimit/src/handler-plugin.ts @@ -7,7 +7,7 @@ import type { import { toArray } from '@orpc/shared' import type { StandardHeaders } from '@standard-server/core' -import type { RateLimitResult } from './types.ts' +import type { RateLimitResult } from './types' export const RATELIMIT_HANDLER_PLUGIN_CONTEXT_SYMBOL: unique symbol = /* @__PURE__ */ Symbol.for( 'ORPC_RATELIMIT_HANDLER_PLUGIN_CONTEXT', diff --git a/packages/ratelimit/src/index.test.ts b/packages/ratelimit/src/index.test.ts index 2d8ff88e40..e9a07c420d 100644 --- a/packages/ratelimit/src/index.test.ts +++ b/packages/ratelimit/src/index.test.ts @@ -1,5 +1,5 @@ it('exports plugin and middleware factory', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ RateLimitHandlerPlugin: expect.any(Function), ratelimit: expect.any(Function), }) diff --git a/packages/ratelimit/src/index.ts b/packages/ratelimit/src/index.ts index 33670782ee..3c5daeee88 100644 --- a/packages/ratelimit/src/index.ts +++ b/packages/ratelimit/src/index.ts @@ -1,3 +1,3 @@ -export * from './handler-plugin.ts' -export * from './middleware.ts' -export * from './types.ts' +export * from './handler-plugin' +export * from './middleware' +export * from './types' diff --git a/packages/ratelimit/src/middleware.test-d.ts b/packages/ratelimit/src/middleware.test-d.ts index 737fb14078..0cdf6b33e8 100644 --- a/packages/ratelimit/src/middleware.test-d.ts +++ b/packages/ratelimit/src/middleware.test-d.ts @@ -1,7 +1,7 @@ import { os, type } from '@orpc/server' -import { ratelimit } from './middleware.ts' -import type { RateLimiter } from './types.ts' +import { ratelimit } from './middleware' +import type { RateLimiter } from './types' describe('ratelimit', () => { it('can infer context & input & meta types', () => { diff --git a/packages/ratelimit/src/middleware.test.ts b/packages/ratelimit/src/middleware.test.ts index d51e214319..16994ccb6d 100644 --- a/packages/ratelimit/src/middleware.test.ts +++ b/packages/ratelimit/src/middleware.test.ts @@ -1,8 +1,8 @@ import { call, os, type } from '@orpc/server' -import { RATELIMIT_HANDLER_PLUGIN_CONTEXT_SYMBOL } from './handler-plugin.ts' -import { ratelimit, RATELIMIT_MIDDLEWARE_CONTEXT_SYMBOL } from './middleware.ts' -import type { RateLimiter, RateLimitResult } from './types.ts' +import { RATELIMIT_HANDLER_PLUGIN_CONTEXT_SYMBOL } from './handler-plugin' +import { ratelimit, RATELIMIT_MIDDLEWARE_CONTEXT_SYMBOL } from './middleware' +import type { RateLimiter, RateLimitResult } from './types' describe('ratelimit', () => { const createLimiter = (result: RateLimitResult): RateLimiter => ({ diff --git a/packages/ratelimit/src/middleware.ts b/packages/ratelimit/src/middleware.ts index 72cc833eb2..52ed81a425 100644 --- a/packages/ratelimit/src/middleware.ts +++ b/packages/ratelimit/src/middleware.ts @@ -3,9 +3,9 @@ import { ORPCError } from '@orpc/server' import type { Promisable, Value } from '@orpc/shared' import { toArray, value } from '@orpc/shared' -import type { RateLimitHandlerPluginContext } from './handler-plugin.ts' -import { RATELIMIT_HANDLER_PLUGIN_CONTEXT_SYMBOL } from './handler-plugin.ts' -import type { RateLimiter } from './types.ts' +import type { RateLimitHandlerPluginContext } from './handler-plugin' +import { RATELIMIT_HANDLER_PLUGIN_CONTEXT_SYMBOL } from './handler-plugin' +import type { RateLimiter } from './types' export const RATELIMIT_MIDDLEWARE_CONTEXT_SYMBOL: unique symbol = /* @__PURE__ */ Symbol.for( 'ORPC_RATELIMIT_MIDDLEWARE_CONTEXT', diff --git a/packages/ratelimit/src/utils.ts b/packages/ratelimit/src/utils.ts index cc0b14d23a..d1b6b39593 100644 --- a/packages/ratelimit/src/utils.ts +++ b/packages/ratelimit/src/utils.ts @@ -1,7 +1,7 @@ import type { Promisable } from '@orpc/shared' import { sleep } from '@orpc/shared' -import type { RateLimitOptions, RateLimitResult } from './types.ts' +import type { RateLimitOptions, RateLimitResult } from './types' /** * Reads the request weight, defaulting to 1. diff --git a/packages/ratelimit/tests/e2e.test.ts b/packages/ratelimit/tests/e2e.test.ts index 9b9d35f023..2b438826e4 100644 --- a/packages/ratelimit/tests/e2e.test.ts +++ b/packages/ratelimit/tests/e2e.test.ts @@ -2,9 +2,9 @@ import { os } from '@orpc/server' import { RPCHandler } from '@orpc/server/fetch' import { z } from 'zod' -import { MemoryRateLimiter } from '../src/adapters/memory.ts' -import type { RateLimiter } from '../src/index.ts' -import { ratelimit, RateLimitHandlerPlugin } from '../src/index.ts' +import { MemoryRateLimiter } from '../src/adapters/memory' +import type { RateLimiter } from '../src/index' +import { ratelimit, RateLimitHandlerPlugin } from '../src/index' it('works', async () => { const router = { diff --git a/packages/server/package.json b/packages/server/package.json index c70ac498a2..2089ea21f7 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -123,7 +123,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/client": "workspace:*", diff --git a/packages/server/src/adapters/aws-lambda/handler.ts b/packages/server/src/adapters/aws-lambda/handler.ts index 82ae7166c8..2238a2e37a 100644 --- a/packages/server/src/adapters/aws-lambda/handler.ts +++ b/packages/server/src/adapters/aws-lambda/handler.ts @@ -7,9 +7,9 @@ import type { } from '@standard-server/aws-lambda' import { sendStandardResponse, toStandardLazyRequest } from '@standard-server/aws-lambda' -import type { Context } from '../../context.ts' -import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index.ts' -import { resolveFriendlyStandardHandlerHandleOptions } from '../standard/index.ts' +import type { Context } from '../../context' +import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index' +import { resolveFriendlyStandardHandlerHandleOptions } from '../standard/index' export type AwsLambdaHandlerHandleResult = { matched: true } | { matched: false } diff --git a/packages/server/src/adapters/aws-lambda/index.test.ts b/packages/server/src/adapters/aws-lambda/index.test.ts index f009eb3a9e..ed8add42cf 100644 --- a/packages/server/src/adapters/aws-lambda/index.test.ts +++ b/packages/server/src/adapters/aws-lambda/index.test.ts @@ -1,5 +1,5 @@ it('exports RPCHandler', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ RPCHandler: expect.any(Function), }) }) diff --git a/packages/server/src/adapters/aws-lambda/index.ts b/packages/server/src/adapters/aws-lambda/index.ts index 2f76c30682..f5895fe7ec 100644 --- a/packages/server/src/adapters/aws-lambda/index.ts +++ b/packages/server/src/adapters/aws-lambda/index.ts @@ -1,5 +1,5 @@ -export * from './handler.ts' -export * from './rpc-handler.ts' +export * from './handler' +export * from './rpc-handler' export type { AnyAPIGatewayProxyEvent, diff --git a/packages/server/src/adapters/aws-lambda/rpc-handler.test.ts b/packages/server/src/adapters/aws-lambda/rpc-handler.test.ts index c2a9a2477c..6bf267e61c 100644 --- a/packages/server/src/adapters/aws-lambda/rpc-handler.test.ts +++ b/packages/server/src/adapters/aws-lambda/rpc-handler.test.ts @@ -7,9 +7,9 @@ import type { HttpResponseStream, } from '@standard-server/aws-lambda' -import { os } from '../../builder.ts' -import type { StandardHandlerPlugin } from '../standard/index.ts' -import { RPCHandler } from './rpc-handler.ts' +import { os } from '../../builder' +import type { StandardHandlerPlugin } from '../standard/index' +import { RPCHandler } from './rpc-handler' class TestResponseStream extends Writable implements HttpResponseStream { chunks: Buffer[] = [] diff --git a/packages/server/src/adapters/aws-lambda/rpc-handler.ts b/packages/server/src/adapters/aws-lambda/rpc-handler.ts index 4281f1ee54..6bf8a8955f 100644 --- a/packages/server/src/adapters/aws-lambda/rpc-handler.ts +++ b/packages/server/src/adapters/aws-lambda/rpc-handler.ts @@ -1,9 +1,9 @@ -import type { Context } from '../../context.ts' -import type { Router } from '../../router.ts' -import type { RPCHandlerCodecOptions, StandardHandlerOptions } from '../standard/index.ts' -import { RPCHandlerCodec, StandardHandler } from '../standard/index.ts' -import type { AwsLambdaHandlerOptions } from './handler.ts' -import { AwsLambdaHandler } from './handler.ts' +import type { Context } from '../../context' +import type { Router } from '../../router' +import type { RPCHandlerCodecOptions, StandardHandlerOptions } from '../standard/index' +import { RPCHandlerCodec, StandardHandler } from '../standard/index' +import type { AwsLambdaHandlerOptions } from './handler' +import { AwsLambdaHandler } from './handler' export interface RPCHandlerOptions extends AwsLambdaHandlerOptions, StandardHandlerOptions, RPCHandlerCodecOptions {} diff --git a/packages/server/src/adapters/crossws/handler.ts b/packages/server/src/adapters/crossws/handler.ts index a273abd435..297b4c61e7 100644 --- a/packages/server/src/adapters/crossws/handler.ts +++ b/packages/server/src/adapters/crossws/handler.ts @@ -9,9 +9,9 @@ import { } from '@standard-server/peer' import type { Message, Peer } from 'crossws' -import type { Context } from '../../context.ts' -import { createStandardPeerRequestHandler } from '../standard-peer/index.ts' -import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index.ts' +import type { Context } from '../../context' +import { createStandardPeerRequestHandler } from '../standard-peer/index' +import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index' export type CrosswsPeerLike = Pick export type CrosswsMessageLike = Pick diff --git a/packages/server/src/adapters/crossws/index.test.ts b/packages/server/src/adapters/crossws/index.test.ts index eff7140892..f727ffebf2 100644 --- a/packages/server/src/adapters/crossws/index.test.ts +++ b/packages/server/src/adapters/crossws/index.test.ts @@ -1,3 +1,3 @@ it('exports RPCHandler', async () => { - await expect(import('./index.ts')).resolves.toHaveProperty('experimental_RPCHandler') + await expect(import('./index')).resolves.toHaveProperty('experimental_RPCHandler') }) diff --git a/packages/server/src/adapters/crossws/index.ts b/packages/server/src/adapters/crossws/index.ts index 4e8b799a20..97d3dd64c7 100644 --- a/packages/server/src/adapters/crossws/index.ts +++ b/packages/server/src/adapters/crossws/index.ts @@ -1,2 +1,2 @@ -export * from './handler.ts' -export * from './rpc-handler.ts' +export * from './handler' +export * from './rpc-handler' diff --git a/packages/server/src/adapters/crossws/rpc-handler.test.ts b/packages/server/src/adapters/crossws/rpc-handler.test.ts index 4f29888c5f..27fc676624 100644 --- a/packages/server/src/adapters/crossws/rpc-handler.test.ts +++ b/packages/server/src/adapters/crossws/rpc-handler.test.ts @@ -1,7 +1,7 @@ import { decodePeerMessage, encodePeerMessage } from '@standard-server/peer' -import { os } from '../../builder.ts' -import { experimental_RPCHandler as RPCHandler } from './rpc-handler.ts' +import { os } from '../../builder' +import { experimental_RPCHandler as RPCHandler } from './rpc-handler' describe('rpcHandler', () => { beforeEach(() => { diff --git a/packages/server/src/adapters/crossws/rpc-handler.ts b/packages/server/src/adapters/crossws/rpc-handler.ts index e23846a5d5..b10f57aaac 100644 --- a/packages/server/src/adapters/crossws/rpc-handler.ts +++ b/packages/server/src/adapters/crossws/rpc-handler.ts @@ -1,9 +1,9 @@ -import type { Context } from '../../context.ts' -import type { Router } from '../../router.ts' -import type { RPCHandlerCodecOptions, StandardHandlerOptions } from '../standard/index.ts' -import { RPCHandlerCodec, StandardHandler } from '../standard/index.ts' -import type { experimental_CrosswsHandlerOptions as CrosswsHandlerOptions } from './handler.ts' -import { experimental_CrosswsHandler as CrosswsHandler } from './handler.ts' +import type { Context } from '../../context' +import type { Router } from '../../router' +import type { RPCHandlerCodecOptions, StandardHandlerOptions } from '../standard/index' +import { RPCHandlerCodec, StandardHandler } from '../standard/index' +import type { experimental_CrosswsHandlerOptions as CrosswsHandlerOptions } from './handler' +import { experimental_CrosswsHandler as CrosswsHandler } from './handler' export interface experimental_RPCHandlerOptions extends StandardHandlerOptions, RPCHandlerCodecOptions, CrosswsHandlerOptions {} diff --git a/packages/server/src/adapters/fastify/handler.ts b/packages/server/src/adapters/fastify/handler.ts index 733bb94041..4795f8e19e 100644 --- a/packages/server/src/adapters/fastify/handler.ts +++ b/packages/server/src/adapters/fastify/handler.ts @@ -7,9 +7,9 @@ import type { } from '@standard-server/fastify' import { sendStandardResponse, toStandardLazyRequest } from '@standard-server/fastify' -import type { Context } from '../../context.ts' -import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index.ts' -import { resolveFriendlyStandardHandlerHandleOptions } from '../standard/index.ts' +import type { Context } from '../../context' +import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index' +import { resolveFriendlyStandardHandlerHandleOptions } from '../standard/index' export type FastifyHandlerHandleResult = { matched: true } | { matched: false } diff --git a/packages/server/src/adapters/fastify/index.test.ts b/packages/server/src/adapters/fastify/index.test.ts index f009eb3a9e..ed8add42cf 100644 --- a/packages/server/src/adapters/fastify/index.test.ts +++ b/packages/server/src/adapters/fastify/index.test.ts @@ -1,5 +1,5 @@ it('exports RPCHandler', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ RPCHandler: expect.any(Function), }) }) diff --git a/packages/server/src/adapters/fastify/index.ts b/packages/server/src/adapters/fastify/index.ts index 4e8b799a20..97d3dd64c7 100644 --- a/packages/server/src/adapters/fastify/index.ts +++ b/packages/server/src/adapters/fastify/index.ts @@ -1,2 +1,2 @@ -export * from './handler.ts' -export * from './rpc-handler.ts' +export * from './handler' +export * from './rpc-handler' diff --git a/packages/server/src/adapters/fastify/rpc-handler.test.ts b/packages/server/src/adapters/fastify/rpc-handler.test.ts index 6e7faccde0..7f5f0074bb 100644 --- a/packages/server/src/adapters/fastify/rpc-handler.test.ts +++ b/packages/server/src/adapters/fastify/rpc-handler.test.ts @@ -2,9 +2,9 @@ import type { FastifyInstance } from 'fastify' import Fastify from 'fastify' import request from 'supertest' -import { os } from '../../builder.ts' -import type { StandardHandlerPlugin } from '../standard/index.ts' -import { RPCHandler } from './rpc-handler.ts' +import { os } from '../../builder' +import type { StandardHandlerPlugin } from '../standard/index' +import { RPCHandler } from './rpc-handler' describe('rpcHandler', () => { let app: FastifyInstance diff --git a/packages/server/src/adapters/fastify/rpc-handler.ts b/packages/server/src/adapters/fastify/rpc-handler.ts index 7f468af452..4b84a7a831 100644 --- a/packages/server/src/adapters/fastify/rpc-handler.ts +++ b/packages/server/src/adapters/fastify/rpc-handler.ts @@ -1,9 +1,9 @@ -import type { Context } from '../../context.ts' -import type { Router } from '../../router.ts' -import type { RPCHandlerCodecOptions, StandardHandlerOptions } from '../standard/index.ts' -import { RPCHandlerCodec, StandardHandler } from '../standard/index.ts' -import type { FastifyHandlerOptions } from './handler.ts' -import { FastifyHandler } from './handler.ts' +import type { Context } from '../../context' +import type { Router } from '../../router' +import type { RPCHandlerCodecOptions, StandardHandlerOptions } from '../standard/index' +import { RPCHandlerCodec, StandardHandler } from '../standard/index' +import type { FastifyHandlerOptions } from './handler' +import { FastifyHandler } from './handler' export interface RPCHandlerOptions extends FastifyHandlerOptions, StandardHandlerOptions, RPCHandlerCodecOptions {} diff --git a/packages/server/src/adapters/fetch/handler.ts b/packages/server/src/adapters/fetch/handler.ts index 92276445f1..005ca4bfa3 100644 --- a/packages/server/src/adapters/fetch/handler.ts +++ b/packages/server/src/adapters/fetch/handler.ts @@ -3,9 +3,9 @@ import { resolveMaybeOptionalOptions } from '@orpc/shared' import type { ToFetchResponseOptions } from '@standard-server/fetch' import { toFetchResponse, toStandardLazyRequest } from '@standard-server/fetch' -import type { Context } from '../../context.ts' -import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index.ts' -import { resolveFriendlyStandardHandlerHandleOptions } from '../standard/index.ts' +import type { Context } from '../../context' +import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index' +import { resolveFriendlyStandardHandlerHandleOptions } from '../standard/index' export type FetchHandlerHandleResult = | { matched: true; response: Response } diff --git a/packages/server/src/adapters/fetch/index.test.ts b/packages/server/src/adapters/fetch/index.test.ts index f009eb3a9e..ed8add42cf 100644 --- a/packages/server/src/adapters/fetch/index.test.ts +++ b/packages/server/src/adapters/fetch/index.test.ts @@ -1,5 +1,5 @@ it('exports RPCHandler', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ RPCHandler: expect.any(Function), }) }) diff --git a/packages/server/src/adapters/fetch/index.ts b/packages/server/src/adapters/fetch/index.ts index ec5a563795..b1f5dbc80f 100644 --- a/packages/server/src/adapters/fetch/index.ts +++ b/packages/server/src/adapters/fetch/index.ts @@ -3,6 +3,6 @@ export { * @deprecated Use `RequestLimitHandlerPlugin` from `@orpc/server/plugins` instead. */ RequestLimitHandlerPlugin as BodyLimitPlugin, -} from '../../plugins/request-limit.ts' -export * from './handler.ts' -export * from './rpc-handler.ts' +} from '../../plugins/request-limit' +export * from './handler' +export * from './rpc-handler' diff --git a/packages/server/src/adapters/fetch/rpc-handler.test.ts b/packages/server/src/adapters/fetch/rpc-handler.test.ts index 304c014fe6..da9c5a941f 100644 --- a/packages/server/src/adapters/fetch/rpc-handler.test.ts +++ b/packages/server/src/adapters/fetch/rpc-handler.test.ts @@ -1,6 +1,6 @@ -import { os } from '../../builder.ts' -import type { StandardHandlerPlugin } from '../standard/index.ts' -import { RPCHandler } from './rpc-handler.ts' +import { os } from '../../builder' +import type { StandardHandlerPlugin } from '../standard/index' +import { RPCHandler } from './rpc-handler' describe('rpcHandler', () => { beforeEach(() => { diff --git a/packages/server/src/adapters/fetch/rpc-handler.ts b/packages/server/src/adapters/fetch/rpc-handler.ts index 8ef7518899..9c4e958cfc 100644 --- a/packages/server/src/adapters/fetch/rpc-handler.ts +++ b/packages/server/src/adapters/fetch/rpc-handler.ts @@ -1,9 +1,9 @@ -import type { Context } from '../../context.ts' -import type { Router } from '../../router.ts' -import type { RPCHandlerCodecOptions, StandardHandlerOptions } from '../standard/index.ts' -import { RPCHandlerCodec, StandardHandler } from '../standard/index.ts' -import type { FetchHandlerOptions } from './handler.ts' -import { FetchHandler } from './handler.ts' +import type { Context } from '../../context' +import type { Router } from '../../router' +import type { RPCHandlerCodecOptions, StandardHandlerOptions } from '../standard/index' +import { RPCHandlerCodec, StandardHandler } from '../standard/index' +import type { FetchHandlerOptions } from './handler' +import { FetchHandler } from './handler' export interface RPCHandlerOptions extends FetchHandlerOptions, StandardHandlerOptions, RPCHandlerCodecOptions {} diff --git a/packages/server/src/adapters/message-port/handler.ts b/packages/server/src/adapters/message-port/handler.ts index edde5dcda0..2d786b2ff0 100644 --- a/packages/server/src/adapters/message-port/handler.ts +++ b/packages/server/src/adapters/message-port/handler.ts @@ -19,9 +19,9 @@ import { ServerPeer, } from '@standard-server/peer' -import type { Context } from '../../context.ts' -import { createStandardPeerRequestHandler } from '../standard-peer/index.ts' -import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index.ts' +import type { Context } from '../../context' +import { createStandardPeerRequestHandler } from '../standard-peer/index' +import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index' type DecodedResponseMessage = ConstructorParameters[0] extends ( message: infer TMessage, diff --git a/packages/server/src/adapters/message-port/index.test.ts b/packages/server/src/adapters/message-port/index.test.ts index b010072ddc..e1282ef4a7 100644 --- a/packages/server/src/adapters/message-port/index.test.ts +++ b/packages/server/src/adapters/message-port/index.test.ts @@ -1,3 +1,3 @@ it('exports RPCHandler', async () => { - await expect(import('./index.ts')).resolves.toHaveProperty('RPCHandler') + await expect(import('./index')).resolves.toHaveProperty('RPCHandler') }) diff --git a/packages/server/src/adapters/message-port/index.ts b/packages/server/src/adapters/message-port/index.ts index 4e8b799a20..97d3dd64c7 100644 --- a/packages/server/src/adapters/message-port/index.ts +++ b/packages/server/src/adapters/message-port/index.ts @@ -1,2 +1,2 @@ -export * from './handler.ts' -export * from './rpc-handler.ts' +export * from './handler' +export * from './rpc-handler' diff --git a/packages/server/src/adapters/message-port/rpc-handler.test.ts b/packages/server/src/adapters/message-port/rpc-handler.test.ts index 165ddf8deb..49fc2ae611 100644 --- a/packages/server/src/adapters/message-port/rpc-handler.test.ts +++ b/packages/server/src/adapters/message-port/rpc-handler.test.ts @@ -1,7 +1,7 @@ import { decodePeerMessage, encodePeerMessage } from '@standard-server/peer' -import { os } from '../../builder.ts' -import { RPCHandler } from './rpc-handler.ts' +import { os } from '../../builder' +import { RPCHandler } from './rpc-handler' describe('rpcHandler', () => { beforeEach(() => { diff --git a/packages/server/src/adapters/message-port/rpc-handler.ts b/packages/server/src/adapters/message-port/rpc-handler.ts index 158443a610..a097583d92 100644 --- a/packages/server/src/adapters/message-port/rpc-handler.ts +++ b/packages/server/src/adapters/message-port/rpc-handler.ts @@ -1,9 +1,9 @@ -import type { Context } from '../../context.ts' -import type { Router } from '../../router.ts' -import type { RPCHandlerCodecOptions, StandardHandlerOptions } from '../standard/index.ts' -import { RPCHandlerCodec, StandardHandler } from '../standard/index.ts' -import type { MessagePortHandlerOptions } from './handler.ts' -import { MessagePortHandler } from './handler.ts' +import type { Context } from '../../context' +import type { Router } from '../../router' +import type { RPCHandlerCodecOptions, StandardHandlerOptions } from '../standard/index' +import { RPCHandlerCodec, StandardHandler } from '../standard/index' +import type { MessagePortHandlerOptions } from './handler' +import { MessagePortHandler } from './handler' export interface RPCHandlerOptions extends StandardHandlerOptions, RPCHandlerCodecOptions, MessagePortHandlerOptions {} diff --git a/packages/server/src/adapters/node/handler.ts b/packages/server/src/adapters/node/handler.ts index 45e1d90e94..5ce81cc883 100644 --- a/packages/server/src/adapters/node/handler.ts +++ b/packages/server/src/adapters/node/handler.ts @@ -7,9 +7,9 @@ import type { } from '@standard-server/node' import { sendStandardResponse, toStandardLazyRequest } from '@standard-server/node' -import type { Context } from '../../context.ts' -import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index.ts' -import { resolveFriendlyStandardHandlerHandleOptions } from '../standard/index.ts' +import type { Context } from '../../context' +import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index' +import { resolveFriendlyStandardHandlerHandleOptions } from '../standard/index' export type NodeHttpHandlerHandleResult = { matched: true } | { matched: false } diff --git a/packages/server/src/adapters/node/index.test.ts b/packages/server/src/adapters/node/index.test.ts index f009eb3a9e..ed8add42cf 100644 --- a/packages/server/src/adapters/node/index.test.ts +++ b/packages/server/src/adapters/node/index.test.ts @@ -1,5 +1,5 @@ it('exports RPCHandler', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ RPCHandler: expect.any(Function), }) }) diff --git a/packages/server/src/adapters/node/index.ts b/packages/server/src/adapters/node/index.ts index ec5a563795..b1f5dbc80f 100644 --- a/packages/server/src/adapters/node/index.ts +++ b/packages/server/src/adapters/node/index.ts @@ -3,6 +3,6 @@ export { * @deprecated Use `RequestLimitHandlerPlugin` from `@orpc/server/plugins` instead. */ RequestLimitHandlerPlugin as BodyLimitPlugin, -} from '../../plugins/request-limit.ts' -export * from './handler.ts' -export * from './rpc-handler.ts' +} from '../../plugins/request-limit' +export * from './handler' +export * from './rpc-handler' diff --git a/packages/server/src/adapters/node/rpc-handler.test.ts b/packages/server/src/adapters/node/rpc-handler.test.ts index b349d6426f..7af9651713 100644 --- a/packages/server/src/adapters/node/rpc-handler.test.ts +++ b/packages/server/src/adapters/node/rpc-handler.test.ts @@ -2,9 +2,9 @@ import type { IncomingMessage, ServerResponse } from 'node:http' import request from 'supertest' -import { os } from '../../builder.ts' -import type { StandardHandlerPlugin } from '../standard/index.ts' -import { RPCHandler } from './rpc-handler.ts' +import { os } from '../../builder' +import type { StandardHandlerPlugin } from '../standard/index' +import { RPCHandler } from './rpc-handler' describe('rpcHandler', () => { beforeEach(() => { diff --git a/packages/server/src/adapters/node/rpc-handler.ts b/packages/server/src/adapters/node/rpc-handler.ts index 456f160d63..250806f774 100644 --- a/packages/server/src/adapters/node/rpc-handler.ts +++ b/packages/server/src/adapters/node/rpc-handler.ts @@ -1,9 +1,9 @@ -import type { Context } from '../../context.ts' -import type { Router } from '../../router.ts' -import type { RPCHandlerCodecOptions, StandardHandlerOptions } from '../standard/index.ts' -import { RPCHandlerCodec, StandardHandler } from '../standard/index.ts' -import type { NodeHttpHandlerOptions } from './handler.ts' -import { NodeHttpHandler } from './handler.ts' +import type { Context } from '../../context' +import type { Router } from '../../router' +import type { RPCHandlerCodecOptions, StandardHandlerOptions } from '../standard/index' +import { RPCHandlerCodec, StandardHandler } from '../standard/index' +import type { NodeHttpHandlerOptions } from './handler' +import { NodeHttpHandler } from './handler' export interface RPCHandlerOptions extends NodeHttpHandlerOptions, StandardHandlerOptions, RPCHandlerCodecOptions {} diff --git a/packages/server/src/adapters/standard-peer/index.test.ts b/packages/server/src/adapters/standard-peer/index.test.ts index 8de52156f7..e96b2da6e3 100644 --- a/packages/server/src/adapters/standard-peer/index.test.ts +++ b/packages/server/src/adapters/standard-peer/index.test.ts @@ -1,3 +1,3 @@ it('exports createStandardPeerRequestHandler', async () => { - await expect(import('./index.ts')).resolves.toHaveProperty('createStandardPeerRequestHandler') + await expect(import('./index')).resolves.toHaveProperty('createStandardPeerRequestHandler') }) diff --git a/packages/server/src/adapters/standard-peer/index.ts b/packages/server/src/adapters/standard-peer/index.ts index 5522418ddc..9c56149efa 100644 --- a/packages/server/src/adapters/standard-peer/index.ts +++ b/packages/server/src/adapters/standard-peer/index.ts @@ -1 +1 @@ -export * from './utils.ts' +export * from './utils' diff --git a/packages/server/src/adapters/standard-peer/utils.test.ts b/packages/server/src/adapters/standard-peer/utils.test.ts index 8d10432e12..3af1c485b1 100644 --- a/packages/server/src/adapters/standard-peer/utils.test.ts +++ b/packages/server/src/adapters/standard-peer/utils.test.ts @@ -1,6 +1,6 @@ import type { StandardLazyRequest } from '@standard-server/core' -import { createStandardPeerRequestHandler } from './utils.ts' +import { createStandardPeerRequestHandler } from './utils' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/server/src/adapters/standard-peer/utils.ts b/packages/server/src/adapters/standard-peer/utils.ts index e26f5a0cea..238c1ba189 100644 --- a/packages/server/src/adapters/standard-peer/utils.ts +++ b/packages/server/src/adapters/standard-peer/utils.ts @@ -1,8 +1,8 @@ import type { StandardLazyRequest, StandardResponse } from '@standard-server/core' -import type { Context } from '../../context.ts' -import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index.ts' -import { resolveFriendlyStandardHandlerHandleOptions } from '../standard/index.ts' +import type { Context } from '../../context' +import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index' +import { resolveFriendlyStandardHandlerHandleOptions } from '../standard/index' export function createStandardPeerRequestHandler( handler: StandardHandler, diff --git a/packages/server/src/adapters/standard/codec.ts b/packages/server/src/adapters/standard/codec.ts index 0b4dce8add..61bdd8b01f 100644 --- a/packages/server/src/adapters/standard/codec.ts +++ b/packages/server/src/adapters/standard/codec.ts @@ -2,9 +2,9 @@ import type { AnyORPCError } from '@orpc/client' import type { Promisable } from '@orpc/shared' import type { StandardLazyRequest, StandardResponse } from '@standard-server/core' -import type { Context } from '../../context.ts' -import type { AnyProcedure } from '../../procedure.ts' -import type { ResolvedStandardHandlerHandleOptions } from './handler.ts' +import type { Context } from '../../context' +import type { AnyProcedure } from '../../procedure' +import type { ResolvedStandardHandlerHandleOptions } from './handler' export interface StandardHandlerCodecResolvedProcedure { path: string[] diff --git a/packages/server/src/adapters/standard/handler.test.ts b/packages/server/src/adapters/standard/handler.test.ts index 17ebb8af0e..fc37b8c8a3 100644 --- a/packages/server/src/adapters/standard/handler.test.ts +++ b/packages/server/src/adapters/standard/handler.test.ts @@ -2,10 +2,10 @@ import { ORPCError } from '@orpc/client' import * as sharedExperimental from '@orpc/shared' import { EventStreamErrorEvent } from '@standard-server/core' -import { createProcedureClient } from '../../procedure-client.ts' -import { StandardHandler } from './handler.ts' +import { createProcedureClient } from '../../procedure-client' +import { StandardHandler } from './handler' -vi.mock('../../procedure-client.ts', () => ({ +vi.mock('../../procedure-client', () => ({ createProcedureClient: vi.fn(), })) diff --git a/packages/server/src/adapters/standard/handler.ts b/packages/server/src/adapters/standard/handler.ts index 5a8c78b6dd..9cd27e647f 100644 --- a/packages/server/src/adapters/standard/handler.ts +++ b/packages/server/src/adapters/standard/handler.ts @@ -25,12 +25,12 @@ import { parseStandardUrl, } from '@standard-server/core' -import type { Context } from '../../context.ts' -import type { ProcedureClientInterceptor } from '../../procedure-client.ts' -import { createProcedureClient } from '../../procedure-client.ts' -import type { StandardHandlerCodec, StandardHandlerCodecResolvedProcedure } from './codec.ts' -import type { StandardHandlerPlugin } from './plugin.ts' -import { CompositeStandardHandlerPlugin } from './plugin.ts' +import type { Context } from '../../context' +import type { ProcedureClientInterceptor } from '../../procedure-client' +import { createProcedureClient } from '../../procedure-client' +import type { StandardHandlerCodec, StandardHandlerCodecResolvedProcedure } from './codec' +import type { StandardHandlerPlugin } from './plugin' +import { CompositeStandardHandlerPlugin } from './plugin' export interface StandardHandlerHandleOptions { prefix?: `/${string}` | undefined diff --git a/packages/server/src/adapters/standard/index.test.ts b/packages/server/src/adapters/standard/index.test.ts index a11243f722..5a42ed08cd 100644 --- a/packages/server/src/adapters/standard/index.test.ts +++ b/packages/server/src/adapters/standard/index.test.ts @@ -1,5 +1,5 @@ it('exports StandardHandler, resolveFriendlyStandardHandlerHandleOptions, RPCMatcher, RPCHandlerCodec', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ StandardHandler: expect.any(Function), resolveFriendlyStandardHandlerHandleOptions: expect.any(Function), RPCMatcher: expect.any(Function), diff --git a/packages/server/src/adapters/standard/index.ts b/packages/server/src/adapters/standard/index.ts index d30632cb7c..e84a94c5ec 100644 --- a/packages/server/src/adapters/standard/index.ts +++ b/packages/server/src/adapters/standard/index.ts @@ -1,6 +1,6 @@ -export * from './codec.ts' -export * from './handler.ts' -export type { StandardHandlerPlugin } from './plugin.ts' -export * from './rpc-handler-codec.ts' -export * from './rpc-matcher.ts' -export * from './utils.ts' +export * from './codec' +export * from './handler' +export type { StandardHandlerPlugin } from './plugin' +export * from './rpc-handler-codec' +export * from './rpc-matcher' +export * from './utils' diff --git a/packages/server/src/adapters/standard/plugin.test.ts b/packages/server/src/adapters/standard/plugin.test.ts index 0895e6bcc0..f753dc7e0b 100644 --- a/packages/server/src/adapters/standard/plugin.test.ts +++ b/packages/server/src/adapters/standard/plugin.test.ts @@ -1,5 +1,5 @@ -import type { StandardHandlerPlugin } from './plugin.ts' -import { CompositeStandardHandlerPlugin } from './plugin.ts' +import type { StandardHandlerPlugin } from './plugin' +import { CompositeStandardHandlerPlugin } from './plugin' describe('compositeStandardHandlerPlugin', () => { beforeEach(() => { diff --git a/packages/server/src/adapters/standard/plugin.ts b/packages/server/src/adapters/standard/plugin.ts index 4d046a2da8..105cee1035 100644 --- a/packages/server/src/adapters/standard/plugin.ts +++ b/packages/server/src/adapters/standard/plugin.ts @@ -1,8 +1,8 @@ import type { OrderablePlugin } from '@orpc/shared' import { sortPlugins } from '@orpc/shared' -import type { Context } from '../../context.ts' -import type { StandardHandlerOptions } from './handler.ts' +import type { Context } from '../../context' +import type { StandardHandlerOptions } from './handler' export interface StandardHandlerPlugin extends OrderablePlugin { /** diff --git a/packages/server/src/adapters/standard/rpc-handler-codec.test.ts b/packages/server/src/adapters/standard/rpc-handler-codec.test.ts index b92f7b6900..6bfb1e8813 100644 --- a/packages/server/src/adapters/standard/rpc-handler-codec.test.ts +++ b/packages/server/src/adapters/standard/rpc-handler-codec.test.ts @@ -1,8 +1,8 @@ import { ORPCError } from '@orpc/client' -import { os } from '../../builder.ts' -import { DEFAULT_ERROR_STATUS } from '../../constants.ts' -import { RPCHandlerCodec } from './rpc-handler-codec.ts' +import { os } from '../../builder' +import { DEFAULT_ERROR_STATUS } from '../../constants' +import { RPCHandlerCodec } from './rpc-handler-codec' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/server/src/adapters/standard/rpc-handler-codec.ts b/packages/server/src/adapters/standard/rpc-handler-codec.ts index 83529e98ef..5aa2272718 100644 --- a/packages/server/src/adapters/standard/rpc-handler-codec.ts +++ b/packages/server/src/adapters/standard/rpc-handler-codec.ts @@ -5,17 +5,17 @@ import { getOwn, parseEmptyableJSON, value } from '@orpc/shared' import type { StandardLazyRequest, StandardResponse } from '@standard-server/core' import { parseStandardUrl } from '@standard-server/core' -import { DEFAULT_ERROR_STATUS, DEFAULT_SUCCESS_STATUS } from '../../constants.ts' -import type { Context } from '../../context.ts' -import type { AnyProcedure } from '../../procedure.ts' -import type { AnyRouter } from '../../router.ts' +import { DEFAULT_ERROR_STATUS, DEFAULT_SUCCESS_STATUS } from '../../constants' +import type { Context } from '../../context' +import type { AnyProcedure } from '../../procedure' +import type { AnyRouter } from '../../router' import type { ResolvedStandardHandlerHandleOptions, StandardHandlerCodec, StandardHandlerCodecResolvedProcedure, -} from '../standard/index.ts' -import type { RPCMatcherOptions } from './rpc-matcher.ts' -import { RPCMatcher } from './rpc-matcher.ts' +} from '../standard/index' +import type { RPCMatcherOptions } from './rpc-matcher' +import { RPCMatcher } from './rpc-matcher' export interface RPCHandlerCodecOptions extends RPCMatcherOptions { /** diff --git a/packages/server/src/adapters/standard/rpc-matcher.test.ts b/packages/server/src/adapters/standard/rpc-matcher.test.ts index e509757ee6..04f5ad4dad 100644 --- a/packages/server/src/adapters/standard/rpc-matcher.test.ts +++ b/packages/server/src/adapters/standard/rpc-matcher.test.ts @@ -1,12 +1,12 @@ import { oc } from '@orpc/contract' import { z } from 'zod' -import { os } from '../../builder.ts' -import { implement } from '../../implementer.ts' -import { Lazy } from '../../lazy.ts' -import * as ProcedureUtils from '../../procedure-utils.ts' -import { withHiddenRouterContract } from '../../router-hidden.ts' -import { RPCMatcher } from './rpc-matcher.ts' +import { os } from '../../builder' +import { implement } from '../../implementer' +import { Lazy } from '../../lazy' +import * as ProcedureUtils from '../../procedure-utils' +import { withHiddenRouterContract } from '../../router-hidden' +import { RPCMatcher } from './rpc-matcher' const createContractProcedureSpy = vi.spyOn(ProcedureUtils, 'createContractProcedure') diff --git a/packages/server/src/adapters/standard/rpc-matcher.ts b/packages/server/src/adapters/standard/rpc-matcher.ts index 89a02aa007..48608ea139 100644 --- a/packages/server/src/adapters/standard/rpc-matcher.ts +++ b/packages/server/src/adapters/standard/rpc-matcher.ts @@ -3,12 +3,12 @@ import type { Value } from '@orpc/shared' import { normalizeHttpPath, pathToHttpPath, stripHttpPathPrefix, value } from '@orpc/shared' import type { StandardMethod } from '@standard-server/core' -import { unlazy } from '../../lazy.ts' -import type { AnyProcedure } from '../../procedure.ts' -import { Procedure } from '../../procedure.ts' -import type { WalkProcedureContractsLazyResult } from '../../router-utils.ts' -import { resolveContractProcedure, walkProcedureContractsSync } from '../../router-utils.ts' -import type { AnyRouter } from '../../router.ts' +import { unlazy } from '../../lazy' +import type { AnyProcedure } from '../../procedure' +import { Procedure } from '../../procedure' +import type { AnyRouter } from '../../router' +import type { WalkProcedureContractsLazyResult } from '../../router-utils' +import { resolveContractProcedure, walkProcedureContractsSync } from '../../router-utils' /** * Methods that can invoke procedures by default. Browsers cannot trigger them diff --git a/packages/server/src/adapters/standard/utils.test.ts b/packages/server/src/adapters/standard/utils.test.ts index dec250dc3b..f3e0873473 100644 --- a/packages/server/src/adapters/standard/utils.test.ts +++ b/packages/server/src/adapters/standard/utils.test.ts @@ -1,4 +1,4 @@ -import { resolveFriendlyStandardHandlerHandleOptions } from './utils.ts' +import { resolveFriendlyStandardHandlerHandleOptions } from './utils' describe('resolveFriendlyStandardHandlerHandleOptions', () => { it('defaults context to empty object', () => { diff --git a/packages/server/src/adapters/standard/utils.ts b/packages/server/src/adapters/standard/utils.ts index 29063a695f..351435a684 100644 --- a/packages/server/src/adapters/standard/utils.ts +++ b/packages/server/src/adapters/standard/utils.ts @@ -1,8 +1,8 @@ import type { Promisable, Value } from '@orpc/shared' import type { StandardLazyRequest } from '@standard-server/core' -import type { Context } from '../../context.ts' -import type { StandardHandlerHandleOptions } from './handler.ts' +import type { Context } from '../../context' +import type { StandardHandlerHandleOptions } from './handler' export type FriendlyStandardHandlerHandleOptions = Omit< StandardHandlerHandleOptions, diff --git a/packages/server/src/adapters/websocket/handler.test-d.ts b/packages/server/src/adapters/websocket/handler.test-d.ts index 7fc202f92b..6eecae57b8 100644 --- a/packages/server/src/adapters/websocket/handler.test-d.ts +++ b/packages/server/src/adapters/websocket/handler.test-d.ts @@ -1,4 +1,4 @@ -import type { WebSocketLike } from './handler.ts' +import type { WebSocketLike } from './handler' it('WebSocket is assignable to WebSocketLike', () => { const _assignable: WebSocketLike = {} as WebSocket diff --git a/packages/server/src/adapters/websocket/handler.ts b/packages/server/src/adapters/websocket/handler.ts index 951b44e627..2dc37e48bf 100644 --- a/packages/server/src/adapters/websocket/handler.ts +++ b/packages/server/src/adapters/websocket/handler.ts @@ -8,9 +8,9 @@ import { ServerPeer, } from '@standard-server/peer' -import type { Context } from '../../context.ts' -import { createStandardPeerRequestHandler } from '../standard-peer/index.ts' -import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index.ts' +import type { Context } from '../../context' +import { createStandardPeerRequestHandler } from '../standard-peer/index' +import type { FriendlyStandardHandlerHandleOptions, StandardHandler } from '../standard/index' /** * Supports standard WebSocket instances, Bun ServerWebSocket, "ws" ServerWebSocket, diff --git a/packages/server/src/adapters/websocket/index.test.ts b/packages/server/src/adapters/websocket/index.test.ts index b010072ddc..e1282ef4a7 100644 --- a/packages/server/src/adapters/websocket/index.test.ts +++ b/packages/server/src/adapters/websocket/index.test.ts @@ -1,3 +1,3 @@ it('exports RPCHandler', async () => { - await expect(import('./index.ts')).resolves.toHaveProperty('RPCHandler') + await expect(import('./index')).resolves.toHaveProperty('RPCHandler') }) diff --git a/packages/server/src/adapters/websocket/index.ts b/packages/server/src/adapters/websocket/index.ts index 4e8b799a20..97d3dd64c7 100644 --- a/packages/server/src/adapters/websocket/index.ts +++ b/packages/server/src/adapters/websocket/index.ts @@ -1,2 +1,2 @@ -export * from './handler.ts' -export * from './rpc-handler.ts' +export * from './handler' +export * from './rpc-handler' diff --git a/packages/server/src/adapters/websocket/rpc-handler.test.ts b/packages/server/src/adapters/websocket/rpc-handler.test.ts index 69eaa0bbb4..4abb4b1386 100644 --- a/packages/server/src/adapters/websocket/rpc-handler.test.ts +++ b/packages/server/src/adapters/websocket/rpc-handler.test.ts @@ -4,8 +4,8 @@ import type { AddressInfo } from 'node:net' import { decodePeerMessage, encodePeerMessage } from '@standard-server/peer' import { WebSocket, WebSocketServer } from 'ws' -import { os } from '../../builder.ts' -import { RPCHandler } from './rpc-handler.ts' +import { os } from '../../builder' +import { RPCHandler } from './rpc-handler' describe('rpcHandler', () => { beforeEach(() => { diff --git a/packages/server/src/adapters/websocket/rpc-handler.ts b/packages/server/src/adapters/websocket/rpc-handler.ts index b74b1682b4..ba579135cf 100644 --- a/packages/server/src/adapters/websocket/rpc-handler.ts +++ b/packages/server/src/adapters/websocket/rpc-handler.ts @@ -1,9 +1,9 @@ -import type { Context } from '../../context.ts' -import type { Router } from '../../router.ts' -import type { RPCHandlerCodecOptions, StandardHandlerOptions } from '../standard/index.ts' -import { RPCHandlerCodec, StandardHandler } from '../standard/index.ts' -import type { WebSocketHandlerOptions } from './handler.ts' -import { WebSocketHandler } from './handler.ts' +import type { Context } from '../../context' +import type { Router } from '../../router' +import type { RPCHandlerCodecOptions, StandardHandlerOptions } from '../standard/index' +import { RPCHandlerCodec, StandardHandler } from '../standard/index' +import type { WebSocketHandlerOptions } from './handler' +import { WebSocketHandler } from './handler' export interface RPCHandlerOptions extends StandardHandlerOptions, RPCHandlerCodecOptions, WebSocketHandlerOptions {} diff --git a/packages/server/src/builder-variants.test-d.ts b/packages/server/src/builder-variants.test-d.ts index 67f31df2b9..424651a74b 100644 --- a/packages/server/src/builder-variants.test-d.ts +++ b/packages/server/src/builder-variants.test-d.ts @@ -13,14 +13,14 @@ import type { BuilderWithInputOutput, BuilderWithMiddlewares, BuilderWithOutput, -} from './builder-variants.ts' -import type { MergedContext, MergedInitialContext } from './context.ts' -import type { Lazy } from './lazy.ts' -import type { DecoratedMiddleware } from './middleware-decorated.ts' -import type { Middleware, MiddlewareDone } from './middleware.ts' -import type { DecoratedProcedure } from './procedure-decorated.ts' -import type { Procedure } from './procedure.ts' -import type { AugmentedRouterWithMiddlewares } from './router-utils.ts' +} from './builder-variants' +import type { MergedContext, MergedInitialContext } from './context' +import type { Lazy } from './lazy' +import type { Middleware, MiddlewareDone } from './middleware' +import type { DecoratedMiddleware } from './middleware-decorated' +import type { Procedure } from './procedure' +import type { DecoratedProcedure } from './procedure-decorated' +import type { AugmentedRouterWithMiddlewares } from './router-utils' const errorMap = { BASE: { diff --git a/packages/server/src/builder-variants.ts b/packages/server/src/builder-variants.ts index 1655773378..0a97ee869e 100644 --- a/packages/server/src/builder-variants.ts +++ b/packages/server/src/builder-variants.ts @@ -13,15 +13,15 @@ import type { } from '@orpc/contract' import type { IntersectPick } from '@orpc/shared' -import type { BuilderDefinition } from './builder.ts' -import type { Context, MergedContext, MergedInitialContext } from './context.ts' -import type { Lazy } from './lazy.ts' -import type { DecoratedMiddleware } from './middleware-decorated.ts' -import type { Middleware } from './middleware.ts' -import type { DecoratedProcedure } from './procedure-decorated.ts' -import type { ProcedureHandler } from './procedure.ts' -import type { AugmentedRouterWithMiddlewares } from './router-utils.ts' -import type { Router } from './router.ts' +import type { BuilderDefinition } from './builder' +import type { Context, MergedContext, MergedInitialContext } from './context' +import type { Lazy } from './lazy' +import type { Middleware } from './middleware' +import type { DecoratedMiddleware } from './middleware-decorated' +import type { ProcedureHandler } from './procedure' +import type { DecoratedProcedure } from './procedure-decorated' +import type { Router } from './router' +import type { AugmentedRouterWithMiddlewares } from './router-utils' /** * The builder variant returned after `.use` is called. diff --git a/packages/server/src/builder.test-d.ts b/packages/server/src/builder.test-d.ts index e7180b8777..5dc0257c62 100644 --- a/packages/server/src/builder.test-d.ts +++ b/packages/server/src/builder.test-d.ts @@ -4,20 +4,20 @@ import { onError, onFinish, onStart, onSuccess } from '@orpc/shared' import { expectTypeOf } from 'vitest' import { z } from 'zod' +import type { Builder, DefaultInitialContext } from './builder' +import { os } from './builder' import type { BuilderWithInput, BuilderWithMiddlewares, BuilderWithOutput, -} from './builder-variants.ts' -import type { Builder, DefaultInitialContext } from './builder.ts' -import { os } from './builder.ts' -import type { MergedContext, MergedInitialContext } from './context.ts' -import type { Lazy } from './lazy.ts' -import type { DecoratedMiddleware } from './middleware-decorated.ts' -import type { Middleware, MiddlewareDone } from './middleware.ts' -import type { DecoratedProcedure } from './procedure-decorated.ts' -import type { Procedure } from './procedure.ts' -import type { AugmentedRouter } from './router-utils.ts' +} from './builder-variants' +import type { MergedContext, MergedInitialContext } from './context' +import type { Lazy } from './lazy' +import type { Middleware, MiddlewareDone } from './middleware' +import type { DecoratedMiddleware } from './middleware-decorated' +import type { Procedure } from './procedure' +import type { DecoratedProcedure } from './procedure-decorated' +import type { AugmentedRouter } from './router-utils' const errorMap = { BASE: { diff --git a/packages/server/src/builder.test.ts b/packages/server/src/builder.test.ts index a70b1096cd..11c08d04b9 100644 --- a/packages/server/src/builder.test.ts +++ b/packages/server/src/builder.test.ts @@ -4,12 +4,12 @@ import type { AnyFunction } from '@orpc/shared' import { toArray } from '@orpc/shared' import { z } from 'zod' -import { Builder, os } from './builder.ts' -import * as LazyModule from './lazy.ts' -import * as MiddlewareDecoratedModule from './middleware-decorated.ts' -import type { AnyMiddleware } from './middleware.ts' -import * as ProcedureDecoratedModule from './procedure-decorated.ts' -import * as RouterUtilsModule from './router-utils.ts' +import { Builder, os } from './builder' +import * as LazyModule from './lazy' +import type { AnyMiddleware } from './middleware' +import * as MiddlewareDecoratedModule from './middleware-decorated' +import * as ProcedureDecoratedModule from './procedure-decorated' +import * as RouterUtilsModule from './router-utils' const resolveMetaPluginsSpy = vi.spyOn(ContractModule, 'resolveMetaPlugins') const mergeErrorMapSpy = vi.spyOn(ContractModule, 'mergeErrorMap') diff --git a/packages/server/src/builder.ts b/packages/server/src/builder.ts index 87cadd4c5d..5a5ab2fc3b 100644 --- a/packages/server/src/builder.ts +++ b/packages/server/src/builder.ts @@ -19,17 +19,17 @@ import type { BuilderWithInput, BuilderWithMiddlewares, BuilderWithOutput, -} from './builder-variants.ts' -import type { Context, MergedInitialContext } from './context.ts' -import { Lazy } from './lazy.ts' -import type { DecoratedMiddleware } from './middleware-decorated.ts' -import { decorateMiddleware } from './middleware-decorated.ts' -import type { Middleware } from './middleware.ts' -import { DecoratedProcedure } from './procedure-decorated.ts' -import type { OrderedMiddleware, ProcedureConfig, ProcedureHandler } from './procedure.ts' -import type { AugmentedRouter } from './router-utils.ts' -import { augmentRouter } from './router-utils.ts' -import type { AnyRouter } from './router.ts' +} from './builder-variants' +import type { Context, MergedInitialContext } from './context' +import { Lazy } from './lazy' +import type { Middleware } from './middleware' +import type { DecoratedMiddleware } from './middleware-decorated' +import { decorateMiddleware } from './middleware-decorated' +import type { OrderedMiddleware, ProcedureConfig, ProcedureHandler } from './procedure' +import { DecoratedProcedure } from './procedure-decorated' +import type { AnyRouter } from './router' +import type { AugmentedRouter } from './router-utils' +import { augmentRouter } from './router-utils' /** * The initial context type used when `.$context` is not called. diff --git a/packages/server/src/constants.test.ts b/packages/server/src/constants.test.ts index 4bd80d7e7a..99fb9060d2 100644 --- a/packages/server/src/constants.test.ts +++ b/packages/server/src/constants.test.ts @@ -1,5 +1,5 @@ it('exports DEFAULT_ERROR_STATUS_CODE', async () => { - await expect(import('./constants.ts')).resolves.toMatchObject({ + await expect(import('./constants')).resolves.toMatchObject({ DEFAULT_ERROR_STATUS: 400, DEFAULT_SUCCESS_STATUS: 200, }) diff --git a/packages/server/src/context.test-d.ts b/packages/server/src/context.test-d.ts index 2bd473abca..bfdd516524 100644 --- a/packages/server/src/context.test-d.ts +++ b/packages/server/src/context.test-d.ts @@ -1,6 +1,6 @@ import { expectTypeOf, it } from 'vitest' -import type { MergedContext, MergedInitialContext } from './context.ts' +import type { MergedContext, MergedInitialContext } from './context' describe('MergedInitialContext', () => { it('no extra', () => { diff --git a/packages/server/src/extensions/callable.test-d.ts b/packages/server/src/extensions/callable.test-d.ts index bb30fa505a..708579fe0a 100644 --- a/packages/server/src/extensions/callable.test-d.ts +++ b/packages/server/src/extensions/callable.test-d.ts @@ -1,7 +1,7 @@ import type { DecoratedProcedure, Procedure, ProcedureClient } from '@orpc/server' import { z } from 'zod' -import './callable.ts' +import './callable' const errorMap = { BASE: { diff --git a/packages/server/src/extensions/callable.test.ts b/packages/server/src/extensions/callable.test.ts index 510788a864..92cbcee657 100644 --- a/packages/server/src/extensions/callable.test.ts +++ b/packages/server/src/extensions/callable.test.ts @@ -1,6 +1,6 @@ -import { os } from '../builder.ts' -import { Procedure } from '../procedure.ts' -import './callable.ts' +import { os } from '../builder' +import { Procedure } from '../procedure' +import './callable' it('adds .callable into decorated procedure', async () => { const callable = os diff --git a/packages/server/src/extensions/callable.ts b/packages/server/src/extensions/callable.ts index b097850269..e50539c25a 100644 --- a/packages/server/src/extensions/callable.ts +++ b/packages/server/src/extensions/callable.ts @@ -2,11 +2,11 @@ import type { ClientContext } from '@orpc/client' import type { AnySchema, ErrorMap } from '@orpc/contract' import type { MaybeOptionalOptions } from '@orpc/shared' -import type { Context } from '../context.ts' -import type { ProcedureClient, ProcedureClientOptions } from '../procedure-client.ts' -import { createProcedureClient } from '../procedure-client.ts' -import { DecoratedProcedure } from '../procedure-decorated.ts' -import type { Procedure } from '../procedure.ts' +import type { Context } from '../context' +import type { Procedure } from '../procedure' +import type { ProcedureClient, ProcedureClientOptions } from '../procedure-client' +import { createProcedureClient } from '../procedure-client' +import { DecoratedProcedure } from '../procedure-decorated' declare module '@orpc/server' { interface DecoratedProcedure< diff --git a/packages/server/src/helpers/base64url.test.ts b/packages/server/src/helpers/base64url.test.ts index 2ac1da6963..b73479e5ac 100644 --- a/packages/server/src/helpers/base64url.test.ts +++ b/packages/server/src/helpers/base64url.test.ts @@ -1,4 +1,4 @@ -import { decodeBase64url, encodeBase64url } from './base64url.ts' +import { decodeBase64url, encodeBase64url } from './base64url' describe('encodeBase64url / decodeBase64url', () => { it('should encode and decode Uint8Array correctly', () => { diff --git a/packages/server/src/helpers/cookie.test.ts b/packages/server/src/helpers/cookie.test.ts index 5ebfa9fb80..bd8755422d 100644 --- a/packages/server/src/helpers/cookie.test.ts +++ b/packages/server/src/helpers/cookie.test.ts @@ -1,4 +1,4 @@ -import { deleteCookie, getCookie, setCookie } from './cookie.ts' +import { deleteCookie, getCookie, setCookie } from './cookie' describe('setCookie', () => { it('should work with Headers object', () => { diff --git a/packages/server/src/helpers/encryption.test.ts b/packages/server/src/helpers/encryption.test.ts index 6ede520a01..99723a3a75 100644 --- a/packages/server/src/helpers/encryption.test.ts +++ b/packages/server/src/helpers/encryption.test.ts @@ -1,4 +1,4 @@ -import { decrypt, encrypt } from './encryption.ts' +import { decrypt, encrypt } from './encryption' describe('encrypt/decrypt', () => { const secret = 'test-secret-key' diff --git a/packages/server/src/helpers/encryption.ts b/packages/server/src/helpers/encryption.ts index 5f05c08a0b..536c66d924 100644 --- a/packages/server/src/helpers/encryption.ts +++ b/packages/server/src/helpers/encryption.ts @@ -1,4 +1,4 @@ -import { decodeBase64url, encodeBase64url } from './base64url.ts' +import { decodeBase64url, encodeBase64url } from './base64url' const PBKDF2_CONFIG = { name: 'PBKDF2', diff --git a/packages/server/src/helpers/index.test.ts b/packages/server/src/helpers/index.test.ts index 3251ee2383..7fef7344f6 100644 --- a/packages/server/src/helpers/index.test.ts +++ b/packages/server/src/helpers/index.test.ts @@ -1,5 +1,5 @@ it('exports helpers', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ encodeBase64url: expect.any(Function), setCookie: expect.any(Function), encrypt: expect.any(Function), diff --git a/packages/server/src/helpers/index.ts b/packages/server/src/helpers/index.ts index 2269f33bc8..79fbe74a2b 100644 --- a/packages/server/src/helpers/index.ts +++ b/packages/server/src/helpers/index.ts @@ -1,4 +1,4 @@ -export * from './base64url.ts' -export * from './cookie.ts' -export * from './encryption.ts' -export * from './signing.ts' +export * from './base64url' +export * from './cookie' +export * from './encryption' +export * from './signing' diff --git a/packages/server/src/helpers/signing.test.ts b/packages/server/src/helpers/signing.test.ts index ce0a83c3c3..9e14744b4e 100644 --- a/packages/server/src/helpers/signing.test.ts +++ b/packages/server/src/helpers/signing.test.ts @@ -1,5 +1,5 @@ -import { getCookie } from './cookie.ts' -import { getSignedValue, sign, unsign } from './signing.ts' +import { getCookie } from './cookie' +import { getSignedValue, sign, unsign } from './signing' describe('signing', () => { const secret = 'test-secret-key' diff --git a/packages/server/src/helpers/signing.ts b/packages/server/src/helpers/signing.ts index b33b265b28..24b942f283 100644 --- a/packages/server/src/helpers/signing.ts +++ b/packages/server/src/helpers/signing.ts @@ -1,4 +1,4 @@ -import { decodeBase64url, encodeBase64url } from './base64url.ts' +import { decodeBase64url, encodeBase64url } from './base64url' const ALGORITHM = { name: 'HMAC', hash: 'SHA-256' } diff --git a/packages/server/src/implementer-procedure.test-d.ts b/packages/server/src/implementer-procedure.test-d.ts index 74cd9a8799..5254e23913 100644 --- a/packages/server/src/implementer-procedure.test-d.ts +++ b/packages/server/src/implementer-procedure.test-d.ts @@ -2,9 +2,9 @@ import type { ORPCErrorConstructorMap, Schema } from '@orpc/contract' import { expectTypeOf } from 'vitest' import { z } from 'zod' -import type { MergedContext, MergedInitialContext } from './context.ts' -import type { ImplementedProcedure, ProcedureImplementer } from './implementer-procedure.ts' -import type { Middleware, MiddlewareDone } from './middleware.ts' +import type { MergedContext, MergedInitialContext } from './context' +import type { ImplementedProcedure, ProcedureImplementer } from './implementer-procedure' +import type { Middleware, MiddlewareDone } from './middleware' const errorMap = { BASE: { diff --git a/packages/server/src/implementer-procedure.test.ts b/packages/server/src/implementer-procedure.test.ts index 3f4e22603a..80b724cdcd 100644 --- a/packages/server/src/implementer-procedure.test.ts +++ b/packages/server/src/implementer-procedure.test.ts @@ -1,6 +1,6 @@ import { z } from 'zod' -import { ImplementedProcedure, ProcedureImplementer } from './implementer-procedure.ts' +import { ImplementedProcedure, ProcedureImplementer } from './implementer-procedure' describe('procedureImplementer', () => { const definition = { diff --git a/packages/server/src/implementer-procedure.ts b/packages/server/src/implementer-procedure.ts index 775fd60db9..7c79a79e0d 100644 --- a/packages/server/src/implementer-procedure.ts +++ b/packages/server/src/implementer-procedure.ts @@ -7,11 +7,11 @@ import type { } from '@orpc/contract' import type { IntersectPick } from '@orpc/shared' -import type { BuilderDefinition } from './builder.ts' -import type { Context, MergedContext, MergedInitialContext } from './context.ts' -import type { Middleware } from './middleware.ts' -import type { ProcedureHandler } from './procedure.ts' -import { Procedure } from './procedure.ts' +import type { BuilderDefinition } from './builder' +import type { Context, MergedContext, MergedInitialContext } from './context' +import type { Middleware } from './middleware' +import type { ProcedureHandler } from './procedure' +import { Procedure } from './procedure' export class ProcedureImplementer< TInitialContext extends Context, diff --git a/packages/server/src/implementer-router.test-d.ts b/packages/server/src/implementer-router.test-d.ts index 778a451cdd..8c13b0b252 100644 --- a/packages/server/src/implementer-router.test-d.ts +++ b/packages/server/src/implementer-router.test-d.ts @@ -7,19 +7,19 @@ import type { import { expectTypeOf } from 'vitest' import { z } from 'zod' -import type { MergedContext, MergedInitialContext } from './context.ts' -import type { ProcedureImplementer } from './implementer-procedure.ts' +import type { MergedContext, MergedInitialContext } from './context' +import type { ProcedureImplementer } from './implementer-procedure' import type { RouterImplementer, RouterImplementerWithMiddlewares, SharedRouterImplementer, SharedRouterImplementerWithMiddlewares, -} from './implementer-router.ts' -import { Lazy } from './lazy.ts' -import type { DecoratedMiddleware } from './middleware-decorated.ts' -import type { Middleware, MiddlewareDone } from './middleware.ts' -import type { Procedure } from './procedure.ts' -import type { AugmentedRouterWithMiddlewares } from './router-utils.ts' +} from './implementer-router' +import { Lazy } from './lazy' +import type { Middleware, MiddlewareDone } from './middleware' +import type { DecoratedMiddleware } from './middleware-decorated' +import type { Procedure } from './procedure' +import type { AugmentedRouterWithMiddlewares } from './router-utils' const errorMap = { BASE: { diff --git a/packages/server/src/implementer-router.test.ts b/packages/server/src/implementer-router.test.ts index 5d637d3884..91133170f0 100644 --- a/packages/server/src/implementer-router.test.ts +++ b/packages/server/src/implementer-router.test.ts @@ -2,15 +2,15 @@ import { oc, ProcedureContract } from '@orpc/contract' import { getOwn } from '@orpc/shared' import * as z from 'zod' -import { os } from './builder.ts' -import { ImplementedProcedure, ProcedureImplementer } from './implementer-procedure.ts' -import { createRouterImplementer } from './implementer-router.ts' -import { Lazy } from './lazy.ts' -import * as MiddlewareDecoratedModule from './middleware-decorated.ts' -import { Procedure } from './procedure.ts' -import * as RouterHiddenModule from './router-hidden.ts' -import { getHiddenRouterContract } from './router-hidden.ts' -import * as RouterUtilsModule from './router-utils.ts' +import { os } from './builder' +import { ImplementedProcedure, ProcedureImplementer } from './implementer-procedure' +import { createRouterImplementer } from './implementer-router' +import { Lazy } from './lazy' +import * as MiddlewareDecoratedModule from './middleware-decorated' +import { Procedure } from './procedure' +import * as RouterHiddenModule from './router-hidden' +import { getHiddenRouterContract } from './router-hidden' +import * as RouterUtilsModule from './router-utils' const decorateMiddlewareSpy = vi.spyOn(MiddlewareDecoratedModule, 'decorateMiddleware') const augmentImplementedRouterSpy = vi.spyOn(RouterUtilsModule, 'augmentImplementedRouter') diff --git a/packages/server/src/implementer-router.ts b/packages/server/src/implementer-router.ts index ad91f9e5e4..786fa5869d 100644 --- a/packages/server/src/implementer-router.ts +++ b/packages/server/src/implementer-router.ts @@ -3,18 +3,18 @@ import { ProcedureContract } from '@orpc/contract' import type { IntersectPick, Public } from '@orpc/shared' import { bindMethods, omit, setOwn } from '@orpc/shared' -import type { Context, MergedContext, MergedInitialContext } from './context.ts' -import { ProcedureImplementer } from './implementer-procedure.ts' -import { Lazy } from './lazy.ts' -import type { DecoratedMiddleware } from './middleware-decorated.ts' -import { decorateMiddleware } from './middleware-decorated.ts' -import type { AnyMiddleware, Middleware } from './middleware.ts' -import type { AnyProcedure, ProcedureConfig } from './procedure.ts' -import { Procedure } from './procedure.ts' -import { withHiddenRouterContract } from './router-hidden.ts' -import type { AugmentedRouterWithMiddlewares } from './router-utils.ts' -import { augmentImplementedRouter } from './router-utils.ts' -import type { ContractedRouter } from './router.ts' +import type { Context, MergedContext, MergedInitialContext } from './context' +import { ProcedureImplementer } from './implementer-procedure' +import { Lazy } from './lazy' +import type { AnyMiddleware, Middleware } from './middleware' +import type { DecoratedMiddleware } from './middleware-decorated' +import { decorateMiddleware } from './middleware-decorated' +import type { AnyProcedure, ProcedureConfig } from './procedure' +import { Procedure } from './procedure' +import type { ContractedRouter } from './router' +import { withHiddenRouterContract } from './router-hidden' +import type { AugmentedRouterWithMiddlewares } from './router-utils' +import { augmentImplementedRouter } from './router-utils' export class SharedRouterImplementer< TContract extends RouterContract, diff --git a/packages/server/src/implementer.test-d.ts b/packages/server/src/implementer.test-d.ts index ab97eeaef1..a97c030852 100644 --- a/packages/server/src/implementer.test-d.ts +++ b/packages/server/src/implementer.test-d.ts @@ -1,7 +1,7 @@ import type { ProcedureContract, RouterContract } from '@orpc/contract' -import type { RouterImplementer } from './implementer-router.ts' -import type { Implementer } from './implementer.ts' +import type { Implementer } from './implementer' +import type { RouterImplementer } from './implementer-router' const contract = { ping: {} as ProcedureContract, diff --git a/packages/server/src/implementer.test.ts b/packages/server/src/implementer.test.ts index a0ecbb79a4..02b0a2cd0f 100644 --- a/packages/server/src/implementer.test.ts +++ b/packages/server/src/implementer.test.ts @@ -2,9 +2,9 @@ import type { RouterContract } from '@orpc/contract' import { oc } from '@orpc/contract' import * as z from 'zod' -import { ImplementedProcedure, ProcedureImplementer } from './implementer-procedure.ts' -import * as ImplementerRouter from './implementer-router.ts' -import { implement } from './implementer.ts' +import { implement } from './implementer' +import { ImplementedProcedure, ProcedureImplementer } from './implementer-procedure' +import * as ImplementerRouter from './implementer-router' const createRouterImplementerSpy = vi.spyOn(ImplementerRouter, 'createRouterImplementer') diff --git a/packages/server/src/implementer.ts b/packages/server/src/implementer.ts index a06b9b9be5..dad18eadb1 100644 --- a/packages/server/src/implementer.ts +++ b/packages/server/src/implementer.ts @@ -2,11 +2,11 @@ import type { RouterContract } from '@orpc/contract' import type { AnyFunction } from '@orpc/shared' import { isNonPrimitive } from '@orpc/shared' -import type { DefaultInitialContext } from './builder.ts' -import type { Context } from './context.ts' -import type { RouterImplementer } from './implementer-router.ts' -import { createRouterImplementer } from './implementer-router.ts' -import type { ProcedureConfig } from './procedure.ts' +import type { DefaultInitialContext } from './builder' +import type { Context } from './context' +import type { RouterImplementer } from './implementer-router' +import { createRouterImplementer } from './implementer-router' +import type { ProcedureConfig } from './procedure' export type Implementer = { $context(): Implementer diff --git a/packages/server/src/index.test.ts b/packages/server/src/index.test.ts index cd238b4412..10400a986e 100644 --- a/packages/server/src/index.test.ts +++ b/packages/server/src/index.test.ts @@ -1,5 +1,5 @@ it('exports os, ORPCError, createRouterClient, RPCJsonSerializer, RPCSerializer', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ os: expect.any(Object), ORPCError: expect.any(Function), createRouterClient: expect.any(Function), diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index fa6acf9cce..76b35ead0c 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -1,44 +1,44 @@ -export * from './builder.ts' -export * from './builder-variants.ts' -export * from './constants.ts' -export * from './context.ts' -export * from './implementer.ts' -export * from './implementer-procedure.ts' -export { SharedRouterImplementer } from './implementer-router.ts' +export * from './builder' +export * from './builder-variants' +export * from './constants' +export * from './context' +export * from './implementer' +export * from './implementer-procedure' +export { SharedRouterImplementer } from './implementer-router' export type { RouterImplementer, RouterImplementerWithMiddlewares, SharedRouterImplementerWithMiddlewares, -} from './implementer-router.ts' -export * from './lazy.ts' -export * from './middleware.ts' -export type { DecoratedMiddleware } from './middleware-decorated.ts' -export * from './procedure.ts' -export * from './procedure-client.ts' -export * from './procedure-decorated.ts' -export { call } from './procedure-utils.ts' -export type { CallOptions, CallRest } from './procedure-utils.ts' -export * from './router.ts' +} from './implementer-router' +export * from './lazy' +export * from './middleware' +export type { DecoratedMiddleware } from './middleware-decorated' +export * from './procedure' +export * from './procedure-client' +export * from './procedure-decorated' +export { call } from './procedure-utils' +export type { CallOptions, CallRest } from './procedure-utils' +export * from './router' export type { /** * @deprecated Use `InferRouterFinalContexts` instead. */ InferRouterFinalContexts as InferRouterCurrentContexts, -} from './router.ts' -export * from './router-client.ts' +} from './router' +export * from './router-client' export { getRouter, resolveContractProcedure, unlazyRouter, walkProcedureContractsAsync, walkProcedureContractsSync, -} from './router-utils.ts' +} from './router-utils' export type { AugmentedRouter, AugmentedRouterWithMiddlewares, UnlaziedRouter, WalkProcedureContractsLazyResult, -} from './router-utils.ts' +} from './router-utils' export type { AnyORPCError, diff --git a/packages/server/src/lazy.test.ts b/packages/server/src/lazy.test.ts index 19138b6dea..a7db12a81b 100644 --- a/packages/server/src/lazy.test.ts +++ b/packages/server/src/lazy.test.ts @@ -1,4 +1,4 @@ -import { Lazy, unlazy } from './lazy.ts' +import { Lazy, unlazy } from './lazy' describe('lazy', () => { const meta = { title: 'test' } diff --git a/packages/server/src/middleware-decorated.test-d.ts b/packages/server/src/middleware-decorated.test-d.ts index 4d17209ed6..b748d0e124 100644 --- a/packages/server/src/middleware-decorated.test-d.ts +++ b/packages/server/src/middleware-decorated.test-d.ts @@ -1,8 +1,8 @@ import type { ErrorMap, MergedErrorMap, ORPCErrorConstructorMap } from '@orpc/contract' -import type { MergedContext, MergedInitialContext } from './context.ts' -import type { DecoratedMiddleware } from './middleware-decorated.ts' -import type { Middleware, MiddlewareDone } from './middleware.ts' +import type { MergedContext, MergedInitialContext } from './context' +import type { Middleware, MiddlewareDone } from './middleware' +import type { DecoratedMiddleware } from './middleware-decorated' const errorMap = { BASE: { message: 'bad request' } } satisfies ErrorMap diff --git a/packages/server/src/middleware-decorated.test.ts b/packages/server/src/middleware-decorated.test.ts index 9b1f85de5a..d259f598fc 100644 --- a/packages/server/src/middleware-decorated.test.ts +++ b/packages/server/src/middleware-decorated.test.ts @@ -2,7 +2,7 @@ import * as ContractModule from '@orpc/contract' import { sleep } from '@orpc/shared' import { vi } from 'vitest' -import { decorateMiddleware } from './middleware-decorated.ts' +import { decorateMiddleware } from './middleware-decorated' const mergeErrorMapSpy = vi.spyOn(ContractModule, 'mergeErrorMap') diff --git a/packages/server/src/middleware-decorated.ts b/packages/server/src/middleware-decorated.ts index 9ebe2d0f11..eefd45a40e 100644 --- a/packages/server/src/middleware-decorated.ts +++ b/packages/server/src/middleware-decorated.ts @@ -3,13 +3,13 @@ import { mergeErrorMap } from '@orpc/contract' import type { IntersectPick } from '@orpc/shared' import { toArray } from '@orpc/shared' -import type { Context, MergedContext, MergedInitialContext } from './context.ts' +import type { Context, MergedContext, MergedInitialContext } from './context' import type { AnyMiddleware, Middleware, MiddlewareNextOptions, MiddlewareResult, -} from './middleware.ts' +} from './middleware' export interface DecoratedMiddleware< TInContext extends Context, diff --git a/packages/server/src/middleware.test-d.ts b/packages/server/src/middleware.test-d.ts index 414dd4b3aa..a6acfa54a3 100644 --- a/packages/server/src/middleware.test-d.ts +++ b/packages/server/src/middleware.test-d.ts @@ -1,7 +1,7 @@ import type { ErrorMap, ORPCErrorConstructorMap } from '@orpc/contract' import * as z from 'zod' -import type { Middleware } from './middleware.ts' +import type { Middleware } from './middleware' const errorMap = { BASE: { diff --git a/packages/server/src/middleware.ts b/packages/server/src/middleware.ts index e293a64504..862627aa51 100644 --- a/packages/server/src/middleware.ts +++ b/packages/server/src/middleware.ts @@ -1,8 +1,8 @@ import type { AnyMetaPlugin, ErrorMap, ORPCErrorConstructorMap } from '@orpc/contract' import type { MaybeOptionalOptions, Promisable } from '@orpc/shared' -import type { Context } from './context.ts' -import type { AnyProcedure } from './procedure.ts' +import type { Context } from './context' +import type { AnyProcedure } from './procedure' export type MiddlewareResult = Promisable<{ output: TOutput diff --git a/packages/server/src/plugins/batch.test.ts b/packages/server/src/plugins/batch.test.ts index f7da5d4bc2..0d49f8898a 100644 --- a/packages/server/src/plugins/batch.test.ts +++ b/packages/server/src/plugins/batch.test.ts @@ -3,14 +3,14 @@ import { promiseWithResolvers, sleep } from '@orpc/shared' import type { StandardResponse } from '@standard-server/core' import { decodePeerMessage } from '@standard-server/peer' -import { RPCHandler } from '../adapters/fetch/rpc-handler.ts' -import { os } from '../builder.ts' -import type { AnyRouter } from '../router.ts' -import { BatchHandlerPlugin } from './batch.ts' -import { RequestCompressionHandlerPlugin } from './request-compression.ts' -import { RequestLimitHandlerPlugin } from './request-limit.ts' -import type { ResponseHeadersHandlerPluginContext } from './response-headers.ts' -import { ResponseHeadersHandlerPlugin } from './response-headers.ts' +import { RPCHandler } from '../adapters/fetch/rpc-handler' +import { os } from '../builder' +import type { AnyRouter } from '../router' +import { BatchHandlerPlugin } from './batch' +import { RequestCompressionHandlerPlugin } from './request-compression' +import { RequestLimitHandlerPlugin } from './request-limit' +import type { ResponseHeadersHandlerPluginContext } from './response-headers' +import { ResponseHeadersHandlerPlugin } from './response-headers' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/server/src/plugins/batch.ts b/packages/server/src/plugins/batch.ts index 7513ccf73a..306971d676 100644 --- a/packages/server/src/plugins/batch.ts +++ b/packages/server/src/plugins/batch.ts @@ -23,8 +23,8 @@ import type { StandardHandlerPlugin, StandardHandlerRoutingInterceptor, StandardHandlerRoutingInterceptorOptions, -} from '../adapters/standard/index.ts' -import type { Context } from '../context.ts' +} from '../adapters/standard/index' +import type { Context } from '../context' /** * Content type for batch responses that use the length-prefixed binary framing, diff --git a/packages/server/src/plugins/cors.test.ts b/packages/server/src/plugins/cors.test.ts index 07111808f3..43d76f100a 100644 --- a/packages/server/src/plugins/cors.test.ts +++ b/packages/server/src/plugins/cors.test.ts @@ -1,6 +1,6 @@ -import { RPCHandler } from '../adapters/fetch/rpc-handler.ts' -import { os } from '../builder.ts' -import { CORSHandlerPlugin } from './cors.ts' +import { RPCHandler } from '../adapters/fetch/rpc-handler' +import { os } from '../builder' +import { CORSHandlerPlugin } from './cors' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/server/src/plugins/cors.ts b/packages/server/src/plugins/cors.ts index ebe15c4eaf..e3145f521c 100644 --- a/packages/server/src/plugins/cors.ts +++ b/packages/server/src/plugins/cors.ts @@ -8,8 +8,8 @@ import type { StandardHandlerPlugin, StandardHandlerRoutingInterceptor, StandardHandlerRoutingInterceptorOptions, -} from '../adapters/standard/index.ts' -import type { Context } from '../context.ts' +} from '../adapters/standard/index' +import type { Context } from '../context' export interface CORSHandlerPluginOptions { /** diff --git a/packages/server/src/plugins/get-method-csrf-protection.test.ts b/packages/server/src/plugins/get-method-csrf-protection.test.ts index 841db7f9bb..b632452a12 100644 --- a/packages/server/src/plugins/get-method-csrf-protection.test.ts +++ b/packages/server/src/plugins/get-method-csrf-protection.test.ts @@ -1,10 +1,10 @@ import { ORPCError } from '@orpc/client' -import { RPCHandler } from '../adapters/fetch/rpc-handler.ts' -import { RPC_DEFAULT_ALLOW_METHODS } from '../adapters/standard/index.ts' -import { os } from '../builder.ts' -import { BatchHandlerPlugin } from './batch.ts' -import { GetMethodCsrfProtectionHandlerPlugin } from './get-method-csrf-protection.ts' +import { RPCHandler } from '../adapters/fetch/rpc-handler' +import { RPC_DEFAULT_ALLOW_METHODS } from '../adapters/standard/index' +import { os } from '../builder' +import { BatchHandlerPlugin } from './batch' +import { GetMethodCsrfProtectionHandlerPlugin } from './get-method-csrf-protection' function makeRequest(headers: Record, method: string) { return { diff --git a/packages/server/src/plugins/get-method-csrf-protection.ts b/packages/server/src/plugins/get-method-csrf-protection.ts index 054bb77bec..a4e5b23124 100644 --- a/packages/server/src/plugins/get-method-csrf-protection.ts +++ b/packages/server/src/plugins/get-method-csrf-protection.ts @@ -7,8 +7,8 @@ import type { StandardHandlerInterceptorOptions, StandardHandlerOptions, StandardHandlerPlugin, -} from '../adapters/standard/index.ts' -import type { Context } from '../context.ts' +} from '../adapters/standard/index' +import type { Context } from '../context' /** * Adds Cross-Site Request Forgery (CSRF) protection that makes the safe `GET` method as diff --git a/packages/server/src/plugins/head-method.test.ts b/packages/server/src/plugins/head-method.test.ts index b771a3f31f..19cbd7beef 100644 --- a/packages/server/src/plugins/head-method.test.ts +++ b/packages/server/src/plugins/head-method.test.ts @@ -2,12 +2,12 @@ import type { StandardResponse } from '@standard-server/core' import { toFetchResponse } from '@standard-server/fetch' import supertest from 'supertest' -import { RPCHandler } from '../adapters/fetch/index.ts' -import { RPCHandler as NodeRPCHandler } from '../adapters/node/index.ts' -import { os } from '../builder.ts' -import { GetMethodCsrfProtectionHandlerPlugin } from './get-method-csrf-protection.ts' -import { HeadMethodHandlerPlugin } from './head-method.ts' -import { ResponseCompressionHandlerPlugin } from './response-compression.ts' +import { RPCHandler } from '../adapters/fetch/index' +import { RPCHandler as NodeRPCHandler } from '../adapters/node/index' +import { os } from '../builder' +import { GetMethodCsrfProtectionHandlerPlugin } from './get-method-csrf-protection' +import { HeadMethodHandlerPlugin } from './head-method' +import { ResponseCompressionHandlerPlugin } from './response-compression' function getInterceptors() { const existingInterceptor = vi.fn() diff --git a/packages/server/src/plugins/head-method.ts b/packages/server/src/plugins/head-method.ts index 5f9f77fb39..82d91a7df2 100644 --- a/packages/server/src/plugins/head-method.ts +++ b/packages/server/src/plugins/head-method.ts @@ -7,8 +7,8 @@ import type { StandardHandlerOptions, StandardHandlerPlugin, StandardHandlerRoutingInterceptor, -} from '../adapters/standard/index.ts' -import type { Context } from '../context.ts' +} from '../adapters/standard/index' +import type { Context } from '../context' const textEncoder = /* @__PURE__ */ new TextEncoder() diff --git a/packages/server/src/plugins/index.test.ts b/packages/server/src/plugins/index.test.ts index a58d384aeb..fff01e166e 100644 --- a/packages/server/src/plugins/index.test.ts +++ b/packages/server/src/plugins/index.test.ts @@ -1,5 +1,5 @@ it('exports plugins', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ BatchHandlerPlugin: expect.any(Function), BATCH_HEADER: expect.any(String), DEFAULT_BATCH_MAX_SIZE: expect.any(Number), diff --git a/packages/server/src/plugins/index.ts b/packages/server/src/plugins/index.ts index f24d310920..9377987ca3 100644 --- a/packages/server/src/plugins/index.ts +++ b/packages/server/src/plugins/index.ts @@ -1,44 +1,44 @@ -export * from './batch.ts' -export * from './cors.ts' +export * from './batch' +export * from './cors' export { /** * @deprecated Use `CORSHandlerPlugin` instead. */ CORSHandlerPlugin as CORSPlugin, -} from './cors.ts' -export * from './get-method-csrf-protection.ts' -export * from './head-method.ts' -export * from './method-override.ts' -export * from './request-compression.ts' -export * from './request-headers.ts' +} from './cors' +export * from './get-method-csrf-protection' +export * from './head-method' +export * from './method-override' +export * from './request-compression' +export * from './request-headers' export { /** * @deprecated Use `RequestHeadersHandlerPlugin` instead. */ RequestHeadersHandlerPlugin as RequestHeadersPlugin, -} from './request-headers.ts' +} from './request-headers' export type { /** * @deprecated Use `RequestHeadersHandlerPluginContext` instead. */ RequestHeadersHandlerPluginContext as RequestHeadersPluginContext, -} from './request-headers.ts' -export * from './request-limit.ts' -export * from './response-compression.ts' -export * from './response-headers.ts' +} from './request-headers' +export * from './request-limit' +export * from './response-compression' +export * from './response-headers' export { /** * @deprecated Use `ResponseHeadersHandlerPlugin` instead. */ ResponseHeadersHandlerPlugin as ResponseHeadersPlugin, -} from './response-headers.ts' +} from './response-headers' export type { /** * @deprecated Use `ResponseHeadersHandlerPluginContext` instead. */ ResponseHeadersHandlerPluginContext as ResponseHeadersPluginContext, -} from './response-headers.ts' -export * from './rethrow.ts' -export * from './signal-sync.ts' -export * from './timeout.ts' +} from './response-headers' +export * from './rethrow' +export * from './signal-sync' +export * from './timeout' export { BATCH_HEADER, DEFAULT_BATCH_MAX_SIZE } from '@orpc/client/plugins' diff --git a/packages/server/src/plugins/method-override.test.ts b/packages/server/src/plugins/method-override.test.ts index 79a093fb16..21f4bc63a2 100644 --- a/packages/server/src/plugins/method-override.test.ts +++ b/packages/server/src/plugins/method-override.test.ts @@ -1,6 +1,6 @@ -import { RPCHandler } from '../adapters/fetch/index.ts' -import { os } from '../builder.ts' -import { MethodOverrideHandlerPlugin } from './method-override.ts' +import { RPCHandler } from '../adapters/fetch/index' +import { os } from '../builder' +import { MethodOverrideHandlerPlugin } from './method-override' function getInterceptor(options?: ConstructorParameters[0]) { const existingInterceptor = vi.fn() diff --git a/packages/server/src/plugins/method-override.ts b/packages/server/src/plugins/method-override.ts index f282c49692..21933fdaf5 100644 --- a/packages/server/src/plugins/method-override.ts +++ b/packages/server/src/plugins/method-override.ts @@ -6,8 +6,8 @@ import type { StandardHandlerOptions, StandardHandlerPlugin, StandardHandlerRoutingInterceptor, -} from '../adapters/standard/index.ts' -import type { Context } from '../context.ts' +} from '../adapters/standard/index' +import type { Context } from '../context' export interface MethodOverrideHandlerPluginOptions { /** diff --git a/packages/server/src/plugins/request-compression.test.ts b/packages/server/src/plugins/request-compression.test.ts index 36ee608ac7..78517508f8 100644 --- a/packages/server/src/plugins/request-compression.test.ts +++ b/packages/server/src/plugins/request-compression.test.ts @@ -3,10 +3,10 @@ import zlib from 'node:zlib' import supertest from 'supertest' -import { RPCHandler } from '../adapters/fetch/index.ts' -import { RPCHandler as NodeRPCHandler } from '../adapters/node/index.ts' -import { os } from '../builder.ts' -import { RequestCompressionHandlerPlugin } from './request-compression.ts' +import { RPCHandler } from '../adapters/fetch/index' +import { RPCHandler as NodeRPCHandler } from '../adapters/node/index' +import { os } from '../builder' +import { RequestCompressionHandlerPlugin } from './request-compression' function compress(data: string | Uint8Array, encoding: 'gzip' | 'deflate' | 'deflate-raw'): Buffer { const buffer = typeof data === 'string' ? Buffer.from(data) : Buffer.from(data) diff --git a/packages/server/src/plugins/request-compression.ts b/packages/server/src/plugins/request-compression.ts index 21943ff21f..8ef9867164 100644 --- a/packages/server/src/plugins/request-compression.ts +++ b/packages/server/src/plugins/request-compression.ts @@ -7,8 +7,8 @@ import type { StandardHandlerOptions, StandardHandlerPlugin, StandardHandlerRoutingInterceptor, -} from '../adapters/standard/index.ts' -import type { Context } from '../context.ts' +} from '../adapters/standard/index' +import type { Context } from '../context' /** * Each coding adds a decompressor to the chain, so an unbounded list lets a tiny diff --git a/packages/server/src/plugins/request-headers.test.ts b/packages/server/src/plugins/request-headers.test.ts index 2c950cceb5..64e6a5080b 100644 --- a/packages/server/src/plugins/request-headers.test.ts +++ b/packages/server/src/plugins/request-headers.test.ts @@ -1,7 +1,7 @@ -import { RPCHandler } from '../adapters/fetch/rpc-handler.ts' -import { os } from '../builder.ts' -import type { RequestHeadersHandlerPluginContext } from './request-headers.ts' -import { RequestHeadersHandlerPlugin } from './request-headers.ts' +import { RPCHandler } from '../adapters/fetch/rpc-handler' +import { os } from '../builder' +import type { RequestHeadersHandlerPluginContext } from './request-headers' +import { RequestHeadersHandlerPlugin } from './request-headers' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/server/src/plugins/request-headers.ts b/packages/server/src/plugins/request-headers.ts index e646d319b9..f1b6ea10b9 100644 --- a/packages/server/src/plugins/request-headers.ts +++ b/packages/server/src/plugins/request-headers.ts @@ -1,7 +1,7 @@ import { toArray } from '@orpc/shared' import { toFetchHeaders } from '@standard-server/fetch' -import type { StandardHandlerOptions, StandardHandlerPlugin } from '../adapters/standard/index.ts' +import type { StandardHandlerOptions, StandardHandlerPlugin } from '../adapters/standard/index' /** * The context shape into which the Request Headers Plugin injects `reqHeaders`. diff --git a/packages/server/src/plugins/request-limit.test.ts b/packages/server/src/plugins/request-limit.test.ts index d28e912dae..5626c8ce12 100644 --- a/packages/server/src/plugins/request-limit.test.ts +++ b/packages/server/src/plugins/request-limit.test.ts @@ -2,11 +2,11 @@ import zlib from 'node:zlib' import supertest from 'supertest' -import { RPCHandler } from '../adapters/fetch/index.ts' -import { RPCHandler as NodeRPCHandler } from '../adapters/node/index.ts' -import { os } from '../builder.ts' -import { RequestCompressionHandlerPlugin } from './request-compression.ts' -import { RequestLimitHandlerPlugin } from './request-limit.ts' +import { RPCHandler } from '../adapters/fetch/index' +import { RPCHandler as NodeRPCHandler } from '../adapters/node/index' +import { os } from '../builder' +import { RequestCompressionHandlerPlugin } from './request-compression' +import { RequestLimitHandlerPlugin } from './request-limit' describe('requestLimitHandlerPlugin', () => { const size22Json = { json: { foo: 'bar' } } diff --git a/packages/server/src/plugins/request-limit.ts b/packages/server/src/plugins/request-limit.ts index 28a18a63ab..77936f4a59 100644 --- a/packages/server/src/plugins/request-limit.ts +++ b/packages/server/src/plugins/request-limit.ts @@ -7,8 +7,8 @@ import type { StandardHandlerOptions, StandardHandlerPlugin, StandardHandlerRoutingInterceptor, -} from '../adapters/standard/index.ts' -import type { Context } from '../context.ts' +} from '../adapters/standard/index' +import type { Context } from '../context' export interface RequestLimitHandlerPluginOptions { /** diff --git a/packages/server/src/plugins/response-compression.test.ts b/packages/server/src/plugins/response-compression.test.ts index 8c101c28e4..f78d01bb58 100644 --- a/packages/server/src/plugins/response-compression.test.ts +++ b/packages/server/src/plugins/response-compression.test.ts @@ -1,9 +1,9 @@ import supertest from 'supertest' -import { RPCHandler } from '../adapters/fetch/index.ts' -import { RPCHandler as NodeRPCHandler } from '../adapters/node/index.ts' -import { os } from '../builder.ts' -import { ResponseCompressionHandlerPlugin } from './response-compression.ts' +import { RPCHandler } from '../adapters/fetch/index' +import { RPCHandler as NodeRPCHandler } from '../adapters/node/index' +import { os } from '../builder' +import { ResponseCompressionHandlerPlugin } from './response-compression' async function decompressStream( stream: ReadableStream, diff --git a/packages/server/src/plugins/response-compression.ts b/packages/server/src/plugins/response-compression.ts index 03a0b2f5d4..f869aacdd6 100644 --- a/packages/server/src/plugins/response-compression.ts +++ b/packages/server/src/plugins/response-compression.ts @@ -19,8 +19,8 @@ import type { StandardHandlerPlugin, StandardHandlerRoutingInterceptor, StandardHandlerRoutingInterceptorOptions, -} from '../adapters/standard/index.ts' -import type { Context } from '../context.ts' +} from '../adapters/standard/index' +import type { Context } from '../context' export interface ResponseCompressionHandlerPluginOptions { /** diff --git a/packages/server/src/plugins/response-headers.test.ts b/packages/server/src/plugins/response-headers.test.ts index 6eb8edb668..41ceb8b955 100644 --- a/packages/server/src/plugins/response-headers.test.ts +++ b/packages/server/src/plugins/response-headers.test.ts @@ -1,7 +1,7 @@ -import { RPCHandler } from '../adapters/fetch/rpc-handler.ts' -import { os } from '../builder.ts' -import type { ResponseHeadersHandlerPluginContext } from './response-headers.ts' -import { ResponseHeadersHandlerPlugin } from './response-headers.ts' +import { RPCHandler } from '../adapters/fetch/rpc-handler' +import { os } from '../builder' +import type { ResponseHeadersHandlerPluginContext } from './response-headers' +import { ResponseHeadersHandlerPlugin } from './response-headers' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/server/src/plugins/response-headers.ts b/packages/server/src/plugins/response-headers.ts index 2135c073ee..5578b8e1ab 100644 --- a/packages/server/src/plugins/response-headers.ts +++ b/packages/server/src/plugins/response-headers.ts @@ -2,7 +2,7 @@ import { toArray } from '@orpc/shared' import { mergeStandardHeaders } from '@standard-server/core' import { toStandardHeaders } from '@standard-server/fetch' -import type { StandardHandlerOptions, StandardHandlerPlugin } from '../adapters/standard/index.ts' +import type { StandardHandlerOptions, StandardHandlerPlugin } from '../adapters/standard/index' /** * The context shape into which the Response Headers Plugin injects `resHeaders`. diff --git a/packages/server/src/plugins/rethrow.test.ts b/packages/server/src/plugins/rethrow.test.ts index 76ef703d8f..75de139b9e 100644 --- a/packages/server/src/plugins/rethrow.test.ts +++ b/packages/server/src/plugins/rethrow.test.ts @@ -1,9 +1,9 @@ import { COMMON_ERROR_STATUS_MAP, ORPCError } from '@orpc/client' import { toArray } from '@orpc/shared' -import { RPCHandler } from '../adapters/fetch/index.ts' -import { os } from '../builder.ts' -import { RethrowHandlerPlugin } from './rethrow.ts' +import { RPCHandler } from '../adapters/fetch/index' +import { os } from '../builder' +import { RethrowHandlerPlugin } from './rethrow' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/server/src/plugins/rethrow.ts b/packages/server/src/plugins/rethrow.ts index fef04f1ac9..e6f1947685 100644 --- a/packages/server/src/plugins/rethrow.ts +++ b/packages/server/src/plugins/rethrow.ts @@ -7,8 +7,8 @@ import type { StandardHandlerOptions, StandardHandlerPlugin, StandardHandlerRoutingInterceptor, -} from '../adapters/standard/index.ts' -import type { Context } from '../context.ts' +} from '../adapters/standard/index' +import type { Context } from '../context' export interface RethrowHandlerPluginOptions { /** diff --git a/packages/server/src/plugins/signal-sync.test.ts b/packages/server/src/plugins/signal-sync.test.ts index 4a90661dfb..f55051900c 100644 --- a/packages/server/src/plugins/signal-sync.test.ts +++ b/packages/server/src/plugins/signal-sync.test.ts @@ -1,10 +1,10 @@ import { AbortError, promiseWithResolvers } from '@orpc/shared' -import { RPCHandler } from '../adapters/fetch/index.ts' -import { os } from '../builder.ts' -import type { AnyProcedure } from '../procedure.ts' -import { SignalSyncHandlerPlugin } from './signal-sync.ts' -import { TimeoutHandlerPlugin } from './timeout.ts' +import { RPCHandler } from '../adapters/fetch/index' +import { os } from '../builder' +import type { AnyProcedure } from '../procedure' +import { SignalSyncHandlerPlugin } from './signal-sync' +import { TimeoutHandlerPlugin } from './timeout' describe('signalSyncHandlerPlugin', () => { async function handle(procedure: AnyProcedure, init?: RequestInit): Promise { diff --git a/packages/server/src/plugins/signal-sync.ts b/packages/server/src/plugins/signal-sync.ts index b77aca8773..a83fd01859 100644 --- a/packages/server/src/plugins/signal-sync.ts +++ b/packages/server/src/plugins/signal-sync.ts @@ -10,9 +10,9 @@ import { toArray, } from '@orpc/shared' -import type { StandardHandlerOptions, StandardHandlerPlugin } from '../adapters/standard/index.ts' -import type { Context } from '../context.ts' -import type { ProcedureClientInterceptor } from '../procedure-client.ts' +import type { StandardHandlerOptions, StandardHandlerPlugin } from '../adapters/standard/index' +import type { Context } from '../context' +import type { ProcedureClientInterceptor } from '../procedure-client' /** * Keeps the request signal and a streaming output (async iterator object or readable stream) in sync: diff --git a/packages/server/src/plugins/timeout.test.ts b/packages/server/src/plugins/timeout.test.ts index d45c6ba04c..e1e39b9b57 100644 --- a/packages/server/src/plugins/timeout.test.ts +++ b/packages/server/src/plugins/timeout.test.ts @@ -1,10 +1,10 @@ import { COMMON_ERROR_STATUS_MAP, ORPCError } from '@orpc/client' import { AbortError } from '@orpc/shared' -import { RPCHandler } from '../adapters/fetch/index.ts' -import { os } from '../builder.ts' -import type { TimeoutHandlerPluginOptions } from './timeout.ts' -import { TimeoutHandlerPlugin } from './timeout.ts' +import { RPCHandler } from '../adapters/fetch/index' +import { os } from '../builder' +import type { TimeoutHandlerPluginOptions } from './timeout' +import { TimeoutHandlerPlugin } from './timeout' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/server/src/plugins/timeout.ts b/packages/server/src/plugins/timeout.ts index 401303071c..10ea219357 100644 --- a/packages/server/src/plugins/timeout.ts +++ b/packages/server/src/plugins/timeout.ts @@ -15,8 +15,8 @@ import type { StandardHandlerInterceptorOptions, StandardHandlerOptions, StandardHandlerPlugin, -} from '../adapters/standard/index.ts' -import type { Context } from '../context.ts' +} from '../adapters/standard/index' +import type { Context } from '../context' export interface TimeoutHandlerPluginOptions { /** diff --git a/packages/server/src/procedure-client.test-d.ts b/packages/server/src/procedure-client.test-d.ts index 8da3271a64..26c2af444a 100644 --- a/packages/server/src/procedure-client.test-d.ts +++ b/packages/server/src/procedure-client.test-d.ts @@ -2,7 +2,7 @@ import type { Client, ThrowableError } from '@orpc/client' import type { ORPCErrorFromErrorMap } from '@orpc/contract' import * as z from 'zod' -import type { ProcedureClient } from './procedure-client.ts' +import type { ProcedureClient } from './procedure-client' const errorMap = { BASE: { diff --git a/packages/server/src/procedure-client.test.ts b/packages/server/src/procedure-client.test.ts index eea3b07b7e..4926be0100 100644 --- a/packages/server/src/procedure-client.test.ts +++ b/packages/server/src/procedure-client.test.ts @@ -4,8 +4,8 @@ import * as ContractModule from '@orpc/contract' import * as SharedV2Module from '@orpc/shared' import * as z from 'zod' -import { os } from './builder.ts' -import { createProcedureClient } from './procedure-client.ts' +import { os } from './builder' +import { createProcedureClient } from './procedure-client' const isAsyncIteratorObject = SharedV2Module.isAsyncIteratorObject const ValidationError = ContractModule.ValidationError diff --git a/packages/server/src/procedure-client.ts b/packages/server/src/procedure-client.ts index a3206442f5..0f2f23a1c4 100644 --- a/packages/server/src/procedure-client.ts +++ b/packages/server/src/procedure-client.ts @@ -31,11 +31,11 @@ import { value, } from '@orpc/shared' -import type { Context } from './context.ts' -import type { Lazyable } from './lazy.ts' -import { unlazy } from './lazy.ts' -import type { MiddlewareDone } from './middleware.ts' -import type { AnyProcedure, Procedure, ProcedureHandlerOptions } from './procedure.ts' +import type { Context } from './context' +import type { Lazyable } from './lazy' +import { unlazy } from './lazy' +import type { MiddlewareDone } from './middleware' +import type { AnyProcedure, Procedure, ProcedureHandlerOptions } from './procedure' export type ProcedureClient< TClientContext extends ClientContext, diff --git a/packages/server/src/procedure-decorated.test-d.ts b/packages/server/src/procedure-decorated.test-d.ts index e0defa162b..140934d5a5 100644 --- a/packages/server/src/procedure-decorated.test-d.ts +++ b/packages/server/src/procedure-decorated.test-d.ts @@ -2,9 +2,9 @@ import type { MergedErrorMap, MetaPlugin, ORPCErrorConstructorMap, Schema } from import { expectTypeOf } from 'vitest' import { z } from 'zod' -import type { MergedInitialContext } from './context.ts' -import type { Middleware, MiddlewareDone } from './middleware.ts' -import type { DecoratedProcedure } from './procedure-decorated.ts' +import type { MergedInitialContext } from './context' +import type { Middleware, MiddlewareDone } from './middleware' +import type { DecoratedProcedure } from './procedure-decorated' const errorMap = { BASE: { diff --git a/packages/server/src/procedure-decorated.test.ts b/packages/server/src/procedure-decorated.test.ts index 1046e6fd80..09eedcdb28 100644 --- a/packages/server/src/procedure-decorated.test.ts +++ b/packages/server/src/procedure-decorated.test.ts @@ -3,9 +3,9 @@ import { setHiddenMetaPlugins } from '@orpc/contract' import * as ContractModule from '@orpc/contract' import * as z from 'zod' -import type { AnyMiddleware } from './middleware.ts' -import { DecoratedProcedure } from './procedure-decorated.ts' -import { Procedure } from './procedure.ts' +import type { AnyMiddleware } from './middleware' +import { Procedure } from './procedure' +import { DecoratedProcedure } from './procedure-decorated' const resolveMetaPluginsSpy = vi.spyOn(ContractModule, 'resolveMetaPlugins') const mergeErrorMapSpy = vi.spyOn(ContractModule, 'mergeErrorMap') diff --git a/packages/server/src/procedure-decorated.ts b/packages/server/src/procedure-decorated.ts index ced81c8824..4e28f4a289 100644 --- a/packages/server/src/procedure-decorated.ts +++ b/packages/server/src/procedure-decorated.ts @@ -9,9 +9,9 @@ import type { import { getHiddenMetaPlugins, mergeErrorMap, resolveMetaPlugins } from '@orpc/contract' import type { IntersectPick } from '@orpc/shared' -import type { Context, MergedContext, MergedInitialContext } from './context.ts' -import type { Middleware } from './middleware.ts' -import { Procedure } from './procedure.ts' +import type { Context, MergedContext, MergedInitialContext } from './context' +import type { Middleware } from './middleware' +import { Procedure } from './procedure' export class DecoratedProcedure< TInitialContext extends Context, diff --git a/packages/server/src/procedure-utils.test-d.ts b/packages/server/src/procedure-utils.test-d.ts index 9d66b1e5a6..f7f19ad0dd 100644 --- a/packages/server/src/procedure-utils.test-d.ts +++ b/packages/server/src/procedure-utils.test-d.ts @@ -1,7 +1,7 @@ import * as z from 'zod' -import { os } from './builder.ts' -import { call } from './procedure-utils.ts' +import { os } from './builder' +import { call } from './procedure-utils' describe('call', () => { it('requires input, options if context is required', async () => { diff --git a/packages/server/src/procedure-utils.test.ts b/packages/server/src/procedure-utils.test.ts index 12347992f5..32a38f8b98 100644 --- a/packages/server/src/procedure-utils.test.ts +++ b/packages/server/src/procedure-utils.test.ts @@ -2,11 +2,11 @@ import type { AnyMetaPlugin } from '@orpc/contract' import { oc } from '@orpc/contract' import * as z from 'zod' -import { os } from './builder.ts' -import { Lazy, unlazy } from './lazy.ts' -import * as ProcedureClient from './procedure-client.ts' -import { call, createContractProcedure, createGuardedProcedureLazy } from './procedure-utils.ts' -import { Procedure } from './procedure.ts' +import { os } from './builder' +import { Lazy, unlazy } from './lazy' +import { Procedure } from './procedure' +import * as ProcedureClient from './procedure-client' +import { call, createContractProcedure, createGuardedProcedureLazy } from './procedure-utils' const createProcedureClientSpy = vi.spyOn(ProcedureClient, 'createProcedureClient') diff --git a/packages/server/src/procedure-utils.ts b/packages/server/src/procedure-utils.ts index 90eab27fe8..3b88134d84 100644 --- a/packages/server/src/procedure-utils.ts +++ b/packages/server/src/procedure-utils.ts @@ -9,13 +9,13 @@ import type { } from '@orpc/contract' import type { PromiseWithError, ThrowableError } from '@orpc/shared' -import type { Context } from './context.ts' -import type { Lazyable } from './lazy.ts' -import { Lazy, unlazy } from './lazy.ts' -import type { ProcedureClientOptions } from './procedure-client.ts' -import { createProcedureClient } from './procedure-client.ts' -import type { AnyProcedure } from './procedure.ts' -import { Procedure } from './procedure.ts' +import type { Context } from './context' +import type { Lazyable } from './lazy' +import { Lazy, unlazy } from './lazy' +import type { AnyProcedure } from './procedure' +import { Procedure } from './procedure' +import type { ProcedureClientOptions } from './procedure-client' +import { createProcedureClient } from './procedure-client' export function createGuardedProcedureLazy(lazy: Lazy): Lazy { const guarded = new Lazy({ diff --git a/packages/server/src/procedure.test.ts b/packages/server/src/procedure.test.ts index a4d7be020b..4273001029 100644 --- a/packages/server/src/procedure.test.ts +++ b/packages/server/src/procedure.test.ts @@ -1,6 +1,6 @@ import { ProcedureContract } from '@orpc/contract' -import { Procedure } from './procedure.ts' +import { Procedure } from './procedure' describe('procedure', () => { const procedure = new Procedure({ diff --git a/packages/server/src/procedure.ts b/packages/server/src/procedure.ts index 15400c14ae..892be46a1c 100644 --- a/packages/server/src/procedure.ts +++ b/packages/server/src/procedure.ts @@ -8,8 +8,8 @@ import { ProcedureContract } from '@orpc/contract' import type { Promisable } from '@orpc/shared' import { getConstructor } from '@orpc/shared' -import type { Context } from './context.ts' -import type { AnyMiddleware } from './middleware.ts' +import type { Context } from './context' +import type { AnyMiddleware } from './middleware' export interface ProcedureHandlerOptions< TCurrentContext extends Context, diff --git a/packages/server/src/router-client.test-d.ts b/packages/server/src/router-client.test-d.ts index 07e0a370d7..8895dab3df 100644 --- a/packages/server/src/router-client.test-d.ts +++ b/packages/server/src/router-client.test-d.ts @@ -1,9 +1,9 @@ import type { Schema } from '@orpc/contract' import * as z from 'zod' -import { os } from './builder.ts' -import type { ProcedureClient } from './procedure-client.ts' -import type { RouterClient } from './router-client.ts' +import { os } from './builder' +import type { ProcedureClient } from './procedure-client' +import type { RouterClient } from './router-client' const errorMap = { BASE: { diff --git a/packages/server/src/router-client.test.ts b/packages/server/src/router-client.test.ts index 465323afba..a10519cd05 100644 --- a/packages/server/src/router-client.test.ts +++ b/packages/server/src/router-client.test.ts @@ -1,10 +1,10 @@ import * as z from 'zod' -import { os } from './builder.ts' -import * as ProcedureClientModule from './procedure-client.ts' -import * as ProcedureUtilsModule from './procedure-utils.ts' -import { createRouterClient } from './router-client.ts' -import * as RouterUtilsModule from './router-utils.ts' +import { os } from './builder' +import * as ProcedureClientModule from './procedure-client' +import * as ProcedureUtilsModule from './procedure-utils' +import { createRouterClient } from './router-client' +import * as RouterUtilsModule from './router-utils' const createProcedureClientSpy = vi.spyOn(ProcedureClientModule, 'createProcedureClient') const createGuardedProcedureLazySpy = vi.spyOn(ProcedureUtilsModule, 'createGuardedProcedureLazy') diff --git a/packages/server/src/router-client.ts b/packages/server/src/router-client.ts index 34dcff4c6f..11325f21af 100644 --- a/packages/server/src/router-client.ts +++ b/packages/server/src/router-client.ts @@ -4,14 +4,14 @@ import type { ErrorMap, Schema } from '@orpc/contract' import type { MaybeOptionalOptions } from '@orpc/shared' import { resolveMaybeOptionalOptions, toArray } from '@orpc/shared' -import type { Lazyable } from './lazy.ts' -import { Lazy } from './lazy.ts' -import type { ProcedureClient, ProcedureClientOptions } from './procedure-client.ts' -import { createProcedureClient } from './procedure-client.ts' -import { createGuardedProcedureLazy } from './procedure-utils.ts' -import { Procedure } from './procedure.ts' -import { getRouter } from './router-utils.ts' -import type { AnyRouter, InferRouterInitialContext } from './router.ts' +import type { Lazyable } from './lazy' +import { Lazy } from './lazy' +import { Procedure } from './procedure' +import type { ProcedureClient, ProcedureClientOptions } from './procedure-client' +import { createProcedureClient } from './procedure-client' +import { createGuardedProcedureLazy } from './procedure-utils' +import type { AnyRouter, InferRouterInitialContext } from './router' +import { getRouter } from './router-utils' /** * The client type derived from a router, exposing every procedure as a callable diff --git a/packages/server/src/router-hidden.test.ts b/packages/server/src/router-hidden.test.ts index f4b090f778..50675adb6d 100644 --- a/packages/server/src/router-hidden.test.ts +++ b/packages/server/src/router-hidden.test.ts @@ -1,7 +1,7 @@ import { oc } from '@orpc/contract' -import { os } from './builder.ts' -import { getHiddenRouterContract, withHiddenRouterContract } from './router-hidden.ts' +import { os } from './builder' +import { getHiddenRouterContract, withHiddenRouterContract } from './router-hidden' const contract = { ping: oc.errors({ BAD_GATEWAY: {} }), diff --git a/packages/server/src/router-hidden.ts b/packages/server/src/router-hidden.ts index 06929c23ac..d5c22cd041 100644 --- a/packages/server/src/router-hidden.ts +++ b/packages/server/src/router-hidden.ts @@ -1,7 +1,7 @@ import type { RouterContract } from '@orpc/contract' -import type { Lazyable } from './lazy.ts' -import type { AnyRouter } from './router.ts' +import type { Lazyable } from './lazy' +import type { AnyRouter } from './router' const HIDDEN_ROUTER_CONTRACT_SYMBOL = /* @__PURE__ */ Symbol.for('ORPC_HIDDEN_ROUTER_CONTRACT') diff --git a/packages/server/src/router-utils.test-d.ts b/packages/server/src/router-utils.test-d.ts index c2fe47ff10..115e8e0f09 100644 --- a/packages/server/src/router-utils.test-d.ts +++ b/packages/server/src/router-utils.test-d.ts @@ -1,13 +1,13 @@ import type { MergedErrorMap, Schema } from '@orpc/contract' -import type { MergedInitialContext } from './context.ts' -import type { Lazy } from './lazy.ts' -import type { Procedure } from './procedure.ts' +import type { MergedInitialContext } from './context' +import type { Lazy } from './lazy' +import type { Procedure } from './procedure' import type { AugmentedRouter, AugmentedRouterWithMiddlewares, UnlaziedRouter, -} from './router-utils.ts' +} from './router-utils' describe('AugmentedRouter', () => { const router = { diff --git a/packages/server/src/router-utils.test.ts b/packages/server/src/router-utils.test.ts index 4b755aacaa..69d164a4fd 100644 --- a/packages/server/src/router-utils.test.ts +++ b/packages/server/src/router-utils.test.ts @@ -2,9 +2,9 @@ import * as ContractModule from '@orpc/contract' import { getOwn } from '@orpc/shared' import { z } from 'zod' -import { Lazy, unlazy } from './lazy.ts' -import { Procedure } from './procedure.ts' -import { withHiddenRouterContract } from './router-hidden.ts' +import { Lazy, unlazy } from './lazy' +import { Procedure } from './procedure' +import { withHiddenRouterContract } from './router-hidden' import { augmentImplementedRouter, augmentRouter, @@ -13,7 +13,7 @@ import { unlazyRouter, walkProcedureContractsAsync, walkProcedureContractsSync, -} from './router-utils.ts' +} from './router-utils' const oc = ContractModule.oc const resolveMetaPluginsSpy = vi.spyOn(ContractModule, 'resolveMetaPlugins') diff --git a/packages/server/src/router-utils.ts b/packages/server/src/router-utils.ts index 0bc75ac356..c31e55ddc8 100644 --- a/packages/server/src/router-utils.ts +++ b/packages/server/src/router-utils.ts @@ -9,15 +9,15 @@ import { mergeErrorMap, ProcedureContract, resolveMetaPlugins } from '@orpc/cont import type { Promisable } from '@orpc/shared' import { getOwn, isNonPrimitive, omit, setOwn } from '@orpc/shared' -import type { Context, MergedInitialContext } from './context.ts' -import type { Lazyable } from './lazy.ts' -import { Lazy, unlazy } from './lazy.ts' -import type { AnyMiddleware } from './middleware.ts' -import { createContractProcedure } from './procedure-utils.ts' -import type { AnyProcedure, ProcedureConfig } from './procedure.ts' -import { Procedure } from './procedure.ts' -import { getHiddenRouterContract } from './router-hidden.ts' -import type { AnyRouter } from './router.ts' +import type { Context, MergedInitialContext } from './context' +import type { Lazyable } from './lazy' +import { Lazy, unlazy } from './lazy' +import type { AnyMiddleware } from './middleware' +import type { AnyProcedure, ProcedureConfig } from './procedure' +import { Procedure } from './procedure' +import { createContractProcedure } from './procedure-utils' +import type { AnyRouter } from './router' +import { getHiddenRouterContract } from './router-hidden' export type AugmentedRouter = T extends Procedure< diff --git a/packages/server/src/router.test-d.ts b/packages/server/src/router.test-d.ts index c3f308871d..b462e61716 100644 --- a/packages/server/src/router.test-d.ts +++ b/packages/server/src/router.test-d.ts @@ -4,8 +4,8 @@ import { oc } from '@orpc/contract' import type { ThrowableError } from '@orpc/shared' import * as z from 'zod' -import type { Lazy, Lazyable } from './lazy.ts' -import type { Procedure } from './procedure.ts' +import type { Lazy, Lazyable } from './lazy' +import type { Procedure } from './procedure' import type { ContractedRouter, InferRouterError, @@ -16,7 +16,7 @@ import type { InferRouterInputs, InferRouterOutputs, Router, -} from './router.ts' +} from './router' describe('contractedRouter', () => { // Schemas should have distinct TInput and TOutput types to ensure correct inference. diff --git a/packages/server/src/router.ts b/packages/server/src/router.ts index 9e0bf4da16..521b4265bc 100644 --- a/packages/server/src/router.ts +++ b/packages/server/src/router.ts @@ -7,9 +7,9 @@ import type { ThrowableError, } from '@orpc/contract' -import type { Context, MergedContext } from './context.ts' -import type { Lazyable } from './lazy.ts' -import type { Procedure } from './procedure.ts' +import type { Context, MergedContext } from './context' +import type { Lazyable } from './lazy' +import type { Procedure } from './procedure' export type Router = | Procedure diff --git a/packages/shared/package.json b/packages/shared/package.json index 9d40a41fa6..1c26391685 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -36,7 +36,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@standard-server/shared": "~0.15.0", diff --git a/packages/shared/src/args.test-d.ts b/packages/shared/src/args.test-d.ts index 9e7c0b6b55..1c22f184a5 100644 --- a/packages/shared/src/args.test-d.ts +++ b/packages/shared/src/args.test-d.ts @@ -1,4 +1,4 @@ -import type { MaybeOptionalOptions } from './args.ts' +import type { MaybeOptionalOptions } from './args' it('MaybeOptionalOptions', () => { const a = (...[options]: MaybeOptionalOptions<{ a: number }>) => { diff --git a/packages/shared/src/args.test.ts b/packages/shared/src/args.test.ts index 985716d16e..f49f2d4f7f 100644 --- a/packages/shared/src/args.test.ts +++ b/packages/shared/src/args.test.ts @@ -1,4 +1,4 @@ -import { resolveMaybeOptionalOptions } from './args.ts' +import { resolveMaybeOptionalOptions } from './args' it('resolveMaybeOptionalOptions', () => { expect(resolveMaybeOptionalOptions([{ a: 1 }])).toEqual({ a: 1 }) diff --git a/packages/shared/src/array.test.ts b/packages/shared/src/array.test.ts index ebfd716b70..c74fe31be1 100644 --- a/packages/shared/src/array.test.ts +++ b/packages/shared/src/array.test.ts @@ -1,4 +1,4 @@ -import { splitInHalf, takeLast, toArray } from './array.ts' +import { splitInHalf, takeLast, toArray } from './array' it('toArray', () => { expect(toArray(undefined)).toEqual([]) diff --git a/packages/shared/src/bigint.test.ts b/packages/shared/src/bigint.test.ts index 4677650471..904cc5fea8 100644 --- a/packages/shared/src/bigint.test.ts +++ b/packages/shared/src/bigint.test.ts @@ -1,4 +1,4 @@ -import { parseBigIntString } from './bigint.ts' +import { parseBigIntString } from './bigint' it('parseBigIntString', () => { expect(parseBigIntString('0', 10)).toBe(0n) diff --git a/packages/shared/src/bigint.ts b/packages/shared/src/bigint.ts index b8548a6d9a..6984fb1e62 100644 --- a/packages/shared/src/bigint.ts +++ b/packages/shared/src/bigint.ts @@ -1,4 +1,4 @@ -import { INTEGER_REGEX } from './regex.ts' +import { INTEGER_REGEX } from './regex' /** * Default maximum digits, excluding a leading `-`, when parsing a `bigint` from a string. diff --git a/packages/shared/src/buffer.test.ts b/packages/shared/src/buffer.test.ts index 1fa6cbc8f1..cf32320f5c 100644 --- a/packages/shared/src/buffer.test.ts +++ b/packages/shared/src/buffer.test.ts @@ -1,7 +1,7 @@ import { Buffer } from 'node:buffer' import process from 'node:process' -import { encodeBase64, loadBytes, toStringOrBytes } from './buffer.ts' +import { encodeBase64, loadBytes, toStringOrBytes } from './buffer' it('loadBytes', async () => { const blob = new Blob(['test'], { type: 'text/plain' }) diff --git a/packages/shared/src/compare.test.ts b/packages/shared/src/compare.test.ts index 19ec70f599..42aa89e97c 100644 --- a/packages/shared/src/compare.test.ts +++ b/packages/shared/src/compare.test.ts @@ -1,4 +1,4 @@ -import { isDeepEqual } from './compare.ts' +import { isDeepEqual } from './compare' describe('deepEqual', () => { it('returns true for the same primitive reference', () => { diff --git a/packages/shared/src/compare.ts b/packages/shared/src/compare.ts index 3b84e3c59e..7f7778fe17 100644 --- a/packages/shared/src/compare.ts +++ b/packages/shared/src/compare.ts @@ -1,4 +1,4 @@ -import { isPlainObject } from './object.ts' +import { isPlainObject } from './object' export function isDeepEqual(a: unknown, b: unknown): boolean { return isDeepEqualInternal(a, b, new WeakMap()) diff --git a/packages/shared/src/error.test.ts b/packages/shared/src/error.test.ts index 683940d1d8..97d7a4dc84 100644 --- a/packages/shared/src/error.test.ts +++ b/packages/shared/src/error.test.ts @@ -1,6 +1,6 @@ import { AbortError } from '@standard-server/shared' -import { isAbortError } from './error.ts' +import { isAbortError } from './error' describe('isAbortError', () => { it('returns true for AbortError', () => { diff --git a/packages/shared/src/function.test.ts b/packages/shared/src/function.test.ts index dcdb24dcd4..0b7bdd97cc 100644 --- a/packages/shared/src/function.test.ts +++ b/packages/shared/src/function.test.ts @@ -1,4 +1,4 @@ -import { defer, isAsyncGeneratorFunction, once, tryOrUndefined } from './function.ts' +import { defer, isAsyncGeneratorFunction, once, tryOrUndefined } from './function' it('once', () => { const fn = vi.fn(() => ({})) diff --git a/packages/shared/src/http.test.ts b/packages/shared/src/http.test.ts index 0fe3fd28ab..ab28490800 100644 --- a/packages/shared/src/http.test.ts +++ b/packages/shared/src/http.test.ts @@ -14,7 +14,7 @@ import { pathToHttpPath, stripHttpPathPrefix, varyByAcceptEncoding, -} from './http.ts' +} from './http' describe('pathToHttpPath', () => { it('produces a leading slash', () => { diff --git a/packages/shared/src/id.test.ts b/packages/shared/src/id.test.ts index a1943270a5..7f90908dd3 100644 --- a/packages/shared/src/id.test.ts +++ b/packages/shared/src/id.test.ts @@ -1,4 +1,4 @@ -import { compareSequentialIds } from './id.ts' +import { compareSequentialIds } from './id' describe('compareSequentialIds', () => { it('should return 0 when ids are equal', () => { diff --git a/packages/shared/src/index.test.ts b/packages/shared/src/index.test.ts index cadb1f2072..d68e2fb2a0 100644 --- a/packages/shared/src/index.test.ts +++ b/packages/shared/src/index.test.ts @@ -1,5 +1,5 @@ it('exports somethings', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ disposableAllAbortSignal: expect.any(Function), }) }) diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts index 98ba6ea026..d969002cb3 100644 --- a/packages/shared/src/index.ts +++ b/packages/shared/src/index.ts @@ -1,33 +1,33 @@ -export * from './args.ts' -export * from './array.ts' -export * from './bigint.ts' -export * from './buffer.ts' -export * from './compare.ts' -export * from './consts.ts' -export * from './error.ts' -export * from './function.ts' -export * from './http.ts' -export * from './id.ts' -export * from './interceptor.ts' -export * from './iterator.ts' -export * from './object.ts' -export * from './plugin.ts' -export * from './promise.ts' -export * from './proxy.ts' -export * from './queue.ts' -export * from './regex.ts' -export * from './signal.ts' -export * from './stream.ts' -export * from './tracing.ts' -export * from './types.ts' -export * from './value.ts' +export * from './args' +export * from './array' +export * from './bigint' +export * from './buffer' +export * from './compare' +export * from './consts' +export * from './error' +export * from './function' +export * from './http' +export * from './id' +export * from './interceptor' +export * from './iterator' +export * from './object' +export * from './plugin' +export * from './promise' +export * from './proxy' +export * from './queue' +export * from './regex' +export * from './signal' +export * from './stream' +export * from './tracing' +export * from './types' +export * from './value' export { /** * @deprecated Use `isPlainObject` instead. */ isPlainObject as isObject, -} from './object.ts' +} from './object' export { AbortError, diff --git a/packages/shared/src/interceptor.test-d.ts b/packages/shared/src/interceptor.test-d.ts index 177b1374ed..896c48906a 100644 --- a/packages/shared/src/interceptor.test-d.ts +++ b/packages/shared/src/interceptor.test-d.ts @@ -1,4 +1,4 @@ -import type { Interceptor } from './interceptor.ts' +import type { Interceptor } from './interceptor' import { onAsyncIteratorObjectError, onError, @@ -6,8 +6,8 @@ import { onReadableStreamError, onStart, onSuccess, -} from './interceptor.ts' -import type { PromiseWithError } from './types.ts' +} from './interceptor' +import type { PromiseWithError } from './types' it('onStart, onSuccess, onError, onFinish, onAsyncIteratorObjectError, onReadableStreamError can be used as an interceptor', () => { const interceptors: Interceptor<{ foo: string }, PromiseWithError<'success', 'error'>>[] = [] diff --git a/packages/shared/src/interceptor.test.ts b/packages/shared/src/interceptor.test.ts index 75aedb6b7f..d0563cb879 100644 --- a/packages/shared/src/interceptor.test.ts +++ b/packages/shared/src/interceptor.test.ts @@ -6,8 +6,8 @@ import { onReadableStreamError, onStart, onSuccess, -} from './interceptor.ts' -import { promiseWithResolvers } from './promise.ts' +} from './interceptor' +import { promiseWithResolvers } from './promise' describe('intercept', () => { const interceptor1 = vi.fn(({ next }) => next()) diff --git a/packages/shared/src/interceptor.ts b/packages/shared/src/interceptor.ts index 21b3afa662..a3be3c2cac 100644 --- a/packages/shared/src/interceptor.ts +++ b/packages/shared/src/interceptor.ts @@ -1,10 +1,10 @@ import { isAsyncIteratorObject } from '@standard-server/shared' import type { Promisable } from 'type-fest' -import { wrapAsyncIterator } from './iterator.ts' -import { override } from './proxy.ts' -import { wrapReadableStream } from './stream.ts' -import type { PromiseWithError, ThrowableError } from './types.ts' +import { wrapAsyncIterator } from './iterator' +import { override } from './proxy' +import { wrapReadableStream } from './stream' +import type { PromiseWithError, ThrowableError } from './types' export type InterceptableOptions = Record diff --git a/packages/shared/src/iterator.test-d.ts b/packages/shared/src/iterator.test-d.ts index 5f8942bb1e..7ff4fd4144 100644 --- a/packages/shared/src/iterator.test-d.ts +++ b/packages/shared/src/iterator.test-d.ts @@ -1,5 +1,5 @@ -import { consumeAsyncIterator } from './iterator.ts' -import type { PromiseWithError } from './types.ts' +import { consumeAsyncIterator } from './iterator' +import type { PromiseWithError } from './types' describe('consumeAsyncIterator', () => { it('can infer types from PromiseWithError + AsyncGenerator', () => { diff --git a/packages/shared/src/iterator.test.ts b/packages/shared/src/iterator.test.ts index 4b27e347ea..292774a80a 100644 --- a/packages/shared/src/iterator.test.ts +++ b/packages/shared/src/iterator.test.ts @@ -7,9 +7,9 @@ import { replicateAsyncIterator, traceAsyncIterator, wrapAsyncIterator, -} from './iterator.ts' -import { promiseWithResolvers } from './promise.ts' -import * as Tracing from './tracing.ts' +} from './iterator' +import { promiseWithResolvers } from './promise' +import * as Tracing from './tracing' const runInSpanContextSpy = vi.spyOn(Tracing, 'runInSpanContext') const startSpanSpy = vi.spyOn(Tracing, 'startSpan') diff --git a/packages/shared/src/iterator.ts b/packages/shared/src/iterator.ts index f21fdc9ea6..f95a643f7d 100644 --- a/packages/shared/src/iterator.ts +++ b/packages/shared/src/iterator.ts @@ -1,11 +1,11 @@ import { AsyncIteratorClass } from '@standard-server/shared' import type { Promisable } from 'type-fest' -import { once } from './function.ts' -import { AsyncIdQueue } from './queue.ts' -import type { StartSpanOptions } from './tracing.ts' -import { recordSpanError, runInSpanContext, startSpan } from './tracing.ts' -import type { PromiseWithError, ThrowableError } from './types.ts' +import { once } from './function' +import { AsyncIdQueue } from './queue' +import type { StartSpanOptions } from './tracing' +import { recordSpanError, runInSpanContext, startSpan } from './tracing' +import type { PromiseWithError, ThrowableError } from './types' export interface WrapAsyncIteratorOptions { /** diff --git a/packages/shared/src/object.test.ts b/packages/shared/src/object.test.ts index 7a07e7d421..524e6fd75c 100644 --- a/packages/shared/src/object.test.ts +++ b/packages/shared/src/object.test.ts @@ -20,7 +20,7 @@ import { pick, set, setOwn, -} from './object.ts' +} from './object' it('findDeepMatches', () => { const { maps, values } = findDeepMatches((v) => typeof v === 'string', { diff --git a/packages/shared/src/object.ts b/packages/shared/src/object.ts index acaf1d92a1..145044abb7 100644 --- a/packages/shared/src/object.ts +++ b/packages/shared/src/object.ts @@ -1,6 +1,6 @@ import { getOrBind, isNonPrimitive } from '@standard-server/shared' -import type { AnyFunction } from './function.ts' +import type { AnyFunction } from './function' export type Segment = string | number diff --git a/packages/shared/src/plugin.test.ts b/packages/shared/src/plugin.test.ts index 69229baaed..cc144738a2 100644 --- a/packages/shared/src/plugin.test.ts +++ b/packages/shared/src/plugin.test.ts @@ -1,5 +1,5 @@ -import type { OrderablePlugin } from './plugin.ts' -import { sortPlugins } from './plugin.ts' +import type { OrderablePlugin } from './plugin' +import { sortPlugins } from './plugin' describe('sortPlugins', () => { it('should handle empty array and single plugin', () => { diff --git a/packages/shared/src/promise.test.ts b/packages/shared/src/promise.test.ts index 907cd20279..aac8d74a98 100644 --- a/packages/shared/src/promise.test.ts +++ b/packages/shared/src/promise.test.ts @@ -1,6 +1,6 @@ import { AsyncLocalStorage } from 'node:async_hooks' -import { captureAsyncContext, promiseWithResolvers } from './promise.ts' +import { captureAsyncContext, promiseWithResolvers } from './promise' describe('promiseWithResolvers', () => { it('resolves the promise', async () => { diff --git a/packages/shared/src/proxy.test.ts b/packages/shared/src/proxy.test.ts index 9fb949aceb..ce8fcb1d78 100644 --- a/packages/shared/src/proxy.test.ts +++ b/packages/shared/src/proxy.test.ts @@ -1,4 +1,4 @@ -import { override } from './proxy.ts' +import { override } from './proxy' describe('override', () => { it('should combine properties from both target and overlay (overlay takes precedence)', () => { diff --git a/packages/shared/src/proxy.ts b/packages/shared/src/proxy.ts index bf4a4b4efe..29dc7a53e4 100644 --- a/packages/shared/src/proxy.ts +++ b/packages/shared/src/proxy.ts @@ -1,7 +1,7 @@ import { getOrBind } from '@standard-server/shared' -import type { Value } from './value.ts' -import { value } from './value.ts' +import type { Value } from './value' +import { value } from './value' /** * Creates a proxy that overlays a `partial` object on top of a `target`. diff --git a/packages/shared/src/queue.test.ts b/packages/shared/src/queue.test.ts index bb32859a83..c4e917b89e 100644 --- a/packages/shared/src/queue.test.ts +++ b/packages/shared/src/queue.test.ts @@ -1,6 +1,6 @@ import { AbortError } from '@standard-server/shared' -import { AsyncIdQueue } from './queue.ts' +import { AsyncIdQueue } from './queue' describe('asyncIdQueue', () => { let queue: AsyncIdQueue diff --git a/packages/shared/src/regex.test.ts b/packages/shared/src/regex.test.ts index 709f9a3acb..ebf85c3a6f 100644 --- a/packages/shared/src/regex.test.ts +++ b/packages/shared/src/regex.test.ts @@ -1,4 +1,4 @@ -import { INTEGER_REGEX, NON_NEGATIVE_INTEGER_REGEX } from './regex.ts' +import { INTEGER_REGEX, NON_NEGATIVE_INTEGER_REGEX } from './regex' it.each([ ['0', true], diff --git a/packages/shared/src/regex.ts b/packages/shared/src/regex.ts index f261c4f4f0..00c7fb3d12 100644 --- a/packages/shared/src/regex.ts +++ b/packages/shared/src/regex.ts @@ -2,9 +2,9 @@ * Matches an integer string: an optional `-`, then digits without leading zeros (`007` is rejected). * Note that `-0` is accepted. */ -export const INTEGER_REGEX = /^-?(?:0|[1-9]\d*)$/ +export const INTEGER_REGEX: RegExp = /^-?(?:0|[1-9]\d*)$/ /** * Matches a non-negative integer string without leading zeros, such as an array index. */ -export const NON_NEGATIVE_INTEGER_REGEX = /^(?:0|[1-9]\d*)$/ +export const NON_NEGATIVE_INTEGER_REGEX: RegExp = /^(?:0|[1-9]\d*)$/ diff --git a/packages/shared/src/signal.test.ts b/packages/shared/src/signal.test.ts index 453362420a..537f15ae00 100644 --- a/packages/shared/src/signal.test.ts +++ b/packages/shared/src/signal.test.ts @@ -1,6 +1,6 @@ import { getEventListeners } from 'node:events' -import { anyAbortSignal, disposableAllAbortSignal, listenAbort, runWithSignal } from './signal.ts' +import { anyAbortSignal, disposableAllAbortSignal, listenAbort, runWithSignal } from './signal' describe('disposableAllAbortSignal', () => { it('returns an undefined signal and a no-op dispose if contains undefined or empty array', () => { diff --git a/packages/shared/src/signal.ts b/packages/shared/src/signal.ts index a26e5c2564..1ed2c338ce 100644 --- a/packages/shared/src/signal.ts +++ b/packages/shared/src/signal.ts @@ -1,6 +1,6 @@ import { throwIfAborted } from '@standard-server/shared' -import { promiseWithResolvers } from './promise.ts' +import { promiseWithResolvers } from './promise' export interface DisposableAllAbortSignal { signal: AbortSignal | undefined diff --git a/packages/shared/src/stream.test.ts b/packages/shared/src/stream.test.ts index 1d0475455b..f6740ddf52 100644 --- a/packages/shared/src/stream.test.ts +++ b/packages/shared/src/stream.test.ts @@ -2,7 +2,7 @@ import { AsyncLocalStorage } from 'node:async_hooks' import { AsyncIteratorClass, sleep } from '@standard-server/shared' -import { promiseWithResolvers } from './promise.ts' +import { promiseWithResolvers } from './promise' import { asyncIteratorToStream, asyncIteratorToUnproxiedDataStream, @@ -10,8 +10,8 @@ import { streamToAsyncIteratorObject, traceReadableStream, wrapReadableStream, -} from './stream.ts' -import * as Tracing from './tracing.ts' +} from './stream' +import * as Tracing from './tracing' const runInSpanContextSpy = vi.spyOn(Tracing, 'runInSpanContext') const startSpanSpy = vi.spyOn(Tracing, 'startSpan') diff --git a/packages/shared/src/stream.ts b/packages/shared/src/stream.ts index 5789639c40..0468a71463 100644 --- a/packages/shared/src/stream.ts +++ b/packages/shared/src/stream.ts @@ -1,12 +1,12 @@ import { AsyncIteratorClass } from '@standard-server/shared' import type { Promisable } from 'type-fest' -import { once } from './function.ts' -import { isPlainObject } from './object.ts' -import { promiseWithResolvers } from './promise.ts' -import type { StartSpanOptions } from './tracing.ts' -import { recordSpanError, runInSpanContext, startSpan } from './tracing.ts' -import type { ThrowableError } from './types.ts' +import { once } from './function' +import { isPlainObject } from './object' +import { promiseWithResolvers } from './promise' +import type { StartSpanOptions } from './tracing' +import { recordSpanError, runInSpanContext, startSpan } from './tracing' +import type { ThrowableError } from './types' export function replicateReadableStream( stream: ReadableStream, diff --git a/packages/shared/src/tracing.test.ts b/packages/shared/src/tracing.test.ts index 02550b3350..667a490c3a 100644 --- a/packages/shared/src/tracing.test.ts +++ b/packages/shared/src/tracing.test.ts @@ -8,7 +8,7 @@ import { startSpan, toSpanAttributeValue, toTracingException, -} from './tracing.ts' +} from './tracing' function createMockSpan() { return { diff --git a/packages/shared/src/tracing.ts b/packages/shared/src/tracing.ts index d492122d91..941bd8eef9 100644 --- a/packages/shared/src/tracing.ts +++ b/packages/shared/src/tracing.ts @@ -1,6 +1,6 @@ import type { Promisable } from 'type-fest' -import { isAbortError } from './error.ts' +import { isAbortError } from './error' const TRACER_SYMBOL = /* @__PURE__ */ Symbol.for('ORPC_TRACER') diff --git a/packages/shared/src/types.test-d.ts b/packages/shared/src/types.test-d.ts index d475219eb1..0b4d644c28 100644 --- a/packages/shared/src/types.test-d.ts +++ b/packages/shared/src/types.test-d.ts @@ -1,4 +1,4 @@ -import type { DistributiveOmit, IntersectPick, PromiseWithError, Public } from './types.ts' +import type { DistributiveOmit, IntersectPick, PromiseWithError, Public } from './types' interface Empty {} diff --git a/packages/shared/src/value.test-d.ts b/packages/shared/src/value.test-d.ts index 23fbf9fd0d..6e18678241 100644 --- a/packages/shared/src/value.test-d.ts +++ b/packages/shared/src/value.test-d.ts @@ -1,7 +1,7 @@ import type { Promisable } from 'type-fest' -import type { Value } from './value.ts' -import { value } from './value.ts' +import type { Value } from './value' +import { value } from './value' describe('value', () => { it('types', () => { diff --git a/packages/shared/src/value.test.ts b/packages/shared/src/value.test.ts index 603563b3da..c23da1cc03 100644 --- a/packages/shared/src/value.test.ts +++ b/packages/shared/src/value.test.ts @@ -1,4 +1,4 @@ -import { value } from './value.ts' +import { value } from './value' it('value', async () => { expect(value(42)).toBe(42) diff --git a/packages/swr/package.json b/packages/swr/package.json index a99fd351f4..4ae6f91ed9 100644 --- a/packages/swr/package.json +++ b/packages/swr/package.json @@ -43,7 +43,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/client": "workspace:*", diff --git a/packages/swr/src/index.test.ts b/packages/swr/src/index.test.ts index 09ddf4b1dd..ef976db9ab 100644 --- a/packages/swr/src/index.test.ts +++ b/packages/swr/src/index.test.ts @@ -1,5 +1,5 @@ it('exports createSWRUtils, SWR_OPERATION_CONTEXT_SYMBOL', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ createSWRUtils: expect.any(Function), createRouterUtils: expect.any(Function), SWR_OPERATION_CONTEXT_SYMBOL: expect.any(Symbol), diff --git a/packages/swr/src/index.ts b/packages/swr/src/index.ts index 5f45468bcb..44c2bdf6f7 100644 --- a/packages/swr/src/index.ts +++ b/packages/swr/src/index.ts @@ -1,13 +1,13 @@ -export type { OperationKey, OperationKeyOptions, OperationKeyPrefixOptions } from './key.ts' -export { ProcedureUtils } from './procedure-utils.ts' -export type { ProcedureUtilsOptions } from './procedure-utils.ts' -export * from './router-utils.ts' -export { createRouterUtils as createSWRUtils } from './router-utils.ts' -export { SharedUtils } from './shared-utils.ts' -export * from './types.ts' +export type { OperationKey, OperationKeyOptions, OperationKeyPrefixOptions } from './key' +export { ProcedureUtils } from './procedure-utils' +export type { ProcedureUtilsOptions } from './procedure-utils' +export * from './router-utils' +export { createRouterUtils as createSWRUtils } from './router-utils' +export { SharedUtils } from './shared-utils' +export * from './types' export { OPERATION_CONTEXT_SYMBOL as SWR_OPERATION_CONTEXT_SYMBOL, type OperationContext as SWROperationContext, -} from './types.ts' +} from './types' export type { Public } from '@orpc/shared' diff --git a/packages/swr/src/key.test.ts b/packages/swr/src/key.test.ts index 0257c2fdbd..5dd5082123 100644 --- a/packages/swr/src/key.test.ts +++ b/packages/swr/src/key.test.ts @@ -1,4 +1,4 @@ -import { generateOperationKey } from './key.ts' +import { generateOperationKey } from './key' describe('generateOperationKey', () => { it('without prefix', () => { diff --git a/packages/swr/src/procedure-utils.test-d.ts b/packages/swr/src/procedure-utils.test-d.ts index ba6cc3ae42..6535bafbf2 100644 --- a/packages/swr/src/procedure-utils.test-d.ts +++ b/packages/swr/src/procedure-utils.test-d.ts @@ -5,8 +5,8 @@ import useSWRInfinite from 'swr/infinite' import useSWRMutation from 'swr/mutation' import useSWRSubscription from 'swr/subscription' -import type { OperationKey } from './key.ts' -import type { ProcedureUtils } from './procedure-utils.ts' +import type { OperationKey } from './key' +import type { ProcedureUtils } from './procedure-utils' describe('procedureUtils', () => { type UtilsInput = { search?: string; cursor?: number } | undefined diff --git a/packages/swr/src/procedure-utils.test.ts b/packages/swr/src/procedure-utils.test.ts index 8517adf66c..52ae955775 100644 --- a/packages/swr/src/procedure-utils.test.ts +++ b/packages/swr/src/procedure-utils.test.ts @@ -1,8 +1,8 @@ import { promiseWithResolvers } from '@orpc/shared' -import type { OperationKey } from './key.ts' -import { ProcedureUtils } from './procedure-utils.ts' -import { OPERATION_CONTEXT_SYMBOL } from './types.ts' +import type { OperationKey } from './key' +import { ProcedureUtils } from './procedure-utils' +import { OPERATION_CONTEXT_SYMBOL } from './types' beforeEach(() => { vi.clearAllMocks() diff --git a/packages/swr/src/procedure-utils.ts b/packages/swr/src/procedure-utils.ts index 5a1571991c..0a2c2c0b16 100644 --- a/packages/swr/src/procedure-utils.ts +++ b/packages/swr/src/procedure-utils.ts @@ -2,9 +2,9 @@ import type { Client, ClientContext } from '@orpc/client' import type { MaybeOptionalOptions } from '@orpc/shared' import { isAsyncIteratorObject, resolveMaybeOptionalOptions, takeLast } from '@orpc/shared' -import type { OperationKey, OperationKeyOptions, OperationKeyPrefixOptions } from './key.ts' -import { generateOperationKey } from './key.ts' -import { SharedUtils } from './shared-utils.ts' +import type { OperationKey, OperationKeyOptions, OperationKeyPrefixOptions } from './key' +import { generateOperationKey } from './key' +import { SharedUtils } from './shared-utils' import type { Fetcher, FetcherOptions, @@ -16,8 +16,8 @@ import type { OperationContext, Subscriber, SubscriberOptions, -} from './types.ts' -import { OPERATION_CONTEXT_SYMBOL } from './types.ts' +} from './types' +import { OPERATION_CONTEXT_SYMBOL } from './types' export interface ProcedureUtilsOptions extends OperationKeyPrefixOptions {} diff --git a/packages/swr/src/router-utils.test-d.ts b/packages/swr/src/router-utils.test-d.ts index fa7c390b2e..9e01531f57 100644 --- a/packages/swr/src/router-utils.test-d.ts +++ b/packages/swr/src/router-utils.test-d.ts @@ -4,10 +4,10 @@ import { os } from '@orpc/server' import type { Public } from '@orpc/shared' import * as z from 'zod' -import type { ProcedureUtils } from './procedure-utils.ts' -import type { RouterUtils } from './router-utils.ts' -import { createRouterUtils } from './router-utils.ts' -import type { SharedUtils } from './shared-utils.ts' +import type { ProcedureUtils } from './procedure-utils' +import type { RouterUtils } from './router-utils' +import { createRouterUtils } from './router-utils' +import type { SharedUtils } from './shared-utils' const inputSchema = z.object({ input: z.number().transform((n) => `${n}`) }) const outputSchema = z.object({ output: z.number().transform((n) => `${n}`) }) diff --git a/packages/swr/src/router-utils.test.ts b/packages/swr/src/router-utils.test.ts index 83e83a5783..e32cd1351c 100644 --- a/packages/swr/src/router-utils.test.ts +++ b/packages/swr/src/router-utils.test.ts @@ -1,11 +1,11 @@ -import { ProcedureUtils } from './procedure-utils.ts' -import { createRouterUtils } from './router-utils.ts' +import { ProcedureUtils } from './procedure-utils' +import { createRouterUtils } from './router-utils' -vi.mock('./procedure-utils.ts', async (importOriginal) => { - const { SharedUtils } = await import('./shared-utils.ts') +vi.mock('./procedure-utils', async (importOriginal) => { + const { SharedUtils } = await import('./shared-utils') return { - ...(await importOriginal()), + ...(await importOriginal()), ProcedureUtils: vi.fn( class extends SharedUtils { call = vi.fn() diff --git a/packages/swr/src/router-utils.ts b/packages/swr/src/router-utils.ts index ee1f67bee0..5d67af6aea 100644 --- a/packages/swr/src/router-utils.ts +++ b/packages/swr/src/router-utils.ts @@ -3,9 +3,9 @@ import { RECURSIVE_CLIENT_UNWRAP_KEYS } from '@orpc/client' import type { Public } from '@orpc/shared' import { bindMethods, isNonPrimitive, toArray } from '@orpc/shared' -import type { OperationKeyPrefixOptions } from './key.ts' -import { ProcedureUtils } from './procedure-utils.ts' -import { SharedUtils } from './shared-utils.ts' +import type { OperationKeyPrefixOptions } from './key' +import { ProcedureUtils } from './procedure-utils' +import { SharedUtils } from './shared-utils' export type RouterUtils = T extends Client diff --git a/packages/swr/src/shared-utils.test-d.ts b/packages/swr/src/shared-utils.test-d.ts index f59db2a5a5..d2f112ebdf 100644 --- a/packages/swr/src/shared-utils.test-d.ts +++ b/packages/swr/src/shared-utils.test-d.ts @@ -1,7 +1,7 @@ import type { Public } from '@orpc/shared' import { mutate } from 'swr' -import type { SharedUtils } from './shared-utils.ts' +import type { SharedUtils } from './shared-utils' describe('sharedUtils', () => { const optionalUtils = {} as Public< diff --git a/packages/swr/src/shared-utils.test.ts b/packages/swr/src/shared-utils.test.ts index 254dcd44be..f51be579d8 100644 --- a/packages/swr/src/shared-utils.test.ts +++ b/packages/swr/src/shared-utils.test.ts @@ -1,4 +1,4 @@ -import { SharedUtils } from './shared-utils.ts' +import { SharedUtils } from './shared-utils' describe('sharedUtils', () => { const utils = new SharedUtils(['test', 'path'], {}) diff --git a/packages/swr/src/shared-utils.ts b/packages/swr/src/shared-utils.ts index ee3f6d5307..0abffc973b 100644 --- a/packages/swr/src/shared-utils.ts +++ b/packages/swr/src/shared-utils.ts @@ -1,10 +1,10 @@ import type { MaybeOptionalOptions, PartialDeep } from '@orpc/shared' import { resolveMaybeOptionalOptions } from '@orpc/shared' -import type { OperationKeyPrefixOptions } from './key.ts' -import { generateOperationKey } from './key.ts' -import type { Matcher, MatcherOptions, MatcherStrategy } from './types.ts' -import { isSubsetOf } from './utils.ts' +import type { OperationKeyPrefixOptions } from './key' +import { generateOperationKey } from './key' +import type { Matcher, MatcherOptions, MatcherStrategy } from './types' +import { isSubsetOf } from './utils' export class SharedUtils { constructor( diff --git a/packages/swr/src/types.ts b/packages/swr/src/types.ts index 76f645bdfa..c4d70f68a2 100644 --- a/packages/swr/src/types.ts +++ b/packages/swr/src/types.ts @@ -2,7 +2,7 @@ import type { ClientContext } from '@orpc/client' import type { PartialDeep } from '@orpc/shared' import type { SWRSubscriptionOptions } from 'swr/subscription' -import type { OperationKey } from './key.ts' +import type { OperationKey } from './key' export type InferSubscriberOutput = TOutput extends AsyncIterable ? U[] : never export type InferLiveSubscriberOutput = TOutput extends AsyncIterable ? U : never diff --git a/packages/swr/src/utils.test.ts b/packages/swr/src/utils.test.ts index fd10f5eb37..c855c17eb3 100644 --- a/packages/swr/src/utils.test.ts +++ b/packages/swr/src/utils.test.ts @@ -1,4 +1,4 @@ -import { isSubsetOf } from './utils.ts' +import { isSubsetOf } from './utils' describe('isSubsetOf', () => { it('returns true for identical values and valid subsets', () => { diff --git a/packages/swr/tests/__shared__/orpc.ts b/packages/swr/tests/__shared__/orpc.ts index 561223d850..5abd83f9ba 100644 --- a/packages/swr/tests/__shared__/orpc.ts +++ b/packages/swr/tests/__shared__/orpc.ts @@ -5,7 +5,7 @@ import { asyncIteratorObject, os } from '@orpc/server' import { RPCHandler } from '@orpc/server/fetch' import * as z from 'zod' -import { createSWRUtils } from '../../src/index.ts' +import { createSWRUtils } from '../../src/index' const staticProcedure = os .errors({ STATIC_ERROR: { data: z.object({ static: z.string() }) } }) diff --git a/packages/swr/tests/e2e.test-d.ts b/packages/swr/tests/e2e.test-d.ts index c2044b1451..7a640df5e5 100644 --- a/packages/swr/tests/e2e.test-d.ts +++ b/packages/swr/tests/e2e.test-d.ts @@ -4,7 +4,7 @@ import useSWRInfinite from 'swr/infinite' import useSWRMutation from 'swr/mutation' import useSWRSubscription from 'swr/subscription' -import { client, orpc } from './__shared__/orpc.ts' +import { client, orpc } from './__shared__/orpc' it('.call', () => { expectTypeOf(orpc.static.call).toEqualTypeOf(client.static) diff --git a/packages/swr/tests/e2e.test.tsx b/packages/swr/tests/e2e.test.tsx index f3eb904410..8476b1030a 100644 --- a/packages/swr/tests/e2e.test.tsx +++ b/packages/swr/tests/e2e.test.tsx @@ -5,7 +5,7 @@ import useSWRInfinite from 'swr/infinite' import useSWRMutation from 'swr/mutation' import useSWRSubscription from 'swr/subscription' -import { orpc, streamHandler } from './__shared__/orpc.ts' +import { orpc, streamHandler } from './__shared__/orpc' beforeEach(async () => { vi.clearAllMocks() diff --git a/packages/tanstack-query/package.json b/packages/tanstack-query/package.json index e55ea938e8..1d37be0c44 100644 --- a/packages/tanstack-query/package.json +++ b/packages/tanstack-query/package.json @@ -47,7 +47,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/client": "workspace:*", diff --git a/packages/tanstack-query/src/contract-utils.test-d.ts b/packages/tanstack-query/src/contract-utils.test-d.ts index 3fef095f73..6371c6d874 100644 --- a/packages/tanstack-query/src/contract-utils.test-d.ts +++ b/packages/tanstack-query/src/contract-utils.test-d.ts @@ -4,13 +4,10 @@ import { meta, oc, type } from '@orpc/contract' import type { ContractJsonifiedClientFactory } from '@orpc/openapi' import type { PromiseWithError } from '@orpc/shared' -import { - createContractJsonifiedUtilsFactory, - createContractUtilsFactory, -} from './contract-utils.ts' -import type { ProcedureUtils } from './procedure-utils.ts' -import type { SharedUtils } from './shared-utils.ts' -import type { OperationContext } from './types.ts' +import { createContractJsonifiedUtilsFactory, createContractUtilsFactory } from './contract-utils' +import type { ProcedureUtils } from './procedure-utils' +import type { SharedUtils } from './shared-utils' +import type { OperationContext } from './types' const contract = { ping: oc.meta(meta.path(['ping'])), diff --git a/packages/tanstack-query/src/contract-utils.test.ts b/packages/tanstack-query/src/contract-utils.test.ts index 155e7de371..32826f5b40 100644 --- a/packages/tanstack-query/src/contract-utils.test.ts +++ b/packages/tanstack-query/src/contract-utils.test.ts @@ -1,10 +1,7 @@ import { ProcedureContract } from '@orpc/contract' -import { - createContractJsonifiedUtilsFactory, - createContractUtilsFactory, -} from './contract-utils.ts' -import * as routerUtilsModule from './router-utils.ts' +import { createContractJsonifiedUtilsFactory, createContractUtilsFactory } from './contract-utils' +import * as routerUtilsModule from './router-utils' const createRouterUtilsSpy = vi.spyOn(routerUtilsModule, 'createRouterUtils') diff --git a/packages/tanstack-query/src/contract-utils.ts b/packages/tanstack-query/src/contract-utils.ts index 1a5996ce61..ebc8fba9ae 100644 --- a/packages/tanstack-query/src/contract-utils.ts +++ b/packages/tanstack-query/src/contract-utils.ts @@ -4,8 +4,8 @@ import { resolveBasePathMeta } from '@orpc/contract' import type { ContractJsonifiedClientFactory, JsonifiedClient } from '@orpc/openapi' import { get } from '@orpc/shared' -import type { RouterUtils, RouterUtilsOptions } from './router-utils.ts' -import { createRouterUtils } from './router-utils.ts' +import type { RouterUtils, RouterUtilsOptions } from './router-utils' +import { createRouterUtils } from './router-utils' export interface ContractUtilsFactory { (contract: T): RouterUtils> diff --git a/packages/tanstack-query/src/index.test.ts b/packages/tanstack-query/src/index.test.ts index c39cfa2d23..cf9f87c518 100644 --- a/packages/tanstack-query/src/index.test.ts +++ b/packages/tanstack-query/src/index.test.ts @@ -1,5 +1,5 @@ it('exports createTanstackQueryUtils, TANSTACK_QUERY_OPERATION_CONTEXT_SYMBOL', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ createTanstackQueryUtils: expect.any(Function), TANSTACK_QUERY_OPERATION_CONTEXT_SYMBOL: expect.any(Symbol), }) diff --git a/packages/tanstack-query/src/index.ts b/packages/tanstack-query/src/index.ts index 1029e48b37..59f6271d0b 100644 --- a/packages/tanstack-query/src/index.ts +++ b/packages/tanstack-query/src/index.ts @@ -1,13 +1,13 @@ -export * from './contract-utils.ts' +export * from './contract-utils' export type { OperationKey, OperationKeyBaseOptions, OperationKeyOptions, OperationKeyPrefixOptions, -} from './key.ts' -export * from './meta.ts' -export type { RouterUtilsPlugin } from './plugin.ts' -export { mergeProcedureUtilsOptions, ProcedureUtils } from './procedure-utils.ts' +} from './key' +export * from './meta' +export type { RouterUtilsPlugin } from './plugin' +export { mergeProcedureUtilsOptions, ProcedureUtils } from './procedure-utils' export type { ProcedureUtilsInfiniteInterceptor, ProcedureUtilsInfiniteInterceptorOptions, @@ -21,18 +21,18 @@ export type { ProcedureUtilsQueryInterceptorOptions, ProcedureUtilsStreamedInterceptor, ProcedureUtilsStreamedInterceptorOptions, -} from './procedure-utils.ts' -export * from './router-utils.ts' -export { createRouterUtils as createTanstackQueryUtils } from './router-utils.ts' -export { SharedUtils } from './shared-utils.ts' -export * from './ssr.ts' -export type { SerializableStreamedQueryOptions, SettleOnFirstDataOptions } from './stream-query.ts' -export * from './structural-sharing.ts' -export * from './types.ts' +} from './procedure-utils' +export * from './router-utils' +export { createRouterUtils as createTanstackQueryUtils } from './router-utils' +export { SharedUtils } from './shared-utils' +export * from './ssr' +export type { SerializableStreamedQueryOptions, SettleOnFirstDataOptions } from './stream-query' +export * from './structural-sharing' +export * from './types' export { OPERATION_CONTEXT_SYMBOL as TANSTACK_QUERY_OPERATION_CONTEXT_SYMBOL, type OperationContext as TanstackQueryOperationContext, -} from './types.ts' +} from './types' export type { AnyNestedClient } from '@orpc/client' diff --git a/packages/tanstack-query/src/key.test.ts b/packages/tanstack-query/src/key.test.ts index dcd129fbbc..bae87ae580 100644 --- a/packages/tanstack-query/src/key.test.ts +++ b/packages/tanstack-query/src/key.test.ts @@ -2,7 +2,7 @@ import { RPCJsonSerializer } from '@orpc/client' import { OpenAPIJsonSerializer } from '@orpc/openapi' import { hashKey, partialMatchKey, QueryClient, skipToken } from '@tanstack/query-core' -import { generateOperationKey } from './key.ts' +import { generateOperationKey } from './key' it('generateOperationKey', () => { expect(generateOperationKey(['path'])).toEqual([['path'], {}]) diff --git a/packages/tanstack-query/src/key.ts b/packages/tanstack-query/src/key.ts index 539a2cc5db..7de7243010 100644 --- a/packages/tanstack-query/src/key.ts +++ b/packages/tanstack-query/src/key.ts @@ -3,8 +3,8 @@ import type { PartialDeep, Public } from '@orpc/shared' import { stringifyJSON } from '@orpc/shared' import { skipToken } from '@tanstack/query-core' -import type { SerializableStreamedQueryOptions } from './stream-query.ts' -import type { OperationType } from './types.ts' +import type { SerializableStreamedQueryOptions } from './stream-query' +import type { OperationType } from './types' export interface OperationKeyPrefixOptions { /** diff --git a/packages/tanstack-query/src/live-query.test.ts b/packages/tanstack-query/src/live-query.test.ts index ad636000d3..f4c295cf49 100644 --- a/packages/tanstack-query/src/live-query.test.ts +++ b/packages/tanstack-query/src/live-query.test.ts @@ -1,7 +1,7 @@ import { sleep } from '@orpc/shared' import { QueryClient, QueryObserver } from '@tanstack/query-core' -import { liveQuery } from './live-query.ts' +import { liveQuery } from './live-query' export const queryClient = new QueryClient({ defaultOptions: { diff --git a/packages/tanstack-query/src/live-query.ts b/packages/tanstack-query/src/live-query.ts index f38883199c..f024f1da4d 100644 --- a/packages/tanstack-query/src/live-query.ts +++ b/packages/tanstack-query/src/live-query.ts @@ -2,7 +2,7 @@ import type { Promisable } from '@orpc/shared' import { listenAbort, stringifyJSON, throwIfAborted } from '@orpc/shared' import type { QueryFunction, QueryFunctionContext, QueryKey } from '@tanstack/query-core' -import type { SettleOnFirstDataOptions } from './stream-query.ts' +import type { SettleOnFirstDataOptions } from './stream-query' export function liveQuery( queryFn: (context: QueryFunctionContext) => Promisable>, diff --git a/packages/tanstack-query/src/meta.test-d.ts b/packages/tanstack-query/src/meta.test-d.ts index 7b1685462c..a79a8b6433 100644 --- a/packages/tanstack-query/src/meta.test-d.ts +++ b/packages/tanstack-query/src/meta.test-d.ts @@ -4,8 +4,8 @@ import { oc, type } from '@orpc/contract' import type { PromiseWithError } from '@orpc/shared' import type { SkipToken } from '@tanstack/query-core' -import { tanstackQuery } from './meta.ts' -import type { OperationContext } from './types.ts' +import { tanstackQuery } from './meta' +import type { OperationContext } from './types' describe('tanstackQuery', () => { it('infers input, output and error types from the contract', () => { diff --git a/packages/tanstack-query/src/meta.test.ts b/packages/tanstack-query/src/meta.test.ts index 2ed31c7abd..a8155d49ac 100644 --- a/packages/tanstack-query/src/meta.test.ts +++ b/packages/tanstack-query/src/meta.test.ts @@ -1,7 +1,7 @@ import { oc } from '@orpc/contract' -import { ContractOptionsUtilsPlugin, getTanstackQueryMeta, tanstackQuery } from './meta.ts' -import { createRouterUtils } from './router-utils.ts' +import { ContractOptionsUtilsPlugin, getTanstackQueryMeta, tanstackQuery } from './meta' +import { createRouterUtils } from './router-utils' describe('tanstackQuery', () => { it('stores options readable via getTanstackQueryMeta', () => { diff --git a/packages/tanstack-query/src/meta.ts b/packages/tanstack-query/src/meta.ts index 3e22d1386d..4aaabc204d 100644 --- a/packages/tanstack-query/src/meta.ts +++ b/packages/tanstack-query/src/meta.ts @@ -17,10 +17,10 @@ import type { import { getRouterContract, ProcedureContract } from '@orpc/contract' import type { ThrowableError } from '@orpc/shared' -import type { OperationKeyBaseOptions } from './key.ts' -import type { RouterUtilsPlugin } from './plugin.ts' -import type { ProcedureUtilsOptions } from './procedure-utils.ts' -import { mergeProcedureUtilsOptions } from './procedure-utils.ts' +import type { OperationKeyBaseOptions } from './key' +import type { RouterUtilsPlugin } from './plugin' +import type { ProcedureUtilsOptions } from './procedure-utils' +import { mergeProcedureUtilsOptions } from './procedure-utils' export type TanstackQueryMetaOptions< TClientContext extends ClientContext, diff --git a/packages/tanstack-query/src/plugin.test.ts b/packages/tanstack-query/src/plugin.test.ts index 8ef2108184..3eb6f6441f 100644 --- a/packages/tanstack-query/src/plugin.test.ts +++ b/packages/tanstack-query/src/plugin.test.ts @@ -1,5 +1,5 @@ -import type { RouterUtilsPlugin } from './plugin.ts' -import { CompositeRouterUtilsPlugin } from './plugin.ts' +import type { RouterUtilsPlugin } from './plugin' +import { CompositeRouterUtilsPlugin } from './plugin' describe('compositeRouterUtilsPlugin', () => { beforeEach(() => { diff --git a/packages/tanstack-query/src/plugin.ts b/packages/tanstack-query/src/plugin.ts index 4291b1f3f8..1283bbce86 100644 --- a/packages/tanstack-query/src/plugin.ts +++ b/packages/tanstack-query/src/plugin.ts @@ -2,8 +2,8 @@ import type { AnyNestedClient, InferClientContext, InferClientError } from '@orp import type { OrderablePlugin } from '@orpc/shared' import { sortPlugins } from '@orpc/shared' -import type { ProcedureUtilsOptions } from './procedure-utils.ts' -import type { RouterUtilsOptions } from './router-utils.ts' +import type { ProcedureUtilsOptions } from './procedure-utils' +import type { RouterUtilsOptions } from './router-utils' /** * Plugin that packages reusable defaults and interceptors for router utils. diff --git a/packages/tanstack-query/src/procedure-utils.angular.test-d.ts b/packages/tanstack-query/src/procedure-utils.angular.test-d.ts index a191b84ff8..9f7d376af7 100644 --- a/packages/tanstack-query/src/procedure-utils.angular.test-d.ts +++ b/packages/tanstack-query/src/procedure-utils.angular.test-d.ts @@ -9,7 +9,7 @@ import { import { injectQueries } from '@tanstack/angular-query-experimental/inject-queries-experimental' import * as z from 'zod' -import type { ProcedureUtils } from './procedure-utils.ts' +import type { ProcedureUtils } from './procedure-utils' export const outputSchema = z.object({ output: z.number().transform((n) => `${n}`) }) diff --git a/packages/tanstack-query/src/procedure-utils.react.test-d.ts b/packages/tanstack-query/src/procedure-utils.react.test-d.ts index 53cd86c4b7..3c8fca672b 100644 --- a/packages/tanstack-query/src/procedure-utils.react.test-d.ts +++ b/packages/tanstack-query/src/procedure-utils.react.test-d.ts @@ -12,7 +12,7 @@ import { } from '@tanstack/react-query' import * as z from 'zod' -import type { ProcedureUtils } from './procedure-utils.ts' +import type { ProcedureUtils } from './procedure-utils' export const outputSchema = z.object({ output: z.number().transform((n) => `${n}`) }) diff --git a/packages/tanstack-query/src/procedure-utils.solid.test-d.ts b/packages/tanstack-query/src/procedure-utils.solid.test-d.ts index b72201017c..567858fca5 100644 --- a/packages/tanstack-query/src/procedure-utils.solid.test-d.ts +++ b/packages/tanstack-query/src/procedure-utils.solid.test-d.ts @@ -9,7 +9,7 @@ import { } from '@tanstack/solid-query' import * as z from 'zod' -import type { ProcedureUtils } from './procedure-utils.ts' +import type { ProcedureUtils } from './procedure-utils' export const outputSchema = z.object({ output: z.number().transform((n) => `${n}`) }) diff --git a/packages/tanstack-query/src/procedure-utils.svelte.test-d.ts b/packages/tanstack-query/src/procedure-utils.svelte.test-d.ts index 20e00fbd45..66bf95f9dc 100644 --- a/packages/tanstack-query/src/procedure-utils.svelte.test-d.ts +++ b/packages/tanstack-query/src/procedure-utils.svelte.test-d.ts @@ -9,7 +9,7 @@ import { } from '@tanstack/svelte-query' import * as z from 'zod' -import type { ProcedureUtils } from './procedure-utils.ts' +import type { ProcedureUtils } from './procedure-utils' export const outputSchema = z.object({ output: z.number().transform((n) => `${n}`) }) diff --git a/packages/tanstack-query/src/procedure-utils.test-d.ts b/packages/tanstack-query/src/procedure-utils.test-d.ts index 162491aa02..409d00a3d2 100644 --- a/packages/tanstack-query/src/procedure-utils.test-d.ts +++ b/packages/tanstack-query/src/procedure-utils.test-d.ts @@ -17,7 +17,7 @@ import type { import { QueryClient, skipToken } from '@tanstack/query-core' import * as z from 'zod' -import type { ProcedureUtils, ProcedureUtilsOptions } from './procedure-utils.ts' +import type { ProcedureUtils, ProcedureUtilsOptions } from './procedure-utils' import type { InfiniteOptionsIn, LiveOptionsIn, @@ -27,7 +27,7 @@ import type { QueryOptionsIn, StreamedKeyOptions, StreamedOptionsIn, -} from './types.ts' +} from './types' export const outputSchema = z.object({ output: z.number().transform((n) => `${n}`) }) diff --git a/packages/tanstack-query/src/procedure-utils.test.ts b/packages/tanstack-query/src/procedure-utils.test.ts index 11ca17721a..f0c305e185 100644 --- a/packages/tanstack-query/src/procedure-utils.test.ts +++ b/packages/tanstack-query/src/procedure-utils.test.ts @@ -1,15 +1,15 @@ import { RPCJsonSerializer } from '@orpc/client' import { InfiniteQueryObserver, QueryClient, QueryObserver, skipToken } from '@tanstack/query-core' -import * as KeyModule from './key.ts' -import * as LiveQuery from './live-query.ts' +import * as KeyModule from './key' +import * as LiveQuery from './live-query' import { isProcedureUtilsOptions, mergeProcedureUtilsOptions, ProcedureUtils, -} from './procedure-utils.ts' -import * as streamQueryModule from './stream-query.ts' -import { OPERATION_CONTEXT_SYMBOL } from './types.ts' +} from './procedure-utils' +import * as streamQueryModule from './stream-query' +import { OPERATION_CONTEXT_SYMBOL } from './types' const streamedQuerySpy = vi.spyOn(streamQueryModule, 'serializableStreamedQuery') diff --git a/packages/tanstack-query/src/procedure-utils.ts b/packages/tanstack-query/src/procedure-utils.ts index 58a282ea96..5ba18f8602 100644 --- a/packages/tanstack-query/src/procedure-utils.ts +++ b/packages/tanstack-query/src/procedure-utils.ts @@ -17,11 +17,11 @@ import type { } from '@tanstack/query-core' import { skipToken } from '@tanstack/query-core' -import type { OperationKeyBaseOptions } from './key.ts' -import { liveQuery } from './live-query.ts' -import { SharedUtils } from './shared-utils.ts' -import { serializableStreamedQuery } from './stream-query.ts' -import { createStructuralSharing } from './structural-sharing.ts' +import type { OperationKeyBaseOptions } from './key' +import { liveQuery } from './live-query' +import { SharedUtils } from './shared-utils' +import { serializableStreamedQuery } from './stream-query' +import { createStructuralSharing } from './structural-sharing' import type { InferLiveQueryOutput, InferStreamedQueryOutput, @@ -39,8 +39,8 @@ import type { StreamedKeyOptions, StreamedOptionsIn, StreamedOptionsOut, -} from './types.ts' -import { OPERATION_CONTEXT_SYMBOL } from './types.ts' +} from './types' +import { OPERATION_CONTEXT_SYMBOL } from './types' export interface ProcedureUtilsQueryInterceptorOptions< TClientContext extends ClientContext, diff --git a/packages/tanstack-query/src/procedure-utils.vue.test-d.ts b/packages/tanstack-query/src/procedure-utils.vue.test-d.ts index 785bab4601..e272252734 100644 --- a/packages/tanstack-query/src/procedure-utils.vue.test-d.ts +++ b/packages/tanstack-query/src/procedure-utils.vue.test-d.ts @@ -10,7 +10,7 @@ import { import { computed } from 'vue' import * as z from 'zod' -import type { ProcedureUtils } from './procedure-utils.ts' +import type { ProcedureUtils } from './procedure-utils' export const outputSchema = z.object({ output: z.number().transform((n) => `${n}`) }) diff --git a/packages/tanstack-query/src/router-utils.test-d.ts b/packages/tanstack-query/src/router-utils.test-d.ts index 3590823ebc..4ea6ad7beb 100644 --- a/packages/tanstack-query/src/router-utils.test-d.ts +++ b/packages/tanstack-query/src/router-utils.test-d.ts @@ -5,10 +5,10 @@ import type { RouterClient } from '@orpc/server' import { os } from '@orpc/server' import * as z from 'zod' -import type { ProcedureUtils, ProcedureUtilsOptions } from './procedure-utils.ts' -import type { RouterUtils, RouterUtilsScoped } from './router-utils.ts' -import { createRouterUtils } from './router-utils.ts' -import type { SharedUtils } from './shared-utils.ts' +import type { ProcedureUtils, ProcedureUtilsOptions } from './procedure-utils' +import type { RouterUtils, RouterUtilsScoped } from './router-utils' +import { createRouterUtils } from './router-utils' +import type { SharedUtils } from './shared-utils' const inputSchema = z.object({ input: z.number().transform((n) => `${n}`) }) const outputSchema = z.object({ output: z.number().transform((n) => `${n}`) }) diff --git a/packages/tanstack-query/src/router-utils.test.ts b/packages/tanstack-query/src/router-utils.test.ts index cc001d539f..aeed39c7d2 100644 --- a/packages/tanstack-query/src/router-utils.test.ts +++ b/packages/tanstack-query/src/router-utils.test.ts @@ -1,15 +1,15 @@ import { RPCJsonSerializer } from '@orpc/client' -import * as KeyModule from './key.ts' -import type { RouterUtilsPlugin } from './plugin.ts' -import { ProcedureUtils } from './procedure-utils.ts' -import { createRouterUtils } from './router-utils.ts' +import * as KeyModule from './key' +import type { RouterUtilsPlugin } from './plugin' +import { ProcedureUtils } from './procedure-utils' +import { createRouterUtils } from './router-utils' -vi.mock('./procedure-utils.ts', async (importOriginal) => { - const { SharedUtils } = await import('./shared-utils.ts') +vi.mock('./procedure-utils', async (importOriginal) => { + const { SharedUtils } = await import('./shared-utils') return { - ...(await importOriginal()), + ...(await importOriginal()), ProcedureUtils: vi.fn( class extends SharedUtils { call = vi.fn() diff --git a/packages/tanstack-query/src/router-utils.ts b/packages/tanstack-query/src/router-utils.ts index a7343d4b5d..921307a13f 100644 --- a/packages/tanstack-query/src/router-utils.ts +++ b/packages/tanstack-query/src/router-utils.ts @@ -3,9 +3,9 @@ import { RECURSIVE_CLIENT_UNWRAP_KEYS } from '@orpc/client' import type { Public } from '@orpc/shared' import { bindMethods, isNonPrimitive, pick, toArray } from '@orpc/shared' -import type { OperationKeyBaseOptions } from './key.ts' -import type { RouterUtilsPlugin } from './plugin.ts' -import { CompositeRouterUtilsPlugin } from './plugin.ts' +import type { OperationKeyBaseOptions } from './key' +import type { RouterUtilsPlugin } from './plugin' +import { CompositeRouterUtilsPlugin } from './plugin' import type { ProcedureUtilsInfiniteInterceptor, ProcedureUtilsLiveInterceptor, @@ -13,13 +13,13 @@ import type { ProcedureUtilsOptions, ProcedureUtilsQueryInterceptor, ProcedureUtilsStreamedInterceptor, -} from './procedure-utils.ts' +} from './procedure-utils' import { isProcedureUtilsOptions, mergeProcedureUtilsOptions, ProcedureUtils, -} from './procedure-utils.ts' -import { SharedUtils } from './shared-utils.ts' +} from './procedure-utils' +import { SharedUtils } from './shared-utils' /** * The utils shape derived from a client: procedure clients map to procedure diff --git a/packages/tanstack-query/src/shared-utils.test-d.ts b/packages/tanstack-query/src/shared-utils.test-d.ts index 9955e873b7..9444883eed 100644 --- a/packages/tanstack-query/src/shared-utils.test-d.ts +++ b/packages/tanstack-query/src/shared-utils.test-d.ts @@ -1,4 +1,4 @@ -import type { SharedUtils } from './shared-utils.ts' +import type { SharedUtils } from './shared-utils' describe('SharedUtils', () => { const utils = {} as SharedUtils<{ a: { b: { c: number } } }> diff --git a/packages/tanstack-query/src/shared-utils.test.ts b/packages/tanstack-query/src/shared-utils.test.ts index 809617a0dc..baa6992a44 100644 --- a/packages/tanstack-query/src/shared-utils.test.ts +++ b/packages/tanstack-query/src/shared-utils.test.ts @@ -1,7 +1,7 @@ import { RPCJsonSerializer } from '@orpc/client' -import * as KeyModule from './key.ts' -import { SharedUtils } from './shared-utils.ts' +import * as KeyModule from './key' +import { SharedUtils } from './shared-utils' const generateOperationKeySpy = vi.spyOn(KeyModule, 'generateOperationKey') diff --git a/packages/tanstack-query/src/shared-utils.ts b/packages/tanstack-query/src/shared-utils.ts index f109a7b372..cbceb926ab 100644 --- a/packages/tanstack-query/src/shared-utils.ts +++ b/packages/tanstack-query/src/shared-utils.ts @@ -1,6 +1,6 @@ -import type { OperationKey, OperationKeyBaseOptions, OperationKeyOptions } from './key.ts' -import { generateOperationKey } from './key.ts' -import type { OperationType } from './types.ts' +import type { OperationKey, OperationKeyBaseOptions, OperationKeyOptions } from './key' +import { generateOperationKey } from './key' +import type { OperationType } from './types' export class SharedUtils { constructor( diff --git a/packages/tanstack-query/src/ssr.test-d.ts b/packages/tanstack-query/src/ssr.test-d.ts index c4b0b7d280..7e6c9320a2 100644 --- a/packages/tanstack-query/src/ssr.test-d.ts +++ b/packages/tanstack-query/src/ssr.test-d.ts @@ -1,8 +1,8 @@ import type { Client } from '@orpc/client' import { RPCSerializer } from '@orpc/client' -import { createRouterUtils } from './router-utils.ts' -import { createHydrationOptions, StreamQuerySSRUtilsPlugin } from './ssr.ts' +import { createRouterUtils } from './router-utils' +import { createHydrationOptions, StreamQuerySSRUtilsPlugin } from './ssr' it('accepts an RPCSerializer', () => { createHydrationOptions(new RPCSerializer()) diff --git a/packages/tanstack-query/src/ssr.test.ts b/packages/tanstack-query/src/ssr.test.ts index 50b87f0205..c6acdf5eae 100644 --- a/packages/tanstack-query/src/ssr.test.ts +++ b/packages/tanstack-query/src/ssr.test.ts @@ -11,9 +11,9 @@ import { QueryObserver, } from '@tanstack/query-core' -import { distinctData } from '../tests/__shared__/utils.ts' -import { createRouterUtils } from './router-utils.ts' -import { createHydrationOptions, StreamQuerySSRUtilsPlugin } from './ssr.ts' +import { distinctData } from '../tests/__shared__/utils' +import { createRouterUtils } from './router-utils' +import { createHydrationOptions, StreamQuerySSRUtilsPlugin } from './ssr' describe('createHydrationOptions', () => { function roundTrip(data: unknown, options = createHydrationOptions()): unknown { diff --git a/packages/tanstack-query/src/ssr.ts b/packages/tanstack-query/src/ssr.ts index 5c5e6a4820..a461ca543f 100644 --- a/packages/tanstack-query/src/ssr.ts +++ b/packages/tanstack-query/src/ssr.ts @@ -8,9 +8,9 @@ import { RPCJsonSerializer } from '@orpc/client' import type { Public } from '@orpc/shared' import { environmentManager } from '@tanstack/query-core' -import type { RouterUtilsPlugin } from './plugin.ts' -import type { ProcedureUtilsOptions } from './procedure-utils.ts' -import { mergeProcedureUtilsOptions } from './procedure-utils.ts' +import type { RouterUtilsPlugin } from './plugin' +import type { ProcedureUtilsOptions } from './procedure-utils' +import { mergeProcedureUtilsOptions } from './procedure-utils' /** * Creates `dehydrate` and `hydrate` query client defaults that preserve oRPC types. diff --git a/packages/tanstack-query/src/stream-query.test.ts b/packages/tanstack-query/src/stream-query.test.ts index cac41da280..607ea49cea 100644 --- a/packages/tanstack-query/src/stream-query.test.ts +++ b/packages/tanstack-query/src/stream-query.test.ts @@ -9,8 +9,8 @@ import { QueryObserver, } from '@tanstack/query-core' -import { distinctData } from '../tests/__shared__/utils.ts' -import { serializableStreamedQuery } from './stream-query.ts' +import { distinctData } from '../tests/__shared__/utils' +import { serializableStreamedQuery } from './stream-query' describe('serializableStreamedQuery', () => { const queryClient = new QueryClient({ diff --git a/packages/tanstack-query/src/structural-sharing.test.ts b/packages/tanstack-query/src/structural-sharing.test.ts index cdc63a4f64..f13deb441e 100644 --- a/packages/tanstack-query/src/structural-sharing.test.ts +++ b/packages/tanstack-query/src/structural-sharing.test.ts @@ -3,7 +3,7 @@ import { OpenAPIJsonSerializer } from '@orpc/openapi' import { NullProtoObj } from '@orpc/shared' import { replaceEqualDeep } from '@tanstack/query-core' -import { createStructuralSharing } from './structural-sharing.ts' +import { createStructuralSharing } from './structural-sharing' const structuralSharing = createStructuralSharing() diff --git a/packages/tanstack-query/src/types.ts b/packages/tanstack-query/src/types.ts index 369e25f3a4..f668b92cc0 100644 --- a/packages/tanstack-query/src/types.ts +++ b/packages/tanstack-query/src/types.ts @@ -10,7 +10,7 @@ import type { SkipToken, } from '@tanstack/query-core' -import type { SerializableStreamedQueryOptions, SettleOnFirstDataOptions } from './stream-query.ts' +import type { SerializableStreamedQueryOptions, SettleOnFirstDataOptions } from './stream-query' export type InferStreamedQueryOutput = TOutput extends AsyncIterable ? U[] : never export type InferLiveQueryOutput = TOutput extends AsyncIterable ? U : never diff --git a/packages/tanstack-query/tests/__shared__/orpc.tsx b/packages/tanstack-query/tests/__shared__/orpc.tsx index 826d78956a..9f02033780 100644 --- a/packages/tanstack-query/tests/__shared__/orpc.tsx +++ b/packages/tanstack-query/tests/__shared__/orpc.tsx @@ -6,7 +6,7 @@ import { RPCHandler } from '@orpc/server/fetch' import { QueryClient } from '@tanstack/react-query' import * as z from 'zod' -import { createTanstackQueryUtils } from '../../src/index.ts' +import { createTanstackQueryUtils } from '../../src/index' export const router = { static: os diff --git a/packages/tanstack-query/tests/e2e.test-d.ts b/packages/tanstack-query/tests/e2e.test-d.ts index 3c893c87dd..2bf6c475de 100644 --- a/packages/tanstack-query/tests/e2e.test-d.ts +++ b/packages/tanstack-query/tests/e2e.test-d.ts @@ -11,7 +11,7 @@ import { useSuspenseQuery, } from '@tanstack/react-query' -import { client, orpc, queryClient } from './__shared__/orpc.tsx' +import { client, orpc, queryClient } from './__shared__/orpc' it('.key', () => { void queryClient.invalidateQueries({ diff --git a/packages/tanstack-query/tests/e2e.test.tsx b/packages/tanstack-query/tests/e2e.test.tsx index 0f6b93273e..7a95a5b524 100644 --- a/packages/tanstack-query/tests/e2e.test.tsx +++ b/packages/tanstack-query/tests/e2e.test.tsx @@ -2,7 +2,7 @@ import { ORPCError } from '@orpc/client' import { skipToken, useInfiniteQuery, useMutation, useQuery } from '@tanstack/react-query' import { act, renderHook } from '@testing-library/react' -import { orpc, queryClient, router } from './__shared__/orpc.tsx' +import { orpc, queryClient, router } from './__shared__/orpc' beforeEach(() => { queryClient.clear() diff --git a/packages/trpc/package.json b/packages/trpc/package.json index 053c65ae09..f9b00794cb 100644 --- a/packages/trpc/package.json +++ b/packages/trpc/package.json @@ -43,7 +43,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/contract": "workspace:*", diff --git a/packages/trpc/src/index.ts b/packages/trpc/src/index.ts index cefab24d82..c7398c167f 100644 --- a/packages/trpc/src/index.ts +++ b/packages/trpc/src/index.ts @@ -1,2 +1,2 @@ -export * from './to-orpc-router.ts' -export * from './to-trpc-meta.ts' +export * from './to-orpc-router' +export * from './to-trpc-meta' diff --git a/packages/trpc/src/to-orpc-router.test-d.ts b/packages/trpc/src/to-orpc-router.test-d.ts index 5c720a92d8..7bc56bafbe 100644 --- a/packages/trpc/src/to-orpc-router.test-d.ts +++ b/packages/trpc/src/to-orpc-router.test-d.ts @@ -4,7 +4,7 @@ import { initTRPC, lazy, tracked, TRPCError } from '@trpc/server' import type { TrackedData } from '@trpc/server/unstable-core-do-not-import' import * as z from 'zod' -import { toORPCRouter } from './to-orpc-router.ts' +import { toORPCRouter } from './to-orpc-router' type TRPCContext = { a: string } diff --git a/packages/trpc/src/to-orpc-router.test.ts b/packages/trpc/src/to-orpc-router.test.ts index 63a0a047d1..e14fe2c641 100644 --- a/packages/trpc/src/to-orpc-router.test.ts +++ b/packages/trpc/src/to-orpc-router.test.ts @@ -14,7 +14,7 @@ import { isAsyncIteratorObject } from '@orpc/shared' import { initTRPC, lazy, tracked, TRPCError } from '@trpc/server' import * as z from 'zod' -import { toORPCRouter } from './to-orpc-router.ts' +import { toORPCRouter } from './to-orpc-router' const inputSchema = z.object({ input: z.number().transform((n) => `${n}`) }) diff --git a/packages/trpc/src/to-trpc-meta.test.ts b/packages/trpc/src/to-trpc-meta.test.ts index 09122f5166..fa1c3bfd4d 100644 --- a/packages/trpc/src/to-trpc-meta.test.ts +++ b/packages/trpc/src/to-trpc-meta.test.ts @@ -3,8 +3,8 @@ import type { Meta } from '@orpc/server' import { defineMeta } from '@orpc/server' import { initTRPC } from '@trpc/server' -import { toORPCRouter } from './to-orpc-router.ts' -import { toTRPCMeta } from './to-trpc-meta.ts' +import { toORPCRouter } from './to-orpc-router' +import { toTRPCMeta } from './to-trpc-meta' describe('toTRPCMeta', () => { it('resolves meta plugins into a plain meta object', () => { diff --git a/packages/valibot/package.json b/packages/valibot/package.json index fc84393ef0..aadd01d1b0 100644 --- a/packages/valibot/package.json +++ b/packages/valibot/package.json @@ -42,7 +42,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/json-schema": "workspace:*", diff --git a/packages/valibot/src/converter.test.ts b/packages/valibot/src/converter.test.ts index 058debb9da..6e75d320ca 100644 --- a/packages/valibot/src/converter.test.ts +++ b/packages/valibot/src/converter.test.ts @@ -2,7 +2,7 @@ import { toJsonSchema } from '@valibot/to-json-schema' import * as v from 'valibot' import * as z from 'zod' -import { ValibotToJsonSchemaConverter } from './converter.ts' +import { ValibotToJsonSchemaConverter } from './converter' vi.mock('@valibot/to-json-schema', async (original) => { const mod = await original() diff --git a/packages/valibot/src/index.test.ts b/packages/valibot/src/index.test.ts index ef1a00335c..032bfb4c2d 100644 --- a/packages/valibot/src/index.test.ts +++ b/packages/valibot/src/index.test.ts @@ -1,5 +1,5 @@ it('exports ValibotToJsonSchemaConverter', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ ValibotToJsonSchemaConverter: expect.any(Function), }) }) diff --git a/packages/valibot/src/index.ts b/packages/valibot/src/index.ts index 60fa772e72..b235d80052 100644 --- a/packages/valibot/src/index.ts +++ b/packages/valibot/src/index.ts @@ -1,3 +1,3 @@ -export * from './converter.ts' +export * from './converter' export type { JsonSchema } from '@orpc/json-schema' diff --git a/packages/zod/package.json b/packages/zod/package.json index 689ff0b8d7..a791e88c58 100644 --- a/packages/zod/package.json +++ b/packages/zod/package.json @@ -42,7 +42,7 @@ } }, "scripts": { - "prepack": "tsc" + "prepack": "tsdown" }, "dependencies": { "@orpc/json-schema": "workspace:*" diff --git a/packages/zod/src/converter.test.ts b/packages/zod/src/converter.test.ts index 078b57f50e..352d122059 100644 --- a/packages/zod/src/converter.test.ts +++ b/packages/zod/src/converter.test.ts @@ -2,12 +2,12 @@ import * as v from 'valibot' import * as z from 'zod' import { $ZodRegistry, toJSONSchema } from 'zod/v4/core' -import { ZodToJsonSchemaConverter } from './converter.ts' +import { ZodToJsonSchemaConverter } from './converter' import { JSON_SCHEMA_INPUT_REGISTRY, JSON_SCHEMA_OUTPUT_REGISTRY, JSON_SCHEMA_REGISTRY, -} from './registries.ts' +} from './registries' vi.mock('zod/v4/core', async (original) => { const mod = await original() diff --git a/packages/zod/src/converter.ts b/packages/zod/src/converter.ts index 043ca63191..523016c026 100644 --- a/packages/zod/src/converter.ts +++ b/packages/zod/src/converter.ts @@ -22,7 +22,7 @@ import { JSON_SCHEMA_INPUT_REGISTRY, JSON_SCHEMA_OUTPUT_REGISTRY, JSON_SCHEMA_REGISTRY, -} from './registries.ts' +} from './registries' export interface ZodToJsonSchemaConverterOptions extends Omit { /** diff --git a/packages/zod/src/index.test.ts b/packages/zod/src/index.test.ts index d09e15e537..2947422255 100644 --- a/packages/zod/src/index.test.ts +++ b/packages/zod/src/index.test.ts @@ -1,5 +1,5 @@ it('exports ZodToJsonSchemaConverter', async () => { - await expect(import('./index.ts')).resolves.toMatchObject({ + await expect(import('./index')).resolves.toMatchObject({ ZodToJsonSchemaConverter: expect.any(Function), }) }) diff --git a/packages/zod/src/index.ts b/packages/zod/src/index.ts index 82f0721a6d..2b82e48ade 100644 --- a/packages/zod/src/index.ts +++ b/packages/zod/src/index.ts @@ -1,4 +1,4 @@ -export * from './converter.ts' -export * from './registries.ts' +export * from './converter' +export * from './registries' export type { JsonSchema } from '@orpc/json-schema' diff --git a/packages/zod/src/registries.test-d.ts b/packages/zod/src/registries.test-d.ts index 34f9722457..76b9b2199c 100644 --- a/packages/zod/src/registries.test-d.ts +++ b/packages/zod/src/registries.test-d.ts @@ -4,7 +4,7 @@ import { JSON_SCHEMA_INPUT_REGISTRY, JSON_SCHEMA_OUTPUT_REGISTRY, JSON_SCHEMA_REGISTRY, -} from './registries.ts' +} from './registries' const user = z.object({ name: z.string(), diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 48a7849483..383dd5b180 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -299,14 +299,14 @@ importers: specifier: ^29.1.1 version: 29.1.1(@noble/hashes@1.8.0) oxfmt: - specifier: ^0.76.0 - version: 0.76.0(@astrojs/compiler-rs@0.5.1)(svelte@5.57.3(@typescript-eslint/types@8.68.0)) + specifier: ^0.77.0 + version: 0.77.0(@astrojs/compiler-rs@0.5.1)(svelte@5.57.3(@typescript-eslint/types@8.68.0)) oxlint: - specifier: ^1.91.0 - version: 1.91.0(oxlint-tsgolint@7.0.2005) + specifier: ^1.92.0 + version: 1.92.0(oxlint-tsgolint@7.0.2006) oxlint-tsgolint: - specifier: ^7.0.2005 - version: 7.0.2005 + specifier: ^7.0.2006 + version: 7.0.2006 pino: specifier: ^10.4.0 version: 10.4.0 @@ -322,6 +322,9 @@ importers: supertest: specifier: ^7.3.1 version: 7.3.1(supports-color@10.2.2) + tsdown: + specifier: ^0.23.7 + version: 0.23.7(@volar/typescript@2.4.28(typescript@7.0.2))(oxc-resolver@11.24.2)(typescript@7.0.2) typescript: specifier: ^7.0.2 version: 7.0.2 @@ -770,8 +773,8 @@ importers: specifier: workspace:* version: link:../shared '@oxc-project/runtime': - specifier: ^0.155.0 - version: 0.155.0 + specifier: ^0.157.0 + version: 0.157.0 '@standard-server/core': specifier: ~0.15.0 version: 0.15.0 @@ -2205,6 +2208,9 @@ packages: '@emnapi/core@1.11.3': resolution: {integrity: sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==} + '@emnapi/core@2.0.0-beta.2': + resolution: {integrity: sha512-MzCVoWtcg4Pm2B3je5mMvYMvj3MmBKw+fU7vbsJc9/iT8ip6/eYIHo/Dsm/mr+wsHB6SEyJDuxB09Yy6r/8+4A==} + '@emnapi/runtime@1.11.1': resolution: {integrity: sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==} @@ -2214,12 +2220,18 @@ packages: '@emnapi/runtime@1.11.3': resolution: {integrity: sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==} + '@emnapi/runtime@2.0.0-beta.2': + resolution: {integrity: sha512-JcrSPzPvZuNZvJqPTF9Fw25LbOJ8avzFVlaf2grmH4Cku0oGP47tRgqPZadcfj3YoZMHkFVnCYFbQM8I+i5QEw==} + '@emnapi/wasi-threads@1.2.2': resolution: {integrity: sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==} '@emnapi/wasi-threads@1.2.3': resolution: {integrity: sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==} + '@emnapi/wasi-threads@2.2.0': + resolution: {integrity: sha512-JP7OYH38Q7+pyTAe14raZHLQIK7BDKbdwji+Xi3pcd/6QkJYQH3SX4wu6EplGrGJWRepoNzedfm0G3B9Z4e9Rw==} + '@esbuild/aix-ppc64@0.28.2': resolution: {integrity: sha512-XExcO+dvLKvVtNTibSTBej1NCAbaGhWn9Ww1ZPx80qsahhPFe/8jgWP0IchNe0F3HwkU7n8ejhH8bjonqht8mQ==} engines: {node: '>=18'} @@ -2937,6 +2949,13 @@ packages: '@emnapi/core': ^1.7.1 || ^2.0.0-alpha.4 '@emnapi/runtime': ^1.7.1 || ^2.0.0-alpha.4 + '@napi-rs/wasm-runtime@1.2.6': + resolution: {integrity: sha512-mRyDmEw9/fCDXCGfL1sbgIw/GUK0PVxRW4YwgPN61F3LQ+fSyoBFarJVzgGyhF6kRzEQZ0FejDqm4WLXSeqQmw==} + engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0} + peerDependencies: + '@emnapi/core': ^1.7.1 || 2.0.0-beta.2 + '@emnapi/runtime': ^1.7.1 || 2.0.0-beta.2 + '@nestjs/cli@12.0.11': resolution: {integrity: sha512-ExNgbKfhwMNXCV6FbQQnQOcxuubkDPcpYXUh+jkFn5Xm+WkdP+wjYS0KqyZgFSfpY24mST6y50UOEHVsvQME1A==} engines: {node: '>= 20.11'} @@ -3747,13 +3766,16 @@ packages: '@oslojs/encoding@1.1.0': resolution: {integrity: sha512-70wQhgYmndg4GCPxPPxPGevRKqTIJ2Nh4OkiMWmDAVYsTQ+Ta7Sq+rPevXyXGdzr30/qZBnyOalCszoMxlyldQ==} - '@oxc-project/runtime@0.155.0': - resolution: {integrity: sha512-VbW9raczGS5ZZ1FMunUBYHe4uV/R684qlQCoMdE3n5JT1PcqQsvmFpMYkF8AD+W04fBLGAq6Tr7YsTk0jjvDBA==} + '@oxc-project/runtime@0.157.0': + resolution: {integrity: sha512-srnUknwVoji5JdmU664pA4XyjBJXmgxP8rWlnZhFovzw6XQxaICGWAuScZdlLmIHI+ZRc7WgeiC2CURF4tAszQ==} engines: {node: ^20.19.0 || >=22.12.0} '@oxc-project/types@0.155.0': resolution: {integrity: sha512-SeE8JPwW1xs1tHeNycjUtUBdhorRa8o4jlvjwk49R7/Z291i+4DQa7JJIgOm/TaYQZx+QrPQbVJ/9c8dMIZN8Q==} + '@oxc-project/types@0.157.0': + resolution: {integrity: sha512-95iTox1qdt6WGWce3xwNOVayByOfLaYAq+qGPpub6NWbBh9sv0GG3+zyfh9ZBCO/jVu5A0EWI+qQI7g6fevjxg==} + '@oxc-resolver/binding-android-arm-eabi@11.24.2': resolution: {integrity: sha512-y09e0L0SRI2OA2tUIrjBgoV3eH5hvUKXNkJqXmNo5V2WxIjyC7I7aJfRLMEVpA8yi95f90gFDvO0VMgrDw+vwA==} cpu: [arm] @@ -3979,276 +4001,276 @@ packages: cpu: [x64] os: [win32] - '@oxfmt/binding-android-arm-eabi@0.76.0': - resolution: {integrity: sha512-z8x4kittQLPsrJWmfoIJyYqs2gNwceGShoUqAJdFRPw3K4kkkKCFHh3Cr4NFRvZb7DPfDS3+JfBjSm3OIyQaJQ==} + '@oxfmt/binding-android-arm-eabi@0.77.0': + resolution: {integrity: sha512-zmPiuOvkuu0csMx4U3gdMunIFWNcWulzikFMdAPBzLazVAA3LhdHzv9yzgUgAckv/zje5vz4XJcseNQKdSsWMw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [android] - '@oxfmt/binding-android-arm64@0.76.0': - resolution: {integrity: sha512-Zj9fEQhQSKGj8ZTB+X4q4ho4545xWf7qsvJpwREWnBz5BATEFYtStKRgiwYOZvxQ7ORlBEgSj7pmDzuljfV1mQ==} + '@oxfmt/binding-android-arm64@0.77.0': + resolution: {integrity: sha512-shXOIK9sj3bvt4H6K47qFWNKaYBwEhzj97iUwoLGyyRDrXt1OdAAuCiupCinG1i7ETL81knjEKeB+JmhOOfPew==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] - '@oxfmt/binding-darwin-arm64@0.76.0': - resolution: {integrity: sha512-jZy8GpUXaWpic5JPMAvLmaBz95Sx0naZl6hptBPLOMiYmZYiME7jAt6pv8o/tjQqPNWKb+7jKzZhrYx6UqM5MQ==} + '@oxfmt/binding-darwin-arm64@0.77.0': + resolution: {integrity: sha512-lrTX0I54buv9CW2leEWchWLdfcrblZ5Rj8uAilKzBEyWif8CTN6zBHdFc12K1b6U2cnlvOFBd1LxdLdqLKX2EA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] - '@oxfmt/binding-darwin-x64@0.76.0': - resolution: {integrity: sha512-U59+a9lVpoRp9enRhTE9GssL3qB1k09CYagRzTfs3dfknopMYV0x0xHZv7Pls3SNMqHlyHR+ufmY76CYafQoLw==} + '@oxfmt/binding-darwin-x64@0.77.0': + resolution: {integrity: sha512-SD44K3x/Im8EsOtdHxjVmTBi0cafAaunRpCeq+w91tkD2keqYagR8oAvxkJHUK+KPg5NQk7JZqQnzGHnVEBrDw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] - '@oxfmt/binding-freebsd-x64@0.76.0': - resolution: {integrity: sha512-J1R3YJHPdQJ2RQvzMdTVDWyizhihGiRGGAeEZxtGp629j5pcT5ypSLSiBflopD7o7tmiMD+xlNfhIVmjcHKMVQ==} + '@oxfmt/binding-freebsd-x64@0.77.0': + resolution: {integrity: sha512-N+gUflsCx3FAVkxi5sxGlL5LwO+7pv5NexHJufBqPyl3BcPv1rXpfwqhL/Vj+XfshfoxMFTBbzrbJgGVaPVkAw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] - '@oxfmt/binding-linux-arm-gnueabihf@0.76.0': - resolution: {integrity: sha512-x9qTg6zHoqeyzmFVlIjSb9WlhZdoXaayMTeQeDeUEfKA484AgPJz7f9chLjDMONA6wUUX0FJxnVHsYgX5Zv0+g==} + '@oxfmt/binding-linux-arm-gnueabihf@0.77.0': + resolution: {integrity: sha512-DXGwP8818IUZ4cxcfugg9PXqnI6fVCWIqgCgBoUKdl/QhJF4Po+lucJBrnrX/b5BNKwVMc3xSrvbI9rl8+RrBA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@oxfmt/binding-linux-arm-musleabihf@0.76.0': - resolution: {integrity: sha512-303gbamm7NDllTtkeaX+8F5Da+KcSBr64mqELQEFg9XgnjfLX3YBCHUcOfgIlVTSybesy43eoeKai8oGr0P6UA==} + '@oxfmt/binding-linux-arm-musleabihf@0.77.0': + resolution: {integrity: sha512-HUiJTgdV10PkCW41nHqVYYlW8Uc+39YBOoluZLfJE2MBPKVTNElhL+vpdSEuVaCGhGkzOGR6XyxM37gu31L1Qw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@oxfmt/binding-linux-arm64-gnu@0.76.0': - resolution: {integrity: sha512-j3UAXzCJoWX9bZLaICj6DfwkI/2fzja9RpiCIbIN+2CQAcKoY+5SH5pQUcECvn32mQm17NSPE9YqTAwYx1seZg==} + '@oxfmt/binding-linux-arm64-gnu@0.77.0': + resolution: {integrity: sha512-+w3V07y6yy8FdACnGtzgDsG/CHgA0Y/W2/bzZuPYgvBAa23Lap/nmvyNQmCiGKkSaChTPlY7QpIShGGAC7IGEQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [glibc] - '@oxfmt/binding-linux-arm64-musl@0.76.0': - resolution: {integrity: sha512-qFZqWVkEzuxWMtUkCtHxsnohXHnUMBQr/ZIxF0KmlCSt8de/bc1lbpVgpqjb3QxCADQHG/O1s3JcowcBF2sqdw==} + '@oxfmt/binding-linux-arm64-musl@0.77.0': + resolution: {integrity: sha512-FASxWQAuLW4WXFViDa77ybd3Y1lbkBx5DTtL4OGl+pL64/ymtydTFvJM0xz/0vnCirNzPUDAI6TiTBDGsFbEVg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [musl] - '@oxfmt/binding-linux-ppc64-gnu@0.76.0': - resolution: {integrity: sha512-ROiAid0UH2GN5lMMX2JTgKlOKx1rN+6a1WxIuBsU3j5A3MuB9U5XkREMW76XBbAImnH45mfOCFcSIwb+drcVYg==} + '@oxfmt/binding-linux-ppc64-gnu@0.77.0': + resolution: {integrity: sha512-WRdlgZahG35zCieq7Po7QU8mBgkFAIdEpgS5p3vVZrHt0FXTbFgzqC7xeBCceh9gpFGgr4VWblULNnU8gdw0DA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] libc: [glibc] - '@oxfmt/binding-linux-riscv64-gnu@0.76.0': - resolution: {integrity: sha512-Oyd/9ObdM2RYkZ7yzF/GyvVdbNgJcRG8BFVwnAVo3ooqzaem4E2p5eTIGB09FecQD+Q5HQEANOTEnIZTO6rBAQ==} + '@oxfmt/binding-linux-riscv64-gnu@0.77.0': + resolution: {integrity: sha512-CVzNO94x/UzQe/INVUu9qt5X1MjLEooqwc/5VcQ88eyLXiEIIsjubpPQgwEMKwfWtAA5hnpFL2GF74zSdCg07Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [riscv64] os: [linux] libc: [glibc] - '@oxfmt/binding-linux-riscv64-musl@0.76.0': - resolution: {integrity: sha512-86DOpmPDR5UzHSOB8y5HlOpYAIBtMx+6L72IyousNx54q1Kz61aykB4ScovFYivZUak+7Ww6tPBUjarluzYKLw==} + '@oxfmt/binding-linux-riscv64-musl@0.77.0': + resolution: {integrity: sha512-NrCcVheqL0kRUi9gptqjkQhxSFayotM+zycC3lSOSrsf5SroZq49u66ShyuZkHCCzKPHB0AT0pL/s+ET9R3qQQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [riscv64] os: [linux] libc: [musl] - '@oxfmt/binding-linux-s390x-gnu@0.76.0': - resolution: {integrity: sha512-u6omjjFooKfnHLBI+3UtBVInAeuEhoM/RAIw/OiFop2QQgOan5zDfqPR6guMaylt68L60kV+by07Ibp87KDjrw==} + '@oxfmt/binding-linux-s390x-gnu@0.77.0': + resolution: {integrity: sha512-LWDQ9T/Bo/kt/q223j9fYLiNTkUYyuMkk7ZrIsIAV7l19MmuKxgd/1tZ8xhoUuVIdsyET7sJrQ6X/vRG6V+bZQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] libc: [glibc] - '@oxfmt/binding-linux-x64-gnu@0.76.0': - resolution: {integrity: sha512-L0/hW1MdMrgsvuLGp9YEQOYOGj5xPHa8wVRtybdd5av03PV4qSpAq3pyfC7sn7UCA8ynRhMRTAa9Kr9nV4LGZg==} + '@oxfmt/binding-linux-x64-gnu@0.77.0': + resolution: {integrity: sha512-5JbOT3ucC/2kROUjyyOW06FjXO8trPjYb+kE7E7cLxmpGAnw0jjeU4Tjg4C8H9JR1MZ2oH4fXE1NqLNZ89ISnw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [glibc] - '@oxfmt/binding-linux-x64-musl@0.76.0': - resolution: {integrity: sha512-JNk/7HaPDJjy5kih3vq6b71Qif3tHx1ZFACGBzeHeNzyKaIpar4eFGya89GR398K2rwX0eEVmEq1npBPlEkkmg==} + '@oxfmt/binding-linux-x64-musl@0.77.0': + resolution: {integrity: sha512-/q9p495bmmKtxqWlIrNiJ15hoddgk/jPvJwMW6Nh796UgVRMTCKD7yI+AAL7/7xWlC3+2ls5l1RPywuV4lOdlw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [musl] - '@oxfmt/binding-openharmony-arm64@0.76.0': - resolution: {integrity: sha512-MDLrOQPXDuPKvPUCvpP3hC6kO72dsYxfpYiR08Nf5DiM75M0d8+D26JwT4uHDf0bcflvlGHcd58Hn2HpxkHUUQ==} + '@oxfmt/binding-openharmony-arm64@0.77.0': + resolution: {integrity: sha512-tmN3OEI38xXr48UeAkQMAX1jMHszVHv4I9lzh44DKrMlIFxEU0aBYl3Zs7PzRBuJOLR7h77m6bUlCh0E06MVXw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] - '@oxfmt/binding-win32-arm64-msvc@0.76.0': - resolution: {integrity: sha512-2CcICDrQKqMAOFuzmts/8Ov5iKb+DW/QrW4MFsl2bnRg86uoiUvtqUkHqNSY19Shegc8pBHiXMSEHDjIg94o0A==} + '@oxfmt/binding-win32-arm64-msvc@0.77.0': + resolution: {integrity: sha512-v//nJMk72xRT+/9QB9mJWEPV3/5XncMvxtYQAYbAsv5VcxLlRcbj2n2srQSERglVcTft4jI3MK30ceCoRcDTJg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] - '@oxfmt/binding-win32-ia32-msvc@0.76.0': - resolution: {integrity: sha512-NjZLJg+tQpMWVSyeWBBKCpib7H/uLq84ZzxCvY5eqHzSaItuzCECGA9MBiZwmW8fnkBIfppg49Ib//LSCGAp8Q==} + '@oxfmt/binding-win32-ia32-msvc@0.77.0': + resolution: {integrity: sha512-D3SMXWBkVogzAlzd3RfMaFuHOTdPpRDFT+jVbtXszWwck9PCK4hYoRoncjuAjWZuWzRFND3/Mk91qFvJyoJbLA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ia32] os: [win32] - '@oxfmt/binding-win32-x64-msvc@0.76.0': - resolution: {integrity: sha512-0vCMaX/qloc7uaKBDRh+62SBW8EqmhS7c8/al+PxD594ao4lyEWdcoEmVoBgnCNVW07GDpg+9uPV7x6ta9mljw==} + '@oxfmt/binding-win32-x64-msvc@0.77.0': + resolution: {integrity: sha512-2vyyODjP1Sb830rTVgfFqZoIUYF8uYdGx9S/Usih+Av6gQ9QyxXzwEGXS7poxfsxxQftZW1IbcFlhvQkeDRekQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] - '@oxlint-tsgolint/darwin-arm64@7.0.2005': - resolution: {integrity: sha512-VqDZxcZVjlonNLuuvraVNgDQt+1ndwa4yJo8OqsK4HYh/61ba9IlMStCVfi/aaIqRoDhNbAKC8gdcTrXqnb+Ug==} + '@oxlint-tsgolint/darwin-arm64@7.0.2006': + resolution: {integrity: sha512-uc0MEHXZUDW23Zmo5X28eSNeSnP17jKnh9GiehpVZqhfy99ks8spyXT5Llar3tjDN7ppnQN0Qd9FK6WNkdD+fQ==} cpu: [arm64] os: [darwin] - '@oxlint-tsgolint/darwin-x64@7.0.2005': - resolution: {integrity: sha512-4kUfLRNYoVpv0Tm3jPYrvxyfOc/LmdvFC3pKZ4tL6K7lA7K/VS81SAtmxRzbYXYSyb3SBWhwsuX+df4neqzxxA==} + '@oxlint-tsgolint/darwin-x64@7.0.2006': + resolution: {integrity: sha512-+x1/pa3S3VMC9cif8XKTOCQUuqRT+wu1Ix+FK5svXa2xbXCuE7+4S0SfmuSnK/mk9AI5+xBxZFhILxmCPUZ1hA==} cpu: [x64] os: [darwin] - '@oxlint-tsgolint/linux-arm64@7.0.2005': - resolution: {integrity: sha512-rhUNcPsBlKvhXtrbhbBUidtRBRdJ8fbEHN9H5Q5N59gby18ruGuDA7KUxl7oRnUzp797uykYQhkBDm+0KpfK/Q==} + '@oxlint-tsgolint/linux-arm64@7.0.2006': + resolution: {integrity: sha512-90v7HX8m54kHXn5DpjNEN18Fb7xwJMREe/wji3USyAf9pTMv7a3qZ3cPoLViIcIzxPLmkcYZIs1j1H3Z2gbVLA==} cpu: [arm64] os: [linux] - '@oxlint-tsgolint/linux-x64@7.0.2005': - resolution: {integrity: sha512-tKs9yinDQZOHygM0e8EJnjTU3mzJtdfkOZP6Udu82iLMePUSHOhTJ9zzU/mSd1hQxURI4LTRRiFhfzC+PzwdNA==} + '@oxlint-tsgolint/linux-x64@7.0.2006': + resolution: {integrity: sha512-/k0wsEqHiA5dWBJYuld3Vecv6bIhKCasxpho/aFkvh870Qox33MuTkKUGWIVm/njAxw7W4pu1a/Xfa3jwuKuPQ==} cpu: [x64] os: [linux] - '@oxlint-tsgolint/win32-arm64@7.0.2005': - resolution: {integrity: sha512-VYPnu1gjfbSv+ROhuyNfMs382D4zQU2ZRc8Uc3nuEZo1k2kf+1KfTrg4hrlWh73h9GI+dUWyo+DYCQzUBlPwcQ==} + '@oxlint-tsgolint/win32-arm64@7.0.2006': + resolution: {integrity: sha512-CQT5sqcLZLNZSWLzUUEjQmp74UX8h1agp3ZJ8pfRktHbx6gfBa8a7CjrnRrZ9VXlwnXVkpw7m5KBO6y+S5MQRA==} cpu: [arm64] os: [win32] - '@oxlint-tsgolint/win32-x64@7.0.2005': - resolution: {integrity: sha512-ekU89cTGy9fpQzuvxIsFHrnoP8XoFjGIRgPEW6eqgY2NYjGy9pwpjF79o04WXRMJFKRrcaVqkZXUUBdLsqpQDw==} + '@oxlint-tsgolint/win32-x64@7.0.2006': + resolution: {integrity: sha512-VZsGowXcp3vQNkjoGeVCOTf4aGrRpRk6bBJWhefnJVPr6z+dX+LKqqHfwaqnFvg66Q2iJpXqklRW38YO21ee+Q==} cpu: [x64] os: [win32] - '@oxlint/binding-android-arm-eabi@1.91.0': - resolution: {integrity: sha512-eOqJUUS1MCqIoUUxMIkuwaqIdKaHr1SXYA0CQI95UUrF8jwQylQH33bBmnqhZfvWXKlRB2Ylx/+Sbk/ctEqzZQ==} + '@oxlint/binding-android-arm-eabi@1.92.0': + resolution: {integrity: sha512-k3Sd4ixQfiOrybv1gT+AMI81HSdtAFsiCFx+xXxWdFkmKW2HNrSiOfwn20o5nl/ggwbzU1oNLDeU/fRPinTVZQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [android] - '@oxlint/binding-android-arm64@1.91.0': - resolution: {integrity: sha512-vIJU4lRxK0EhbBt+iR3rkq3pio4I+V5Gshwjei3plNjN+CIq0WxWHzYVI06J9KN8Ar3hyNSFtzJAjVRLZOYpjg==} + '@oxlint/binding-android-arm64@1.92.0': + resolution: {integrity: sha512-OZzgEuiTSG11QkBWdXEguiLOT6lL09KtfcC/BmvUQWBAjU5eVyBxIAsmWAXv8L85/eT6RE0GBEWTEFBAbYE74g==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] - '@oxlint/binding-darwin-arm64@1.91.0': - resolution: {integrity: sha512-tLy76MurwAOpQt5QVMkJUgexBSWhB7qdvAYb14bc0xntZS6f55aKicbZoxZ/QlmAbnrdlXeD5+IjwY8EZ9RWTg==} + '@oxlint/binding-darwin-arm64@1.92.0': + resolution: {integrity: sha512-We6XS7tIqxgUoany6uyGjj7mNsh/mwf4Gt9gUzhxG65NKo2Ow9s6tDfrVuI0FVg8n3YmpW5PBx80qFxiLwAfsA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] - '@oxlint/binding-darwin-x64@1.91.0': - resolution: {integrity: sha512-zPeMmjAqm5vXxbTp/JqYuc9gGSbUuEaeCAkFHB4TCRLTlfJGD//Fkx03YvZHCHZJ7ideLiiLcae+3f2I27qnaA==} + '@oxlint/binding-darwin-x64@1.92.0': + resolution: {integrity: sha512-jKJWijmi6AxAZcXXWA6R/NLVZHxoRTbIMnV8znsHzeiVfuEefYcyR8SJGfbBPmkG+kveLFRcBGw0fBrjLqtGmQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] - '@oxlint/binding-freebsd-x64@1.91.0': - resolution: {integrity: sha512-psOR9+xGMXn0hj4KY5M2kjSQ1n0TCMdYbPOraoV0iQyl7mw2oBBYGUM2+ma40m1YLVrktTBOta4FjrmcOHDhrg==} + '@oxlint/binding-freebsd-x64@1.92.0': + resolution: {integrity: sha512-wkw01wvJPM8/4jh+MV3cp11859VuBc94N2q5uOzcBgdGIRAqMCg1O0W/+xsZ1fsInvuUcv2Xo4nd1nzcKhi9kg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] - '@oxlint/binding-linux-arm-gnueabihf@1.91.0': - resolution: {integrity: sha512-1PNA1j4ETxawvxfz6ueDxWgQgWkXPbv44DWZmC7LR07GqojGFDOwWbosOT6/AYiJr7zMXEhn2dPWMkyFFOFpUQ==} + '@oxlint/binding-linux-arm-gnueabihf@1.92.0': + resolution: {integrity: sha512-Elm6nW308MzmR8knvk0tPqQ4XE+PGKztjXv7kVZTRLkhBQZRXHUQoBLc4E30fiIuF6gkZO5f3EpJtQc4Ok/fXw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@oxlint/binding-linux-arm-musleabihf@1.91.0': - resolution: {integrity: sha512-jcNePVpca37lTbHmiPMnVbPAAW0rH9kAoDjsDv6vESEX9pzazIR1q5SyYuc1rQzdjHtc2VVCDN9jDh6tHcOHyA==} + '@oxlint/binding-linux-arm-musleabihf@1.92.0': + resolution: {integrity: sha512-oylpBAoeogddjhTlSPsXrzGq/aeJsvaULz/hYXvWtGn/Wt8LPLC7gFhucCicbRnzEKsShrZxIA0KyHmtFNnijQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@oxlint/binding-linux-arm64-gnu@1.91.0': - resolution: {integrity: sha512-TJi78UX6R+9qZ23ZKtzN6adfW83bjY0NXsCRMBRH6H7IizaMXmZbdRAtjedMkx77bT46YQH0csawsY9lwha8MA==} + '@oxlint/binding-linux-arm64-gnu@1.92.0': + resolution: {integrity: sha512-/EWOI0wwY+74UGvC93TldpoNP8moIcidVUPbUSoX16/SEdF7ah209yxSQia4+9JdCRWYA3+yQMofXMgWKk/16Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [glibc] - '@oxlint/binding-linux-arm64-musl@1.91.0': - resolution: {integrity: sha512-OowlLroUTzKq5OBvbu6iegch8SJ2DivXFCukzPWURwvcJhMj7/P0CUGH5qrDlxT1Kh48dcxqYqrvE8qK6xTLKQ==} + '@oxlint/binding-linux-arm64-musl@1.92.0': + resolution: {integrity: sha512-9Se7Zuazr104yc2PaluriJW2rqvtaN6FSi9MSjQgZGeYb6LKvEcJ586tpjek0l7hNQNoir8MID7OENPH6juN1w==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [musl] - '@oxlint/binding-linux-ppc64-gnu@1.91.0': - resolution: {integrity: sha512-QF/5Ge8yGpWg5s4awMNHfVKh1WOmk591Qg082i6CHenXYBa+W1E5RwWZXaKUOw4Ko7CCjqg3TfBc0AzhnqblYg==} + '@oxlint/binding-linux-ppc64-gnu@1.92.0': + resolution: {integrity: sha512-88IAchs204I/xxAbAo3NRyz1m/29tn8jUAPvc4tK4FzrT2PLwZertd93ANF6231vwbAhYiD5gl0cX8Po5xsjWQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] libc: [glibc] - '@oxlint/binding-linux-riscv64-gnu@1.91.0': - resolution: {integrity: sha512-dXlsKlNhzJQX1nageGKnvWe1D7uTng249hQM80CG/YPZ8F/VZHbxVLhImgurdWBOmu86XOemValLjrW6QIOM/Q==} + '@oxlint/binding-linux-riscv64-gnu@1.92.0': + resolution: {integrity: sha512-KtFdVdkfvBGcsrmnbjYJ9/XTDABnaniiwnptAcAm0pkaR2zhZ3sr/Xy+N1Xbz1Yq5Jegu7SoeNv9caTP0b5OTA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [riscv64] os: [linux] libc: [glibc] - '@oxlint/binding-linux-riscv64-musl@1.91.0': - resolution: {integrity: sha512-tznkj5VrWNRUfymkaLcJetgMLbP9suL5ob/m7j0Fdbnm5u3Li/Ezo/YcBixiuwdL1sg0oGpyTe86It0J6T+Lxg==} + '@oxlint/binding-linux-riscv64-musl@1.92.0': + resolution: {integrity: sha512-V43CO5FPgHtwHup4H5+dIdwzZX2FhREQGsSBZx8V1UyFEAul0Q13qviKqZfSMM6G41CGtCekVpJGGOxW5v1y8Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [riscv64] os: [linux] libc: [musl] - '@oxlint/binding-linux-s390x-gnu@1.91.0': - resolution: {integrity: sha512-sNvfLiUYQkVsLNUgIW24AEYTHSd2zZ1vAxXssPdjuQHTtCpRvQihYri6d5z5FY7w/QrcnB5+g9E+/sqmZq8tfA==} + '@oxlint/binding-linux-s390x-gnu@1.92.0': + resolution: {integrity: sha512-WooxeACzGH5q34olo7JgAk7XbVkTUNfwhR/TzmhwVs/y1p2R7ZWJo14hiyxiGcoYZR1iBnbBFHectADqb/KSog==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] libc: [glibc] - '@oxlint/binding-linux-x64-gnu@1.91.0': - resolution: {integrity: sha512-eA25ETvimhUZ89y5BcunNY7yv7qwG2I7V7dFQAU+mIEqZ57gBCXdIERl0yXOEt43zjsw0yK2gRKTc+twF706wQ==} + '@oxlint/binding-linux-x64-gnu@1.92.0': + resolution: {integrity: sha512-lW2pLF1oFvNN780YUCtDyoUm8oFzZGJNcOFe9RtLMX5v5+FcWfAQvHUMMPF8H8kJB0HAi3dFmWDWLa5VPuY9mw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [glibc] - '@oxlint/binding-linux-x64-musl@1.91.0': - resolution: {integrity: sha512-4hZ4Z9K+OkcTpAHDoUTMg/8MModbM0aocrl9KnGzp9h5iKqjrXraEUZorYoVCT7xoK93CAHXgTndxRBrOjH/fA==} + '@oxlint/binding-linux-x64-musl@1.92.0': + resolution: {integrity: sha512-2BJAAB/eqPn7iD7mFVfs+1ZVUogAYOMCTaUgjAvbtNGg2ppCDE7gcv/9VSO6GCDybdFUqlcyeyjn9hRpl1ZHog==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [musl] - '@oxlint/binding-openharmony-arm64@1.91.0': - resolution: {integrity: sha512-gtqn4b0kLpGe46Qh7NHiR86wZpd+TLaesO106s7V3RG33r63VB94LW5qPKEDJX64osh3xfjnPFn1M0484bC7wQ==} + '@oxlint/binding-openharmony-arm64@1.92.0': + resolution: {integrity: sha512-iLtjNqqa/2IV5qu/3rrkpVd42Ia3yeCn4fSZoEr+m5FoGHtZvAV6J6YuU3lewg5Rg5ORGvwhdgN+7gNzwkl7tA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] - '@oxlint/binding-win32-arm64-msvc@1.91.0': - resolution: {integrity: sha512-KQItBdsyHN28U3z/bEek6h9pvG3Uqv564QYO8K1bE/V7YRZgpHlRnfNKVPHkk4sfYKyPzEjCgW80QkImOLvJog==} + '@oxlint/binding-win32-arm64-msvc@1.92.0': + resolution: {integrity: sha512-ryxiR3ZqB0OJzydMu+bVC3R7ZtoU7X1rI8sEgTBCCvQvgVwoCwqSFlfmhgiZ+9wZ4IdTsFeu9tdiF9KtRCbSHQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] - '@oxlint/binding-win32-ia32-msvc@1.91.0': - resolution: {integrity: sha512-XFKqbbsQVmTgw+CyBKuzSZtAa45viom1naFfulKmkTFdDyDaBQaBqEz5J61TI8iwBynU+F8q7qPD+9mplZRhEg==} + '@oxlint/binding-win32-ia32-msvc@1.92.0': + resolution: {integrity: sha512-DaE9OChj4nsdEST32BP7saGu8WtjOinTy/eS88dZ0TvTfDV26ebRDhsI1rL9OKXfO+DgehzhAQMqdPr2jgfcFw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ia32] os: [win32] - '@oxlint/binding-win32-x64-msvc@1.91.0': - resolution: {integrity: sha512-DmpK0PthG66Bcz5Y4JqNbzXltzyLQtg3ofYpd25+ejm7kQYUM78VL1uIP/ZFct2781mwUyBX37LatFPCTVp35A==} + '@oxlint/binding-win32-x64-msvc@1.92.0': + resolution: {integrity: sha512-0AyhqX0ciFuEnHIL+B4PIMMX3s/IpGHNEbbUqwsNhSrzWUSlEOPw/q7qFnRsEJfiKedcqVfUE/aXYuSMtpiFyw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] @@ -4430,36 +4452,72 @@ packages: cpu: [arm] os: [android] + '@rolldown/binding-android-arm-eabi@1.3.0': + resolution: {integrity: sha512-zjq+pUSE36RJG9nJXqrRfMCOxekzVhlaYMtFELHaOcRH4UqTnkWhbTbEixKEawsb0ZTVMRbn8RLYcuU4DYk8qg==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [android] + '@rolldown/binding-android-arm64@1.2.15': resolution: {integrity: sha512-xD7DdZCrbThKuxNg7ooQmvp07ys4J/pnSEMTG3/OdOWl6daC67m/Q4fL78sRHMxTH/N4fGUbYhcPM0MF5WFHkg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] + '@rolldown/binding-android-arm64@1.3.0': + resolution: {integrity: sha512-HdnCiSmMGgEILGVLU1o4dcOblLGj8sMnqEFrDY/S7KRti1nTQHAqGGs2AniPspbK90AFS3pM23K/R0J3hPQXYQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [android] + '@rolldown/binding-darwin-arm64@1.2.15': resolution: {integrity: sha512-m2WuQ6r0B4OTYxyPpNLtXaMRbRDUbG8YQV2Q3KTdSSK8Th6KHCnC8jVCJt8bvYeSB5WivkkNbc85mKadaSdOxA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] + '@rolldown/binding-darwin-arm64@1.3.0': + resolution: {integrity: sha512-TkQ2JGC8/9UxoCeH5dSJj1gxuFhzw200QTJJd2YNPRXznSSM4XvpKV2Cs+RM2BcM8sa6xa4rmXNuiJ64+1993g==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [darwin] + '@rolldown/binding-darwin-x64@1.2.15': resolution: {integrity: sha512-5RtnsHM36nodM9WbMy+zip0LGS/G+y5wro5RHrpOlr4ac24+1zSi9kiV2MP1myZeZ/ifEHfulQcWjnAXzc2C2A==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] + '@rolldown/binding-darwin-x64@1.3.0': + resolution: {integrity: sha512-Gr+iZW50RJZo4BPUazaDh/Azx7W0Rl04sy2MkXD+H4RkxzUX5hIrjaVw1BK+XHsccKExQAmCy6DhvRLlUzaYUg==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [darwin] + '@rolldown/binding-freebsd-x64@1.2.15': resolution: {integrity: sha512-g3l09pyFqhu+135JKkbkwiKGQmwU5hUMUPJ4VdBADvuqR8d33L6H578rh8m7rtxbdp+VmX/+nzI7nvhSZlzpUQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] + '@rolldown/binding-freebsd-x64@1.3.0': + resolution: {integrity: sha512-RwAtx8peSqUoBf8pxE0L62xKXBNnA3BtdFV+07t13t0TQoASCtV9tnU67aKKMRZSiD06SU07chB5B8fWFdW3gQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [freebsd] + '@rolldown/binding-linux-arm-gnueabihf@1.2.15': resolution: {integrity: sha512-nIe3VugI97nGQtspPxDqA4sXMUpeiocKIP/CqpY/u/vgbT+alX+cVxu1C/oVBPKg4feNTmYovE91v4DgXvXNwQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] + '@rolldown/binding-linux-arm-gnueabihf@1.3.0': + resolution: {integrity: sha512-ow8fq6kYaIx75D0EVT5GeF4DcawcEYYXJ2CvEaOzyygW1jtVDQU/9o5YYidctHBRDUgPzGaTNB6n/VMTmd1ymw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [linux] + '@rolldown/binding-linux-arm64-gnu@1.2.15': resolution: {integrity: sha512-iTBjXx+B5QSvgI89lJfmqh4wTh8NabR1YZIIN3hNx4zSG0EVfVqkOvLulNpG4251pbd6/IAmZ/LefVk1Y4rPhw==} engines: {node: ^20.19.0 || >=22.12.0} @@ -4467,6 +4525,13 @@ packages: os: [linux] libc: [glibc] + '@rolldown/binding-linux-arm64-gnu@1.3.0': + resolution: {integrity: sha512-PLOWuiz+rdqSgiLgN7bxvy6DjXLj8gnJxzRS243LNnLi96VeyB7VFsC3eblcKv3Xwd3jQqJfbCWRhLijTIZyvQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [linux] + libc: [glibc] + '@rolldown/binding-linux-arm64-musl@1.2.15': resolution: {integrity: sha512-uN26XOnVR7rqQupG3V9oAG2EGGatWjcJHOeDOHUFCh4TBWmP2tHTFoVN13aYbwfm0aHqJAEmcwhAu6sooIjfqQ==} engines: {node: ^20.19.0 || >=22.12.0} @@ -4474,6 +4539,13 @@ packages: os: [linux] libc: [musl] + '@rolldown/binding-linux-arm64-musl@1.3.0': + resolution: {integrity: sha512-CQ/k85cc342j5SnZ/gT9p132NXZRGTgLRhfItdYqUg+jpvL5HYFve0GB+zQDCYGwDjtDWIoqKSOitkmZMZc/tw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [linux] + libc: [musl] + '@rolldown/binding-linux-ppc64-gnu@1.2.15': resolution: {integrity: sha512-9nWkcdd+H+XhaA3fQIwpHnKIrfx/PQ6rO0pivr78Og07tXlUlctBBJoEYLPfhTmCR/QxEVdn6uPjHV5SymPhdw==} engines: {node: ^20.19.0 || >=22.12.0} @@ -4481,6 +4553,13 @@ packages: os: [linux] libc: [glibc] + '@rolldown/binding-linux-ppc64-gnu@1.3.0': + resolution: {integrity: sha512-wk+ZG7xDP2px3cQRFoNoNp52/w1O5hTTtciHxuastreMOp8isYUTCpcG/rEYnSQBI+nycN+B9d9pBGua+qvV7w==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [ppc64] + os: [linux] + libc: [glibc] + '@rolldown/binding-linux-s390x-gnu@1.2.15': resolution: {integrity: sha512-Ggh0ciFjLwIusLSLz7LZYEaGdxOAUJXI+Qu5JCbhPJJHEt8vP+IjRATTJheiJsdzzTYgUiHUiw3X1Ea3ZpMBdA==} engines: {node: ^20.19.0 || >=22.12.0} @@ -4488,6 +4567,13 @@ packages: os: [linux] libc: [glibc] + '@rolldown/binding-linux-s390x-gnu@1.3.0': + resolution: {integrity: sha512-sEgyZt72Rj7V5q6OZ7A4U2I5v4EMGEv3Fp5QmoncmKbUMTrGmpyH7MwENfERGbfUYjxdBmktw4JJLys5I1aQNQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [s390x] + os: [linux] + libc: [glibc] + '@rolldown/binding-linux-x64-gnu@1.2.15': resolution: {integrity: sha512-FHg60rS6DBePAYZ9X9F67x+JObFdmgn6tupA1C/a3B+CufFmTD4mX+e8M75tCiAO3foR/6xwVBI0KQiI7sn/rw==} engines: {node: ^20.19.0 || >=22.12.0} @@ -4495,6 +4581,13 @@ packages: os: [linux] libc: [glibc] + '@rolldown/binding-linux-x64-gnu@1.3.0': + resolution: {integrity: sha512-PvL0BoBUwVugK1pFd+zyVk1L9F6ucmQ7oF2dpy8zKPHNlbW2zrU9Jst3fWYfG7z3owjxqhwAvi5G4o0AikrJMw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [linux] + libc: [glibc] + '@rolldown/binding-linux-x64-musl@1.2.15': resolution: {integrity: sha512-/cvV/7v5VGz/moiz0XKRj2dE8DzsKyhIu1KpOvJGPjRywg3yscON889UGvAe8zfiJLHup7VLjBduoGWi3HusWQ==} engines: {node: ^20.19.0 || >=22.12.0} @@ -4502,24 +4595,54 @@ packages: os: [linux] libc: [musl] + '@rolldown/binding-linux-x64-musl@1.3.0': + resolution: {integrity: sha512-5N4DdzAmLtnyuh027H6ViC99BeoA4T0RwKS6qUrl6zY70AKRsNDrnEZeWnqrKmDRFxXmv8zf9yhF2DxN/SfyGQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [linux] + libc: [musl] + '@rolldown/binding-openharmony-arm64@1.2.15': resolution: {integrity: sha512-MyzC5Hrv/sm+Z7TSGKP/j8001RO2xQm1zOpCNVL4j0cY/VhBZviludA2YFQ7i4lH6ZAXxQm0lcMdBzM+99mE7w==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] + '@rolldown/binding-openharmony-arm64@1.3.0': + resolution: {integrity: sha512-Tz+2b+yF5eVRGX3DWebn2JIvZkNYI1gkafI+nF2fau2zeQDOpBAS8w1PxHi4ke//NIOE6+2DNYyq1veIjzAXqQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [openharmony] + + '@rolldown/binding-wasm32-wasi@1.3.0': + resolution: {integrity: sha512-ntK6OFor3nQtS1TenZP5wX59oPpkKEmour3AipGHB32u+Z8QXxjVdG+7vNSvgerRWIj6vjg4XpKu42slb0vlXQ==} + engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0} + cpu: [wasm32] + '@rolldown/binding-win32-arm64-msvc@1.2.15': resolution: {integrity: sha512-+PgYiS+AH5omy6L45ZLxybasauJaj3M8buoT83D+nzPmCayXlxUV9hydhciCKVyIg0B/v0BtXPDE1uGqNwCPpg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] + '@rolldown/binding-win32-arm64-msvc@1.3.0': + resolution: {integrity: sha512-ldH38lBlOpS+b4fbSG9euQjhYXLE18PIz5hyvf6gvFfyVLodRE/Tsu4jV8UmPqjjce6lotmUUwscxPuer4lczQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [win32] + '@rolldown/binding-win32-x64-msvc@1.2.15': resolution: {integrity: sha512-HFZd2QNQYn1JbIi+Hpd7H+r/lkWxcfIu28nirZ6eCn2LafuvmExMlb/P96Sfx5tf7pPArw39IdhmCF8vmV+NhQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] + '@rolldown/binding-win32-x64-msvc@1.3.0': + resolution: {integrity: sha512-HglhUzUPuXNTGFt5ZwJalSEvavhFSl+nxpQM9urkzkt+2oGI1ZSwgyytk9aGw15/0kk1TCHPc57nv3DdiG8/yQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [win32] + '@rolldown/pluginutils@1.0.1': resolution: {integrity: sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==} @@ -6436,6 +6559,36 @@ packages: '@xtuc/long@4.2.2': resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==} + '@yuku-toolchain/darwin-arm64@0.27.0': + resolution: {integrity: sha512-A3v83rNyHWlnJeeMBsWggZ+RZDP2BEMHIiMk+j23LqtVch24MXwg8veflkQgZ2GtCtZOxcG+NkztnsSUS4rWEQ==} + cpu: [arm64] + os: [darwin] + + '@yuku-toolchain/darwin-x64@0.27.0': + resolution: {integrity: sha512-u+fcqQw0uRj5irtO5f0xu5nGazYRxfBVBNIuhiONWX6Mh2izRONSNXhCwFDaYRqHunublzw2l2aQMB0n5n1t0Q==} + cpu: [x64] + os: [darwin] + + '@yuku-toolchain/linux-arm64@0.27.0': + resolution: {integrity: sha512-IPB+9LSC/sf8Sa8DtqapUgU4uTL/U94Vr5mgUsfRx59u8/4BT38cze+e5b96AlQynsdtuF4tgC0FW0TmJ2B75g==} + cpu: [arm64] + os: [linux] + + '@yuku-toolchain/linux-x64@0.27.0': + resolution: {integrity: sha512-fe1kN04JPBODrkRZOuI06jIqKyzcyn0ykx+tpiERDwqAh9ALWOtkgfhFjVaOQSu+guhakzY/89xjQdmfY7EJ7w==} + cpu: [x64] + os: [linux] + + '@yuku-toolchain/win32-arm64@0.27.0': + resolution: {integrity: sha512-NZmiFTF7ee45Fhnsa0BGMCpElJGg8iGYt4N3UoKj/n1vNmACcgY6NI4najNr9Jc1ulIVVvtPbo934RMlZQakrA==} + cpu: [arm64] + os: [win32] + + '@yuku-toolchain/win32-x64@0.27.0': + resolution: {integrity: sha512-7LSviI8HtHga0g7G2oT7C/SP2IoLmrg8LYPeWZkp4ljFtaWKJoTRF0Iv0cVt0dR4rehoN/+TjN4r8SoArCKvlg==} + cpu: [x64] + os: [win32] + abbrev@3.0.1: resolution: {integrity: sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==} engines: {node: ^18.17.0 || >=20.5.0} @@ -6865,6 +7018,10 @@ packages: resolution: {integrity: sha512-tixWYgm5ZoOD+3g6UTea91eow5z6AAHaho3g0V9CNSNb45gM8SmflpAc+GRd1InC4AqN/07Unrgp56Y94N9hJQ==} engines: {node: '>=20.19.0'} + cac@7.1.0: + resolution: {integrity: sha512-LMDU/U2yA4IPIY8KT0NsNPWEYZvAMkbgyspxJ6btJaYV+WMDOHAZCmB0lsTObiHaRS1V/ztKAl7+TSkTqXyeoA==} + engines: {node: '>=20.19.0'} + call-bind-apply-helpers@1.0.2: resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==} engines: {node: '>= 0.4'} @@ -7576,6 +7733,15 @@ packages: resolution: {integrity: sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==} engines: {node: '>=4'} + dts-resolver@3.0.0: + resolution: {integrity: sha512-1T1f+z+4tl9XD+m+0HBgWoL/nm0bOIffyWaUuUSBlFg/86IWvfx+wjNaO/ybU0AJzG9/Mi5hBUgGV6zCmWEN7Q==} + engines: {node: ^22.18.0 || >=24.0.0} + peerDependencies: + oxc-resolver: '>=11.0.0' + peerDependenciesMeta: + oxc-resolver: + optional: true + dunder-proto@1.0.1: resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==} engines: {node: '>= 0.4'} @@ -7620,6 +7786,10 @@ packages: emojilib@2.4.0: resolution: {integrity: sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==} + empathic@2.1.0: + resolution: {integrity: sha512-AnfC1ATldl49/cvZdLPDjBfrRNwbDO05aibiOtzQu3qtlbJtomNLhF30HEtn/7iBz50dlMECqATo3fG0LrdEgw==} + engines: {node: '>=14'} + encodeurl@2.0.0: resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==} engines: {node: '>= 0.8'} @@ -8303,6 +8473,9 @@ packages: hookable@6.1.1: resolution: {integrity: sha512-U9LYDy1CwhMCnprUfeAZWZGByVbhd54hwepegYTK7Pi5NvqEj63ifz5z+xukznehT7i6NIZRu89Ay1AZmRsLEQ==} + hookable@6.1.2: + resolution: {integrity: sha512-+abwxtiEA52GCVIsQqut3S/uKTbUwYIp4Pe/vv+6py5XiXBCqMZHg6pA6Y5qhgLSEys0/cYuPbO0z1QFj5ZCmg==} + html-encoding-sniffer@6.0.0: resolution: {integrity: sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg==} engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0} @@ -8372,6 +8545,10 @@ packages: import-meta-resolve@4.2.0: resolution: {integrity: sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==} + import-without-cache@0.4.1: + resolution: {integrity: sha512-vXoV9PjKHEednCUu01e98TkImxy67e3BJXbTIOmIq4Hyzw3IAwYRcuPkfeTzJzwyyts4kjuA73x+pWJLc4f86A==} + engines: {node: ^22.18.0 || >=24.0.0} + inherits@2.0.3: resolution: {integrity: sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==} @@ -9614,8 +9791,8 @@ packages: rolldown: optional: true - oxfmt@0.76.0: - resolution: {integrity: sha512-Yo9RIn9lRWTm/U8obHbXUWc39lCpEFXlEggFoPx01zS18OCFi7mAwMmL05+p1AunuJgSkONffWyBHJzpMMCRuQ==} + oxfmt@0.77.0: + resolution: {integrity: sha512-3bPDJwLZf4i6dOaQS+6GOI/YUFTHNif7qw4nknbZyzdB0uws57tD8jA/GLGC9J7kjyf6d/eVWm73b43VeMUqGw==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: @@ -9630,12 +9807,12 @@ packages: vite-plus: optional: true - oxlint-tsgolint@7.0.2005: - resolution: {integrity: sha512-6ccPGu4u4J9bwYPHXBFPee3RZrX3BboRdU7k14zRDDB1lvN3O7J/vPRFdaEfa1+CWx4xnQQOp4ctoaF66oO0uw==} + oxlint-tsgolint@7.0.2006: + resolution: {integrity: sha512-5B3UtH71kycPHUC1kFEIffivEAs49SUmkJuHZOZnTY0NPj4legp0bcsCQucuLVNCoJzDucS68P2C4WIhP+LypQ==} hasBin: true - oxlint@1.91.0: - resolution: {integrity: sha512-vjy/cBZcEFcYh3dbxUoQK+bjc+QaY3ZWo86aJkZ5YAwp/HyiqP7dTdNgbvcIVJafhAH5sZbTqBp4sZcicEZngA==} + oxlint@1.92.0: + resolution: {integrity: sha512-y9iRiRwVjVFqzKNXZJ9bT/GYRdf+F9Gy+a1Yju2Aq3xqqa4FJYXHI8VrxlpzxKDvkYRohvJX42m/eH+qkQPOFw==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: @@ -10377,11 +10554,38 @@ packages: robust-predicates@3.0.3: resolution: {integrity: sha512-NS3levdsRIUOmiJ8FZWCP7LG3QpJyrs/TE0Zpf1yvZu8cAJJ6QMW92H1c7kWpdIHo8RvmLxN/o2JXTKHp74lUA==} + rolldown-plugin-dts@0.30.0: + resolution: {integrity: sha512-5FNezfYv5alHvrYw5Xoj4RNqbZ9F+/1jETFSohhYfRiama8tUN4mcVURmBqbZQba45t5hRdW7aSOnV6WYIj0MA==} + engines: {node: ^22.18.0 || ^24.11.0 || >=26.0.0} + peerDependencies: + '@volar/typescript': ~2.4.0 + '@vue/language-core': ~3.2.0 || ~3.3.0 + rolldown: ^1.2.0 + tsrs: '*' + typescript: ^5.0.0 || ^6.0.0 || ~7.0.0 || ~7.1.0-0 + vue-tsc: ~3.2.0 || ~3.3.0 + peerDependenciesMeta: + '@volar/typescript': + optional: true + '@vue/language-core': + optional: true + tsrs: + optional: true + typescript: + optional: true + vue-tsc: + optional: true + rolldown@1.2.15: resolution: {integrity: sha512-6odND+fel5zVw3I4Yc2e69gvguDnX0CAAGiNDZSq4ik5WUcaLrkD2GLuog0XcODbor31hZ5ayEMgVDno+KPV5g==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true + rolldown@1.3.0: + resolution: {integrity: sha512-7j1jdVlzWzbRat9EDMsB/QmyMcc6hOO0vbcma8LGjBTmKlpS5Hem+5fpntc/HoRV5tLrG+Qo6I1ZHV/ZuL5S8g==} + engines: {node: ^20.19.0 || >=22.12.0} + hasBin: true + rollup@4.63.0: resolution: {integrity: sha512-T5vnZ2y4QqC3/4P+w2+JO+Q/OVdnPsv4XcSYJYMEn0R9/jjl5AgLwO9LAZMzP2lN71O6pypn91rB7lDstUkfrQ==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -11122,6 +11326,40 @@ packages: resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==} engines: {node: '>=6'} + tsdown@0.23.7: + resolution: {integrity: sha512-w9nmWyEimfqQ7/HpVeKTldAeBvWGXiaWyNP7xaxSrr0GhKxsngEyTWqk1nOruRqvqRSkdpMMkpV2BcoWfLB4Uw==} + engines: {node: ^22.18.0 || ^24.11.0 || >=26.0.0} + hasBin: true + peerDependencies: + '@arethetypeswrong/core': ^0.18.1 + '@tsdown/css': 0.23.7 + '@tsdown/exe': 0.23.7 + '@vitejs/devtools': '*' + publint: ^0.3.8 + tsx: '*' + typescript: ^5.0.0 || ^6.0.0 || ^7.0.0 + unplugin-unused: '>=0.5.0' + unrun: '*' + peerDependenciesMeta: + '@arethetypeswrong/core': + optional: true + '@tsdown/css': + optional: true + '@tsdown/exe': + optional: true + '@vitejs/devtools': + optional: true + publint: + optional: true + tsx: + optional: true + typescript: + optional: true + unplugin-unused: + optional: true + unrun: + optional: true + tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} @@ -11960,6 +12198,15 @@ packages: youch@4.1.0-beta.10: resolution: {integrity: sha512-rLfVLB4FgQneDr0dv1oddCVZmKjcJ6yX6mS4pU82Mq/Dt9a3cLZQ62pDBL4AUO+uVrCvtWz3ZFUL2HFAFJ/BXQ==} + yuku@0.27.0: + resolution: {integrity: sha512-YmSD4xYlESRi8egxzC4guegQdMhAcz1G9NUsMNrTABAIV9dQxoBzDC7ZyAG/dSG18o1Oxt4xDok2irvPy9FSJQ==} + engines: {node: '>=16.4.0'} + peerDependencies: + '@yuku-toolchain/wasm': 0.27.0 + peerDependenciesMeta: + '@yuku-toolchain/wasm': + optional: true + zenscroll@4.0.2: resolution: {integrity: sha512-jEA1znR7b4C/NnaycInCU6h/d15ZzCd1jmsruqOKnZP6WXQSMH3W2GL+OXbkruslU4h+Tzuos0HdswzRUk/Vgg==} @@ -12850,6 +13097,12 @@ snapshots: tslib: 2.8.1 optional: true + '@emnapi/core@2.0.0-beta.2': + dependencies: + '@emnapi/wasi-threads': 2.2.0 + tslib: 2.8.1 + optional: true + '@emnapi/runtime@1.11.1': dependencies: tslib: 2.8.1 @@ -12865,6 +13118,11 @@ snapshots: tslib: 2.8.1 optional: true + '@emnapi/runtime@2.0.0-beta.2': + dependencies: + tslib: 2.8.1 + optional: true + '@emnapi/wasi-threads@1.2.2': dependencies: tslib: 2.8.1 @@ -12875,6 +13133,11 @@ snapshots: tslib: 2.8.1 optional: true + '@emnapi/wasi-threads@2.2.0': + dependencies: + tslib: 2.8.1 + optional: true + '@esbuild/aix-ppc64@0.28.2': optional: true @@ -13558,6 +13821,13 @@ snapshots: '@tybys/wasm-util': 0.10.3 optional: true + '@napi-rs/wasm-runtime@1.2.6(@emnapi/core@2.0.0-beta.2)(@emnapi/runtime@2.0.0-beta.2)': + dependencies: + '@emnapi/core': 2.0.0-beta.2 + '@emnapi/runtime': 2.0.0-beta.2 + '@tybys/wasm-util': 0.10.3 + optional: true + '@nestjs/cli@12.0.11(@swc/core@1.16.21(@swc/helpers@0.5.23))(@types/node@26.6.6)(fork-ts-checker-webpack-plugin@9.1.0(typescript@6.0.3)(webpack@5.106.2(@swc/core@1.16.21(@swc/helpers@0.5.23))(cssnano@7.1.9(postcss@8.5.32))(csso@5.0.5)(esbuild@0.28.2)(lightningcss@1.33.0)(postcss@8.5.32)))(prettier@3.9.6)(ts-loader@9.6.2(typescript@6.0.3)(webpack@5.106.2(@swc/core@1.16.21(@swc/helpers@0.5.23))(cssnano@7.1.9(postcss@8.5.32))(csso@5.0.5)(esbuild@0.28.2)(lightningcss@1.33.0)(postcss@8.5.32)))(tsconfig-paths-webpack-plugin@4.2.0)(webpack-node-externals@3.0.0)(webpack@5.106.2(@swc/core@1.16.21(@swc/helpers@0.5.23))(cssnano@7.1.9(postcss@8.5.32))(csso@5.0.5)(esbuild@0.28.2)(lightningcss@1.33.0)(postcss@8.5.32))': dependencies: '@angular-devkit/core': 22.2.3(chokidar@5.0.0) @@ -14500,10 +14770,12 @@ snapshots: '@oslojs/encoding@1.1.0': {} - '@oxc-project/runtime@0.155.0': {} + '@oxc-project/runtime@0.157.0': {} '@oxc-project/types@0.155.0': {} + '@oxc-project/types@0.157.0': {} + '@oxc-resolver/binding-android-arm-eabi@11.24.2': optional: true @@ -14622,136 +14894,136 @@ snapshots: '@oxc-transform-react/binding-win32-x64-msvc@0.145.0': optional: true - '@oxfmt/binding-android-arm-eabi@0.76.0': + '@oxfmt/binding-android-arm-eabi@0.77.0': optional: true - '@oxfmt/binding-android-arm64@0.76.0': + '@oxfmt/binding-android-arm64@0.77.0': optional: true - '@oxfmt/binding-darwin-arm64@0.76.0': + '@oxfmt/binding-darwin-arm64@0.77.0': optional: true - '@oxfmt/binding-darwin-x64@0.76.0': + '@oxfmt/binding-darwin-x64@0.77.0': optional: true - '@oxfmt/binding-freebsd-x64@0.76.0': + '@oxfmt/binding-freebsd-x64@0.77.0': optional: true - '@oxfmt/binding-linux-arm-gnueabihf@0.76.0': + '@oxfmt/binding-linux-arm-gnueabihf@0.77.0': optional: true - '@oxfmt/binding-linux-arm-musleabihf@0.76.0': + '@oxfmt/binding-linux-arm-musleabihf@0.77.0': optional: true - '@oxfmt/binding-linux-arm64-gnu@0.76.0': + '@oxfmt/binding-linux-arm64-gnu@0.77.0': optional: true - '@oxfmt/binding-linux-arm64-musl@0.76.0': + '@oxfmt/binding-linux-arm64-musl@0.77.0': optional: true - '@oxfmt/binding-linux-ppc64-gnu@0.76.0': + '@oxfmt/binding-linux-ppc64-gnu@0.77.0': optional: true - '@oxfmt/binding-linux-riscv64-gnu@0.76.0': + '@oxfmt/binding-linux-riscv64-gnu@0.77.0': optional: true - '@oxfmt/binding-linux-riscv64-musl@0.76.0': + '@oxfmt/binding-linux-riscv64-musl@0.77.0': optional: true - '@oxfmt/binding-linux-s390x-gnu@0.76.0': + '@oxfmt/binding-linux-s390x-gnu@0.77.0': optional: true - '@oxfmt/binding-linux-x64-gnu@0.76.0': + '@oxfmt/binding-linux-x64-gnu@0.77.0': optional: true - '@oxfmt/binding-linux-x64-musl@0.76.0': + '@oxfmt/binding-linux-x64-musl@0.77.0': optional: true - '@oxfmt/binding-openharmony-arm64@0.76.0': + '@oxfmt/binding-openharmony-arm64@0.77.0': optional: true - '@oxfmt/binding-win32-arm64-msvc@0.76.0': + '@oxfmt/binding-win32-arm64-msvc@0.77.0': optional: true - '@oxfmt/binding-win32-ia32-msvc@0.76.0': + '@oxfmt/binding-win32-ia32-msvc@0.77.0': optional: true - '@oxfmt/binding-win32-x64-msvc@0.76.0': + '@oxfmt/binding-win32-x64-msvc@0.77.0': optional: true - '@oxlint-tsgolint/darwin-arm64@7.0.2005': + '@oxlint-tsgolint/darwin-arm64@7.0.2006': optional: true - '@oxlint-tsgolint/darwin-x64@7.0.2005': + '@oxlint-tsgolint/darwin-x64@7.0.2006': optional: true - '@oxlint-tsgolint/linux-arm64@7.0.2005': + '@oxlint-tsgolint/linux-arm64@7.0.2006': optional: true - '@oxlint-tsgolint/linux-x64@7.0.2005': + '@oxlint-tsgolint/linux-x64@7.0.2006': optional: true - '@oxlint-tsgolint/win32-arm64@7.0.2005': + '@oxlint-tsgolint/win32-arm64@7.0.2006': optional: true - '@oxlint-tsgolint/win32-x64@7.0.2005': + '@oxlint-tsgolint/win32-x64@7.0.2006': optional: true - '@oxlint/binding-android-arm-eabi@1.91.0': + '@oxlint/binding-android-arm-eabi@1.92.0': optional: true - '@oxlint/binding-android-arm64@1.91.0': + '@oxlint/binding-android-arm64@1.92.0': optional: true - '@oxlint/binding-darwin-arm64@1.91.0': + '@oxlint/binding-darwin-arm64@1.92.0': optional: true - '@oxlint/binding-darwin-x64@1.91.0': + '@oxlint/binding-darwin-x64@1.92.0': optional: true - '@oxlint/binding-freebsd-x64@1.91.0': + '@oxlint/binding-freebsd-x64@1.92.0': optional: true - '@oxlint/binding-linux-arm-gnueabihf@1.91.0': + '@oxlint/binding-linux-arm-gnueabihf@1.92.0': optional: true - '@oxlint/binding-linux-arm-musleabihf@1.91.0': + '@oxlint/binding-linux-arm-musleabihf@1.92.0': optional: true - '@oxlint/binding-linux-arm64-gnu@1.91.0': + '@oxlint/binding-linux-arm64-gnu@1.92.0': optional: true - '@oxlint/binding-linux-arm64-musl@1.91.0': + '@oxlint/binding-linux-arm64-musl@1.92.0': optional: true - '@oxlint/binding-linux-ppc64-gnu@1.91.0': + '@oxlint/binding-linux-ppc64-gnu@1.92.0': optional: true - '@oxlint/binding-linux-riscv64-gnu@1.91.0': + '@oxlint/binding-linux-riscv64-gnu@1.92.0': optional: true - '@oxlint/binding-linux-riscv64-musl@1.91.0': + '@oxlint/binding-linux-riscv64-musl@1.92.0': optional: true - '@oxlint/binding-linux-s390x-gnu@1.91.0': + '@oxlint/binding-linux-s390x-gnu@1.92.0': optional: true - '@oxlint/binding-linux-x64-gnu@1.91.0': + '@oxlint/binding-linux-x64-gnu@1.92.0': optional: true - '@oxlint/binding-linux-x64-musl@1.91.0': + '@oxlint/binding-linux-x64-musl@1.92.0': optional: true - '@oxlint/binding-openharmony-arm64@1.91.0': + '@oxlint/binding-openharmony-arm64@1.92.0': optional: true - '@oxlint/binding-win32-arm64-msvc@1.91.0': + '@oxlint/binding-win32-arm64-msvc@1.92.0': optional: true - '@oxlint/binding-win32-ia32-msvc@1.91.0': + '@oxlint/binding-win32-ia32-msvc@1.92.0': optional: true - '@oxlint/binding-win32-x64-msvc@1.91.0': + '@oxlint/binding-win32-x64-msvc@1.92.0': optional: true '@pagefind/darwin-arm64@1.5.2': @@ -14883,48 +15155,100 @@ snapshots: '@rolldown/binding-android-arm-eabi@1.2.15': optional: true + '@rolldown/binding-android-arm-eabi@1.3.0': + optional: true + '@rolldown/binding-android-arm64@1.2.15': optional: true + '@rolldown/binding-android-arm64@1.3.0': + optional: true + '@rolldown/binding-darwin-arm64@1.2.15': optional: true + '@rolldown/binding-darwin-arm64@1.3.0': + optional: true + '@rolldown/binding-darwin-x64@1.2.15': optional: true + '@rolldown/binding-darwin-x64@1.3.0': + optional: true + '@rolldown/binding-freebsd-x64@1.2.15': optional: true + '@rolldown/binding-freebsd-x64@1.3.0': + optional: true + '@rolldown/binding-linux-arm-gnueabihf@1.2.15': optional: true + '@rolldown/binding-linux-arm-gnueabihf@1.3.0': + optional: true + '@rolldown/binding-linux-arm64-gnu@1.2.15': optional: true + '@rolldown/binding-linux-arm64-gnu@1.3.0': + optional: true + '@rolldown/binding-linux-arm64-musl@1.2.15': optional: true + '@rolldown/binding-linux-arm64-musl@1.3.0': + optional: true + '@rolldown/binding-linux-ppc64-gnu@1.2.15': optional: true + '@rolldown/binding-linux-ppc64-gnu@1.3.0': + optional: true + '@rolldown/binding-linux-s390x-gnu@1.2.15': optional: true + '@rolldown/binding-linux-s390x-gnu@1.3.0': + optional: true + '@rolldown/binding-linux-x64-gnu@1.2.15': optional: true + '@rolldown/binding-linux-x64-gnu@1.3.0': + optional: true + '@rolldown/binding-linux-x64-musl@1.2.15': optional: true + '@rolldown/binding-linux-x64-musl@1.3.0': + optional: true + '@rolldown/binding-openharmony-arm64@1.2.15': optional: true + '@rolldown/binding-openharmony-arm64@1.3.0': + optional: true + + '@rolldown/binding-wasm32-wasi@1.3.0': + dependencies: + '@emnapi/core': 2.0.0-beta.2 + '@emnapi/runtime': 2.0.0-beta.2 + '@napi-rs/wasm-runtime': 1.2.6(@emnapi/core@2.0.0-beta.2)(@emnapi/runtime@2.0.0-beta.2) + optional: true + '@rolldown/binding-win32-arm64-msvc@1.2.15': optional: true + '@rolldown/binding-win32-arm64-msvc@1.3.0': + optional: true + '@rolldown/binding-win32-x64-msvc@1.2.15': optional: true + '@rolldown/binding-win32-x64-msvc@1.3.0': + optional: true + '@rolldown/pluginutils@1.0.1': {} '@rollup/pluginutils@5.4.0(rollup@4.63.0)': @@ -17358,6 +17682,15 @@ snapshots: optionalDependencies: typescript: 6.0.3 + '@volar/typescript@2.4.28(typescript@7.0.2)': + dependencies: + '@volar/language-core': 2.4.28 + path-browserify: 1.0.1 + vscode-uri: 3.2.0 + optionalDependencies: + typescript: 7.0.2 + optional: true + '@vscode/emmet-helper@2.11.0': dependencies: emmet: 2.4.11 @@ -17588,6 +17921,24 @@ snapshots: '@xtuc/long@4.2.2': optional: true + '@yuku-toolchain/darwin-arm64@0.27.0': + optional: true + + '@yuku-toolchain/darwin-x64@0.27.0': + optional: true + + '@yuku-toolchain/linux-arm64@0.27.0': + optional: true + + '@yuku-toolchain/linux-x64@0.27.0': + optional: true + + '@yuku-toolchain/win32-arm64@0.27.0': + optional: true + + '@yuku-toolchain/win32-x64@0.27.0': + optional: true + abbrev@3.0.1: {} abbrev@5.0.0: {} @@ -18277,6 +18628,8 @@ snapshots: cac@7.0.0: {} + cac@7.1.0: {} + call-bind-apply-helpers@1.0.2: dependencies: es-errors: 1.3.0 @@ -19022,6 +19375,10 @@ snapshots: dset@3.1.4: {} + dts-resolver@3.0.0(oxc-resolver@11.24.2): + optionalDependencies: + oxc-resolver: 11.24.2 + dunder-proto@1.0.1: dependencies: call-bind-apply-helpers: 1.0.2 @@ -19062,6 +19419,8 @@ snapshots: emojilib@2.4.0: {} + empathic@2.1.0: {} + encodeurl@2.0.0: {} enhanced-resolve@5.24.5: @@ -19974,6 +20333,8 @@ snapshots: hookable@6.1.1: {} + hookable@6.1.2: {} + html-encoding-sniffer@6.0.0(@noble/hashes@1.8.0): dependencies: '@exodus/bytes': 1.15.1(@noble/hashes@1.8.0) @@ -20052,6 +20413,8 @@ snapshots: import-meta-resolve@4.2.0: {} + import-without-cache@0.4.1: {} + inherits@2.0.3: optional: true @@ -21480,63 +21843,63 @@ snapshots: '@oxc-project/types': 0.155.0 rolldown: 1.2.15 - oxfmt@0.76.0(@astrojs/compiler-rs@0.5.1)(svelte@5.57.3(@typescript-eslint/types@8.68.0)): + oxfmt@0.77.0(@astrojs/compiler-rs@0.5.1)(svelte@5.57.3(@typescript-eslint/types@8.68.0)): dependencies: tinypool: 2.2.0 optionalDependencies: '@astrojs/compiler-rs': 0.5.1 - '@oxfmt/binding-android-arm-eabi': 0.76.0 - '@oxfmt/binding-android-arm64': 0.76.0 - '@oxfmt/binding-darwin-arm64': 0.76.0 - '@oxfmt/binding-darwin-x64': 0.76.0 - '@oxfmt/binding-freebsd-x64': 0.76.0 - '@oxfmt/binding-linux-arm-gnueabihf': 0.76.0 - '@oxfmt/binding-linux-arm-musleabihf': 0.76.0 - '@oxfmt/binding-linux-arm64-gnu': 0.76.0 - '@oxfmt/binding-linux-arm64-musl': 0.76.0 - '@oxfmt/binding-linux-ppc64-gnu': 0.76.0 - '@oxfmt/binding-linux-riscv64-gnu': 0.76.0 - '@oxfmt/binding-linux-riscv64-musl': 0.76.0 - '@oxfmt/binding-linux-s390x-gnu': 0.76.0 - '@oxfmt/binding-linux-x64-gnu': 0.76.0 - '@oxfmt/binding-linux-x64-musl': 0.76.0 - '@oxfmt/binding-openharmony-arm64': 0.76.0 - '@oxfmt/binding-win32-arm64-msvc': 0.76.0 - '@oxfmt/binding-win32-ia32-msvc': 0.76.0 - '@oxfmt/binding-win32-x64-msvc': 0.76.0 + '@oxfmt/binding-android-arm-eabi': 0.77.0 + '@oxfmt/binding-android-arm64': 0.77.0 + '@oxfmt/binding-darwin-arm64': 0.77.0 + '@oxfmt/binding-darwin-x64': 0.77.0 + '@oxfmt/binding-freebsd-x64': 0.77.0 + '@oxfmt/binding-linux-arm-gnueabihf': 0.77.0 + '@oxfmt/binding-linux-arm-musleabihf': 0.77.0 + '@oxfmt/binding-linux-arm64-gnu': 0.77.0 + '@oxfmt/binding-linux-arm64-musl': 0.77.0 + '@oxfmt/binding-linux-ppc64-gnu': 0.77.0 + '@oxfmt/binding-linux-riscv64-gnu': 0.77.0 + '@oxfmt/binding-linux-riscv64-musl': 0.77.0 + '@oxfmt/binding-linux-s390x-gnu': 0.77.0 + '@oxfmt/binding-linux-x64-gnu': 0.77.0 + '@oxfmt/binding-linux-x64-musl': 0.77.0 + '@oxfmt/binding-openharmony-arm64': 0.77.0 + '@oxfmt/binding-win32-arm64-msvc': 0.77.0 + '@oxfmt/binding-win32-ia32-msvc': 0.77.0 + '@oxfmt/binding-win32-x64-msvc': 0.77.0 svelte: 5.57.3(@typescript-eslint/types@8.68.0) - oxlint-tsgolint@7.0.2005: + oxlint-tsgolint@7.0.2006: optionalDependencies: - '@oxlint-tsgolint/darwin-arm64': 7.0.2005 - '@oxlint-tsgolint/darwin-x64': 7.0.2005 - '@oxlint-tsgolint/linux-arm64': 7.0.2005 - '@oxlint-tsgolint/linux-x64': 7.0.2005 - '@oxlint-tsgolint/win32-arm64': 7.0.2005 - '@oxlint-tsgolint/win32-x64': 7.0.2005 - - oxlint@1.91.0(oxlint-tsgolint@7.0.2005): + '@oxlint-tsgolint/darwin-arm64': 7.0.2006 + '@oxlint-tsgolint/darwin-x64': 7.0.2006 + '@oxlint-tsgolint/linux-arm64': 7.0.2006 + '@oxlint-tsgolint/linux-x64': 7.0.2006 + '@oxlint-tsgolint/win32-arm64': 7.0.2006 + '@oxlint-tsgolint/win32-x64': 7.0.2006 + + oxlint@1.92.0(oxlint-tsgolint@7.0.2006): optionalDependencies: - '@oxlint/binding-android-arm-eabi': 1.91.0 - '@oxlint/binding-android-arm64': 1.91.0 - '@oxlint/binding-darwin-arm64': 1.91.0 - '@oxlint/binding-darwin-x64': 1.91.0 - '@oxlint/binding-freebsd-x64': 1.91.0 - '@oxlint/binding-linux-arm-gnueabihf': 1.91.0 - '@oxlint/binding-linux-arm-musleabihf': 1.91.0 - '@oxlint/binding-linux-arm64-gnu': 1.91.0 - '@oxlint/binding-linux-arm64-musl': 1.91.0 - '@oxlint/binding-linux-ppc64-gnu': 1.91.0 - '@oxlint/binding-linux-riscv64-gnu': 1.91.0 - '@oxlint/binding-linux-riscv64-musl': 1.91.0 - '@oxlint/binding-linux-s390x-gnu': 1.91.0 - '@oxlint/binding-linux-x64-gnu': 1.91.0 - '@oxlint/binding-linux-x64-musl': 1.91.0 - '@oxlint/binding-openharmony-arm64': 1.91.0 - '@oxlint/binding-win32-arm64-msvc': 1.91.0 - '@oxlint/binding-win32-ia32-msvc': 1.91.0 - '@oxlint/binding-win32-x64-msvc': 1.91.0 - oxlint-tsgolint: 7.0.2005 + '@oxlint/binding-android-arm-eabi': 1.92.0 + '@oxlint/binding-android-arm64': 1.92.0 + '@oxlint/binding-darwin-arm64': 1.92.0 + '@oxlint/binding-darwin-x64': 1.92.0 + '@oxlint/binding-freebsd-x64': 1.92.0 + '@oxlint/binding-linux-arm-gnueabihf': 1.92.0 + '@oxlint/binding-linux-arm-musleabihf': 1.92.0 + '@oxlint/binding-linux-arm64-gnu': 1.92.0 + '@oxlint/binding-linux-arm64-musl': 1.92.0 + '@oxlint/binding-linux-ppc64-gnu': 1.92.0 + '@oxlint/binding-linux-riscv64-gnu': 1.92.0 + '@oxlint/binding-linux-riscv64-musl': 1.92.0 + '@oxlint/binding-linux-s390x-gnu': 1.92.0 + '@oxlint/binding-linux-x64-gnu': 1.92.0 + '@oxlint/binding-linux-x64-musl': 1.92.0 + '@oxlint/binding-openharmony-arm64': 1.92.0 + '@oxlint/binding-win32-arm64-msvc': 1.92.0 + '@oxlint/binding-win32-ia32-msvc': 1.92.0 + '@oxlint/binding-win32-x64-msvc': 1.92.0 + oxlint-tsgolint: 7.0.2006 p-limit@7.3.3: dependencies: @@ -22350,6 +22713,20 @@ snapshots: robust-predicates@3.0.3: {} + rolldown-plugin-dts@0.30.0(@volar/typescript@2.4.28(typescript@7.0.2))(oxc-resolver@11.24.2)(rolldown@1.3.0)(typescript@7.0.2): + dependencies: + dts-resolver: 3.0.0(oxc-resolver@11.24.2) + get-tsconfig: 5.0.0-beta.6 + obug: 3.0.0 + rolldown: 1.3.0 + yuku: 0.27.0 + optionalDependencies: + '@volar/typescript': 2.4.28(typescript@7.0.2) + typescript: 7.0.2 + transitivePeerDependencies: + - '@yuku-toolchain/wasm' + - oxc-resolver + rolldown@1.2.15: dependencies: '@oxc-project/types': 0.155.0 @@ -22371,6 +22748,28 @@ snapshots: '@rolldown/binding-win32-arm64-msvc': 1.2.15 '@rolldown/binding-win32-x64-msvc': 1.2.15 + rolldown@1.3.0: + dependencies: + '@oxc-project/types': 0.157.0 + '@rolldown/pluginutils': 1.0.1 + optionalDependencies: + '@rolldown/binding-android-arm-eabi': 1.3.0 + '@rolldown/binding-android-arm64': 1.3.0 + '@rolldown/binding-darwin-arm64': 1.3.0 + '@rolldown/binding-darwin-x64': 1.3.0 + '@rolldown/binding-freebsd-x64': 1.3.0 + '@rolldown/binding-linux-arm-gnueabihf': 1.3.0 + '@rolldown/binding-linux-arm64-gnu': 1.3.0 + '@rolldown/binding-linux-arm64-musl': 1.3.0 + '@rolldown/binding-linux-ppc64-gnu': 1.3.0 + '@rolldown/binding-linux-s390x-gnu': 1.3.0 + '@rolldown/binding-linux-x64-gnu': 1.3.0 + '@rolldown/binding-linux-x64-musl': 1.3.0 + '@rolldown/binding-openharmony-arm64': 1.3.0 + '@rolldown/binding-wasm32-wasi': 1.3.0 + '@rolldown/binding-win32-arm64-msvc': 1.3.0 + '@rolldown/binding-win32-x64-msvc': 1.3.0 + rollup@4.63.0: dependencies: '@types/estree': 1.0.9 @@ -23315,6 +23714,32 @@ snapshots: minimist: 1.2.8 strip-bom: 3.0.0 + tsdown@0.23.7(@volar/typescript@2.4.28(typescript@7.0.2))(oxc-resolver@11.24.2)(typescript@7.0.2): + dependencies: + cac: 7.1.0 + defu: 6.1.7 + empathic: 2.1.0 + hookable: 6.1.2 + import-without-cache: 0.4.1 + obug: 3.0.0 + picomatch: 4.0.7 + rolldown: 1.3.0 + rolldown-plugin-dts: 0.30.0(@volar/typescript@2.4.28(typescript@7.0.2))(oxc-resolver@11.24.2)(rolldown@1.3.0)(typescript@7.0.2) + tinyexec: 1.3.1 + tinyglobby: 0.2.17 + tinyps: 0.5.1 + unconfig-core: 7.5.0 + verkit: 0.5.0 + optionalDependencies: + typescript: 7.0.2 + transitivePeerDependencies: + - '@volar/typescript' + - '@vue/language-core' + - '@yuku-toolchain/wasm' + - oxc-resolver + - tsrs + - vue-tsc + tslib@1.14.1: optional: true @@ -24157,6 +24582,15 @@ snapshots: cookie: 1.1.1 youch-core: 0.3.3 + yuku@0.27.0: + optionalDependencies: + '@yuku-toolchain/darwin-arm64': 0.27.0 + '@yuku-toolchain/darwin-x64': 0.27.0 + '@yuku-toolchain/linux-arm64': 0.27.0 + '@yuku-toolchain/linux-x64': 0.27.0 + '@yuku-toolchain/win32-arm64': 0.27.0 + '@yuku-toolchain/win32-x64': 0.27.0 + zenscroll@4.0.2: {} zimmerframe@1.1.4: {} diff --git a/tests/batch/__shared__/client-server.compression-hono-fetch.ts b/tests/batch/__shared__/client-server.compression-hono-fetch.ts index 87a815523a..1a63ab24f9 100644 --- a/tests/batch/__shared__/client-server.compression-hono-fetch.ts +++ b/tests/batch/__shared__/client-server.compression-hono-fetch.ts @@ -8,8 +8,8 @@ import { BatchResponseCompressionHandlerPlugin } from '@orpc/node' import { RPCHandler } from '@orpc/server/fetch' import { BatchHandlerPlugin } from '@orpc/server/plugins' -import type { CreateBatchClientServerTest } from './client-server.ts' -import { defaultBatchClientServerOptions, defaultBatchGroup } from './client-server.ts' +import type { CreateBatchClientServerTest } from './client-server' +import { defaultBatchClientServerOptions, defaultBatchGroup } from './client-server' /** * Compressed batches over the fetch adapter, which the plugin serves as readily as the node one diff --git a/tests/batch/__shared__/client-server.compression-node-http.ts b/tests/batch/__shared__/client-server.compression-node-http.ts index ada83ff6d0..b5b3d503a8 100644 --- a/tests/batch/__shared__/client-server.compression-node-http.ts +++ b/tests/batch/__shared__/client-server.compression-node-http.ts @@ -8,8 +8,8 @@ import { BatchResponseCompressionHandlerPlugin } from '@orpc/node' import { RPCHandler } from '@orpc/server/node' import { BatchHandlerPlugin } from '@orpc/server/plugins' -import type { CreateBatchClientServerTest } from './client-server.ts' -import { defaultBatchClientServerOptions, defaultBatchGroup } from './client-server.ts' +import type { CreateBatchClientServerTest } from './client-server' +import { defaultBatchClientServerOptions, defaultBatchGroup } from './client-server' /** * The same suite as the plain node-http one, with batch responses compressed on the wire. diff --git a/tests/batch/__shared__/client-server.hono-fetch.ts b/tests/batch/__shared__/client-server.hono-fetch.ts index b7baf3926a..02e47add8a 100644 --- a/tests/batch/__shared__/client-server.hono-fetch.ts +++ b/tests/batch/__shared__/client-server.hono-fetch.ts @@ -7,8 +7,8 @@ import { BatchLinkPlugin } from '@orpc/client/plugins' import { RPCHandler } from '@orpc/server/fetch' import { BatchHandlerPlugin } from '@orpc/server/plugins' -import type { CreateBatchClientServerTest } from './client-server.ts' -import { defaultBatchClientServerOptions, defaultBatchGroup } from './client-server.ts' +import type { CreateBatchClientServerTest } from './client-server' +import { defaultBatchClientServerOptions, defaultBatchGroup } from './client-server' export const createHonoFetchBatchClientServerTest: CreateBatchClientServerTest = ( router, diff --git a/tests/batch/__shared__/client-server.node-http.ts b/tests/batch/__shared__/client-server.node-http.ts index 9b4fe32cb4..b1dbeae856 100644 --- a/tests/batch/__shared__/client-server.node-http.ts +++ b/tests/batch/__shared__/client-server.node-http.ts @@ -7,8 +7,8 @@ import { BatchLinkPlugin } from '@orpc/client/plugins' import { RPCHandler } from '@orpc/server/node' import { BatchHandlerPlugin } from '@orpc/server/plugins' -import type { CreateBatchClientServerTest } from './client-server.ts' -import { defaultBatchClientServerOptions, defaultBatchGroup } from './client-server.ts' +import type { CreateBatchClientServerTest } from './client-server' +import { defaultBatchClientServerOptions, defaultBatchGroup } from './client-server' export const createNodeHttpBatchClientServerTest: CreateBatchClientServerTest = ( router, diff --git a/tests/batch/__shared__/client-server.ts b/tests/batch/__shared__/client-server.ts index 11007a651b..1d48a76b1f 100644 --- a/tests/batch/__shared__/client-server.ts +++ b/tests/batch/__shared__/client-server.ts @@ -3,7 +3,7 @@ import type { BatchLinkPluginMode } from '@orpc/client/plugins' import type { AnyRouter, Context, RouterClient } from '@orpc/server' import type { Public } from '@orpc/shared' -import { defaultSerializer } from '../../rpc/__shared__/client-server.ts' +import { defaultSerializer } from '../../rpc/__shared__/client-server' export interface BatchClientServerTestOptions { context?: Context diff --git a/tests/batch/batch-plugin.test.ts b/tests/batch/batch-plugin.test.ts index 7e93d221dd..97f9d6b678 100644 --- a/tests/batch/batch-plugin.test.ts +++ b/tests/batch/batch-plugin.test.ts @@ -3,10 +3,10 @@ import { promiseWithResolvers } from '@orpc/shared' import { sleep } from '@standard-server/shared' import { z } from 'zod' -import { createCompressionHonoFetchBatchClientServerTest } from './__shared__/client-server.compression-hono-fetch.ts' -import { createCompressionNodeHttpBatchClientServerTest } from './__shared__/client-server.compression-node-http.ts' -import { createHonoFetchBatchClientServerTest } from './__shared__/client-server.hono-fetch.ts' -import { createNodeHttpBatchClientServerTest } from './__shared__/client-server.node-http.ts' +import { createCompressionHonoFetchBatchClientServerTest } from './__shared__/client-server.compression-hono-fetch' +import { createCompressionNodeHttpBatchClientServerTest } from './__shared__/client-server.compression-node-http' +import { createHonoFetchBatchClientServerTest } from './__shared__/client-server.hono-fetch' +import { createNodeHttpBatchClientServerTest } from './__shared__/client-server.node-http' describe.each([ ['node-http', createNodeHttpBatchClientServerTest], diff --git a/tests/openapi/__shared__/client-server.hono-fetch.ts b/tests/openapi/__shared__/client-server.hono-fetch.ts index 56e4574964..651beaca0a 100644 --- a/tests/openapi/__shared__/client-server.hono-fetch.ts +++ b/tests/openapi/__shared__/client-server.hono-fetch.ts @@ -4,8 +4,8 @@ import { serve } from '@hono/node-server' import { createORPCClient } from '@orpc/client' import { OpenAPIHandler, OpenAPILink } from '@orpc/openapi/fetch' -import type { CreateOpenAPIClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateOpenAPIClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createHonoFetchClientServerTest: CreateOpenAPIClientServerTest = ( router, diff --git a/tests/openapi/__shared__/client-server.node-http.ts b/tests/openapi/__shared__/client-server.node-http.ts index 2520cdcfb4..1935556d23 100644 --- a/tests/openapi/__shared__/client-server.node-http.ts +++ b/tests/openapi/__shared__/client-server.node-http.ts @@ -5,8 +5,8 @@ import { createORPCClient } from '@orpc/client' import { OpenAPILink } from '@orpc/openapi/fetch' import { OpenAPIHandler } from '@orpc/openapi/node' -import type { CreateOpenAPIClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateOpenAPIClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createNodeHttpClientServerTest: CreateOpenAPIClientServerTest = ( router, diff --git a/tests/openapi/cancel-and-abort.test.ts b/tests/openapi/cancel-and-abort.test.ts index 872519b2b2..39a2f5a20a 100644 --- a/tests/openapi/cancel-and-abort.test.ts +++ b/tests/openapi/cancel-and-abort.test.ts @@ -3,8 +3,8 @@ import { os } from '@orpc/server' import { AsyncIteratorClass, sleep } from '@standard-server/shared' import { z } from 'zod' -import { createHonoFetchClientServerTest } from './__shared__/client-server.hono-fetch.ts' -import { createNodeHttpClientServerTest } from './__shared__/client-server.node-http.ts' +import { createHonoFetchClientServerTest } from './__shared__/client-server.hono-fetch' +import { createNodeHttpClientServerTest } from './__shared__/client-server.node-http' describe.each([ ['hono-fetch', createHonoFetchClientServerTest], diff --git a/tests/openapi/data-transfer.test.ts b/tests/openapi/data-transfer.test.ts index af028d7010..eea8207650 100644 --- a/tests/openapi/data-transfer.test.ts +++ b/tests/openapi/data-transfer.test.ts @@ -4,9 +4,9 @@ import { os } from '@orpc/server' import { promiseWithResolvers } from '@orpc/shared' import { z } from 'zod' -import { Person } from '../rpc/__shared__/client-server.ts' -import { createHonoFetchClientServerTest } from './__shared__/client-server.hono-fetch.ts' -import { createNodeHttpClientServerTest } from './__shared__/client-server.node-http.ts' +import { Person } from '../rpc/__shared__/client-server' +import { createHonoFetchClientServerTest } from './__shared__/client-server.hono-fetch' +import { createNodeHttpClientServerTest } from './__shared__/client-server.node-http' describe.each([ ['hono-fetch', createHonoFetchClientServerTest], diff --git a/tests/rpc/__shared__/client-server.compression-crossws.ts b/tests/rpc/__shared__/client-server.compression-crossws.ts index 0e06581d41..5566fa8aeb 100644 --- a/tests/rpc/__shared__/client-server.compression-crossws.ts +++ b/tests/rpc/__shared__/client-server.compression-crossws.ts @@ -12,8 +12,8 @@ import { import crossws from 'crossws/adapters/node' import { WebSocket as FallbackWebSocket } from 'ws' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createCompressionCrosswsClientServerTest: CreateClientServerTest = ( router, diff --git a/tests/rpc/__shared__/client-server.compression-hono-fetch.ts b/tests/rpc/__shared__/client-server.compression-hono-fetch.ts index 375b24392e..e97e05e750 100644 --- a/tests/rpc/__shared__/client-server.compression-hono-fetch.ts +++ b/tests/rpc/__shared__/client-server.compression-hono-fetch.ts @@ -10,8 +10,8 @@ import { ResponseCompressionHandlerPlugin, } from '@orpc/server/plugins' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createCompressionHonoFetchClientServerTest: CreateClientServerTest = ( router, diff --git a/tests/rpc/__shared__/client-server.compression-message-port-transfer.ts b/tests/rpc/__shared__/client-server.compression-message-port-transfer.ts index 5ffd582241..9ab7f1b858 100644 --- a/tests/rpc/__shared__/client-server.compression-message-port-transfer.ts +++ b/tests/rpc/__shared__/client-server.compression-message-port-transfer.ts @@ -7,8 +7,8 @@ import { ResponseCompressionHandlerPlugin, } from '@orpc/server/plugins' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createCompressionMessagePortTransferClientServerTest: CreateClientServerTest = ( router, diff --git a/tests/rpc/__shared__/client-server.compression-message-port.ts b/tests/rpc/__shared__/client-server.compression-message-port.ts index ac6a421bb8..201061f101 100644 --- a/tests/rpc/__shared__/client-server.compression-message-port.ts +++ b/tests/rpc/__shared__/client-server.compression-message-port.ts @@ -7,8 +7,8 @@ import { ResponseCompressionHandlerPlugin, } from '@orpc/server/plugins' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createCompressionMessagePortClientServerTest: CreateClientServerTest = ( router, diff --git a/tests/rpc/__shared__/client-server.compression-node-http.ts b/tests/rpc/__shared__/client-server.compression-node-http.ts index bfc8f1bb8b..fdb7dc955e 100644 --- a/tests/rpc/__shared__/client-server.compression-node-http.ts +++ b/tests/rpc/__shared__/client-server.compression-node-http.ts @@ -10,8 +10,8 @@ import { ResponseCompressionHandlerPlugin, } from '@orpc/server/plugins' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createCompressionNodeHttpClientServerTest: CreateClientServerTest = ( router, diff --git a/tests/rpc/__shared__/client-server.compression-node-ws.ts b/tests/rpc/__shared__/client-server.compression-node-ws.ts index c4585f29b0..f5e8bf5bf6 100644 --- a/tests/rpc/__shared__/client-server.compression-node-ws.ts +++ b/tests/rpc/__shared__/client-server.compression-node-ws.ts @@ -10,8 +10,8 @@ import { import { RPCHandler } from '@orpc/server/websocket' import { WebSocket, WebSocketServer } from 'ws' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createCompressionNodeWsClientServerTest: CreateClientServerTest = ( router, diff --git a/tests/rpc/__shared__/client-server.crossws.ts b/tests/rpc/__shared__/client-server.crossws.ts index fd127d64b9..525401e122 100644 --- a/tests/rpc/__shared__/client-server.crossws.ts +++ b/tests/rpc/__shared__/client-server.crossws.ts @@ -7,8 +7,8 @@ import { experimental_RPCHandler as RPCHandler } from '@orpc/server/crossws' import crossws from 'crossws/adapters/node' import { WebSocket as FallbackWebSocket } from 'ws' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createCrosswsClientServerTest: CreateClientServerTest = ( router, diff --git a/tests/rpc/__shared__/client-server.hono-fetch.ts b/tests/rpc/__shared__/client-server.hono-fetch.ts index ac804556dd..5d8817a076 100644 --- a/tests/rpc/__shared__/client-server.hono-fetch.ts +++ b/tests/rpc/__shared__/client-server.hono-fetch.ts @@ -5,8 +5,8 @@ import { createORPCClient } from '@orpc/client' import { RPCLink } from '@orpc/client/fetch' import { RPCHandler } from '@orpc/server/fetch' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createHonoFetchClientServerTest: CreateClientServerTest = ( router, diff --git a/tests/rpc/__shared__/client-server.message-port-transfer.ts b/tests/rpc/__shared__/client-server.message-port-transfer.ts index 66e31755d4..9e39145240 100644 --- a/tests/rpc/__shared__/client-server.message-port-transfer.ts +++ b/tests/rpc/__shared__/client-server.message-port-transfer.ts @@ -2,8 +2,8 @@ import { createORPCClient } from '@orpc/client' import { RPCLink } from '@orpc/client/message-port' import { RPCHandler } from '@orpc/server/message-port' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createMessagePortTransferClientServerTest: CreateClientServerTest = ( router, diff --git a/tests/rpc/__shared__/client-server.message-port.ts b/tests/rpc/__shared__/client-server.message-port.ts index 31a3c21adf..1a27b72daf 100644 --- a/tests/rpc/__shared__/client-server.message-port.ts +++ b/tests/rpc/__shared__/client-server.message-port.ts @@ -2,8 +2,8 @@ import { createORPCClient } from '@orpc/client' import { RPCLink } from '@orpc/client/message-port' import { RPCHandler } from '@orpc/server/message-port' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createMessagePortClientServerTest: CreateClientServerTest = ( router, diff --git a/tests/rpc/__shared__/client-server.node-http.ts b/tests/rpc/__shared__/client-server.node-http.ts index 3882f4573d..94fe07fdda 100644 --- a/tests/rpc/__shared__/client-server.node-http.ts +++ b/tests/rpc/__shared__/client-server.node-http.ts @@ -5,8 +5,8 @@ import { createORPCClient } from '@orpc/client' import { RPCLink } from '@orpc/client/fetch' import { RPCHandler } from '@orpc/server/node' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createNodeHttpClientServerTest: CreateClientServerTest = ( router, diff --git a/tests/rpc/__shared__/client-server.node-ws.ts b/tests/rpc/__shared__/client-server.node-ws.ts index 0c4b4487b2..fc2058f093 100644 --- a/tests/rpc/__shared__/client-server.node-ws.ts +++ b/tests/rpc/__shared__/client-server.node-ws.ts @@ -5,8 +5,8 @@ import { RPCLink } from '@orpc/client/websocket' import { RPCHandler } from '@orpc/server/websocket' import { WebSocket, WebSocketServer } from 'ws' -import type { CreateClientServerTest } from './client-server.ts' -import { defaultSerializer } from './client-server.ts' +import type { CreateClientServerTest } from './client-server' +import { defaultSerializer } from './client-server' export const createNodeWsClientServerTest: CreateClientServerTest = ( router, diff --git a/tests/rpc/cancel-and-abort.test.ts b/tests/rpc/cancel-and-abort.test.ts index 0a6a673219..5a570ea1b5 100644 --- a/tests/rpc/cancel-and-abort.test.ts +++ b/tests/rpc/cancel-and-abort.test.ts @@ -2,18 +2,18 @@ import { os } from '@orpc/server' import { AsyncIteratorClass, sleep } from '@standard-server/shared' import { z } from 'zod' -import { createCompressionCrosswsClientServerTest } from './__shared__/client-server.compression-crossws.ts' -import { createCompressionHonoFetchClientServerTest } from './__shared__/client-server.compression-hono-fetch.ts' -import { createCompressionMessagePortTransferClientServerTest } from './__shared__/client-server.compression-message-port-transfer.ts' -import { createCompressionMessagePortClientServerTest } from './__shared__/client-server.compression-message-port.ts' -import { createCompressionNodeHttpClientServerTest } from './__shared__/client-server.compression-node-http.ts' -import { createCompressionNodeWsClientServerTest } from './__shared__/client-server.compression-node-ws.ts' -import { createCrosswsClientServerTest } from './__shared__/client-server.crossws.ts' -import { createHonoFetchClientServerTest } from './__shared__/client-server.hono-fetch.ts' -import { createMessagePortTransferClientServerTest } from './__shared__/client-server.message-port-transfer.ts' -import { createMessagePortClientServerTest } from './__shared__/client-server.message-port.ts' -import { createNodeHttpClientServerTest } from './__shared__/client-server.node-http.ts' -import { createNodeWsClientServerTest } from './__shared__/client-server.node-ws.ts' +import { createCompressionCrosswsClientServerTest } from './__shared__/client-server.compression-crossws' +import { createCompressionHonoFetchClientServerTest } from './__shared__/client-server.compression-hono-fetch' +import { createCompressionMessagePortClientServerTest } from './__shared__/client-server.compression-message-port' +import { createCompressionMessagePortTransferClientServerTest } from './__shared__/client-server.compression-message-port-transfer' +import { createCompressionNodeHttpClientServerTest } from './__shared__/client-server.compression-node-http' +import { createCompressionNodeWsClientServerTest } from './__shared__/client-server.compression-node-ws' +import { createCrosswsClientServerTest } from './__shared__/client-server.crossws' +import { createHonoFetchClientServerTest } from './__shared__/client-server.hono-fetch' +import { createMessagePortClientServerTest } from './__shared__/client-server.message-port' +import { createMessagePortTransferClientServerTest } from './__shared__/client-server.message-port-transfer' +import { createNodeHttpClientServerTest } from './__shared__/client-server.node-http' +import { createNodeWsClientServerTest } from './__shared__/client-server.node-ws' describe.each([ ['crossws', createCrosswsClientServerTest], diff --git a/tests/rpc/data-transfer.test.ts b/tests/rpc/data-transfer.test.ts index afb8be3a48..27a7e8df26 100644 --- a/tests/rpc/data-transfer.test.ts +++ b/tests/rpc/data-transfer.test.ts @@ -2,20 +2,20 @@ import { os } from '@orpc/server' import { promiseWithResolvers } from '@orpc/shared' import { z } from 'zod' -import { builtInRPCSupportDataTypes } from './__shared__/built-in-support-data-types.ts' -import { createCompressionCrosswsClientServerTest } from './__shared__/client-server.compression-crossws.ts' -import { createCompressionHonoFetchClientServerTest } from './__shared__/client-server.compression-hono-fetch.ts' -import { createCompressionMessagePortTransferClientServerTest } from './__shared__/client-server.compression-message-port-transfer.ts' -import { createCompressionMessagePortClientServerTest } from './__shared__/client-server.compression-message-port.ts' -import { createCompressionNodeHttpClientServerTest } from './__shared__/client-server.compression-node-http.ts' -import { createCompressionNodeWsClientServerTest } from './__shared__/client-server.compression-node-ws.ts' -import { createCrosswsClientServerTest } from './__shared__/client-server.crossws.ts' -import { createHonoFetchClientServerTest } from './__shared__/client-server.hono-fetch.ts' -import { createMessagePortTransferClientServerTest } from './__shared__/client-server.message-port-transfer.ts' -import { createMessagePortClientServerTest } from './__shared__/client-server.message-port.ts' -import { createNodeHttpClientServerTest } from './__shared__/client-server.node-http.ts' -import { createNodeWsClientServerTest } from './__shared__/client-server.node-ws.ts' -import { Person } from './__shared__/client-server.ts' +import { builtInRPCSupportDataTypes } from './__shared__/built-in-support-data-types' +import { Person } from './__shared__/client-server' +import { createCompressionCrosswsClientServerTest } from './__shared__/client-server.compression-crossws' +import { createCompressionHonoFetchClientServerTest } from './__shared__/client-server.compression-hono-fetch' +import { createCompressionMessagePortClientServerTest } from './__shared__/client-server.compression-message-port' +import { createCompressionMessagePortTransferClientServerTest } from './__shared__/client-server.compression-message-port-transfer' +import { createCompressionNodeHttpClientServerTest } from './__shared__/client-server.compression-node-http' +import { createCompressionNodeWsClientServerTest } from './__shared__/client-server.compression-node-ws' +import { createCrosswsClientServerTest } from './__shared__/client-server.crossws' +import { createHonoFetchClientServerTest } from './__shared__/client-server.hono-fetch' +import { createMessagePortClientServerTest } from './__shared__/client-server.message-port' +import { createMessagePortTransferClientServerTest } from './__shared__/client-server.message-port-transfer' +import { createNodeHttpClientServerTest } from './__shared__/client-server.node-http' +import { createNodeWsClientServerTest } from './__shared__/client-server.node-ws' describe.each([ ['crossws', createCrosswsClientServerTest], diff --git a/tsconfig.json b/tsconfig.json index d631b9b659..abf0577067 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,9 +4,9 @@ "target": "ES2022", "jsx": "react-jsx", "lib": ["ES2023"], - "module": "nodenext", + "module": "preserve", + "moduleResolution": "bundler", - "rewriteRelativeImportExtensions": true, "types": ["node", "vitest/globals"], "noImplicitOverride": true, diff --git a/tsconfig.lib.json b/tsconfig.lib.json index bbc6e35d41..4891b344b1 100644 --- a/tsconfig.lib.json +++ b/tsconfig.lib.json @@ -3,11 +3,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "lib": ["ES2022", "DOM", "DOM.Iterable"], - "types": [], - "declaration": true, - "noEmit": false, - "rootDir": "${configDir}/src", - "outDir": "${configDir}/dist" + "types": [] }, "include": ["${configDir}/src"], "exclude": [ diff --git a/tsdown.config.ts b/tsdown.config.ts new file mode 100644 index 0000000000..f8dcbb00a1 --- /dev/null +++ b/tsdown.config.ts @@ -0,0 +1,123 @@ +import { readFileSync } from 'node:fs' + +import { defineConfig, Rolldown } from 'tsdown' +import type { TsdownPlugin } from 'tsdown' + +const pkg = JSON.parse(readFileSync('package.json', 'utf8')) as { + exports: Record + dependencies?: Record + peerDependencies?: Record +} + +const runtimeModules = ['bun', /^(bun|node|cloudflare):/] + +export default defineConfig({ + entry: Object.values(pkg.exports).filter((path) => path.startsWith('./src/')), + unbundle: true, + deps: { + neverBundle: true, + onlyImport: [ + ...Object.keys({ ...pkg.dependencies, ...pkg.peerDependencies }), + ...runtimeModules, + ], + }, + platform: 'neutral', + target: 'es2022', + dts: { generator: 'oxc' }, + inputOptions: { external: runtimeModules }, + plugins: [restoreReexports()], +}) + +const isExportList = (node: any): boolean => + node.type === 'ExportNamedDeclaration' && !node.source && !node.declaration + +/** + * Rolldown writes re-exports as `import { a } from 'x'; export { a }`, which + * Expo's tree shaking can't see through. Turn them back into `export { a } from 'x'`. + */ +function restoreReexports(): TsdownPlugin { + return { + name: 'restore-reexports', + renderChunk(code, chunk) { + if (!chunk.fileName.endsWith('.js')) { + return null + } + + const text = (node: any): string => code.slice(node.start, node.end) + + const body: any[] = this.parse(code).body + const imports = body.filter( + (node) => + node.type === 'ImportDeclaration' && + !node.attributes.length && + node.specifiers.every((spec: any) => spec.type === 'ImportSpecifier'), + ) + const exportLists = body.filter(isExportList) + + const used = new Set() + const collect = (node: any): void => { + if (node && typeof node === 'object') { + if (node.type === 'Identifier') { + used.add(node.name) + } + Object.values(node).forEach(collect) + } + } + collect(body.filter((node) => !imports.includes(node) && !exportLists.includes(node))) + + const exportsByLocal = new Map() + for (const spec of exportLists.flatMap((node) => node.specifiers)) { + exportsByLocal.set(spec.local.name, [ + ...(exportsByLocal.get(spec.local.name) ?? []), + text(spec.exported), + ]) + } + + const s = new Rolldown.RolldownMagicString(code) + const moved = new Set() + + for (const node of imports) { + const kept: string[] = [] + const reexported: string[] = [] + + for (const spec of node.specifiers) { + const local = spec.local.name + const exported = exportsByLocal.get(local) + + if (exported && !used.has(local)) { + moved.add(local) + const imported = text(spec.imported) + reexported.push( + ...exported.map((as) => (as === imported ? as : `${imported} as ${as}`)), + ) + } else { + kept.push(text(spec)) + } + } + + // Written in place of the import, so modules still evaluate in the same order. + if (reexported.length) { + const source = text(node.source) + const imported = kept.length ? `import { ${kept.join(', ')} } from ${source};\n` : '' + s.overwrite( + node.start, + node.end, + `${imported}export { ${reexported.join(', ')} } from ${source};`, + ) + } + } + + for (const node of exportLists) { + const left = node.specifiers.filter((spec: any) => !moved.has(spec.local.name)) + + if (!left.length) { + s.remove(node.start, node.end) + } else if (left.length !== node.specifiers.length) { + s.overwrite(node.start, node.end, `export { ${left.map(text).join(', ')} };`) + } + } + + return s + }, + } +}