sveltedfire 0.1.27 → 0.1.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
<script lang="ts">
|
|
2
2
|
import { handleForm } from "../utilities/handleForm.js";
|
|
3
3
|
|
|
4
|
-
let { collectionName, docId = null, docIdField = null, onSubmit, children, beforeSubmit = null, formRef = $bindable(), forceNew = false, ...rest } = $props()
|
|
4
|
+
let { collectionName, docId = null, docIdField = null, onSubmit, children, beforeSubmit = null, formRef = $bindable(), forceNew = false, useDottedNotation = false, ...rest } = $props()
|
|
5
5
|
|
|
6
|
-
const submitTheForm = handleForm({ collectionName, docId, docIdField, onSubmit, beforeSubmit, forceNew })
|
|
6
|
+
const submitTheForm = handleForm({ collectionName, docId, docIdField, onSubmit, beforeSubmit, forceNew, useDottedNotation })
|
|
7
7
|
</script>
|
|
8
8
|
|
|
9
9
|
<form onsubmit={submitTheForm} bind:this={formRef} {...rest}>
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
export declare const handleForm: ({ collectionName, docId, docIdField, onSubmit, beforeSubmit, forceNew }: {
|
|
1
|
+
export declare const handleForm: ({ collectionName, docId, docIdField, onSubmit, beforeSubmit, forceNew, useDottedNotation }: {
|
|
2
2
|
collectionName: string;
|
|
3
3
|
docId?: null | string;
|
|
4
4
|
docIdField?: null | string;
|
|
5
5
|
onSubmit: any;
|
|
6
6
|
beforeSubmit?: any;
|
|
7
7
|
forceNew?: boolean;
|
|
8
|
+
useDottedNotation?: boolean;
|
|
8
9
|
}) => (ev: SubmitEvent) => Promise<void>;
|
|
@@ -1,13 +1,62 @@
|
|
|
1
1
|
import { getFirestore, collection, doc, getDoc, updateDoc, setDoc, addDoc, deleteField } from "firebase/firestore";
|
|
2
|
-
|
|
2
|
+
const isLiteralObject = (a) => (!!a) && (a.constructor === Object);
|
|
3
|
+
const cleanArrays = (obj) => {
|
|
4
|
+
if (Array.isArray(obj)) {
|
|
5
|
+
return obj.filter(k => JSON.stringify(k) !== JSON.stringify(deleteField())); // Raw comparison does not work
|
|
6
|
+
}
|
|
7
|
+
else {
|
|
8
|
+
if (isLiteralObject(obj)) {
|
|
9
|
+
Object.keys(obj).forEach(k => {
|
|
10
|
+
obj[k] = cleanArrays(obj[k]);
|
|
11
|
+
});
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
return obj;
|
|
15
|
+
};
|
|
16
|
+
const convertToDotted = (data) => {
|
|
17
|
+
let assembler = {};
|
|
18
|
+
Object.keys(data).forEach(k => {
|
|
19
|
+
if (isLiteralObject(data[k])) {
|
|
20
|
+
let subdata = convertToDotted(data[k]);
|
|
21
|
+
Object.keys(subdata).forEach(j => {
|
|
22
|
+
assembler[`${k}.${j}`] = subdata[j];
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
else if (Array.isArray(data[k])) {
|
|
26
|
+
data[k].forEach((val, idx) => {
|
|
27
|
+
if (isLiteralObject(val)) {
|
|
28
|
+
let subdata = convertToDotted(val);
|
|
29
|
+
Object.keys(subdata).forEach(j => {
|
|
30
|
+
assembler[`${k}.${idx}.${j}`] = subdata[j];
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
assembler[`${k}.${idx}`] = val;
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
assembler[k] = data[k];
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
return assembler;
|
|
43
|
+
};
|
|
44
|
+
export const handleForm = ({ collectionName, docId = null, docIdField = null, onSubmit, beforeSubmit = null, forceNew = false, useDottedNotation = false }) => async (ev) => {
|
|
3
45
|
const db = getFirestore();
|
|
4
46
|
console.log('Attempting to save');
|
|
5
47
|
ev.preventDefault();
|
|
6
48
|
const formData = new FormData(ev.target);
|
|
7
49
|
let col = collection(db, collectionName);
|
|
8
50
|
let objData = Object.fromEntries(formData.entries());
|
|
51
|
+
let actualDocId = '';
|
|
52
|
+
if (docId) {
|
|
53
|
+
actualDocId = docId;
|
|
54
|
+
}
|
|
55
|
+
if (docIdField) {
|
|
56
|
+
actualDocId = formData.get(docIdField);
|
|
57
|
+
}
|
|
9
58
|
if (beforeSubmit) {
|
|
10
|
-
objData = await beforeSubmit(objData, ev);
|
|
59
|
+
[objData, actualDocId] = await beforeSubmit(objData, actualDocId, ev);
|
|
11
60
|
}
|
|
12
61
|
Object.keys(objData).forEach(k => {
|
|
13
62
|
if (objData[k] === '_deleteme_') {
|
|
@@ -52,40 +101,20 @@ export const handleForm = ({ collectionName, docId = null, docIdField = null, on
|
|
|
52
101
|
delete objData[k];
|
|
53
102
|
}
|
|
54
103
|
});
|
|
55
|
-
const isLiteralObject = (a) => (!!a) && (a.constructor === Object);
|
|
56
|
-
const cleanArrays = (obj) => {
|
|
57
|
-
if (Array.isArray(obj)) {
|
|
58
|
-
return obj.filter(k => JSON.stringify(k) !== JSON.stringify(deleteField())); // Raw comparison does not work
|
|
59
|
-
}
|
|
60
|
-
else {
|
|
61
|
-
if (isLiteralObject(obj)) {
|
|
62
|
-
Object.keys(obj).forEach(k => {
|
|
63
|
-
obj[k] = cleanArrays(obj[k]);
|
|
64
|
-
});
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
return obj;
|
|
68
|
-
};
|
|
69
104
|
objData = cleanArrays(objData);
|
|
105
|
+
if (useDottedNotation) {
|
|
106
|
+
objData = convertToDotted(objData);
|
|
107
|
+
}
|
|
70
108
|
console.log('Object data is', objData);
|
|
71
109
|
let docRefId;
|
|
72
|
-
if (docId) {
|
|
73
|
-
if (forceNew) {
|
|
74
|
-
await setDoc(doc(col, docId), objData);
|
|
75
|
-
}
|
|
76
|
-
else {
|
|
77
|
-
await updateDoc(doc(col, docId), objData);
|
|
78
|
-
}
|
|
79
|
-
docRefId = docId;
|
|
80
|
-
}
|
|
81
|
-
else if (docIdField) {
|
|
110
|
+
if (docId || docIdField) {
|
|
82
111
|
if (forceNew) {
|
|
83
|
-
await setDoc(doc(col,
|
|
112
|
+
await setDoc(doc(col, actualDocId), objData);
|
|
84
113
|
}
|
|
85
114
|
else {
|
|
86
|
-
await updateDoc(doc(col,
|
|
115
|
+
await updateDoc(doc(col, actualDocId), objData);
|
|
87
116
|
}
|
|
88
|
-
docRefId =
|
|
117
|
+
docRefId = actualDocId;
|
|
89
118
|
}
|
|
90
119
|
else {
|
|
91
120
|
let docRef = await addDoc(col, objData);
|