@lark.js/mvc 0.0.13 → 0.0.14

package/dist/compiler.js

@@ -14512,7 +14512,7 @@ var require_lib = __commonJS({
         options = Object.assign({}, options);
         try {
           options.sourceType = "module";
-          const parser = getParser2(options, input);
+          const parser = getParser(options, input);
           const ast = parser.parse();
           if (parser.sawUnambiguousESM) {
             return ast;
@@ -14520,7 +14520,7 @@ var require_lib = __commonJS({
           if (parser.ambiguousScriptDifferentAst) {
             try {
               options.sourceType = "script";
-              return getParser2(options, input).parse();
+              return getParser(options, input).parse();
             } catch (_unused) {
             }
           } else {
@@ -14530,17 +14530,17 @@ var require_lib = __commonJS({
         } catch (moduleError) {
           try {
             options.sourceType = "script";
-            return getParser2(options, input).parse();
+            return getParser(options, input).parse();
           } catch (_unused2) {
           }
           throw moduleError;
         }
       } else {
-        return getParser2(options, input).parse();
+        return getParser(options, input).parse();
       }
     }
     function parseExpression(input, options) {
-      const parser = getParser2(options, input);
+      const parser = getParser(options, input);
       if (parser.options.strictMode) {
         parser.state.strict = true;
       }
@@ -14554,7 +14554,7 @@ var require_lib = __commonJS({
       return tokenTypes2;
     }
     var tokTypes = generateExportedTokenTypes(tt);
-    function getParser2(options, input) {
+    function getParser(options, input) {
       let cls = Parser;
       const pluginsMap = /* @__PURE__ */ new Map();
       if (options != null && options.plugins) {
@@ -15132,334 +15132,9 @@ function compileToVDomFunction(source, debug, file) {
   return `($data,$viewId,$refAlt,$n,$refFn,$encUri,$encQuote)=>{${fullSource}}`;
 }
 
-// src/compiler/swc/extract-global-vars.ts
-var parseSyncFn = null;
-var parseSyncLoadAttempted = false;
-async function getParser() {
-  if (!parseSyncLoadAttempted) {
-    parseSyncLoadAttempted = true;
-    try {
-      const swc = await import("@swc/core");
-      parseSyncFn = swc.parseSync;
-    } catch (err) {
-      console.error("failed to load @swc/core", err);
-    }
-  }
-  return parseSyncFn;
-}
-async function extractGlobalVars(source) {
-  const { protectedSource, comments: _comments } = protectComments(source);
-  const viewEventProcessed = processViewEvents(protectedSource);
-  const converted = convertArtSyntax(viewEventProcessed, false);
-  const template = restoreComments(converted, _comments);
-  const templateCmdRegExp = /<%([@=!:])?([\s\S]*?)%>|$/g;
-  const fnParts = [];
-  const htmlStore = {};
-  let htmlIndex = 0;
-  let lastIndex = 0;
-  const htmlKey = String.fromCharCode(5);
-  template.replace(
-    templateCmdRegExp,
-    (match, operate, content, offset) => {
-      const start = operate ? 3 : 2;
-      const htmlText = template.substring(lastIndex, offset + start);
-      const key = htmlKey + htmlIndex++ + htmlKey;
-      htmlStore[key] = htmlText;
-      lastIndex = offset + match.length - 2;
-      if (operate && content.trim()) {
-        fnParts.push(';"' + key + '";', "[" + content + "]");
-      } else {
-        fnParts.push(';"' + key + '";', content || "");
-      }
-      return match;
-    }
-  );
-  let fn = fnParts.join("");
-  fn = `(function(){${fn}})`;
-  const parseSync = await getParser();
-  if (!parseSync) {
-    return fallbackExtractVariables(source);
-  }
-  let ast;
-  try {
-    ast = parseSync(fn, {
-      syntax: "ecmascript",
-      target: "es2022"
-    });
-  } catch {
-    return fallbackExtractVariables(source);
-  }
-  const globalExists = {};
-  for (const name of BUILTIN_GLOBALS) globalExists[name] = 1;
-  const globalVars = /* @__PURE__ */ Object.create(null);
-  const fnNodes = [];
-  walkSwcAst(ast, {
-    VariableDeclarator(node) {
-      if (node.id.type === "Identifier") {
-        const name = node.id.value;
-        globalExists[name] = node.init ? 3 : 2;
-      }
-    },
-    FunctionDeclaration(node) {
-      if (node.identifier) {
-        globalExists[node.identifier.value] = 3;
-      }
-      fnNodes.push(node);
-    },
-    FunctionExpression(node) {
-      fnNodes.push(node);
-    },
-    ArrowFunctionExpression(node) {
-      fnNodes.push(node);
-    },
-    CallExpression(node) {
-      if (node.callee.type === "Identifier") {
-        globalExists[node.callee.value] = 1;
-      }
-    }
-  });
-  const functionParams = /* @__PURE__ */ Object.create(null);
-  for (const fnNode of fnNodes) {
-    const patterns = getParamPatterns(fnNode);
-    for (const pat of patterns) {
-      if (pat.type === "Identifier") {
-        functionParams[pat.value] = 1;
-      } else if (pat.type === "AssignmentPattern" && pat.left.type === "Identifier") {
-        functionParams[pat.left.value] = 1;
-      } else if (pat.type === "RestElement" && pat.argument.type === "Identifier") {
-        functionParams[pat.argument.value] = 1;
-      }
-    }
-  }
-  walkSwcAst(ast, {
-    Identifier(node) {
-      const name = node.value;
-      if (globalExists[name]) return;
-      if (functionParams[name]) return;
-      globalVars[name] = 1;
-    },
-    AssignmentExpression(node) {
-      if (node.left.type === "Identifier") {
-        const name = node.left.value;
-        if (!globalExists[name] || globalExists[name] === 1) {
-          globalExists[name] = (globalExists[name] || 0) + 1;
-        }
-      }
-    }
-  });
-  return Object.keys(globalVars);
-}
-function getParamPatterns(fnNode) {
-  if (fnNode.type === "ArrowFunctionExpression") {
-    return fnNode.params;
-  }
-  return fnNode.params.map((p) => p.pat);
-}
-function fallbackExtractVariables(source) {
-  const vars = /* @__PURE__ */ new Set();
-  const outputRegExp = /\{\{[:=!@]\s*([a-zA-Z_$][\w$]*)[^}]*\}\}/g;
-  let m;
-  while ((m = outputRegExp.exec(source)) !== null) {
-    vars.add(m[1]);
-  }
-  const eachRegExp = /\{\{forOf\s+([a-zA-Z_$][\w$]*)\s+as/g;
-  while ((m = eachRegExp.exec(source)) !== null) {
-    vars.add(m[1]);
-  }
-  const ifRegExp = /\{\{(?:else\s+)?if\s+([a-zA-Z_$][\w$]*)[^}]*\}\}/g;
-  while ((m = ifRegExp.exec(source)) !== null) {
-    vars.add(m[1]);
-  }
-  return Array.from(vars).filter((v) => !BUILTIN_GLOBALS.has(v));
-}
-function walkSwcAst(ast, visitors) {
-  function visit(node) {
-    const type = node.type;
-    if (visitors[type]) {
-      visitors[type](node);
-    }
-    for (const key of Object.keys(node)) {
-      if (key === "type" || key === "span" || key === "ctxt") continue;
-      if (type === "MemberExpression" && key === "property") {
-        const me = node;
-        if (me.property.type !== "Computed") continue;
-      }
-      if (type === "KeyValueProperty" && key === "key") {
-        const kv = node;
-        if (kv.key.type !== "Computed") continue;
-      }
-      if (type === "MethodProperty" && key === "key") {
-        const mp = node;
-        if (mp.key.type !== "Computed") continue;
-      }
-      const child = Reflect.get(node, key);
-      if (Array.isArray(child)) {
-        for (const item of child) {
-          if (isSwcNode(item)) visit(item);
-        }
-      } else if (isSwcNode(child)) {
-        visit(child);
-      }
-    }
-  }
-  visit(ast);
-}
-function isSwcNode(v) {
-  return !!v && typeof v === "object" && typeof v.type === "string";
-}
-var BUILTIN_GLOBALS = /* @__PURE__ */ new Set([
-  // ─── Template runtime helpers (injected by compileToFunction) ───────
-  //
-  // These variables appear in the generated template function signature
-  // or body. They must be excluded from extractGlobalVars() so that
-  // they are not mistaken for user data variables and destructured from $data.
-  // SPLITTER character constant (same as \x1e), used as namespace separator
-  // for refData keys, event attribute encoding, and internal data structures.
-  // Declared as: let $splitter='\x1e'
-  "$splitter",
-  // Data — the data object passed from Updater to the template function.
-  // User variables are destructured from $data at the top of the function:
-  //   let {name, age} = $data;
-  // This is the first parameter of the generated arrow function.
-  "$data",
-  // Null-safe toString: v => '' + (v == null ? '' : v)
-  // Converts null/undefined to empty string, otherwise calls toString().
-  // Wraps every {{!raw}} output to prevent "null" / "undefined" rendering.
-  "$strSafe",
-  // HTML entity encoder: v => $strSafe(v).replace(/[&<>"'`]/g, entityMap)
-  // Encodes &, <, >, ", ', ` to HTML entities (&amp; &lt; etc.)
-  // Applied to all {{=escaped}} and {{:binding}} outputs.
-  "$encHtml",
-  // HTML entity map — internal object used by $encHtml:
-  //   {'&':'amp','<':'gt','>':'gt','"':'#34','\'':'#39','`':'#96'}
-  // Not a standalone function; referenced inside $encHtml's closure.
-  "$entMap",
-  // HTML entity RegExp — internal regexp used by $encHtml:
-  //   /[&<>"'`]/g
-  "$entReg",
-  // HTML entity replacer function — internal helper used by $encHtml:
-  //   m => '&' + $entMap[m] + ';'
-  // Maps matched character to its entity string.
-  "$entFn",
-  // Output buffer — the string accumulator for rendered HTML.
-  // All template output is appended via $out += '...'.
-  // Declared as: let $out = ''
-  "$out",
-  // Reference lookup: (refData, value) => key
-  // Finds or allocates a SPLITTER-prefixed key in refData for a given
-  // object reference. Used by {{@ref}} operator for passing object
-  // references to child views via v-lark attributes.
-  "$refFn",
-  // URI encoder: v => encodeURIComponent($strSafe(v)).replace(/[!')(*]/g, extraMap)
-  // Extends encodeURIComponent with encoding of ! ' ( ) *.
-  // Applied to values in @event URL parameters and {{!uri}} contexts.
-  "$encUri",
-  // URI encode map — internal object used by $encUri:
-  //   {'!':'%21','\'':'%27','(':'%28',')':'%29','*':'%2A'}
-  "$uriMap",
-  // URI encode replacer — internal helper used by $encUri:
-  //   m => $uriMap[m]
-  "$uriFn",
-  // URI encode regexp — internal regexp used by $encUri:
-  //   /[!')(*]/g
-  "$uriReg",
-  // Quote encoder: v => $strSafe(v).replace(/['"\\]/g, '\\$&')
-  // Escapes quotes and backslashes for safe embedding in HTML attribute
-  // values (e.g. data-json='...').
-  "$encQuote",
-  // Quote encode regexp — internal regexp used by $encQuote:
-  //   /['"\\]/g
-  "$qReg",
-  // View ID — the unique identifier of the owning View instance.
-  // Injected into @event attribute values at render time so that
-  // EventDelegator can dispatch events to the correct View handler.
-  // The \x1f placeholder in compiled output is replaced with '+$viewId+'.
-  "$viewId",
-  // Debug: current expression text — stores the template expression being
-  // evaluated, for error reporting. Only present in debug mode.
-  // e.g. $dbgExpr='<%=user.name%>'
-  "$dbgExpr",
-  // Debug: original art syntax — stores the {{}} template syntax before
-  // conversion, for error reporting. Only present in debug mode.
-  // e.g. $dbgArt='{{=user.name}}'
-  "$dbgArt",
-  // Debug: source line number — tracks the current line in the template
-  // source, for error reporting. Only present in debug mode.
-  "$dbgLine",
-  // RefData alias — fallback reference lookup table.
-  // Defaults to $data when no explicit $refAlt is provided.
-  // Ensures $refFn() does not crash when @ operator is used without refData.
-  "$refAlt",
-  // Temporary variable — used by the compiler for intermediate
-  // expression results in generated code (e.g. loop variables,
-  // conditional branches). Declared as: let $tmp
-  "$tmp",
-  // JS literals
-  "undefined",
-  "null",
-  "true",
-  "false",
-  "NaN",
-  "Infinity",
-  // JS built-in globals
-  "window",
-  "self",
-  "globalThis",
-  "document",
-  "console",
-  "JSON",
-  "Math",
-  "Intl",
-  "Promise",
-  "Symbol",
-  "Number",
-  "String",
-  "Boolean",
-  "Array",
-  "Object",
-  "Date",
-  "RegExp",
-  "Error",
-  "TypeError",
-  "RangeError",
-  "SyntaxError",
-  "Map",
-  "Set",
-  "WeakMap",
-  "WeakSet",
-  "Proxy",
-  "Reflect",
-  "ArrayBuffer",
-  "DataView",
-  "Float32Array",
-  "Float64Array",
-  "Int8Array",
-  "Int16Array",
-  "Int32Array",
-  "Uint8Array",
-  "Uint16Array",
-  "Uint32Array",
-  "Uint8ClampedArray",
-  // Functions
-  "parseInt",
-  "parseFloat",
-  "isNaN",
-  "isFinite",
-  "encodeURIComponent",
-  "decodeURIComponent",
-  "encodeURI",
-  "decodeURI",
-  // SWC helpers
-  "arguments",
-  "this",
-  "require",
-  // Lark framework
-  "Lark"
-]);
-
 // src/compiler/extract-global-vars.ts
 var import_parser = __toESM(require_lib(), 1);
-async function extractGlobalVars2(source) {
+async function extractGlobalVars(source) {
   const { protectedSource, comments: _comments } = protectComments(source);
   const viewEventProcessed = processViewEvents(protectedSource);
   const converted = convertArtSyntax(viewEventProcessed, false);
@@ -15496,10 +15171,10 @@ async function extractGlobalVars2(source) {
       allowAwaitOutsideFunction: true
     });
   } catch {
-    return fallbackExtractVariables2(source);
+    return fallbackExtractVariables(source);
   }
   const globalExists = {};
-  for (const name of BUILTIN_GLOBALS2) globalExists[name] = 1;
+  for (const name of BUILTIN_GLOBALS) globalExists[name] = 1;
   const globalVars = /* @__PURE__ */ Object.create(null);
   const fnRange = [];
   walkAst(ast, {
@@ -15558,22 +15233,22 @@ async function extractGlobalVars2(source) {
   });
   return Object.keys(globalVars);
 }
-function fallbackExtractVariables2(source) {
+function fallbackExtractVariables(source) {
   const vars = /* @__PURE__ */ new Set();
   const outputRegExp = /\{\{[:=!@]\s*([a-zA-Z_$][\w$]*)[^}]*\}\}/g;
   let m;
   while ((m = outputRegExp.exec(source)) !== null) {
     vars.add(m[1]);
   }
-  const eachRegExp = /\{\{forOf\s+([a-zA-Z_$][\w$]*)\s+as/g;
-  while ((m = eachRegExp.exec(source)) !== null) {
+  const forOfRegExp = /\{\{forOf\s+([a-zA-Z_$][\w$]*)\s+as/g;
+  while ((m = forOfRegExp.exec(source)) !== null) {
     vars.add(m[1]);
   }
   const ifRegExp = /\{\{(?:else\s+)?if\s+([a-zA-Z_$][\w$]*)[^}]*\}\}/g;
   while ((m = ifRegExp.exec(source)) !== null) {
     vars.add(m[1]);
   }
-  return Array.from(vars).filter((v) => !BUILTIN_GLOBALS2.has(v));
+  return Array.from(vars).filter((v) => !BUILTIN_GLOBALS.has(v));
 }
 function walkAst(ast, visitors) {
   function visit(node) {
@@ -15611,7 +15286,7 @@ function walkAst(ast, visitors) {
 function isAstNode(v) {
   return !!v && typeof v === "object" && typeof v.type === "string";
 }
-var BUILTIN_GLOBALS2 = /* @__PURE__ */ new Set([
+var BUILTIN_GLOBALS = /* @__PURE__ */ new Set([
   // ─── Template runtime helpers (injected by compileToFunction) ───────
   //
   // These variables appear in the generated template function signature
@@ -15850,8 +15525,8 @@ function compileToFunction(source, debug, file) {
   return `($data,$viewId,$refAlt,$encHtml,$strSafe,$encUri,$refFn,$encQuote)=>{${fullSource}}`;
 }
 async function compileTemplate(source, options = {}) {
-  const { debug = false, file, virtualDom = false, useSwc = false } = options;
-  const globalVars = options.globalVars ?? await (useSwc ? extractGlobalVars(source) : extractGlobalVars2(source));
+  const { debug = false, file, virtualDom = false } = options;
+  const globalVars = options.globalVars ?? await extractGlobalVars(source);
   const { protectedSource, comments } = protectComments(source);
   const converted = convertArtSyntax(protectedSource, debug);
   const viewEventProcessed = processViewEvents(converted);
@@ -15885,6 +15560,5 @@ export default function(data, viewId, refData) {
 }
 export {
   compileTemplate,
-  extractGlobalVars2 as extractGlobalVars,
-  extractGlobalVars as extractGlobalVarsSwc
+  extractGlobalVars
 };

package/dist/devtool.cjs

@@ -832,6 +832,21 @@ function use(names, callback) {
   return loadPromise;
 }
 
+// src/frame-registry.ts
+var frameRegistry = /* @__PURE__ */ new Map();
+function getFrame(id) {
+  return frameRegistry.get(id);
+}
+function getAllFrames() {
+  return frameRegistry;
+}
+function registerFrame(id, frame) {
+  frameRegistry.set(id, frame);
+}
+function removeFrame(id) {
+  frameRegistry.delete(id);
+}
+
 // src/dom.ts
 var wrapMeta = {
   option: [1, "<select multiple>"],
@@ -1542,7 +1557,7 @@ var Updater = class {
     const changed = this.hasChangedFlag;
     this.hasChangedFlag = 0;
     this.changedKeys = /* @__PURE__ */ new Set();
-    const frame = Frame.get(this.viewId);
+    const frame = getFrame(this.viewId);
     const view = frame?.view;
     const node = getById(this.viewId);
     if (changed && view && node && view.signature > 0 && frame) {
@@ -2088,7 +2103,7 @@ function invalidateViewClass(viewPath) {
 
 // src/hmr.ts
 function reloadViews(viewPath) {
-  const allFrames = Frame.getAll();
+  const allFrames = getAllFrames();
   const toReload = [];
   for (const [, frame] of allFrames) {
     if (frame.viewPath) {
@@ -2109,9 +2124,13 @@ function acceptView(hot, viewPath) {
       const NewViewClass = candidate;
       registerViewClass(viewPath, NewViewClass);
       reloadViews(viewPath);
-    } else {
-      hot.invalidate();
+      return;
+    }
+    if (getViewClass(viewPath)) {
+      reloadViews(viewPath);
+      return;
     }
+    hot.invalidate();
   });
 }
 function disposeView(hot, viewPath) {
@@ -2753,7 +2772,6 @@ var View = class _View {
 };
 
 // src/frame.ts
-var frameRegistry = /* @__PURE__ */ new Map();
 var rootFrame;
 var globalAlter;
 var MAX_FRAME_POOL = 64;
@@ -2805,7 +2823,7 @@ var Frame = class _Frame extends EventEmitter {
     if (parentId) {
       this._parentId = parentId;
     }
-    frameRegistry.set(id, this);
+    registerFrame(id, this);
     const element = document.getElementById(id);
     if (element) {
       element.frame = this;
@@ -2936,7 +2954,7 @@ var Frame = class _Frame extends EventEmitter {
    */
   mountFrame(frameId, viewPath, viewInitParams) {
     notifyAlter(this, { id: frameId });
-    let childFrame = frameRegistry.get(frameId);
+    let childFrame = getFrame(frameId);
     if (!childFrame) {
       if (!this.childrenMap[frameId]) {
         this.childrenCount++;
@@ -2957,17 +2975,17 @@ var Frame = class _Frame extends EventEmitter {
    */
   unmountFrame(id) {
     const targetId = id ? this.childrenMap[id] : this.id;
-    const frame = frameRegistry.get(targetId);
+    const frame = getFrame(targetId);
     if (!frame) return;
     const wasCreated = frame.readyCount > 0;
     const pId = frame.parentId;
     frame.unmountView();
-    removeFrame(targetId, wasCreated);
+    removeFrame2(targetId, wasCreated);
     reInitFrameForCache(frame);
     if (frameCache.length < MAX_FRAME_POOL) {
       frameCache.push(frame);
     }
-    const parent = frameRegistry.get(pId || "");
+    const parent = getFrame(pId || "");
     if (parent && parent.childrenMap[targetId]) {
       Reflect.deleteProperty(parent.childrenMap, targetId);
       parent.childrenCount--;
@@ -3032,7 +3050,7 @@ var Frame = class _Frame extends EventEmitter {
     let currentPid = this.parentId;
     let n = level >>> 0 || 1;
     while (currentPid && n--) {
-      frame = frameRegistry.get(currentPid);
+      frame = getFrame(currentPid);
       currentPid = frame?.parentId;
     }
     return frame;
@@ -3093,11 +3111,11 @@ var Frame = class _Frame extends EventEmitter {
   // ============================================================
   /** Get frame by ID */
   static get(id) {
-    return frameRegistry.get(id);
+    return getFrame(id);
   }
   /** Get all frames */
   static getAll() {
-    return frameRegistry;
+    return getAllFrames();
   }
   /**
    * Returns the existing root frame, or `undefined` if none has been created.
@@ -3147,10 +3165,10 @@ var Frame = class _Frame extends EventEmitter {
 function htmlElIsBound(element) {
   return !!element.frameBound;
 }
-function removeFrame(id, wasCreated) {
-  const frameInstance = frameRegistry.get(id);
+function removeFrame2(id, wasCreated) {
+  const frameInstance = getFrame(id);
   if (!frameInstance) return;
-  frameRegistry.delete(id);
+  removeFrame(id);
   Frame.fire("remove", { frame: frameInstance, fcc: wasCreated });
   const element = document.getElementById(id);
   if (element) {
@@ -3167,7 +3185,7 @@ function notifyCreated(frameInstance) {
     }
     const pId = frameInstance.parentId;
     if (pId) {
-      const parent = frameRegistry.get(pId);
+      const parent = getFrame(pId);
       if (parent && !parent.readyMap.has(frameInstance.id)) {
         parent.readyMap.add(frameInstance.id);
         parent.readyCount++;
@@ -3183,7 +3201,7 @@ function notifyAlter(frameInstance, data) {
     frameInstance.fire("alter", data);
     const pId = frameInstance.parentId;
     if (pId) {
-      const parent = frameRegistry.get(pId);
+      const parent = getFrame(pId);
       if (parent && parent.readyMap.has(frameInstance.id)) {
         parent.readyCount--;
         parent.readyMap.delete(frameInstance.id);
@@ -3201,7 +3219,7 @@ function reInitFrame(frame, id, parentId) {
   frame["signature"] = 1;
   frame["readyMap"] = /* @__PURE__ */ new Set();
   frame["invokeList"] = [];
-  frameRegistry.set(id, frame);
+  registerFrame(id, frame);
 }
 function reInitFrameForCache(frame) {
   Reflect.set(frame, "id", "");
@@ -3210,7 +3228,7 @@ function reInitFrameForCache(frame) {
   frame["readyMap"] = /* @__PURE__ */ new Set();
 }
 function translateQuery(pId, src, params) {
-  const parentFrame = frameRegistry.get(pId);
+  const parentFrame = getFrame(pId);
   const parentView = parentFrame?.view;
   if (!parentView) return;
   const parentRefData = parentView.updater.refData;