sveltedfire 0.1.3 → 0.1.5

package/dist/index.d.ts

@@ -9,6 +9,7 @@ export { kindlyFetchDoc } from './sveltedfire/utilities/kindlyFetchDoc.js';
 export { kindlyFetchDocs } from './sveltedfire/utilities/kindlyFetchDocs.js';
 export { type AuthSig } from './sveltedfire/auth/AuthSig.js';
 export { getAuthContext } from './sveltedfire/auth/getAuthContext.js';
+export { handleForm } from './sveltedfire/utilities/handleForm.js';
 import SignedIn from './sveltedfire/components/SignedIn.svelte';
 import SignedOut from './sveltedfire/components/SignedOut.svelte';
 import SveltedAuth from "./sveltedfire/components/SveltedAuth.svelte";

package/dist/index.js

@@ -10,6 +10,7 @@ export { kindlyFetchDoc } from './sveltedfire/utilities/kindlyFetchDoc.js';
 export { kindlyFetchDocs } from './sveltedfire/utilities/kindlyFetchDocs.js';
 export {} from './sveltedfire/auth/AuthSig.js';
 export { getAuthContext } from './sveltedfire/auth/getAuthContext.js';
+export { handleForm } from './sveltedfire/utilities/handleForm.js';
 import SignedIn from './sveltedfire/components/SignedIn.svelte';
 import SignedOut from './sveltedfire/components/SignedOut.svelte';
 import SveltedAuth from "./sveltedfire/components/SveltedAuth.svelte";

package/dist/sveltedfire/auth/getAuthContext.d.ts

@@ -1 +1,2 @@
-export declare const getAuthContext: () => unknown;
+import { type AuthSig } from "./AuthSig.js";
+export declare const getAuthContext: () => AuthSig;

package/dist/sveltedfire/auth/getAuthContext.js

@@ -1,3 +1,4 @@
 import { getContext } from "svelte";
 import { AUTH_CONTEXT_NAME } from '../constants.js';
+import {} from "./AuthSig.js";
 export const getAuthContext = () => getContext(AUTH_CONTEXT_NAME);

package/dist/sveltedfire/components/FireForm.svelte

@@ -1,52 +1,9 @@
 <script lang="ts">
-  import { getFirestore, collection, doc, getDoc, updateDoc, setDoc, addDoc, deleteField } from "firebase/firestore"
+	import { handleForm } from "../utilities/handleForm.js";
 
   let { collectionName, docId = null, docIdField = null, onSubmit, children, beforeSubmit = null, ...rest } = $props()
-  const db = getFirestore()
-
-  const submitTheForm = async (ev: SubmitEvent) => {
-    console.log('Attempting to save')
-    ev.preventDefault()
-    const formData = new FormData(ev.target as HTMLFormElement)
-    let col = collection(db, collectionName)
-    let objData = Object.fromEntries(formData.entries())
-    if (beforeSubmit) {
-      objData = beforeSubmit(objData, ev)
-    }
-    Object.keys(objData).forEach(k => {
-      if (objData[k] === '_deleteme_') {
-        if (!k.match(/\[/)) {
-          objData[k] = deleteField()
-        }
-      }
-      let matcher = k.match(/^(.*)\[(.*)\]$/)
-      if (matcher) {
-        if (!(matcher[1] in objData)) {
-          objData[matcher[1]] = []
-        }
-        if (objData[k] === '_deleteme_') {
-          console.log('Deletion override')
-          objData[matcher[1]] = deleteField()
-        } else {
-          objData[matcher[1]][parseInt(matcher[2], 10)] = objData[k]
-        }
-        delete objData[k]
-      }
-    })
-    console.log('Object data is', objData)
-    let docRefId
-    if (docId) {
-      await updateDoc(doc(col, docId), objData)
-      docRefId = docId
-    } else if (docIdField) {
-      await updateDoc(doc(col, formData.get(docIdField) as string), objData)
-      docRefId = formData.get(docIdField) as string
-    } else {
-      let docRef = await addDoc(col, objData)
-      docRefId = docRef.id
-    }
-    onSubmit(docRefId)
-  }
+  
+  const submitTheForm = handleForm({ collectionName, docId, docIdField, onSubmit, beforeSubmit })
 </script>
 
 <form onsubmit={submitTheForm} {...rest}>

package/dist/sveltedfire/components/SveltedAuth.svelte

@@ -11,7 +11,7 @@
   let additionalKeys: {[k: string]: any} = {}
   Object.keys(rest).forEach(k => {
     if (k.startsWith('extra_')) {
-      const actualKey = k.replace('^extra_', '')
+      const actualKey = k.replace(new RegExp('^extra_'), '')
       additionalKeys[actualKey] = k
     }
   })

package/dist/sveltedfire/utilities/handleForm.d.ts

@@ -0,0 +1,7 @@
+export declare const handleForm: ({ collectionName, docId, docIdField, onSubmit, beforeSubmit }: {
+    collectionName: string;
+    docId: null | string;
+    docIdField: null | string;
+    onSubmit: any;
+    beforeSubmit: any;
+}) => (ev: SubmitEvent) => Promise<void>;

package/dist/sveltedfire/utilities/handleForm.js

@@ -0,0 +1,48 @@
+import { getFirestore, collection, doc, getDoc, updateDoc, setDoc, addDoc, deleteField } from "firebase/firestore";
+export const handleForm = ({ collectionName, docId = null, docIdField = null, onSubmit, beforeSubmit = null }) => async (ev) => {
+    const db = getFirestore();
+    console.log('Attempting to save');
+    ev.preventDefault();
+    const formData = new FormData(ev.target);
+    let col = collection(db, collectionName);
+    let objData = Object.fromEntries(formData.entries());
+    if (beforeSubmit) {
+        objData = beforeSubmit(objData, ev);
+    }
+    Object.keys(objData).forEach(k => {
+        if (objData[k] === '_deleteme_') {
+            if (!k.match(/\[/)) {
+                objData[k] = deleteField();
+            }
+        }
+        let matcher = k.match(/^(.*)\[(.*)\]$/);
+        if (matcher) {
+            if (!(matcher[1] in objData)) {
+                objData[matcher[1]] = [];
+            }
+            if (objData[k] === '_deleteme_') {
+                console.log('Deletion override');
+                objData[matcher[1]] = deleteField();
+            }
+            else {
+                objData[matcher[1]][parseInt(matcher[2], 10)] = objData[k];
+            }
+            delete objData[k];
+        }
+    });
+    console.log('Object data is', objData);
+    let docRefId;
+    if (docId) {
+        await updateDoc(doc(col, docId), objData);
+        docRefId = docId;
+    }
+    else if (docIdField) {
+        await updateDoc(doc(col, formData.get(docIdField)), objData);
+        docRefId = formData.get(docIdField);
+    }
+    else {
+        let docRef = await addDoc(col, objData);
+        docRefId = docRef.id;
+    }
+    onSubmit(docRefId);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sveltedfire",
-	"version": "0.1.3",
+	"version": "0.1.5",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build && npm run prepack",