Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ export interface OpaqueRefMethods<T> {
setSchema(schema: JSONSchema): void;
map<S>(
fn: (
element: T extends Array<infer U> ? Opaque<U> : Opaque<T>,
index: Opaque<number>,
array: T,
element: T extends Array<infer U> ? OpaqueRef<U> : OpaqueRef<T>,
index: OpaqueRef<number>,
array: OpaqueRef<T>,
) => Opaque<S>,
): Opaque<S[]>;
): OpaqueRef<S[]>;
}

// Factory types
Expand Down
4 changes: 2 additions & 2 deletions packages/runner/src/builder/opaque-ref.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ export function opaqueRef<T>(
},
map: <S>(
fn: (
element: Opaque<Required<T extends Array<infer U> ? U : T>>,
index: Opaque<number>,
element: OpaqueRef<Required<T extends Array<infer U> ? U : T>>,
index: OpaqueRef<number>,
array: T,
) => Opaque<S>,
) => {
Expand Down
8 changes: 4 additions & 4 deletions packages/runner/src/builder/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ declare module "@commontools/api" {
unsafe_getExternal(): OpaqueRef<T>;
map<S>(
fn: (
element: T extends Array<infer U> ? Opaque<U> : Opaque<T>,
index: Opaque<number>,
array: T,
element: T extends Array<infer U> ? OpaqueRef<U> : OpaqueRef<T>,
index: OpaqueRef<number>,
array: OpaqueRef<T>,
) => Opaque<S>,
): Opaque<S[]>;
): OpaqueRef<S[]>;
toJSON(): unknown;
[Symbol.iterator](): Iterator<T>;
[Symbol.toPrimitive](hint: string): T;
Expand Down
2 changes: 1 addition & 1 deletion packages/static/assets/types/commontools.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export interface OpaqueRefMethods<T> {
setDefault(value: Opaque<T> | T): void;
setName(name: string): void;
setSchema(schema: JSONSchema): void;
map<S>(fn: (element: T extends Array<infer U> ? Opaque<U> : Opaque<T>, index: Opaque<number>, array: T) => Opaque<S>): Opaque<S[]>;
map<S>(fn: (element: T extends Array<infer U> ? OpaqueRef<U> : OpaqueRef<T>, index: OpaqueRef<number>, array: OpaqueRef<T>) => Opaque<S>): OpaqueRef<S[]>;
}
export interface Recipe {
argumentSchema: JSONSchema;
Expand Down