try to infer ancestor key substring

rsek · Jan 17, 2024 · cc4070b · cc4070b
1 parent 7276776
commit cc4070b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/pkg/nodejs/@datasworn/core/dist/IdParser.d.ts b/pkg/nodejs/@datasworn/core/dist/IdParser.d.ts
@@ -325,7 +325,7 @@ interface RecursiveCollectableId<RulesPackage extends string = string, Type exte
     get ancestorCollectionKeys(): AncestorKeys;
 }
 declare namespace RecursiveCollectableId {
-    type FromString<T extends Strings.RecursiveCollectableId> = T extends Strings.RecursiveCollectableId<infer RulesPackage, infer Type, infer AncestorKeys, infer Key> ? RecursiveCollectableId<RulesPackage, Type, AncestorKeys, Key> & {
+    type FromString<T extends Strings.RecursiveCollectableId> = T extends `${infer RulesPackage}${CONST.Sep}${infer Type extends TypeElements.Collectable.Recursive}${infer AncestorPath extends `${CONST.Sep}${string}`}${CONST.Sep}${infer Key}` ? RecursiveCollectableId<RulesPackage, Type, Utils.Split<AncestorPath>, Key> & {
         id: T;
     } : never;
 }

diff --git a/src/pkg-core/IdParser.ts b/src/pkg-core/IdParser.ts
@@ -1051,13 +1051,15 @@ interface RecursiveCollectableId<
 
 namespace RecursiveCollectableId {
 	export type FromString<T extends Strings.RecursiveCollectableId> =
-		T extends Strings.RecursiveCollectableId<
-			infer RulesPackage,
-			infer Type,
-			infer AncestorKeys,
-			infer Key
-		>
-			? RecursiveCollectableId<RulesPackage, Type, AncestorKeys, Key> & {
+		T extends `${infer RulesPackage}${CONST.Sep}${infer Type extends
+			TypeElements.Collectable.Recursive}${infer AncestorPath extends
+			`${CONST.Sep}${string}`}${CONST.Sep}${infer Key}`
+			? RecursiveCollectableId<
+					RulesPackage,
+					Type,
+					Utils.Split<AncestorPath>,
+					Key
+			  > & {
 					id: T
 			  }
 			: never