@jqhtml/core 2.3.59 → 2.3.64

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.64
  * (c) 2025 JQHTML Team
  * Released under the MIT License
  */
@@ -204,6 +204,21 @@ class LifecycleManager {
     }
 }
 
+/**
+ * The one rule for "is this name a component?"
+ *
+ * An optional SINGLE leading underscore, then a capital letter, then letters,
+ * digits and underscores. The underscore prefix is a namespace reserved for
+ * framework-provided components (`_Root_Layout`) so they cannot collide with
+ * application components. Two or more leading underscores are not a component
+ * name; a lower-case first letter after the optional underscore is an HTML tag.
+ */
+const COMPONENT_NAME_PATTERN = /^_?[A-Z][A-Za-z0-9_]*$/;
+const COMPONENT_NAME_RULE = 'must start with a capital letter, optionally preceded by a single underscore';
+function is_component_name(name) {
+    return COMPONENT_NAME_PATTERN.test(name);
+}
+
 /**
  * JQHTML v2 Component Registry
  *
@@ -250,9 +265,9 @@ function register_component(nameOrClass, component_class, template) {
         if (!component_class) {
             throw new Error('Component class is required when registering by name');
         }
-        // Validate component name starts with capital letter
-        if (!/^[A-Z]/.test(name)) {
-            throw new Error(`Component name '${name}' must start with a capital letter. Convention is First_Letter_With_Underscores.`);
+        // Validate component name against the shared rule
+        if (!is_component_name(name)) {
+            throw new Error(`Component name '${name}' ${COMPONENT_NAME_RULE}. Convention is First_Letter_With_Underscores.`);
         }
         component_classes.set(name, component_class);
         // If template provided, register it
@@ -321,9 +336,9 @@ function register_template(template_def) {
     if (!name) {
         throw new Error('Template must have a name property');
     }
-    // Validate template name starts with capital letter
-    if (!/^[A-Z]/.test(name)) {
-        throw new Error(`Template name '${name}' must start with a capital letter. Convention is First_Letter_With_Underscores.`);
+    // Validate template name against the shared rule
+    if (!is_component_name(name)) {
+        throw new Error(`Template name '${name}' ${COMPONENT_NAME_RULE}. Convention is First_Letter_With_Underscores.`);
     }
     // Check for duplicate registration
     if (component_templates.has(name)) {
@@ -639,7 +654,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 +682,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 +1867,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.64';
 const CLASS_MARKER = '__jqhtml_class__';
 const PROPS_MARKER = '__jqhtml_props__';
 /**
@@ -3849,10 +3876,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 +3904,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();
@@ -4976,7 +5002,8 @@ 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
+     * optionally preceded by a single underscore, such as 'Parent_Dashboard' or
+     * '_Root_Layout' - 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
@@ -5042,26 +5069,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
@@ -5073,14 +5080,16 @@ class Jqhtml_Component {
             // Add component name at the beginning (most specific)
             classesToAdd.unshift(this.args._component_name);
         }
-        // Filter out private classes (starting with _) and invalid class names
+        // Filter out private/mangled classes (starting with _) and invalid class names.
+        // A component name with the reserved single-underscore prefix (_Root_Layout)
+        // is public and is kept - see component-name.ts.
         const publicClasses = classesToAdd.filter(className => {
             // Guard against undefined, null, or non-string values
             if (!className || typeof className !== 'string') {
                 console.warn('[JQHTML] Filtered out invalid class name:', className);
                 return false;
             }
-            return !className.startsWith('_');
+            return !className.startsWith('_') || is_component_name(className);
         });
         if (publicClasses.length > 0) {
             this.$.addClass(publicClasses.join(' '));
@@ -5286,7 +5295,7 @@ 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_Component.COMPONENT_NAME_PATTERN = COMPONENT_NAME_PATTERN;
 
 /**
  * JQHTML v2 Template Renderer
@@ -5808,16 +5817,20 @@ function init_jquery_plugin(jQuery) {
             catch (error) {
                 console.warn('[JQHTML] Error stopping existing component during replacement:', error);
             }
-            // Remove component classes (any class starting with capital letter, except BEM classes)
+            // Remove component classes (any class starting with a capital letter, or a
+            // component name with the reserved underscore prefix - except BEM classes)
             const classes = element.attr('class');
             if (classes) {
                 const classList = classes.split(/\s+/);
                 const nonComponentClasses = classList.filter((cls) => {
                     // Keep class if:
                     // 1. It's empty
-                    // 2. It doesn't start with a capital letter
+                    // 2. It is neither capital-first nor a component name (see component-name.ts)
                     // 3. It's a BEM-style class (contains __) - these persist across reinitialization
-                    return !cls || cls[0] !== cls[0].toUpperCase() || cls[0] === cls[0].toLowerCase() || cls.includes('__');
+                    if (!cls || cls.includes('__'))
+                        return true;
+                    const capital_first = cls[0] === cls[0].toUpperCase() && cls[0] !== cls[0].toLowerCase();
+                    return !capital_first && !is_component_name(cls);
                 });
                 element.attr('class', nonComponentClasses.join(' '));
             }
@@ -6183,7 +6196,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.64';
 // Default export with all functionality
 const jqhtml = {
     // Core
@@ -6319,5 +6332,5 @@ if (typeof window !== 'undefined' && !window.jqhtml) {
     }
 }
 
-export { Jqhtml_Component, LifecycleManager as Jqhtml_LifecycleManager, Jqhtml_Local_Storage, LifecycleManager, Load_Coordinator, applyDebugDelay, boot, clear_preload_data, configure, create_component, jqhtml as default, devWarn, escape_html, escape_html_nl2br, extract_slots, get_captured_data, get_component_class, get_component_names, get_config, get_registered_templates, get_template, get_template_by_class, handleComponentError, has_component, init, init_jquery_plugin, isSequentialProcessing, list_components, logDataChange, logDispatch, logInstruction, logLifecycle, process_instructions, register, register_cache_class, register_component, register_template, render_template, set_preload_data, start_data_capture, stop_data_capture, version };
+export { COMPONENT_NAME_PATTERN, COMPONENT_NAME_RULE, Jqhtml_Component, LifecycleManager as Jqhtml_LifecycleManager, Jqhtml_Local_Storage, LifecycleManager, Load_Coordinator, applyDebugDelay, boot, clear_preload_data, configure, create_component, jqhtml as default, devWarn, escape_html, escape_html_nl2br, extract_slots, get_captured_data, get_component_class, get_component_names, get_config, get_registered_templates, get_template, get_template_by_class, handleComponentError, has_component, init, init_jquery_plugin, isSequentialProcessing, is_component_name, list_components, logDataChange, logDispatch, logInstruction, logLifecycle, process_instructions, register, register_cache_class, register_component, register_template, render_template, set_preload_data, start_data_capture, stop_data_capture, version };
 //# sourceMappingURL=jqhtml-core.esm.js.map