@strictly/define 0.0.22 → 0.0.23

package/dist/index.d.ts

@@ -152,24 +152,24 @@ type Depths = [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13];
 
 type PathOf<Prefix extends string, Accessor extends string | number | symbol, SegmentOverride extends string | null = null> = SegmentOverride extends string ? `${Prefix}.${SegmentOverride}` : Accessor extends string | number ? `${Prefix}.${Accessor}` : never;
 
-type FlattenedTypesOfType<T extends Type, SegmentOverride extends string | null, Path extends string = '$', Depth extends number = StartingDepth> = InternalFlattenedTypeDefsOf$1<T['definition'], SegmentOverride, Path, '', Depth>;
-type InternalFlattenedTypeDefsOf$1<T extends TypeDef, SegmentOverride extends string | null, Path extends string, Qualifier extends string, Depth extends number> = {
+type FlattenedTypesOfType<T extends Type, SegmentOverride extends string | null, Path extends string = '$', Depth extends number = StartingDepth> = InternalFlattenedTypeDefsOf$1<T['definition'], SegmentOverride, Path, Depth>;
+type InternalFlattenedTypeDefsOf$1<T extends TypeDef, SegmentOverride extends string | null, Path extends string, Depth extends number> = {
     readonly [K in Path]: Type<T>;
-} & InternalFlattenedTypeDefsOfChildren$1<T, SegmentOverride, Path, Qualifier, Depth>;
-type InternalFlattenedTypeDefsOfChildren$1<T extends TypeDef, SegmentOverride extends string | null, Path extends string, Qualifier extends string, Depth extends number, NextDepth extends number = Depths[Depth]> = NextDepth extends -1 ? never : T extends LiteralTypeDef ? InternalFlattenedTypeDefsOfLiteralChildren$1 : T extends ListTypeDef ? InternalFlattenedTypeDefsOfListChildren$1<T, SegmentOverride, Path, NextDepth> : T extends RecordTypeDef ? InternalFlattenedTypeDefsOfRecordChildren$1<T, SegmentOverride, Path, NextDepth> : T extends ObjectTypeDef ? InternalFlattenedTypeDefsOfObjectChildren$1<T, SegmentOverride, Path, Qualifier, NextDepth> : T extends UnionTypeDef ? InternalFlattenedTypeDefsOfUnionChildren$1<T, SegmentOverride, Path, Qualifier, NextDepth> : never;
+} & InternalFlattenedTypeDefsOfChildren$1<T, SegmentOverride, Path, Depth>;
+type InternalFlattenedTypeDefsOfChildren$1<T extends TypeDef, SegmentOverride extends string | null, Path extends string, Depth extends number, NextDepth extends number = Depths[Depth]> = NextDepth extends -1 ? never : T extends LiteralTypeDef ? InternalFlattenedTypeDefsOfLiteralChildren$1 : T extends ListTypeDef ? InternalFlattenedTypeDefsOfListChildren$1<T, SegmentOverride, Path, NextDepth> : T extends RecordTypeDef ? InternalFlattenedTypeDefsOfRecordChildren$1<T, SegmentOverride, Path, NextDepth> : T extends ObjectTypeDef ? InternalFlattenedTypeDefsOfObjectChildren$1<T, SegmentOverride, Path, NextDepth> : T extends UnionTypeDef ? InternalFlattenedTypeDefsOfUnionChildren$1<T, SegmentOverride, Path, NextDepth> : never;
 type InternalFlattenedTypeDefsOfLiteralChildren$1 = {};
-type InternalFlattenedTypeDefsOfListChildren$1<T extends ListTypeDef, SegmentOverride extends string | null, Path extends string, Depth extends number> = InternalFlattenedTypeDefsOf$1<T['elements'], SegmentOverride, PathOf<Path, number, SegmentOverride>, '', Depth>;
-type InternalFlattenedTypeDefsOfRecordChildren$1<T extends RecordTypeDef, SegmentOverride extends string | null, Path extends string, Depth extends number> = InternalFlattenedTypeDefsOf$1<T['valueTypeDef'], SegmentOverride, PathOf<Path, T['keyPrototype'], SegmentOverride>, '', Depth>;
-type InternalFlattenedTypeDefsOfObjectChildren$1<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<{
+type InternalFlattenedTypeDefsOfListChildren$1<T extends ListTypeDef, SegmentOverride extends string | null, Path extends string, Depth extends number> = InternalFlattenedTypeDefsOf$1<T['elements'], SegmentOverride, PathOf<Path, number, SegmentOverride>, Depth>;
+type InternalFlattenedTypeDefsOfRecordChildren$1<T extends RecordTypeDef, SegmentOverride extends string | null, Path extends string, Depth extends number> = InternalFlattenedTypeDefsOf$1<T['valueTypeDef'], SegmentOverride, PathOf<Path, T['keyPrototype'], SegmentOverride>, Depth>;
+type InternalFlattenedTypeDefsOfObjectChildren$1<T extends ObjectTypeDef, SegmentOverride extends string | null, Path 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$1<UnionTypeDef<null, {
         readonly '0': Exclude<Fields[K], undefined>;
         readonly '1': LiteralTypeDef<undefined>;
-    }>, SegmentOverride, PathOf<Path, `${Qualifier}${K}`, null>, '', Depth> : InternalFlattenedTypeDefsOf$1<Exclude<Fields[K], undefined>, SegmentOverride, PathOf<Path, `${Qualifier}${K}`, null>, '', Depth>;
+    }>, SegmentOverride, PathOf<Path, K, null>, Depth> : InternalFlattenedTypeDefsOf$1<Exclude<Fields[K], undefined>, SegmentOverride, PathOf<Path, K, null>, Depth>;
 }[keyof Fields]> : never : never;
