@ztimson/momentum 0.41.0 → 0.42.0

package/dist/client.d.ts

@@ -2,6 +2,7 @@ import { Settings } from './settings';
 export type Platform = 'windows' | 'android' | 'ios' | 'mac' | 'linux' | 'unknown';
 export declare class Client {
     private readonly settings;
+    get mobile(): boolean;
     private _platform?;
     get platform(): Platform;
     private _pwa?;

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,SAAS,CAAC;AAEnF,qBAAa,MAAM;IAuBN,OAAO,CAAC,QAAQ,CAAC,QAAQ;IArBrC,OAAO,CAAC,SAAS,CAAC,CAAW;IAC7B,IAAI,QAAQ,IAAI,QAAQ,CAWvB;IAED,OAAO,CAAC,IAAI,CAAC,CAAU;IACvB,IAAI,GAAG,IAAI,OAAO,CAIjB;gBAE4B,QAAQ,EAAE,QAAQ;IAEzC,MAAM,CAAC,MAAM,UAAQ;IA0F3B,SAAS,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,KAAK;CAiItC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,SAAS,CAAC;AAEnF,qBAAa,MAAM;IAyBN,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAvBrC,IAAI,MAAM,YAAyD;IAEnE,OAAO,CAAC,SAAS,CAAC,CAAW;IAC7B,IAAI,QAAQ,IAAI,QAAQ,CAWvB;IAED,OAAO,CAAC,IAAI,CAAC,CAAU;IACvB,IAAI,GAAG,IAAI,OAAO,CAIjB;gBAE4B,QAAQ,EAAE,QAAQ;IAEzC,MAAM,CAAC,MAAM,UAAQ;IA0F3B,SAAS,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,KAAK;CAiItC"}

package/dist/data.d.ts

@@ -1,6 +1,6 @@
 import { Api } from './api';
 import { Meta } from './core';
-import { TypedEmitter, TypedEvents } from '@ztimson/utils';
+import { PromiseProgress, TypedEmitter, TypedEvents } from '@ztimson/utils';
 export type Document<T> = Meta & T;
 export type RawQuery = {
     operand: 'delete' | 'deleteOne' | 'find' | 'findOne' | 'insert' | 'replaceOne' | 'update' | 'updateOne';
@@ -9,10 +9,26 @@ export type RawQuery = {
     options?: any;
     count?: boolean;
 };
+export type Schema = Meta & {
+    path: string;
+    description?: string;
+    autoIncrement?: number;
+    fields?: SchemaField[];
+};
+export type SchemaField = {
+    key: string;
+    type: string;
+    format: string;
+    default: any;
+    null: boolean;
+};
 /**
- * Recursive type for defining data schema: [path sagment, exists, children]
+ * Recursive type for defining data schema
  */
-export type TreeNode = [string, boolean, TreeNode[]];
+export type SchemaNode = Schema & {
+    name: string;
+    children: SchemaNode[];
+};
 export type DataEvents = TypedEvents & {
     create: (collection: string, document: any) => any;
     read: (collection: string, documents: any | any[]) => any;
@@ -29,5 +45,12 @@ export declare class Data extends TypedEmitter<DataEvents> {
     update<T>(collection: string, document: Document<T>, append?: boolean): Promise<Document<T>>;
     delete(collection: string, id: number): Promise<void>;
     raw<T>(collection: string, query: RawQuery): Promise<Document<T>>;
+    deleteSchema(collection: string): PromiseProgress<void>;
+    getSchema(tree?: false): Promise<string[]>;
+    getSchema(tree?: boolean): Promise<SchemaNode[]>;
+    getSchema(path?: string): Promise<Schema>;
+    setSchema(schema: Partial<Schema> & {
+        path: string;
+    }): PromiseProgress<unknown>;
 }
 //# sourceMappingURL=data.d.ts.map

package/dist/data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../src/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,KAAK,IAAI,EAAC,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAC,YAAY,EAAE,KAAK,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE9D,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;AAEnC,MAAM,MAAM,QAAQ,GAAG;IACtB,OAAO,EAAE,QAAQ,GAAG,WAAW,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,GAAG,YAAY,GAAG,QAAQ,GAAG,WAAW,CAAC;IACxG,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;CAChB,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;AAErD,MAAM,MAAM,UAAU,GAAG,WAAW,GAAG;IACtC,MAAM,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,GAAG,CAAC;IACnD,IAAI,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,GAAG,EAAE,KAAK,GAAG,CAAC;IAC1D,MAAM,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,GAAG,CAAC;IACnD,MAAM,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,GAAG,CAAC;IACtD,GAAG,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,GAAG,CAAC;CACjE,CAAC;AAEF,qBAAa,IAAK,SAAQ,YAAY,CAAC,UAAU,CAAC;IACjD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAO;gBAEf,GAAG,EAAE,GAAG,GAAG,MAAM;IAK7B,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAW1E,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IACtD,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAQhE,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,UAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAYzF,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOrD,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;CAMjE"}
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../src/data.ts"],"names":[],"mappings":"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"}

package/dist/index.cjs

@@ -665,7 +665,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     set token(token) {
       if (token == this._token) return;
       this._token = token;
-      this.headers["Authorization"] = token ? `Bearer ${token}` : void 0;
+      this.headers["Authorization"] = token ? `Bearer ${token}` : null;
       this.emit("token", token);
     }
     healthcheck() {
@@ -948,6 +948,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       __publicField(this, "_pwa");
       this.settings = settings;
     }
+    get mobile() {
+      return ["android", "ios"].includes(this.platform);
+    }
     get platform() {
       if (!this._platform) {
         const userAgent = navigator.userAgent || navigator.vendor;
@@ -1036,7 +1039,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         window.document.head.append(link);
         setTimeout(() => {
           const dismissed = !!localStorage.getItem("momentum:install-prompt");
-          if (!dismissed && !this.pwa && this.platform == "ios") this.pwaPrompt();
+          if (!dismissed && !this.pwa && this.mobile) this.pwaPrompt();
         }, 500);
       }
     }
@@ -1170,7 +1173,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     create(collection, document2) {
       return this.api.request({
-        url: `/api/data/${collection}`,
+        url: `/api/data/${collection.replaceAll(/(^\/|\/$)/g, "")}`,
         method: "POST",
         body: document2
       }).then((resp) => {
@@ -1179,7 +1182,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       });
     }
     read(collection, id) {
-      return this.api.request({ url: `/api/data/${collection}${id ? `/${id}` : ""}` }).then((resp) => {
+      return this.api.request({ url: `/api/data/${collection.replaceAll(/(^\/|\/$)/g, "")}/${id ?? ""}` }).then((resp) => {
         this.emit("read", collection, resp);
         return resp;
       });
@@ -1187,7 +1190,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     update(collection, document2, append = true) {
       if (!document2._id) return this.create(collection, document2);
       return this.api.request({
-        url: `/api/data/${collection}/${document2._id}`,
+        url: `/api/data/${collection.replaceAll(/(^\/|\/$)/g, "")}/${document2._id}`,
         method: append ? "PATCH" : "PUT",
         body: document2
       }).then((resp) => {
@@ -1197,16 +1200,28 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     delete(collection, id) {
       return this.api.request({
-        url: `/api/data/${collection}/${id}`,
+        url: `/api/data/${collection.replaceAll(/(^\/|\/$)/g, "")}/${id}`,
         method: "DELETE"
       }).then(() => this.emit("delete", collection, id));
     }
     raw(collection, query) {
-      return this.api.request({ url: `/api/data/${collection}`, body: query }).then((resp) => {
+      return this.api.request({ url: `/api/data/${collection.replaceAll(/(^\/|\/$)/g, "")}`, body: query }).then((resp) => {
         this.emit("raw", collection, query, resp);
         return resp;
       });
     }
+    deleteSchema(collection) {
+      return this.api.request({ url: `/api/data/schema/${collection.replaceAll(/(^\/|\/$)/g, "")}`, method: "DELETE" });
+    }
+    getSchema(pathOrTree) {
+      let url = "/api/data/schema";
+      if (typeof pathOrTree == "string") url += `/${pathOrTree.replaceAll(/(^\/|\/$)/g, "")}`;
+      else if (typeof pathOrTree == "boolean") url += `?tree=${pathOrTree}`;
+      return this.api.request({ url });
+    }
+    setSchema(schema) {
+      return this.api.request({ url: `/api/data/schema/${schema.path.replaceAll(/(^\/|\/$)/g, "")}`, body: schema });
+    }
   }
   class Email extends _ {
     constructor(api) {
@@ -1605,7 +1620,7 @@ ${log}`;
       this.api = typeof api == "string" ? new Api(api) : api;
     }
     async all(detailed = false, reload) {
-      if (!detailed && this.cache.complete && !reload) return this.cache;
+      if (!reload && !detailed && this.cache.complete) return this.cache;
       return this.api.request({ url: `/api/settings` + (detailed ? "?detailed" : "") }).then((resp) => {
         Object.entries(resp).forEach(([key, value]) => this.cache.set(key, detailed ? value.value : value));
         this.cache.complete = true;

package/dist/index.mjs

@@ -661,7 +661,7 @@ class Api extends F {
   set token(token) {
     if (token == this._token) return;
     this._token = token;
-    this.headers["Authorization"] = token ? `Bearer ${token}` : void 0;
+    this.headers["Authorization"] = token ? `Bearer ${token}` : null;
     this.emit("token", token);
   }
   healthcheck() {
@@ -944,6 +944,9 @@ class Client {
     __publicField(this, "_pwa");
     this.settings = settings;
   }
+  get mobile() {
+    return ["android", "ios"].includes(this.platform);
+  }
   get platform() {
     if (!this._platform) {
       const userAgent = navigator.userAgent || navigator.vendor;
@@ -1032,7 +1035,7 @@ class Client {
       window.document.head.append(link);
       setTimeout(() => {
         const dismissed = !!localStorage.getItem("momentum:install-prompt");
-        if (!dismissed && !this.pwa && this.platform == "ios") this.pwaPrompt();
+        if (!dismissed && !this.pwa && this.mobile) this.pwaPrompt();
       }, 500);
     }
   }
@@ -1166,7 +1169,7 @@ class Data extends _ {
   }
   create(collection, document2) {
     return this.api.request({
-      url: `/api/data/${collection}`,
+      url: `/api/data/${collection.replaceAll(/(^\/|\/$)/g, "")}`,
       method: "POST",
       body: document2
     }).then((resp) => {
@@ -1175,7 +1178,7 @@ class Data extends _ {
     });
   }
   read(collection, id) {
-    return this.api.request({ url: `/api/data/${collection}${id ? `/${id}` : ""}` }).then((resp) => {
+    return this.api.request({ url: `/api/data/${collection.replaceAll(/(^\/|\/$)/g, "")}/${id ?? ""}` }).then((resp) => {
       this.emit("read", collection, resp);
       return resp;
     });
@@ -1183,7 +1186,7 @@ class Data extends _ {
   update(collection, document2, append = true) {
     if (!document2._id) return this.create(collection, document2);
     return this.api.request({
-      url: `/api/data/${collection}/${document2._id}`,
+      url: `/api/data/${collection.replaceAll(/(^\/|\/$)/g, "")}/${document2._id}`,
       method: append ? "PATCH" : "PUT",
       body: document2
     }).then((resp) => {
@@ -1193,16 +1196,28 @@ class Data extends _ {
   }
   delete(collection, id) {
     return this.api.request({
-      url: `/api/data/${collection}/${id}`,
+      url: `/api/data/${collection.replaceAll(/(^\/|\/$)/g, "")}/${id}`,
       method: "DELETE"
     }).then(() => this.emit("delete", collection, id));
   }
   raw(collection, query) {
-    return this.api.request({ url: `/api/data/${collection}`, body: query }).then((resp) => {
+    return this.api.request({ url: `/api/data/${collection.replaceAll(/(^\/|\/$)/g, "")}`, body: query }).then((resp) => {
       this.emit("raw", collection, query, resp);
       return resp;
     });
   }
+  deleteSchema(collection) {
+    return this.api.request({ url: `/api/data/schema/${collection.replaceAll(/(^\/|\/$)/g, "")}`, method: "DELETE" });
+  }
+  getSchema(pathOrTree) {
+    let url = "/api/data/schema";
+    if (typeof pathOrTree == "string") url += `/${pathOrTree.replaceAll(/(^\/|\/$)/g, "")}`;
+    else if (typeof pathOrTree == "boolean") url += `?tree=${pathOrTree}`;
+    return this.api.request({ url });
+  }
+  setSchema(schema) {
+    return this.api.request({ url: `/api/data/schema/${schema.path.replaceAll(/(^\/|\/$)/g, "")}`, body: schema });
+  }
 }
 class Email extends _ {
   constructor(api) {
@@ -1601,7 +1616,7 @@ class Settings extends _ {
     this.api = typeof api == "string" ? new Api(api) : api;
   }
   async all(detailed = false, reload) {
-    if (!detailed && this.cache.complete && !reload) return this.cache;
+    if (!reload && !detailed && this.cache.complete) return this.cache;
     return this.api.request({ url: `/api/settings` + (detailed ? "?detailed" : "") }).then((resp) => {
       Object.entries(resp).forEach(([key, value]) => this.cache.set(key, detailed ? value.value : value));
       this.cache.complete = true;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/momentum",
-	"version": "0.41.0",
+	"version": "0.42.0",
 	"description": "Client library for momentum",
 	"keywords": ["Momentum"],
 	"author": "Zak Timson <zaktimson@gmail.com>",
@@ -24,7 +24,7 @@
 		"postbuild": "node -e \"const fs=require('fs');fs.cpSync('dist/index.mjs','../server/public/momentum.mjs');fs.cpSync('dist/index.cjs','../server/public/momentum.js')\""
 	},
 	"dependencies": {
-		"@ztimson/utils": "0.17.0"
+		"@ztimson/utils": "0.17.1"
 	},
 	"devDependencies": {
 		"@types/node": "^22.5.4",