@mintjamsinc/ichigojs 0.1.65 → 0.1.66

package/dist/ichigo.esm.js

@@ -6859,11 +6859,16 @@ class ExpressionUtils {
                 const ast = parse(source, { ecmaVersion: "latest" });
                 const dependencies = new Set();
                 const declaredVariables = new Set();
+                const thisAliases = new Set();
                 // First, collect all declared variables (const, let, var, function params, etc.)
                 ancestor(ast, {
                     VariableDeclarator(node) {
                         if (node.id.type === 'Identifier') {
                             declaredVariables.add(node.id.name);
+                            // Detect aliases assigned from `this`, e.g. `let vm = this;`
+                            if (node.init && node.init.type === 'ThisExpression') {
+                                thisAliases.add(node.id.name);
+                            }
                         }
                     },
                     FunctionDeclaration(node) {
@@ -6915,9 +6920,14 @@ class ExpressionUtils {
                         }
                     },
                     MemberExpression(node) {
-                        // Handle 'this.propertyName' patterns
-                        if (node.object.type === 'ThisExpression' && node.property.type === 'Identifier') {
-                            dependencies.add(node.property.name);
+                        // Handle 'this.propertyName' patterns and aliases like 'vm.x' when 'vm = this'
+                        if (node.property.type === 'Identifier') {
+                            if (node.object.type === 'ThisExpression') {
+                                dependencies.add(node.property.name);
+                            }
+                            else if (node.object.type === 'Identifier' && thisAliases.has(node.object.name)) {
+                                dependencies.add(node.property.name);
+                            }
                         }
                     }
                 });
@@ -7011,7 +7021,7 @@ class ExpressionUtils {
             return expression;
         }
         try {
-            // Build a map of positions to replace: { start: number, end: number, name: string }[]
+            // Build a map of positions to replace: { start: number, end: number, name: string, asThisAlias?: boolean }[]
             const replacements = [];
             // In script mode we must not wrap in parens (that would make multi-statement input invalid).
             // Offsets from the parser therefore refer directly to the original expression, so no shift.
@@ -7020,13 +7030,17 @@ class ExpressionUtils {
             const offsetShift = asScript ? 0 : 1;
             const parsedAst = parse(source, { ecmaVersion: 'latest' });
             // Track identifiers that are locally declared within the handler body (let/const/var, function
-            // params) so we don't rewrite them to `this.xxx`. Only relevant in script mode, where the user
-            // can write declarations; in expression mode there are no declarations to track.
+            // params) so we don't rewrite them to `this.xxx`. Additionally detect `this` aliases such as
+            // `let vm = this;` so that `vm.x` can be rewritten to `this.x` even though `vm` is locally declared.
             const locallyDeclared = new Set();
+            const thisAliases = new Set();
             if (asScript) {
                 full(parsedAst, (node) => {
                     if (node.type === 'VariableDeclarator' && node.id?.type === 'Identifier') {
                         locallyDeclared.add(node.id.name);
+                        if (node.init && node.init.type === 'ThisExpression') {
+                            thisAliases.add(node.id.name);
+                        }
                     }
                     else if (node.type === 'FunctionDeclaration' && node.id?.type === 'Identifier') {
                         locallyDeclared.add(node.id.name);
@@ -7043,20 +7057,34 @@ class ExpressionUtils {
                 if (!bindingIdentifiers.has(node.name)) {
                     return;
                 }
-                // Skip identifiers that were declared locally in the handler body
+                // Locally declared identifiers must not be rewritten to `this.xxx`. The one
+                // exception is a `this`-alias (e.g. `let vm = this;`): when such an alias is
+                // used as the OBJECT of a MemberExpression (`vm.x`), we replace just the
+                // object with `this` so that `vm.x` becomes `this.x`. In every other position
+                // (the declaration LHS, a bare reference such as `console.log(vm)`, an
+                // argument, etc.) the alias must be left untouched — rewriting it to
+                // `this.vm` would either produce a syntax error (`let this.vm = this;`) or
+                // change the meaning at runtime.
+                // walk.fullAncestor includes the visited node itself as the last entry of
+                // `ancestors`, so the actual parent node is at length - 2.
+                const parentNode = ancestors.length >= 2 ? ancestors[ancestors.length - 2] : undefined;
+                const isAliasAsMemberObject = parentNode?.type === 'MemberExpression' && parentNode.object === node;
                 if (locallyDeclared.has(node.name)) {
+                    if (!thisAliases.has(node.name) || !isAliasAsMemberObject) {
+                        return;
+                    }
+                    replacements.push({
+                        start: node.start - offsetShift,
+                        end: node.end - offsetShift,
+                        name: node.name,
+                        asThisAlias: true
+                    });
                     return;
                 }
-                // Check if this identifier is a property of a MemberExpression
-                // (e.g., in 'obj.prop', we should skip 'prop')
-                if (ancestors.length >= 1) {
-                    const parent = ancestors[ancestors.length - 1];
-                    if (parent.type === 'MemberExpression') {
-                        // Skip if this identifier is the property (not the object) of a non-computed member access
-                        if (!parent.computed && parent.property === node) {
-                            return;
-                        }
-                    }
+                // Skip identifiers that are the property (not the object) of a non-computed
+                // member access (e.g., the `prop` in `obj.prop`).
+                if (parentNode?.type === 'MemberExpression' && !parentNode.computed && parentNode.property === node) {
+                    return;
                 }
                 // Add to replacements list (adjust for the wrapping parentheses in expression mode)
                 replacements.push({
@@ -7070,9 +7098,8 @@ class ExpressionUtils {
             // Apply replacements
             let result = expression;
             for (const replacement of replacements) {
-                result = result.substring(0, replacement.start) +
-                    `this.${replacement.name}` +
-                    result.substring(replacement.end);
+                const insertion = replacement.asThisAlias ? 'this' : `this.${replacement.name}`;
+                result = result.substring(0, replacement.start) + insertion + result.substring(replacement.end);
             }
             return result;
         }
@@ -11164,12 +11191,23 @@ class VModelDirective {
     #collectDependentIdentifiers() {
         const ids = new Set(this.#evaluator?.dependentIdentifiers ?? []);
         const element = this.#vNode.node;
-        if (element instanceof HTMLInputElement && element.type === 'checkbox') {
+        if (element instanceof HTMLInputElement) {
             const manager = this.#vNode.directiveManager;
-            for (const attrName of ['value', 'true-value', 'false-value']) {
-                const bindDirective = manager?.findBindDirective(attrName);
-                if (bindDirective) {
-                    bindDirective.dependentIdentifiers.forEach(id => ids.add(id));
+            // For checkboxes and radios, v-model's rendered state depends on
+            // the element's typed `:value` binding (if present). Checkboxes
+            // additionally depend on `:true-value` / `:false-value` bindings.
+            if (element.type === 'checkbox' || element.type === 'radio') {
+                const valueBind = manager?.findBindDirective('value');
+                if (valueBind) {
+                    valueBind.dependentIdentifiers.forEach(id => ids.add(id));
+                }
+            }
+            if (element.type === 'checkbox') {
+                for (const attrName of ['true-value', 'false-value']) {
+                    const bindDirective = manager?.findBindDirective(attrName);
+                    if (bindDirective) {
+                        bindDirective.dependentIdentifiers.forEach(id => ids.add(id));
+                    }
                 }
             }
         }
@@ -11256,11 +11294,13 @@ class VModelDirective {
                 this.#renderCheckbox(element, value);
             }
             else if (element.type === 'radio') {
-                // Prefer the original typed value stored by VBindDirective (:value binding)
-                // to avoid type coercion issues (e.g., boolean false vs string "false").
-                const radioValue = element._value !== undefined
-                    ? element._value
-                    : element.value;
+                // Prefer the typed value from a sibling :value binding when present,
+                // falling back to any stored `_value` or the raw string `value`.
+                const manager = this.#vNode.directiveManager;
+                const bindDirective = manager?.findBindDirective('value');
+                const radioValue = bindDirective !== undefined
+                    ? bindDirective.evaluate()
+                    : (element._value !== undefined ? element._value : element.value);
                 element.checked = radioValue === value;
             }
             else {
@@ -11289,11 +11329,13 @@ class VModelDirective {
                     newValue = this.#computeCheckboxNewValue(target);
                 }
                 else if (target.type === 'radio') {
-                    // Prefer the original typed value stored by VBindDirective (:value binding)
-                    // to preserve the type on write-back (e.g., boolean false, number 0).
-                    newValue = target._value !== undefined
-                        ? target._value
-                        : target.value;
+                    // Prefer the typed value from a sibling :value binding when present,
+                    // falling back to any stored `_value` or the raw string `value`.
+                    const manager = this.#vNode.directiveManager;
+                    const bindDirective = manager?.findBindDirective('value');
+                    newValue = bindDirective !== undefined
+                        ? bindDirective.evaluate()
+                        : (target._value !== undefined ? target._value : target.value);
                 }
                 else {
                     newValue = target.value;