@fgv/ts-json-base 5.0.0-28 → 5.0.0-29

package/dist/ts-json-base.d.ts

@@ -168,6 +168,11 @@ export declare function isJsonObject(from: unknown): from is JsonObject;
  */
 export declare function isJsonPrimitive(from: unknown): from is JsonPrimitive;
 
+/**
+ * Helper type to detect if T is exactly unknown.
+ */
+declare type IsUnknown<T> = unknown extends T ? ([T] extends [unknown] ? true : false) : false;
+
 /**
  * Function to transform the name of a some entity, given an original name
  * and the contents of the entity.
@@ -208,7 +213,7 @@ declare const jsonArray_2: Validator<JsonArray, IJsonValidatorContext>;
  * @returns A constrained type that is compatible with JSON serialization.
  * @public
  */
-export declare type JsonCompatible<T> = T extends JsonPrimitive ? T : T extends Array<unknown> ? JsonCompatibleArray<T[number]> : T extends Function ? ['Error: Function is not JSON-compatible'] : T extends object ? {
+export declare type JsonCompatible<T> = IsUnknown<T> extends true ? JsonValue : T extends JsonPrimitive ? T : T extends Array<unknown> ? JsonCompatibleArray<T[number]> : T extends Function ? ['Error: Function is not JSON-compatible'] : T extends object ? {
     [K in keyof T]: JsonCompatible<T[K]>;
 } : ['Error: Non-JSON type'];
 

package/lib/packlets/json/common.d.ts

@@ -29,13 +29,17 @@ export interface JsonArray extends Array<JsonValue> {
  * @public
  */
 export type JsonValueType = 'primitive' | 'object' | 'array';
+/**
+ * Helper type to detect if T is exactly unknown.
+ */
+type IsUnknown<T> = unknown extends T ? ([T] extends [unknown] ? true : false) : false;
 /**
  * A constrained type that is compatible with JSON serialization.
  * @param T - The type to be constrained
  * @returns A constrained type that is compatible with JSON serialization.
  * @public
  */
-export type JsonCompatible<T> = T extends JsonPrimitive ? T : T extends Array<unknown> ? JsonCompatibleArray<T[number]> : T extends Function ? ['Error: Function is not JSON-compatible'] : T extends object ? {
+export type JsonCompatible<T> = IsUnknown<T> extends true ? JsonValue : T extends JsonPrimitive ? T : T extends Array<unknown> ? JsonCompatibleArray<T[number]> : T extends Function ? ['Error: Function is not JSON-compatible'] : T extends object ? {
     [K in keyof T]: JsonCompatible<T[K]>;
 } : ['Error: Non-JSON type'];
 /**
@@ -117,4 +121,5 @@ export declare function sanitizeJson(from: unknown): Result<JsonValue>;
  * @public
  */
 export declare function sanitizeJsonObject<T>(from: T): Result<T>;
+export {};
 //# sourceMappingURL=common.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fgv/ts-json-base",
-  "version": "5.0.0-28",
+  "version": "5.0.0-29",
   "description": "Typescript types and basic functions for working with json",
   "main": "lib/index.js",
   "types": "dist/ts-json-base.d.ts",
@@ -39,12 +39,12 @@
     "@rushstack/eslint-patch": "~1.12.0",
     "@rushstack/eslint-config": "4.4.0",
     "eslint-plugin-tsdoc": "~0.4.0",
-    "@fgv/ts-utils": "5.0.0-28",
-    "@fgv/ts-utils-jest": "5.0.0-28",
-    "@fgv/ts-extras": "5.0.0-28"
+    "@fgv/ts-utils": "5.0.0-29",
+    "@fgv/ts-extras": "5.0.0-29",
+    "@fgv/ts-utils-jest": "5.0.0-29"
   },
   "peerDependencies": {
-    "@fgv/ts-utils": "5.0.0-28"
+    "@fgv/ts-utils": "5.0.0-29"
   },
   "scripts": {
     "build": "heft test --clean",