feat: updated types to be stored under core package

RomanBobrovskiy · RomanBobrovskiy · commit a953238b68f7 · 2024-11-13T17:28:45.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -66,13 +66,8 @@
     "lib": "lib"
   },
   "workspaces": [
-    "packages/cache-core",
-    "packages/common",
-    "packages/redis-cache",
-    "packages/s3-cache",
-    "packages/tsconfig",
-    "examples/app-router",
-    "examples/page-router"
+    "packages/*",
+    "examples/*"
   ],
   "lint-staged": {
     "*.{ts,tsx}": "eslint --fix"
diff --git a/packages/cache-core/__tests__/mocks/index.ts b/packages/cache-core/__tests__/mocks/index.ts
@@ -4,7 +4,7 @@ import {
   CacheEntry,
   CacheContext,
   CacheHandlerContext
-} from '@dbbs/next-cache-handler-common'
+} from '../../src/types'
 
 export const mockNextHandlerContext: NextCacheHandlerContext = {
   revalidatedTags: [],
diff --git a/packages/cache-core/src/cacheHandler.ts b/packages/cache-core/src/cacheHandler.ts
@@ -10,7 +10,7 @@ import type {
   CacheHandlerContext,
   CacheEntry,
   IncrementalCacheValue
-} from '@dbbs/next-cache-handler-common'
+} from '../src/types'
 import { ConsoleLogger, type BaseLogger } from './logger'
 import { FileSystemCache } from './strategies/fileSystem'
 
diff --git a/packages/cache-core/src/index.ts b/packages/cache-core/src/index.ts
@@ -1,4 +1,5 @@
 export { Cache } from './cacheHandler'
 export { FileSystemCache } from './strategies/fileSystem'
-export { MemoryCache, type MemoryCacheConstructorProps } from './strategies/memory'
-export type { LoggerInputParams, BaseLogger } from './logger'
+export { MemoryCache, MemoryCacheConstructorProps } from './strategies/memory'
+export { LoggerInputParams, BaseLogger } from './logger'
+export * from './types'
diff --git a/packages/cache-core/src/strategies/fileSystem.ts b/packages/cache-core/src/strategies/fileSystem.ts
@@ -1,7 +1,7 @@
 import fs from 'node:fs/promises'
 import { existsSync } from 'node:fs'
 import path from 'node:path'