-type InternalFlattenedTypeDefsOfUnionChildren$1<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$1<Unions[K], SegmentOverride, Path, '', Depth>;
+type InternalFlattenedTypeDefsOfUnionChildren$1<T extends UnionTypeDef, SegmentOverride extends string | null, Path 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$1<Unions[K], SegmentOverride, Path, Depth>;
 }[keyof Unions]> : UnionToIntersection<{
-    readonly [K in keyof Unions]: InternalFlattenedTypeDefsOfChildren$1<Unions[K], SegmentOverride, Path, `${Qualifier}${K}:`, Depth>;
+    readonly [K in keyof Unions]: InternalFlattenedTypeDefsOfChildren$1<Unions[K], SegmentOverride, `${Path}:${K}`, Depth>;
 }[keyof Unions]> : never : never;
 
 type FlattenedValuesOfType<T extends Type, SegmentOverride extends string | null = null, Flattened extends Readonly<Record<string, Type>> = FlattenedTypesOfType<T, SegmentOverride>> = {
@@ -271,24 +271,24 @@ type ValidatingUnionTypeDef<E = any, C = any, D extends string | null = string |
     readonly readonly: boolean;
 };
 
-type FlattenedTypesOfValidatingType<T extends Type, SegmentOverride extends string | null, Path extends string = '$', Depth extends number = StartingDepth> = InternalFlattenedTypeDefsOf<T['definition'], SegmentOverride, Path, '', Depth>;
-type InternalFlattenedTypeDefsOf<T extends TypeDef, SegmentOverride extends string | null, Path extends string, Qualifier extends string, Depth extends number> = {
+type FlattenedTypesOfValidatingType<T extends Type, SegmentOverride extends string | null, Path extends string = '$', Depth extends number = StartingDepth> = InternalFlattenedTypeDefsOf<T['definition'], SegmentOverride, Path, Depth>;
+type InternalFlattenedTypeDefsOf<T extends TypeDef, SegmentOverride extends string | null, Path extends string, Depth extends number> = {
     readonly [K in Path]: Type<T>;
-} & InternalFlattenedTypeDefsOfChildren<T, SegmentOverride, Path, Qualifier, Depth>;
-type InternalFlattenedTypeDefsOfChildren<T extends TypeDef, SegmentOverride extends string | null, Path extends string, Qualifier extends string, Depth extends number, NextDepth extends number = Depths[Depth]> = NextDepth extends -1 ? never : 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> : never;
+} & InternalFlattenedTypeDefsOfChildren<T, SegmentOverride, Path, Depth>;
+type InternalFlattenedTypeDefsOfChildren<T extends TypeDef, SegmentOverride extends string | null, Path extends string, Depth extends number, NextDepth extends number = Depths[Depth]> = NextDepth extends -1 ? never : 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, NextDepth> : T extends ValidatingUnionTypeDef ? InternalFlattenedTypeDefsOfUnionChildren<T, SegmentOverride, Path, NextDepth> : never;
 type InternalFlattenedTypeDefsOfLiteralChildren = {};
