refactor: merge with standard-server repo (#176)

* improve tsconfig

* refactor: merge with  repo

* improve test:coverage

* update naming

* fix typescript references

Author: dinwwwh

eslint.config.js

@@ -12,15 +12,15 @@ export default antfu({
     'ts/method-signature-style': ['off'],
   },
 }, {
-  files: ['**/*.test.ts', '**/*.test.tsx', '**/*.test-d.ts', '**/*.test-d.tsx', 'apps/content/shared/**', 'playgrounds/**'],
+  files: ['**/*.test.ts', '**/*.test.tsx', '**/*.test-d.ts', '**/*.test-d.tsx', 'apps/content/shared/**', 'playgrounds/**', 'packages/*/playground/**'],
   rules: {
     'unused-imports/no-unused-vars': 'off',
     'antfu/no-top-level-await': 'off',
     'react-hooks/rules-of-hooks': 'off',
     'no-alert': 'off',
   },
 }, {
-  files: ['apps/content/shared/**', 'apps/content/docs/**', 'apps/content/examples/**', 'playgrounds/**'],
+  files: ['apps/content/shared/**', 'apps/content/docs/**', 'apps/content/examples/**', 'playgrounds/**', 'packages/*/playground/**'],
   rules: {
     'no-console': 'off',
     'perfectionist/sort-imports': 'off',

package.json

@@ -13,7 +13,7 @@
     "posttype:check": "tsc --noEmit",
     "test": "vitest run",
     "test:watch": "vitest watch",
-    "test:coverage": "vitest run --coverage --coverage.include=packages",
+    "test:coverage": "vitest run --coverage --coverage.include='packages/*/src/**'",
     "lint": "eslint --max-warnings=0 .",
     "lint:fix": "pnpm run lint --fix",
     "sherif": "pnpm dlx sherif",

packages/client/package.json

@@ -60,9 +60,9 @@
     "type:check": "tsc -b"
   },
   "dependencies": {
-    "@orpc/server-standard": "^0.4.0",
-    "@orpc/server-standard-fetch": "^0.4.0",
-    "@orpc/shared": "workspace:*"
+    "@orpc/shared": "workspace:*",
+    "@orpc/standard-server": "workspace:*",
+    "@orpc/standard-server-fetch": "workspace:*"
   },
   "devDependencies": {
     "zod": "^3.24.1"

packages/client/src/adapters/fetch/rpc-link.test.ts

@@ -1,7 +1,7 @@
 import { ORPCError } from '@orpc/contract'
 import { os } from '@orpc/server'
-import { getEventMeta, isAsyncIteratorObject, withEventMeta } from '@orpc/server-standard'
 import { RPCHandler } from '@orpc/server/fetch'
+import { getEventMeta, isAsyncIteratorObject, withEventMeta } from '@orpc/standard-server'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { supportedDataTypes } from '../../../tests/shared'
 import { RPCLink } from './rpc-link'

packages/client/src/adapters/fetch/rpc-link.ts

@@ -1,9 +1,9 @@
 import type { Value } from '@orpc/shared'
 import type { ClientContext, ClientLink, ClientOptionsOut } from '../../types'
 import type { FetchWithContext } from './types'
-import { isAsyncIteratorObject, type StandardBody } from '@orpc/server-standard'
-import { toFetchBody, toStandardBody } from '@orpc/server-standard-fetch'
 import { trim, value } from '@orpc/shared'
+import { isAsyncIteratorObject, type StandardBody } from '@orpc/standard-server'
+import { toFetchBody, toStandardBody } from '@orpc/standard-server-fetch'
 import { ORPCError } from '../../error'
 import { createAutoRetryEventIterator, type EventIteratorReconnectOptions } from '../../event-iterator'
 import { RPCSerializer } from '../../rpc'

packages/client/src/event-iterator.test.ts

@@ -1,4 +1,4 @@
-import { getEventMeta, withEventMeta } from '@orpc/server-standard'
+import { getEventMeta, withEventMeta } from '@orpc/standard-server'
 import { createAutoRetryEventIterator, mapEventIterator } from './event-iterator'
 import { onEventIteratorStatusChange } from './event-iterator-state'
 

packages/client/src/event-iterator.ts

@@ -1,6 +1,6 @@
 import type { EventIteratorState } from './event-iterator-state'
-import { getEventMeta, isEventMetaContainer, withEventMeta } from '@orpc/server-standard'
 import { retry } from '@orpc/shared'
+import { getEventMeta, isEventMetaContainer, withEventMeta } from '@orpc/standard-server'
 import { registerEventIteratorState, updateEventIteratorStatus } from './event-iterator-state'
 
 export function mapEventIterator<TYield, TReturn, TNext, TMap = TYield | TReturn>(

packages/client/src/openapi/bracket-notation.test.ts

@@ -181,7 +181,7 @@ describe('bracketNotation', () => {
   })
 
   it.each([
-    [{ a: 1, b: 2, c: [1, 2, { a: 1, b: 2 }, new Date(), new Blob(), new Set([1, 2]), new Map([[1, 2]])] }],
+    [{ a: 1, b: 2, c: [1, 2, { a: 1, b: 2 }, new Date(), new Blob([]), new Set([1, 2]), new Map([[1, 2]])] }],
   ])('.serialize + .deserialize', (value) => {
     expect(serializer.deserialize(serializer.serialize(value))).toEqual(value)
   })

packages/client/src/openapi/serializer.test.ts

@@ -1,5 +1,5 @@
 import { ORPCError } from '@orpc/contract'
-import { ErrorEvent, getEventMeta, withEventMeta } from '@orpc/server-standard'
+import { ErrorEvent, getEventMeta, withEventMeta } from '@orpc/standard-server'
 import { OpenAPIJsonSerializer } from './json-serializer'
 import { OpenAPISerializer } from './serializer'
 
@@ -21,7 +21,7 @@ describe('openAPISerializer', () => {
     })
 
     it('with blob', () => {
-      const blob = new Blob()
+      const blob = new Blob([])
       expect(openapiSerializer.serialize(blob)).toBe(blob)
     })
 
@@ -217,7 +217,7 @@ describe('openAPISerializer', () => {
     })
 
     it('with blob', () => {
-      const blob = new Blob()
+      const blob = new Blob([])
       expect(openapiSerializer.deserialize(blob)).toBe(blob)
     })
 

packages/client/src/openapi/serializer.ts

@@ -1,5 +1,5 @@
-import type { JsonValue } from '@orpc/server-standard'
-import { ErrorEvent, isAsyncIteratorObject } from '@orpc/server-standard'
+import type { JsonValue } from '@orpc/standard-server'
+import { ErrorEvent, isAsyncIteratorObject } from '@orpc/standard-server'
 import { ORPCError, toORPCError } from '../error'
 import { mapEventIterator } from '../event-iterator'
 import { BracketNotationSerializer } from './bracket-notation'