@motifx/compiler 1.2.0-rc.3 → 1.2.0-rc.5

package/dist/index.esm.js

@@ -430,7 +430,7 @@ const motifComponent = () => { return "_mc"; };
 const motifFragment = () => { return "_mf"; };
 const motifFunctionComponent = () => { return "_mfc"; };
 const motifCompiled = () => { return "_mv"; };
-const COMPILER_CONTRACT = 2;
+const COMPILER_CONTRACT = 1;
 
 let active$1 = null;
 let seen = null;
@@ -509,11 +509,64 @@ const makeHtmlAttr = (prop, name, value, path) => {
     }
     return null;
 };
+function classKeyOf(p) {
+    if (p.computed)
+        return p.key;
+    if (t.isIdentifier(p.key))
+        return t.stringLiteral(p.key.name);
+    if (t.isStringLiteral(p.key))
+        return t.stringLiteral(p.key.value);
+    if (t.isNumericLiteral(p.key))
+        return t.stringLiteral(String(p.key.value));
+    return null;
+}
+function literalTruthOf(val) {
+    if (t.isBooleanLiteral(val))
+        return val.value;
+    if (t.isStringLiteral(val))
+        return val.value !== '';
+    if (t.isNumericLiteral(val))
+        return val.value !== 0 && !Number.isNaN(val.value);
+    if (t.isNullLiteral(val))
+        return false;
+    if (t.isIdentifier(val) && val.name === 'undefined')
+        return false;
+    if (t.isTemplateLiteral(val) && val.expressions.length === 0)
+        return val.quasis.some(q => (q.value.cooked ?? q.value.raw) !== '');
+    return undefined;
+}
+function splitClassObject(obj, staticNames, live) {
+    const props = [];
+    obj.properties.forEach(p => {
+        if (!t.isObjectProperty(p)) {
+            props.push(p);
+            return;
+        }
+        const key = classKeyOf(p);
+        if (key === null || !t.isExpression(p.value))
+            return;
+        const truth = literalTruthOf(p.value);
+        if (truth === false)
+            return;
+        if (truth === true) {
+            if (t.isStringLiteral(key))
+                staticNames.push(key);
+            else
+                props.push(t.objectProperty(key, t.booleanLiteral(true), true));
+            return;
+        }
+        const getter = t.isFunctionExpression(p.value) || t.isArrowFunctionExpression(p.value)
+            ? p.value
+            : t.arrowFunctionExpression([], p.value);
+        props.push(t.objectProperty(key, getter, p.computed));
+    });
+    if (props.length > 0)
+        live.push(t.objectExpression(props));
+}
 const mergeHtmlAttributes = (htmlAttrlist) => {
     const htmlProps = [];
     if (htmlAttrlist.length > 0) {
         var totalAttr = [];
-        var totalClass = [];
         var totalBindClass = [];
         var totalStringClass = [];
         htmlAttrlist.forEach(attr => {
@@ -523,38 +576,7 @@ const mergeHtmlAttributes = (htmlAttrlist) => {
                     : attr.key.quasis.map(q => q.value.raw).join("").toLowerCase();
                 if (keyValue === "class" || keyValue === "classname") {
                     if (t.isObjectExpression(attr.value)) {
-                        const objectProperties = [];
-                        attr.value.properties.forEach(p => {
-                            if (t.isObjectProperty(p)) {
-                                const val = p.value;
-                                if (t.isStringLiteral(val)) {
-                                    totalStringClass.push(p.key);
-                                }
-                                else if (t.isBooleanLiteral(val)) {
-                                    totalStringClass.push(p.key);
-                                }
-                                else if (t.isFunctionExpression(val) || t.isArrowFunctionExpression(val)) {
-                                    objectProperties.push(p);
-                                }
-                                else if (t.isTemplateLiteral(val)) {
-                                    if (val.expressions.length === 0) {
-                                        totalStringClass.push(t.stringLiteral(val.quasis.map(q => q.value.raw).join("")));
-                                    }
-                                    else {
-                                        totalBindClass.push(t.arrowFunctionExpression([], val));
-                                    }
-                                }
-                                else {
-                                    totalClass.push(p);
-                                }
-                            }
-                            else if (t.isFunctionExpression(p) || t.isArrowFunctionExpression(p)) {
-                                totalBindClass.push(p);
-                            }
-                        });
-                        if (objectProperties.length > 0) {
-                            totalBindClass.push(t.objectExpression(objectProperties));
-                        }
+                        splitClassObject(attr.value, totalStringClass, totalBindClass);
                     }
                     else if (t.isMemberExpression(attr.value) || t.isCallExpression(attr.value)) {
                         totalBindClass.push(attr.value);
@@ -581,34 +603,7 @@ const mergeHtmlAttributes = (htmlAttrlist) => {
                             if (!element)
                                 return;
                             if (t.isObjectExpression(element)) {
-                                element.properties.forEach(p => {
-                                    if (t.isObjectProperty(p)) {
-                                        const val = p.value;
-                                        if (t.isStringLiteral(val)) {
-                                            totalStringClass.push(p.key);
-                                        }
-                                        else if (t.isBooleanLiteral(val)) {
-                                            totalStringClass.push(p.key);
-                                        }
-                                        else if (t.isFunctionExpression(val) || t.isArrowFunctionExpression(val)) {
-                                            totalBindClass.push(val);
-                                        }
-                                        else if (t.isTemplateLiteral(val)) {
-                                            if (val.expressions.length === 0) {
-                                                totalStringClass.push(t.stringLiteral(val.quasis.map(q => q.value.raw).join("")));
-                                            }
-                                            else {
-                                                totalBindClass.push(t.arrowFunctionExpression([], val));
-                                            }
-                                        }
-                                        else {
-                                            totalClass.push(p);
-                                        }
-                                    }
-                                    else if (t.isFunctionExpression(p) || t.isArrowFunctionExpression(p)) {
-                                        totalBindClass.push(p);
-                                    }
-                                });
+                                splitClassObject(element, totalStringClass, totalBindClass);
                             }
                             else if (t.isStringLiteral(element)) {
                                 totalStringClass.push(element);
@@ -697,9 +692,6 @@ const mergeHtmlAttributes = (htmlAttrlist) => {
         if (totalBindClass.length > 0) {
             htmlProps.push(t.expressionStatement(t.callExpression(t.identifier('sender.class.add'), [t.arrayExpression(totalBindClass)])));
         }
-        if (totalClass.length > 0) {
-            htmlProps.push(t.expressionStatement(t.callExpression(t.identifier('sender.class.add'), [t.objectExpression(totalClass)])));
-        }
         if (totalStringClass.length > 0) {
             htmlProps.push(t.expressionStatement(t.callExpression(t.identifier('sender.class.add'), [...totalStringClass])));
         }
@@ -1397,6 +1389,19 @@ function lifecycleHookOf(name) {
         hook = lower.slice(2);
     return hook !== null && LIFECYCLE_HOOKS.has(hook) ? hook : null;
 }
+const HOOK_KEYS = {
+    built: 'onBuilt', building: 'onBuilding', mounted: 'onMounted', config: 'onConfig', configured: 'onConfigured',
+    initializing: 'onInitializing', initialized: 'onInitialized', disposing: 'onDisposing', disposed: 'onDisposed',
+    visibilitychanged: 'onVisibilityChanged', activated: 'onActivated', deactivated: 'onDeactivated',
+};
+function hookKey(name) {
+    const hook = lifecycleHookOf(name);
+    if (hook !== null)
+        return HOOK_KEYS[hook];
+    if (name.toLowerCase() === 'oninitializecomponent')
+        return 'oninitializeComponent';
+    return name;
+}
 /** `.some/.every/.find/...` gibi KISA DEVRE yapan dizi yüklemleri (MJX004). */
 const SHORT_CIRCUIT_ARRAY_METHODS = new Set(['some', 'every', 'find', 'findindex', 'findlast', 'findlastindex']);
 /** Bir üye zincirinin kökü `this` mi? (`this.state.rows.some(...)` → evet) */
@@ -1706,14 +1711,14 @@ const getProps = (props, path, state) => {
                     if (value != null) {
                         var ce = makeComponentTraps(prop, name, value);
                         if (ce !== null) {
+                            ce.key = id(hookKey(name));
                             componentEvents.push(ce);
                             explainProp(prop, 'component-event', 'lifecycle', ce, 'n/a', DEPS.none, 'lifecycle hook; called once during component setup/build/dispose');
                         }
                     }
                 }
                 else if (!plainTag && mergedHook !== null && value != null && t.isExpression(value)) {
-                    const key = name.toLowerCase().startsWith('on') ? name : 'on' + mergedHook;
-                    const lifecycleProp = t.objectProperty(t.isValidIdentifier(key) ? id(key) : t.stringLiteral(key), value);
+                    const lifecycleProp = t.objectProperty(id(HOOK_KEYS[mergedHook]), value);
                     componentEvents.push(lifecycleProp);
                     explainProp(prop, 'component-event', 'lifecycle', lifecycleProp, 'n/a', DEPS.none, 'lifecycle hook; on a component tag it is applied via runover to the tag\'s component (the returned root for a function component)');
                 }
@@ -1846,7 +1851,7 @@ const getProps = (props, path, state) => {
                                 warn('MJX007', `Unknown directive "${name}": it is passed on as the prop "on${clearedName}". Supported: ${supportedDirectivesText()}.`, prop, fileName);
                             }
                             if (t.isExpression(value)) {
-                                objectExpression.push(t.objectProperty(id("on" + clearedName), value));
+                                objectExpression.push(t.objectProperty(id(hookKey("on" + clearedName)), value));
                             }
                             else {
                                 objectProps.push(value);
@@ -1899,10 +1904,17 @@ const getProps = (props, path, state) => {
                         if (atr !== null) {
                             htmlAttrlist.push(atr);
                             const lname = name.toLowerCase();
-                            const c = classifyAttrValue(prop, value, atr);
-                            const call = lname === 'class' || lname === 'classname' ? 'sender.class.add' : lname === 'style' ? 'sender.style' : 'sender.attr.add';
-                            const shown = call === 'sender.attr.add' ? `${call}({ "${name}": ${codeOf(atr.value)} })` : `${call}(${codeOf(atr.value)})`;
-                            explainProp(prop, 'attr', c.shape, shown, c.reactive, c.deps, c.note);
+                            if ((lname === 'class' || lname === 'classname') && (t.isObjectExpression(atr.value) || t.isArrayExpression(atr.value))) {
+                                const lowered = mergeHtmlAttributes([atr]);
+                                const live = lowered.some(s => t.isCallExpression(s.expression) && t.isArrayExpression(s.expression.arguments[0]));
+                                explainProp(prop, 'attr', 'class.object', lowered.map(s => codeOf(s.expression)).join('; '), live ? 'live' : 'static', live ? DEPS.getter : DEPS.none, live ? 'each key toggles its class; values other than literals are wrapped in getters' : undefined);
+                            }
+                            else {
+                                const c = classifyAttrValue(prop, value, atr);
+                                const call = lname === 'class' || lname === 'classname' ? 'sender.class.add' : lname === 'style' ? 'sender.style' : 'sender.attr.add';
+                                const shown = call === 'sender.attr.add' ? `${call}({ "${name}": ${codeOf(atr.value)} })` : `${call}(${codeOf(atr.value)})`;
+                                explainProp(prop, 'attr', c.shape, shown, c.reactive, c.deps, c.note);
+                            }
                         }
                     }
                     else {
@@ -1932,7 +1944,7 @@ const getProps = (props, path, state) => {
                                 objectExpression.push(t.objectProperty(t.stringLiteral(name), value));
                             }
                             else {
-                                objectExpression.push(t.objectProperty(id(name), value));
+                                objectExpression.push(t.objectProperty(id(hookKey(name)), value));
                             }
                             {
                                 const c = classifyPropValue(prop, value);
@@ -1961,7 +1973,7 @@ const getProps = (props, path, state) => {
     mergedHooks.forEach((entries, hook) => {
         if (entries.length === 0)
             return;
-        const merged = t.objectProperty(id('on' + hook), t.arrayExpression(entries.map(e => e.value)));
+        const merged = t.objectProperty(id(HOOK_KEYS[hook]), t.arrayExpression(entries.map(e => e.value)));
         componentEvents.push(merged);
         entries.forEach(e => explainProp(e.prop, 'component-event', 'lifecycle', merged, 'n/a', DEPS.none, 'all spellings of the same hook on this tag are merged into one list; each is called once, in source order'));
     });
@@ -3167,7 +3179,7 @@ class Compiler {
                                                 return;
                                             if (!t.isArrowFunctionExpression(only.value) && !t.isFunctionExpression(only.value))
                                                 return;
-                                            node.arguments[1] = only.value;
+                                            node.arguments.push(t.numericLiteral(1));
                                         }
                                     });
                                     absorbGeneratedCoreImports(topLevel, coreImports);