@jqhtml/core 2.3.54 → 2.3.61

package/dist/index.js

@@ -634,7 +634,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
@@ -660,6 +662,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);
@@ -856,11 +868,22 @@ function process_rawtag_to_html(instruction, html) {
         }
     }
     html.push('>');
-    // Add raw content - escape HTML entities but preserve whitespace
-    const escaped_content = rawContent
-        .replace(/&/g, '&')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;');
+    // Add raw content, preserving whitespace.
+    //
+    // <textarea> holds text and nothing else, so everything is escaped.
+    //
+    // <pre> holds phrasing content - <pre><code> is the standard code-block idiom - so
+    // markup the author wrote is passed through. A '<' that does not begin a tag is
+    // still escaped, which is what the HTML tokenizer itself does with a stray '<' and
+    // keeps code samples such as "if (a < b)" rendering as written. Interpolated
+    // values are escaped by the compiler before they reach this point.
+    const is_raw_html_content = tagName.toLowerCase() === 'pre';
+    const escaped_content = is_raw_html_content
+        ? rawContent.replace(/<(?![a-zA-Z/!?])/g, '&lt;')
+        : rawContent
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;');
     html.push(escaped_content);
     // Close tag
     html.push(`</${tagName}>`);
@@ -1532,6 +1555,11 @@ class Load_Coordinator {
                     }
                     if (!uncacheable_property) {
                         uncacheable_property = key;
+                        // This package compiles with strictNullChecks off, and without it
+                        // TypeScript will not narrow a discriminated union by its boolean
+                        // discriminant - so `serialized` is still the full Serialize_Result
+                        // here even though `ok` has been ruled out above. The cast states
+                        // what the control flow already guarantees.
                         uncacheable_reason = serialized.reason;
                     }
                     return { key: null, uncacheable_property, uncacheable_reason };
@@ -1819,7 +1847,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.54';
+const CORE_VERSION = '2.3.61';
 const CLASS_MARKER = '__jqhtml_class__';
 const PROPS_MARKER = '__jqhtml_props__';
 /**
@@ -3828,10 +3856,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];
@@ -3856,12 +3884,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();
@@ -4953,11 +4980,21 @@ class Jqhtml_Component {
     }
     /**
      * Find closest ancestor component matching selector
+     *
+     * A bare component name - a plain identifier starting with a capital letter,
+     * such as 'Parent_Dashboard' - is treated as the component-name class
+     * selector '.Parent_Dashboard'. Components carry a CSS class for every name
+     * in their prototype chain, so a base class name matches its subclasses too.
+     * Every other selector ('.Foo', '#id', '[attr]', 'div > .Component') is
+     * passed to jQuery unchanged.
      */
     closest(selector) {
+        const search = Jqhtml_Component.COMPONENT_NAME_PATTERN.test(selector)
+            ? `.${selector}`
+            : selector;
         let current = this.$.parent();
         while (current.length > 0) {
-            if (current.is(selector)) {
+            if (current.is(search)) {
                 const comp = current.data('_component');
                 if (comp instanceof Jqhtml_Component) {
                     return comp;
@@ -5011,26 +5048,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
@@ -5254,6 +5271,8 @@ class Jqhtml_Component {
 }
 // Static properties
 Jqhtml_Component.__jqhtml_component = true; // Marker for unified register() detection
+// A bare component name, as accepted by closest() in place of a class selector
+Jqhtml_Component.COMPONENT_NAME_PATTERN = /^[A-Z][A-Za-z0-9_]*$/;
 
 /**
  * JQHTML v2 Template Renderer
@@ -6150,7 +6169,7 @@ function init(jQuery, config) {
     }
 }
 // Version - will be replaced during build with actual version from package.json
-const version = '2.3.54';
+const version = '2.3.61';
 // Default export with all functionality
 const jqhtml = {
     // Core