Skip to content

Commit

Permalink
FIx build
Browse files Browse the repository at this point in the history
  • Loading branch information
@CraigMacomber
CraigMacomber committed Nov 12, 2024
1 parent a90e167 commit 90a79f5
Show file tree
Hide file tree
Showing 12 changed files with 60 additions and 30 deletions.
8 changes: 5 additions & 3 deletions packages/dds/tree/api-report/tree.alpha.api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ export type InsertableObjectFromSchemaRecordUnsafe<T extends Unenforced<Restrict
};

// @public
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchema<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = TSchema extends FieldSchema<infer Kind, infer Types> ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : TSchema extends ImplicitAllowedTypes ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;

// @public
export type InsertableTreeFieldFromImplicitFieldUnsafe<TSchemaInput extends Unenforced<ImplicitFieldSchema>, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchemaUnsafe<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypesUnsafe<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypesUnsafe<TSchema> : never;
Expand Down Expand Up @@ -479,9 +479,11 @@ export const noopValidator: JsonValidator;

// @public
type ObjectFromSchemaRecord<T extends RestrictiveStringRecord<ImplicitFieldSchema>> = {
-readonly [Property in keyof T as Property extends string ? [AssignableTreeFieldFromImplicitField<T[Property]>] extends [never] ? never : Property : never]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
-readonly [Property in keyof T as [
AssignableTreeFieldFromImplicitField<T[Property & string]>
] extends [never | undefined] ? never : Property]: TreeFieldFromImplicitField<T[Property & string]>;
} & {
readonly [Property in keyof T]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
readonly [Property in keyof T]: TreeFieldFromImplicitField<T[Property & string]>;
};

// @public
Expand Down
8 changes: 5 additions & 3 deletions packages/dds/tree/api-report/tree.beta.api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export type InsertableObjectFromSchemaRecordUnsafe<T extends Unenforced<Restrict
};

// @public
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchema<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = TSchema extends FieldSchema<infer Kind, infer Types> ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : TSchema extends ImplicitAllowedTypes ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;

// @public
export type InsertableTreeFieldFromImplicitFieldUnsafe<TSchemaInput extends Unenforced<ImplicitFieldSchema>, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchemaUnsafe<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypesUnsafe<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypesUnsafe<TSchema> : never;
Expand Down Expand Up @@ -284,9 +284,11 @@ export enum NodeKind {

// @public
type ObjectFromSchemaRecord<T extends RestrictiveStringRecord<ImplicitFieldSchema>> = {
-readonly [Property in keyof T as Property extends string ? [AssignableTreeFieldFromImplicitField<T[Property]>] extends [never] ? never : Property : never]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
-readonly [Property in keyof T as [
AssignableTreeFieldFromImplicitField<T[Property & string]>
] extends [never | undefined] ? never : Property]: TreeFieldFromImplicitField<T[Property & string]>;
} & {
readonly [Property in keyof T]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
readonly [Property in keyof T]: TreeFieldFromImplicitField<T[Property & string]>;
};

// @public
Expand Down
8 changes: 5 additions & 3 deletions packages/dds/tree/api-report/tree.legacy.alpha.api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export type InsertableObjectFromSchemaRecordUnsafe<T extends Unenforced<Restrict
};

// @public
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchema<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = TSchema extends FieldSchema<infer Kind, infer Types> ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : TSchema extends ImplicitAllowedTypes ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;

// @public
export type InsertableTreeFieldFromImplicitFieldUnsafe<TSchemaInput extends Unenforced<ImplicitFieldSchema>, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchemaUnsafe<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypesUnsafe<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypesUnsafe<TSchema> : never;
Expand Down Expand Up @@ -279,9 +279,11 @@ export enum NodeKind {

// @public
type ObjectFromSchemaRecord<T extends RestrictiveStringRecord<ImplicitFieldSchema>> = {
-readonly [Property in keyof T as Property extends string ? [AssignableTreeFieldFromImplicitField<T[Property]>] extends [never] ? never : Property : never]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
-readonly [Property in keyof T as [
AssignableTreeFieldFromImplicitField<T[Property & string]>
] extends [never | undefined] ? never : Property]: TreeFieldFromImplicitField<T[Property & string]>;
} & {
readonly [Property in keyof T]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
readonly [Property in keyof T]: TreeFieldFromImplicitField<T[Property & string]>;
};

// @public
Expand Down
8 changes: 5 additions & 3 deletions packages/dds/tree/api-report/tree.legacy.public.api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export type InsertableObjectFromSchemaRecordUnsafe<T extends Unenforced<Restrict
};

// @public
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchema<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = TSchema extends FieldSchema<infer Kind, infer Types> ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : TSchema extends ImplicitAllowedTypes ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;

