notu 0.6.2 → 0.7.0

package/dist/notu.mjs

@@ -40,7 +40,6 @@ class Attr extends ModelWithState {
     __publicField(this, "_name", "");
     __publicField(this, "_description", "");
     __publicField(this, "_type", "TEXT");
-    __publicField(this, "_spaceId", 0);
     __publicField(this, "_space", null);
     name && (this.name = name), description && (this.description = description);
   }
@@ -88,29 +87,26 @@ class Attr extends ModelWithState {
   asDate() {
     return this.type = "DATE", this;
   }
-  get spaceId() {
-    return this._spaceId;
-  }
-  set spaceId(value) {
-    var _a;
-    value !== this._spaceId && (this._spaceId = value, value !== ((_a = this.space) == null ? void 0 : _a.id) && (this._space = null), this.isClean && this.dirty());
-  }
   get space() {
     return this._space;
   }
   set space(value) {
-    this._space = value, this.spaceId = (value == null ? void 0 : value.id) ?? 0;
+    var _a;
+    if (value !== this._space) {
+      const idChanged = (value == null ? void 0 : value.id) != ((_a = this._space) == null ? void 0 : _a.id);
+      this._space = value, this.isClean && idChanged && this.dirty();
+    }
   }
   in(space) {
-    return typeof space == "number" ? this.spaceId = space : this.space = space, this;
+    return this.space = space, this;
   }
   duplicate() {
     const output = new Attr();
-    return output.id = this.id, output.name = this.name, output.description = this.description, output.type = this.type, this.space ? output.space = this.space : output.spaceId = this.spaceId, output.state = this.state, output;
+    return output.id = this.id, output.name = this.name, output.description = this.description, output.type = this.type, output.space = this.space, output.state = this.state, output;
   }
   validate(throwError = !1) {
     let output = null;
-    if (this.spaceId <= 0 ? output = "Note spaceId must be greater than zero." : !this.isNew && this.id <= 0 && (output = "Attr id must be greater than zero if in non-new state."), throwError && output != null)
+    if (this.space ? !this.isNew && this.id <= 0 && (output = "Attr id must be greater than zero if in non-new state.") : output = "Attr must belong to a space.", throwError && output != null)
       throw Error(output);
     return output == null;
   }
@@ -127,158 +123,99 @@ class Attr extends ModelWithState {
     }
   }
   toJSON() {
+    var _a;
     return {
       state: this.state,
       id: this.id,
       name: this.name,
       description: this.description,
       type: this.type,
-      spaceId: this.spaceId
+      spaceId: (_a = this.space) == null ? void 0 : _a.id
     };
   }
-  static fromJSON(json) {
-    const output = new Attr(json.name, json.description);
-    return output.type = json.type, output.spaceId = json.spaceId, output.id = json.id, output.state = json.state, output;
-  }
 }
