@basictech/react 0.2.0-beta.8 → 0.2.0

package/.turbo/turbo-build.log

@@ -1,6 +1,6 @@
 
 
-> @basictech/react@0.2.0-beta.7 build
+> @basictech/react@0.2.0-beta.11 build
 > tsup
 
 CLI Building entry: src/index.ts
@@ -11,13 +11,13 @@
 CLI Cleaning output folder
 CJS Build start
 ESM Build start
-CJS dist/index.js     22.22 KB
-CJS dist/index.js.map 45.33 KB
-CJS ⚡️ Build success in 14ms
-ESM dist/index.mjs     19.99 KB
-ESM dist/index.mjs.map 45.28 KB
-ESM ⚡️ Build success in 14ms
+CJS dist/index.js     24.60 KB
+CJS dist/index.js.map 51.73 KB
+CJS ⚡️ Build success in 13ms
+ESM dist/index.mjs     22.39 KB
+ESM dist/index.mjs.map 51.69 KB
+ESM ⚡️ Build success in 13ms
 DTS Build start
-DTS ⚡️ Build success in 934ms
-DTS dist/index.d.ts  1003.00 B
-DTS dist/index.d.mts 1003.00 B
+DTS ⚡️ Build success in 1177ms
+DTS dist/index.d.ts  1006.00 B
+DTS dist/index.d.mts 1006.00 B

package/changelog.md

@@ -1,5 +1,65 @@
 # 1.3.4
 
+## 0.2.0
+
+### Minor Changes
+
+- 5890f4c: changed isLoaded to isAuthReady and fixed dbStatus hooks for useBasic
+- ba294c5: dependency updates
+- cd827af: add schema validation
+- 1a3fe80: schema validation bugfix
+- 13594a9: added basic-sync
+- ba294c5: dependency update
+- f035281: remove sync lib
+- 4841960: rebuild tsup
+- 96e0156: update schema validation
+- cda3d16: add schema validation
+- 2c898ae: update useQuery hook
+
+  - no need to pass param as a function, can now enter query directly
+  - defaults to empty array when loading
+
+- 90ccdd7: add debug option
+- 4841960: test build
+- f035281: remove sync library
+- ef528e9: added schema package - test
+
+### Patch Changes
+
+- 3c7b34e: version changes mostly
+- c085672: reset versions
+- Updated dependencies [96e0156]
+- Updated dependencies [ef528e9]
+  - @basictech/schema@0.1.0
+
+## 0.2.0-beta.11
+
+### Minor Changes
+
+- update schema validation
+
+### Patch Changes
+
+- Updated dependencies
+  - @basictech/schema@0.1.0-beta.1
+
+## 0.2.0-beta.10
+
+### Minor Changes
+
+- added schema package - test
+
+### Patch Changes
+
+- Updated dependencies
+  - @basictech/schema@0.1.0-beta.0
+
+## 0.2.0-beta.9
+
+### Minor Changes
+
+- add schema validation
+
 ## 0.2.0-beta.8
 
 ### Minor Changes

package/dist/index.d.mts

