notu 0.12.2 → 0.13.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);
   }
@@ -220,63 +62,36 @@ class Notu {
     return await this.client.customJob(name, data);
   }
 }
-class NoteAttr extends ModelWithState {
-  constructor(attr, tag, value) {
-    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;
+class ModelWithState {
+  constructor() {
+    __publicField(this, "state", "NEW");
   }
-  get tag() {
-    return this._tag;
+  new() {
+    return this.state = "NEW", this;
+  }
+  clean() {
+    return this.state = "CLEAN", this;
   }
-  get attr() {
-    return this._attr;
+  dirty() {
+    return this.state = "DIRTY", this;
   }
-  get value() {
-    return this._value;
+  delete() {
+    return this.state = "DELETED", this;
   }
-  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());
+  get isNew() {
+    return this.state == "NEW";
   }
-  withValue(value) {
-    return this.value = value, this;
+  get isClean() {
+    return this.state == "CLEAN";
   }
-  duplicate() {
-    const output = this.duplicateAsNew();
-    return output.state = this.state, output;
+  get isDirty() {
+    return this.state == "DIRTY";
   }
-  duplicateAsNew() {
-    return new NoteAttr(this.attr, this.tag, this.value);
+  get isDeleted() {
+    return this.state == "DELETED";
   }
   validate(throwError = !1) {
-    let output = null;
-    if (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
-    };
+    return !0;
   }
 }
 class NoteTag extends ModelWithState {
@@ -284,7 +99,6 @@ class NoteTag extends ModelWithState {
     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 +119,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,19 +133,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())
+      data: this.data
     };
   }
 }
@@ -532,7 +315,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 +385,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 +397,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 +412,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,23 +428,11 @@ 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;
   }
 }
@@ -766,17 +500,6 @@ class NotuHttpClient {
     );
     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(
@@ -839,15 +562,12 @@ class NotuCache {
     __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 +604,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 +647,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 +672,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 +730,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 +740,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 +768,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 +794,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 +806,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
 };

package/dist/notu.umd.js

@@ -1 +1 @@
-(function(global,factory){typeof exports=="object"&&typeof module<"u"?factory(exports):typeof define=="function"&&define.amd?define(["exports"],factory):(global=typeof globalThis<"u"?globalThis:global||self,factory(global.notu={}))})(this,function(exports2){"use strict";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 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");__publicField(this,"_cache");this._client=client,this._cache=cache}get client(){return this._client}get cache(){return this._cache}async login(username,password){return await this.client.login(username,password)}async setup(){return await this.client.setup()}getSpaces(){return this.cache.getSpaces()}getSpace(id){return this.cache.getSpace(id)}getSpaceByName(name){return this.cache.getSpaceByName(name)}async saveSpace(space){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)}getTag(id){return this.cache.getTag(id)}getTagByName(name,space){return this.cache.getTagByName(name,space)}async getNotes(query,spaceId){return(await this.client.getNotes(query,spaceId)).map(n=>this.cache.noteFromJSON(n))}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))noteData.ownTag.links=noteData.tags.map(x=>x.tagId),this.cache.tagSaved(noteData.ownTag);for(const tagData of tagsBeingDeletedData)tagData.state="DELETED",this.cache.tagSaved(tagData);return notes=notesData.map(n=>this.cache.noteFromJSON(n)),notes}async customJob(name,data){return await this.client.customJob(name,data)}}class NoteAttr extends ModelWithState{constructor(attr,tag,value){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}get tag(){return this._tag}get attr(){return this._attr}get value(){return this._value}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())}withValue(value){return this.value=value,this}duplicate(){const output=this.duplicateAsNew();return output.state=this.state,output}duplicateAsNew(){return new NoteAttr(this.attr,this.tag,this.value)}validate(throwError=!1){let output=null;if(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}}}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)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}get tag(){return this._tag}get data(){return this._data}set data(value){this._data=value,this.isClean&&this.dirty()}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}validate(throwError=!1){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,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}}}class Tag extends ModelWithState{constructor(name=""){super();__publicField(this,"_id",0);__publicField(this,"_space",null);__publicField(this,"_name","");__publicField(this,"_color",null);__publicField(this,"_isPublic",!1);__publicField(this,"links",[]);this._name=name}get id(){return this._id}set id(value){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){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 name(){return this._name}set name(value){value!==this._name&&(this._name=value,this.isClean&&this.dirty())}getFullName(){return`${this.space.name}.${this.name}`}getQualifiedName(contextSpaceId){var _a;return contextSpaceId==((_a=this.space)==null?void 0:_a.id)?this.name:this.getFullName()}getUniqueName(cache){return cache.getTagsByName(this.name).length==1?this.name:this.getFullName()}get color(){return this._color}set color(value){value!==this._color&&(this._color=value,this.isClean&&this.dirty())}get isPublic(){return this._isPublic}set isPublic(value){if(!this.isNew&&this.isPublic&&!value)throw Error("Cannot change a tag from public to private once its already been saved.");value!==this._isPublic&&(this._isPublic=value,this.isClean&&this.dirty())}asPublic(){return this.isPublic=!0,this}asPrivate(){return this.isPublic=!1,this}linksTo(tag){return!!this.links.find(x=>x==tag)}duplicate(){const output=this.duplicateAsNew();return output.id=this.id,output.state=this.state,output}duplicateAsNew(){const output=new Tag(this.name);return output.color=this.color,output.space=this.space,output.isPublic=this.isPublic,output.links=this.links.slice(),output}validate(throwError=!1){let output=null;if(!this.isNew&&this.id<=0?output="Tag id must be greater than zero if in non-new state.":!this.name||!/^[a-zA-Z][a-zA-Z0-9 ]*[a-zA-Z0-9]?$/.test(this.name)?output="Tag name is invalid, must only contain letters, numbers, and spaces, starting with a letter":this.color&&!/^#?[A-z0-9]{6}$/.test(this.color)&&(output="Tag color is invalid, must be a 6 character hexadecimal."),throwError&&output!=null)throw Error(output);return output==null}toJSON(){var _a;return{state:this.state,id:this.id,name:this.name,spaceId:(_a=this.space)==null?void 0:_a.id,color:this.color,isPublic:this.isPublic,links:this.links.map(x=>x.id)}}}class Note extends ModelWithState{constructor(text,ownTag){super();__publicField(this,"_id",0);__publicField(this,"_date",new Date);__publicField(this,"_text","");__publicField(this,"_space",null);__publicField(this,"_ownTag",null);__publicField(this,"_tags",[]);__publicField(this,"_attrs",[]);text&&(this.text=text),this._ownTag=ownTag}get id(){return this._id}set 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}set date(value){value!==this._date&&(this._date=value,this.isClean&&this.dirty())}at(value){return this.date=value,this}get text(){return this._text}set text(value){value!==this._text&&(this._text=value,this.isClean&&this.dirty())}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(),this._setOwnTagSpace()}}in(space){return this.space=space,this}get ownTag(){return this._ownTag}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)}get tags(){return this._tags.filter(x=>!x.isDeleted)}get tagsPendingDeletion(){return this._tags.filter(x=>x.isDeleted)}addTag(tag){if(tag.isDeleted)throw Error("Cannot add a tag marked as deleted to a note");if(tag.isNew)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.space.id!=this.space.id)throw Error("Cannot add a private tag from another space");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.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}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}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}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}toJSON(){var _a;return{state:this.state,id:this.id,date:this.date,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())}}validate(throwError=!1){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];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);__publicField(this,"_fetch");__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()}async _populateSpaces(){const spacesData=await this._fetcher.getSpacesData();this._spaces=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(),allTags=new Map;for(const tagData of tagsData){const tag=this.tagFromJSON(tagData);allTags.set(tag.id,tag),tagData.tag=tag}this._tags=allTags;for(const tagData of tagsData)this._populateTagLinks(tagData.tag,tagData)}_populateTagNames(){const result=new Map;for(const tag of this._tags.values())result.has(tag.name)?result.get(tag.name).push(tag):result.set(tag.name,[tag]);this._tagNames=result}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,this._tags&&this._populateTagLinks(tag,tagData),tag}_populateTagLinks(tag,tagData){tag.links=tagData.links.map(x=>this._tags.get(x))}async _populateAttrs(){const attrsData=await this._fetcher.getAttrsData();this._attrs=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}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._tagNames.get(name)??[])if(tag.name==name&&tag.space.id==space)return tag}getTagsByName(name){return this._tagNames.get(name)??[]}tagSaved(tagData){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){__publicField(this,"_url",null);__publicField(this,"_token",null);__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 NoteComponentInfo{constructor(text,start,processor){__publicField(this,"text");__publicField(this,"start");__publicField(this,"processor");this.text=text,this.start=start,this.processor=processor}get end(){return this.start+this.text.length}}function splitNoteTextIntoComponents(note,notu,componentProcessors,defaultProcessor,groupIntoParagraph){const componentInfos=recursiveSplitNoteText(note.text,note,componentProcessors,defaultProcessor),components=[];async function save(){note.text=components.map(x=>x.getText()).join(""),await notu.saveNotes([note])}for(let groupStart=0;groupStart<componentInfos.length;groupStart++){const startInfo=componentInfos[groupStart];if(!startInfo.processor.componentShowsInlineInParagraph){components.push(startInfo.processor.create(startInfo,note,save));continue}for(let groupEnd=groupStart;groupEnd<=componentInfos.length;groupEnd++){const endInfo=componentInfos[groupEnd];if(!endInfo||!endInfo.processor.componentShowsInlineInParagraph){const groupedComponents=componentInfos.slice(groupStart,groupEnd).map(x=>x.processor.create(x,note,save));components.push(groupIntoParagraph(groupedComponents)),groupStart=groupEnd-1;break}}}return components}function recursiveSplitNoteText(text,note,componentProcessors,defaultProcessor){let componentInfo=null;for(const processor of componentProcessors)if(componentInfo=processor.identify(text),componentInfo)break;if(!componentInfo)return[new NoteComponentInfo(text,0,defaultProcessor)];const output=[];return componentInfo.start>0&&output.push(...recursiveSplitNoteText(text.substring(0,componentInfo.start),note,componentProcessors,defaultProcessor)),output.push(componentInfo),componentInfo.end<text.length&&output.push(...recursiveSplitNoteText(text.substring(componentInfo.end),note,componentProcessors,defaultProcessor)),output}class ParsedQuery{constructor(){__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]+)/,/(#+\??~?|~)\[([\w\d\s]+\.)?([\w\d\s]+)\]/];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);__publicField(this,"searchDepths",[]);__publicField(this,"filter",null)}}class NewParsedTagFilter{constructor(){__publicField(this,"pattern",null);__publicField(this,"exps",[])}}function newParseQuery(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 ");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){const regexes=[/([#@_]+)([\w\d]+\.)?([\w\d]+)/,/([#@_]+)\[([\w\d\s]+\.)?([\w\d\s]+)\]/];for(const regex of regexes)for(;;){const match=regex.exec(query);if(!match)break;let hashPrefix=match[1];const parsedTag=new NewParsedTag;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);const fullMatch=match[0],matchStart=query.indexOf(fullMatch),matchEnd=matchStart+fullMatch.length,tagDataFilter=getTagDataFilterText(query,matchEnd);tagDataFilter&&(query=query.substring(0,matchEnd)+query.substring(matchEnd+tagDataFilter.length+2),processTagDataFilter(parsedTag,tagDataFilter)),query=query.substring(0,matchStart)+`{tag${parsedQuery.tags.length}}`+query.substring(matchEnd),parsedQuery.tags.push(parsedTag)}return query}function getTagDataFilterText(query,tagEndIndex){if(query.charAt(tagEndIndex)!="{")return null;let i=tagEndIndex+1,braceDepth=1;for(;;){if(i>=query.length)throw Error("Invalid query syntax, expected closing '}' symbol.");const char=query.charAt(i);if(char=="{")braceDepth++;else if(char=="}"&&(braceDepth--,braceDepth==0))break;i++}return query.substring(tagEndIndex+1,i)}function processTagDataFilter(parsedTag,filterText){filterText=` ${filterText}`,parsedTag.filter=new NewParsedTagFilter,parsedTag.filter.pattern=filterText;const expressionRegex=/[\s\(]\.([\w\d\[\]\.]+)/;for(;;){const match=expressionRegex.exec(parsedTag.filter.pattern);if(!match)break;const expression=match[1];parsedTag.filter.pattern=parsedTag.filter.pattern.replace(`.${expression}`,`{exp${parsedTag.filter.exps.length}}`),parsedTag.filter.exps.push(expression)}parsedTag.filter.pattern=parsedTag.filter.pattern.trim()}exports2.Attr=Attr,exports2.NewParsedQuery=NewParsedQuery,exports2.NewParsedTag=NewParsedTag,exports2.NewParsedTagFilter=NewParsedTagFilter,exports2.Note=Note,exports2.NoteAttr=NoteAttr,exports2.NoteComponentInfo=NoteComponentInfo,exports2.NoteTag=NoteTag,exports2.Notu=Notu,exports2.NotuCache=NotuCache,exports2.NotuHttpCacheFetcher=NotuHttpCacheFetcher,exports2.NotuHttpClient=NotuHttpClient,exports2.ParsedAttr=ParsedAttr,exports2.ParsedQuery=ParsedQuery,exports2.ParsedTag=ParsedTag,exports2.Space=Space,exports2.Tag=Tag,exports2.newParseQuery=newParseQuery,exports2.parseQuery=parseQuery,exports2.splitNoteTextIntoComponents=splitNoteTextIntoComponents,Object.defineProperty(exports2,Symbol.toStringTag,{value:"Module"})});
+(function(global,factory){typeof exports=="object"&&typeof module<"u"?factory(exports):typeof define=="function"&&define.amd?define(["exports"],factory):(global=typeof globalThis<"u"?globalThis:global||self,factory(global.notu={}))})(this,function(exports2){"use strict";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 Notu{constructor(client,cache){__publicField(this,"_client");__publicField(this,"_cache");this._client=client,this._cache=cache}get client(){return this._client}get cache(){return this._cache}async login(username,password){return await this.client.login(username,password)}async setup(){return await this.client.setup()}getSpaces(){return this.cache.getSpaces()}getSpace(id){return this.cache.getSpace(id)}getSpaceByName(name){return this.cache.getSpaceByName(name)}async saveSpace(space){const spaceData=await this.client.saveSpace(space);return this.cache.spaceSaved(spaceData)}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){return(await this.client.getNotes(query,spaceId)).map(n=>this.cache.noteFromJSON(n))}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))noteData.ownTag.links=noteData.tags.map(x=>x.tagId),this.cache.tagSaved(noteData.ownTag);for(const tagData of tagsBeingDeletedData)tagData.state="DELETED",this.cache.tagSaved(tagData);return notes=notesData.map(n=>this.cache.noteFromJSON(n)),notes}async customJob(name,data){return await this.client.customJob(name,data)}}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 NoteTag extends ModelWithState{constructor(tag){super();__publicField(this,"_tag");__publicField(this,"_data");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}get tag(){return this._tag}get data(){return this._data}set data(value){this._data=value,this.isClean&&this.dirty()}withData(data){return this.data=data,this}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}validate(throwError=!1){function exit(message){if(throwError&&message!=null)throw Error(message);return message==null}return this.tag?!0:exit("NoteTag must have a tag set.")}toJSON(){return{state:this.state,tagId:this.tag.id,data:this.data}}}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}}}class Tag extends ModelWithState{constructor(name=""){super();__publicField(this,"_id",0);__publicField(this,"_space",null);__publicField(this,"_name","");__publicField(this,"_color",null);__publicField(this,"_isPublic",!1);__publicField(this,"links",[]);this._name=name}get id(){return this._id}set id(value){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){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 name(){return this._name}set name(value){value!==this._name&&(this._name=value,this.isClean&&this.dirty())}getFullName(){return`${this.space.name}.${this.name}`}getQualifiedName(contextSpaceId){var _a;return contextSpaceId==((_a=this.space)==null?void 0:_a.id)?this.name:this.getFullName()}getUniqueName(cache){return cache.getTagsByName(this.name).length==1?this.name:this.getFullName()}get color(){return this._color}set color(value){value!==this._color&&(this._color=value,this.isClean&&this.dirty())}get isPublic(){return this._isPublic}set isPublic(value){if(!this.isNew&&this.isPublic&&!value)throw Error("Cannot change a tag from public to private once its already been saved.");value!==this._isPublic&&(this._isPublic=value,this.isClean&&this.dirty())}asPublic(){return this.isPublic=!0,this}asPrivate(){return this.isPublic=!1,this}linksTo(tag){return!!this.links.find(x=>x==tag)}duplicate(){const output=this.duplicateAsNew();return output.id=this.id,output.state=this.state,output}duplicateAsNew(){const output=new Tag(this.name);return output.color=this.color,output.space=this.space,output.isPublic=this.isPublic,output.links=this.links.slice(),output}validate(throwError=!1){let output=null;if(!this.isNew&&this.id<=0?output="Tag id must be greater than zero if in non-new state.":!this.name||!/^[a-zA-Z][a-zA-Z0-9 ]*[a-zA-Z0-9]?$/.test(this.name)?output="Tag name is invalid, must only contain letters, numbers, and spaces, starting with a letter":this.color&&!/^#?[A-z0-9]{6}$/.test(this.color)&&(output="Tag color is invalid, must be a 6 character hexadecimal."),throwError&&output!=null)throw Error(output);return output==null}toJSON(){var _a;return{state:this.state,id:this.id,name:this.name,spaceId:(_a=this.space)==null?void 0:_a.id,color:this.color,isPublic:this.isPublic,links:this.links.map(x=>x.id)}}}class Note extends ModelWithState{constructor(text,ownTag){super();__publicField(this,"_id",0);__publicField(this,"_date",new Date);__publicField(this,"_text","");__publicField(this,"_space",null);__publicField(this,"_ownTag",null);__publicField(this,"_tags",[]);text&&(this.text=text),this._ownTag=ownTag}get id(){return this._id}set 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}set date(value){value!==this._date&&(this._date=value,this.isClean&&this.dirty())}at(value){return this.date=value,this}get text(){return this._text}set text(value){value!==this._text&&(this._text=value,this.isClean&&this.dirty())}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(),this._setOwnTagSpace()}}in(space){return this.space=space,this}get ownTag(){return this._ownTag}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)}get tags(){return this._tags.filter(x=>!x.isDeleted)}get tagsPendingDeletion(){return this._tags.filter(x=>x.isDeleted)}addTag(tag){if(tag.isDeleted)throw Error("Cannot add a tag marked as deleted to a note");if(tag.isNew)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.space.id!=this.space.id)throw Error("Cannot add a private tag from another space");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.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?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))}getTagData(tag,type){const nt=this.getTag(tag);return nt?new type(nt):null}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._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._tags=this.tags.map(x=>x.duplicateAsNew()),output}toJSON(){var _a;return{state:this.state,id:this.id,date:this.date,text:this.text,spaceId:this.space.id,ownTag:(_a=this.ownTag)==null?void 0:_a.toJSON(),tags:this._tags.map(x=>x.toJSON())}}validate(throwError=!1){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.");if(this.ownTag&&!this.ownTag.validate(throwError))return!1;for(const nt of this._tags)if(!nt.validate(throwError))return!1;return!0}}class NotuHttpClient{constructor(url,fetchMethod=null){__publicField(this,"_url",null);__publicField(this,"_token",null);__publicField(this,"_fetch");__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 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);if(!fetcher)throw Error("NotuCache constructor must have a fetcher argument supplied.");this._fetcher=fetcher}async populate(){await this._populateSpaces(),await this._populateTags(),this._populateTagNames()}async _populateSpaces(){const spacesData=await this._fetcher.getSpacesData();this._spaces=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(),allTags=new Map;for(const tagData of tagsData){const tag=this.tagFromJSON(tagData);allTags.set(tag.id,tag),tagData.tag=tag}this._tags=allTags;for(const tagData of tagsData)this._populateTagLinks(tagData.tag,tagData)}_populateTagNames(){const result=new Map;for(const tag of this._tags.values())result.has(tag.name)?result.get(tag.name).push(tag):result.set(tag.name,[tag]);this._tagNames=result}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,this._tags&&this._populateTagLinks(tag,tagData),tag}_populateTagLinks(tag,tagData){tag.links=tagData.links.map(x=>this._tags.get(x))}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 ntData of noteData.tags){const nt=note.addTag(this.getTag(ntData.tagId));nt.data=ntData.data,nt.state=ntData.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._tagNames.get(name)??[])if(tag.name==name&&tag.space.id==space)return tag}getTagsByName(name){return this._tagNames.get(name)??[]}tagSaved(tagData){const tag=this.tagFromJSON(tagData);return tag.state=="DELETED"?this._tags.delete(tag.id):this._tags.set(tag.id,tag),this._populateTagNames(),tag}}class NotuHttpCacheFetcher{constructor(url,token,fetchMethod=null){__publicField(this,"_url",null);__publicField(this,"_token",null);__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 _getX(endpoint){return await(await this._fetch(this.url+endpoint,{method:"GET",headers:{Authorization:"Bearer "+this.token}})).json()}}class NoteComponentInfo{constructor(text,start,processor){__publicField(this,"text");__publicField(this,"start");__publicField(this,"processor");this.text=text,this.start=start,this.processor=processor}get end(){return this.start+this.text.length}}function splitNoteTextIntoComponents(note,notu,componentProcessors,defaultProcessor,groupIntoParagraph){const componentInfos=recursiveSplitNoteText(note.text,note,componentProcessors,defaultProcessor),components=[];async function save(){note.text=components.map(x=>x.getText()).join(""),await notu.saveNotes([note])}for(let groupStart=0;groupStart<componentInfos.length;groupStart++){const startInfo=componentInfos[groupStart];if(!startInfo.processor.componentShowsInlineInParagraph){components.push(startInfo.processor.create(startInfo,note,save));continue}for(let groupEnd=groupStart;groupEnd<=componentInfos.length;groupEnd++){const endInfo=componentInfos[groupEnd];if(!endInfo||!endInfo.processor.componentShowsInlineInParagraph){const groupedComponents=componentInfos.slice(groupStart,groupEnd).map(x=>x.processor.create(x,note,save));components.push(groupIntoParagraph(groupedComponents)),groupStart=groupEnd-1;break}}}return components}function recursiveSplitNoteText(text,note,componentProcessors,defaultProcessor){let componentInfo=null;for(const processor of componentProcessors)if(componentInfo=processor.identify(text),componentInfo)break;if(!componentInfo)return[new NoteComponentInfo(text,0,defaultProcessor)];const output=[];return componentInfo.start>0&&output.push(...recursiveSplitNoteText(text.substring(0,componentInfo.start),note,componentProcessors,defaultProcessor)),output.push(componentInfo),componentInfo.end<text.length&&output.push(...recursiveSplitNoteText(text.substring(componentInfo.end),note,componentProcessors,defaultProcessor)),output}class ParsedQuery{constructor(){__publicField(this,"where",null);__publicField(this,"order",null);__publicField(this,"tags",[])}}class ParsedTag{constructor(){__publicField(this,"space",null);__publicField(this,"name",null);__publicField(this,"searchDepths",[]);__publicField(this,"filter",null)}}class ParsedTagFilter{constructor(){__publicField(this,"pattern",null);__publicField(this,"exps",[])}}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 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){const regexes=[/([#@_]+)([\w\d]+\.)?([\w\d]+)/,/([#@_]+)\[([\w\d\s]+\.)?([\w\d\s]+)\]/];for(const regex of regexes)for(;;){const match=regex.exec(query);if(!match)break;let hashPrefix=match[1];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);const fullMatch=match[0],matchStart=query.indexOf(fullMatch),matchEnd=matchStart+fullMatch.length,tagDataFilter=getTagDataFilterText(query,matchEnd);tagDataFilter&&(query=query.substring(0,matchEnd)+query.substring(matchEnd+tagDataFilter.length+2),processTagDataFilter(parsedTag,tagDataFilter)),query=query.substring(0,matchStart)+`{tag${parsedQuery.tags.length}}`+query.substring(matchEnd),parsedQuery.tags.push(parsedTag)}return query}function getTagDataFilterText(query,tagEndIndex){if(query.charAt(tagEndIndex)!="{")return null;let i=tagEndIndex+1,braceDepth=1;for(;;){if(i>=query.length)throw Error("Invalid query syntax, expected closing '}' symbol.");const char=query.charAt(i);if(char=="{")braceDepth++;else if(char=="}"&&(braceDepth--,braceDepth==0))break;i++}return query.substring(tagEndIndex+1,i)}function processTagDataFilter(parsedTag,filterText){filterText=` ${filterText}`,parsedTag.filter=new ParsedTagFilter,parsedTag.filter.pattern=filterText;const expressionRegex=/[\s\(]\.([\w\d\[\]\.]+)/;for(;;){const match=expressionRegex.exec(parsedTag.filter.pattern);if(!match)break;const expression=match[1];parsedTag.filter.pattern=parsedTag.filter.pattern.replace(`.${expression}`,`{exp${parsedTag.filter.exps.length}}`),parsedTag.filter.exps.push(expression)}parsedTag.filter.pattern=parsedTag.filter.pattern.trim()}exports2.Note=Note,exports2.NoteComponentInfo=NoteComponentInfo,exports2.NoteTag=NoteTag,exports2.Notu=Notu,exports2.NotuCache=NotuCache,exports2.NotuHttpCacheFetcher=NotuHttpCacheFetcher,exports2.NotuHttpClient=NotuHttpClient,exports2.ParsedQuery=ParsedQuery,exports2.ParsedTag=ParsedTag,exports2.ParsedTagFilter=ParsedTagFilter,exports2.Space=Space,exports2.Tag=Tag,exports2.parseQuery=parseQuery,exports2.splitNoteTextIntoComponents=splitNoteTextIntoComponents,Object.defineProperty(exports2,Symbol.toStringTag,{value:"Module"})});

package/dist/types/TestHelpers.d.ts

@@ -1,7 +1,6 @@
-import { Attr, Note, Space, Tag } from ".";
+import { Note, Space, Tag } from ".";
 import { NotuCacheFetcher } from "./services/HttpCacheFetcher";
 export declare function newNote(text?: string, id?: number): Note;
 export declare function newSpace(name?: string, id?: number): Space;
-export declare function newAttr(name?: string, id?: number): Attr;
 export declare function newTag(name?: string, id?: number): Tag;
 export declare function testCacheFetcher(): NotuCacheFetcher;

package/dist/types/index.d.ts

@@ -1,14 +1,11 @@
-import Attr from './models/Attr';
 import { Notu } from './services/Notu';
 import NotuHttpClient from './services/HttpClient';
 import { NotuCache } from './services/NotuCache';
 import { NotuHttpCacheFetcher } from './services/HttpCacheFetcher';
 import Note from './models/Note';
-import NoteAttr from './models/NoteAttr';
 import { NoteComponentInfo, splitNoteTextIntoComponents } from './notecomponents/NoteComponent';
 import NoteTag from './models/NoteTag';
-import parseQuery, { ParsedQuery, ParsedTag, ParsedAttr } from './services/QueryParser';
-import newParseQuery, { NewParsedQuery, NewParsedTag, NewParsedTagFilter } from './services/NewQueryParser';
+import parseQuery, { ParsedQuery, ParsedTag, ParsedTagFilter } from './services/QueryParser';
 import Space from './models/Space';
 import Tag from './models/Tag';
-export { Attr, Notu, NotuHttpClient, NotuCache, NotuHttpCacheFetcher, Note, NoteAttr, NoteComponentInfo, splitNoteTextIntoComponents, NoteTag, parseQuery, ParsedQuery, ParsedTag, ParsedAttr, newParseQuery, NewParsedQuery, NewParsedTag, NewParsedTagFilter, Space, Tag };
+export { Notu, NotuHttpClient, NotuCache, NotuHttpCacheFetcher, Note, NoteComponentInfo, splitNoteTextIntoComponents, NoteTag, parseQuery, ParsedQuery, ParsedTag, ParsedTagFilter, Space, Tag };

package/dist/types/models/Note.d.ts

@@ -1,9 +1,7 @@
 import ModelWithState from './ModelWithState';
-import NoteAttr from './NoteAttr';
 import NoteTag from './NoteTag';
 import Space from './Space';
 import Tag from './Tag';
-import Attr from './Attr';
 export default class Note extends ModelWithState<Note> {
     constructor(text?: string, ownTag?: Tag);
     private _id;
@@ -31,13 +29,6 @@ export default class Note extends ModelWithState<Note> {
     addTag(tag: Tag): NoteTag;
     removeTag(tag: Tag): Note;
     getTag(tag: string | Tag, space?: number | Space): NoteTag;
-    private _attrs;
-    get attrs(): Array<NoteAttr>;
-    get attrsPendingDeletion(): Array<NoteAttr>;
-    addAttr(attr: Attr, value?: any): Note;
-    removeAttr(attr: Attr): Note;
-    getAttr(attr: string | Attr): NoteAttr;
-    getValue(attr: string | Attr): any;
     getTagData<T>(tag: Tag, type: {
         new (noteTag: NoteTag): T;
     }): T;
@@ -62,18 +53,6 @@ export default class Note extends ModelWithState<Note> {
             state: "NEW" | "CLEAN" | "DIRTY" | "DELETED";
             tagId: number;
             data: any;
-            attrs: {
-                state: "NEW" | "CLEAN" | "DIRTY" | "DELETED";
-                attrId: number;
-                tagId: number;
-                value: any;
-            }[];
-        }[];
-        attrs: {
-            state: "NEW" | "CLEAN" | "DIRTY" | "DELETED";
-            attrId: number;
-            tagId: number;
-            value: any;
         }[];
     };
     validate(throwError?: boolean): boolean;

package/dist/types/models/NoteTag.d.ts

@@ -1,7 +1,5 @@
 import ModelWithState from './ModelWithState';
 import Tag from './Tag';
-import Attr from './Attr';
-import NoteAttr from './NoteAttr';
 export default class NoteTag extends ModelWithState<NoteTag> {
     constructor(tag: Tag);
     private _tag;
@@ -10,13 +8,6 @@ export default class NoteTag extends ModelWithState<NoteTag> {
     get data(): any;
     set data(value: any);
     withData(data: any): NoteTag;
-    private _attrs;
-    get attrs(): Array<NoteAttr>;
-    get attrsPendingDeletion(): Array<NoteAttr>;
-    addAttr(attr: Attr, value?: any): NoteTag;
-    removeAttr(attr: Attr): NoteTag;
-    getAttr(attr: string | Attr): NoteAttr;
-    getValue(attr: string | Attr): any;
     duplicate(): NoteTag;
     duplicateAsNew(): NoteTag;
     validate(throwError?: boolean): boolean;
@@ -24,11 +15,5 @@ export default class NoteTag extends ModelWithState<NoteTag> {
         state: "NEW" | "CLEAN" | "DIRTY" | "DELETED";
         tagId: number;
         data: any;
-        attrs: {
-            state: "NEW" | "CLEAN" | "DIRTY" | "DELETED";
-            attrId: number;
-            tagId: number;
-            value: any;
-        }[];
     };
 }

package/dist/types/services/HttpCacheFetcher.d.ts

@@ -1,7 +1,6 @@
 export interface NotuCacheFetcher {
     getSpacesData(): Promise<Array<any>>;
     getTagsData(): Promise<Array<any>>;
-    getAttrsData(): Promise<Array<any>>;
 }
 export declare class NotuHttpCacheFetcher implements NotuCacheFetcher {
     private _url;
@@ -12,6 +11,5 @@ export declare class NotuHttpCacheFetcher implements NotuCacheFetcher {
     constructor(url: string, token: string, fetchMethod?: (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>);
     getSpacesData(): Promise<Array<any>>;
     getTagsData(): Promise<Array<any>>;
-    getAttrsData(): Promise<Array<any>>;
     private _getX;
 }

package/dist/types/services/HttpClient.d.ts

@@ -1,4 +1,3 @@
-import Attr from '../models/Attr';
 import Note from '../models/Note';
 import Space from '../models/Space';
 import Tag from '../models/Tag';
@@ -6,7 +5,6 @@ export interface NotuClient {
     login(username: string, password: string): Promise<string>;
     setup(): Promise<void>;
     saveSpace(space: Space): Promise<any>;
-    saveAttr(attr: Attr): Promise<any>;
     getNotes(query: string, space: number | Space): Promise<Array<any>>;
     getNoteCount(query: string, space: number | Space): Promise<number>;
     getRelatedNotes(tag: Tag | Note | number): Promise<Array<any>>;
@@ -26,7 +24,6 @@ export default class NotuHttpClient implements NotuClient {
     login(username: string, password: string): Promise<string>;
     setup(): Promise<void>;
     saveSpace(space: Space): Promise<any>;
-    saveAttr(attr: Attr): Promise<any>;
     getNotes(query: string, space: number | Space): Promise<Array<any>>;
     getNoteCount(query: string, space: number | Space): Promise<number>;
     getRelatedNotes(tag: Tag | Note | number): Promise<Array<any>>;

package/dist/types/services/Notu.d.ts

@@ -1,4 +1,4 @@
-import { Attr, Note, Space, Tag } from '..';
+import { Note, Space, Tag } from '..';
 import { NotuClient } from './HttpClient';
 import { NotuCache } from './NotuCache';
 export declare class Notu {
@@ -13,10 +13,6 @@ export declare class Notu {
     getSpace(id: number): Space;
     getSpaceByName(name: string): Space;
     saveSpace(space: Space): Promise<Space>;
-    getAttrs(space?: number | Space): Array<Attr>;
-    getAttr(id: number): Attr;
-    getAttrByName(name: string, space: number | Space): Attr;
-    saveAttr(attr: Attr): Promise<Attr>;
     getTags(space?: number | Space, includeOtherSpacePublics?: boolean): Array<Tag>;
     getTag(id: number): Tag;
     getTagByName(name: string, space: number | Space): Tag;

package/dist/types/services/NotuCache.d.ts

@@ -1,4 +1,3 @@
-import Attr from '../models/Attr';
 import Note from '../models/Note';
 import Space from '../models/Space';
 import Tag from '../models/Tag';
@@ -9,7 +8,6 @@ export declare class NotuCache {
     private _spaces;
     private _tags;
     private _tagNames;
-    private _attrs;
     populate(): Promise<void>;
     private _populateSpaces;
     spaceFromJSON(spaceData: any): Space;
@@ -17,8 +15,6 @@ export declare class NotuCache {
     private _populateTagNames;
     tagFromJSON(tagData: any): Tag;
     private _populateTagLinks;
-    private _populateAttrs;
-    attrFromJSON(attrData: any): Attr;
     noteFromJSON(noteData: any): Note;
     getSpaces(): Array<Space>;
     getSpace(id: number): Space;
@@ -29,8 +25,4 @@ export declare class NotuCache {
     getTagByName(name: string, space: number | Space): Tag;
     getTagsByName(name: string): Array<Tag>;
     tagSaved(tagData: any): Tag;
-    getAttrs(space?: number | Space): Array<Attr>;
-    getAttr(id: number): Attr;
-    getAttrByName(name: string, space: number | Space): Attr;
-    attrSaved(attrData: any): Attr;
 }

package/dist/types/services/QueryParser.d.ts

@@ -2,21 +2,17 @@ export declare class ParsedQuery {
     where: string;
     order: string;
     tags: Array<ParsedTag>;
-    attrs: Array<ParsedAttr>;
 }
 export declare class ParsedTag {
     space: string;
     name: string;
-    searchDepth: number;
-    strictSearchDepth: boolean;
-    includeOwner: boolean;
+    searchDepths: Array<number>;
+    filter: ParsedTagFilter;
 }
-export declare class ParsedAttr {
-    name: string;
-    exists: boolean;
-    tagNameFilters: Array<ParsedTag>;
+export declare class ParsedTagFilter {
+    pattern: string;
+    exps: Array<string>;
 }
 export default function parseQuery(query: string): ParsedQuery;
 export declare function splitQuery(query: string): ParsedQuery;
 export declare function identifyTags(query: string, parsedQuery: ParsedQuery): string;
-export declare function identifyAttrs(query: string, parsedQuery: ParsedQuery): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notu",
-  "version": "0.12.2",
+  "version": "0.13.0",
   "main": "dist/notu.mjs",
   "unpkg": "dist/notu.mjs",
   "types": "dist/types/index.d.ts",

package/dist/types/models/Attr.d.ts

@@ -1,51 +0,0 @@
-import ModelWithState from './ModelWithState';
-import Space from './Space';
-declare const ATTR_TYPE: {
-    TEXT: string;
-    NUMBER: string;
-    BOOLEAN: string;
-    DATE: string;
-};
-export type AttrType = keyof typeof ATTR_TYPE;
-export default class Attr extends ModelWithState<Attr> {
-    constructor(name?: string, description?: string);
-    id: number;
-    private _name;
-    get name(): string;
-    set name(value: string);
-    private _description;
-    get description(): string;
-    set description(value: string);
-    private _type;
-    get type(): AttrType;
-    set type(value: AttrType);
-    get isText(): boolean;
-    get isNumber(): boolean;
-    get isBoolean(): boolean;
-    get isDate(): boolean;
-    asText(): Attr;
-    asNumber(): Attr;
-    asBoolean(): Attr;
-    asDate(): Attr;
-    private _space;
-    get space(): Space;
-    set space(value: Space);
-    in(space: Space): Attr;
-    private _color;
-    get color(): string;
-    set color(value: string);
-    duplicate(): Attr;
-    duplicateAsNew(): Attr;
-    validate(throwError?: boolean): boolean;
-    get defaultValue(): any;
-    toJSON(): {
-        state: "NEW" | "CLEAN" | "DIRTY" | "DELETED";
-        id: number;
-        name: string;
-        description: string;
-        type: "TEXT" | "NUMBER" | "BOOLEAN" | "DATE";
-        spaceId: number;
-        color: string;
-    };
-}
-export {};

package/dist/types/models/NoteAttr.d.ts

@@ -1,23 +0,0 @@
-import ModelWithState from './ModelWithState';
-import Attr from './Attr';
-import Tag from './Tag';
-export default class NoteAttr extends ModelWithState<NoteAttr> {
-    constructor(attr: Attr, tag?: Tag, value?: any);
-    private _tag;
-    get tag(): Tag;
-    private _attr;
-    get attr(): Attr;
-    private _value;
-    get value(): any;
-    set value(newVal: any);
-    withValue(value: any): NoteAttr;
-    duplicate(): NoteAttr;
-    duplicateAsNew(): NoteAttr;
-    validate(throwError?: boolean): boolean;
-    toJSON(): {
-        state: "NEW" | "CLEAN" | "DIRTY" | "DELETED";
-        attrId: number;
-        tagId: number;
-        value: any;
-    };
-}

package/dist/types/services/NewQueryParser.d.ts

@@ -1,18 +0,0 @@
-export declare class NewParsedQuery {
-    where: string;
-    order: string;
-    tags: Array<NewParsedTag>;
-}
-export declare class NewParsedTag {
-    space: string;
-    name: string;
-    searchDepths: Array<number>;
-    filter: NewParsedTagFilter;
-}
-export declare class NewParsedTagFilter {
-    pattern: string;
-    exps: Array<string>;
-}
-export default function newParseQuery(query: string): NewParsedQuery;
-export declare function splitQuery(query: string): NewParsedQuery;
-export declare function identifyTags(query: string, parsedQuery: NewParsedQuery): string;