-class CachedClient {
-  constructor(internalClient) {
-    __publicField(this, "_internalClient");
-    //Caches
-    __publicField(this, "_spaces", null);
-    __publicField(this, "_attrs", null);
-    __publicField(this, "_tags", null);
-    this._internalClient = internalClient;
+class Notu {
+  constructor(client, cache) {
+    __publicField(this, "_client");
+    __publicField(this, "_cache");
+    this._client = client, this._cache = cache;
   }
-  _linkTagsToSpaces() {
-    for (const tag of this._tags.values()) {
-      const space = this._spaces.get(tag.spaceId);
-      space && (tag.space = space);
-    }
+  get client() {
+    return this._client;
   }
-  _linkAttrsToSpaces() {
-    for (const attr of this._attrs.values()) {
-      const space = this._spaces.get(attr.spaceId);
-      space && (attr.space = space);
-    }
+  get cache() {
+    return this._cache;
   }
-  /////////////////////////////////////
-  // NotuClient implementation start //
-  /////////////////////////////////////
   async login(username, password) {
-    return await this._internalClient.login(username, password);
-  }
-  async getSpaces() {
-    if (this._spaces == null) {
-      const spaces = await this._internalClient.getSpaces();
-      this._spaces = /* @__PURE__ */ new Map();
-      for (const space of spaces)
-        this._spaces.set(space.id, space);
-      this._tags != null && this._linkTagsToSpaces(), this._attrs != null && this._linkAttrsToSpaces();
-    }
-    return [...this._spaces.values()];
+    return await this.client.login(username, password);
+  }
+  getSpaces() {
+    return this.cache.getSpaces();
+  }
+  getSpace(id) {
+    return this.cache.getSpace(id);
+  }
+  getSpaceByName(name) {
+    return this.cache.getSpaceByName(name);
   }
   async saveSpace(space) {
-    const saveResult = await this._internalClient.saveSpace(space);
-    return this._spaces != null && this._spaces.set(saveResult.id, saveResult), saveResult;
-  }
-  async getAttrs(spaceId) {
-    if (this._attrs == null) {
-      const attrs = await this._internalClient.getAttrs(spaceId);
-      this._attrs = /* @__PURE__ */ new Map();
-      for (const attr of attrs)
-        this._attrs.set(attr.id, attr);
-      this._spaces != null && this._linkAttrsToSpaces();
-    }
-    return [...this._attrs.values()];
+    const spaceData = await this.client.saveSpace(space);
+    return this.cache.spaceSaved(spaceData);
+  }
+  getAttrs(space) {
+    return this.cache.getAttrs(space);
+  }
+  getAttr(id) {
+    return this.cache.getAttr(id);
+  }
+  getAttrByName(name, space) {
+    return this.cache.getAttrByName(name, space);
   }
   async saveAttr(attr) {
-    const saveResult = await this._internalClient.saveAttr(attr);
-    return this._attrs != null && this._attrs.set(saveResult.id, saveResult), saveResult;
-  }
-  async getTags() {
-    if (this._tags == null) {
-      const tags = await this._internalClient.getTags();
-      this._tags = /* @__PURE__ */ new Map();
-      for (const tag of tags)
-        this._tags.set(tag.id, tag);
-      this._spaces != null && this._linkTagsToSpaces();
-    }
-    return [...this._tags.values()];
+    const attrData = await this.client.saveAttr(attr);
+    return this.cache.attrSaved(attrData);
+  }
+  getTags(space = null, includeOtherSpacePublics = !1) {
+    return this.cache.getTags(space, includeOtherSpacePublics);
+  }
+  getTag(id) {
+    return this.cache.getTag(id);
+  }
+  getTagByName(name, space) {
+    return this.cache.getTagByName(name, space);
   }
   async getNotes(query, spaceId) {
-    const results = await this._internalClient.getNotes(query, spaceId);
-    if (this._spaces != null)
-      for (const note of results) {
-        const space = this._spaces.get(note.spaceId);
-        space && (note.space = space);
-      }
-    if (this._attrs != null)
-      for (const note of results)
-        for (const na of note.allAttrs) {
-          const attr = this._attrs.get(na.attrId);
-          attr && (na.attr = attr, attr.isDate && !(na.value instanceof Date) && (na.value = new Date(na.value)), na.clean());
-        }
-    if (this._tags != null)
-      for (const note of results) {
-        {
-          const tag = this._tags.get(note.id);
-          tag && (note.setOwnTag(tag), note.clean(), note.ownTag.clean());
-        }
-        for (const nt of note.tags) {
-          const tag = this._tags.get(nt.tagId);
-          tag && (nt.tag = tag, nt.clean());
-        }
-        for (const na of note.allAttrs.filter((x) => x.tagId != null)) {
-          const tag = this._tags.get(na.tagId);
-          tag && (na.tag = tag, na.clean());
-        }
-      }
-    return results;
+    return (await this.client.getNotes(query, spaceId)).map((n) => this.cache.noteFromJSON(n));
   }
   async getNoteCount(query, spaceId) {
-    return await this._internalClient.getNoteCount(query, spaceId);
+    return await this.client.getNoteCount(query, spaceId);
   }
   async saveNotes(notes) {
-    const saveResults = await this._internalClient.saveNotes(notes);
-    if (this._tags != null)
-      for (const note of saveResults.filter((x) => !!x.ownTag))
-        this._tags.set(note.ownTag.id, note.ownTag);
-    return saveResults;
+    const notesData = await this.client.saveNotes(notes);
+    for (const noteData of notesData.filter((x) => !!x.ownTag))
+      this.cache.tagSaved(noteData.ownTag);
+    return notes = notesData.map((n) => this.cache.noteFromJSON(n)), notes;
   }
   async customJob(name, data) {
-    return await this._internalClient.customJob(name, data);
-  }
-  ///////////////////////////////////
-  // NotuClient implementation end //
-  ///////////////////////////////////
-  //Synchronous cache methods
-  //These are introduced to make it far easier to lookup the cached values
-  //Especially in React where async is kind of a pain
-  //Make sure this method has been called before any of the other methods in this section
-  async cacheAll(spaceId = 0) {
-    await this.getSpaces();
-    const tagsPromise = this.getTags(), attrsPromise = this.getAttrs(spaceId);
-    await Promise.all([tagsPromise, attrsPromise]);
-  }
-  get spaces() {
-    return [...this._spaces.values()];
-  }
-  get tags() {
-    return [...this._tags.values()];
-  }
-  get attrs() {
-    return [...this._attrs.values()];
+    return await this.client.customJob(name, data);
   }
 }
 class Space extends ModelWithState {
   constructor(name = "") {
     super();
-    __publicField(this, "id", 0);
+    __publicField(this, "_id", 0);
     __publicField(this, "_name", "");
     __publicField(this, "_version", "0.0.1");
     this._name = name;
   }
+  get id() {
+    return this._id;
+  }
+  set id(value) {
+    if (!this.isNew)
+      throw Error("Cannot change the id of a Space once it has already been created.");
+    this._id = value;
+  }
   get name() {
     return this._name;
   }
@@ -296,7 +233,7 @@ class Space extends ModelWithState {
   }
   duplicate() {
     const output = new Space();
-    return output.id = this.id, output.name = this.name, output.state = this.state, output.version = this.version, output;
+    return output.id = this.id, output.name = this.name, output.version = this.version, output.state = this.state, output;
   }
   validate(throwError = !1) {
     let output = null;
@@ -312,12 +249,8 @@ class Space extends ModelWithState {
       version: this.version
     };
   }
-  static fromJSON(json) {
-    const output = new Space(json.name);
-    return output.id = json.id, output.state = json.state, output.version = json.version, output;
-  }
 }
-class HttpClient {
+class NotuHttpClient {
   constructor(url, fetchMethod = null) {
     __publicField(this, "_url", null);
     __publicField(this, "_token", null);
@@ -337,81 +270,60 @@ class HttpClient {
     this._token = value;
   }
   async login(username, password) {
-    const result = await this._fetch(
+    const response = await this._fetch(
       this.url + "/login",
       {
         method: "POST",
         body: JSON.stringify({ username, password })
       }
     );
-    if (result.body != null) {
-      const token = (await result.json()).token;
-      if (token)
-        return this._token = token, { success: !0, error: null, token: this._token };
+    if (response.body != null) {
+      const result = await response.json();
+      return result.token && (this._token = result.token), result;
     }
-    return { success: !1, error: "Invalid username & password.", token: null };
+    return { token: null, error: "Unknown error occurred on the server" };
   }
-  async getSpaces() {
-    return (await (await this._fetch(
-      this.url + "/spaces",
+  async setup() {
+    await (await this._fetch(
+      this.url + "/setup",
       {
-        method: "GET",
+        method: "POST",
         headers: { Authorization: "Bearer " + this.token }
       }
-    )).json()).map((x) => Space.fromJSON(x));
+    )).json();
   }
   async saveSpace(space) {
-    const result = await this._fetch(
+    return await (await this._fetch(
       this.url + "/spaces",
       {
         method: "POST",
         body: JSON.stringify(space),
         headers: { Authorization: "Bearer " + this.token }
       }
-    );
-    return Space.fromJSON(await result.json());
-  }
-  async getAttrs(spaceId = 0) {
-    return (await (await this._fetch(
-      this.url + `/attrs?space=${spaceId}`,
-      {
-        method: "GET",
-        headers: { Authorization: "Bearer " + this.token }
-      }
-    )).json()).map((x) => Attr.fromJSON(x));
+    )).json();
   }
   async saveAttr(attr) {
-    const result = await this._fetch(
+    return await (await this._fetch(
       this.url + "/attrs",
       {
         method: "POST",
         body: JSON.stringify(attr),
         headers: { Authorization: "Bearer " + this.token }
       }
-    );
-    return Attr.fromJSON(await result.json());
-  }
-  async getTags() {
-    return (await (await this._fetch(
-      this.url + "/tags",
-      {
-        method: "GET",
-        headers: { Authorization: "Bearer " + this.token }
-      }
-    )).json()).map((x) => Tag.fromJSON(x));
+    )).json();
   }
-  async getNotes(query, spaceId) {
-    return (await (await this._fetch(
-      this.url + `/notes?space=${spaceId}&query=${encodeURIComponent(query)}`,
+  async getNotes(query, space) {
+    return space instanceof Space && (space = space.id), await (await this._fetch(
+      this.url + `/notes?space=${space}&query=${encodeURIComponent(query)}`,
       {
         method: "GET",
         headers: { Authorization: "Bearer " + this.token }
       }
-    )).json()).map((x) => Note.fromJSON(x));
+    )).json();
   }
-  async getNoteCount(query, spaceId) {
-    return (await (await this._fetch(
-      this.url + `/notes?count=true&space=${spaceId}&query=${encodeURIComponent(query)}`,
+  async getNoteCount(query, space) {
+    return space instanceof Space && (space = space.id), (await (await this._fetch(
+      this.url + `/notes?count=true&space=${space}&query=${encodeURIComponent(query)}`,
       {
         method: "GET",
         headers: { Authorization: "Bearer " + this.token }
@@ -419,14 +331,14 @@ class HttpClient {
     )).json()).count;
   }
   async saveNotes(notes) {
-    return (await (await this._fetch(
+    return await (await this._fetch(
       this.url + "/notes",
       {
         method: "POST",
         body: JSON.stringify(notes),
         headers: { Authorization: "Bearer " + this.token }
       }
-    )).json()).map((x) => Note.fromJSON(x));
+    )).json();
   }
   async customJob(name, data) {
     return await (await this._fetch(
@@ -440,164 +352,129 @@ class HttpClient {
   }
 }
 class NoteAttr extends ModelWithState {
-  constructor(note, attr, value) {
+  constructor(attr, tag, value) {
     super();
-    __publicField(this, "_noteId", 0);
-    __publicField(this, "_note", null);
-    __publicField(this, "_attrId", 0);
+    __publicField(this, "_tag", null);
     __publicField(this, "_attr", null);
     __publicField(this, "_value", null);
-    __publicField(this, "_tagId", null);
-    __publicField(this, "_tag", null);
-    note != null && note != null && (typeof note == "number" ? this.noteId = note : this.note = note), attr != null && attr != null && (typeof attr == "number" ? this.attrId = attr : this.attr = attr), value != null && value != null && (this.value = value);
-  }
-  get noteId() {
-    return this._noteId;
-  }
-  set noteId(value) {
-    var _a;
-    value !== this._noteId && (this._noteId = value, value !== ((_a = this.note) == null ? void 0 : _a.id) && (this._note = null), this.isClean && this.dirty());
-  }
-  get note() {
-    return this._note;
-  }
-  set note(value) {
-    this._note = value, this.noteId = (value == null ? void 0 : value.id) ?? 0;
-  }
-  get attrId() {
-    return this._attrId;
+    if (!attr)
+      throw Error("Cannot instanciate new NoteAttr without a passed in attr.");
+    if (attr.isNew)
+      throw Error("Cannot create a NoteAttr object for an attr that hasn't been saved yet.");
+    if (attr.isDeleted)
+      throw Error("Cannot create a NoteAttr object for an attr marked as deleted.");
+    if (this._attr = attr, tag) {
+      if (tag.isNew)
+        throw Error("Cannot create a NoteAttr object linked to a tag that hasn't been saved yet.");
+      if (tag.isDeleted)
+        throw Error("Cannot create a NoteAttr object linked to a tag marked as deleted.");
+      this._tag = tag;
+    }
+    value != null && value != null ? this.value = value : this.value = attr.defaultValue;
   }
-  set attrId(value) {
-    var _a;
-    value !== this._attrId && (this._attrId = value, value !== ((_a = this.attr) == null ? void 0 : _a.id) && (this._attr = null), this.isClean && this.dirty());
+  get tag() {
+    return this._tag;
   }
   get attr() {
     return this._attr;
   }
-  set attr(newAttr) {
-    const oldAttr = this._attr;
-    this._attr = newAttr, newAttr ? newAttr.id != this.attrId && (!oldAttr || newAttr.type != oldAttr.type) && (this.value = newAttr.defaultValue) : this.value = null, this.attrId = (newAttr == null ? void 0 : newAttr.id) ?? 0;
-  }
   get value() {
     return this._value;
   }
   set value(newVal) {
-    newVal != this._value && (this._value = newVal, this.isClean && this.dirty());
+    this.attr.isDate && !(newVal instanceof Date) && (newVal = new Date(newVal)), newVal != this._value && (this._value = newVal, this.isClean && this.dirty());
   }
   withValue(value) {
     return this.value = value, this;
   }
-  get tagId() {
-    return this._tagId;
-  }
-  set tagId(value) {
-    var _a;
-    value !== this._tagId && (this._tagId = value, value !== ((_a = this.tag) == null ? void 0 : _a.id) && (this._tag = null), this.isClean && this.dirty());
-  }
-  get tag() {
-    return this._tag;
-  }
-  set tag(value) {
-    this._tag = value, this.tagId = (value == null ? void 0 : value.id) ?? null;
-  }
-  onTag(tag) {
-    return typeof tag == "number" ? this.tagId = tag : this.tag = tag, this;
-  }
   duplicate() {
-    const output = new NoteAttr();
-    return output.noteId = this.noteId, this.attr ? output.attr = this.attr : output.attrId = this.attrId, this.tag ? output.tag = this.tag : output.tagId = this.tagId, output.value = this.value, output.state = this.state, output;
+    return new NoteAttr(this.attr, this.tag, this.value);
   }
   validate(throwError = !1) {
     let output = null;
-    if (this.noteId <= 0 && !this.isNew ? output = "NoteAttr noteId must be greater than zero" : this.attrId <= 0 && (output = "NoteAttr attrId must be greater than zero"), throwError && output != null)
+    if (throwError && output != null)
       throw Error(output);
     return output == null;
   }
   toJSON() {
     return {
       state: this.state,
-      noteId: this.noteId,
-      attrId: this.attrId,
-      tagId: this.tagId,
+      attrId: this.attr.id,
+      tagId: this.tag.id,
       value: this.value
     };
   }
-  static fromJSON(json) {
-    const output = new NoteAttr(json.noteId, json.attrId, json.value);
-    return output.tagId = json.tagId, output.state = json.state, output;
-  }
 }
 class NoteTag extends ModelWithState {
-  constructor(note, tag) {
+  constructor(tag) {
     super();
-    __publicField(this, "_noteId", 0);
-    __publicField(this, "_note", null);
-    __publicField(this, "_tagId", 0);
-    __publicField(this, "_tag", null);
-    note != null && note != null && (typeof note == "number" ? this.noteId = note : this.note = note), tag != null && tag != null && (typeof tag == "number" ? this.tagId = tag : this.tag = tag);
-  }
-  get noteId() {
-    return this._noteId;
-  }
-  set noteId(value) {
-    var _a;
-    value !== this._noteId && (this._noteId = value, value !== ((_a = this.note) == null ? void 0 : _a.id) && (this._note = null), this.isClean && this.dirty());
-  }
-  get note() {
-    return this._note;
+    __publicField(this, "_tag");
+    __publicField(this, "_attrs", []);
+    if (!tag)
+      throw Error("Cannot instanciate new NoteTag without a passed in tag.");
+    if (tag.isNew)
+      throw Error("Cannot create a NoteTag object for a tag that hasn't been saved yet.");
+    if (tag.isDeleted)
+      throw Error("Cannot create a NoteTag object for a tag marked as deleted.");
+    this._tag = tag;
   }
-  set note(value) {
-    this._note = value, this.noteId = (value == null ? void 0 : value.id) ?? 0;
+  get tag() {
+    return this._tag;
   }
-  get tagId() {
-    return this._tagId;
+  get attrs() {
+    return this._attrs.filter((x) => !x.isDeleted);
   }
-  set tagId(value) {
-    var _a;
-    value !== this._tagId && (this._tagId = value, value !== ((_a = this.tag) == null ? void 0 : _a.id) && (this._tag = null), this.isClean && this.dirty());
+  get attrsPendingDeletion() {
+    return this._attrs.filter((x) => x.isDeleted);
   }
-  get tag() {
-    return this._tag;
+  addAttr(attr, value) {
+    if (attr.isDeleted)
+      throw Error("Cannot add an attribute marked as deleted.");
+    if (attr.isNew)
+      throw Error("Cannot add an attribute that hasn't yet been saved.");
+    const na = new NoteAttr(attr, this.tag, value);
+    return this._attrs.push(na), this;
   }
-  set tag(value) {
-    this._tag = value, this.tagId = (value == null ? void 0 : value.id) ?? 0;
+  removeAttr(attr) {
+    const na = this._attrs.find((x) => x.attr.id == attr.id);
+    return na ? (na.isNew ? this._attrs = this._attrs.filter((x) => x !== na) : na.delete(), this) : this;
   }
-  get attrs() {
-    return this.note ? this.note.allAttrs.filter((x) => x.tagId == this.tagId) : [];
+  getAttr(attr) {
+    return attr instanceof Attr && (attr = attr.name), this.attrs.find((x) => x.attr.name == attr);
   }
-  addAttr(attr) {
-    if (!this.note)
-      throw new Error("Cannot call addAttr on NoteTag where note property has not been set");
-    const na = this.note.addAttr(attr);
-    return na.tag = this.tag, na;
+  getValue(attr) {
+    var _a;
+    return (_a = this.getAttr(attr)) == null ? void 0 : _a.value;
   }
   duplicate() {
-    const output = new NoteTag();
-    return output.noteId = this.noteId, this.tag ? output.tag = this.tag : output.tagId = this.tagId, output;
+    const output = new NoteTag(this.tag);
+    return output._attrs = this.attrs.map((x) => x.duplicate()), output;
   }
   validate(throwError = !1) {
-    let output = null;
-    if (this.noteId <= 0 && !this.isNew ? output = "NoteTag noteId must be greater than zero" : this.tagId <= 0 ? output = "NoteTag tagId must be greater than zero" : this.noteId == this.tagId && (output = "NoteTag cannot link a note to its own tag"), throwError && output != null)
-      throw Error(output);
-    return output == null;
+    function exit(message) {
+      if (throwError && message != null)
+        throw Error(message);
+      return message == null;
+    }
+    if (!this.tag)
+      return exit("NoteTag must have a tag set.");
+    for (const na of this._attrs)
+      if (!na.validate(throwError))
+        return !1;
+    return !0;
   }
   toJSON() {
     return {
       state: this.state,
-      noteId: this.noteId,
-      tagId: this.tagId
+      tagId: this.tag.id,
+      attrs: this._attrs
     };
   }
-  static fromJSON(json) {
-    const output = new NoteTag(json.noteId, json.tagId);
-    return output.state = json.state, output;
-  }
 }
 class Tag extends ModelWithState {
   constructor(name = "") {
     super();
     __publicField(this, "_id", 0);
-    __publicField(this, "_spaceId", 0);
     __publicField(this, "_space", null);
     __publicField(this, "_name", "");
     __publicField(this, "_color", null);
@@ -608,23 +485,22 @@ class Tag extends ModelWithState {
     return this._id;
   }
   set id(value) {
-    value !== this._id && (this._id = value, this.isClean && this.dirty());
-  }
-  get spaceId() {
-    return this._spaceId;
-  }
-  set spaceId(value) {
-    var _a;
-    value !== this._spaceId && (this._spaceId = value, value !== ((_a = this.space) == null ? void 0 : _a.id) && (this._space = null), this.isClean && this.dirty());
+    if (!this.isNew)
+      throw Error("Cannot change the id of a Tag once it has already been created.");
+    this._id = value;
   }
   get space() {
     return this._space;
   }
   set space(value) {
-    this._space = value, this.spaceId = (value == null ? void 0 : value.id) ?? 0;
+    var _a;
+    if (value !== this._space) {
+      const idChanged = (value == null ? void 0 : value.id) != ((_a = this._space) == null ? void 0 : _a.id);
+      this._space = value, this.isClean && idChanged && this.dirty();
+    }
   }
   in(space) {
-    return typeof space == "number" ? this.spaceId = space : this.space = space, this;
+    return this.space = space, this;
   }
   get name() {
     return this._name;
@@ -633,7 +509,8 @@ class Tag extends ModelWithState {
     value !== this._name && (this._name = value, this.isClean && this.dirty());
   }
   getQualifiedName(contextSpaceId) {
-    return contextSpaceId == this.spaceId ? this.name : `${this.space.name}.${this.name}`;
+    var _a;
+    return contextSpaceId == ((_a = this.space) == null ? void 0 : _a.id) ? this.name : `${this.space.name}.${this.name}`;
   }
   get color() {
     return this._color;
@@ -668,38 +545,36 @@ class Tag extends ModelWithState {
     return hex ? (hex.startsWith("#") && (hex = hex.substring(1)), parseInt(hex, 16)) : null;
   }
   toJSON() {
+    var _a;
     return {
       state: this.state,
       id: this.id,
       name: this.name,
-      spaceId: this.spaceId,
+      spaceId: (_a = this.space) == null ? void 0 : _a.id,
       color: this.color,
       isPublic: this.isPublic
     };
   }
-  static fromJSON(json) {
-    const output = new Tag(json.name);
-    return output.id = json.id, output.spaceId = json.spaceId, output.color = json.color, output.isPublic = json.isPublic, output.state = json.state, output;
-  }
 }
 class Note extends ModelWithState {
-  constructor(text) {
+  constructor(text, ownTag) {
     super();
     __publicField(this, "_id", 0);
     __publicField(this, "_date", /* @__PURE__ */ new Date());
     __publicField(this, "_text", "");
-    __publicField(this, "_spaceId", 0);
     __publicField(this, "_space", null);
     __publicField(this, "_ownTag", null);
     __publicField(this, "_tags", []);
     __publicField(this, "_attrs", []);
-    text && (this.text = text);
+    text && (this.text = text), this._ownTag = ownTag;
   }
   get id() {
     return this._id;
   }
   set id(value) {
-    this._id = value, this.ownTag && (this.ownTag.id = value);
+    if (!this.isNew)
+      throw Error("Cannot change the id of a Note once it has already been created.");
+    this._id = value, this.ownTag && this.ownTag.id != value && (this.ownTag.id = value);
   }
   get date() {
     return this._date;
@@ -716,42 +591,30 @@ class Note extends ModelWithState {
   set text(value) {
     value !== this._text && (this._text = value, this.isClean && this.dirty());
   }
-  get spaceId() {
-    return this._spaceId;
-  }
-  set spaceId(value) {
-    var _a;
-    value !== this._spaceId && (this._spaceId = value, value !== ((_a = this.space) == null ? void 0 : _a.id) && (this._space = null), this.isClean && this.dirty(), this._setOwnTagSpace());
-  }
   get space() {
     return this._space;
   }
   set space(value) {
-    this._space = value, this.spaceId = (value == null ? void 0 : value.id) ?? 0;
+    var _a;
+    if (value !== this._space) {
+      const idChanged = (value == null ? void 0 : value.id) != ((_a = this._space) == null ? void 0 : _a.id);
+      this._space = value, this.isClean && idChanged && this.dirty(), this._setOwnTagSpace();
+    }
   }
   in(space) {
-    return typeof space == "number" ? this.spaceId = space : this.space = space, this;
+    return this.space = space, this;
   }
   get ownTag() {
     return this._ownTag;
   }
-  setOwnTag(tag) {
-    if (typeof tag == "string")
-      this.ownTag == null && (this._ownTag = new Tag()), this.ownTag.name = tag, this.ownTag.id = this.id, this._setOwnTagSpace();
-    else {
-      if (this.ownTag)
-        throw new Error("Note has already had its tag set. If you would like to change the tag name, call setTag with just a string specifying the new tag name.");
-      if (tag.id != 0 && tag.id != this.id)
-        throw new Error("Attempted to set tag to note with non-matching ID. Added tag id must either match the note id, which indicates that the tag has already been added to the note. Otherwise the tag id must be zero, indicating that the tag still needs to be added.");
-      this._ownTag = tag;
-    }
-    return this;
+  setOwnTag(tagName) {
+    return this.ownTag == null ? (this._ownTag = new Tag(tagName), this.ownTag.id = this.id) : this.ownTag.isDeleted && this.ownTag.dirty(), this.ownTag.name = tagName, this._setOwnTagSpace(), this;
   }
   removeOwnTag() {
     return this.ownTag ? (this.ownTag.isNew ? this._ownTag = null : this.ownTag.delete(), this) : this;
   }
   _setOwnTagSpace() {
-    this.ownTag && (this.space ? this.ownTag.space = this.space : this.ownTag.spaceId = this.spaceId);
+    this.ownTag && this.space && (this.ownTag.space = this.space);
   }
   get tags() {
     return this._tags.filter((x) => !x.isDeleted);
@@ -766,63 +629,47 @@ class Note extends ModelWithState {
       throw Error("Cannot add a tag that hasn't yet been saved to a note");
     if (tag.id == this.id)
       throw Error("Note cannot add its own tag as a linked tag");
-    if (!tag.isPublic && tag.spaceId != this.spaceId)
+    if (!tag.isPublic && tag.space.id != this.space.id)
       throw Error("Cannot add a private tag from another space");
-    let nt = this._tags.find((x) => x.tagId == tag.id);
-    return nt ? (nt.isDeleted && nt.dirty(), nt) : (nt = new NoteTag(), nt.note = this, nt.tag = tag, this._tags.push(nt), nt);
+    let nt = this._tags.find((x) => x.tag.id == tag.id);
+    return nt ? (nt.isDeleted && nt.dirty(), nt) : (nt = new NoteTag(tag), this._tags.push(nt), nt);
   }
   removeTag(tag) {
-    const nt = this._tags.find((x) => x.tagId == tag.id);
-    if (!nt)
-      return this;
-    nt.isNew ? this._tags = this._tags.filter((x) => x !== nt) : nt.delete();
-    for (const na of this._attrs.filter((x) => !x.isDeleted && x.tagId == tag.id))
-      this.removeAttr(na.attr, na.tag);
-    return this;
+    const nt = this._tags.find((x) => x.tag.id == tag.id);
+    return nt ? (nt.isNew ? this._tags = this._tags.filter((x) => x !== nt) : nt.delete(), this) : this;
   }
   getTag(tag, space = null) {
-    return tag instanceof Tag && (tag = tag.name), space && space instanceof Space && (space = space.id), space != null ? this.tags.find((x) => x.tag.name == tag && x.tag.spaceId == space) : this.tags.find((x) => x.tag.name == tag && x.tag.spaceId == this.spaceId);
+    return tag instanceof Tag && (tag = tag.name), space && space instanceof Space && (space = space.id), space != null ? this.tags.find((x) => x.tag.name == tag && x.tag.space.id == space) : this.tags.find((x) => x.tag.name == tag && x.tag.space.id == this.space.id);
   }
-  /** This contains all attrs that have been added either directly to the note, or to a tag on the note and are not due to be deleted. */
-  get allAttrs() {
+  get attrs() {
     return this._attrs.filter((x) => !x.isDeleted);
   }
-  /** This contains all attrs that have been added directly to the note and are not due to be deleted. */
-  get noteAttrs() {
-    return this._attrs.filter((x) => !x.isDeleted && !x.tag);
-  }
-  /** This contains all attrs that have been added either directly to the note, or to a tag on the note and are due to be deleted. */
-  get allAttrsPendingDeletion() {
+  get attrsPendingDeletion() {
     return this._attrs.filter((x) => x.isDeleted);
   }
-  addAttr(attr) {
+  addAttr(attr, value) {
     if (attr.isDeleted)
       throw Error("Cannot add an attribute marked as deleted to a note");
     if (attr.isNew)
       throw Error("Cannot add an attribute that hasn't yet been saved to a note");
-    const na = new NoteAttr(this, attr);
-    return this._attrs.push(na), na;
+    const na = new NoteAttr(attr, null, value);
+    return this._attrs.push(na), this;
   }
-  removeAttr(attr, tag = null) {
-    const na = this._attrs.find((x) => x.attrId == attr.id && x.tagId == (tag == null ? void 0 : tag.id));
+  removeAttr(attr) {
+    const na = this._attrs.find((x) => x.attr.id == attr.id);
     return na ? (na.isNew ? this._attrs = this._attrs.filter((x) => x !== na) : na.delete(), this) : this;
   }
+  getAttr(attr) {
+    return attr instanceof Attr && (attr = attr.name), this.attrs.find((x) => x.attr.name == attr);
+  }
   getValue(attr) {
     var _a;
-    return attr instanceof Attr && (attr = attr.name), (_a = this.noteAttrs.find((x) => x.attr.name == attr)) == null ? void 0 : _a.value;
-  }
-  getAttr(attr) {
-    return attr instanceof Attr && (attr = attr.name), this.noteAttrs.find((x) => x.attr.name == attr);
+    return (_a = this.getAttr(attr)) == null ? void 0 : _a.value;
   }
   duplicate() {
-    const output = new Note();
-    return output.id = this.id, output.date = this.date, output.text = this.text, this.space ? output.space = this.space : output.spaceId = this.spaceId, output._tags = this.tags.map((x) => {
-      const ntCopy = x.duplicate();
-      return ntCopy.note = output, ntCopy;
-    }), output._attrs = this.allAttrs.map((x) => {
-      const naCopy = x.duplicate();
-      return naCopy.note = output, naCopy;
-    }), this.ownTag && !this.ownTag.isDeleted && output.setOwnTag(this.ownTag.duplicate()), output.state = this.state, output;
+    var _a;
+    const output = new Note(this.text, (_a = this.ownTag) == null ? void 0 : _a.duplicate()).at(this.date).in(this.space);
+    return output._attrs = this.attrs.map((x) => x.duplicate()), output._tags = this.tags.map((x) => x.duplicate()), output;
   }
   toJSON() {
     return {
@@ -830,39 +677,34 @@ class Note extends ModelWithState {
       id: this.id,
       date: this.date,
       text: this.text,
-      spaceId: this.spaceId,
+      spaceId: this.space.id,
       ownTag: this.ownTag,
-      tags: this.tags,
+      tags: this._tags,
       attrs: this._attrs
     };
   }
-  static fromJSON(json) {
-    const output = new Note(json.text);
-    if (output.id = json.id, output.date = new Date(json.date), output.spaceId = json.spaceId, json.ownTag && output.setOwnTag(Tag.fromJSON(json.ownTag)), json.tags) {
-      output._tags = json.tags.map((x) => NoteTag.fromJSON(x));
-      for (const nt of output._tags)
-        nt.note = output;
-    }
-    if (json.attrs) {
-      output._attrs = json.attrs.map((x) => NoteAttr.fromJSON(x));
-      for (const na of output._attrs)
-        na.note = output;
-    }
-    return output.state = json.state, output;
-  }
   validate(throwError = !1) {
-    let output = null;
-    this.spaceId <= 0 ? output = "Note spaceId must be greater than zero." : !this.isNew && this.id <= 0 ? output = "Note id must be greater than zero if in non-new state." : this.ownTag && this.ownTag.spaceId != this.spaceId && (output = "Note cannot belong to a different space than its own tag");
-    const survivingAttrs = this._attrs.filter((x) => !x.isDeleted);
+    function exit(message) {
+      if (throwError && message != null)
+        throw Error(message);
+      return message == null;
+    }
+    if (this.space) {
+      if (!this.isNew && this.id <= 0)
+        return exit("Note id must be greater than zero if in non-new state.");
+      if (this.ownTag && this.ownTag.space.id != this.space.id)
+        return exit("Note cannot belong to a different space than its own tag");
+    } else
+      return exit("Note must belong to a space.");
+    const survivingAttrs = this.attrs;
     for (let i = 0; i < survivingAttrs.length; i++) {
       const na = survivingAttrs[i];
       for (let j = i + 1; j < survivingAttrs.length; j++) {
         const na2 = survivingAttrs[j];
-        na.attrId == na2.attrId && na.tagId == na2.tagId && (output = `Attr '${na.attr.name}' is duplicated.`);
+        if (na.attr.id == na2.attr.id)
+          return exit(`Attr '${na.attr.name}' is duplicated.`);
       }
     }
-    if (throwError && output != null)
-      throw Error(output);
     if (this.ownTag && !this.ownTag.validate(throwError))
       return !1;
     for (const nt of this._tags)
@@ -871,7 +713,160 @@ class Note extends ModelWithState {
     for (const na of this._attrs)
       if (!na.validate(throwError))
         return !1;
-    return output == null;
+    return !0;
+  }
+}
+class NotuCache {
+  constructor(fetcher) {
+    __publicField(this, "_fetcher");
+    __publicField(this, "_spaces", null);
+    __publicField(this, "_tags", null);
+    __publicField(this, "_attrs", null);
+    if (!fetcher)
+      throw Error("NotuCache constructor must have a fetcher argument supplied.");
+    this._fetcher = fetcher;
+  }
+  async populate() {
+    await this._populateSpaces();
+    const tagsPromise = this._populateTags(), attrsPromise = this._populateAttrs();
+    await Promise.all([tagsPromise, attrsPromise]);
+  }
+  async _populateSpaces() {
+    const spacesData = await this._fetcher.getSpacesData();
+    this._spaces = /* @__PURE__ */ new Map();
+    for (const spaceData of spacesData) {
+      const space = this._spaceFromJSON(spaceData);
+      this._spaces.set(space.id, space);
+    }
+  }
+  _spaceFromJSON(spaceData) {
+    const space = new Space(spaceData.name);
+    return space.id = spaceData.id, space.version = spaceData.version, space.state = spaceData.state, space;
+  }
+  async _populateTags() {
+    const tagsData = await this._fetcher.getTagsData();
+    this._tags = /* @__PURE__ */ new Map();
+    for (const tagData of tagsData) {
+      const tag = this._tagFromJSON(tagData);
+      this._tags.set(tag.id, tag);
+    }
+  }
+  _tagFromJSON(tagData) {
+    const tag = new Tag(tagData.name);
+    return tag.id = tagData.id, tag.space = this._spaces.get(tagData.spaceId), tag.color = tagData.color, tag.isPublic = tagData.isPublic, tag.state = tagData.state, tag;
+  }
+  async _populateAttrs() {
+    const attrsData = await this._fetcher.getAttrsData();
+    this._attrs = /* @__PURE__ */ new Map();
+    for (const attrData of attrsData) {
+      const attr = this._attrFromJSON(attrData);
+      this._attrs.set(attr.id, attr);
+    }
+  }
+  _attrFromJSON(attrData) {
+    const attr = new Attr(attrData.name, attrData.description);
+    return attr.id = attrData.id, attr.type = attrData.type, attr.space = this._spaces.get(attrData.spaceId), attr.state = attrData.state, attr;
+  }
+  noteFromJSON(noteData) {
+    const note = new Note(noteData.text, this.getTag(noteData.id)).at(new Date(noteData.date)).in(this.getSpace(noteData.spaceId));
+    note.id = noteData.id, note.state = noteData.state;
+    for (const naData of noteData.attrs) {
+      const attr = this.getAttr(naData.attrId);
+      note.addAttr(attr, naData.value), note.getAttr(attr).state = naData.state;
+    }
+    for (const ntData of noteData.tags) {
+      const nt = note.addTag(this.getTag(ntData.tagId));
+      nt.state = ntData.state;
+      for (const ntaData of ntData.attrs) {
+        const attr = this.getAttr(ntaData.attrId);
+        nt.addAttr(attr, ntaData.value), nt.getAttr(attr).state = ntaData.state;
+      }
+    }
+    return note;
+  }
+  getSpaces() {
+    return Array.from(this._spaces.values());
+  }
+  getSpace(id) {
+    return this._spaces.get(id);
+  }
+  getSpaceByName(name) {
+    for (const space of this._spaces.values())
+      if (space.name == name)
+        return space;
+  }
+  spaceSaved(spaceData) {
+    const space = this._spaceFromJSON(spaceData);
+    return space.state == "DELETED" ? this._spaces.delete(space.id) : this._spaces.set(space.id, space), space;
+  }
+  getTags(space = null, includeOtherSpacePublics = !1) {
+    return space == null ? Array.from(this._tags.values()) : (space instanceof Space && (space = space.id), Array.from(this._tags.values()).filter((x) => x.isPublic && includeOtherSpacePublics || x.space.id == space));
+  }
+  getTag(id) {
+    return this._tags.get(id);
+  }
+  getTagByName(name, space) {
+    space instanceof Space && (space = space.id);
+    for (const tag of this._tags.values())
+      if (tag.name == name && tag.space.id == space)
+        return tag;
+  }
+  tagSaved(tagData) {
+    const tag = this._tagFromJSON(tagData);
+    return tag.state == "DELETED" ? this._tags.delete(tag.id) : this._tags.set(tag.id, tag), tag;
+  }
+  getAttrs(space) {
+    return space instanceof Space && (space = space.id), Array.from(this._attrs.values()).filter((x) => x.space.id == space);
+  }
+  getAttr(id) {
+    return this._attrs.get(id);
+  }
+  getAttrByName(name, space) {
+    space instanceof Space && (space = space.id);
+    for (const attr of this._attrs.values())
+      if (attr.name == name && attr.space.id == space)
+        return attr;
+  }
+  attrSaved(attrData) {
+    const attr = this._attrFromJSON(attrData);
+    return attr.state == "DELETED" ? this._attrs.delete(attr.id) : this._attrs.set(attr.id, attr), attr;
+  }
+}
+class NotuHttpCacheFetcher {
+  constructor(url, token, fetchMethod = null) {
+    __publicField(this, "_url", null);
+    __publicField(this, "_token", null);
+    //Added for testing support
+    __publicField(this, "_fetch");
+    if (!url)
+      throw Error("Endpoint URL must be passed into NotuHttpCacheFetcher constructor");
+    if (!token)
+      throw Error("Security token must be passed into NotuHttpCacheFetcher constructor");
+    url.endsWith("/") && (url = url.substring(0, url.length - 1)), this._url = url, this._token = token, this._fetch = fetchMethod ?? window.fetch.bind(window);
+  }
+  get url() {
+    return this._url;
+  }
+  get token() {
+    return this._token;
+  }
+  async getSpacesData() {
+    return await this._getX("/spaces");
+  }
+  async getTagsData() {
+    return await this._getX("/tags");
+  }
+  async getAttrsData() {
+    return await this._getX("/attrs");
+  }
+  async _getX(endpoint) {
+    return await (await this._fetch(
+      this.url + endpoint,
+      {
+        method: "GET",
+        headers: { Authorization: "Bearer " + this.token }
+      }
+    )).json();
   }
 }
 class ParsedQuery {
@@ -956,11 +951,13 @@ function identifyAttrs(query, parsedQuery) {
 }
 export {
   Attr,
-  CachedClient,
-  HttpClient,
   Note,
   NoteAttr,
   NoteTag,
+  Notu,
+  NotuCache,
+  NotuHttpCacheFetcher,
+  NotuHttpClient,
   ParsedAttr,
   ParsedQuery,
   ParsedTag,