onelaraveljs 1.21.13 → 1.21.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onelaraveljs",
-  "version": "1.21.13",
+  "version": "1.21.15",
   "description": "OneLaravel JS Framework Core & Compiler",
   "main": "index.js",
   "exports": {

package/src/core/OneMarkup.js

@@ -2,6 +2,11 @@ import { __defineProp, __hasOwnProp } from '../helpers/utils.js';
 import OneDOM from './OneDOM.js';
 import { TemplateDetectorService } from './services/TemplateDetectorService.js';
 
+/**
+ * @type {OneMarkupService}
+ */
+let oms = null;
+
 export class OneMarkupModel {
     constructor(fullName, openTag, closeTag, attributes = {}, nodes = []) {
         /**
@@ -20,6 +25,7 @@ export class OneMarkupModel {
         this.__definedAttributes = [];
         this.__tagName = fullName.split(':')[1];
         this.__fullName = fullName;
+        this.__query = null;
         this.__defineAttributes(Object.keys(attributes));
     }
     __update(fullName, openTag, closeTag, attributes = {}, nodes = []) {
@@ -165,6 +171,16 @@ export class OneMarkupModel {
         this.__nodes.push(...nodes);
         return this.__nodes;
     }
+    __sync() {
+        if(this.__query){
+            const result = oms.find(this.__query.pattern, this.__query.attributes, this.__query.options, this.__query.index, true);
+            if(result){
+                this.__update(result.fullName, result.openTag, result.closeTag, result.attributes, result.nodes);
+                return true;
+            }
+        }
+        return false;
+    }
     updateNodes(nodes = []) {
         this.__nodes = nodes;
         return this;
@@ -351,9 +367,9 @@ export class OneMarkupService {
         const elements = this.detector.find("one:" + pattern, options);
         const isTotal = total && typeof total === 'number' && total !== 0;
         const isLast = isTotal && total === -1 && isOne;
-        const isFirst = total && total === 1 && isOne;
+        const isFirst = ((total === false || total === null || total === 0) && isOne) || (isTotal && total === 1 && !isOne);
         const isRight = isTotal && total < 0 && !isOne;
-        const oneIndex = isOne && isTotal && !isLast && !isFirst ? (total >= 0 ? (elements.length - total > 0 ? total : 0) : 0) : (elements.length + total > 0 ? (elements.length + total - 1): elements.length - 1);
+        const oneIndex = isOne && isTotal && !isLast && !isFirst ? (total >= 0 ? (elements.length - total > 0 ? total : 0) : 0) : (elements.length + total > 0 ? (elements.length + total - 1): elements.length - 1); // total is index
         
         if (elements.length === 0) {
             if (isLast || isFirst) {
@@ -452,11 +468,21 @@ export class OneMarkupService {
         return new OneMarkupCollection(result);
     }
     findOne(pattern = '*', attributes = {}, options = {}, index = 0) {
-        return this.find(pattern, attributes, options, index, true);
+        const result = this.find(pattern, attributes, options, index, true);
+        if(result === null){
+            return null;
+        }
+        result.__query = { pattern, attributes, options, index };
+        return result;
     }
 
     first(pattern = '*', attributes = {}, options = {}) {
-        return this.find(pattern, attributes, options, 1, true);
+        const result = this.find(pattern, attributes, options, 0, true);
+        if(result === null){
+            return null;
+        }
+        result.__query = { pattern, attributes, options, total: 1, index: 0 };
+        return result;
     }
     last(pattern = '*', attributes = {}, options = {}) {
         return this.find(pattern, attributes, options, -1, true);
@@ -467,4 +493,5 @@ export class OneMarkupService {
 }
 
 export const OneMarkup = new OneMarkupService();
+oms = OneMarkup;
 export default OneMarkup;

package/src/core/reactive/ReactiveComponent.js

@@ -101,7 +101,7 @@ export class ReactiveComponent {
      * Mount component và thiết lập state subscriptions
      */
     mounted() {
-        if (this.isMounted || this.isDestroyed) return;
+        if (this.isMounted) return;
         
         // console.log(`ReactiveComponent mounted [${this.type}]:`, this.id);
         
@@ -130,11 +130,12 @@ export class ReactiveComponent {
      * Unmount component và dọn dẹp subscriptions
      */
     unmounted() {
-        if (!this.isMounted || this.isDestroyed) return;
+        if (!this.isMounted) return;
         
         // console.log(`ReactiveComponent unmounted [${this.type}]:`, this.id);
         
         this.isMounted = false;
+        this.isScanned = false;
         
         // Unmount children cho loại watch
         if (this.type === 'watch') {
@@ -142,13 +143,14 @@ export class ReactiveComponent {
         }
         
         this._unsubscribeAll();
+        this.markup = null;
     }
 
     /**
      * Cập nhật component khi state thay đổi
      */
     update() {
-        if (this._isUpdating || !this.isMounted || this.isDestroyed) return;
+        if (this._isUpdating || !this.isMounted) return;
         
         this._isUpdating = true;
         
@@ -318,6 +320,7 @@ export class ReactiveComponent {
                 this.closeTag = this.markup.closeTag;
                 this.refElements = this.markup.nodes.slice();
             } else {
+                this.markup.__sync();
                 // Quét lại markup hiện tại - validate trước
                 if (!this.markup.openTag?.isConnected || !this.markup.closeTag?.isConnected) {
                     console.warn(`ReactiveComponent [${this.type}][${this.id}]: Cannot re-scan, markup disconnected`);