diff --git a/packages/common-aws/package.json b/packages/common-aws/package.json index 354b20a..2c352b9 100644 --- a/packages/common-aws/package.json +++ b/packages/common-aws/package.json @@ -1,6 +1,6 @@ { "name": "@paradoxical-io/common-aws", - "version": "2.5.2", + "version": "2.6.0", "description": "Common aws for paradox services", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/common-hapi/package.json b/packages/common-hapi/package.json index 0661fb7..84ddbee 100644 --- a/packages/common-hapi/package.json +++ b/packages/common-hapi/package.json @@ -1,6 +1,6 @@ { "name": "@paradoxical-io/common-hapi", - "version": "2.5.2", + "version": "2.6.0", "description": "Common hapi code for paradoxical services", "files": [ "dist/**/*.js", diff --git a/packages/common-server/package.json b/packages/common-server/package.json index 004e59f..9384934 100644 --- a/packages/common-server/package.json +++ b/packages/common-server/package.json @@ -1,6 +1,6 @@ { "name": "@paradoxical-io/common-server", - "version": "2.5.2", + "version": "2.6.0", "description": "Common code for paradox services", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/packages/common-server/src/config/index.ts b/packages/common-server/src/config/index.ts index aa85c56..0fb14eb 100644 --- a/packages/common-server/src/config/index.ts +++ b/packages/common-server/src/config/index.ts @@ -3,4 +3,3 @@ export * from './errors/providedConfigError'; export * from './loader'; export * from './providers/providedConfigValue'; export * from './providers/staticConfigProvider'; -export * from './resolver'; diff --git a/packages/common-sql/package.json b/packages/common-sql/package.json index 1ae28a4..6fc129b 100644 --- a/packages/common-sql/package.json +++ b/packages/common-sql/package.json @@ -1,6 +1,6 @@ { "name": "@paradoxical-io/common-sql", - "version": "2.5.2", + "version": "2.6.0", "files": [ "dist/**/*.js", "dist/**/*.d.ts", diff --git a/packages/common-test/package.json b/packages/common-test/package.json index 9cde306..4cf6453 100644 --- a/packages/common-test/package.json +++ b/packages/common-test/package.json @@ -1,6 +1,6 @@ { "name": "@paradoxical-io/common-test", - "version": "2.5.2", + "version": "2.6.0", "description": "Common test-code for jest", "files": [ "dist/**/*.js", diff --git a/packages/common/package.json b/packages/common/package.json index c807f88..73bca04 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@paradoxical-io/common", - "version": "2.5.2", + "version": "2.6.0", "description": "Common code for all paradox projects", "files": [ "dist/**/*.js", diff --git a/packages/common/src/promise/index.ts b/packages/common/src/promise/index.ts index c69c2df..62ce7fb 100644 --- a/packages/common/src/promise/index.ts +++ b/packages/common/src/promise/index.ts @@ -1,3 +1,4 @@ export * from './cache'; export * from './limiter'; +export * from './resolver'; export * from './timeout'; diff --git a/packages/common-server/src/config/resolver.test.ts b/packages/common/src/promise/resolver.test.ts similarity index 100% rename from packages/common-server/src/config/resolver.test.ts rename to packages/common/src/promise/resolver.test.ts diff --git a/packages/common-server/src/config/resolver.ts b/packages/common/src/promise/resolver.ts similarity index 88% rename from packages/common-server/src/config/resolver.ts rename to packages/common/src/promise/resolver.ts index ae63719..28bc34f 100644 --- a/packages/common-server/src/config/resolver.ts +++ b/packages/common/src/promise/resolver.ts @@ -1,10 +1,8 @@ -import { Limiter } from '@paradoxical-io/common/dist/promise/limiter'; - -import { ReloadableProvidedValue } from '.'; +import { Limiter } from './limiter'; type Resolved = T extends () => Promise ? U : T; -type Primitive = string | number | boolean | ReloadableProvidedValue | null | undefined; +type Primitive = string | number | boolean | null | undefined; type MappedResolved = T extends Primitive ? T : { [k in keyof T]: MappedResolved> }; diff --git a/packages/types/package.json b/packages/types/package.json index dab8617..ea7b4cf 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@paradoxical-io/types", - "version": "2.5.2", + "version": "2.6.0", "description": "Paradox shared types", "files": [ "dist/**/*.js",