fediverse
/
activity-kit-core
mirror of https://github.com/michaelcpuckett/activity-kit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix

This commit is contained in:
Michael Puckett 2023-07-20 17:57:16 -04:00
parent ee3812ca00
commit a26609618a
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/types/lib/activitypub/Core/Entity.d.ts vendored
View File

@ -4,5 +4,5 @@ import { ContextDefinition } from 'jsonld';
export type BaseEntity<T extends AnyType> = {
'@context'?: URL | URL[] | ContextDefinition;
id?: URL | null;
type: TypeOrArrayWithType<T>;
type: T | TypeOrArrayWithType<T>;
};

4
packages/types/lib/activitypub/Extended/Activity.d.ts vendored
View File

@ -1,6 +1,6 @@
/// <reference types="node" />
import { ActivityTypes, OrArray, TransitiveActivityTypes, IntransitiveActivityTypes } from '../util';
import { EntityReference } from '../Core';
import { CoreObjectProperties, EntityReference } from '../Core';
import { BaseEntity } from '../Core/Entity';
export type AnyActivityType = (typeof ActivityTypes)[keyof typeof ActivityTypes];
export type AnyTransitiveActivityType = (typeof TransitiveActivityTypes)[keyof typeof TransitiveActivityTypes];
@ -13,7 +13,7 @@ export type ActivityProperties = {
origin?: OrArray<EntityReference>;
instrument?: OrArray<EntityReference>;
};
type BaseActivity<T extends AnyActivityType> = BaseEntity<T> & ActivityProperties;
type BaseActivity<T extends AnyActivityType> = BaseEntity<T> & CoreObjectProperties & ActivityProperties;
type TransitiveActivityProperties = {
object: OrArray<EntityReference>;
};

2
packages/types/lib/activitypub/util/const.d.ts vendored
View File

@ -201,4 +201,4 @@ export declare const AllTypes: {
readonly HASHTAG: "Hashtag";
};
export type AnyType = (typeof AllTypes)[keyof typeof AllTypes];
export type TypeOrArrayWithType<T> = T | [T, ...Array<AnyType>];
export type TypeOrArrayWithType<T extends AnyType> = T | [T, ...Array<AnyType>];

2
packages/types/src/activitypub/Core/Entity.ts
View File

@ -5,5 +5,5 @@ export type BaseEntity<T extends AnyType> = {
'@context'?: URL | URL[] | ContextDefinition;
// Activity Pub allows null.
id?: URL | null;
type: TypeOrArrayWithType<T>;
type: T | TypeOrArrayWithType<T>;
};

3
packages/types/src/activitypub/Extended/Activity.ts
View File

@ -4,7 +4,7 @@ import {
TransitiveActivityTypes,
IntransitiveActivityTypes,
} from '../util';
import { EntityReference } from '../Core';
import { CoreObjectProperties, EntityReference } from '../Core';
import { BaseEntity } from '../Core/Entity';
export type AnyActivityType =
@ -36,6 +36,7 @@ export type ActivityProperties = {
*/
type BaseActivity<T extends AnyActivityType> = BaseEntity<T> &
CoreObjectProperties &
ActivityProperties;
type TransitiveActivityProperties = {

2
packages/types/src/activitypub/util/const.ts
View File

@ -91,4 +91,4 @@ export const AllTypes = {
export type AnyType = (typeof AllTypes)[keyof typeof AllTypes];
export type TypeOrArrayWithType<T> = T | [T, ...Array<AnyType>];
export type TypeOrArrayWithType<T extends AnyType> = T | [T, ...Array<AnyType>];