@strictly/define 0.0.22 → 0.0.24

package/transformers/flatteners/specs/value_path_to_type_path.tests.ts

@@ -194,20 +194,20 @@ describe('valuePathToTypePath', function () {
           '$',
         ],
         [
-          '$.x:a',
-          '$.x:a',
+          '$:x.a',
+          '$:x.a',
         ],
         [
-          '$.x:b',
-          '$.x:b',
+          '$:x.b',
+          '$:x.b',
         ],
         [
-          '$.y:b',
-          '$.y:b',
+          '$:y.b',
+          '$:y.b',
         ],
         [
-          '$.y:c',
-          '$.y:c',
+          '$:y.c',
+          '$:y.c',
         ],
       ] as const)('it maps %s', function (from, to) {
         const typePath = valuePathToTypePath<Paths, typeof from>(typeDef, from)
@@ -237,6 +237,90 @@ describe('valuePathToTypePath', function () {
           expectTypeOf(fakeTypePath).toEqualTypeOf<'$.fake'>()
         })
       })
+
+      describe('nested discriminated', () => {
+        const nestedTypeDef = object().field('o', typeDef)
+        type Paths = ValueToTypePathsOfType<typeof nestedTypeDef>
+
+        describe.each([
+          [
+            '$',
+            '$',
+          ],
+          [
+            '$.o',
+            '$.o',
+          ],
+          [
+            '$.o:x.a',
+            '$.o:x.a',
+          ],
+          [
+            '$.o:x.b',
+            '$.o:x.b',
+          ],
+          [
+            '$.o:y.b',
+            '$.o:y.b',
+          ],
+          [
+            '$.o:y.c',
+            '$.o:y.c',
+          ],
+        ] as const)('it maps %s', function (from, to) {
+          const typePath = valuePathToTypePath<Paths, typeof from>(nestedTypeDef, from)
+
+          it('maps a value path to the expected type path', function () {
+            expect(typePath).toEqual(to)
+          })
+
+          it('has expected type', function () {
+            expectTypeOf(typePath).toEqualTypeOf(to)
+          })
+        })
+      })
+
+      describe('list discriminated', () => {
+        const listTypeDef = list(typeDef)
+        type Paths = ValueToTypePathsOfType<typeof listTypeDef>
+
+        describe.each([
+          [
+            '$',
+            '$',
+          ],
+          [
+            '$.0',
+            '$.*',
+          ],
+          [
+            '$.0:x.a',
+            '$.*:x.a',
+          ],
+          [
+            '$.0:x.b',
+            '$.*:x.b',
+          ],
+          [
+            '$.99:y.b',
+            '$.*:y.b',
+          ],
+          [
+            '$.1:y.c',
+            '$.*:y.c',
+          ],
+        ] as const)('it maps %s', function (from, to) {
+          const typePath = valuePathToTypePath<Paths, typeof from>(listTypeDef, from)
+
+          it('maps a value path to the expected type path', function () {
+            expect(typePath).toEqual(to)
+          })
+
+          it('has expected type', function () {
+            expectTypeOf(typePath).toEqualTypeOf(to)
+          })
+        })
+      })
     })
   })
 })

package/transformers/flatteners/value_path_to_type_path.ts