// @public
export type InsertableTreeFieldFromImplicitFieldUnsafe<TSchemaInput extends Unenforced<ImplicitFieldSchema>, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchemaUnsafe<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypesUnsafe<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypesUnsafe<TSchema> : never;
Expand Down Expand Up @@ -279,9 +279,11 @@ export enum NodeKind {

// @public
type ObjectFromSchemaRecord<T extends RestrictiveStringRecord<ImplicitFieldSchema>> = {
-readonly [Property in keyof T as Property extends string ? [AssignableTreeFieldFromImplicitField<T[Property]>] extends [never] ? never : Property : never]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
-readonly [Property in keyof T as [
AssignableTreeFieldFromImplicitField<T[Property & string]>
] extends [never | undefined] ? never : Property]: TreeFieldFromImplicitField<T[Property & string]>;
} & {
readonly [Property in keyof T]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
readonly [Property in keyof T]: TreeFieldFromImplicitField<T[Property & string]>;
};

// @public
Expand Down
8 changes: 5 additions & 3 deletions packages/dds/tree/api-report/tree.public.api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export type InsertableObjectFromSchemaRecordUnsafe<T extends Unenforced<Restrict
};

// @public
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchema<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = TSchema extends FieldSchema<infer Kind, infer Types> ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : TSchema extends ImplicitAllowedTypes ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;

// @public
export type InsertableTreeFieldFromImplicitFieldUnsafe<TSchemaInput extends Unenforced<ImplicitFieldSchema>, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchemaUnsafe<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypesUnsafe<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypesUnsafe<TSchema> : never;
Expand Down Expand Up @@ -279,9 +279,11 @@ export enum NodeKind {

// @public
type ObjectFromSchemaRecord<T extends RestrictiveStringRecord<ImplicitFieldSchema>> = {
-readonly [Property in keyof T as Property extends string ? [AssignableTreeFieldFromImplicitField<T[Property]>] extends [never] ? never : Property : never]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
-readonly [Property in keyof T as [
AssignableTreeFieldFromImplicitField<T[Property & string]>
] extends [never | undefined] ? never : Property]: TreeFieldFromImplicitField<T[Property & string]>;
} & {
readonly [Property in keyof T]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
readonly [Property in keyof T]: TreeFieldFromImplicitField<T[Property & string]>;
};

// @public
Expand Down
7 changes: 7 additions & 0 deletions packages/dds/tree/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,13 @@
},
"Interface_InternalTypes_TreeArrayNodeBase": {
"backCompat": false
},
"TypeAlias_InsertableTreeFieldFromImplicitField": {
"backCompat": false
},
"TypeAlias_InternalTypes_InsertableObjectFromSchemaRecord": {
"backCompat": false,
"forwardCompat": false
}
},
"entrypoint": "public"
Expand Down
3 changes: 3 additions & 0 deletions packages/dds/tree/src/test/types/validateTreePrevious.generated.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,7 @@ declare type old_as_current_for_TypeAlias_InsertableTreeFieldFromImplicitField =
* typeValidation.broken:
* "TypeAlias_InsertableTreeFieldFromImplicitField": {"backCompat": false}
*/
// @ts-expect-error compatibility expected to be broken
declare type current_as_old_for_TypeAlias_InsertableTreeFieldFromImplicitField = requireAssignableTo<TypeOnly<current.InsertableTreeFieldFromImplicitField<any>>, TypeOnly<old.InsertableTreeFieldFromImplicitField<any>>>

/*
Expand Down Expand Up @@ -961,6 +962,7 @@ declare type current_as_old_for_TypeAlias_InternalTypes_FlexListToUnion = requir
* typeValidation.broken:
* "TypeAlias_InternalTypes_InsertableObjectFromSchemaRecord": {"forwardCompat": false}
*/
// @ts-expect-error compatibility expected to be broken
declare type old_as_current_for_TypeAlias_InternalTypes_InsertableObjectFromSchemaRecord = requireAssignableTo<TypeOnly<old.InternalTypes.InsertableObjectFromSchemaRecord<any>>, TypeOnly<current.InternalTypes.InsertableObjectFromSchemaRecord<any>>>

/*
Expand All @@ -970,6 +972,7 @@ declare type old_as_current_for_TypeAlias_InternalTypes_InsertableObjectFromSche
* typeValidation.broken:
* "TypeAlias_InternalTypes_InsertableObjectFromSchemaRecord": {"backCompat": false}
*/
// @ts-expect-error compatibility expected to be broken
declare type current_as_old_for_TypeAlias_InternalTypes_InsertableObjectFromSchemaRecord = requireAssignableTo<TypeOnly<current.InternalTypes.InsertableObjectFromSchemaRecord<any>>, TypeOnly<old.InternalTypes.InsertableObjectFromSchemaRecord<any>>>

