octane 0.13.6 → 0.13.7

package/dist/cjs/runtime.cjs

@@ -9884,6 +9884,7 @@ function initializeContext(ctx, defaultValue) {
   ctx.$$kind = import_runtime_tags.CONTEXT_TAG;
   ctx.defaultValue = defaultValue;
   ctx.$$version = 0;
+  ctx.$$providerVersion = 0;
   (0, import_context_identity.registerContext)(ctx);
   if (__octaneDev) {
     (0, import_context_identity.defineRemovedContextMembers)(ctx);
@@ -9958,6 +9959,7 @@ function provideContext(scope, context, value) {
       else values.delete(context);
     });
   if (had) {
+    context.$$providerVersion = context.$$providerVersion === context.$$version ? context.$$version + 1 : -1;
     context.$$version++;
     (0, import_context_epoch.bumpContextEpoch)();
   }
@@ -11472,12 +11474,29 @@ function promoteMemoAncestry(scope) {
 function recordContextDependency(block, context) {
   if (block === null || !block.memoInChain) return;
   SKIPPED_ROW_REFRESH = refreshSkippedRows;
-  (block.$$ctxDirect ??= /* @__PURE__ */ new Map()).set(context, context.$$version);
+  const direct = block.$$ctxDirect ??= /* @__PURE__ */ new Map();
+  const previous = direct.get(context);
+  direct.set(context, context.$$version);
   for (let current = block; current !== null; current = current.parentBlock) {
     if (current.body?.__memo === true || current.$$implicitBail === true) {
       (current.$$ctxReads ??= /* @__PURE__ */ new Map()).set(context, context.$$version);
     }
   }
+  return previous;
+}
+function recordLocalContextValue(reader, block, context, value, previous) {
+  if (reader === null || block === null || !block.memoInChain) return;
+  if (typeof previous === "number" || context.$$providerVersion !== context.$$version) return;
+  const cache = reader.$$ctxCache;
+  const owner = cache === context ? reader.$$ctxCacheOwner : cache !== null && reader.$$ctxCacheOwner === null ? cache.get(context) : void 0;
+  if (owner === null || owner === void 0 || owner === DEFAULT_CTX) return;
+  if (previous !== void 0) {
+    if (previous.owner !== owner || !Object.is(previous.value, value)) return;
+    previous.version = context.$$version;
+    block.$$ctxDirect.set(context, previous);
+  } else {
+    block.$$ctxDirect.set(context, { version: context.$$version, owner, value });
+  }
 }
 let SCOPED_READ_TRACKING = false;
 let SCOPED_READS = null;
@@ -11635,8 +11654,10 @@ function readContextFrom(reader, block, context) {
   return context.defaultValue;
 }
 function readContextFromScope(scope, context) {
-  recordContextDependency(scope.block, context);
-  return readContextFrom(scope, scope.block, context);
+  const previous = recordContextDependency(scope.block, context);
+  const value = readContextFrom(scope, scope.block, context);
+  recordLocalContextValue(scope, scope.block, context, value, previous);
+  return value;
 }
 function getRendererOwnerVisibility(scope) {
   if (findHiddenActivity(scope.block) !== null) return "activity";
@@ -11654,8 +11675,10 @@ function reportRendererOwnerError(scope, error) {
   }
 }
 function useContextInternal(context) {
-  recordContextDependency(CURRENT_BLOCK, context);
-  return readContextFrom(CURRENT_SCOPE, CURRENT_BLOCK, context);
+  const previous = recordContextDependency(CURRENT_BLOCK, context);
+  const value = readContextFrom(CURRENT_SCOPE, CURRENT_BLOCK, context);
+  recordLocalContextValue(CURRENT_SCOPE, CURRENT_BLOCK, context, value, previous);
+  return value;
 }
 class SuspenseException {
   constructor(thenable) {
@@ -12685,7 +12708,13 @@ function parseTemplate(html, ns, frag) {
   initDomOperations();
   const t = (STAGED_DOM ? STAGED_DOM.view(document) : document).createElement("template");
   if (ns === 0) {
-    (STAGED_DOM ? STAGED_DOM.view(t) : t).innerHTML = frag ? `<octane-frag>${html}</octane-frag>` : html;
+    (STAGED_DOM ? STAGED_DOM.view(t) : t).innerHTML = html;
+    if (frag) {
+      const owner = t.content.ownerDocument;
+      const wrapper = (STAGED_DOM ? STAGED_DOM.view(owner) : owner).createElement("octane-frag");
+      (STAGED_DOM ? STAGED_DOM.view(wrapper) : wrapper).appendChild(t.content);
+      return fragmentTemplate(wrapper);
+    }
     const root = getFirstChild(t.content);
     if (root.nodeType === 1 && root.localName === "octane-frag") {
       return fragmentTemplate(root);
@@ -25039,8 +25068,12 @@ function ctxDepsChanged(block) {
 function ctxDirectChanged(block) {
   const direct = block.$$ctxDirect;
   if (direct === null) return false;
-  for (const [ctx, version] of direct) {
-    if (ctx.$$version !== version) return true;
+  for (const [ctx, read] of direct) {
+    const version = typeof read === "number" ? read : read.version;
+    if (ctx.$$version === version) continue;
+    if (typeof read === "number" || ctx.$$providerVersion !== ctx.$$version || !Object.is(read.owner.$$ctxValues?.get(ctx), read.value))
+      return true;
+    read.version = ctx.$$version;
   }
   return false;
 }
@@ -25109,7 +25142,8 @@ function restampCtxDeps(block) {
       }
     }
     if (hasDirect) {
-      for (const [ctx, v] of direct) {
+      for (const [ctx, read] of direct) {
+        const v = typeof read === "number" ? read : read.version;
         const cur = m.get(ctx);
         if (cur !== v) {
           const live = ctx.$$version;

package/dist/cjs/version.cjs

@@ -21,7 +21,7 @@ __export(version_exports, {
   version: () => version
 });
 module.exports = __toCommonJS(version_exports);
-const version = "0.13.6";
+const version = "0.13.7";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   version

package/dist/compiler/compile.js

@@ -26202,14 +26202,6 @@ function normalizeAuthoredJsxLiterals(ast) {
 			if (typeof raw === 'string' && raw.slice(1, -1) === value) return null;
 			return { ...node, value: { ...node.value, raw: JSON.stringify(value) } };
 		}
-		if (
-			node.type === 'JSXStyleElement' &&
-			(hasJsxAttribute(node, 'dangerouslySetInnerHTML') || hasJsxAttribute(node, 'children'))
-		) {
-			return normalizeAuthoredJsxLiterals(
-				b.jsx_element(node, node.openingElement.attributes || [], []),
-			);
-		}
 		return null;
 	});
 }

package/dist/compiler/parser-template-shape.js

@@ -1,6 +1,6 @@
 /** @import { Program } from 'estree' */
 
-import { isLayoutWhitespace } from '@tsrx/core';
+import { builders as b, isLayoutWhitespace } from '@tsrx/core';
 
 // `@tsrx/core` 0.5 gives template markup TSX's exact tree: the indentation
 // between children is a `JSXText` of its own, and an `@case`/`@default` arm is
@@ -62,6 +62,18 @@ function adopt(value, editor) {
 		}
 		return out ?? value;
 	}
+	// Explicit content props make <style> an ordinary host, not scoped CSS.
+	// Normalize before both runtime and editor analysis, retaining authored locations.
+	if (
+		value.type === 'JSXStyleElement' &&
+		value.openingElement.attributes.some(
+			(attr) =>
+				attr.type === 'JSXAttribute' &&
+				(attr.name.name === 'children' || attr.name.name === 'dangerouslySetInnerHTML'),
+		)
+	) {
+		return adopt(b.jsx_element(value, value.openingElement.attributes, []), editor);
+	}
 	/** @type {any} */
 	let out = null;
 	for (const key in value) {

package/dist/node/runtime.js

@@ -9769,6 +9769,7 @@ function initializeContext(ctx, defaultValue) {
   ctx.$$kind = CONTEXT_TAG;
   ctx.defaultValue = defaultValue;
   ctx.$$version = 0;
+  ctx.$$providerVersion = 0;
   registerContext(ctx);
   if (__octaneDev) {
     defineRemovedContextMembers(ctx);
@@ -9843,6 +9844,7 @@ function provideContext(scope, context, value) {
       else values.delete(context);
     });
   if (had) {
+    context.$$providerVersion = context.$$providerVersion === context.$$version ? context.$$version + 1 : -1;
     context.$$version++;
     bumpContextEpoch();
   }
@@ -11357,12 +11359,29 @@ function promoteMemoAncestry(scope) {
 function recordContextDependency(block, context) {
   if (block === null || !block.memoInChain) return;
   SKIPPED_ROW_REFRESH = refreshSkippedRows;
-  (block.$$ctxDirect ??= /* @__PURE__ */ new Map()).set(context, context.$$version);
+  const direct = block.$$ctxDirect ??= /* @__PURE__ */ new Map();
+  const previous = direct.get(context);
+  direct.set(context, context.$$version);
   for (let current = block; current !== null; current = current.parentBlock) {
     if (current.body?.__memo === true || current.$$implicitBail === true) {
       (current.$$ctxReads ??= /* @__PURE__ */ new Map()).set(context, context.$$version);
     }
   }
+  return previous;
+}
+function recordLocalContextValue(reader, block, context, value, previous) {
+  if (reader === null || block === null || !block.memoInChain) return;
+  if (typeof previous === "number" || context.$$providerVersion !== context.$$version) return;
+  const cache = reader.$$ctxCache;
+  const owner = cache === context ? reader.$$ctxCacheOwner : cache !== null && reader.$$ctxCacheOwner === null ? cache.get(context) : void 0;
+  if (owner === null || owner === void 0 || owner === DEFAULT_CTX) return;
+  if (previous !== void 0) {
+    if (previous.owner !== owner || !Object.is(previous.value, value)) return;
+    previous.version = context.$$version;
+    block.$$ctxDirect.set(context, previous);
+  } else {
+    block.$$ctxDirect.set(context, { version: context.$$version, owner, value });
+  }
 }
 let SCOPED_READ_TRACKING = false;
 let SCOPED_READS = null;
@@ -11520,8 +11539,10 @@ function readContextFrom(reader, block, context) {
   return context.defaultValue;
 }
 function readContextFromScope(scope, context) {
-  recordContextDependency(scope.block, context);
-  return readContextFrom(scope, scope.block, context);
+  const previous = recordContextDependency(scope.block, context);
+  const value = readContextFrom(scope, scope.block, context);
+  recordLocalContextValue(scope, scope.block, context, value, previous);
+  return value;
 }
 function getRendererOwnerVisibility(scope) {
   if (findHiddenActivity(scope.block) !== null) return "activity";
@@ -11539,8 +11560,10 @@ function reportRendererOwnerError(scope, error) {
   }
 }
 function useContextInternal(context) {
-  recordContextDependency(CURRENT_BLOCK, context);
-  return readContextFrom(CURRENT_SCOPE, CURRENT_BLOCK, context);
+  const previous = recordContextDependency(CURRENT_BLOCK, context);
+  const value = readContextFrom(CURRENT_SCOPE, CURRENT_BLOCK, context);
+  recordLocalContextValue(CURRENT_SCOPE, CURRENT_BLOCK, context, value, previous);
+  return value;
 }
 class SuspenseException {
   constructor(thenable) {
@@ -12570,7 +12593,13 @@ function parseTemplate(html, ns, frag) {
   initDomOperations();
   const t = (STAGED_DOM ? STAGED_DOM.view(document) : document).createElement("template");
   if (ns === 0) {
-    (STAGED_DOM ? STAGED_DOM.view(t) : t).innerHTML = frag ? `<octane-frag>${html}</octane-frag>` : html;
+    (STAGED_DOM ? STAGED_DOM.view(t) : t).innerHTML = html;
+    if (frag) {
+      const owner = t.content.ownerDocument;
+      const wrapper = (STAGED_DOM ? STAGED_DOM.view(owner) : owner).createElement("octane-frag");
+      (STAGED_DOM ? STAGED_DOM.view(wrapper) : wrapper).appendChild(t.content);
+      return fragmentTemplate(wrapper);
+    }
     const root = getFirstChild(t.content);
     if (root.nodeType === 1 && root.localName === "octane-frag") {
       return fragmentTemplate(root);
@@ -24933,8 +24962,12 @@ function ctxDepsChanged(block) {
 function ctxDirectChanged(block) {
   const direct = block.$$ctxDirect;
   if (direct === null) return false;
-  for (const [ctx, version] of direct) {
-    if (ctx.$$version !== version) return true;
+  for (const [ctx, read] of direct) {
+    const version = typeof read === "number" ? read : read.version;
+    if (ctx.$$version === version) continue;
+    if (typeof read === "number" || ctx.$$providerVersion !== ctx.$$version || !Object.is(read.owner.$$ctxValues?.get(ctx), read.value))
+      return true;
+    read.version = ctx.$$version;
   }
   return false;
 }
@@ -25003,7 +25036,8 @@ function restampCtxDeps(block) {
       }
     }
     if (hasDirect) {
-      for (const [ctx, v] of direct) {
+      for (const [ctx, read] of direct) {
+        const v = typeof read === "number" ? read : read.version;
         const cur = m.get(ctx);
         if (cur !== v) {
           const live = ctx.$$version;

package/dist/node/version.js

@@ -1,4 +1,4 @@
-const version = "0.13.6";
+const version = "0.13.7";
 export {
   version
 };

package/dist/runtime.d.ts

@@ -365,7 +365,7 @@ export interface Block extends Scope {
      */
     inactive: boolean;
     /** Direct (own) context reads this render — drives memo invalidation alongside $$ctxReads. */
-    $$ctxDirect: Map<Context<any>, any> | null;
+    $$ctxDirect: Map<Context<any>, DirectContextRead> | null;
     /**
      * The context epoch at which this block's $$ctxReads/$$ctxDirect
      * entries were last known consistent with live context versions: sampled when
@@ -1074,6 +1074,8 @@ export interface Context<T> {
      * changed", so an unpaired bump strands consumers.
      */
     $$version: number;
+    /** Local-provider provenance; -1 after any external version write. */
+    $$providerVersion?: number;
 }
 /**
  * Create a Context. Providers push the value into a Block-scoped slot; `use(ctx)`
@@ -1261,6 +1263,11 @@ interface HostContextRequestSignal {
  * @internal owner-bridge ABI (octane/react and future hosts).
  */
 export declare function createHostContextRequest(thenable: PromiseLike<unknown>): HostContextRequestSignal;
+type DirectContextRead = number | {
+    version: number;
+    owner: Scope;
+    value: unknown;
+};
 /** @internal Live context reader rooted at a captured DOM boundary scope. */
 export declare function readContextFromScope<T>(scope: Scope, context: Context<T>): T;
 /** @internal Cold adapter query; native render and hide paths pay no extra work. */

package/dist/runtime.js

@@ -9768,6 +9768,7 @@ function initializeContext(ctx, defaultValue) {
   ctx.$$kind = CONTEXT_TAG;
   ctx.defaultValue = defaultValue;
   ctx.$$version = 0;
+  ctx.$$providerVersion = 0;
   registerContext(ctx);
   if (process.env.NODE_ENV !== "production") {
     defineRemovedContextMembers(ctx);
@@ -9842,6 +9843,7 @@ function provideContext(scope, context, value) {
       else values.delete(context);
     });
   if (had) {
+    context.$$providerVersion = context.$$providerVersion === context.$$version ? context.$$version + 1 : -1;
     context.$$version++;
     bumpContextEpoch();
   }
@@ -11356,12 +11358,29 @@ function promoteMemoAncestry(scope) {
 function recordContextDependency(block, context) {
   if (block === null || !block.memoInChain) return;
   SKIPPED_ROW_REFRESH = refreshSkippedRows;
-  (block.$$ctxDirect ??= /* @__PURE__ */ new Map()).set(context, context.$$version);
+  const direct = block.$$ctxDirect ??= /* @__PURE__ */ new Map();
+  const previous = direct.get(context);
+  direct.set(context, context.$$version);
   for (let current = block; current !== null; current = current.parentBlock) {
     if (current.body?.__memo === true || current.$$implicitBail === true) {
       (current.$$ctxReads ??= /* @__PURE__ */ new Map()).set(context, context.$$version);
     }
   }
+  return previous;
+}
+function recordLocalContextValue(reader, block, context, value, previous) {
+  if (reader === null || block === null || !block.memoInChain) return;
+  if (typeof previous === "number" || context.$$providerVersion !== context.$$version) return;
+  const cache = reader.$$ctxCache;
+  const owner = cache === context ? reader.$$ctxCacheOwner : cache !== null && reader.$$ctxCacheOwner === null ? cache.get(context) : void 0;
+  if (owner === null || owner === void 0 || owner === DEFAULT_CTX) return;
+  if (previous !== void 0) {
+    if (previous.owner !== owner || !Object.is(previous.value, value)) return;
+    previous.version = context.$$version;
+    block.$$ctxDirect.set(context, previous);
+  } else {
+    block.$$ctxDirect.set(context, { version: context.$$version, owner, value });
+  }
 }
 let SCOPED_READ_TRACKING = false;
 let SCOPED_READS = null;
@@ -11519,8 +11538,10 @@ function readContextFrom(reader, block, context) {
   return context.defaultValue;
 }
 function readContextFromScope(scope, context) {
-  recordContextDependency(scope.block, context);
-  return readContextFrom(scope, scope.block, context);
+  const previous = recordContextDependency(scope.block, context);
+  const value = readContextFrom(scope, scope.block, context);
+  recordLocalContextValue(scope, scope.block, context, value, previous);
+  return value;
 }
 function getRendererOwnerVisibility(scope) {
   if (findHiddenActivity(scope.block) !== null) return "activity";
@@ -11538,8 +11559,10 @@ function reportRendererOwnerError(scope, error) {
   }
 }
 function useContextInternal(context) {
-  recordContextDependency(CURRENT_BLOCK, context);
-  return readContextFrom(CURRENT_SCOPE, CURRENT_BLOCK, context);
+  const previous = recordContextDependency(CURRENT_BLOCK, context);
+  const value = readContextFrom(CURRENT_SCOPE, CURRENT_BLOCK, context);
+  recordLocalContextValue(CURRENT_SCOPE, CURRENT_BLOCK, context, value, previous);
+  return value;
 }
 class SuspenseException {
   constructor(thenable) {
@@ -12569,7 +12592,13 @@ function parseTemplate(html, ns, frag) {
   initDomOperations();
   const t = (STAGED_DOM ? STAGED_DOM.view(document) : document).createElement("template");
   if (ns === 0) {
-    (STAGED_DOM ? STAGED_DOM.view(t) : t).innerHTML = frag ? `<octane-frag>${html}</octane-frag>` : html;
+    (STAGED_DOM ? STAGED_DOM.view(t) : t).innerHTML = html;
+    if (frag) {
+      const owner = t.content.ownerDocument;
+      const wrapper = (STAGED_DOM ? STAGED_DOM.view(owner) : owner).createElement("octane-frag");
+      (STAGED_DOM ? STAGED_DOM.view(wrapper) : wrapper).appendChild(t.content);
+      return fragmentTemplate(wrapper);
+    }
     const root = getFirstChild(t.content);
     if (root.nodeType === 1 && root.localName === "octane-frag") {
       return fragmentTemplate(root);
@@ -24932,8 +24961,12 @@ function ctxDepsChanged(block) {
 function ctxDirectChanged(block) {
   const direct = block.$$ctxDirect;
   if (direct === null) return false;
-  for (const [ctx, version] of direct) {
-    if (ctx.$$version !== version) return true;
+  for (const [ctx, read] of direct) {
+    const version = typeof read === "number" ? read : read.version;
+    if (ctx.$$version === version) continue;
+    if (typeof read === "number" || ctx.$$providerVersion !== ctx.$$version || !Object.is(read.owner.$$ctxValues?.get(ctx), read.value))
+      return true;
+    read.version = ctx.$$version;
   }
   return false;
 }
@@ -25002,7 +25035,8 @@ function restampCtxDeps(block) {
       }
     }
     if (hasDirect) {
-      for (const [ctx, v] of direct) {
+      for (const [ctx, read] of direct) {
+        const v = typeof read === "number" ? read : read.version;
         const cur = m.get(ctx);
         if (cur !== v) {
           const live = ctx.$$version;

package/dist/version.js

@@ -1,4 +1,4 @@
-const version = "0.13.6";
+const version = "0.13.7";
 export {
   version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "octane",
-  "version": "0.13.6",
+  "version": "0.13.7",
   "license": "MIT",
   "type": "module",
   "sideEffects": [