@jqhtml/core 2.3.59 → 2.3.61

package/dist/instruction-processor.d.ts

@@ -17,7 +17,8 @@ export interface ComponentInstruction {
 export interface SlotInstruction {
     slot: [string, Record<string, any>, (context: any) => [any[], Jqhtml_Component]];
 }
-export type Instruction = TagInstruction | RawTagInstruction | ComponentInstruction | SlotInstruction | string;
+export type ContentInstruction = ['_content', Instruction[], Jqhtml_Component?];
+export type Instruction = TagInstruction | RawTagInstruction | ComponentInstruction | SlotInstruction | ContentInstruction | string;
 export declare function uid(): string;
 /**
  * Process an array of instructions and append to target

package/dist/instruction-processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instruction-processor.d.ts","sourceRoot":"","sources":["../src/instruction-processor.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAKlD,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;CAC7C;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;CAClL;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC;CAClF;AAED,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG,iBAAiB,GAAG,oBAAoB,GAAG,eAAe,GAAG,MAAM,CAAC;AAqB/G,wBAAgB,GAAG,IAAI,MAAM,CA2C5B;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,WAAW,EAAE,EAC3B,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,gBAAgB,EACzB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GACtC,IAAI,CAwCN;AAghBD;;GAEG;AACH,wBAAgB,aAAa,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAW1F"}
+{"version":3,"file":"instruction-processor.d.ts","sourceRoot":"","sources":["../src/instruction-processor.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAKlD,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;CAC7C;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;CAClL;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC;CAClF;AAQD,MAAM,MAAM,kBAAkB,GAAG,CAAC,UAAU,EAAE,WAAW,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC;AAEhF,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG,iBAAiB,GAAG,oBAAoB,GAAG,eAAe,GAAG,kBAAkB,GAAG,MAAM,CAAC;AAqBpI,wBAAgB,GAAG,IAAI,MAAM,CA2C5B;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,WAAW,EAAE,EAC3B,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,gBAAgB,EACzB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GACtC,IAAI,CA0CN;AAyhBD;;GAEG;AACH,wBAAgB,aAAa,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAW1F"}

package/dist/jqhtml-core.esm.js

@@ -1,5 +1,5 @@
 /**
- * JQHTML Core v2.3.59
+ * JQHTML Core v2.3.61
  * (c) 2025 JQHTML Team
  * Released under the MIT License
  */
@@ -639,7 +639,9 @@ function process_instructions(instructions, target, context, slots) {
         if (el) {
             const element = $(el);
             el.removeAttribute('data-tid');
-            apply_attributes(element, tagData.attrs, context);
+            // Bind to the component whose template wrote this element, which for
+            // spliced content is not the component being rendered.
+            apply_attributes(element, tagData.attrs, tagData.context);
         }
     }
     // Third pass: initialize and boot components in parallel
@@ -665,6 +667,16 @@ function process_instruction_to_html(instruction, html, tagElements, components,
         // Raw HTML/text - no escaping, as requested
         html.push(instruction);
     }
+    else if (Array.isArray(instruction)) {
+        if (instruction[0] !== '_content' || !Array.isArray(instruction[1])) {
+            return;
+        }
+        // Content written in another template renders in that template's component.
+        const definer = instruction[2] || context;
+        for (const item of instruction[1]) {
+            process_instruction_to_html(item, html, tagElements, components, definer, slots);
+        }
+    }
     else if ('tag' in instruction) {
         // HTML tag
         process_tag_to_html(instruction, html, tagElements, components, context);
@@ -1840,7 +1852,7 @@ Load_Coordinator._registry = new Map();
 const class_registry = Object.create(null);
 // Markers for serialized class instances (unique to avoid collisions with user data)
 // Replaced at build time by rollup (see rollup.config.js).
-const CORE_VERSION = '2.3.59';
+const CORE_VERSION = '2.3.61';
 const CLASS_MARKER = '__jqhtml_class__';
 const PROPS_MARKER = '__jqhtml_props__';
 /**
@@ -3849,10 +3861,10 @@ class Jqhtml_Component {
                         // Create a content function that invokes child slots
                         // When parent calls content('slotName'), it invokes the child's slot function
                         const childSlots = instructions._slots;
-                        const contentFunction = (slotName, data) => {
+                        const contentFunction = (slotName, ...slotArgs) => {
                             if (childSlots[slotName] && typeof childSlots[slotName] === 'function') {
-                                // Invoke the slot function with data parameter
-                                const [slotInstructions, slotContext] = childSlots[slotName](data);
+                                // Invoke the slot function with everything content() was given
+                                const [slotInstructions, slotContext] = childSlots[slotName](...slotArgs);
                                 // Return in render function format: [instructions, context]
                                 // The template expression handler expects this format
                                 return [slotInstructions, slotContext];
@@ -3877,12 +3889,11 @@ class Jqhtml_Component {
                     instructions = [];
                 }
             }
-            // Flatten any nested content instructions before processing
-            // Instructions may contain ['_content', [...]] markers from content() calls
-            const flattenedInstructions = this._flatten_instructions(instructions);
-            // Process instructions to generate DOM
+            // Process instructions to generate DOM. ['_content', ...] markers from
+            // content() are handled by the processor, which renders them in the
+            // component that wrote them.
             // This kicks off child component boots but doesn't wait for them
-            process_instructions(flattenedInstructions, this.$, this);
+            process_instructions(instructions, this.$, this);
         }
         // Don't update ready state here - let phases complete in order
         this._update_debug_attrs();
@@ -5042,26 +5053,6 @@ class Jqhtml_Component {
     _generate_cid() {
         return uid();
     }
-    /**
-     * Flatten instruction array - converts ['_content', [...]] markers to flat array
-     * Recursively flattens nested content from content() calls
-     */
-    _flatten_instructions(instructions) {
-        const result = [];
-        for (const instruction of instructions) {
-            // Check if this is a _content marker: ['_content', [...]]
-            if (Array.isArray(instruction) && instruction[0] === '_content' && Array.isArray(instruction[1])) {
-                // Recursively flatten the content instructions
-                const contentInstructions = this._flatten_instructions(instruction[1]);
-                result.push(...contentInstructions);
-            }
-            else {
-                // Regular instruction - keep as is
-                result.push(instruction);
-            }
-        }
-        return result;
-    }
     _apply_css_classes() {
         const hierarchy = this.constructor.get_class_hierarchy();
         // If component name differs from class name, add component name to hierarchy
@@ -6183,7 +6174,7 @@ function init(jQuery, config) {
     }
 }
 // Version - will be replaced during build with actual version from package.json
-const version = '2.3.59';
+const version = '2.3.61';
 // Default export with all functionality
 const jqhtml = {
     // Core