notu 0.12.2 → 0.14.0

package/dist/notu.mjs

@@ -1,151 +1,6 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => (__defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value), value);
-class ModelWithState {
-  constructor() {
-    __publicField(this, "state", "NEW");
-  }
-  new() {
-    return this.state = "NEW", this;
-  }
-  clean() {
-    return this.state = "CLEAN", this;
-  }
-  dirty() {
-    return this.state = "DIRTY", this;
-  }
-  delete() {
-    return this.state = "DELETED", this;
-  }
-  get isNew() {
-    return this.state == "NEW";
-  }
-  get isClean() {
-    return this.state == "CLEAN";
-  }
-  get isDirty() {
-    return this.state == "DIRTY";
-  }
-  get isDeleted() {
-    return this.state == "DELETED";
-  }
-  validate(throwError = !1) {
-    return !0;
-  }
-}
-class Attr extends ModelWithState {
-  constructor(name, description) {
-    super();
-    __publicField(this, "id", 0);
-    __publicField(this, "_name", "");
-    __publicField(this, "_description", "");
-    __publicField(this, "_type", "TEXT");
-    __publicField(this, "_space", null);
-    __publicField(this, "_color", null);
-    name && (this.name = name), description && (this.description = description);
-  }
-  get name() {
-    return this._name;
-  }
-  set name(value) {
-    value !== this._name && (this._name = value, this.isClean && this.dirty());
-  }
-  get description() {
-    return this._description;
-  }
-  set description(value) {
-    value !== this._description && (this._description = value, this.isClean && this.dirty());
-  }
-  get type() {
-    return this._type;
-  }
-  set type(value) {
-    if (!this.isNew)
-      throw Error("Cannot change an attribute's type once it has been created.");
-    this._type = value;
-  }
-  get isText() {
-    return this.type == "TEXT";
-  }
-  get isNumber() {
-    return this.type == "NUMBER";
-  }
-  get isBoolean() {
-    return this.type == "BOOLEAN";
-  }
-  get isDate() {
-    return this.type == "DATE";
-  }
-  asText() {
-    return this.type = "TEXT", this;
-  }
-  asNumber() {
-    return this.type = "NUMBER", this;
-  }
-  asBoolean() {
-    return this.type = "BOOLEAN", this;
-  }
-  asDate() {
-    return this.type = "DATE", this;
-  }
-  get space() {
-    return this._space;
-  }
-  set space(value) {
-    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 this.space = space, this;
-  }
-  get color() {
-    return this._color;
-  }
-  set color(value) {
-    value !== this._color && (this._color = value, this.isClean && this.dirty());
-  }
-  duplicate() {
-    const output = this.duplicateAsNew();
-    return output.id = this.id, output.state = this.state, output;
-  }
-  duplicateAsNew() {
-    const output = new Attr();
-    return output.name = this.name, output.description = this.description, output.type = this.type, output.space = this.space, output.color = this.color, output;
-  }
-  validate(throwError = !1) {
-    let output = null;
-    if (this.space ? !this.isNew && this.id <= 0 ? output = "Attr id must be greater than zero if in non-new state." : this.color && !/^#?[A-z0-9]{6}$/.test(this.color) && (output = "Tag color is invalid, must be a 6 character hexadecimal.") : output = "Attr must belong to a space.", throwError && output != null)
-      throw Error(output);
-    return output == null;
-  }
-  get defaultValue() {
-    switch (this.type) {
-      case "TEXT":
-        return "";
-      case "NUMBER":
-        return 0;
-      case "BOOLEAN":
-        return !1;
-      case "DATE":
-        return /* @__PURE__ */ new Date();
-    }
-  }
-  toJSON() {
-    var _a;
-    return {
-      state: this.state,
-      id: this.id,
-      name: this.name,
-      description: this.description,
-      type: this.type,
-      spaceId: (_a = this.space) == null ? void 0 : _a.id,
-      color: this.color
-    };
-  }
-}
 class Notu {
   constructor(client, cache) {
     __publicField(this, "_client");
@@ -177,19 +32,6 @@ class Notu {
     const spaceData = await this.client.saveSpace(space);
     return this.cache.spaceSaved(spaceData);
   }
-  getAttrs(space = null) {
-    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 attrData = await this.client.saveAttr(attr);
-    return this.cache.attrSaved(attrData);
-  }
   getTags(space = null, includeOtherSpacePublics = !1) {
     return this.cache.getTags(space, includeOtherSpacePublics);
   }
@@ -205,9 +47,6 @@ class Notu {
   async getNoteCount(query, spaceId) {
     return await this.client.getNoteCount(query, spaceId);
   }
-  async getRelatedNotes(tag) {
-    return (await this.client.getRelatedNotes(tag)).map((n) => this.cache.noteFromJSON(n));
-  }
   async saveNotes(notes) {
     const tagsBeingDeletedData = notes.filter((x) => !!x.ownTag).filter((x) => x.isDeleted || x.ownTag.isDeleted).map((x) => x.ownTag.toJSON()), notesData = await this.client.saveNotes(notes);
     for (const noteData of notesData.filter((x) => !!x.ownTag && !x.ownTag.isDeleted))
@@ -220,71 +59,214 @@ class Notu {
     return await this.client.customJob(name, data);
   }
 }
-class NoteAttr extends ModelWithState {
-  constructor(attr, tag, value) {
+class ModelWithState {
+  constructor() {
+    __publicField(this, "state", "NEW");
+  }
+  new() {
+    return this.state = "NEW", this;
+  }
+  clean() {
+    return this.state = "CLEAN", this;
+  }
+  dirty() {
+    return this.state = "DIRTY", this;
+  }
+  delete() {
+    return this.state = "DELETED", this;
+  }
+  get isNew() {
+    return this.state == "NEW";
+  }
+  get isClean() {
+    return this.state == "CLEAN";
+  }
+  get isDirty() {
+    return this.state == "DIRTY";
+  }
+  get isDeleted() {
+    return this.state == "DELETED";
+  }
+  validate(throwError = !1) {
+    return !0;
+  }
+}
+class Space extends ModelWithState {
+  constructor(name = "") {
     super();
-    __publicField(this, "_tag", null);
-    __publicField(this, "_attr", null);
-    __publicField(this, "_value", null);
-    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;
+    __publicField(this, "_id", 0);
+    __publicField(this, "_name", "");
+    __publicField(this, "_version", "0.0.1");
+    __publicField(this, "_useCommonSpace", !1);
+    this._name = name;
   }
-  get tag() {
-    return this._tag;
+  get id() {
+    return this._id;
   }
-  get attr() {
-    return this._attr;
+  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 value() {
-    return this._value;
+  get name() {
+    return this._name;
   }
-  set value(newVal) {
-    this.attr.isText && typeof newVal != "string" ? newVal = String(newVal) : this.attr.isDate && !(newVal instanceof Date) ? newVal = new Date(newVal) : this.attr.isNumber && typeof newVal != "number" ? newVal = Number(newVal) : this.attr.isBoolean && typeof newVal != "boolean" && (newVal = !!newVal), newVal != this._value && (this._value = newVal, this.isClean && this.dirty());
+  set name(value) {
+    value !== this._name && (this._name = value, this.isClean && this.dirty());
   }
-  withValue(value) {
-    return this.value = value, this;
+  get version() {
+    return this._version;
+  }
+  set version(value) {
+    value !== this._version && (this._version = value, this.isClean && this.dirty());
+  }
+  v(version) {
+    return this.version = version, this;
+  }
+  get useCommonSpace() {
+    return this._useCommonSpace;
+  }
+  set useCommonSpace(value) {
+    value !== this._useCommonSpace && (this._useCommonSpace = value, this.isClean && this.dirty());
   }
   duplicate() {
     const output = this.duplicateAsNew();
-    return output.state = this.state, output;
+    return output.id = this.id, output.state = this.state, output;
   }
   duplicateAsNew() {
-    return new NoteAttr(this.attr, this.tag, this.value);
+    const output = new Space();
+    return output.name = this.name, output.version = this.version, output;
   }
   validate(throwError = !1) {
     let output = null;
-    if (throwError && output != null)
+    if (!this.isNew && this.id <= 0 && (output = "Space id must be greater than zero if in non-new state."), throwError && output != null)
       throw Error(output);
     return output == null;
   }
   toJSON() {
-    var _a;
     return {
       state: this.state,
-      attrId: this.attr.id,
-      tagId: (_a = this.tag) == null ? void 0 : _a.id,
-      value: this.value
+      id: this.id,
+      name: this.name,
+      version: this.version,
+      useCommonSpace: this.useCommonSpace
     };
   }
 }
+class NotuHttpClient {
+  constructor(url, fetchMethod = null) {
+    __publicField(this, "_url", null);
+    __publicField(this, "_token", null);
+    //Added for testing support
+    __publicField(this, "_fetch");
+    //Used to handle error responses that come in and take some custom action on them
+    //Returns true if the response was handled, otherwise returns in which case an error will be thrown
+    __publicField(this, "errorHandler", null);
+    if (!url)
+      throw Error("Endpoint URL must be passed in to NotuClient constructor");
+    url.endsWith("/") && (url = url.substring(0, url.length - 1)), this._url = url, this._fetch = fetchMethod ?? window.fetch.bind(window);
+  }
+  get url() {
+    return this._url;
+  }
+  get token() {
+    return this._token;
+  }
+  set token(value) {
+    this._token = value;
+  }
+  _validateResponseStatus(response) {
+    if (response.status >= 400 && response.status < 600) {
+      if (this.errorHandler && this.errorHandler(response))
+        return;
+      throw Error(response.statusText);
+    }
+  }
+  async login(username, password) {
+    const response = await this._fetch(
+      this.url + "/login",
+      {
+        method: "POST",
+        body: JSON.stringify({ username, password })
+      }
+    );
+    if (this._validateResponseStatus(response), response.body != null) {
+      const result = await response.json();
+      return result && (this._token = result), result;
+    }
+    throw Error("Unknown error occurred on the server");
+  }
+  async setup() {
+    const response = await this._fetch(
+      this.url + "/setup",
+      {
+        method: "POST",
+        headers: { Authorization: "Bearer " + this.token }
+      }
+    );
+    this._validateResponseStatus(response), await response.json();
+  }
+  async saveSpace(space) {
+    const response = await this._fetch(
+      this.url + "/spaces",
+      {
+        method: "POST",
+        body: JSON.stringify(space),
+        headers: { Authorization: "Bearer " + this.token }
+      }
+    );
+    return this._validateResponseStatus(response), await response.json();
+  }
+  async getNotes(query, space) {
+    space && space instanceof Space && (space = space.id);
+    const response = await this._fetch(
+      this.url + `/notes?${space ? `space=${space}&` : ""}query=${encodeURIComponent(query)}`,
+      {
+        method: "GET",
+        headers: { Authorization: "Bearer " + this.token }
+      }
+    );
+    return this._validateResponseStatus(response), await response.json();
+  }
+  async getNoteCount(query, space) {
+    space instanceof Space && (space = space.id);
+    const response = await this._fetch(
+      this.url + `/notes?count=true&space=${space}&query=${encodeURIComponent(query)}`,
+      {
+        method: "GET",
+        headers: { Authorization: "Bearer " + this.token }
+      }
+    );
+    return this._validateResponseStatus(response), (await response.json()).count;
+  }
+  async saveNotes(notes) {
+    const response = await this._fetch(
+      this.url + "/notes",
+      {
+        method: "POST",
+        body: JSON.stringify(notes),
+        headers: { Authorization: "Bearer " + this.token }
+      }
+    );
+    return this._validateResponseStatus(response), await response.json();
+  }
+  async customJob(name, data) {
+    const response = await this._fetch(
+      this.url + "/customJob",
+      {
+        method: "POST",
+        body: JSON.stringify({ name, data, clientTimezone: Intl.DateTimeFormat().resolvedOptions().timeZone }),
+        headers: { Authorization: "Bearer " + this.token }
+      }
+    );
+    return this._validateResponseStatus(response), await response.json();
+  }
+}
 class NoteTag extends ModelWithState {
   constructor(tag) {
     super();
     __publicField(this, "_tag");
     __publicField(this, "_data");
-    __publicField(this, "_attrs", []);
     if (!tag)
       throw Error("Cannot instanciate new NoteTag without a passed in tag.");
     if (tag.isNew)
@@ -305,38 +287,13 @@ class NoteTag extends ModelWithState {
   withData(data) {
     return this.data = data, this;
   }
-  get attrs() {
-    return this._attrs.filter((x) => !x.isDeleted);
-  }
-  get attrsPendingDeletion() {
-    return this._attrs.filter((x) => x.isDeleted);
-  }
-  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.");
-    let na = this.attrs.find((x) => x.attr.id == attr.id);
-    return na ? (na.isDeleted && na.dirty(), value != null && (na.value = value), this) : (na = new NoteAttr(attr, this.tag, value), this._attrs.push(na), this);
-  }
-  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 (_a = this.getAttr(attr)) == null ? void 0 : _a.value;
-  }
   duplicate() {
     const output = this.duplicateAsNew();
     return output.state = this.state, output;
   }
   duplicateAsNew() {
     const output = new NoteTag(this.tag);
-    return this.data && (output._data = JSON.parse(JSON.stringify(this.data))), output._attrs = this.attrs.map((x) => x.duplicateAsNew()), output;
+    return this.data && (output._data = JSON.parse(JSON.stringify(this.data))), output;
   }
   validate(throwError = !1) {
     function exit(message) {
@@ -344,81 +301,13 @@ class NoteTag extends ModelWithState {
         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;
+    return this.tag ? !0 : exit("NoteTag must have a tag set.");
   }
   toJSON() {
     return {
       state: this.state,
       tagId: this.tag.id,
-      data: this.data,
-      attrs: this._attrs.map((x) => x.toJSON())
-    };
-  }
-}
-class Space extends ModelWithState {
-  constructor(name = "") {
-    super();
-    __publicField(this, "_id", 0);
-    __publicField(this, "_name", "");
-    __publicField(this, "_version", "0.0.1");
-    __publicField(this, "_useCommonSpace", !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;
-  }
-  set name(value) {
-    value !== this._name && (this._name = value, this.isClean && this.dirty());
-  }
-  get version() {
-    return this._version;
-  }
-  set version(value) {
-    value !== this._version && (this._version = value, this.isClean && this.dirty());
-  }
-  v(version) {
-    return this.version = version, this;
-  }
-  get useCommonSpace() {
-    return this._useCommonSpace;
-  }
-  set useCommonSpace(value) {
-    value !== this._useCommonSpace && (this._useCommonSpace = value, this.isClean && this.dirty());
-  }
-  duplicate() {
-    const output = this.duplicateAsNew();
-    return output.id = this.id, output.state = this.state, output;
-  }
-  duplicateAsNew() {
-    const output = new Space();
-    return output.name = this.name, output.version = this.version, output;
-  }
-  validate(throwError = !1) {
-    let output = null;
-    if (!this.isNew && this.id <= 0 && (output = "Space id must be greater than zero if in non-new state."), throwError && output != null)
-      throw Error(output);
-    return output == null;
-  }
-  toJSON() {
-    return {
-      state: this.state,
-      id: this.id,
-      name: this.name,
-      version: this.version,
-      useCommonSpace: this.useCommonSpace
+      data: this.data
     };
   }
 }
@@ -532,7 +421,6 @@ class Note extends ModelWithState {
     __publicField(this, "_space", null);
     __publicField(this, "_ownTag", null);
     __publicField(this, "_tags", []);
-    __publicField(this, "_attrs", []);
     text && (this.text = text), this._ownTag = ownTag;
   }
   get id() {
@@ -603,46 +491,11 @@ class Note extends ModelWithState {
   }
   removeTag(tag) {
     const nt = this._tags.find((x) => x.tag.id == tag.id);
-    if (!nt)
-      return this;
-    if (nt.isNew)
-      this._tags = this._tags.filter((x) => x !== nt);
-    else {
-      nt.delete();
-      const attrs = nt.attrs.map((x) => x.attr);
-      for (const attr of attrs)
-        nt.removeAttr(attr);
-    }
-    return this;
+    return nt ? (nt.isNew ? this._tags = this._tags.filter((x) => x !== nt) : nt.delete(), this) : this;
   }
   getTag(tag, space = null) {
     return tag instanceof Tag ? this.tags.find((x) => x.tag === tag) : (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));
   }
-  get attrs() {
-    return this._attrs.filter((x) => !x.isDeleted);
-  }
-  get attrsPendingDeletion() {
-    return this._attrs.filter((x) => x.isDeleted);
-  }
-  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");
-    let na = this.attrs.find((x) => x.attr.id == attr.id);
-    return na ? (na.isDeleted && na.dirty(), value != null && (na.value = value), this) : (na = new NoteAttr(attr, null, value), this._attrs.push(na), this);
-  }
-  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 (_a = this.getAttr(attr)) == null ? void 0 : _a.value;
-  }
   getTagData(tag, type) {
     const nt = this.getTag(tag);
     return nt ? new type(nt) : null;
@@ -650,11 +503,11 @@ class Note extends ModelWithState {
   duplicate() {
     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.id = this.id, output.state = this.state, output;
+    return output._tags = this.tags.map((x) => x.duplicate()), output.id = this.id, output.state = this.state, output;
   }
   duplicateAsNew() {
     const output = new Note(this.text).at(this.date).in(this.space);
-    return output._attrs = this.attrs.map((x) => x.duplicateAsNew()), output._tags = this.tags.map((x) => x.duplicateAsNew()), output;
+    return output._tags = this.tags.map((x) => x.duplicateAsNew()), output;
   }
   toJSON() {
     var _a;
@@ -665,8 +518,7 @@ class Note extends ModelWithState {
       text: this.text,
       spaceId: this.space.id,
       ownTag: (_a = this.ownTag) == null ? void 0 : _a.toJSON(),
-      tags: this._tags.map((x) => x.toJSON()),
-      attrs: this._attrs.map((x) => x.toJSON())
+      tags: this._tags.map((x) => x.toJSON())
     };
   }
   validate(throwError = !1) {
@@ -682,172 +534,26 @@ class Note extends ModelWithState {
         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];
-        if (na.attr.id == na2.attr.id)
-          return exit(`Attr '${na.attr.name}' is duplicated.`);
-      }
-    }
     if (this.ownTag && !this.ownTag.validate(throwError))
       return !1;
     for (const nt of this._tags)
       if (!nt.validate(throwError))
         return !1;
-    for (const na of this._attrs)
-      if (!na.validate(throwError))
-        return !1;
     return !0;
   }
 }
-class NotuHttpClient {
-  constructor(url, fetchMethod = null) {
-    __publicField(this, "_url", null);
-    __publicField(this, "_token", null);
-    //Added for testing support
-    __publicField(this, "_fetch");
-    //Used to handle error responses that come in and take some custom action on them
-    //Returns true if the response was handled, otherwise returns in which case an error will be thrown
-    __publicField(this, "errorHandler", null);
-    if (!url)
-      throw Error("Endpoint URL must be passed in to NotuClient constructor");
-    url.endsWith("/") && (url = url.substring(0, url.length - 1)), this._url = url, this._fetch = fetchMethod ?? window.fetch.bind(window);
-  }
-  get url() {
-    return this._url;
-  }
-  get token() {
-    return this._token;
-  }
-  set token(value) {
-    this._token = value;
-  }
-  _validateResponseStatus(response) {
-    if (response.status >= 400 && response.status < 600) {
-      if (this.errorHandler && this.errorHandler(response))
-        return;
-      throw Error(response.statusText);
-    }
-  }
-  async login(username, password) {
-    const response = await this._fetch(
-      this.url + "/login",
-      {
-        method: "POST",
-        body: JSON.stringify({ username, password })
-      }
-    );
-    if (this._validateResponseStatus(response), response.body != null) {
-      const result = await response.json();
-      return result && (this._token = result), result;
-    }
-    throw Error("Unknown error occurred on the server");
-  }
-  async setup() {
-    const response = await this._fetch(
-      this.url + "/setup",
-      {
-        method: "POST",
-        headers: { Authorization: "Bearer " + this.token }
-      }
-    );
-    this._validateResponseStatus(response), await response.json();
-  }
-  async saveSpace(space) {
-    const response = await this._fetch(
-      this.url + "/spaces",
-      {
-        method: "POST",
-        body: JSON.stringify(space),
-        headers: { Authorization: "Bearer " + this.token }
-      }
-    );
-    return this._validateResponseStatus(response), await response.json();
-  }
-  async saveAttr(attr) {
-    const response = await this._fetch(
-      this.url + "/attrs",
-      {
-        method: "POST",
-        body: JSON.stringify(attr),
-        headers: { Authorization: "Bearer " + this.token }
-      }
-    );
-    return this._validateResponseStatus(response), await response.json();
-  }
-  async getNotes(query, space) {
-    space instanceof Space && (space = space.id);
-    const response = await this._fetch(
-      this.url + `/notes?space=${space}&query=${encodeURIComponent(query)}`,
-      {
-        method: "GET",
-        headers: { Authorization: "Bearer " + this.token }
-      }
-    );
-    return this._validateResponseStatus(response), await response.json();
-  }
-  async getNoteCount(query, space) {
-    space instanceof Space && (space = space.id);
-    const response = await this._fetch(
-      this.url + `/notes?count=true&space=${space}&query=${encodeURIComponent(query)}`,
-      {
-        method: "GET",
-        headers: { Authorization: "Bearer " + this.token }
-      }
-    );
-    return this._validateResponseStatus(response), (await response.json()).count;
-  }
-  async getRelatedNotes(tag) {
-    tag instanceof Tag && (tag = tag.id), tag instanceof Note && (tag = tag.id);
-    const response = await this._fetch(
-      this.url + `/notes?tag=${tag}`,
-      {
-        method: "GET",
-        headers: { Authorization: "Bearer " + this.token }
-      }
-    );
-    return this._validateResponseStatus(response), await response.json();
-  }
-  async saveNotes(notes) {
-    const response = await this._fetch(
-      this.url + "/notes",
-      {
-        method: "POST",
-        body: JSON.stringify(notes),
-        headers: { Authorization: "Bearer " + this.token }
-      }
-    );
-    return this._validateResponseStatus(response), await response.json();
-  }
-  async customJob(name, data) {
-    const response = await this._fetch(
-      this.url + "/customJob",
-      {
-        method: "POST",
-        body: JSON.stringify({ name, data, clientTimezone: Intl.DateTimeFormat().resolvedOptions().timeZone }),
-        headers: { Authorization: "Bearer " + this.token }
-      }
-    );
-    return this._validateResponseStatus(response), await response.json();
-  }
-}
 class NotuCache {
   constructor(fetcher) {
     __publicField(this, "_fetcher");
     __publicField(this, "_spaces", null);
     __publicField(this, "_tags", null);
     __publicField(this, "_tagNames", 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]), this._populateTagNames();
+    await this._populateSpaces(), await this._populateTags(), this._populateTagNames();
   }
   async _populateSpaces() {
     const spacesData = await this._fetcher.getSpacesData();
@@ -884,32 +590,12 @@ class NotuCache {
   _populateTagLinks(tag, tagData) {
     tag.links = tagData.links.map((x) => this._tags.get(x));
   }
-  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 ownTag = !noteData.ownTag || noteData.ownTag.state == "CLEAN" ? this.getTag(noteData.id) : this.tagFromJSON(noteData.ownTag), note = new Note(noteData.text, ownTag).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.data = ntData.data, 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;
   }
@@ -947,22 +633,6 @@ class NotuCache {
     const tag = this.tagFromJSON(tagData);
     return tag.state == "DELETED" ? this._tags.delete(tag.id) : this._tags.set(tag.id, tag), this._populateTagNames(), tag;
   }
-  getAttrs(space = null) {
-    return space == null ? Array.from(this._attrs.values()) : (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) {
@@ -988,9 +658,6 @@ class NotuHttpCacheFetcher {
   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,
@@ -1049,89 +716,9 @@ class ParsedQuery {
     __publicField(this, "where", null);
     __publicField(this, "order", null);
     __publicField(this, "tags", []);
-    __publicField(this, "attrs", []);
   }
 }
 class ParsedTag {
-  constructor() {
-    __publicField(this, "space", null);
-    __publicField(this, "name", null);
-    __publicField(this, "searchDepth", 0);
-    __publicField(this, "strictSearchDepth", !0);
-    __publicField(this, "includeOwner", !1);
-  }
-}
-class ParsedAttr {
-  constructor() {
-    __publicField(this, "name", null);
-    __publicField(this, "exists", !1);
-    __publicField(this, "tagNameFilters", null);
-  }
-}
-function parseQuery(query) {
-  const output = splitQuery$1(query);
-  return output.where = identifyTags$1(output.where, output), output.order = identifyTags$1(output.order, output), output.where = identifyAttrs(output.where, output), output.order = identifyAttrs(output.order, output), output;
-}
-function splitQuery$1(query) {
-  query = " " + query + " ";
-  const output = new ParsedQuery(), orderByIndex = query.toUpperCase().indexOf(" ORDER BY ");
-  return orderByIndex < 0 ? output.where = query.trim() : (output.where = query.substring(0, orderByIndex).trim(), output.order = query.substring(orderByIndex + 10).trim()), output.where == "" && (output.where = null), output;
-}
-function identifyTags$1(query, parsedQuery) {
-  const regexes = [
-    /(#+\??~?|~)([\w\d]+\.)?([\w\d]+)/,
-    //Single word tags and space names
-    /(#+\??~?|~)\[([\w\d\s]+\.)?([\w\d\s]+)\]/
-    //Multi-word tags and space names wrapped in []
-  ];
-  for (const regex of regexes)
-    for (; ; ) {
-      const match = regex.exec(query);
-      if (!match)
-        break;
-      const hashPrefix = match[1], parsedTag = new ParsedTag();
-      parsedTag.space = match[2] ? match[2].substring(0, match[2].length - 1) : null, parsedTag.name = match[3], parsedTag.includeOwner = hashPrefix.includes("~"), parsedTag.searchDepth = (hashPrefix.match(/#/g) || []).length, parsedTag.strictSearchDepth = !hashPrefix.includes("?");
-      const fullMatch = match[0], matchStart = query.indexOf(fullMatch), matchEnd = matchStart + fullMatch.length;
-      query = query.substring(0, matchStart) + `{tag${parsedQuery.tags.length}}` + query.substring(matchEnd), parsedQuery.tags.push(parsedTag);
-    }
-  return query;
-}
-function identifyAttrs(query, parsedQuery) {
-  const regexes = [
-    /@([\w\d]+)/,
-    /@\[([\w\d\s]+)\]/
-  ];
-  for (const regex of regexes)
-    for (; ; ) {
-      const match = regex.exec(query);
-      if (!match)
-        break;
-      const parsedAttr = new ParsedAttr();
-      parsedAttr.name = match[1];
-      const matchStart = query.indexOf(match[0]);
-      let matchEnd = matchStart + match[0].length;
-      if (query.substring(matchEnd, matchEnd + 9) == ".Exists()" && (parsedAttr.exists = !0, matchEnd += 9), query.substring(matchEnd, matchEnd + 4) == ".On(") {
-        let tagFilterStart = matchEnd + 4;
-        if (matchEnd = query.indexOf(")", tagFilterStart), matchEnd < 0)
-          throw Error("Unclosed bracket detected");
-        let tagNameFilters = query.substring(tagFilterStart, matchEnd).split("|");
-        const dummyParsedQuery = new ParsedQuery();
-        for (let tagNameFilter of tagNameFilters)
-          tagNameFilter.startsWith("~") || (tagNameFilter = "~" + tagNameFilter), identifyTags$1(tagNameFilter, dummyParsedQuery);
-        parsedAttr.tagNameFilters = dummyParsedQuery.tags, matchEnd++;
-      }
-      query = query.substring(0, matchStart) + `{attr${parsedQuery.attrs.length}}` + query.substring(matchEnd), parsedQuery.attrs.push(parsedAttr);
-    }
-  return query;
-}
-class NewParsedQuery {
-  constructor() {
-    __publicField(this, "where", null);
-    __publicField(this, "order", null);
-    __publicField(this, "tags", []);
-  }
-}
-class NewParsedTag {
   constructor() {
     __publicField(this, "space", null);
     __publicField(this, "name", null);
@@ -1139,19 +726,19 @@ class NewParsedTag {
     __publicField(this, "filter", null);
   }
 }
-class NewParsedTagFilter {
+class ParsedTagFilter {
   constructor() {
     __publicField(this, "pattern", null);
     __publicField(this, "exps", []);
   }
 }
-function newParseQuery(query) {
+function parseQuery(query) {
   const output = splitQuery(query);
   return output.where = identifyTags(output.where, output), output.order = identifyTags(output.order, output), output;
 }
 function splitQuery(query) {
   query = " " + query + " ";
-  const output = new NewParsedQuery(), orderByIndex = query.toUpperCase().indexOf(" ORDER BY ");
+  const output = new ParsedQuery(), orderByIndex = query.toUpperCase().indexOf(" ORDER BY ");
   return orderByIndex < 0 ? output.where = query.trim() : (output.where = query.substring(0, orderByIndex).trim(), output.order = query.substring(orderByIndex + 10).trim()), output.where == "" && (output.where = null), output;
 }
 function identifyTags(query, parsedQuery) {
@@ -1167,7 +754,7 @@ function identifyTags(query, parsedQuery) {
       if (!match)
         break;
       let hashPrefix = match[1];
-      const parsedTag = new NewParsedTag();
+      const parsedTag = new ParsedTag();
       parsedTag.space = match[2] ? match[2].substring(0, match[2].length - 1) : null, parsedTag.name = match[3], hashPrefix.startsWith("@") && (parsedTag.searchDepths.push(0), hashPrefix = hashPrefix.substring(1));
       for (let i = 0; i < hashPrefix.length; i++)
         hashPrefix[i] == "#" && parsedTag.searchDepths.push(i + 1);
@@ -1193,7 +780,7 @@ function getTagDataFilterText(query, tagEndIndex) {
   return query.substring(tagEndIndex + 1, i);
 }
 function processTagDataFilter(parsedTag, filterText) {
-  filterText = ` ${filterText}`, parsedTag.filter = new NewParsedTagFilter(), parsedTag.filter.pattern = filterText;
+  filterText = ` ${filterText}`, parsedTag.filter = new ParsedTagFilter(), parsedTag.filter.pattern = filterText;
   const expressionRegex = /[\s\(]\.([\w\d\[\]\.]+)/;
   for (; ; ) {
     const match = expressionRegex.exec(parsedTag.filter.pattern);
@@ -1205,24 +792,18 @@ function processTagDataFilter(parsedTag, filterText) {
   parsedTag.filter.pattern = parsedTag.filter.pattern.trim();
 }
 export {
-  Attr,
-  NewParsedQuery,
-  NewParsedTag,
-  NewParsedTagFilter,
   Note,
-  NoteAttr,
   NoteComponentInfo,
   NoteTag,
   Notu,
   NotuCache,
   NotuHttpCacheFetcher,
   NotuHttpClient,
-  ParsedAttr,
   ParsedQuery,
   ParsedTag,
+  ParsedTagFilter,
   Space,
   Tag,
-  newParseQuery,
   parseQuery,
   splitNoteTextIntoComponents
 };