-type InternalFlattenedTypeDefsOfListChildren<T extends ValidatingListTypeDef, SegmentOverride extends string | null, Path extends string, Depth extends number> = InternalFlattenedTypeDefsOf<T['elements'], SegmentOverride, PathOf<Path, number, SegmentOverride>, '', Depth>;
-type InternalFlattenedTypeDefsOfRecordChildren<T extends ValidatingRecordTypeDef, SegmentOverride extends string | null, Path extends string, Depth extends number> = InternalFlattenedTypeDefsOf<T['valueTypeDef'], SegmentOverride, PathOf<Path, T['keyPrototype'], SegmentOverride>, '', Depth>;
-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<{
+type InternalFlattenedTypeDefsOfListChildren<T extends ValidatingListTypeDef, SegmentOverride extends string | null, Path extends string, Depth extends number> = InternalFlattenedTypeDefsOf<T['elements'], SegmentOverride, PathOf<Path, number, SegmentOverride>, Depth>;
+type InternalFlattenedTypeDefsOfRecordChildren<T extends ValidatingRecordTypeDef, SegmentOverride extends string | null, Path extends string, Depth extends number> = InternalFlattenedTypeDefsOf<T['valueTypeDef'], SegmentOverride, PathOf<Path, T['keyPrototype'], SegmentOverride>, Depth>;
+type InternalFlattenedTypeDefsOfObjectChildren<T extends ValidatingObjectTypeDef, SegmentOverride extends string | null, Path extends string, Depth extends number> = T extends ValidatingObjectTypeDef<infer _E, infer _C, infer Fields> ? keyof Fields extends string ? UnionToIntersection<{
     readonly [K in keyof Fields]-?: undefined extends Fields[K] ? InternalFlattenedTypeDefsOf<ValidatingUnionTypeDef<ErrorOfValidatingTypeDef<Exclude<Fields[K], undefined>>, ContextOfValidatingTypeDef<Exclude<Fields[K], undefined>>, null, {
         readonly '0': Exclude<Fields[K], undefined>;
         readonly '1': ValidatingLiteralTypeDef<undefined>;
-    }>, SegmentOverride, PathOf<Path, `${Qualifier}${K}`, null>, '', Depth> : InternalFlattenedTypeDefsOf<Exclude<Fields[K], undefined>, SegmentOverride, PathOf<Path, `${Qualifier}${K}`, null>, '', Depth>;
+    }>, SegmentOverride, PathOf<Path, K, null>, Depth> : InternalFlattenedTypeDefsOf<Exclude<Fields[K], undefined>, SegmentOverride, PathOf<Path, K, null>, Depth>;
 }[keyof Fields]> : never : never;
-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<{
-    readonly [K in keyof Unions]: InternalFlattenedTypeDefsOfChildren<Unions[K], SegmentOverride, Path, '', Depth>;
+type InternalFlattenedTypeDefsOfUnionChildren<T extends ValidatingUnionTypeDef, SegmentOverride extends string | null, Path extends string, Depth extends number> = T extends ValidatingUnionTypeDef<infer _E, infer _C, 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]> : UnionToIntersection<{
-    readonly [K in keyof Unions]: InternalFlattenedTypeDefsOfChildren<Unions[K], SegmentOverride, Path, `${Qualifier}${K}:`, Depth>;
+    readonly [K in keyof Unions]: InternalFlattenedTypeDefsOfChildren<Unions[K], SegmentOverride, `${Path}:${K}`, Depth>;
 }[keyof Unions]> : never : never;
 
 type ValidatorOfValidatingType<T extends ValidatingTypeDef, ValuePath extends string> = T extends ValidatingTypeDef<infer E, infer C> ? Validator<ValueOfTypeDef<ReadonlyOfTypeDef<T>>, E, ValuePath, C> : never;
@@ -301,7 +301,7 @@ declare function flattenValidatorsOfValidatingType<T extends ValidatingType, Typ
 declare function flattenValuesOfType<T extends Type>(typeDef: Type, value: ValueOfType<T>): Record<string, any>;
 
 declare function jsonPath<Prefix extends string, Segment extends number | string>(prefix: Prefix, segment: Segment): `${Prefix}.${Segment}`;
-declare function jsonPath<Prefix extends string, Segment extends number | string, Qualifier extends string>(prefix: Prefix, segment: Segment, qualifier: Qualifier): `${Prefix}.${Qualifier}${Segment}`;
+declare function jsonPath<Prefix extends string, Segment extends number | string, Qualifier extends string>(prefix: Prefix, segment: Segment, qualifier: Qualifier): `${Prefix}${Qualifier}.${Segment}`;
 declare function jsonPathPop<Path extends string>(path: Path): [string, string] | null;
 declare function jsonPathPrefix<Prefix extends string, Path extends string>(prefix: Prefix, path: Path): Path extends StringConcatOf<'$', infer ToMount> ? `${Prefix}${ToMount}` : never;
 declare function jsonPathUnprefix<Prefix extends string, Path extends string>(prefix: Prefix, path: Path): Path extends StringConcatOf<Prefix, infer ToUnmount> ? `$${ToUnmount}` : never;
@@ -489,33 +489,33 @@ declare function union<D extends null>(): UnionTypeDefBuilder<never, {}, D, {}>;
 declare function union<D extends string>(discriminator: D): UnionTypeDefBuilder<never, {}, D, {}>;
 
 type PathsOfType<T extends Type, SegmentOverride extends string | null = null, Prefix extends string = '$'> = InternalJsonPathsOf<T['definition'], Prefix, SegmentOverride, StartingDepth>;
