pawa-ssr 1.3.1 → 1.3.3

package/CHANGELOG.md

@@ -1,3 +1,4 @@
 CHANGELOG.md
 + version 1.0.0 - v1.2.2 on experiment
 + version 1.2.3 bugs fixing on for-key
++ version 1.2.8 - 1.3.1 experimentin global state

package/index.js

@@ -5,6 +5,7 @@ import { propsValidator, evaluateExpr,extractAtExpressions, reArrangeAttri,resum
 import {AsyncLocalStorage} from'node:async_hooks'
 import { If,For,State,Switch, Key } from'./power.js';
 import PawaElement from'./pawaElement.js'
+import { pluginsMap } from "pawajs";
 
 const PAWA_STORE_SYMBOL = Symbol.for('pawa.ssr.store');
 
@@ -134,7 +135,9 @@ const useInnerContext=()=>{
 
 
 const $state = (initialValue) => {
-  const state = { value: null };
+  const id=crypto.randomUUID()
+  const state = { value: null ,id};
+
   if (typeof initialValue === 'function') {
     const res = initialValue();
     if (res instanceof Promise) {
@@ -150,18 +153,18 @@ const $state = (initialValue) => {
 
   const initLocalState = (target, ctx) => {
     const newState = { ...target };
-    if (typeof initialValue === 'function') {
-      const res = initialValue();
-      if (!(res instanceof Promise)) newState.value = res;
-    } else if (initialValue && typeof initialValue === 'object') {
+    const currentValue = target.value;
+
+    if (currentValue && typeof currentValue === 'object') {
       try {
-        newState.value = typeof structuredClone === 'function' ? structuredClone(initialValue) : (Array.isArray(initialValue) ? [...initialValue] : { ...initialValue });
+        newState.value = structuredClone(currentValue);
       } catch (e) {
-        newState.value = Array.isArray(initialValue) ? [...initialValue] : { ...initialValue };
+        newState.value = Array.isArray(currentValue) ? [...currentValue] : { ...currentValue };
       }
     } else {
-      newState.value = initialValue;
+      newState.value = currentValue;
     }
+
     ctx.states.set(target, newState);
   };
 
@@ -171,7 +174,7 @@ const $state = (initialValue) => {
       if (ctx) {
         if (!ctx.states) ctx.states = new Map();
         if (!ctx.states.has(target)) initLocalState(target, ctx);
-        return Reflect.get(ctx.states.get(target), prop, receiver);
+        return ctx.states.get(target)[prop];
       }
       return Reflect.get(target, prop, receiver);
     },
@@ -180,12 +183,15 @@ const $state = (initialValue) => {
       if (ctx) {
         if (!ctx.states) ctx.states = new Map();
         if (!ctx.states.has(target)) initLocalState(target, ctx);
-        return Reflect.set(ctx.states.get(target), prop, value, receiver);
+        // Directly set the property on the request-local state object.
+        ctx.states.get(target)[prop] = value;
+        return true; // The set trap must return a boolean.
       }
       return Reflect.set(target, prop, value, receiver);
     }
   });
 };
+
 setServer({
   useContext,
   useInnerContext,
@@ -216,15 +222,10 @@ export const getAllServerAttrArray=()=>{
   return allServerAttr;
 }
 
-const compoBeforeCall = new Set()
-const compoAfterCall=new Set()
-const renderBeforePawa=new Set()
-const renderAfterPawa=new Set()
-const renderBeforeChild=new Set()
-const startsWithSet=new Set()
-const fullNamePlugin=new Set()
-const externalPlugin={}
-const pawaAttributes=new Set()
+const {compoAfterCall,compoBeforeCall,externalPlugin,
+  fullNamePlugin,renderAfterPawa,renderBeforeChild,
+  renderBeforePawa,startsWithSet
+}=pluginsMap()
 const setPawaAttribute=(...attr)=>{
   attr.forEach(att=>{
     pawaAttributes.add(att)
@@ -903,9 +904,9 @@ const attributeHandler =async (el, attr) => {
  */
 export const render =async (el, contexts = {},stream) => {
   
-  // if (checkIfRemove(el) && !el.hasAttribute('switch')) {
-  //   return
-  // }
+  if (checkIfRemove(el) && !el.hasAttribute('switch')) {
+    return
+  }
   const isStream=store.getStore().stream
   if(el.hasAttribute('only-client')){
     el.removeAttribute('only-client')
@@ -937,7 +938,7 @@ export const render =async (el, contexts = {},stream) => {
         console.error(error.message,error.stack)
       }
     }
-    
+    const stateContext=store.getStore().stateContext
     PawaElement.Element(el,context)
      if(el.childNodes.some(node=>node.nodeType === 3 && node.nodeValue.includes('@{')) && !el._avoidPawaRender){
        await textContentHandler(el)  
@@ -982,7 +983,7 @@ export const render =async (el, contexts = {},stream) => {
                 console.warn(`${attr.name} plugin must be a function`)
                 return
               }
-             await plugin(el,attr)
+             await plugin(el,attr,stateContext,stream)// on client no stream but an object called notRender
             }catch(error){
               console.warn(error.message,error.stack)
             }
@@ -996,7 +997,7 @@ export const render =async (el, contexts = {},stream) => {
                 console.warn(`${name} plugin must be a function`)
                 return
               }
-              await plugin(el,attr)
+              await plugin(el,attr,stateContext,stream)
             }catch(error){
               console.warn(error.message,error.stack)
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pawa-ssr",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "type":"module",
   "description": "pawajs ssr libary",
   "main": "index.js",
@@ -25,6 +25,6 @@
   "homepage": "https://github.com/Allisboy/pawajs-ssr#readme",
   "dependencies": {
     "linkedom": "^0.18.11",
-    "pawajs": "^1.4.7"
+    "pawajs": "^1.4.11"
   }
 }