/*
Expand Down
8 changes: 5 additions & 3 deletions packages/framework/fluid-framework/api-report/fluid-framework.alpha.api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ export type InsertableObjectFromSchemaRecordUnsafe<T extends Unenforced<Restrict
};

// @public
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchema<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = TSchema extends FieldSchema<infer Kind, infer Types> ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : TSchema extends ImplicitAllowedTypes ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;

// @public
export type InsertableTreeFieldFromImplicitFieldUnsafe<TSchemaInput extends Unenforced<ImplicitFieldSchema>, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchemaUnsafe<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypesUnsafe<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypesUnsafe<TSchema> : never;
Expand Down Expand Up @@ -827,9 +827,11 @@ export const noopValidator: JsonValidator;

// @public
type ObjectFromSchemaRecord<T extends RestrictiveStringRecord<ImplicitFieldSchema>> = {
-readonly [Property in keyof T as Property extends string ? [AssignableTreeFieldFromImplicitField<T[Property]>] extends [never] ? never : Property : never]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
-readonly [Property in keyof T as [
AssignableTreeFieldFromImplicitField<T[Property & string]>
] extends [never | undefined] ? never : Property]: TreeFieldFromImplicitField<T[Property & string]>;
} & {
readonly [Property in keyof T]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
readonly [Property in keyof T]: TreeFieldFromImplicitField<T[Property & string]>;
};

// @public
Expand Down
8 changes: 5 additions & 3 deletions packages/framework/fluid-framework/api-report/fluid-framework.beta.api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ export type InsertableObjectFromSchemaRecordUnsafe<T extends Unenforced<Restrict
};

// @public
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchema<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = TSchema extends FieldSchema<infer Kind, infer Types> ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : TSchema extends ImplicitAllowedTypes ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;

// @public
export type InsertableTreeFieldFromImplicitFieldUnsafe<TSchemaInput extends Unenforced<ImplicitFieldSchema>, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchemaUnsafe<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypesUnsafe<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypesUnsafe<TSchema> : never;
Expand Down Expand Up @@ -629,9 +629,11 @@ export enum NodeKind {

// @public
type ObjectFromSchemaRecord<T extends RestrictiveStringRecord<ImplicitFieldSchema>> = {
-readonly [Property in keyof T as Property extends string ? [AssignableTreeFieldFromImplicitField<T[Property]>] extends [never] ? never : Property : never]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
-readonly [Property in keyof T as [
AssignableTreeFieldFromImplicitField<T[Property & string]>
] extends [never | undefined] ? never : Property]: TreeFieldFromImplicitField<T[Property & string]>;
} & {
readonly [Property in keyof T]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
readonly [Property in keyof T]: TreeFieldFromImplicitField<T[Property & string]>;
};

// @public
Expand Down
8 changes: 5 additions & 3 deletions packages/framework/fluid-framework/api-report/fluid-framework.legacy.alpha.api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ export type InsertableObjectFromSchemaRecordUnsafe<T extends Unenforced<Restrict
};

// @public
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchema<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;
export type InsertableTreeFieldFromImplicitField<TSchemaInput extends ImplicitFieldSchema, TSchema = UnionToIntersection<TSchemaInput>> = TSchema extends FieldSchema<infer Kind, infer Types> ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypes<Types>, Kind, true> : TSchema extends ImplicitAllowedTypes ? InsertableTreeNodeFromImplicitAllowedTypes<TSchema> : never;

// @public
export type InsertableTreeFieldFromImplicitFieldUnsafe<TSchemaInput extends Unenforced<ImplicitFieldSchema>, TSchema = UnionToIntersection<TSchemaInput>> = [TSchema] extends [FieldSchemaUnsafe<infer Kind, infer Types>] ? ApplyKindInput<InsertableTreeNodeFromImplicitAllowedTypesUnsafe<Types>, Kind, true> : [TSchema] extends [ImplicitAllowedTypes] ? InsertableTreeNodeFromImplicitAllowedTypesUnsafe<TSchema> : never;
Expand Down Expand Up @@ -926,9 +926,11 @@ export enum NodeKind {

// @public
type ObjectFromSchemaRecord<T extends RestrictiveStringRecord<ImplicitFieldSchema>> = {
-readonly [Property in keyof T as Property extends string ? [AssignableTreeFieldFromImplicitField<T[Property]>] extends [never] ? never : Property : never]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
-readonly [Property in keyof T as [
AssignableTreeFieldFromImplicitField<T[Property & string]>
] extends [never | undefined] ? never : Property]: TreeFieldFromImplicitField<T[Property & string]>;
} & {
readonly [Property in keyof T]: Property extends string ? TreeFieldFromImplicitField<T[Property]> : unknown;
readonly [Property in keyof T]: TreeFieldFromImplicitField<T[Property & string]>;
};

// @public
Expand Down
Loading

0 comments on commit 90a79f5

Please sign in to comment.