@bagelink/vue 0.0.953 → 0.0.957

package/dist/components/form/BglField.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BglField.vue.d.ts","sourceRoot":"","sources":["../../../src/components/form/BglField.vue"],"names":[],"mappings":"AAsHA,OAAO,EAGN,KAAK,KAAK,EAQV,MAAM,eAAe,CAAA;yBAGL,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,eAChC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAClD,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,iBAC5F,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;WA2KxD,mBAAmB,CAAC;;;;;eAvKrB,KAAK,CAAC,CAAC,CAAC;oBACH;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE;KAsKmD,CAAC,4BAA2B;oBAChG,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;;;;;YAK+B,OAAO,CAAC,OAAO,WAAW,CAAC;;AArLvE,wBAqL4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}
+{"version":3,"file":"BglField.vue.d.ts","sourceRoot":"","sources":["../../../src/components/form/BglField.vue"],"names":[],"mappings":"AAkJA,OAAO,EAGN,KAAK,KAAK,EAQV,MAAM,eAAe,CAAA;yBAGL,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,eAChC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,cAClD,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,iBAC5F,WAAW,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;WAuMxD,mBAAmB,CAAC;;;;;eAnMrB,KAAK,CAAC,CAAC,CAAC;oBACH;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE;KAkMmD,CAAC,4BAA2B;oBAChG,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;;;;;YAK+B,OAAO,CAAC,OAAO,WAAW,CAAC;;AAjNvE,wBAiN4E;AAC5E,KAAK,mBAAmB,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}

package/dist/components/form/inputs/FileUpload.vue.d.ts

@@ -1,7 +1,28 @@
 import { StorageFile } from '../../..';
 type StrKey = keyof StorageFile;
 type FSValue = string[] | string | number;
+declare let __VLS_typeProps: {
+    label?: string;
+    multiple?: boolean;
+    files?: StorageFile | StorageFile[];
+    bindkey?: StrKey;
+    modelValue?: FSValue;
+    width?: string;
+    height?: string | 'auto';
+    topic?: string;
+    fill?: boolean;
+    oval?: boolean;
+    theme?: 'dropzone' | 'basic';
+    accept?: string;
+    required?: boolean;
+};
 declare function browse(): void;
+declare const __VLS_defaults: {
+    modelValue: () => FSValue;
+};
+type __VLS_PublicProps = {
+    'modelValue'?: typeof __VLS_defaults['modelValue'];
+} & typeof __VLS_typeProps;
 declare function __VLS_template(): {
     slots: {
         files?(_: {
@@ -72,38 +93,10 @@ declare function __VLS_template(): {
     attrs: Partial<{}>;
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import('vue').DefineComponent<{
-    label?: string;
-    multiple?: boolean;
-    files?: StorageFile | StorageFile[];
-    bindkey?: StrKey;
-    modelValue?: FSValue;
-    width?: string;
-    height?: string | "auto";
-    topic?: string;
-    fill?: boolean;
-    oval?: boolean;
-    theme?: "dropzone" | "basic";
-    accept?: string;
-    required?: boolean;
-}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+declare const __VLS_component: import('vue').DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     "update:modelValue": (...args: any[]) => void;
     addFileStart: (...args: any[]) => void;
-}, string, import('vue').PublicProps, Readonly<{
-    label?: string;
-    multiple?: boolean;
-    files?: StorageFile | StorageFile[];
-    bindkey?: StrKey;
-    modelValue?: FSValue;
-    width?: string;
-    height?: string | "auto";
-    topic?: string;
-    fill?: boolean;
-    oval?: boolean;
-    theme?: "dropzone" | "basic";
-    accept?: string;
-    required?: boolean;
-}> & Readonly<{
+}, string, import('vue').PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     onAddFileStart?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;

package/dist/components/form/inputs/FileUpload.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileUpload.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/form/inputs/FileUpload.vue"],"names":[],"mappings":"AA4lBA,OAAO,EAAmC,KAAK,WAAW,EAAkB,MAAM,eAAe,CAAA;AAKjG,KAAK,MAAM,GAAG,MAAM,WAAW,CAAA;AAE/B,KAAK,OAAO,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,CAAA;AA0JzC,iBAAS,MAAM,SAiBd;AA6BD,iBAAS,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;0BA7KZ,MAAM;4BACJ,OAAO;uBACZ,MAAM;2BACF,OAAO;;YAiqBS,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;0BApqBpB,MAAM;4BACJ,OAAO;uBACZ,MAAM;2BACF,OAAO;;;YAkqBgB,GAAG;;;WASxB,OAAO,IAA6B;EAEjD;AAuBD,KAAK,oBAAoB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAC9D,QAAA,MAAM,eAAe;YAhuBZ,MAAM;eACH,OAAO;YACV,WAAW,GAAG,WAAW,EAAE;cACzB,MAAM;iBACH,OAAO;YACZ,MAAM;aACL,MAAM,GAAG,MAAM;YAChB,MAAM;WACP,OAAO;WACP,OAAO;YACN,UAAU,GAAG,OAAO;aACnB,MAAM;eACJ,OAAO;;;;;YAZV,MAAM;eACH,OAAO;YACV,WAAW,GAAG,WAAW,EAAE;cACzB,MAAM;iBACH,OAAO;YACZ,MAAM;aACL,MAAM,GAAG,MAAM;YAChB,MAAM;WACP,OAAO;WACP,OAAO;YACN,UAAU,GAAG,OAAO;aACnB,MAAM;eACJ,OAAO;;;;kFA2tBjB,CAAC;wBACkB,uBAAuB,CAAC,OAAO,eAAe,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAAnG,wBAAoG;AAWpG,KAAK,uBAAuB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IACxC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KAEV,CAAA;CACD,CAAC"}
+{"version":3,"file":"FileUpload.vue.d.ts","sourceRoot":"","sources":["../../../../src/components/form/inputs/FileUpload.vue"],"names":[],"mappings":"AAomBA,OAAO,EAAmC,KAAK,WAAW,EAAkB,MAAM,eAAe,CAAA;AAKjG,KAAK,MAAM,GAAG,MAAM,WAAW,CAAA;AAE/B,KAAK,OAAO,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,MAAM,CAAA;AAEzC,QAAA,IAAI,eAAe,EAAG;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,KAAK,CAAC,EAAE,WAAW,GAAG,WAAW,EAAE,CAAA;IACnC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAA;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,OAAO,CAAA;CAClB,CAAC;AAkJF,iBAAS,MAAM,SAiBd;AA+BD,QAAA,MAAM,cAAc;sBACI,OAAO;CAC9B,CAAC;AACF,KAAK,iBAAiB,GAAG;IACzB,YAAY,CAAC,EAAE,OAAO,cAAc,CAAC,YAAY,CAAC,CAAC;CAClD,GAAG,OAAO,eAAe,CAAC;AAI3B,iBAAS,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAhMZ,MAAM;4BACJ,OAAO;uBACZ,MAAM;2BACF,OAAO;;YAorBS,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;0BAvrBpB,MAAM;4BACJ,OAAO;uBACZ,MAAM;2BACF,OAAO;;;YAqrBgB,GAAG;;;WASxB,OAAO,IAA6B;EAEjD;AA0BD,KAAK,oBAAoB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AAC9D,QAAA,MAAM,eAAe;;;;;;kFAUnB,CAAC;wBACkB,uBAAuB,CAAC,OAAO,eAAe,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAAnG,wBAAoG;AAWpG,KAAK,uBAAuB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG;IACxC,QAAO;QACN,MAAM,EAAE,CAAC,CAAC;KAEV,CAAA;CACD,CAAC"}

package/dist/index.cjs

@@ -9623,15 +9623,40 @@ const _sfc_main$L = /* @__PURE__ */ vue.defineComponent({
         emit2("update:modelValue", val);
       }
     });
+    const objPathRegex = /[.\][]/;
+    function setFieldData(key, val) {
+      const data2 = { ...props2.modelValue };
+      const keys4 = key.split(objPathRegex);
+      let temp = data2;
+      for (let i2 = 0; i2 < keys4.length - 1; i2++) {
+        if (!temp[keys4[i2]]) {
+          temp[keys4[i2]] = {};
+        }
+        temp = temp[keys4[i2]];
+      }
+      temp[keys4[keys4.length - 1]] = val;
+      return data2;
+    }
+    function getFieldData(obj, key) {
+      const keys4 = key.split(objPathRegex);
+      let result2 = obj;
+      for (const k2 of keys4) {
+        if (result2 && k2 in result2) {
+          result2 = result2[k2];
+        } else {
+          return void 0;
+        }
+      }
+      return result2;
+    }
     const fieldData = vue.computed({
       set: (val) => {
         if (!props2.field.id) return;
-        const data2 = { ...props2.modelValue };
-        data2[props2.field.id] = val;
+        const data2 = setFieldData(props2.field.id, val);
         emit2("update:modelValue", data2);
       },
       get: () => {
-        if (props2.field.id) return props2.modelValue[props2.field.id];
+        if (props2.field.id) return getFieldData(props2.modelValue, props2.field.id);
         return props2.field.defaultValue ?? "";
       }
     });
@@ -18694,7 +18719,7 @@ const _hoisted_17 = ["src"];
 const _hoisted_18 = { class: "p-1 flex column hover fileUploadPlaceHolder justify-content-center mb-05" };
 const _sfc_main$D = /* @__PURE__ */ vue.defineComponent({
   __name: "FileUpload",
-  props: {
+  props: /* @__PURE__ */ vue.mergeModels({
     label: {},
     multiple: { type: Boolean },
     files: {},
@@ -18708,44 +18733,62 @@ const _sfc_main$D = /* @__PURE__ */ vue.defineComponent({
     theme: {},
     accept: {},
     required: { type: Boolean }
-  },
-  emits: ["update:modelValue", "addFileStart"],
+  }, {
+    "modelValue": { default: () => [] },
+    "modelModifiers": {}
+  }),
+  emits: /* @__PURE__ */ vue.mergeModels(["update:modelValue", "addFileStart"], ["update:modelValue"]),
   setup(__props, { emit: __emit }) {
     const props2 = __props;
     const emit2 = __emit;
     const bindKey2 = props2.bindkey || "id";
     const bagel = useBagel();
     const isImage = (str) => IMAGE_FORMATS_REGEXP.test(str);
-    let file_bindkeys = vue.ref(props2.modelValue || []);
+    const file_bindkeys = vue.useModel(__props, "modelValue");
     const storageFiles = vue.ref([]);
-    async function fetchFiles() {
+    async function fetchTopicFiles() {
       const files = await bagel.get(`/files?topic=${props2.topic}`);
       storageFiles.value.push(...files);
     }
-    vue.onMounted(() => {
-      if (props2.topic) fetchFiles();
-      if (!props2.files && [file_bindkeys.value].flat().length > 0) {
-        const ids = [file_bindkeys.value].flat().filter(Boolean);
-        if (!(ids == null ? void 0 : ids.length)) return;
-        if (bindKey2 === "url") {
-          ids.forEach((url) => {
-            storageFiles.value.push({ url });
-          });
-          return;
-        }
-        if (props2.multiple) {
-          ids.forEach((id) => {
-            void bagel.get(`/files/${id}`).then((file) => {
-              storageFiles.value.push(file);
-            }).catch(console.error);
-          });
-        } else {
-          void bagel.get(`/files/${ids[0]}`).then((file) => {
+    function loadFiles() {
+      const ids = [file_bindkeys.value].flat().filter(Boolean);
+      if (!ids.length) {
+        storageFiles.value.splice(0, storageFiles.value.length);
+        return;
+      }
+      const currentIds = storageFiles.value.map((file) => file[bindKey2]);
+      const idsToAdd = ids.filter((id) => !currentIds.includes(id));
+      const idsToRemove = currentIds.filter((id) => (typeof id === "string" || typeof id === "number") && !ids.includes(id));
+      idsToRemove.forEach((id) => {
+        const index2 = storageFiles.value.findIndex((file) => file[bindKey2] === id);
+        if (index2 !== -1) storageFiles.value.splice(index2, 1);
+      });
+      if (bindKey2 === "url") {
+        idsToAdd.forEach((url) => {
+          storageFiles.value.push({ url });
+        });
+        return;
+      }
+      if (props2.multiple) {
+        idsToAdd.forEach((id) => {
+          void bagel.get(`/files/${id}`).then((file) => {
             storageFiles.value.push(file);
           }).catch(console.error);
-        }
+        });
+      } else {
+        void bagel.get(`/files/${idsToAdd[0]}`).then((file) => {
+          storageFiles.value.push(file);
+        }).catch(console.error);
+      }
+    }
+    vue.onMounted(() => {
+      if (props2.topic) fetchTopicFiles();
+      if (!props2.files && [file_bindkeys.value].flat().length > 0) {
+        loadFiles();
       }
     });
+    vue.watch(() => props2.topic, fetchTopicFiles);
+    vue.watch(() => props2.modelValue, loadFiles);
     vue.watch(
       () => props2.files,
       (newFiles) => {
@@ -18762,17 +18805,6 @@ const _sfc_main$D = /* @__PURE__ */ vue.defineComponent({
     function compareLists(a2, b2) {
       return [a2].flat().every((id) => [b2].flat().includes(id)) && [b2].flat().every((id) => [a2].flat().includes(id));
     }
-    vue.watch(() => props2.modelValue, (newVal = []) => {
-      console.log(newVal, "newVal");
-      const isSame = compareLists(file_bindkeys.value, newVal);
-      if (!isSame) {
-        file_bindkeys.value = newVal;
-        for (const fle of storageFiles.value) {
-          const index2 = [file_bindkeys.value].flat().findIndex((key) => fle[bindKey2] === key);
-          if (index2 === -1) storageFiles.value.splice(index2, 1);
-        }
-      }
-    });
     function updateModelValue() {
       let idValue;
       if (props2.multiple) {
@@ -18783,7 +18815,6 @@ const _sfc_main$D = /* @__PURE__ */ vue.defineComponent({
       const isSame = compareLists(file_bindkeys.value, idValue);
       if (!isSame) {
         file_bindkeys.value = idValue;
-        emit2("update:modelValue", file_bindkeys.value);
       }
     }
     const fileQueue = vue.ref([]);
@@ -19102,7 +19133,7 @@ const _sfc_main$D = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const $el = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["__scopeId", "data-v-0dfbee23"]]);
+const $el = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["__scopeId", "data-v-30231b53"]]);
 const _hoisted_1$u = ["title"];
 const _hoisted_2$k = { key: 0 };
 const _hoisted_3$g = ["value", "placeholder"];

package/dist/index.mjs

@@ -9621,15 +9621,40 @@ const _sfc_main$L = /* @__PURE__ */ defineComponent({
         emit2("update:modelValue", val);
       }
     });
+    const objPathRegex = /[.\][]/;
+    function setFieldData(key, val) {
+      const data2 = { ...props2.modelValue };
+      const keys4 = key.split(objPathRegex);
+      let temp = data2;
+      for (let i2 = 0; i2 < keys4.length - 1; i2++) {
+        if (!temp[keys4[i2]]) {
+          temp[keys4[i2]] = {};
+        }
+        temp = temp[keys4[i2]];
+      }
+      temp[keys4[keys4.length - 1]] = val;
+      return data2;
+    }
+    function getFieldData(obj, key) {
+      const keys4 = key.split(objPathRegex);
+      let result2 = obj;
+      for (const k2 of keys4) {
+        if (result2 && k2 in result2) {
+          result2 = result2[k2];
+        } else {
+          return void 0;
+        }
+      }
+      return result2;
+    }
     const fieldData = computed({
       set: (val) => {
         if (!props2.field.id) return;
-        const data2 = { ...props2.modelValue };
-        data2[props2.field.id] = val;
+        const data2 = setFieldData(props2.field.id, val);
         emit2("update:modelValue", data2);
       },
       get: () => {
-        if (props2.field.id) return props2.modelValue[props2.field.id];
+        if (props2.field.id) return getFieldData(props2.modelValue, props2.field.id);
         return props2.field.defaultValue ?? "";
       }
     });
@@ -18692,7 +18717,7 @@ const _hoisted_17 = ["src"];
 const _hoisted_18 = { class: "p-1 flex column hover fileUploadPlaceHolder justify-content-center mb-05" };
 const _sfc_main$D = /* @__PURE__ */ defineComponent({
   __name: "FileUpload",
-  props: {
+  props: /* @__PURE__ */ mergeModels({
     label: {},
     multiple: { type: Boolean },
     files: {},
@@ -18706,44 +18731,62 @@ const _sfc_main$D = /* @__PURE__ */ defineComponent({
     theme: {},
     accept: {},
     required: { type: Boolean }
-  },
-  emits: ["update:modelValue", "addFileStart"],
+  }, {
+    "modelValue": { default: () => [] },
+    "modelModifiers": {}
+  }),
+  emits: /* @__PURE__ */ mergeModels(["update:modelValue", "addFileStart"], ["update:modelValue"]),
   setup(__props, { emit: __emit }) {
     const props2 = __props;
     const emit2 = __emit;
     const bindKey2 = props2.bindkey || "id";
     const bagel = useBagel();
     const isImage = (str) => IMAGE_FORMATS_REGEXP.test(str);
-    let file_bindkeys = ref(props2.modelValue || []);
+    const file_bindkeys = useModel(__props, "modelValue");
     const storageFiles = ref([]);
-    async function fetchFiles() {
+    async function fetchTopicFiles() {
       const files = await bagel.get(`/files?topic=${props2.topic}`);
       storageFiles.value.push(...files);
     }
-    onMounted(() => {
-      if (props2.topic) fetchFiles();
-      if (!props2.files && [file_bindkeys.value].flat().length > 0) {
-        const ids = [file_bindkeys.value].flat().filter(Boolean);
-        if (!(ids == null ? void 0 : ids.length)) return;
-        if (bindKey2 === "url") {
-          ids.forEach((url) => {
-            storageFiles.value.push({ url });
-          });
-          return;
-        }
-        if (props2.multiple) {
-          ids.forEach((id) => {
-            void bagel.get(`/files/${id}`).then((file) => {
-              storageFiles.value.push(file);
-            }).catch(console.error);
-          });
-        } else {
-          void bagel.get(`/files/${ids[0]}`).then((file) => {
+    function loadFiles() {
+      const ids = [file_bindkeys.value].flat().filter(Boolean);
+      if (!ids.length) {
+        storageFiles.value.splice(0, storageFiles.value.length);
+        return;
+      }
+      const currentIds = storageFiles.value.map((file) => file[bindKey2]);
+      const idsToAdd = ids.filter((id) => !currentIds.includes(id));
+      const idsToRemove = currentIds.filter((id) => (typeof id === "string" || typeof id === "number") && !ids.includes(id));
+      idsToRemove.forEach((id) => {
+        const index2 = storageFiles.value.findIndex((file) => file[bindKey2] === id);
+        if (index2 !== -1) storageFiles.value.splice(index2, 1);
+      });
+      if (bindKey2 === "url") {
+        idsToAdd.forEach((url) => {
+          storageFiles.value.push({ url });
+        });
+        return;
+      }
+      if (props2.multiple) {
+        idsToAdd.forEach((id) => {
+          void bagel.get(`/files/${id}`).then((file) => {
             storageFiles.value.push(file);
           }).catch(console.error);
-        }
+        });
+      } else {
+        void bagel.get(`/files/${idsToAdd[0]}`).then((file) => {
+          storageFiles.value.push(file);
+        }).catch(console.error);
+      }
+    }
+    onMounted(() => {
+      if (props2.topic) fetchTopicFiles();
+      if (!props2.files && [file_bindkeys.value].flat().length > 0) {
+        loadFiles();
       }
     });
+    watch(() => props2.topic, fetchTopicFiles);
+    watch(() => props2.modelValue, loadFiles);
     watch(
       () => props2.files,
       (newFiles) => {
@@ -18760,17 +18803,6 @@ const _sfc_main$D = /* @__PURE__ */ defineComponent({
     function compareLists(a2, b2) {
       return [a2].flat().every((id) => [b2].flat().includes(id)) && [b2].flat().every((id) => [a2].flat().includes(id));
     }
-    watch(() => props2.modelValue, (newVal = []) => {
-      console.log(newVal, "newVal");
-      const isSame = compareLists(file_bindkeys.value, newVal);
-      if (!isSame) {
-        file_bindkeys.value = newVal;
-        for (const fle of storageFiles.value) {
-          const index2 = [file_bindkeys.value].flat().findIndex((key) => fle[bindKey2] === key);
-          if (index2 === -1) storageFiles.value.splice(index2, 1);
-        }
-      }
-    });
     function updateModelValue() {
       let idValue;
       if (props2.multiple) {
@@ -18781,7 +18813,6 @@ const _sfc_main$D = /* @__PURE__ */ defineComponent({
       const isSame = compareLists(file_bindkeys.value, idValue);
       if (!isSame) {
         file_bindkeys.value = idValue;
-        emit2("update:modelValue", file_bindkeys.value);
       }
     }
     const fileQueue = ref([]);
@@ -19100,7 +19131,7 @@ const _sfc_main$D = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const $el = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["__scopeId", "data-v-0dfbee23"]]);
+const $el = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["__scopeId", "data-v-30231b53"]]);
 const _hoisted_1$u = ["title"];
 const _hoisted_2$k = { key: 0 };
 const _hoisted_3$g = ["value", "placeholder"];

package/dist/style.css

@@ -707,7 +707,7 @@ data[data-v-6c27f163] {
 }
 }
 
-.fileUploadWrap[data-v-0dfbee23] {
+.fileUploadWrap[data-v-30231b53] {
 	outline: 1px solid var(--border-color);
 	border-radius: var(--input-border-radius);
 	text-align: center;
@@ -719,7 +719,7 @@ data[data-v-6c27f163] {
 	background: var(--input-bg);
 	height: 215px;
 }
-.bagel-input .fileUploadWrap.fileDropZone[data-v-0dfbee23] {
+.bagel-input .fileUploadWrap.fileDropZone[data-v-30231b53] {
 	background: var(--input-bg);
 	display: flex;
 	align-items: center;
@@ -727,14 +727,14 @@ data[data-v-6c27f163] {
 	color: var(--bgl-gray);
 	flex-direction: column;
 }
-.fileUploadWrap.dragover[data-v-0dfbee23],
-.fileUploadWrap[data-v-0dfbee23]:hover {
+.fileUploadWrap.dragover[data-v-30231b53],
+.fileUploadWrap[data-v-30231b53]:hover {
 	box-shadow: inset 0 0 10px #00000012;
 }
-.fileUploadWrap[style*="height: auto;"][data-v-0dfbee23] {
+.fileUploadWrap[style*="height: auto;"][data-v-30231b53] {
 	min-height: 215px;
 }
-.multi-image-item-preview[data-v-0dfbee23] {
+.multi-image-item-preview[data-v-30231b53] {
 	border: 1px solid var(--border-color) !important;
 	border-radius: var(--input-border-radius);
 	margin: 0.5rem !important;
@@ -748,12 +748,12 @@ data[data-v-6c27f163] {
 	gap: 1rem;
 	align-items: center;
 }
-.multi-image-item-preview p[data-v-0dfbee23] {
+.multi-image-item-preview p[data-v-30231b53] {
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
-.multi-preview[data-v-0dfbee23]{
+.multi-preview[data-v-30231b53]{
 	width: 40px;
 	height: 40px;
 	border-radius: var(--input-border-radius);
@@ -764,17 +764,17 @@ data[data-v-6c27f163] {
 	align-items: center;
 	display: flex;
 }
-.bgl-single-preview[data-v-0dfbee23]{
+.bgl-single-preview[data-v-30231b53]{
 	height: 100%;
 	position: relative;
 }
-.bgl-single-preview + .fileUploadPlaceHolder[data-v-0dfbee23]{
+.bgl-single-preview + .fileUploadPlaceHolder[data-v-30231b53]{
 	position: absolute;
 	inset: 0;
 	margin: auto;
 	top: calc(50% - 2rem);
 }
-.single-image-item-preview[data-v-0dfbee23] {
+.single-image-item-preview[data-v-30231b53] {
 	height: 100%;
 	min-height: 100%;
 	position: relative;
@@ -782,13 +782,13 @@ data[data-v-6c27f163] {
 	align-items: center;
 	justify-content: center;
 }
-.fileUploadWrap[style*="height: auto"] .single-image-item-preview[data-v-0dfbee23] {
+.fileUploadWrap[style*="height: auto"] .single-image-item-preview[data-v-30231b53] {
 	min-height: 215px;
 }
-.fileUploadWrap[style*="height: auto"] .single-preview[data-v-0dfbee23] {
+.fileUploadWrap[style*="height: auto"] .single-preview[data-v-30231b53] {
 	margin: 0rem !important;
 }
-.single-preview[data-v-0dfbee23]{
+.single-preview[data-v-30231b53]{
 	border-radius: var(--input-border-radius);
 	margin: 1rem;
 	padding: 0px;
@@ -797,7 +797,7 @@ data[data-v-6c27f163] {
 	object-fit: cover;
 	background: var(--bgl-gray-light);
 }
-.single-image-item-preview[data-v-0dfbee23]:hover::after{
+.single-image-item-preview[data-v-30231b53]:hover::after{
 	content: "zoom_in";
 	font-size: 32px;
 	font-family: "Material Symbols Outlined", serif;
@@ -807,20 +807,20 @@ data[data-v-6c27f163] {
 	z-index: 9;
 	pointer-events: none;
 }
-.single-image-item-preview:hover img[data-v-0dfbee23]{
+.single-image-item-preview:hover img[data-v-30231b53]{
 	filter: brightness(70%);
 }
-.bgl_fill-image.single-image-item-preview[data-v-0dfbee23] {
+.bgl_fill-image.single-image-item-preview[data-v-30231b53] {
 	height: 100%;
 }
-.bgl_fill-image.single-image-item-preview .single-preview[data-v-0dfbee23]{
+.bgl_fill-image.single-image-item-preview .single-preview[data-v-30231b53]{
 	border-radius: unset;
 	object-fit: cover;
 	box-shadow: unset;
 	width: 100%;
 	height: auto;
 }
-.single-image-item-preview .pie[data-v-0dfbee23] {
+.single-image-item-preview .pie[data-v-30231b53] {
 	transform-origin: top;
 	transform: scale(1.4);
 	position: absolute;
@@ -834,31 +834,31 @@ data[data-v-6c27f163] {
 	border: none !important;
 	padding: 0 !important;
 }
-.bgl_oval-upload[data-v-0dfbee23] {
+.bgl_oval-upload[data-v-30231b53] {
 	border-radius: 100% !important;
 	overflow: hidden;
 }
-.bgl_oval-upload p[data-v-0dfbee23] {
+.bgl_oval-upload p[data-v-30231b53] {
 		padding: 0.75rem !important;
 		font-size: 12px
 }
-.bgl_oval-upload .fileUploadPlaceHolder[data-v-0dfbee23]{
+.bgl_oval-upload .fileUploadPlaceHolder[data-v-30231b53]{
 		top: 0;
 }
-.bgl_oval-upload .pie[data-v-0dfbee23] {
+.bgl_oval-upload .pie[data-v-30231b53] {
 		transform: scale(1);
 }
-.bgl_oval-upload span.bgl_icon-font.color-primary[data-v-0dfbee23] {
+.bgl_oval-upload span.bgl_icon-font.color-primary[data-v-30231b53] {
 		transform: scale(0.4) !important;
 }
-.bgl_oval-upload .single-image-item-preview[data-v-0dfbee23]{
+.bgl_oval-upload .single-image-item-preview[data-v-30231b53]{
 		height: 100%;
 }
-.bgl_oval-upload .single-preview[data-v-0dfbee23] {
+.bgl_oval-upload .single-preview[data-v-30231b53] {
 		margin: 0;
 		height: 100% !important;
 }
-.pie[data-v-0dfbee23] {
+.pie[data-v-30231b53] {
 	width: 30px;
 	height: 30px;
 	position: relative;
@@ -866,7 +866,7 @@ data[data-v-6c27f163] {
 	align-items: center;
 	justify-content: center;
 }
-.pie[data-v-0dfbee23]:before {
+.pie[data-v-30231b53]:before {
 	content: '';
 	position: absolute;
 	border-radius: 50%;
@@ -884,26 +884,26 @@ data[data-v-6c27f163] {
 		#000 calc(100% - var(--b))
 	);
 }
-.pie .success[data-v-0dfbee23] {
+.pie .success[data-v-30231b53] {
 	transform: scale(0);
 	opacity: 0;
 	transition: all 0.3s ease-in-out;
 }
-.pie .progress[data-v-0dfbee23] {
+.pie .progress[data-v-30231b53] {
 	position: absolute;
 	font-size: 10px;
 }
-.pie.complete .progress[data-v-0dfbee23] {
+.pie.complete .progress[data-v-30231b53] {
 	display: none;
 }
-.pie.complete .success[data-v-0dfbee23] {
+.pie.complete .success[data-v-30231b53] {
 	transform: scale(1.3);
 	opacity: 1;
 }
-.pie.complete[data-v-0dfbee23]:before {
+.pie.complete[data-v-30231b53]:before {
 	background: conic-gradient(var(--bgl-green) calc(var(--p) * 1%), #0000 0);
 }
-.pie.complete[data-v-0dfbee23] {
+.pie.complete[data-v-30231b53] {
 	color: var(--bgl-green);
 }
 
@@ -3598,6 +3598,12 @@ to {
 .align-content-center {
     align-content: center;
 }
+.align-content-start {
+    align-content: start;
+}
+.align-content-end {
+    align-content: end;
+}
 .align-content-space-between {
     align-content: space-between;
 }
@@ -6934,6 +6940,14 @@ to {
         align-content: center;
     }
 
+    .m_align-content-start {
+        align-content: start;
+    }
+
+    .m_align-content-end {
+        align-content: end;
+    }
+
     .m_align-content-space-between {
         align-content: space-between;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/vue",
   "type": "module",
-  "version": "0.0.953",
+  "version": "0.0.957",
   "description": "Bagel core sdk packages",
   "author": {
     "name": "Neveh Allon",

package/src/components/form/BglField.vue

@@ -48,15 +48,43 @@ const formData = $computed({
 	},
 })
 
+const objPathRegex = /[.\][]/
+
+function setFieldData(key: string, val: any) {
+	const data = { ...props.modelValue }
+	const keys = key.split(objPathRegex)
+	let temp = data
+	for (let i = 0; i < keys.length - 1; i++) {
+		if (!temp[keys[i]]) {
+			temp[keys[i]] = {}
+		}
+		temp = temp[keys[i]]
+	}
+	temp[keys[keys.length - 1]] = val
+	return data
+}
+
+function getFieldData(obj: Record<string, any>, key: string) {
+	const keys = key.split(objPathRegex)
+	let result = obj
+	for (const k of keys) {
+		if (result && k in result) {
+			result = result[k]
+		} else {
+			return undefined
+		}
+	}
+	return result
+}
+
 const fieldData = $computed({
 	set: (val: any) => {
 		if (!props.field.id) return
-		const data = { ...props.modelValue }
-		data[props.field.id] = val
+		const data = setFieldData(props.field.id, val)
 		emit('update:modelValue', data)
 	},
 	get: () => {
-		if (props.field.id) return props.modelValue[props.field.id]
+		if (props.field.id) return getFieldData(props.modelValue, props.field.id)
 		return props.field.defaultValue ?? ''
 	},
 })

package/src/components/form/inputs/FileUpload.vue

@@ -38,45 +38,66 @@ interface QueueFile {
 
 const isImage = (str: string) => IMAGE_FORMATS_REGEXP.test(str)
 
-let file_bindkeys = $ref<FSValue>(props.modelValue || [])
+const file_bindkeys = defineModel('modelValue', { default: () => [] as FSValue })
 const storageFiles = $ref<StorageFile[]>([])
 
-async function fetchFiles() {
+async function fetchTopicFiles() {
 	const files = await bagel.get<StorageFile[]>(`/files?topic=${props.topic}`)
 	storageFiles.push(...files)
 }
 
-onMounted(() => {
-	if (props.topic) fetchFiles()
-	if (!props.files && [file_bindkeys].flat().length > 0) {
-		const ids = [file_bindkeys].flat().filter(Boolean) as (string | number)[] | undefined
-		if (!ids?.length) return
-		if (bindKey === 'url') {
-			ids.forEach((url) => {
-				storageFiles.push({ url } as StorageFile)
-			})
-			return
-		}
-		if (props.multiple) {
-			ids.forEach((id) => {
-				void bagel
-					.get<StorageFile>(`/files/${id}`)
-					.then((file) => {
-						storageFiles.push(file)
-					})
-					.catch(console.error)
-			})
-		} else {
+function loadFiles() {
+	const ids = ([file_bindkeys.value].flat().filter(Boolean) as unknown) as (string | number)[]
+	if (!ids.length) {
+		storageFiles.splice(0, storageFiles.length)
+		return
+	}
+
+	const currentIds = storageFiles.map(file => file[bindKey])
+	const idsToAdd = ids.filter(id => !currentIds.includes(id))
+	const idsToRemove = currentIds.filter((id): id is string | number => (typeof id === 'string' || typeof id === 'number') && !ids.includes(id))
+
+	idsToRemove.forEach((id) => {
+		const index = storageFiles.findIndex(file => file[bindKey] === id)
+		if (index !== -1) storageFiles.splice(index, 1)
+	})
+
+	if (bindKey === 'url') {
+		idsToAdd.forEach((url) => {
+			storageFiles.push({ url } as StorageFile)
+		})
+		return
+	}
+
+	if (props.multiple) {
+		idsToAdd.forEach((id) => {
 			void bagel
-				.get<StorageFile>(`/files/${ids[0]}`)
+				.get<StorageFile>(`/files/${id}`)
 				.then((file) => {
 					storageFiles.push(file)
 				})
 				.catch(console.error)
-		}
+		})
+	} else {
+		void bagel
+			.get<StorageFile>(`/files/${idsToAdd[0]}`)
+			.then((file) => {
+				storageFiles.push(file)
+			})
+			.catch(console.error)
+	}
+}
+
+onMounted(() => {
+	if (props.topic) fetchTopicFiles()
+	if (!props.files && [file_bindkeys.value].flat().length > 0) {
+		loadFiles()
 	}
 })
 
+watch(() => props.topic, fetchTopicFiles)
+watch(() => props.modelValue, loadFiles)
+
 watch(
 	() => props.files,
 	(newFiles) => {
@@ -100,18 +121,6 @@ function compareLists(a: any, b: any) {
 		.every((id: any) => [b].flat().includes(id)) && [b].flat().every(id => [a].flat().includes(id))
 }
 
-watch(() => props.modelValue, (newVal: FSValue = []) => {
-	console.log(newVal, 'newVal')
-	const isSame = compareLists(file_bindkeys, newVal)
-	if (!isSame) {
-		file_bindkeys = newVal
-		for (const fle of storageFiles) {
-			const index = [file_bindkeys].flat().findIndex(key => fle[bindKey] === key)
-			if (index === -1) storageFiles.splice(index, 1)
-		}
-	}
-})
-
 function updateModelValue() {
 	let idValue: FSValue
 	if (props.multiple) {
@@ -119,10 +128,9 @@ function updateModelValue() {
 	} else {
 		idValue = (storageFiles[0][bindKey] as string) || ''
 	}
-	const isSame = compareLists(file_bindkeys, idValue)
+	const isSame = compareLists(file_bindkeys.value, idValue)
 	if (!isSame) {
-		file_bindkeys = idValue
-		emit('update:modelValue', file_bindkeys)
+		file_bindkeys.value = idValue
 	}
 }
 

package/src/styles/layout.css

@@ -77,6 +77,14 @@
     align-content: center;
 }
 
+.align-content-start {
+    align-content: start;
+}
+
+.align-content-end {
+    align-content: end;
+}
+
 .align-content-space-between {
     align-content: space-between;
 }

package/src/styles/mobilLayout.css

@@ -102,6 +102,14 @@
         align-content: center;
     }
 
+    .m_align-content-start {
+        align-content: start;
+    }
+
+    .m_align-content-end {
+        align-content: end;
+    }
+
     .m_align-content-space-between {
         align-content: space-between;
     }