update base model & refactor

src/common/types.ts

@@ -55,6 +55,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;

src/common/utils.ts

@@ -1 +1,13 @@
-export type Modify<T, R> = Omit<T, keyof R> & R;
+export type Modify<T, R> = Omit<T, keyof R> & R;
+
+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/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,

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";
 
 /**

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,26 +1,26 @@
-import { contexts } from "../../common/common.constants";
+import { contexts } from "../../common/constants";
+import { ContextValue } from "../../common/types";
+import { cloneObjDeep } from "../../common/utils";
 
-// TODO: types
+interface ContextField {
-// TODO: renaming/refactor
+    '@context'?: ContextValue | ContextValue[];
-export type Context = string | any[];
-
-export interface ModelBaseAPWithContext {
-    '@context'?: Context;
 }
 
 export class APBase<T> {
-    public fields: T & ModelBaseAPWithContext;
+    public fields: T & ContextField;
 
-    constructor(fields: T) {
+    constructor(fields: T & ContextField) {
-        // TODO: make recursive copy
+        const obj = cloneObjDeep<T & ContextField>(fields);
         this.fields = {
-            ...fields,
+            ...obj,
-        } as T & ModelBaseAPWithContext;
+        } as T & ContextField;
     }
 
-    // TODO: rewrite (better option to handle multiple contexts)
+    private parseValue(value: any): any {
-    // some comment
+        return value instanceof APBase ? value.toPlain() : value;
-    public setContext(context?: Context): this {
+    }
+
+    public withContext(context?: ContextValue): this {
         this.fields = {
             ['@context']: context || contexts.activityStreamsV2,
             ...this.fields
@@ -28,20 +28,33 @@ export class APBase<T> {
         return this;
     }
 
-    public plain(): Record<string, any> {
+    public toPlain(): Record<string, any> {
         const result = {} as Record<string, any>;
-        for (const [key, node] of Object.entries(this.fields)) {
+        for (const [key, value] of Object.entries(this.fields)) {
-            if (node instanceof APBase) {
+            const isFunction = typeof value === 'function';
-                result[key] = node.plain();
+            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";
 
 /**

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

src/models/apObject/APObject.types.ts

@@ -29,7 +29,7 @@ import {
     SummaryMapValue,
     UpdatedValue,
     DurationValue, SourceValue, LikesValue, SharesValue,
-} from "../../common/common.types";
+} from "../../common/types";
 
 export interface APObjectFields {
     /**

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";
 
 /**

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";
 
 /**

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";
 
 /**

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";
 
 /**

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";
 
 /**

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";
 
 /**

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";
 
 /**

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";
 
 /**

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

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.

src/models/link/Link.types.ts

@@ -2,12 +2,11 @@ import {
     HeightValue,
     HreflangValue,
     HrefValue,
-    IdValue,
     MediaTypeValue,
     NameMapValue,
     NameValue, PreviewValue,
     RelValue, TypeValue, WidthValue
-} from "../../common/common.types";
+} from "../../common/types";
 
 export interface LinkFields {
 

src/models/mention/Mention.model.ts

@@ -1,6 +1,6 @@
 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.
  *

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";
 
 /**

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";
 
 /**

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";
 
 /**

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";
 
 /**

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";
 
 /**

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";
 
 /**

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";
 
 /**

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";
 
 /**

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";
 
 /**

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";
 
 /**

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";
 
 /**

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";
 
 /**

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";
 
 /**