@@ -1,5 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import React from 'react';
+export { useLiveQuery as useQuery } from 'dexie-react-hooks';
 
 declare enum DBStatus {
     LOADING = "LOADING",
@@ -37,6 +38,4 @@ declare function useBasic(): {
     dbStatus: DBStatus;
 };
 
-declare function useQuery(queryable: any): any;
-
-export { BasicProvider, useBasic, useQuery };
+export { BasicProvider, useBasic };

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import React from 'react';
+export { useLiveQuery as useQuery } from 'dexie-react-hooks';
 
 declare enum DBStatus {
     LOADING = "LOADING",
@@ -37,6 +38,4 @@ declare function useBasic(): {
     dbStatus: DBStatus;
 };
 
-declare function useQuery(queryable: any): any;
-
-export { BasicProvider, useBasic, useQuery };
+export { BasicProvider, useBasic };

package/dist/index.js

@@ -32,7 +32,7 @@ var src_exports = {};
 __export(src_exports, {
   BasicProvider: () => BasicProvider,
   useBasic: () => useBasic,
-  useQuery: () => useQuery
+  useQuery: () => import_dexie_react_hooks.useLiveQuery
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -50,8 +50,7 @@ var import_dexie_observable = require("dexie-observable");
 var import_dexie = require("dexie");
 
 // src/config.ts
-var import_ajv = __toESM(require("ajv"));
-var SERVER_URL = "http://localhost:3000";
+var SERVER_URL = "https://api.basic.tech";
 var log = (...args) => {
   try {
     if (localStorage.getItem("basic_debug") === "true") {
@@ -60,65 +59,6 @@ var log = (...args) => {
   } catch (e) {
   }
 };
-var basicJsonSchema = {
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "properties": {
-    "project_id": {
-      "type": "string"
-    },
-    "namespace": {
-      "type": "string"
-    },
-    "version": {
-      "type": "integer",
-      "minimum": 0
-    },
-    "tables": {
-      "type": "object",
-      "patternProperties": {
-        "^[a-zA-Z0-9_]+$": {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string"
-            },
-            "type": {
-              "type": "string",
-              "enum": ["collection"]
-            },
-            "fields": {
-              "type": "object",
-              "patternProperties": {
-                "^[a-zA-Z0-9_]+$": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "string"
-                    },
-                    "primary": {
-                      "type": "boolean"
-                    },
-                    "indexed": {
-                      "type": "boolean"
-                    }
-                  },
-                  "required": ["type"]
-                }
-              },
-              "additionalProperties": true
-            }
-          },
-          "required": ["fields"]
-        }
-      },
-      "additionalProperties": true
-    }
-  },
-  "required": ["project_id", "version", "tables"]
-};
-var ajv = new import_ajv.default();
-var validator = ajv.compile(basicJsonSchema);
 
 // src/sync/syncProtocol.js
 var syncProtocol = function() {
@@ -223,6 +163,115 @@ var syncProtocol = function() {
   });
 };
 
