APBase Improvements (#4)

* update base model & refactor

* implement proxy

* update Person model

* fix APBase toPlain

package.json

@@ -7,8 +7,8 @@
   "scripts": {
     "tsc": "tsc -p ./tsconfig.json",
     "tsc:watch": "tsc -w -p ./tsconfig.json",
-    "start": "node --es-module-specifier-resolution=node build/index.js",
+    "start": "node --es-module-specifier-resolution=node dist/index.js",
-    "start:dev": "nodemon --es-module-specifier-resolution=node build/index.js"
+    "start:dev": "nodemon --es-module-specifier-resolution=node dist/index.js"
   },
   "files": [
     "dist"

src/common/types.ts

@@ -39,6 +39,7 @@ export enum ASModelType {
     Question = 'Question',
     Tombstone = 'Tombstone',
     Profile = 'Profile',
+    Actor = 'Actor',
     Link = 'Link',
     Mention = 'Mention',
     Collection = 'Collection',
@@ -55,6 +56,7 @@ export type LanguageTag = string;
 export type MediaType = string;
 export type Duration = string;
 
+export type ContextValue = string | Record<string, string>;
 export type UrlValue = string | Link;
 export type IdValue = string;
 export type TypeValue = string;
@@ -145,4 +147,14 @@ export type OauthAuthorizationEndpointValue = string;
 export type OauthTokenEndpointValue = string;
 export type ProvideClientKeyValue = string;
 export type SignClientKeyValue = string;
-export type SharedInboxValue = string;
+export type SharedInboxValue = string;
+
+export interface WithContext {
+    /**
+     * JSON-LD uses the special @context property to define the processing context.
+     * The value of the @context property is defined by the [JSON-LD] specification.
+     *
+     * {@link https://www.w3.org/TR/activitystreams-core/#jsonld Docs}
+     */
+    '@context'?: ContextValue | ContextValue[];
+}

src/common/utils.ts

@@ -1 +1,15 @@
-export type Modify<T, R> = Omit<T, keyof R> & R;
+export type Modify<T, R> = Omit<T, keyof R> & R;
+
+export const hasKey = <T extends object>(obj: T, k: keyof any): k is keyof T => k in obj;
+
+export const cloneObjDeep = <T>(obj: T): T => {
+    const duplicateObj = {} as T;
+    for (const key in obj) {
+        if(typeof obj[key] === 'object') {
+            duplicateObj[key] = cloneObjDeep(obj[key]);
+        } else {
+            duplicateObj[key] = obj[key];
+        }
+    }
+    return duplicateObj;
+}

src/index.ts

@@ -1 +0,0 @@
-

src/models/activity/Activity.model.ts

@@ -1,6 +1,6 @@
 import {APBase} from "../apBase/APBase.model";
 import { ActivityFields } from "./Activity.types";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 
 /**
  * An Activity is a subtype of Object that describes some form of action that may happen,
@@ -11,10 +11,10 @@ import {ASModelType} from "../../common/common.types";
  * {@link https://www.w3.org/ns/activitystreams#Activity Docs}
  */
 export class Activity extends APBase<ActivityFields>{
-    constructor(fields: ActivityFields) {
+    static create(fields: ActivityFields) {
-        super({
+        return APBase._create<ActivityFields>({
             type: ASModelType.Activity,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/activity/Activity.types.ts

@@ -6,7 +6,7 @@ import {
     OriginValue,
     ResultValue,
     TargetValue
-} from "../../common/common.types";
+} from "../../common/types";
 
 export interface ActivityFields extends APObjectFields {
 

src/models/actor/Actor.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {ActorFields} from "./Actor.types";
 
 /**
@@ -13,10 +13,10 @@ import {ActorFields} from "./Actor.types";
  * {@link https://www.w3.org/TR/activitypub/#actors Docs}
  */
 export class Actor extends APBase<ActorFields>{
-    constructor(fields: ActorFields) {
+    static create(fields: ActorFields) {
-        super({
+        return APBase._create<ActorFields>({
-            type: ASModelType.Profile,
+            type: ASModelType.Actor,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/actor/Actor.types.ts

@@ -13,7 +13,7 @@ import {
     ProxyUrlValue, SharedInboxValue,
     SignClientKeyValue,
     StreamsValue
-} from "../../common/common.types";
+} from "../../common/types";
 
 export interface EndpointsValue {
 

src/models/apBase/APBase.model.ts

@@ -1,47 +1,65 @@
-import { contexts } from "../../common/common.constants";
+import {cloneObjDeep, hasKey} from "../../common/utils";
+import { WithContext } from "../../common/types";
 
-// TODO: types
-// TODO: renaming/refactor
-export type Context = string | any[];
 
-export interface ModelBaseAPWithContext {
+export class APBase<T extends WithContext> {
-    '@context'?: Context;
+    public fields: T;
-}
 
-export class APBase<T> {
+    protected constructor(fields: T) {
-    public fields: T & ModelBaseAPWithContext;
-
-    constructor(fields: T) {
-        // TODO: make recursive copy
         this.fields = {
-            ...fields,
+            ...cloneObjDeep<T>(fields),
-        } as T & ModelBaseAPWithContext;
+        };
     }
 
-    // TODO: rewrite (better option to handle multiple contexts)
+    protected static _create<T extends WithContext>(fields: T) {
-    // some comment
+        const data = new APBase<T>(fields);
-    public setContext(context?: Context): this {
+        return new Proxy(data, {
-        this.fields = {
+            get(target: APBase<T>, p: keyof APBase<T> & keyof T) {
-            ['@context']: context || contexts.activityStreamsV2,
+                return hasKey(target, p) ? target[p] : target.fields[p];
-            ...this.fields
+            },
-        }
+            set(target: APBase<T>, p: keyof APBase<T> & keyof T, newValue: any): boolean {
-        return this;
+                target.fields[p] = newValue;
+                return true;
+            }
+        }) as APBase<T> & T & WithContext;
     }
 
-    public plain(): Record<string, any> {
+    protected parseValue(value: any): any {
+        return value instanceof APBase ? value.toPlain() : value.toValue();
+    }
+
+    public toPlain(): Record<string, any> {
         const result = {} as Record<string, any>;
-        for (const [key, node] of Object.entries(this.fields)) {
+        if ('@context' in this.fields) {
-            if (node instanceof APBase) {
+            result['@context'] = this.fields['@context'];
-                result[key] = node.plain();
+        }
+        for (const [key, value] of Object.entries(this.fields)) {
+            if (key === '@context') continue;
+
+            const isFunction = typeof value === 'function';
+            const isArray = Array.isArray(value);
+            const isNull = value === null;
+            const isUndefined = value === undefined;
+            const isObject = !isArray && !isNull && typeof value === 'object';
+            const isPlain = !isArray && !isNull && !isUndefined && !isObject && !isFunction;
+
+            if (isArray) {
+                result[key] = value.map(v => this.parseValue(v));
+            } else if (isNull || isUndefined) {
+                result[key] = null;
+            } else if (isObject) {
+                result[key] = {};
+                Object.entries(value).forEach(([k, v]) => result[key][k] = this.parseValue(v));
+            } else if (isPlain) {
+                result[key] = this.parseValue(value);
             } else {
-                result[key] = node;
+                throw new Error(`Unable to convert key ${key} with value ${value}. Type of value: ${typeof value}`);
             }
         }
-        // TODO make recursive copy
         return result;
     }
 
-    public json() {
+    public toJSON(): string {
-        return JSON.stringify(this.plain());
+        return JSON.stringify(this.toPlain());
     }
-}
+}

src/models/apEvent/APEvent.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {APEventFields} from "./APEvent.types";
 
 /**
@@ -8,10 +8,10 @@ import {APEventFields} from "./APEvent.types";
  * {@link https://www.w3.org/ns/activitystreams#Event Docs}
  */
 export class APEvent extends APBase<APEventFields>{
-    constructor(fields: APEventFields) {
+    static create(fields: APEventFields) {
-        super({
+        return APBase._create<APEventFields>({
             type: ASModelType.Event,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/apObject/APObject.model.ts

@@ -1,6 +1,6 @@
 import {APBase} from "../apBase/APBase.model";
 import { APObjectFields } from "./APObject.types";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 
 /**
  * Describes an object of any kind. The Object type serves as the base type for most of
@@ -10,10 +10,10 @@ import {ASModelType} from "../../common/common.types";
  * {@link https://www.w3.org/ns/activitystreams#Object Docs}
  */
 export class APObject extends APBase<APObjectFields>{
-    constructor(fields: APObjectFields) {
+    static create(fields: APObjectFields) {
-        super({
+        return APBase._create<APObjectFields>({
             type: ASModelType.Object,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/apObject/APObject.types.ts

@@ -28,10 +28,10 @@ import {
     SummaryValue,
     SummaryMapValue,
     UpdatedValue,
-    DurationValue, SourceValue, LikesValue, SharesValue,
+    DurationValue, SourceValue, LikesValue, SharesValue, ContextValue, WithContext,
-} from "../../common/common.types";
+} from "../../common/types";
 
-export interface APObjectFields {
+export interface APObjectFields extends WithContext {
     /**
      * Provides the globally unique identifier for
      * an {@link https://www.w3.org/TR/activitystreams-vocabulary/#dfn-object Object}

src/models/application/Application.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {ApplicationFields} from "./Application.types";
 
 /**
@@ -8,10 +8,10 @@ import {ApplicationFields} from "./Application.types";
  * {@link https://www.w3.org/ns/activitystreams#Application Docs}
  */
 export class Application extends APBase<ApplicationFields>{
-    constructor(fields: ApplicationFields) {
+    static create(fields: ApplicationFields) {
-        super({
+        return APBase._create<ApplicationFields>({
             type: ASModelType.Application,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/article/Article.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {ArticleFields} from "./Article.types";
 
 /**
@@ -8,10 +8,10 @@ import {ArticleFields} from "./Article.types";
  * {@link https://www.w3.org/ns/activitystreams#Article Docs}
  */
 export class Article extends APBase<ArticleFields>{
-    constructor(fields: ArticleFields) {
+    static create(fields: ArticleFields) {
-        super({
+        return APBase._create<ArticleFields>({
             type: ASModelType.Article,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/audio/Audio.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {AudioFields} from "./Audio.types";
 
 /**
@@ -8,10 +8,10 @@ import {AudioFields} from "./Audio.types";
  * {@link https://www.w3.org/ns/activitystreams#Audio Docs}
  */
 export class Audio extends APBase<AudioFields>{
-    constructor(fields: AudioFields) {
+    static create(fields: AudioFields) {
-        super({
+        return APBase._create<AudioFields>({
             type: ASModelType.Audio,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/collection/Collection.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {CollectionFields} from "./Collection.types";
 
 /**
@@ -9,10 +9,10 @@ import {CollectionFields} from "./Collection.types";
  * {@link https://www.w3.org/ns/activitystreams#Collection Docs}
  */
 export class Collection extends APBase<CollectionFields>{
-    constructor(fields: CollectionFields) {
+    static create(fields: CollectionFields) {
-        super({
+        return APBase._create<CollectionFields>({
             type: ASModelType.Collection,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/collection/Collection.types.ts

@@ -4,7 +4,7 @@ import {
     CollectionFirstValue, CollectionItemsValue,
     CollectionLastValue,
     TotalItemsValue
-} from "../../common/common.types";
+} from "../../common/types";
 
 export interface CollectionFields extends APObjectFields {
 

src/models/collectionPage/CollectionPage.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {CollectionPageFields} from "./CollectionPage.types";
 
 /**
@@ -8,10 +8,10 @@ import {CollectionPageFields} from "./CollectionPage.types";
  * {@link https://www.w3.org/ns/activitystreams#CollectionPage Docs}
  */
 export class CollectionPage extends APBase<CollectionPageFields>{
-    constructor(fields: CollectionPageFields) {
+    static create(fields: CollectionPageFields) {
-        super({
+        return APBase._create<CollectionPageFields>({
             type: ASModelType.CollectionPage,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/collectionPage/CollectionPage.types.ts

@@ -1,5 +1,5 @@
 import {CollectionFields} from "../collection/Collection.types";
-import {CollectionPageNextValue, CollectionPagePartOfValue, CollectionPagePrevValue} from "../../common/common.types";
+import {CollectionPageNextValue, CollectionPagePartOfValue, CollectionPagePrevValue} from "../../common/types";
 
 export interface CollectionPageFields extends CollectionFields {
 

src/models/document/Document.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {DocumentFields} from "./Document.types";
 
 /**
@@ -8,10 +8,10 @@ import {DocumentFields} from "./Document.types";
  * {@link https://www.w3.org/ns/activitystreams#Document Docs}
  */
 export class Document extends APBase<DocumentFields>{
-    constructor(fields: DocumentFields) {
+    static create(fields: DocumentFields) {
-        super({
+        return APBase._create<DocumentFields>({
             type: ASModelType.Document,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/group/Group.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {GroupFields} from "./Group.types";
 
 /**
@@ -8,10 +8,10 @@ import {GroupFields} from "./Group.types";
  * {@link https://www.w3.org/ns/activitystreams#Group Docs}
  */
 export class Group extends APBase<GroupFields>{
-    constructor(fields: GroupFields) {
+    static create(fields: GroupFields) {
-        super({
+        return APBase._create<GroupFields>({
             type: ASModelType.Group,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/image/Image.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {ImageFields} from "./Image.types";
 
 /**
@@ -8,10 +8,10 @@ import {ImageFields} from "./Image.types";
  * {@link https://www.w3.org/ns/activitystreams#Image Docs}
  */
 export class Image extends APBase<ImageFields>{
-    constructor(fields: ImageFields) {
+    static create(fields: ImageFields) {
-        super({
+        return APBase._create<ImageFields>({
             type: ASModelType.Image,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/intransitiveActivity/IntransitiveActivity.model.ts

@@ -1,6 +1,6 @@
 import {APBase} from "../apBase/APBase.model";
 import {IntransitiveActivityFields} from './IntransitiveActivity.types';
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 
 /**
  * Instances of intransitiveActivity are a subtype of
@@ -10,10 +10,10 @@ import {ASModelType} from "../../common/common.types";
  * {@link https://www.w3.org/ns/activitystreams#IntransitiveActivity Docs}
  */
 export class IntransitiveActivity extends APBase<IntransitiveActivityFields>{
-    constructor(fields: IntransitiveActivityFields) {
+    static create(fields: IntransitiveActivityFields) {
-        super({
+        return APBase._create<IntransitiveActivityFields>({
             type: ASModelType.Activity,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/link/Link.model.ts

@@ -1,6 +1,6 @@
 import {APBase} from "../apBase/APBase.model";
 import { LinkFields } from "./Link.types";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 
 /**
  * A Link is an indirect, qualified reference to a resource identified by a URL.
@@ -13,10 +13,10 @@ import {ASModelType} from "../../common/common.types";
  * {@link https://www.w3.org/ns/activitystreams#Link Docs}
  */
 export class Link extends APBase<LinkFields>{
-    constructor(fields: LinkFields) {
+    static create(fields: LinkFields) {
-        super({
+        return APBase._create<LinkFields>({
             type: ASModelType.Link,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/link/Link.types.ts

@@ -2,14 +2,14 @@ import {
     HeightValue,
     HreflangValue,
     HrefValue,
-    IdValue,
     MediaTypeValue,
     NameMapValue,
     NameValue, PreviewValue,
     RelValue, TypeValue, WidthValue
-} from "../../common/common.types";
+} from "../../common/types";
 
 export interface LinkFields {
+    '@context': never;
 
     /**
      * Identifies the {@link https://www.w3.org/TR/activitystreams-vocabulary/#dfn-object Object}

src/models/mention/Mention.model.ts

@@ -1,16 +1,17 @@
 import {APBase} from "../apBase/APBase.model";
 import {MentionFields} from "./Mention.types";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
+
 /**
  * A specialized Link that represents an @mention.
  *
  * {@link https://www.w3.org/ns/activitystreams#Mention Docs}
  */
 export class Mention extends APBase<MentionFields>{
-    constructor(fields: MentionFields) {
+    static create(fields: MentionFields) {
-        super({
+        return APBase._create<MentionFields>({
             type: ASModelType.Mention,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/note/Note.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {NoteFields} from "./Note.types";
 
 /**
@@ -8,10 +8,10 @@ import {NoteFields} from "./Note.types";
  * {@link https://www.w3.org/ns/activitystreams#Note Docs}
  */
 export class Note extends APBase<NoteFields>{
-    constructor(fields: NoteFields) {
+    static create(fields: NoteFields) {
-        super({
+        return APBase._create<NoteFields>({
             type: ASModelType.Note,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/orderedCollection/OrderedCollection.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {OrderedCollectionFields} from "./OrderedCollection.types";
 
 /**
@@ -9,10 +9,10 @@ import {OrderedCollectionFields} from "./OrderedCollection.types";
  * {@link https://www.w3.org/ns/activitystreams#OrderedCollection Docs}
  */
 export class OrderedCollection extends APBase<OrderedCollectionFields>{
-    constructor(fields: OrderedCollectionFields) {
+    static create(fields: OrderedCollectionFields) {
-        super({
+        return APBase._create<OrderedCollectionFields>({
             type: ASModelType.OrderedCollection,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/orderedCollection/OrderedCollection.types.ts

@@ -2,7 +2,7 @@ import {
     OrderedCollectionCurrentValue,
     OrderedCollectionFirstValue, OrderedCollectionItemsValue,
     OrderedCollectionLastValue
-} from "../../common/common.types";
+} from "../../common/types";
 import {CollectionFields} from "../collection/Collection.types";
 import {Modify} from "../../common/utils";
 

src/models/orderedCollectionPage/OrderedCollectionPage.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {OrderedCollectionPageFields} from "./OrderedCollectionPage.types";
 
 /**
@@ -8,10 +8,10 @@ import {OrderedCollectionPageFields} from "./OrderedCollectionPage.types";
  * {@link https://www.w3.org/ns/activitystreams#OrderedCollectionPage Docs}
  */
 export class OrderedCollectionPage extends APBase<OrderedCollectionPageFields>{
-    constructor(fields: OrderedCollectionPageFields) {
+    static create(fields: OrderedCollectionPageFields) {
-        super({
+        return APBase._create<OrderedCollectionPageFields>({
             type: ASModelType.OrderedCollectionPage,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/orderedCollectionPage/OrderedCollectionPage.types.ts

@@ -4,7 +4,7 @@ import {
     OrderedCollectionPagePartOfValue,
     OrderedCollectionPagePrevValue,
     StartIndexValue
-} from "../../common/common.types";
+} from "../../common/types";
 import {CollectionPageFields} from "../collectionPage/CollectionPage.types";
 import {Modify} from "../../common/utils";
 

src/models/organization/Organization.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {OrganizationFields} from "./Organization.types";
 
 /**
@@ -8,10 +8,10 @@ import {OrganizationFields} from "./Organization.types";
  * {@link https://www.w3.org/ns/activitystreams#Organization Docs}
  */
 export class Organization extends APBase<OrganizationFields>{
-    constructor(fields: OrganizationFields) {
+    static create(fields: OrganizationFields) {
-        super({
+        return APBase._create<OrganizationFields>({
             type: ASModelType.Organization,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/page/Page.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {PageFields} from "./Page.types";
 
 /**
@@ -8,10 +8,10 @@ import {PageFields} from "./Page.types";
  * {@link https://www.w3.org/ns/activitystreams#Page Docs}
  */
 export class Page extends APBase<PageFields>{
-    constructor(fields: PageFields) {
+    static create(fields: PageFields) {
-        super({
+        return APBase._create<PageFields>({
             type: ASModelType.Page,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/person/Person.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {PersonFields} from "./Person.types";
 
 /**
@@ -8,10 +8,10 @@ import {PersonFields} from "./Person.types";
  * {@link https://www.w3.org/ns/activitystreams#Person Docs}
  */
 export class Person extends APBase<PersonFields>{
-    constructor(fields: PersonFields) {
+    static create(fields: PersonFields) {
-        super({
+        return APBase._create<PersonFields>({
             type: ASModelType.Person,
-            ...fields
+            ...fields,
-        })
+        });
     }
-}
+}

src/models/place/Place.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {PlaceFields} from "./Place.types";
 
 /**
@@ -10,10 +10,10 @@ import {PlaceFields} from "./Place.types";
  * {@link https://www.w3.org/ns/activitystreams#Place Docs}
  */
 export class Place extends APBase<PlaceFields>{
-    constructor(fields: PlaceFields) {
+    static create(fields: PlaceFields) {
-        super({
+        return APBase._create<PlaceFields>({
             type: ASModelType.Place,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/place/Place.types.ts

@@ -6,7 +6,7 @@ import {
     LongitudeValue,
     RadiusValue,
     UnitsValue
-} from "../../common/common.types";
+} from "../../common/types";
 
 
 export interface PlaceFields extends APObjectFields {

src/models/profile/Profile.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {ProfileFields} from "./Profile.types";
 
 /**
@@ -10,10 +10,10 @@ import {ProfileFields} from "./Profile.types";
  * {@link https://www.w3.org/ns/activitystreams#Profile Docs}
  */
 export class Profile extends APBase<ProfileFields>{
-    constructor(fields: ProfileFields) {
+    static create(fields: ProfileFields) {
-        super({
+        return APBase._create<ProfileFields>({
             type: ASModelType.Profile,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/profile/Profile.types.ts

@@ -1,6 +1,6 @@
 
 import {APObjectFields} from "../apObject/APObject.types";
-import {DescribesValue} from "../../common/common.types";
+import {DescribesValue} from "../../common/types";
 
 export interface ProfileFields extends APObjectFields {
 

src/models/question/Question.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {QuestionFields} from "./Question.types";
 
 /**
@@ -14,10 +14,10 @@ import {QuestionFields} from "./Question.types";
  * {@link https://www.w3.org/ns/activitystreams#Question Docs}
  */
 export class Question extends APBase<QuestionFields>{
-    constructor(fields: QuestionFields) {
+    static create(fields: QuestionFields) {
-        super({
+        return APBase._create<QuestionFields>({
             type: ASModelType.Question,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/question/Question.types.ts

@@ -1,5 +1,5 @@
 import {IntransitiveActivityFields} from "../intransitiveActivity/IntransitiveActivity.types";
-import {AnyOfValue, ClosedValue, OneOfValue} from "../../common/common.types";
+import {AnyOfValue, ClosedValue, OneOfValue} from "../../common/types";
 
 export interface QuestionFields extends IntransitiveActivityFields {
 

src/models/relationship/Relationship.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {RelationshipFields} from "./Relationship.types";
 
 /**
@@ -11,10 +11,10 @@ import {RelationshipFields} from "./Relationship.types";
  * {@link https://www.w3.org/ns/activitystreams#Relationship Docs}
  */
 export class Relationship extends APBase<RelationshipFields>{
-    constructor(fields: RelationshipFields) {
+    static create(fields: RelationshipFields) {
-        super({
+        return APBase._create<RelationshipFields>({
             type: ASModelType.Relationship,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/relationship/Relationship.types.ts

@@ -1,5 +1,5 @@
 import {APObjectFields} from "../apObject/APObject.types";
-import {SubjectValue, ObjectValue, RelationshipValue} from "../../common/common.types";
+import {SubjectValue, ObjectValue, RelationshipValue} from "../../common/types";
 
 export interface RelationshipFields extends APObjectFields {
 

src/models/service/Service.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {ServiceFields} from "./Service.types";
 
 /**
@@ -8,10 +8,10 @@ import {ServiceFields} from "./Service.types";
  * {@link https://www.w3.org/ns/activitystreams#Service Docs}
  */
 export class Service extends APBase<ServiceFields>{
-    constructor(fields: ServiceFields) {
+    static create(fields: ServiceFields) {
-        super({
+        return APBase._create<ServiceFields>({
             type: ASModelType.Service,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/tombstone/Tombstone.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {TombstoneFields} from "./Tombstone.types";
 
 /**
@@ -10,10 +10,10 @@ import {TombstoneFields} from "./Tombstone.types";
  * {@link https://www.w3.org/ns/activitystreams#Tombstone Docs}
  */
 export class Tombstone extends APBase<TombstoneFields>{
-    constructor(fields: TombstoneFields) {
+    static create(fields: TombstoneFields) {
-        super({
+        return APBase._create<TombstoneFields>({
             type: ASModelType.Tombstone,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

src/models/tombstone/Tombstone.types.ts

@@ -1,4 +1,4 @@
-import {DeletedValue, FormerTypeValue} from "../../common/common.types";
+import {DeletedValue, FormerTypeValue} from "../../common/types";
 import {APObjectFields} from "../apObject/APObject.types";
 
 export interface TombstoneFields extends APObjectFields {

src/models/video/Video.model.ts

@@ -1,5 +1,5 @@
 import {APBase} from "../apBase/APBase.model";
-import {ASModelType} from "../../common/common.types";
+import {ASModelType} from "../../common/types";
 import {VideoFields} from "./Video.types";
 
 /**
@@ -8,10 +8,10 @@ import {VideoFields} from "./Video.types";
  * {@link https://www.w3.org/ns/activitystreams#Video Docs}
  */
 export class Video extends APBase<VideoFields>{
-    constructor(fields: VideoFields) {
+    static create(fields: VideoFields) {
-        super({
+        return APBase._create<VideoFields>({
             type: ASModelType.Video,
-            ...fields
+            ...fields,
-        })
+        });
     }
 }

tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "outDir": "./dist",
     "declaration": true,
-    "target": "es2016",
+    "target": "es2017",
     "module": "ES6",
     "moduleResolution": "Node",
     "esModuleInterop": true,