-import type { CacheStrategy, CacheEntry, CacheContext } from '@dbbs/next-cache-handler-common'
+import type { CacheStrategy, CacheEntry, CacheContext } from '../types'
 import { checkHeaderTags } from '@dbbs/next-cache-handler-common'
 
 export class FileSystemCache implements CacheStrategy {
diff --git a/packages/cache-core/src/strategies/memory.ts b/packages/cache-core/src/strategies/memory.ts
@@ -1,4 +1,4 @@
-import type { CacheEntry, CacheStrategy } from '@dbbs/next-cache-handler-common'
+import type { CacheEntry, CacheStrategy } from '../types'
 import { checkHeaderTags } from '@dbbs/next-cache-handler-common'
 
 const mapCache = new Map()
diff --git a/packages/cache-core/src/types/index.ts b/packages/cache-core/src/types/index.ts
diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
@@ -1,3 +1,2 @@
-export * from './types'
 export * from './aws'
 export * from './utils'
diff --git a/packages/redis-cache/__tests__/mocks.ts b/packages/redis-cache/__tests__/mocks.ts
@@ -1,4 +1,4 @@
-import { CacheEntry } from '@dbbs/next-cache-handler-common'
+import { CacheEntry } from '@dbbs/next-cache-handler-core'
 export const mockCacheEntry: CacheEntry = {
   value: {
     pageData: {},
diff --git a/packages/redis-cache/__tests__/redis-stack.spec.ts b/packages/redis-cache/__tests__/redis-stack.spec.ts
@@ -1,5 +1,5 @@
 import { mockCacheEntry, mockDeleteKey, mockReadKey, mockScan, mockWriteKey } from './mocks'
-import { CacheEntry } from '@dbbs/next-cache-handler-common'
+import { CacheEntry } from '@dbbs/next-cache-handler-core'
 import { RedisAdapter, RedisCache } from '../src'
 import { RedisStack } from '../lib/RedisStack'
 
diff --git a/packages/redis-cache/package.json b/packages/redis-cache/package.json
@@ -31,6 +31,7 @@
   },
   "devDependencies": {
     "@dbbs/next-cache-handler-common": "*",
+    "@dbbs/next-cache-handler-core": "*",
     "tsconfig": "*"
   },
   "directories": {
diff --git a/packages/redis-cache/src/RedisStack.ts b/packages/redis-cache/src/RedisStack.ts
@@ -9,7 +9,7 @@ import {
   RedisScripts,
   SchemaFieldTypes
 } from 'redis'
-import type { CacheEntry } from '@dbbs/next-cache-handler-common'
+import type { CacheEntry } from '@dbbs/next-cache-handler-core'
 import { RedisAdapter, RedisJSON } from './types'
 import { CHUNK_LIMIT } from './constants'
 
diff --git a/packages/redis-cache/src/RedisString.ts b/packages/redis-cache/src/RedisString.ts
@@ -1,5 +1,5 @@
 import { createClient, RedisClientType, RedisClientOptions } from 'redis'
-import type { CacheEntry } from '@dbbs/next-cache-handler-common'
+import type { CacheEntry } from '@dbbs/next-cache-handler-core'
 import { checkHeaderTags } from '@dbbs/next-cache-handler-common'
 import { RedisAdapter } from './types'
 import { CHUNK_LIMIT } from './constants'
diff --git a/packages/redis-cache/src/index.ts b/packages/redis-cache/src/index.ts
@@ -1,5 +1,5 @@
 import { RedisClientOptions } from 'redis'
-import type { CacheEntry, CacheStrategy } from '@dbbs/next-cache-handler-common'
+import type { CacheEntry, CacheStrategy } from '@dbbs/next-cache-handler-core'
 import { RedisString } from './RedisString'
 import { RedisStack } from './RedisStack'
 import { CHUNK_LIMIT } from './constants'
diff --git a/packages/redis-cache/src/types.ts b/packages/redis-cache/src/types.ts
@@ -1,4 +1,4 @@
-import { CacheStrategy } from '@dbbs/next-cache-handler-common'
+import { CacheStrategy } from '@dbbs/next-cache-handler-core'
 
 interface RedisJSONArray extends Array<RedisJSON> {}
 
diff --git a/packages/s3-cache/__tests__/s3.spec.ts b/packages/s3-cache/__tests__/s3.spec.ts
@@ -1,4 +1,4 @@
-import { CacheEntry, CacheContext } from '@dbbs/next-cache-handler-common'
+import { CacheEntry, CacheContext } from '@dbbs/next-cache-handler-core'
 import { S3Cache } from '../src'
 
 const mockHtmlPage = '<p>My Page</p>'
diff --git a/packages/s3-cache/package.json b/packages/s3-cache/package.json
@@ -31,7 +31,8 @@
   },
   "devDependencies": {
     "tsconfig": "*",
-    "@dbbs/next-cache-handler-common": "*"
+    "@dbbs/next-cache-handler-common": "*",
+    "@dbbs/next-cache-handler-core": "*"
   },
   "directories": {
     "lib": "lib"
diff --git a/packages/s3-cache/src/index.ts b/packages/s3-cache/src/index.ts
@@ -1,13 +1,8 @@
 import { NEXT_CACHE_TAGS_HEADER } from 'next/dist/lib/constants'
 import { ListObjectsV2CommandOutput, S3 } from '@aws-sdk/client-s3'
 import { PutObjectCommandInput } from '@aws-sdk/client-s3/dist-types/commands/PutObjectCommand'
-import {
-  getAWSCredentials,
-  type CacheEntry,
-  type CacheStrategy,
-  chunkArray,
-  CacheContext
-} from '@dbbs/next-cache-handler-common'
+import { getAWSCredentials, chunkArray } from '@dbbs/next-cache-handler-common'
+import type { CacheEntry, CacheStrategy, CacheContext } from '@dbbs/next-cache-handler-core'
 
 const TAG_PREFIX = 'revalidateTag'
 const NOT_FOUND_ERROR = ['NotFound', 'NoSuchKey']

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { CacheEntry, CacheStrategy } from '@dbbs/next-cache-handler-common'`
	`1`	`+import type { CacheEntry, CacheStrategy } from '../types'`
`2`	`2`	`import { checkHeaderTags } from '@dbbs/next-cache-handler-common'`
`3`	`3`
`4`	`4`	`const mapCache = new Map()`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`		`-export * from './types'`
`2`	`1`	`export * from './aws'`
`3`	`2`	`export * from './utils'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { CacheEntry } from '@dbbs/next-cache-handler-common'`
	`1`	`+import { CacheEntry } from '@dbbs/next-cache-handler-core'`
`2`	`2`	`export const mockCacheEntry: CacheEntry = {`
`3`	`3`	`value: {`
`4`	`4`	`pageData: {},`