octane 0.5.0 → 0.6.0

package/dist/cjs/runtime.server.cjs

@@ -1580,6 +1580,7 @@ function ssrDeoptBlockChildren(children, scope) {
   return ssrChild(children, scope);
 }
 function serverDescNeedsBlocks(v) {
+  if (typeof v === "function") return true;
   if (v == null || typeof v !== "object") return false;
   if (v.$$kind === import_runtime_tags.CONTEXT_TAG || typeof v.then === "function") return true;
   if (Array.isArray(v)) {

package/dist/cjs/version.cjs

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

package/dist/compiler/compile-universal.js

@@ -449,7 +449,8 @@ function isTemplateNode(node) {
 		node?.type === 'JSXForExpression' ||
 		node?.type === 'JSXIfExpression' ||
 		node?.type === 'JSXSwitchExpression' ||
-		node?.type === 'JSXTryExpression'
+		node?.type === 'JSXTryExpression' ||
+		node?.type === 'JSXCodeBlock'
 	);
 }
 
@@ -2756,7 +2757,12 @@ function rewriteSourceAst(node, state) {
 		}
 		const replacement = state.astNodeReplacements?.get(value);
 		if (replacement !== undefined) return replacement;
-		if (value !== node && isTemplateNode(value)) {
+		// A template node in expression position — nested or the root itself
+		// (JSX as a component prop, a sole expression child, a renderable hole) —
+		// is a value and needs renderable lowering. Passing the root through
+		// leaves raw JSX for DOM codegen, which emits descriptor-runtime helpers
+		// the universal module does not export.
+		if (isTemplateNode(value)) {
 			return compileRenderableExpressionAst(value, state);
 		}
 		let output = null;
@@ -3296,19 +3302,24 @@ function compileBlockValueAst(statements, state, params = [], origin = null) {
 	const templates = [];
 	const setup = [];
 	for (const statement of statements ?? []) {
+		// Inside a BlockStatement the parser wraps JSX-producing nodes like
+		// `@{ … }` in an ExpressionStatement; unwrap it for the template/setup
+		// partition while keeping the statement for setup output.
+		const inner = statement.type === 'ExpressionStatement' ? statement.expression : statement;
 		if (
-			statement.type === 'JSXElement' ||
-			statement.type === 'Element' ||
-			statement.type === 'JSXFragment' ||
-			statement.type === 'Fragment' ||
-			statement.type === 'JSXText' ||
-			statement.type === 'JSXExpressionContainer' ||
-			statement.type === 'JSXForExpression' ||
-			statement.type === 'JSXIfExpression' ||
-			statement.type === 'JSXSwitchExpression' ||
-			statement.type === 'JSXTryExpression'
+			inner.type === 'JSXElement' ||
+			inner.type === 'Element' ||
+			inner.type === 'JSXFragment' ||
+			inner.type === 'Fragment' ||
+			inner.type === 'JSXText' ||
+			inner.type === 'JSXExpressionContainer' ||
+			inner.type === 'JSXForExpression' ||
+			inner.type === 'JSXIfExpression' ||
+			inner.type === 'JSXSwitchExpression' ||
+			inner.type === 'JSXTryExpression' ||
+			inner.type === 'JSXCodeBlock'
 		) {
-			templates.push(...compileChildAst(statement, context, state));
+			templates.push(...compileChildAst(inner, context, state));
 		} else {
 			setup.push(statement);
 		}
@@ -3612,6 +3623,14 @@ function compileChildAst(node, context, state) {
 	}
 	if (node.type === 'JSXExpressionContainer') {
 		if (!node.expression || node.expression.type === 'JSXEmptyExpression') return [];
+		// `{() => @{ … }}` is the explicit scoped child — it lowers to the same
+		// scoped block as bare `@{ … }`, keeping the arrow's parameters.
+		if (
+			node.expression.type === 'ArrowFunctionExpression' &&
+			node.expression.body?.type === 'JSXCodeBlock'
+		) {
+			return compileCodeBlockAst(node.expression.body, node.expression.params, context, state);
+		}
 		// A string-literal child is authored text with braces around it: fold it
 		// into the plan like JSXText, so the constant stops riding every render's
 		// slot array. Renderers without host text keep the renderable-hole slot.
@@ -3639,6 +3658,7 @@ function compileChildAst(node, context, state) {
 	if (node.type === 'JSXIfExpression') return [compileIfAst(node, context, state)];
 	if (node.type === 'JSXSwitchExpression') return [compileSwitchAst(node, context, state)];
 	if (node.type === 'JSXTryExpression') return [compileTryAst(node, context, state)];
+	if (node.type === 'JSXCodeBlock') return compileCodeBlockAst(node, [], context, state);
 	if (node.type === 'JSXStyleElement') {
 		throw universalError(
 			state.filename,
@@ -3658,6 +3678,37 @@ function compileChildrenAst(children, context, state) {
 	return output;
 }
 
+// `@{ … }` at child position: an empty block contributes nothing, a
+// render-only block merges into the parent template, and a setup-bearing or
+// code-only block lowers to a scoped dynamic child whose thunk runs its
+// statements inside a persistent child owner — the universal counterpart of
+// the DOM childSlot lowering for JSXCodeBlock. The explicit `{() => @{ … }}`
+// spelling always keeps its scope: its parameters bind inside the thunk.
+function compileCodeBlockAst(block, params, context, state) {
+	const body = block.body ?? [];
+	const render = block.render ?? null;
+	if (body.length === 0 && params.length === 0) {
+		return render === null ? [] : compileChildAst(render, context, state);
+	}
+	return [
+		addDynamicAst(
+			context,
+			generatedCall(
+				state.helpers.block,
+				[
+					compileBlockValueAst(
+						[...body, ...(render === null ? [] : [render])],
+						state,
+						params,
+						block,
+					),
+				],
+				block,
+			),
+		),
+	];
+}
+
 function extractEntryParallelUsesAst(expression, state) {
 	const useAliases = new Set(
 		[...state.runtimeImports].filter(([, imported]) => imported === 'use').map(([local]) => local),
@@ -3875,6 +3926,7 @@ function universalHelperImportAsts(state, extraPairs = [], origin = null) {
 		['universalChildren', state.helpers.children],
 		['universalContext', state.helpers.context],
 		['universalActivity', state.helpers.activity],
+		['universalBlock', state.helpers.block],
 		...(state.helpers.firstScreenEvent === undefined
 			? []
 			: [['firstScreenEvent', state.helpers.firstScreenEvent]]),
@@ -4239,6 +4291,7 @@ export function lowerUniversalRendererRegionAst(
 	state.helpers.children = allocName(state, `${prefix}Children`);
 	state.helpers.context = allocName(state, `${prefix}Context`);
 	state.helpers.activity = allocName(state, `${prefix}Activity`);
+	state.helpers.block = allocName(state, `${prefix}Block`);
 	const generatedRuntimeAliases = Object.freeze(
 		Object.fromEntries(
 			[
@@ -4464,6 +4517,7 @@ export function lowerUniversalRendererRegionAst(
 				try: state.helpers.try,
 				context: state.helpers.context,
 				activity: state.helpers.activity,
+				block: state.helpers.block,
 			}),
 			components: Object.freeze(state.components),
 			bindings: Object.freeze([...specializationBindings]),
@@ -4553,6 +4607,7 @@ export function compileUniversal(
 	state.helpers.children = allocName(state, '__octaneUniversalChildren');
 	state.helpers.context = allocName(state, '__octaneUniversalContext');
 	state.helpers.activity = allocName(state, '__octaneUniversalActivity');
+	state.helpers.block = allocName(state, '__octaneUniversalBlock');
 	if (state.hmr) {
 		state.helpers.hmr = allocName(state, '__octaneUniversalHmr');
 		state.helpers.hmrSymbol = allocName(state, '__octaneUniversalHmrSymbol');
@@ -4606,6 +4661,7 @@ export function compileUniversal(
 			try: state.helpers.try,
 			context: state.helpers.context,
 			activity: state.helpers.activity,
+			block: state.helpers.block,
 		},
 		components: state.components,
 	};

package/dist/compiler/compile.js

@@ -16856,6 +16856,7 @@ function transformUniversalParallelUse(ast, ctx, metadata) {
 			else if (name === regions.switch) thunkIndexes = [1, 2];
 			else if (name === regions.for) thunkIndexes = [2, 3];
 			else if (name === regions.try) thunkIndexes = [0, 1, 2];
+			else if (name === regions.block) thunkIndexes = [0];
 			if (thunkIndexes !== null) {
 				for (const index of thunkIndexes) transformThunkValue(node.arguments?.[index], ownerName);
 				for (let index = 0; index < (node.arguments?.length || 0); index++) {

package/dist/compiler/style-scopes.js

@@ -46,11 +46,11 @@
  *   `JSXElement`: it is not a block, opens no scope, and is never stamped.
  * - Assigned blocks (`const theme = <style>…</style>`) lower anywhere a
  *   declaration is legal: their sheet injects at the declaration position and
- *   the initializer becomes the class-map object (`$class` first). Exported or
- *   applied blocks are themes and keep every selector; other blocks keep only
- *   what the class map exposes. The classification comes from the core
- *   analyzer (`metadata.styleKind`, `metadata.styleApplies`), which runs on
- *   the parser AST before it is adopted, so this pass reads it read-only.
+ *   the initializer becomes the class-map object (`$class` first). Every
+ *   assigned block is a theme and keeps every selector. The classification
+ *   comes from the core analyzer (`metadata.styleKind`, `metadata.styleApplies`),
+ *   which runs on the parser AST before it is adopted, so this pass reads it
+ *   read-only.
  * - `style(expr)` is Octane's class-string expression (core has no such
  *   intrinsic): it resolves to the scope chain plus the value only where TSRX
  *   reads a class value — as the expression of a JSX attribute value or of a

package/dist/compiler/volar.LICENSES.txt

@@ -69,7 +69,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-@tsrx/core@0.3.2
+@tsrx/core@0.4.0
 
 MIT License
 
@@ -93,7 +93,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-acorn@8.17.0
+acorn@8.18.0
 
 MIT License