lilact 0.30.1 → 0.31.1

package/dist/lilact.development.js

@@ -1716,11 +1716,13 @@ __export(symbols_exports, {
   INTERVAL: () => INTERVAL,
   IS_ZOMBIE: () => IS_ZOMBIE,
   LAZY: () => LAZY,
+  LOCATION: () => LOCATION,
   MEMOIZED: () => MEMOIZED,
   REPEAT: () => REPEAT,
   TEXT: () => TEXT2
 });
 var [
+  LOCATION,
   CORE,
   COMPONENT,
   TEXT2,
@@ -1736,6 +1738,7 @@ var [
   CALLBACK,
   ARGS
 ] = [
+  /* @__PURE__ */ Symbol.for("LILACT:LOCATION"),
   /* @__PURE__ */ Symbol.for("LILACT:CORE"),
   /* @__PURE__ */ Symbol.for("LILACT:COMPONENT"),
   /* @__PURE__ */ Symbol.for("LILACT:TEXT"),
@@ -2350,7 +2353,6 @@ __export(components_exports, {
   current_component: () => current_component,
   effect_timeout: () => effect_timeout,
   events_set: () => events_set,
-  hotReloadRoot: () => hotReloadRoot,
   insertion_effects: () => insertion_effects,
   layout_effects: () => layout_effects,
   length_css_attributes_set: () => length_css_attributes_set,
@@ -2371,6 +2373,16 @@ var SVG_NS = "http://www.w3.org/2000/svg";
 function getComponentEntity(entity) {
   return entity?.[MEMOIZED] ? entity.component : entity;
 }
+var hotEntityAliases = /* @__PURE__ */ new Map();
+function resolveHotEntity(entity) {
+  entity = getComponentEntity(entity);
+  const visited = /* @__PURE__ */ new Set();
+  while (typeof entity === "function" && hotEntityAliases.has(entity) && !visited.has(entity)) {
+    visited.add(entity);
+    entity = hotEntityAliases.get(entity);
+  }
+  return entity;
+}
 var componentInstances = /* @__PURE__ */ new Map();
 function registerComponentCore(core) {
   const entity = getComponentEntity(core.entity);
@@ -2416,7 +2428,7 @@ function replaceComponentEntity(componentCore, nextEntity) {
     return false;
   }
   const oldEntity = getComponentEntity(componentCore.entity);
-  const newEntity = getComponentEntity(nextEntity);
+  const newEntity = resolveHotEntity(nextEntity);
   if (oldEntity === newEntity) {
     return true;
   }
@@ -2442,6 +2454,11 @@ function replaceAllComponentInstances(oldEntity, newEntity) {
   if (typeof oldEntity !== "function" || typeof newEntity !== "function") {
     return 0;
   }
+  newEntity = resolveHotEntity(newEntity);
+  if (oldEntity === newEntity) {
+    return 0;
+  }
+  hotEntityAliases.set(oldEntity, newEntity);
   const instances = componentInstances.get(oldEntity);
   if (!instances) {
     return 0;
@@ -2471,7 +2488,7 @@ var ComponentCache = class {
       componentCore = bucket[bucket[IDX]];
       bucket[IDX]++;
       const oldEntity = getComponentEntity(componentCore.entity);
-      const newEntity = getComponentEntity(nextEntity);
+      const newEntity = resolveHotEntity(nextEntity);
       const incompatible = typeof oldEntity !== typeof newEntity || typeof oldEntity === "function" && isClass(oldEntity) !== isClass(newEntity);
       if (incompatible) {
         componentCore = construct_func();
@@ -2898,10 +2915,11 @@ var renderErrorHandler = (c, e) => {
 };
 function constructFunc(core, parent) {
   let comp = core;
-  if (core[TEXT2] !== void 0) {
-  } else {
+  if (core[TEXT2] === void 0) {
     let entity = core.entity;
     let memoized = false;
+    const loc = core.props[LOCATION];
+    if (loc) delete core.props[LOCATION];
     if (typeof entity === "object") {
       if (entity[MEMOIZED]) {
         memoized = entity[MEMOIZED];
@@ -2910,52 +2928,64 @@ function constructFunc(core, parent) {
         throw new Error("Invalid component.");
       }
     }
+    entity = resolveHotEntity(entity);
     if (typeof entity === "string") {
       comp = new HTMLComponent(entity, core.props);
-    } else {
-      if (isClass(entity)) {
-        if (entity?.defaultProps) {
-          core.props = { ...entity.defaultProps, ...core.props };
-        }
-        comp = new entity(core.props);
-        const desc = Object.getOwnPropertyDescriptor(comp, "state");
-        if (desc) {
-          if (typeof desc.get !== "function" && typeof desc.set !== "function") {
-            comp[CORE].state = comp.state;
-            Object.defineProperty(comp, "state", {
-              get() {
-                return this[CORE].state;
-              },
-              set(v) {
-                if (this[CORE].state === void 0) {
-                  this[CORE].state = v;
-                } else {
-                  throw new Error("Assigning component state this way is not allowed.");
-                }
+    } else if (isClass(entity)) {
+      if (entity?.defaultProps) {
+        core.props = {
+          ...entity.defaultProps,
+          ...core.props
+        };
+      }
+      comp = new entity(core.props);
+      const desc = Object.getOwnPropertyDescriptor(comp, "state");
+      if (desc) {
+        if (typeof desc.get !== "function" && typeof desc.set !== "function") {
+          comp[CORE].state = comp.state;
+          Object.defineProperty(comp, "state", {
+            get() {
+              return this[CORE].state;
+            },
+            set(value) {
+              if (this[CORE].state === void 0) {
+                this[CORE].state = value;
+              } else {
+                throw new Error(
+                  "Assigning component state this way is not allowed."
+                );
               }
-            });
-          }
-        }
-      } else if (typeof entity === "function") {
-        if (entity?.defaultProps) {
-          core.props = { ...entity.defaultProps, ...core.props };
+            }
+          });
         }
-        comp = new Component(core.props);
-        comp.render = entity.bind(comp);
-        comp[CORE].hooks = [];
-        comp[CORE].hook_index = 0;
-      } else {
-        throw new Error("Error in constructing component.");
       }
-      comp[CORE].entity = entity;
-      registerComponentCore(comp[CORE]);
-      if (core.container) {
-        comp[CORE].container = core.container;
+    } else if (typeof entity === "function") {
+      if (entity?.defaultProps) {
+        core.props = {
+          ...entity.defaultProps,
+          ...core.props
+        };
       }
+      comp = new Component(core.props);
+      comp.render = entity.bind(comp);
+      comp[CORE].hooks = [];
+      comp[CORE].hook_index = 0;
+    } else {
+      throw new Error("Error in constructing component.");
+    }
+    if (loc) comp[CORE].location = loc;
+    comp[CORE].entity = entity;
+    registerComponentCore(comp[CORE]);
+    if (core.container) {
+      comp[CORE].container = core.container;
+    }
+    if (memoized) {
+      comp[CORE][MEMOIZED] = true;
     }
-    if (memoized) comp[CORE][MEMOIZED] = true;
   }
-  if (parent instanceof ComponentCore) comp[CORE].parent = parent;
+  if (parent instanceof ComponentCore) {
+    comp[CORE].parent = parent;
+  }
   return comp;
 }
 function prepareCore(parent, core) {
@@ -3237,24 +3267,10 @@ function createRoot(element) {
       }
     },
     getCore() {
-      console.log(root, root[CORE]);
       return root[CORE];
     }
   };
 }
-function hotReloadRoot(rootCore, nextEntity, props) {
-  if (!rootCore || !rootCore.component) {
-    throw new Error("Invalid root component.");
-  }
-  const replaced = replaceComponentEntity(rootCore, nextEntity);
-  if (!replaced) {
-    throw new Error(
-      "Cannot hot-reload the root from a class component to a function component, or vice versa."
-    );
-  }
-  rootCore.apply(props === void 0 ? rootCore.props : { ...rootCore.props, ...props });
-  return rootCore;
-}
 function createPortal(children, element) {
   return createComponent2(lilact_default.Portal, { "view": element }, children);
 }
@@ -3969,6 +3985,7 @@ function run(jsx, path = `InlineJSX-${++lilact_default.eval_num}`, options = {})
       appendSourcemap: true,
       injectTraceLabels: true,
       produceCJS: true,
+      addLocationProp: true,
       blocksInfo: lilact_default.blocksInfo
     });
   } catch (value) {
@@ -6216,6 +6233,7 @@ function processImportExports(node3, jsx2, meta) {
 }
 
 // .tmp/src/jsx.js
+var LOCATION2 = /* @__PURE__ */ Symbol.for("LILACT:LOCATION");
 var transpilerConfig = {
   setBlockLabels: true,
   enableLabelStack: false,
@@ -6930,6 +6948,7 @@ function transpileJSX(jsx2, {
   discardComments = false,
   produceCJS = false,
   logErrors = false,
+  addLocationProp = false,
   // lilact internal
   mappings = [],
   meta,
@@ -7073,7 +7092,10 @@ function transpileJSX(jsx2, {
         }
       }
       const loc = getRowCol(eols, node3.begin);
-      out2 = ` ${factory}( ${node3.tag}, { ${out2} )`;
+      if (addLocationProp)
+        out2 = ` ${factory}( ${node3.tag}, { [Lilact.LOCATION]:["${path2}", ${loc}], ${out2} )`;
+      else
+        out2 = ` ${factory}( ${node3.tag}, { ${out2} )`;
       return out2;
     }
   };
@@ -7098,7 +7120,7 @@ function transpileJSX(jsx2, {
 
 // .tmp/src/lilact.jsx
 var Lilact2 = {
-  VERSION: "RC.6",
+  VERSION: "RC.7",
   // Configuration
   defaultTransitionTimeout: 300,
   defaultIsEqual: Object.is,
@@ -7176,6 +7198,7 @@ export {
   INTERVAL,
   IS_ZOMBIE,
   LAZY,
+  LOCATION,
   Lilact2 as Lilact,
   Link,
   MEMOIZED,
@@ -7225,7 +7248,6 @@ export {
   getComponentByPointer,
   globalErrorHandler,
   grabTimers,
-  hotReloadRoot,
   id_num,
   insertion_effects,
   isAsync,