-type InternalJsonPathsOf<F extends TypeDef, Prefix extends string, SegmentOverride extends string | null, Depth extends number, NextDepth extends number = Depths[Depth]> = 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 UnionTypeDef ? InternalJsonPathsOfUnionChildren<F, Prefix, SegmentOverride, Qualifier, Depth> : never;
+type InternalJsonPathsOf<F extends TypeDef, Prefix extends string, SegmentOverride extends string | null, Depth extends number, NextDepth extends number = Depths[Depth]> = InternalJsonPathsOfChildren<F, Prefix, SegmentOverride, NextDepth> | Prefix;
+type InternalJsonPathsOfChildren<F extends TypeDef, Prefix extends string, SegmentOverride extends string | null, 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, Depth> : F extends UnionTypeDef ? InternalJsonPathsOfUnionChildren<F, Prefix, SegmentOverride, Depth> : never;
 type InternalJsonPathsOfLiteralChildren = never;
 type InternalJsonPathsOfListChildren<F extends ListTypeDef, Prefix extends string, SegmentOverride extends string | null, Depth extends number> = InternalJsonPathsOf<F['elements'], PathOf<Prefix, number, SegmentOverride>, SegmentOverride, Depth>;
 type InternalJsonPathsOfRecordChildren<F extends RecordTypeDef, Prefix extends string, SegmentOverride extends string | null, Depth extends number> = InternalJsonPathsOf<F['valueTypeDef'], PathOf<Prefix, F['keyPrototype'], SegmentOverride>, SegmentOverride, Depth>;
-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 : never;
-type InternalJsonPathsOfUnionChildren<F extends UnionTypeDef, Prefix extends string, SegmentOverride extends string | null, Qualifier extends string, Depth extends number> = F extends UnionTypeDef<infer D, infer Unions> ? keyof Unions extends string ? {
-    readonly [K in keyof Unions]: InternalJsonPathsOfChildren<Unions[K], Prefix, SegmentOverride, D extends null ? Qualifier : `${Qualifier}${K}:`, Depth>;
+type InternalJsonPathsOfObjectChildren<F extends ObjectTypeDef, Prefix extends string, SegmentOverride extends string | null, Depth extends number> = 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, Depth extends number> = F extends UnionTypeDef<infer D, infer Unions> ? keyof Unions extends string ? {
+    readonly [K in keyof Unions]: InternalJsonPathsOfChildren<Unions[K], D extends null ? Prefix : `${Prefix}:${K}`, SegmentOverride, Depth>;
 }[keyof Unions] : never : never;
 
 type ValueToTypePathsOfType<T extends StrictType, SegmentOverride extends string = '*', Path extends string = '$'> = SimplifyDeep<InternalFlattenedTypePathsOf<T['definition'], SegmentOverride, Path, Path, StartingDepth>>;
 type InternalFlattenedTypePathsOf<T extends TypeDef, SegmentOverride extends string, ValuePath extends string, TypePath extends string, Depth extends number> = {
     readonly [K in ValuePath]: TypePath;
-} & InternalFlattenedTypePathsOfChildren<T, SegmentOverride, ValuePath, TypePath, '', Depth>;
-type InternalFlattenedTypePathsOfChildren<T extends TypeDef, SegmentOverride extends string, ValuePath extends string, TypePath extends string, Qualifier extends string, Depth extends number, NextDepth extends number = Depths[Depth]> = NextDepth extends -1 ? never : T extends LiteralTypeDef ? InternalFlattenedTypePathsOfLiteralChildren : T extends ListTypeDef ? InternalFlattenedTypePathsOfListChildren<T, SegmentOverride, ValuePath, TypePath, NextDepth> : T extends RecordTypeDef ? InternalFlattenedTypePathsOfRecordChildren<T, SegmentOverride, ValuePath, TypePath, NextDepth> : T extends ObjectTypeDef ? InternalFlattenedTypePathsOfObjectChildren<T, SegmentOverride, ValuePath, TypePath, Qualifier, NextDepth> : T extends UnionTypeDef ? InternalFlattenedTypePathsOfUnionChildren<T, SegmentOverride, ValuePath, TypePath, Qualifier, NextDepth> : never;
+} & InternalFlattenedTypePathsOfChildren<T, SegmentOverride, ValuePath, TypePath, Depth>;
+type InternalFlattenedTypePathsOfChildren<T extends TypeDef, SegmentOverride extends string, ValuePath extends string, TypePath extends string, Depth extends number, NextDepth extends number = Depths[Depth]> = NextDepth extends -1 ? never : T extends LiteralTypeDef ? InternalFlattenedTypePathsOfLiteralChildren : T extends ListTypeDef ? InternalFlattenedTypePathsOfListChildren<T, SegmentOverride, ValuePath, TypePath, NextDepth> : T extends RecordTypeDef ? InternalFlattenedTypePathsOfRecordChildren<T, SegmentOverride, ValuePath, TypePath, NextDepth> : T extends ObjectTypeDef ? InternalFlattenedTypePathsOfObjectChildren<T, SegmentOverride, ValuePath, TypePath, NextDepth> : T extends UnionTypeDef ? InternalFlattenedTypePathsOfUnionChildren<T, SegmentOverride, ValuePath, TypePath, NextDepth> : never;
 type InternalFlattenedTypePathsOfLiteralChildren = {};
 type InternalFlattenedTypePathsOfListChildren<T extends ListTypeDef, SegmentOverride extends string, ValuePath extends string, TypePath extends string, Depth extends number> = InternalFlattenedTypePathsOf<T['elements'], SegmentOverride, PathOf<ValuePath, number>, PathOf<TypePath, number, SegmentOverride>, Depth>;
 type InternalFlattenedTypePathsOfRecordChildren<T extends RecordTypeDef, SegmentOverride extends string, ValuePath extends string, TypePath extends string, Depth extends number> = InternalFlattenedTypePathsOf<T['valueTypeDef'], SegmentOverride, PathOf<ValuePath, T['keyPrototype']>, PathOf<TypePath, T['keyPrototype'], SegmentOverride>, Depth>;
