@fictjs/compiler 0.16.0 → 0.17.0

package/dist/index.cjs

@@ -18938,6 +18938,22 @@ function structurizeBlockUntilJoin(ctx, blockId, joinBlock) {
       if (branchNode) nodes.push(branchNode);
       break;
     }
+    case "Switch": {
+      nodes.push(structurizeSwitch(ctx, block, term));
+      break;
+    }
+    case "ForOf": {
+      nodes.push(structurizeForOf(ctx, block, term));
+      break;
+    }
+    case "ForIn": {
+      nodes.push(structurizeForIn(ctx, block, term));
+      break;
+    }
+    case "Try": {
+      nodes.push(structurizeTry(ctx, block, term));
+      break;
+    }
     case "Break":
       nodes.push({ kind: "break", label: term.label });
       break;
@@ -19072,7 +19088,9 @@ function isSwitchCaseTerminated(node) {
   }
 }
 function structurizeForOf(ctx, block, term) {
+  ctx.reservedBlocks.add(term.exit);
   const body = structurizeBlock(ctx, term.body);
+  ctx.reservedBlocks.delete(term.exit);
   const exit = !ctx.emitted.has(term.exit) ? structurizeBlock(ctx, term.exit) : null;
   const forOfNode = {
     kind: "forOf",
@@ -19088,7 +19106,9 @@ function structurizeForOf(ctx, block, term) {
   return forOfNode;
 }
 function structurizeForIn(ctx, block, term) {
+  ctx.reservedBlocks.add(term.exit);
   const body = structurizeBlock(ctx, term.body);
+  ctx.reservedBlocks.delete(term.exit);
   const exit = !ctx.emitted.has(term.exit) ? structurizeBlock(ctx, term.exit) : null;
   const forInNode = {
     kind: "forIn",
@@ -25761,6 +25781,10 @@ function registerResumableComponent(componentName, ctx) {
   const hostParam = t4.identifier("host");
   const snapshotId = t4.identifier("snapshot");
   const ctxId = t4.identifier("ctx");
+  const runtimeModuleUrlExpr = t4.memberExpression(
+    t4.metaProperty(t4.identifier("import"), t4.identifier("meta")),
+    t4.identifier("url")
+  );
   ctx.helpersUsed.add("getSSRScope");
   ctx.helpersUsed.add("ensureScope");
   ctx.helpersUsed.add("prepareContext");
@@ -25834,7 +25858,10 @@ function registerResumableComponent(componentName, ctx) {
   ctx.helpersUsed.add("registerResume");
   const registerCall = t4.expressionStatement(
     t4.callExpression(t4.identifier(RUNTIME_ALIASES.registerResume), [
-      t4.stringLiteral(resumeExport),
+      t4.callExpression(t4.identifier(RUNTIME_ALIASES.qrl), [
+        runtimeModuleUrlExpr,
+        t4.stringLiteral(resumeExport)
+      ]),
       resumeFnId
     ])
   );
@@ -27624,18 +27651,8 @@ function lowerExpressionImpl(expr, ctx, valueUsed = true) {
         blocks,
         meta: { fromExpression: true }
       };
-      const cfg = analyzeCFG(fn.blocks);
-      const hasLoop = cfg.loopHeaders.size > 0 || cfg.backEdges.size > 0;
       const { node, diagnostics } = structurizeCFGWithDiagnostics(fn);
-      const structured = node.kind === "stateMachine" || hasLoop ? node.kind === "stateMachine" ? node : {
-        kind: "stateMachine",
-        blocks: fn.blocks.map((block) => ({
-          blockId: block.id,
-          instructions: block.instructions,
-          terminator: block.terminator
-        })),
-        entryBlock: fn.blocks[0]?.id ?? 0
-      } : diagnostics.isComplete ? node : {
+      const structured = node.kind === "stateMachine" ? node : diagnostics.isComplete ? node : {
         kind: "stateMachine",
         blocks: fn.blocks.map((block) => ({
           blockId: block.id,

package/dist/index.js

@@ -18921,6 +18921,22 @@ function structurizeBlockUntilJoin(ctx, blockId, joinBlock) {
       if (branchNode) nodes.push(branchNode);
       break;
     }
+    case "Switch": {
+      nodes.push(structurizeSwitch(ctx, block, term));
+      break;
+    }
+    case "ForOf": {
+      nodes.push(structurizeForOf(ctx, block, term));
+      break;
+    }
+    case "ForIn": {
+      nodes.push(structurizeForIn(ctx, block, term));
+      break;
+    }
+    case "Try": {
+      nodes.push(structurizeTry(ctx, block, term));
+      break;
+    }
     case "Break":
       nodes.push({ kind: "break", label: term.label });
       break;
@@ -19055,7 +19071,9 @@ function isSwitchCaseTerminated(node) {
   }
 }
 function structurizeForOf(ctx, block, term) {
+  ctx.reservedBlocks.add(term.exit);
   const body = structurizeBlock(ctx, term.body);
+  ctx.reservedBlocks.delete(term.exit);
   const exit = !ctx.emitted.has(term.exit) ? structurizeBlock(ctx, term.exit) : null;
   const forOfNode = {
     kind: "forOf",
@@ -19071,7 +19089,9 @@ function structurizeForOf(ctx, block, term) {
   return forOfNode;
 }
 function structurizeForIn(ctx, block, term) {
+  ctx.reservedBlocks.add(term.exit);
   const body = structurizeBlock(ctx, term.body);
+  ctx.reservedBlocks.delete(term.exit);
   const exit = !ctx.emitted.has(term.exit) ? structurizeBlock(ctx, term.exit) : null;
   const forInNode = {
     kind: "forIn",
@@ -25744,6 +25764,10 @@ function registerResumableComponent(componentName, ctx) {
   const hostParam = t4.identifier("host");
   const snapshotId = t4.identifier("snapshot");
   const ctxId = t4.identifier("ctx");
+  const runtimeModuleUrlExpr = t4.memberExpression(
+    t4.metaProperty(t4.identifier("import"), t4.identifier("meta")),
+    t4.identifier("url")
+  );
   ctx.helpersUsed.add("getSSRScope");
   ctx.helpersUsed.add("ensureScope");
   ctx.helpersUsed.add("prepareContext");
@@ -25817,7 +25841,10 @@ function registerResumableComponent(componentName, ctx) {
   ctx.helpersUsed.add("registerResume");
   const registerCall = t4.expressionStatement(
     t4.callExpression(t4.identifier(RUNTIME_ALIASES.registerResume), [
-      t4.stringLiteral(resumeExport),
+      t4.callExpression(t4.identifier(RUNTIME_ALIASES.qrl), [
+        runtimeModuleUrlExpr,
+        t4.stringLiteral(resumeExport)
+      ]),
       resumeFnId
     ])
   );
@@ -27607,18 +27634,8 @@ function lowerExpressionImpl(expr, ctx, valueUsed = true) {
         blocks,
         meta: { fromExpression: true }
       };
-      const cfg = analyzeCFG(fn.blocks);
-      const hasLoop = cfg.loopHeaders.size > 0 || cfg.backEdges.size > 0;
       const { node, diagnostics } = structurizeCFGWithDiagnostics(fn);
-      const structured = node.kind === "stateMachine" || hasLoop ? node.kind === "stateMachine" ? node : {
-        kind: "stateMachine",
-        blocks: fn.blocks.map((block) => ({
-          blockId: block.id,
-          instructions: block.instructions,
-          terminator: block.terminator
-        })),
-        entryBlock: fn.blocks[0]?.id ?? 0
-      } : diagnostics.isComplete ? node : {
+      const structured = node.kind === "stateMachine" ? node : diagnostics.isComplete ? node : {
         kind: "stateMachine",
         blocks: fn.blocks.map((block) => ({
           blockId: block.id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fictjs/compiler",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "Babel plugin for Fict Compiler",
   "publishConfig": {
     "access": "public",
@@ -48,7 +48,7 @@
     "@types/babel__helper-plugin-utils": "^7.10.3",
     "@types/babel__traverse": "^7.28.0",
     "tsup": "^8.5.1",
-    "@fictjs/runtime": "0.16.0"
+    "@fictjs/runtime": "0.17.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format cjs,esm --dts",