+// src/schema.ts
+var import_ajv = __toESM(require("ajv"));
+var basicJsonSchema = {
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "properties": {
+    "project_id": {
+      "type": "string"
+    },
+    "namespace": {
+      "type": "string"
+    },
+    "version": {
+      "type": "integer",
+      "minimum": 0
+    },
+    "tables": {
+      "type": "object",
+      "patternProperties": {
+        "^[a-zA-Z0-9_]+$": {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "type": {
+              "type": "string",
+              "enum": ["collection"]
+            },
+            "fields": {
+              "type": "object",
+              "patternProperties": {
+                "^[a-zA-Z0-9_]+$": {
+                  "type": "object",
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": ["string", "boolean", "number", "json"]
+                    },
+                    "indexed": {
+                      "type": "boolean"
+                    },
+                    "required": {
+                      "type": "boolean"
+                    }
+                  },
+                  "required": ["type"]
+                }
+              },
+              "additionalProperties": true
+            }
+          },
+          "required": ["fields"]
+        }
+      },
+      "additionalProperties": true
+    }
+  },
+  "required": ["project_id", "version", "tables"]
+};
+var ajv = new import_ajv.default();
+var validator = ajv.compile(basicJsonSchema);
+function validateSchema(schema) {
+  const v = validator(schema);
+  return {
+    valid: v,
+    errors: validator.errors || []
+  };
+}
+function validateData(schema, table, data, checkRequired = true) {
+  const valid = validateSchema(schema);
+  if (!valid.valid) {
+    return { valid: false, errors: valid.errors, message: "Schema is invalid" };
+  }
+  const tableSchema = schema.tables[table];
+  if (!tableSchema) {
+    return { valid: false, errors: [{ message: `Table ${table} not found in schema` }], message: "Table not found" };
+  }
+  for (const [fieldName, fieldValue] of Object.entries(data)) {
+    const fieldSchema = tableSchema.fields[fieldName];
+    if (!fieldSchema) {
+      return {
+        valid: false,
+        errors: [{ message: `Field ${fieldName} not found in schema` }],
+        message: "Invalid field"
+      };
+    }
+    const schemaType = fieldSchema.type;
+    const valueType = typeof fieldValue;
+    if (schemaType === "string" && valueType !== "string" || schemaType === "number" && valueType !== "number" || schemaType === "boolean" && valueType !== "boolean" || schemaType === "json" && valueType !== "object") {
+      return {
+        valid: false,
+        errors: [{
+          message: `Field ${fieldName} should be type ${schemaType}, got ${valueType}`
+        }],
+        message: "invalid type"
+      };
+    }
+  }
+  if (checkRequired) {
+    for (const [fieldName, fieldSchema] of Object.entries(tableSchema.fields)) {
+      if (fieldSchema.required && !data[fieldName]) {
+        return { valid: false, errors: [{ message: `Field ${fieldName} is required` }], message: "Required field missing" };
+      }
+    }
+  }
+  return { valid: true, errors: [] };
+}
+
 // src/sync/index.ts
 syncProtocol();
 var BasicSync = class extends import_dexie2.Dexie {
@@ -240,6 +289,10 @@ var BasicSync = class extends import_dexie2.Dexie {
     log("Starting connection...");
     return this.syncable.connect("websocket", WS_URL, { authToken: access_token });
   }
+  async disconnect() {
+    const WS_URL = `${SERVER_URL}/ws`;
+    return this.syncable.disconnect(WS_URL);
+  }
   async updateSyncNodes() {
     try {
       const syncNodes = await this.table("_syncNodes").toArray();
@@ -290,19 +343,33 @@ var BasicSync = class extends import_dexie2.Dexie {
       ref: this.table(name),
       // --- WRITE ---- // 
       add: (data) => {
-        log("Adding data to", name, data);
+        const valid = validateData(this.basic_schema, name, data);
+        if (!valid.valid) {
+          log("Invalid data", valid);
+          return Promise.reject({ ...valid });
+        }
         return this.table(name).add({
           id: (0, import_uuid.v7)(),
           ...data
         });
       },
       put: (data) => {
+        const valid = validateData(this.basic_schema, name, data);
+        if (!valid.valid) {
+          log("Invalid data", valid);
+          return Promise.reject({ ...valid });
+        }
         return this.table(name).put({
           id: (0, import_uuid.v7)(),
           ...data
         });
       },
       update: (id, data) => {
+        const valid = validateData(this.basic_schema, name, data, false);
+        if (!valid.valid) {
+          log("Invalid data", valid);
+          return Promise.reject({ ...valid });
+        }
         return this.table(name).update(id, data);
       },
       delete: (id) => {
@@ -370,6 +437,7 @@ async function deleteRecord({ projectId, accountId, tableName, id, token }) {
 }
 
 // src/AuthContext.tsx
+var import_schema2 = require("@basictech/schema");
 var import_jsx_runtime = require("react/jsx-runtime");
 var BasicContext = (0, import_react.createContext)({
   unicorn: "\u{1F984}",
@@ -414,11 +482,12 @@ function BasicProvider({ children, project_id, schema, debug = false }) {
   const syncRef = (0, import_react.useRef)(null);
   (0, import_react.useEffect)(() => {
     function initDb() {
-      if (!validator(schema)) {
-        log("Basic Schema is invalid!", validator.errors);
+      const valid = (0, import_schema2.validateSchema)(schema);
+      if (!valid.valid) {
+        log("Basic Schema is invalid!", valid.errors);
         console.group("Schema Errors");
         let errorMessage = "";
-        validator.errors.forEach((error2, index) => {
+        valid.errors.forEach((error2, index) => {
           log(`${index + 1}:`, error2.message, ` - at ${error2.instancePath}`);
           errorMessage += `${index + 1}: ${error2.message} - at ${error2.instancePath}
 `;
@@ -461,10 +530,10 @@ function BasicProvider({ children, project_id, schema, debug = false }) {
     });
   };
   (0, import_react.useEffect)(() => {
-    if (token && syncRef.current) {
+    if (token && syncRef.current && isSignedIn && isSignedIn) {
       connectToDb();
     }
-  }, [token]);
+  }, [isSignedIn]);
   const getSignInLink = () => {
     log("getting sign in link...");
     const randomState = Math.random().toString(36).substring(6);
@@ -489,6 +558,9 @@ function BasicProvider({ children, project_id, schema, debug = false }) {
     setToken(null);
     document.cookie = `basic_token=; Secure; SameSite=Strict`;
     localStorage.removeItem("basic_auth_state");
+    if (syncRef.current) {
+      syncRef.current.disconnect();
+    }
   };
   const getToken = async () => {
     log("getting token...");
@@ -678,14 +750,6 @@ function useBasic() {
 
 // src/index.ts
 var import_dexie_react_hooks = require("dexie-react-hooks");
-function useQuery(queryable) {
-  return (0, import_dexie_react_hooks.useLiveQuery)(() => {
-    if (typeof queryable === "function") {
-      return queryable();
-    }
-    return queryable;
-  }, [queryable], []);
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BasicProvider,