-type InternalFlattenedTypePathsOfObjectChildren<T extends ObjectTypeDef, SegmentOverride extends string, ValuePath extends string, TypePath extends string, Qualifier extends string, Depth extends number> = T extends ObjectTypeDef<infer Fields> ? keyof Fields extends string ? UnionToIntersection<{
-    readonly [K in keyof Fields]-?: InternalFlattenedTypePathsOf<Exclude<Fields[K], undefined>, SegmentOverride, PathOf<ValuePath, `${Qualifier}${K}`>, PathOf<TypePath, `${Qualifier}${K}`>, Depth>;
+type InternalFlattenedTypePathsOfObjectChildren<T extends ObjectTypeDef, SegmentOverride extends string, ValuePath extends string, TypePath extends string, Depth extends number> = T extends ObjectTypeDef<infer Fields> ? keyof Fields extends string ? UnionToIntersection<{
+    readonly [K in keyof Fields]-?: InternalFlattenedTypePathsOf<Exclude<Fields[K], undefined>, SegmentOverride, PathOf<ValuePath, K>, PathOf<TypePath, K>, Depth>;
 }[keyof Fields]> : never : never;
-type InternalFlattenedTypePathsOfUnionChildren<T extends UnionTypeDef, SegmentOverride extends string, ValuePath extends string, TypePath 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]: InternalFlattenedTypePathsOfChildren<Unions[K], SegmentOverride, ValuePath, TypePath, '', Depth>;
+type InternalFlattenedTypePathsOfUnionChildren<T extends UnionTypeDef, SegmentOverride extends string, ValuePath extends string, TypePath 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]: InternalFlattenedTypePathsOfChildren<Unions[K], SegmentOverride, ValuePath, TypePath, Depth>;
 }[keyof Unions]> : UnionToIntersection<{
-    readonly [K in keyof Unions]: InternalFlattenedTypePathsOfChildren<Unions[K], SegmentOverride, ValuePath, TypePath, `${Qualifier}${K}:`, Depth>;
+    readonly [K in keyof Unions]: InternalFlattenedTypePathsOfChildren<Unions[K], SegmentOverride, `${ValuePath}:${K}`, `${TypePath}:${K}`, Depth>;
 }[keyof Unions]> : never : never;
 
 type ValueTypesOfDiscriminatedUnion<U extends UnionTypeDef> = U extends UnionTypeDef<infer D, infer Unions> ? D extends string ? {

package/dist/index.js

@@ -190,8 +190,8 @@ import {
   assertState
 } from "@strictly/base";
 function jsonPath(prefix, segment, qualifier) {
-  const s = `.${qualifier != null ? qualifier : ""}${segment}`;
-  return `${prefix}${s}`;
+  const s = `.${segment}`;
+  return `${prefix}${qualifier != null ? qualifier : ""}${s}`;
 }
 function jsonPathPop(path) {
   const parts = path.split(".");
@@ -229,11 +229,11 @@ function flattenValueTo({ definition }, v, setter, mapper2) {
 function internalFlattenValue(valuePath, typePath, typeDef, v, setter, mapper2, r) {
   r[valuePath] = mapper2(typeDef, v, setter, typePath, valuePath);
   if (v !== void 0) {
-    return internalFlattenValueChildren(valuePath, typePath, "", typeDef, v, mapper2, r);
+    return internalFlattenValueChildren(valuePath, typePath, typeDef, v, mapper2, r);
   }
   return r;
 }
-function internalFlattenValueChildren(valuePath, typePath, qualifier, typeDef, v, mapper2, r) {
+function internalFlattenValueChildren(valuePath, typePath, typeDef, v, mapper2, r) {
   switch (typeDef.type) {
     case 1 /* Literal */:
       return r;
@@ -242,9 +242,9 @@ function internalFlattenValueChildren(valuePath, typePath, qualifier, typeDef, v
     case 3 /* Record */:
       return internalFlattenRecordChildren(valuePath, typePath, typeDef, v, mapper2, r);
     case 4 /* Object */:
-      return internalFlattenObjectChildren(valuePath, typePath, qualifier, typeDef, v, mapper2, r);
+      return internalFlattenObjectChildren(valuePath, typePath, typeDef, v, mapper2, r);
     case 5 /* Union */:
-      return internalFlattenUnionChildren(valuePath, typePath, qualifier, typeDef, v, mapper2, r);
+      return internalFlattenUnionChildren(valuePath, typePath, typeDef, v, mapper2, r);
     default:
       throw new UnreachableError2(typeDef);
   }
@@ -285,14 +285,14 @@ function internalFlattenRecordChildren(valuePath, typePath, { valueTypeDef }, v,
     r
   );
 }
-function internalFlattenObjectChildren(valuePath, typePath, qualifier, { fields }, v, mapper2, r) {
+function internalFlattenObjectChildren(valuePath, typePath, { fields }, v, mapper2, r) {
   return reduce2(
     fields,
     function(r2, k, fieldTypeDef) {
       const fieldValue = v[k];
       return internalFlattenValue(
-        jsonPath(valuePath, k, qualifier),
-        jsonPath(typePath, k, qualifier),
+        jsonPath(valuePath, k),
+        jsonPath(typePath, k),
         fieldTypeDef,
         fieldValue,
         (value) => {
@@ -305,13 +305,12 @@ function internalFlattenObjectChildren(valuePath, typePath, qualifier, { fields
     r
   );
 }
-function internalFlattenUnionChildren(valuePath, typePath, qualifier, typeDef, v, mapper2, r) {
+function internalFlattenUnionChildren(valuePath, typePath, typeDef, v, mapper2, r) {
   const childTypeDef = getUnionTypeDef(typeDef, v);
-  const newQualifier = typeDef.discriminator != null ? `${qualifier}${v[typeDef.discriminator]}:` : qualifier;
+  const qualifier = typeDef.discriminator != null ? `:${v[typeDef.discriminator]}` : "";
   return internalFlattenValueChildren(
-    valuePath,
-    typePath,
-    newQualifier,
+    `${valuePath}${qualifier}`,
+    `${typePath}${qualifier}`,
     childTypeDef,
     v,
     mapper2,
@@ -478,8 +477,8 @@ function internalFlattenUnionTypeDefChildren(path, qualifier, {
     unions,
     function(acc, key, typeDef) {
       return internalFlattenTypeDefChildren(
-        path,
-        discriminator != null ? `${qualifier}${key}:` : qualifier,
+        discriminator != null ? `${path}:${qualifier}` : path,
+        key,
         typeDef,
         acc
       );
@@ -544,25 +543,36 @@ import {
 } from "@strictly/base";
 function valuePathToTypePath({ definition: typeDef }, valuePath, allowMissingPaths = false) {
   const valueSteps = valuePath.split(/\.|\[/g);
-  assertEqual2(valueSteps[0], "$");
+  const parts = valueSteps[0].split(":");
+  const [
+    first,
+    ...qualifiers
+  ] = parts;
+  assertEqual2(first, "$");
   const typeSteps = internalJsonValuePathToTypePath(
     typeDef,
+    qualifiers,
     valueSteps.slice(1),
     allowMissingPaths,
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     valuePath
   );
-  typeSteps.unshift("$");
+  typeSteps.unshift(valueSteps[0]);
   return typeSteps.join(".");
 }
-function internalJsonValuePathToTypePath(typeDef, valueSteps, allowMissingPaths, originalValuePath) {
+function internalJsonValuePathToTypePath(typeDef, qualifiers, valueSteps, allowMissingPaths, originalValuePath) {
   if (valueSteps.length === 0) {
     return [];
   }
   const [
-    valueStep,
+    nextValueStepAndQualifiersString,
     ...remainingValueSteps
   ] = valueSteps;
+  const nextValueStepAndQualifiers = nextValueStepAndQualifiersString.split(":");
+  const [
+    valueStep,
+    ...nextQualifiers
+  ] = nextValueStepAndQualifiers;
   switch (typeDef.type) {
     case 1 /* Literal */:
       if (allowMissingPaths) {
@@ -571,14 +581,18 @@ function internalJsonValuePathToTypePath(typeDef, valueSteps, allowMissingPaths,
         throw new PreconditionFailedError(
           "literal should terminate path {} ({})",
           originalValuePath,
-          valueStep
+          nextValueStepAndQualifiersString
         );
       }
     case 2 /* List */:
       return [
-        "*",
+        [
+          "*",
+          ...nextQualifiers
+        ].join(":"),
         ...internalJsonValuePathToTypePath(
           typeDef.elements,
+          nextQualifiers,
           remainingValueSteps,
           allowMissingPaths,
           originalValuePath
@@ -586,9 +600,13 @@ function internalJsonValuePathToTypePath(typeDef, valueSteps, allowMissingPaths,
       ];
     case 3 /* Record */:
       return [
-        "*",
+        [
+          "*",
+          ...nextQualifiers
+        ].join(":"),
         ...internalJsonValuePathToTypePath(
           typeDef.valueTypeDef,
+          nextQualifiers,
           remainingValueSteps,
           allowMissingPaths,
           originalValuePath
@@ -603,9 +621,10 @@ function internalJsonValuePathToTypePath(typeDef, valueSteps, allowMissingPaths,
         assertExists(typeDef.fields[valueStep], "missing field in {} ({})", originalValuePath, valueStep);
       }
       return [
-        valueStep,
+        nextValueStepAndQualifiersString,
         ...internalJsonValuePathToTypePath(
           typeDef.fields[valueStep],
+          nextQualifiers,
           remainingValueSteps,
           allowMissingPaths,
           originalValuePath
@@ -627,6 +646,7 @@ function internalJsonValuePathToTypePath(typeDef, valueSteps, allowMissingPaths,
           assertExists(union2, "expected a complex union {}", originalValuePath);
           return internalJsonValuePathToTypePath(
             union2,
+            nextQualifiers,
             valueSteps,
             allowMissingPaths,
             originalValuePath
@@ -635,8 +655,7 @@ function internalJsonValuePathToTypePath(typeDef, valueSteps, allowMissingPaths,
           return [];
         }
       } else {
-        const qualifierIndex = valueStep.indexOf(":");
-        if (qualifierIndex < 0) {
+        if (qualifiers.length === 0) {
           if (allowMissingPaths) {
             return valueSteps;
           } else {
@@ -647,25 +666,18 @@ function internalJsonValuePathToTypePath(typeDef, valueSteps, allowMissingPaths,
             );
           }
         }
-        const qualifier = valueStep.substring(0, qualifierIndex);
-        const remainder = valueStep.substring(qualifierIndex + 1);
-        const union2 = assertExistsAndReturn(typeDef.unions[qualifier], "missing union {}", qualifier);
         const [
-          typeStep,
-          ...remainingTypeSteps
-        ] = internalJsonValuePathToTypePath(
+          qualifier,
+          ...remainingQualifiers
+        ] = qualifiers;
+        const union2 = assertExistsAndReturn(typeDef.unions[qualifier], "missing union {}", qualifier);
+        return internalJsonValuePathToTypePath(
           union2,
-          [
-            remainder,
-            ...remainingValueSteps
-          ],
+          remainingQualifiers,
+          valueSteps,
           allowMissingPaths,
           originalValuePath
         );
-        return [
-          `${qualifier}:${typeStep}`,
-          ...remainingTypeSteps
-        ];
       }
     default:
       throw new UnreachableError5(typeDef);

package/package.json

@@ -38,7 +38,7 @@
     "test:watch": "vitest"
   },
   "type": "module",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "exports": {
     ".": {
       "import": {

package/transformers/flatteners/flatten_type_to.ts

@@ -116,8 +116,8 @@ function internalFlattenUnionTypeDefChildren(
     unions,
     function (acc, key, typeDef: StrictTypeDef) {
       return internalFlattenTypeDefChildren(
-        path,
-        discriminator != null ? `${qualifier}${key}:` : qualifier,
+        discriminator != null ? `${path}:${qualifier}` : path,
+        key,
         typeDef,
         acc,
       )

package/transformers/flatteners/flatten_value_to.ts

@@ -68,7 +68,7 @@ function internalFlattenValue<M>(
   // assume undefined means the field is optional and not populated
   // TODO: actually capture if field is optional in typedef (or in builder for creating validator)
   if (v !== undefined) {
-    return internalFlattenValueChildren(valuePath, typePath, '', typeDef, v, mapper, r)
+    return internalFlattenValueChildren(valuePath, typePath, typeDef, v, mapper, r)
   }
   return r
 }
@@ -76,7 +76,6 @@ function internalFlattenValue<M>(
 function internalFlattenValueChildren<M>(
   valuePath: string,
   typePath: string,
-  qualifier: string,
   typeDef: StrictTypeDef,
   v: AnyValueType,
   mapper: Mapper<M>,
@@ -91,9 +90,9 @@ function internalFlattenValueChildren<M>(
     case TypeDefType.Record:
       return internalFlattenRecordChildren(valuePath, typePath, typeDef, v, mapper, r)
     case TypeDefType.Object:
-      return internalFlattenObjectChildren(valuePath, typePath, qualifier, typeDef, v, mapper, r)
+      return internalFlattenObjectChildren(valuePath, typePath, typeDef, v, mapper, r)
     case TypeDefType.Union:
-      return internalFlattenUnionChildren(valuePath, typePath, qualifier, typeDef, v, mapper, r)
+      return internalFlattenUnionChildren(valuePath, typePath, typeDef, v, mapper, r)
     default:
       throw new UnreachableError(typeDef)
   }
@@ -154,7 +153,6 @@ function internalFlattenRecordChildren<M>(
 function internalFlattenObjectChildren<M>(
   valuePath: string,
   typePath: string,
-  qualifier: string,
   { fields }: StrictObjectTypeDef,
   v: Record<string, AnyValueType>,
   mapper: Mapper<M>,
@@ -165,8 +163,8 @@ function internalFlattenObjectChildren<M>(
     function (r, k, fieldTypeDef) {
       const fieldValue = v[k]
       return internalFlattenValue(
-        jsonPath(valuePath, k, qualifier),
-        jsonPath(typePath, k, qualifier),
+        jsonPath(valuePath, k),
+        jsonPath(typePath, k),
         fieldTypeDef,
         fieldValue,
         (value: AnyValueType) => {
@@ -183,18 +181,16 @@ function internalFlattenObjectChildren<M>(
 function internalFlattenUnionChildren<M>(
   valuePath: string,
   typePath: string,
-  qualifier: string,
   typeDef: StrictUnionTypeDef,
   v: AnyValueType,
   mapper: Mapper<M>,
   r: Record<string, M>,
 ): AnyValueType {
   const childTypeDef = getUnionTypeDef(typeDef, v)
-  const newQualifier = typeDef.discriminator != null ? `${qualifier}${v[typeDef.discriminator]}:` : qualifier
+  const qualifier = typeDef.discriminator != null ? `:${v[typeDef.discriminator]}` : ''
   return internalFlattenValueChildren(
-    valuePath,
-    typePath,
-    newQualifier,
+    `${valuePath}${qualifier}`,
+    `${typePath}${qualifier}`,
     childTypeDef,
     v,
     mapper,

package/transformers/flatteners/json_path.ts

@@ -12,15 +12,15 @@ export function jsonPath<
   Prefix extends string,
   Segment extends number | string,
   Qualifier extends string,
->(prefix: Prefix, segment: Segment, qualifier: Qualifier): `${Prefix}.${Qualifier}${Segment}`
+>(prefix: Prefix, segment: Segment, qualifier: Qualifier): `${Prefix}${Qualifier}.${Segment}`
 export function jsonPath<
   Prefix extends string,
   Segment extends number | string,
   Qualifier extends string = '',
 >(prefix: Prefix, segment: Segment, qualifier?: Qualifier) {
-  const s = `.${qualifier ?? ''}${segment}`
+  const s = `.${segment}`
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  return `${prefix}${s}` as `${Prefix}.${Qualifier}${Segment}`
+  return `${prefix}${qualifier ?? ''}${s}` as `${Prefix}${Qualifier}.${Segment}`
 }
 
 // TODO type safety

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

@@ -106,8 +106,8 @@ describe('flattenJsonValueToTypePathsOf', function () {
       it('equals expected value', function () {
         expect(flattened).toEqual({
           $: '$',
-          '$.x:a': '$.x:a',
-          '$.x:b': '$.x:b',
+          '$:x.a': '$:x.a',
+          '$:x.b': '$:x.b',
         })
       })
     })

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

@@ -135,8 +135,8 @@ describe('flattenTypeDefTo', function () {
       it('equals expected type', function () {
         expect(flattened).toEqual({
           $: TypeDefType.Union,
-          '$.a:a': TypeDefType.Literal,
-          '$.b:b': TypeDefType.Literal,
+          '$:a.a': TypeDefType.Literal,
+          '$:b.b': TypeDefType.Literal,
         })
       })
 

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

@@ -329,7 +329,7 @@ describe('flattenValueTo', function () {
         it('equals expected type', function () {
           expect(flattened).toEqual({
             $: '{"d":"1","a":2}',
-            ['$.1:a']: '2',
+            ['$:1.a']: '2',
           })
         })
       })
@@ -357,7 +357,7 @@ describe('flattenValueTo', function () {
         })
 
         it('sets an internal value', function () {
-          flattened['$.1:a'](1)
+          flattened['$:1.a'](1)
 
           expect(u).toEqual({
             d: '1',

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

@@ -31,14 +31,14 @@ describe('json_paths', () => {
     })
 
     describe('qualified', () => {
-      const path = jsonPath('$', 'x', 'y:')
+      const path = jsonPath('$', 'x', ':y')
 
       it('has the expected type', () => {
-        expectTypeOf(path).toEqualTypeOf<'$.y:x'>()
+        expectTypeOf(path).toEqualTypeOf<'$:y.x'>()
       })
 
       it('has the expected value', () => {
-        expect(path).toEqual('$.y:x')
+        expect(path).toEqual('$:y.x')
       })
     })
   })