@daz4126/helium 1.0.0-beta.1 → 1.0.0-beta.3

package/helium.js

@@ -46,19 +46,23 @@ const defaultEngine = {
   }
 };
 
-// Factory function to create helium with custom engine and prefixes
+// Factory function to create helium with custom engine
 export function createHelium(options = {}) {
   const engine = options.engine ?? defaultEngine;
-  const prefix = options.prefix ?? 'he';           // 'he' or 'xe'
-  const rootAttr = options.rootAttr ?? 'helium';   // 'helium' or 'xenon'
 
-  // Build prefix-aware regex and matcher
-  const ATTR_REGEX = new RegExp(`^(@|:|data-${prefix})`);
+  // Engine-aware expression parser (CSP-safe when using jexpr engine)
+  const evalExpr = v => {
+    try {
+      const compiled = engine.compile(v, true);
+      const scope = engine.createScope ? engine.createScope({ state: {}, el: null, event: {}, refs: {}, $: null, html: null, get: null, post: null, put: null, patch: null, del: null }) : {};
+      return compiled.execute(scope);
+    } catch { return v; }
+  };
 
   const match = (name, ...attrs) => {
     const p = name.split(/[.:]/)[0];
     if (p === ":" || p === "") return false;
-    return attrs.some(a => p === `@${a}` || p === `data-${prefix}-${a}`);
+    return attrs.some(a => p === `@${a}` || p === 'data-he-' + a);
   };
 
   // Single global object to hold all settings (scoped to this instance)
@@ -67,7 +71,8 @@ export function createHelium(options = {}) {
   async function helium(initialState = {}) {
     const inits = [];
     const ALL = Symbol("all");
-    const root = document.querySelector(`[\\@${rootAttr}]`) || document.querySelector(`[data-${rootAttr}]`) || document.body;
+    const root = document.querySelector('[\\@helium]') || document.querySelector('[data-helium]') || document.body;
+    const storageKey = root.getAttribute('@local-storage') || root.getAttribute('data-he-local-storage');
 
     // Initialize or reuse HELIUM object
     if (!HELIUM) {
@@ -225,6 +230,7 @@ export function createHelium(options = {}) {
         const parentKey = HELIUM.parentKeys.get(t);
         if (parentKey) HELIUM.bindings.get(parentKey)?.forEach(safeApplyBinding);
         HELIUM.bindings.get(ALL)?.forEach(safeApplyBinding);
+        if (storageKey) localStorage.setItem(storageKey, JSON.stringify(state));
         return res
       }
   };
@@ -232,6 +238,9 @@ export function createHelium(options = {}) {
     // Initialize state if it doesn't exist
     const state = new Proxy({}, handler);
 
+    // Load from localStorage if key exists
+    if (storageKey) try { Object.assign(state, JSON.parse(localStorage.getItem(storageKey))); } catch {}
+
     // Merge initial state
     Object.assign(state, initialState);
 
@@ -373,7 +382,8 @@ export function createHelium(options = {}) {
      const heElements = [element, ...element.querySelectorAll("*")].filter(e => {
         if (HELIUM.processed.has(e)) return false;
         for (let i = 0; i < e.attributes.length; i++) {
-          if (ATTR_REGEX.test(e.attributes[i].name)) return true;
+          const n = e.attributes[i].name;
+          if (n[0] === '@' || n[0] === ':' || n.startsWith('data-he')) return true;
         }
         return false;
       });
@@ -386,7 +396,7 @@ export function createHelium(options = {}) {
       const importPromises = [];
 
       heElements.forEach((el) => {
-        const importAttr = el.getAttribute("@import") || el.getAttribute(`data-${prefix}-import`);
+        const importAttr = el.getAttribute("@import") || el.getAttribute('data-he-import');
         if (importAttr) {
           importAttr.split(",").map((m) => m.trim()).forEach((moduleName) => {
               // Build path: use as-is for URLs, otherwise resolve relative to document location
@@ -434,7 +444,7 @@ export function createHelium(options = {}) {
           const {name, value} = attrs[i];
 
           // Skip non-helium attributes early
-          if (!name.startsWith('@') && !name.startsWith(':') && !name.startsWith(`data-${prefix}`)) continue;
+          if (name[0] !== '@' && name[0] !== ':' && !name.startsWith('data-he')) continue;
 
           // Initialize state first if needed (skip reserved words, only if not already set)
           if (match(name, "text", "html", "bind") && isValidIdentifier(value) && !RESERVED.has(value) && state[value] == null) {
@@ -442,11 +452,11 @@ export function createHelium(options = {}) {
           }
 
           // Process the attribute
-          if (name === "@data" || name === `data-${prefix}`) {
-            Object.assign(state, parseEx(value));
+          if (name === "@data" || name === 'data-he') {
+            Object.assign(state, evalExpr(value));
           }
-          else if (name.startsWith(":") || name.startsWith(`data-${prefix}-attr:`)) {
-            const propName = name.startsWith(":") ? name.slice(1) : name.slice(prefix.length + 11);
+          else if (name.startsWith(":") || name.startsWith('data-he-attr:')) {
+            const propName = name.startsWith(":") ? name.slice(1) : name.slice(13);
             deferredBindings.push({el, prop: propName, compiled: compile(value, true)});
           }
           else if (match(name, "ref")) {
@@ -482,8 +492,8 @@ export function createHelium(options = {}) {
           else if (match(name, "init")) {
             inits.push({ compiled: compile(value, true), el });
           }
-          else if (name.startsWith("@") || name.startsWith(`data-${prefix}`)) {
-            const fullName = name.startsWith("@") ? name.slice(1) : name.slice(prefix.length + 6);
+          else if (name.startsWith("@") || name.startsWith('data-he')) {
+            const fullName = name.startsWith("@") ? name.slice(1) : name.slice(8);
             const [eventName, ...mods] = fullName.split(".");
             const isHttpMethod = ["get", "post", "put", "patch", "delete"].includes(eventName);
             const event = isHttpMethod ? getEvent(el) : eventName;
@@ -503,12 +513,12 @@ export function createHelium(options = {}) {
               }
               if (!mods.includes("outside") || !el.contains(e.target)) {
                 if (isHttpMethod) {
-                  const getAttr = name => el.getAttribute(`data-${prefix}-${name}`) || el.getAttribute(`@${name}`);
+                  const getAttr = a => el.getAttribute('data-he-' + a) || el.getAttribute('@' + a);
                   const pairs = (getAttr('target') || "").split(",").map(p => p.split(":").map(s => s.trim()));
                   const target = pairs.map(([target]) => target);
                   const action = pairs.map(([, action]) => action);
                   const options = {
-                    ...(getAttr("options") && parseEx(getAttr("options") || "{}")),
+                    ...(getAttr("options") && evalExpr(getAttr("options") || "{}")),
                     ...(target && { target }),
                     ...(action && { action }),
                     ...(getAttr("template") && { template: execExpr(getAttr("template")),}),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daz4126/helium",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.3",
   "main": "helium.js",
   "type": "module",
   "exports": {