@@ -22,22 +22,29 @@ export function valuePathToTypePath<
 ): ValuePathsToTypePaths[ValuePath] {
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
   const valueSteps = (valuePath as string).split(/\.|\[/g)
-  assertEqual(valueSteps[0], '$')
+  const parts = valueSteps[0].split(':')
+  const [
+    first,
+    ...qualifiers
+  ] = parts
+  assertEqual(first, '$')
 
   const typeSteps = internalJsonValuePathToTypePath(
     typeDef,
+    qualifiers,
     valueSteps.slice(1),
     allowMissingPaths,
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     valuePath as string,
   )
-  typeSteps.unshift('$')
+  typeSteps.unshift(valueSteps[0])
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
   return typeSteps.join('.') as ValuePathsToTypePaths[ValuePath]
 }
 
 function internalJsonValuePathToTypePath(
   typeDef: TypeDef,
+  qualifiers: string[],
   valueSteps: string[],
   allowMissingPaths: boolean,
   originalValuePath: string,
@@ -46,9 +53,14 @@ function internalJsonValuePathToTypePath(
     return []
   }
   const [
-    valueStep,
+    nextValueStepAndQualifiersString,
     ...remainingValueSteps
   ] = valueSteps
+  const nextValueStepAndQualifiers = nextValueStepAndQualifiersString.split(':')
+  const [
+    valueStep,
+    ...nextQualifiers
+  ] = nextValueStepAndQualifiers
   switch (typeDef.type) {
     case TypeDefType.Literal:
       if (allowMissingPaths) {
@@ -58,15 +70,19 @@ function internalJsonValuePathToTypePath(
         throw new PreconditionFailedError(
           'literal should terminate path {} ({})',
           originalValuePath,
-          valueStep,
+          nextValueStepAndQualifiersString,
         )
       }
     case TypeDefType.List:
       // TODO assert format of current step
       return [
-        '*',
+        [
+          '*',
+          ...nextQualifiers,
+        ].join(':'),
         ...internalJsonValuePathToTypePath(
           typeDef.elements,
+          nextQualifiers,
           remainingValueSteps,
           allowMissingPaths,
           originalValuePath,
@@ -74,9 +90,13 @@ function internalJsonValuePathToTypePath(
       ]
     case TypeDefType.Record:
       return [
-        '*',
+        [
+          '*',
+          ...nextQualifiers,
+        ].join(':'),
         ...internalJsonValuePathToTypePath(
           typeDef.valueTypeDef,
+          nextQualifiers,
           remainingValueSteps,
           allowMissingPaths,
           originalValuePath,
@@ -92,9 +112,10 @@ function internalJsonValuePathToTypePath(
         assertExists(typeDef.fields[valueStep], 'missing field in {} ({})', originalValuePath, valueStep)
       }
       return [
-        valueStep,
+        nextValueStepAndQualifiersString,
         ...internalJsonValuePathToTypePath(
           typeDef.fields[valueStep],
+          nextQualifiers,
           remainingValueSteps,
           allowMissingPaths,
           originalValuePath,
@@ -117,6 +138,7 @@ function internalJsonValuePathToTypePath(
           assertExists(union, 'expected a complex union {}', originalValuePath)
           return internalJsonValuePathToTypePath(
             union,
+            nextQualifiers,
             valueSteps,
             allowMissingPaths,
             originalValuePath,
@@ -126,8 +148,7 @@ function internalJsonValuePathToTypePath(
           return []
         }
       } else {
-        const qualifierIndex = valueStep.indexOf(':')
-        if (qualifierIndex < 0) {
+        if (qualifiers.length === 0) {
           if (allowMissingPaths) {
             return valueSteps
           } else {
@@ -138,25 +159,18 @@ function internalJsonValuePathToTypePath(
             )
           }
         }
-        const qualifier = valueStep.substring(0, qualifierIndex)
-        const remainder = valueStep.substring(qualifierIndex + 1)
-        const union = assertExistsAndReturn(typeDef.unions[qualifier], 'missing union {}', qualifier)
         const [
-          typeStep,
-          ...remainingTypeSteps
-        ] = internalJsonValuePathToTypePath(
+          qualifier,
+          ...remainingQualifiers
+        ] = qualifiers
+        const union = assertExistsAndReturn(typeDef.unions[qualifier], 'missing union {}', qualifier)
+        return internalJsonValuePathToTypePath(
           union,
-          [
-            remainder,
-            ...remainingValueSteps,
-          ],
+          remainingQualifiers,
+          valueSteps,
           allowMissingPaths,
           originalValuePath,
         )
-        return [
-          `${qualifier}:${typeStep}`,
-          ...remainingTypeSteps,
-        ]
       }
     default:
       throw new UnreachableError(typeDef)

package/types/flattened_types_of_type.ts

@@ -23,25 +23,23 @@ export type FlattenedTypesOfType<
   SegmentOverride extends string | null,
   Path extends string = '$',
   Depth extends number = StartingDepth,
-> = InternalFlattenedTypeDefsOf<T['definition'], SegmentOverride, Path, '', Depth>
+> = InternalFlattenedTypeDefsOf<T['definition'], SegmentOverride, Path, Depth>
 
 type InternalFlattenedTypeDefsOf<
   T extends TypeDef,
   SegmentOverride extends string | null,
   Path extends string,
-  Qualifier extends string,
   Depth extends number,
 > =
   & {
     readonly [K in Path]: Type<T>
   }
-  & InternalFlattenedTypeDefsOfChildren<T, SegmentOverride, Path, Qualifier, Depth>
+  & InternalFlattenedTypeDefsOfChildren<T, SegmentOverride, Path, Depth>
 
 type InternalFlattenedTypeDefsOfChildren<
   T extends TypeDef,
   SegmentOverride extends string | null,
   Path extends string,
-  Qualifier extends string,
   Depth extends number,
   NextDepth extends number = Depths[Depth],
 > =
@@ -51,9 +49,8 @@ type InternalFlattenedTypeDefsOfChildren<
     : T extends LiteralTypeDef ? InternalFlattenedTypeDefsOfLiteralChildren
     : T extends ListTypeDef ? InternalFlattenedTypeDefsOfListChildren<T, SegmentOverride, Path, NextDepth>
     : T extends RecordTypeDef ? InternalFlattenedTypeDefsOfRecordChildren<T, SegmentOverride, Path, NextDepth>
-    : T extends ObjectTypeDef
-      ? InternalFlattenedTypeDefsOfObjectChildren<T, SegmentOverride, Path, Qualifier, NextDepth>
-    : T extends UnionTypeDef ? InternalFlattenedTypeDefsOfUnionChildren<T, SegmentOverride, Path, Qualifier, NextDepth>
+    : T extends ObjectTypeDef ? InternalFlattenedTypeDefsOfObjectChildren<T, SegmentOverride, Path, NextDepth>
+    : T extends UnionTypeDef ? InternalFlattenedTypeDefsOfUnionChildren<T, SegmentOverride, Path, NextDepth>
     : never
 
 type InternalFlattenedTypeDefsOfLiteralChildren = {}
@@ -67,7 +64,6 @@ type InternalFlattenedTypeDefsOfListChildren<
   T['elements'],
   SegmentOverride,
   PathOf<Path, number, SegmentOverride>,
-  '',
   Depth
 >
 
@@ -80,7 +76,6 @@ type InternalFlattenedTypeDefsOfRecordChildren<
   T['valueTypeDef'],
   SegmentOverride,
   PathOf<Path, T['keyPrototype'], SegmentOverride>,
-  '',
   Depth
 >
 
@@ -88,7 +83,6 @@ type InternalFlattenedTypeDefsOfObjectChildren<
   T extends ObjectTypeDef,
   SegmentOverride extends string | null,
   Path extends string,
-  Qualifier extends string,
   Depth extends number,
 > = T extends ObjectTypeDef<infer Fields> ? keyof Fields extends string ? UnionToIntersection<{
       readonly [K in keyof Fields]-?: undefined extends Fields[K] ? InternalFlattenedTypeDefsOf<
@@ -97,15 +91,13 @@ type InternalFlattenedTypeDefsOfObjectChildren<
             readonly '1': LiteralTypeDef<undefined>,
           }>,
           SegmentOverride,
-          PathOf<Path, `${Qualifier}${K}`, null>,
-          '',
+          PathOf<Path, K, null>,
           Depth
         >
         : InternalFlattenedTypeDefsOf<
           Exclude<Fields[K], undefined>,
           SegmentOverride,
-          PathOf<Path, `${Qualifier}${K}`, null>,
-          '',
+          PathOf<Path, K, null>,
           Depth
         >
     }[keyof Fields]>
@@ -116,14 +108,12 @@ type InternalFlattenedTypeDefsOfUnionChildren<
   T extends UnionTypeDef,
   SegmentOverride extends string | null,
   Path extends string,
-  Qualifier extends string,
   Depth extends number,
 > = T extends UnionTypeDef<infer D, infer Unions> ? keyof Unions extends string ? D extends null ? UnionToIntersection<{
         readonly [K in keyof Unions]: InternalFlattenedTypeDefsOfChildren<
           Unions[K],
           SegmentOverride,
           Path,
-          '',
           Depth
         >
       }[keyof Unions]>
@@ -131,8 +121,7 @@ type InternalFlattenedTypeDefsOfUnionChildren<
       readonly [K in keyof Unions]: InternalFlattenedTypeDefsOfChildren<
         Unions[K],
         SegmentOverride,
-        Path,
-        `${Qualifier}${K}:`,
+        `${Path}:${K}`,
         Depth
       >
     }[keyof Unions]>

package/types/flattened_types_of_validating_type.ts

@@ -26,25 +26,23 @@ export type FlattenedTypesOfValidatingType<
   SegmentOverride extends string | null,
   Path extends string = '$',
   Depth extends number = StartingDepth,
-> = InternalFlattenedTypeDefsOf<T['definition'], SegmentOverride, Path, '', Depth>
+> = InternalFlattenedTypeDefsOf<T['definition'], SegmentOverride, Path, Depth>
 
 type InternalFlattenedTypeDefsOf<
   T extends TypeDef,
   SegmentOverride extends string | null,
   Path extends string,
-  Qualifier extends string,
   Depth extends number,
 > =
   & {
     readonly [K in Path]: Type<T>
   }
-  & InternalFlattenedTypeDefsOfChildren<T, SegmentOverride, Path, Qualifier, Depth>
+  & InternalFlattenedTypeDefsOfChildren<T, SegmentOverride, Path, Depth>
 
 type InternalFlattenedTypeDefsOfChildren<
   T extends TypeDef,
   SegmentOverride extends string | null,
   Path extends string,
-  Qualifier extends string,
   Depth extends number,
   NextDepth extends number = Depths[Depth],
 > =
@@ -54,10 +52,8 @@ type InternalFlattenedTypeDefsOfChildren<
     : T extends ValidatingLiteralTypeDef ? InternalFlattenedTypeDefsOfLiteralChildren
     : T extends ValidatingListTypeDef ? InternalFlattenedTypeDefsOfListChildren<T, SegmentOverride, Path, NextDepth>
     : T extends ValidatingRecordTypeDef ? InternalFlattenedTypeDefsOfRecordChildren<T, SegmentOverride, Path, NextDepth>
-    : T extends ValidatingObjectTypeDef
-      ? InternalFlattenedTypeDefsOfObjectChildren<T, SegmentOverride, Path, Qualifier, NextDepth>
-    : T extends ValidatingUnionTypeDef
-      ? InternalFlattenedTypeDefsOfUnionChildren<T, SegmentOverride, Path, Qualifier, NextDepth>
+    : T extends ValidatingObjectTypeDef ? InternalFlattenedTypeDefsOfObjectChildren<T, SegmentOverride, Path, NextDepth>
+    : T extends ValidatingUnionTypeDef ? InternalFlattenedTypeDefsOfUnionChildren<T, SegmentOverride, Path, NextDepth>
     : never
 
 type InternalFlattenedTypeDefsOfLiteralChildren = {}
@@ -71,7 +67,6 @@ type InternalFlattenedTypeDefsOfListChildren<
   T['elements'],
   SegmentOverride,
   PathOf<Path, number, SegmentOverride>,
-  '',
   Depth
 >
 
@@ -84,7 +79,6 @@ type InternalFlattenedTypeDefsOfRecordChildren<
   T['valueTypeDef'],
   SegmentOverride,
   PathOf<Path, T['keyPrototype'], SegmentOverride>,
-  '',
   Depth
 >
 
@@ -92,7 +86,6 @@ type InternalFlattenedTypeDefsOfObjectChildren<
   T extends ValidatingObjectTypeDef,
   SegmentOverride extends string | null,
   Path extends string,
-  Qualifier extends string,
   Depth extends number,
 > = T extends ValidatingObjectTypeDef<infer _E, infer _C, infer Fields>
   ? keyof Fields extends string ? UnionToIntersection<{
@@ -111,15 +104,13 @@ type InternalFlattenedTypeDefsOfObjectChildren<
             }
           >,
           SegmentOverride,
-          PathOf<Path, `${Qualifier}${K}`, null>,
-          '',
+          PathOf<Path, K, null>,
           Depth
         >
         : InternalFlattenedTypeDefsOf<
           Exclude<Fields[K], undefined>,
           SegmentOverride,
-          PathOf<Path, `${Qualifier}${K}`, null>,
-          '',
+          PathOf<Path, K, null>,
           Depth
         >
     }[keyof Fields]>
@@ -130,7 +121,6 @@ type InternalFlattenedTypeDefsOfUnionChildren<
   T extends ValidatingUnionTypeDef,
   SegmentOverride extends string | null,
   Path extends string,
-  Qualifier extends string,
   Depth extends number,
 > = T extends ValidatingUnionTypeDef<infer _E, infer _C, infer D, infer Unions>
   ? keyof Unions extends string ? D extends null ? UnionToIntersection<{
@@ -138,7 +128,6 @@ type InternalFlattenedTypeDefsOfUnionChildren<
           Unions[K],
           SegmentOverride,
           Path,
-          '',
           Depth
         >
       }[keyof Unions]>
@@ -146,8 +135,7 @@ type InternalFlattenedTypeDefsOfUnionChildren<
       readonly [K in keyof Unions]: InternalFlattenedTypeDefsOfChildren<
         Unions[K],
         SegmentOverride,
-        Path,
-        `${Qualifier}${K}:`,
+        `${Path}:${K}`,
         Depth
       >
     }[keyof Unions]>

package/types/paths_of_type.ts

@@ -26,24 +26,22 @@ export type InternalJsonPathsOf<
   // TODO maybe depth isn't necessary here?
   Depth extends number,
   NextDepth extends number = Depths[Depth],
-> = InternalJsonPathsOfChildren<F, Prefix, SegmentOverride, '', NextDepth> | Prefix
+> = InternalJsonPathsOfChildren<F, Prefix, SegmentOverride, NextDepth> | Prefix
 
 type InternalJsonPathsOfChildren<
   F extends TypeDef,
   Prefix extends string,
   SegmentOverride extends string | null,
-  Qualifier extends string,
   Depth extends number,
 > = Depth extends -1 ? never
   : F extends LiteralTypeDef ? InternalJsonPathsOfLiteralChildren
   : F extends ListTypeDef ? InternalJsonPathsOfListChildren<F, Prefix, SegmentOverride, Depth>
   : F extends RecordTypeDef ? InternalJsonPathsOfRecordChildren<F, Prefix, SegmentOverride, Depth>
-  : F extends ObjectTypeDef ? InternalJsonPathsOfObjectChildren<F, Prefix, SegmentOverride, Qualifier, Depth>
+  : F extends ObjectTypeDef ? InternalJsonPathsOfObjectChildren<F, Prefix, SegmentOverride, Depth>
   : F extends UnionTypeDef ? InternalJsonPathsOfUnionChildren<
       F,
       Prefix,
       SegmentOverride,
-      Qualifier,
       Depth
     >
   : never
@@ -86,28 +84,25 @@ type InternalJsonPathsOfObjectChildren<
   F extends ObjectTypeDef,
   Prefix extends string,
   SegmentOverride extends string | null,
-  Qualifier extends string,
   Depth extends number,
-> = F extends ObjectTypeDef<infer Fields> ? keyof Fields extends string ? {
-      [K in keyof Fields]: InternalJsonPathsOf<
-        Fields[K],
-        PathOf<
-          Prefix,
-          `${Qualifier}${K}`,
-          null
-        >,
-        SegmentOverride,
-        Depth
-      >
-    }[keyof Fields]
-  : never
+> = F extends ObjectTypeDef<infer Fields> ? {
+    [K in keyof Fields]: InternalJsonPathsOf<
+      Fields[K],
+      PathOf<
+        Prefix,
+        K,
+        null
+      >,
+      SegmentOverride,
+      Depth
+    >
+  }[keyof Fields]
   : never
 
 type InternalJsonPathsOfUnionChildren<
   F extends UnionTypeDef,
   Prefix extends string,
   SegmentOverride extends string | null,
-  Qualifier extends string,
   Depth extends number,
 > // typescript cannot infer the key in unions unless we get the value directly
  = F extends UnionTypeDef<infer D, infer Unions> ? keyof Unions extends string ? {
@@ -117,13 +112,12 @@ type InternalJsonPathsOfUnionChildren<
         // I think what we should do is have a "denormalize of", which you can then
         // get the paths of if you want the unique paths
         // (alt PrefixOf<Prefix, K>,)
-        Prefix,
+        D extends null ? Prefix : `${Prefix}:${K}`,
         SegmentOverride,
-        D extends null ? Qualifier : `${Qualifier}${K}:`,
         Depth
       >
     }[keyof Unions]
     // do not expose the discriminator as we cannot set this value independently
-    //  | (D extends string ? JsonPathOf<Prefix, D, null, Qualifier> : never)
+    //  | (D extends string ? JsonPathOf<Prefix, D, null> : never)
   : never
   : never

package/types/specs/flattened_types_of_type.tests.ts

@@ -192,13 +192,13 @@ describe('union', function () {
 
       type C = {
         readonly $: SimplifyDeep<typeof builder._type>,
-        readonly ['$.1:a']: {
+        readonly ['$:1.a']: {
           readonly definition: {
             readonly type: TypeDefType.Literal,
             readonly valuePrototype: [boolean],
           },
         },
-        readonly ['$.2:a']: {
+        readonly ['$:2.a']: {
           readonly definition: {
             readonly type: TypeDefType.Literal,
             readonly valuePrototype: [number],
@@ -227,25 +227,25 @@ describe('union', function () {
       type T = SimplifyDeep<FlattenedTypesOfType<typeof builder._type, null>>
       type C = {
         readonly $: SimplifyDeep<typeof builder._type>,
-        readonly ['$.1:p:a']: {
+        readonly ['$:1:p.a']: {
           readonly definition: {
             readonly type: TypeDefType.Literal,
             readonly valuePrototype: [boolean],
           },
         },
-        readonly ['$.1:q:a']: {
+        readonly ['$:1:q.a']: {
           readonly definition: {
             readonly type: TypeDefType.Literal,
             readonly valuePrototype: [string],
           },
         },
-        readonly ['$.2:r:b']: {
+        readonly ['$:2:r.b']: {
           readonly definition: {
             readonly type: TypeDefType.Literal,
             readonly valuePrototype: [number],
           },
         },
-        readonly ['$.2:s:c']: {
+        readonly ['$:2:s.c']: {
           readonly definition: {
             readonly type: TypeDefType.Literal,
             readonly valuePrototype: [string],

package/types/specs/paths_of_type.tests.ts

@@ -263,7 +263,7 @@ describe('PathsOfType', function () {
 
     type T = PathsOfType<typeof builder>
 
-    type P = '$' | '$.1:a' | '$.2:b'
+    type P = '$' | '$:1.a' | '$:2.b'
 
     it('equals expected type', function () {
       expectTypeOf<P>().toEqualTypeOf<T>()
@@ -283,7 +283,7 @@ describe('PathsOfType', function () {
 
     type T = PathsOfType<typeof builder>
 
-    type P = '$' | '$.1:p:a' | '$.2:q:b'
+    type P = '$' | '$:1:p.a' | '$:2:q.b'
 
     it('equals expected type', function () {
       expectTypeOf<P>().toEqualTypeOf<T>()

package/types/specs/value_to_type_paths_of_type.tests.ts

@@ -119,10 +119,10 @@ describe('ValueToTypePathsOfType', function () {
 
       type C = {
         readonly $: '$',
-        readonly ['$.1:a']: '$.1:a',
-        readonly ['$.1:b']: '$.1:b',
-        readonly ['$.2:x']: '$.2:x',
-        readonly ['$.2:y']: '$.2:y',
+        readonly ['$:1.a']: '$:1.a',
+        readonly ['$:1.b']: '$:1.b',
+        readonly ['$:2.x']: '$:2.x',
+        readonly ['$:2.y']: '$:2.y',
       }
       it('equals expected type', function () {
         expectTypeOf<C>().toEqualTypeOf<T>()