@supersoniks/concorde 3.1.16 → 3.1.19

package/src/core/utils/PublisherProxy.ts

@@ -54,6 +54,7 @@ export class PublisherProxy<T = any> {
   _value_: T;
   _is_savable_ = false;
   _invalidateListeners_ = new Set<VoidFunction>();
+  _formInvalidateListeners_ = new Set<VoidFunction>();
   _assignListeners_ = new Set<(value: T) => void>();
   _mutationListeners_ = new Set<VoidFunction>();
   _fillListeners_ = new Set<Record<string, CoreJSType>>();
@@ -61,11 +62,17 @@ export class PublisherProxy<T = any> {
   _lockInternalMutationPublishing_ = false;
   _instanceCounter_ = 0;
   parent: PublisherProxy | null;
+  _parentKey_?: string;
   root: PublisherProxy;
 
-  constructor(target: T, parentProxPub: PublisherProxy | null) {
+  constructor(
+    target: T,
+    parentProxPub: PublisherProxy | null,
+    parentKey?: string
+  ) {
     this._value_ = target;
     this.parent = parentProxPub || null;
+    this._parentKey_ = parentKey;
     this.root = this;
     this._instanceCounter_ = 0;
     while (this.root.parent) {
@@ -82,6 +89,7 @@ export class PublisherProxy<T = any> {
       this._proxies_.get(key)?.delete();
     }
     this._invalidateListeners_.clear();
+    this._formInvalidateListeners_.clear();
     this._assignListeners_.clear();
     this._mutationListeners_.clear();
     this._fillListeners_.clear();
@@ -97,6 +105,7 @@ export class PublisherProxy<T = any> {
       this._templateFillListeners_.size > 0 ||
       this._assignListeners_.size > 0 ||
       this._invalidateListeners_.size > 0 ||
+      this._formInvalidateListeners_.size > 0 ||
       this._mutationListeners_.size > 0 ||
       this._fillListeners_.size > 0
     );
@@ -126,15 +135,22 @@ export class PublisherProxy<T = any> {
     await queueTaskPromise();
     if (currentId !== this._assignmentId_) return;
     const newValue = this.get();
-    this._assignListeners_.forEach((handler: (value: T) => void) =>
-      handler(newValue)
-    );
+
+    this._assignListeners_.forEach((handler: (value: T) => void) => {
+      handler(newValue);
+    });
     this._publishInternalMutation_(lockInternalMutationsTransmission);
   }
 
   _publishInvalidation_() {
     this._invalidateListeners_.forEach((handler: VoidFunction) => handler());
   }
+
+  _publishFormInvalidation_() {
+    this._formInvalidateListeners_.forEach((handler: VoidFunction) =>
+      handler()
+    );
+  }
   _publishDynamicFilling_(key: string, value: CoreJSType) {
     this._fillListeners_.forEach((handler) => {
       if (handler[key] !== value) handler[key] = value;
@@ -187,6 +203,7 @@ export class PublisherProxy<T = any> {
     if (typeof handler != "function") return;
     this._invalidateListeners_.delete(handler);
   }
+
   /**
    * Flag les données comme étant invalides
    */
@@ -194,6 +211,25 @@ export class PublisherProxy<T = any> {
     this._publishInvalidation_();
   }
 
+  /**
+   * Appel la fonction "handler" (passée en paramettre) lorsque la donnée est flaggée comme invalide
+   */
+  onFormInvalidate(handler: VoidFunction | undefined) {
+    if (typeof handler != "function") return;
+    this._formInvalidateListeners_.add(handler);
+  }
+  /**
+   * Stop les appels de la fonction "handler" (passée en paramettre) lorsque la donnée est flaggée comme invalide
+   */
+  offFormInvalidate(handler: VoidFunction | undefined) {
+    if (typeof handler != "function") return;
+    this._formInvalidateListeners_.delete(handler);
+  }
+
+  invalidateForm() {
+    this._publishFormInvalidation_();
+  }
+
   /**
    * Appel la fonction "handler" (passée en paramettre) lorsque quelque chose change la valeur gérée par le proxy quelque soit la profondeur de la donnée
    *
@@ -272,14 +308,17 @@ export class PublisherProxy<T = any> {
     ) {
       return true;
     }
+
     /**
      * On assigne la nouvelle valeur
      */
+
     const prevValue = this._value_ as any;
     this._value_ = isComplex(newValue)
       ? newValue
       : ({ __value: newValue } as any);
     this._cachedGet_ = undefined;
+
     /**
      * Si il s'agit d'une valeur primitive (un entier, une chaine ) la valeure en renseignée par un objet contenant la vaeur {__value}
      * On publie juste et on sen va.
@@ -288,8 +327,36 @@ export class PublisherProxy<T = any> {
       this._value_,
       "__value"
     );
+
+    if (this._parentKey_ && this.parent) {
+      //si le parent n'a pas de valeur, on la crée en renseignant this.value et on retourne.
+      const valueTosetInParent = isPrimitiveValue
+        ? (this._value_ as any).__value
+        : this._value_;
+      if (this.parent?.get() == null && this.parent?.get() == undefined) {
+        //if _parentKey_ is a number, we assume it's an array
+        if (!isNaN(Number(this._parentKey_))) {
+          const parent = [];
+          parent[Number(this._parentKey_)] = valueTosetInParent;
+          this.parent.set(parent);
+        } else {
+          this.parent.set({ [this._parentKey_]: valueTosetInParent });
+        }
+        // return;
+      } else {
+        //on mets à jour la valeur de la clef dans l'objet parnet pour refléter le changement au ca sou elle n'existait pas
+        this.parent._value_[this._parentKey_] = valueTosetInParent;
+      }
+    }
+
     if (isPrimitiveValue) {
-      await this._publishAssignement_(lockInternalMutationsTransmission);
+      //await  //await here gives better performance but can cause issues with some listeners
+      this._publishAssignement_(lockInternalMutationsTransmission);
+      if (this.parent && this._parentKey_)
+        this.parent._publishDynamicFilling_(
+          this._parentKey_,
+          (this._value_ as any).__value
+        );
       return true;
     }
     /**
@@ -318,7 +385,8 @@ export class PublisherProxy<T = any> {
     /**
      * On prévient les écouteurs que la valeur a changé
      */
-    await this._publishAssignement_();
+    //await  //await here gives better performance but can cause issues with some listeners
+    this._publishAssignement_();
     /**
      * Si la donnée est complexe (objet, tableau)
      * on crée les proxys pour les sous-éléments qui n'en on pas
@@ -339,7 +407,8 @@ export class PublisherProxy<T = any> {
           this._publishDynamicFilling_(key, v);
           continue;
         }
-        await this._proxies_.get(key)?.set(valueV, true);
+        //await //await here gives better performance but can cause issues with some listeners
+        this._proxies_.get(key)?.set(valueV, true);
         this._publishDynamicFilling_(key, v);
       }
     }
@@ -640,6 +709,9 @@ const internalProps: Set<string> = new Set([
   "invalidate",
   "onInvalidate",
   "offInvalidate",
+  "invalidateForm",
+  "onFormInvalidate",
+  "offFormInvalidate",
   "onAssign",
   "offAssign",
   "startDynamicFilling",
@@ -656,16 +728,19 @@ const internalProps: Set<string> = new Set([
   "_fillListeners_",
   "_assignListeners_",
   "_invalidateListeners_",
+  "_formInvalidateListeners_",
   "_publishInternalMutation_",
   "hasListener",
   "delete",
   "_mutationListeners_",
   "_publishDynamicFilling_",
   "_publishInvalidation_",
+  "_publishFormInvalidation_",
   "_publishTemplateFilling_",
   "_publishAssignement_",
   "_proxies_",
   "parent",
+  "_parentKey_",
   "_value_",
   "_is_savable_",
   "_lockInternalMutationPublishing_",
@@ -679,24 +754,38 @@ const internalProps: Set<string> = new Set([
 export default class Publisher<
   T = PublisherContentType
 > extends PublisherProxy<T> {
-  constructor(target: T, parentProxPub: PublisherProxy | null = null) {
-    super(target, parentProxPub);
-    const thisProxy = new Proxy(this, {
+  constructor(
+    target: T,
+    parentProxPub: PublisherProxy | null = null,
+    parentKey?: string
+  ) {
+    super(target, parentProxPub, parentKey);
+
+    const thisProxy: any = new Proxy(this, {
       /**
        * Lorsque l'on écrit monConteneur =  publisher.maClef ou monConteneur = publisher["maClef"] monConteneur contient :
        * Les methodes de PublisherProxy (onAssign... : voir liste dans kle tableaus si dessous), si la clef est une méthode de PublisherProxy,,
        * Sinon un autre proxy qui a comme valeur interne la valeur corespondante à la clef dans l'objet.
        */
       get: function (publisherInstance: PublisherProxy<T>, sKey: any) {
+        if (internalProps.has(sKey)) return (publisherInstance as any)[sKey];
         if (sKey == Symbol.toPrimitive) {
           return () => thisProxy.get();
         }
-        if (internalProps.has(sKey)) return (publisherInstance as any)[sKey];
+
+        // Support de la notation à points (rigolo mais pas intuitif)
+        // if (sKey.includes(".")) {
+        //   const keys = sKey.split(".");
+        //   return thisProxy[keys.shift()][keys.join(".")];
+        // }
+
         if (!publisherInstance._proxies_.has(sKey)) {
           const vValue = (publisherInstance._value_ as any)[sKey];
+
           const newPublisher = new Publisher(
             isComplex(vValue) ? vValue : { __value: vValue },
-            publisherInstance
+            publisherInstance,
+            sKey
           );
           newPublisher._proxies_.set("_parent_", thisProxy);
           publisherInstance._proxies_.set(sKey, newPublisher);
@@ -731,14 +820,23 @@ export default class Publisher<
           return true;
         }
 
+        // Support de la notation à points (rigolo mais pas intuitif)
+        // if (sKey.includes(".")) {
+        //   const keys = sKey.split(".");
+        //   thisProxy[keys.shift() || ""][keys.join(".")].set(vValue);
+        //   return true;
+        // }
+
         //Création du publisher si il n'existe pas
         if (!publisherInstance._proxies_.has(sKey)) {
-          const newPublisher = new Publisher({}, publisherInstance);
+          const newPublisher = new Publisher({}, publisherInstance, sKey);
           newPublisher._proxies_.set("_parent_", thisProxy);
           publisherInstance._proxies_.set(sKey, newPublisher);
         }
         //mis à jour et publication de la donnée si elle a changé
+
         const prevValue = (publisherInstance._value_ as any)[sKey];
+
         if (prevValue !== vValue) {
           (publisherInstance._value_ as any)[sKey] = vValue;
           publisherInstance._publishDynamicFilling_(sKey, vValue);
@@ -798,14 +896,6 @@ export default class Publisher<
     return thisProxy as any;
   }
 
-  toString() {
-    return "hey";
-  }
-
-  valueOf() {
-    return 2;
-  }
-
   getProperty<U, K extends keyof U>(o: U, propertyName: K): U[K] {
     return o[propertyName]; // o[propertyName] is of type T[K]
   }

package/src/docs/search/docs-search.json

@@ -1269,6 +1269,36 @@
       }
     }
   },
+  {
+    "search": "You can write the folowing code where the name attribute is written in dot notation.\n",
+    "files": {
+      "core/components/functional/submit/submit.md": {
+        "title": "Submit",
+        "hashes": {
+          "dot-notation": {
+            "count": 1,
+            "title": "dot notation",
+            "type": "paragraph"
+          }
+        }
+      }
+    }
+  },
+  {
+    "search": "The data will be stored in the following format:\n",
+    "files": {
+      "core/components/functional/submit/submit.md": {
+        "title": "Submit",
+        "hashes": {
+          "dot-notation": {
+            "count": 1,
+            "title": "dot notation",
+            "type": "paragraph"
+          }
+        }
+      }
+    }
+  },
   {
     "search": "Subscriber",
     "files": {