Fix snapshots

lxsmnsyc · lxsmnsyc · commit 38bc989649bd · 2025-02-20T01:37:05.000+08:00
diff --git a/packages/core/babel/components.ts b/packages/core/babel/components.ts
@@ -1,6 +1,6 @@
 import type { NodePath, Visitor } from '@babel/traverse';
 import * as t from '@babel/types';
-import getImportIdentifier from './core/get-import-identifier';
+import { getImportIdentifier } from './core/get-import-identifier';
 import type { State } from './core/types';
 
 type ComponentImport = [name: string, source: string];
@@ -84,7 +84,7 @@ const COMPONENT_TRAVERSE: Visitor<State> = {
   },
 };
 
-export default function transformComponents(
+export function transformComponents(
   state: State,
   path: NodePath,
 ): void {
diff --git a/packages/core/babel/core/accessor-variable.ts b/packages/core/babel/core/accessor-variable.ts
@@ -1,9 +1,9 @@
 import type * as babel from '@babel/core';
 import * as t from '@babel/types';
-import derefMemo from './deref-memo';
+import { derefMemo } from './deref-memo';
 import { generateUniqueName } from './generate-unique-name';
 
-export default function accessorVariable(
+export function accessorVariable(
   path: babel.NodePath,
   accessorIdentifier: t.Identifier,
   callee: t.Identifier,
diff --git a/packages/core/babel/core/assert.ts b/packages/core/babel/core/assert.ts
@@ -1,7 +1,4 @@
-export default function assert<T extends Error>(
-  cond: unknown,
-  error: T,
-): asserts cond {
+export function assert<T extends Error>(cond: unknown, error: T): asserts cond {
   if (!cond) {
     throw error;
   }
diff --git a/packages/core/babel/core/deferred-variable.ts b/packages/core/babel/core/deferred-variable.ts
@@ -1,10 +1,10 @@
 import type * as babel from '@babel/core';
 import * as t from '@babel/types';
-import accessorVariable from './accessor-variable';
-import getImportIdentifier from './get-import-identifier';
+import { accessorVariable } from './accessor-variable';
+import { getImportIdentifier } from './get-import-identifier';
 import type { State } from './types';
 
-export default function deferredVariable(
+export function deferredVariable(
   state: State,
   path: babel.NodePath,
   deferredIdentifier: t.Identifier,
diff --git a/packages/core/babel/core/deref-memo-variable.ts b/packages/core/babel/core/deref-memo-variable.ts
@@ -1,9 +1,9 @@
 import type * as babel from '@babel/core';
 import * as t from '@babel/types';
-import derefMemo from './deref-memo';
+import { derefMemo } from './deref-memo';
 import { generateUniqueName } from './generate-unique-name';
 
-export default function derefMemoVariable(
+export function derefMemoVariable(
   path: babel.NodePath,
   memoIdentifier: t.Identifier,
   stateIdentifier: t.Expression,
diff --git a/packages/core/babel/core/deref-memo.ts b/packages/core/babel/core/deref-memo.ts
@@ -1,9 +1,9 @@
 import type * as babel from '@babel/core';
 import * as t from '@babel/types';
-import assert from './assert';
+import { assert } from './assert';
 import { unexpectedType } from './errors';
 import { addProtoGetter } from './proto';
-import unwrapNode, { getProperParentPath } from './unwrap-node';
+import { getProperParentPath, unwrapNode } from './unwrap-node';
 
 const REF_MEMO_CTF = '$refMemo';
 const GET_CTF = '$get';
@@ -67,7 +67,7 @@ function transformReferencePath(
   return true;
 }
 
-export default function derefMemo(
+export function derefMemo(
   path: babel.NodePath,
   memoIdentifier: t.Identifier,
   readIdentifier: t.Identifier,
diff --git a/packages/core/babel/core/deref-signal-variable.ts b/packages/core/babel/core/deref-signal-variable.ts
@@ -1,9 +1,9 @@
 import type * as babel from '@babel/core';
 import * as t from '@babel/types';
-import derefSignal from './deref-signal';
+import { derefSignal } from './deref-signal';
 import { generateUniqueName } from './generate-unique-name';
 
-export default function derefSignalVariable(
+export function derefSignalVariable(
   path: babel.NodePath,
   signalIdentifier: t.Identifier,
   stateIdentifier: t.Expression,
diff --git a/packages/core/babel/core/deref-signal.ts b/packages/core/babel/core/deref-signal.ts
@@ -1,13 +1,12 @@
 import type * as babel from '@babel/core';
 import * as t from '@babel/types';
-import assert from './assert';
+import { assert } from './assert';
 import { unexpectedType } from './errors';
 import { generateUniqueName } from './generate-unique-name';
-import isAwaited from './is-awaited';
-import isYielded from './is-yielded';
+import { isAwaited } from './is-awaited';
+import { isYielded } from './is-yielded';
 import { addProtoGetter, addProtoProperty, addProtoSetter } from './proto';
-// import isInTypeScript from './is-in-typescript';
-import unwrapNode, { getProperParentPath, isPathValid } from './unwrap-node';
+import { getProperParentPath, isPathValid, unwrapNode } from './unwrap-node';
 
 const REF_SIGNAL_CTF = '$refSignal';
 const GET_CTF = '$get';
@@ -220,7 +219,7 @@ function transformSignalWrite(
   }
 }
 
-export default function derefSignal(
+export function derefSignal(
   path: babel.NodePath,
   signalIdentifier: t.Identifier,
   readIdentifier: t.Identifier,
diff --git a/packages/core/babel/core/destructure-variable.ts b/packages/core/babel/core/destructure-variable.ts
@@ -1,14 +1,14 @@
 import type * as babel from '@babel/core';
 import * as t from '@babel/types';
-import derefMemo from './deref-memo';
+import { derefMemo } from './deref-memo';
 import { unexpectedType } from './errors';
 import { generateUniqueName } from './generate-unique-name';
-import getImportIdentifier from './get-import-identifier';
-import isStatic from './is-static';
+import { getImportIdentifier } from './get-import-identifier';
+import { isStatic } from './is-static';
 import type { State } from './types';
-import unwrapNode from './unwrap-node';
+import { unwrapNode } from './unwrap-node';
 
-export default function destructureVariable(
+export function destructureVariable(
   state: State,
   path: babel.NodePath,
   target: t.Expression,
diff --git a/packages/core/babel/core/is-awaited.ts b/packages/core/babel/core/is-awaited.ts
@@ -1,8 +1,6 @@
 import * as t from '@babel/types';
 
-export default function isAwaited(
-  node: t.Expression | t.SpreadElement,
-): boolean {
+export function isAwaited(node: t.Expression | t.SpreadElement): boolean {
   // Default
   if (t.isAwaitExpression(node)) {
     return true;
diff --git a/packages/core/babel/core/is-in-typescript.ts b/packages/core/babel/core/is-in-typescript.ts
@@ -1,10 +1,10 @@
-import * as t from '@babel/types';
 import type * as babel from '@babel/core';
+import * as t from '@babel/types';
 
-export default function isInTypeScript(path: babel.NodePath): boolean {
+export function isInTypescript(path: babel.NodePath): boolean {
   let parent = path.parentPath;
   while (parent) {
-    if (t.isTypeScript(parent.node)) {
+    if (t.isTypeScript(parent.node) && !t.isExpression(parent.node)) {
       return true;
     }
     parent = parent.parentPath;
diff --git a/packages/core/babel/core/is-static.ts b/packages/core/babel/core/is-static.ts
@@ -1,6 +1,6 @@
 import * as t from '@babel/types';
 
-export default function isStatic(
+export function isStatic(
   node:
     | t.Expression
     | t.SpreadElement
diff --git a/packages/core/babel/core/is-yielded.ts b/packages/core/babel/core/is-yielded.ts
@@ -1,8 +1,6 @@
 import * as t from '@babel/types';
 
-export default function isYielded(
-  node: t.Expression | t.SpreadElement,
-): boolean {
+export function isYielded(node: t.Expression | t.SpreadElement): boolean {
   // Default
   if (t.isYieldExpression(node)) {
     return true;
diff --git a/packages/core/babel/core/memo-variable.ts b/packages/core/babel/core/memo-variable.ts
@@ -1,10 +1,10 @@
 import type * as babel from '@babel/core';
 import * as t from '@babel/types';
-import accessorVariable from './accessor-variable';
-import getImportIdentifier from './get-import-identifier';
+import { accessorVariable } from './accessor-variable';
+import { getImportIdentifier } from './get-import-identifier';
 import type { State } from './types';
 
-export default function memoVariable(
+export function memoVariable(
   state: State,
   path: babel.NodePath,
   memoIdentifier: t.Identifier,
diff --git a/packages/core/babel/core/signal-variable.ts b/packages/core/babel/core/signal-variable.ts
@@ -1,11 +1,11 @@
 import type * as babel from '@babel/core';
 import * as t from '@babel/types';
-import derefSignal from './deref-signal';
+import { derefSignal } from './deref-signal';
 import { generateUniqueName } from './generate-unique-name';
-import getImportIdentifier from './get-import-identifier';
+import { getImportIdentifier } from './get-import-identifier';
 import type { State } from './types';
 
-export default function signalVariable(
+export function signalVariable(
   state: State,
   path: babel.NodePath,
   signalIdentifier: t.Identifier,
diff --git a/packages/core/babel/core/unwrap-node.ts b/packages/core/babel/core/unwrap-node.ts
@@ -36,7 +36,7 @@ export function isPathValid<V extends t.Node>(
   return key((path as NodePath).node);
 }
 
-export default function unwrapNode<K extends (node: t.Node) => boolean>(
+export function unwrapNode<K extends (node: t.Node) => boolean>(
   node: t.Node,
   key: K,
 ): TypeCheck<K> | undefined {
diff --git a/packages/core/babel/index.ts b/packages/core/babel/index.ts
@@ -1,9 +1,9 @@
 import type * as babel from '@babel/core';
-import type { State, Options } from './core/types';
-import transformComponents from './components';
-import transformCTF from './transform-ctf';
-import transformLabels from './transform-label';
-import transformComments from './transform-comment';
+import { transformComponents } from './components';
+import type { Options, State } from './core/types';
+import { transformComments } from './transform-comment';
+import { transformCTF } from './transform-ctf';
+import { transformLabels } from './transform-label';
 
 export type { Options };
 
diff --git a/packages/core/babel/transform-comment.ts b/packages/core/babel/transform-comment.ts
@@ -1,11 +1,11 @@
 import type * as babel from '@babel/core';
 import * as t from '@babel/types';
-import accessorVariable from './core/accessor-variable';
-import deferredVariable from './core/deferred-variable';
-import destructureVariable from './core/destructure-variable';
-import getImportIdentifier from './core/get-import-identifier';
-import memoVariable from './core/memo-variable';
-import signalVariable from './core/signal-variable';
+import { accessorVariable } from './core/accessor-variable';
+import { deferredVariable } from './core/deferred-variable';
+import { destructureVariable } from './core/destructure-variable';
+import { getImportIdentifier } from './core/get-import-identifier';
+import { memoVariable } from './core/memo-variable';
+import { signalVariable } from './core/signal-variable';
 import type { State } from './core/types';
 
 const VARIABLE_LABEL = {
@@ -222,9 +222,6 @@ const COMMENT_TRAVERSE: babel.Visitor<State> = {
   },
 };
 
-export default function transformComments(
-  state: State,
-  path: babel.NodePath,
-): void {
+export function transformComments(state: State, path: babel.NodePath): void {
   path.traverse(COMMENT_TRAVERSE, state);
 }
diff --git a/packages/core/babel/transform-ctf.ts b/packages/core/babel/transform-ctf.ts
@@ -1,18 +1,18 @@
 import type * as babel from '@babel/core';
 import * as t from '@babel/types';
-import accessorVariable from './core/accessor-variable';
-import assert from './core/assert';
-import deferredVariable from './core/deferred-variable';
-import derefMemoVariable from './core/deref-memo-variable';
-import derefSignalVariable from './core/deref-signal-variable';
-import destructureVariable from './core/destructure-variable';
+import { accessorVariable } from './core/accessor-variable';
+import { assert } from './core/assert';
+import { deferredVariable } from './core/deferred-variable';
+import { derefMemoVariable } from './core/deref-memo-variable';
+import { derefSignalVariable } from './core/deref-signal-variable';
+import { destructureVariable } from './core/destructure-variable';
 import { unexpectedArgumentLength, unexpectedType } from './core/errors';
 import { generateUniqueName } from './core/generate-unique-name';
-import getImportIdentifier from './core/get-import-identifier';
-import memoVariable from './core/memo-variable';
-import signalVariable from './core/signal-variable';
+import { getImportIdentifier } from './core/get-import-identifier';
+import { memoVariable } from './core/memo-variable';
+import { signalVariable } from './core/signal-variable';
 import type { State } from './core/types';
-import unwrapNode from './core/unwrap-node';
+import { unwrapNode } from './core/unwrap-node';
 
 type AutoArrowCTF = [name: string, source: string, arguments: number];
 
@@ -208,9 +208,7 @@ const CTF_TRAVERSE: babel.Visitor<State> = {
                   id,
                   getImportIdentifier(state, path, name, source),
                   [
-                    arrow
-                      ? t.arrowFunctionExpression([], argument)
-                      : argument,
+                    arrow ? t.arrowFunctionExpression([], argument) : argument,
                     ...rest,
                   ],
                 ),
@@ -273,7 +271,9 @@ const CTF_TRAVERSE: babel.Visitor<State> = {
                 );
                 options = optionsValue;
               }
-              path.replaceWith(memoVariable(state, path, id, argument, options));
+              path.replaceWith(
+                memoVariable(state, path, id, argument, options),
+              );
             } else if (trueCallee.name === DEREF_SIGNAL_CTF) {
               // Transform $derefSignal
               const args = trueCallExpr.arguments;
@@ -388,6 +388,6 @@ const CTF_TRAVERSE: babel.Visitor<State> = {
   },
 };
 
-export default function transformCTF(state: State, path: babel.NodePath): void {
+export function transformCTF(state: State, path: babel.NodePath): void {
   path.traverse(CTF_TRAVERSE, state);
 }
diff --git a/packages/core/babel/transform-label.ts b/packages/core/babel/transform-label.ts
@@ -1,13 +1,13 @@
 import type * as babel from '@babel/core';
 import * as t from '@babel/types';
-import accessorVariable from './core/accessor-variable';
-import assert from './core/assert';
-import deferredVariable from './core/deferred-variable';
-import destructureVariable from './core/destructure-variable';
+import { accessorVariable } from './core/accessor-variable';
+import { assert } from './core/assert';
+import { deferredVariable } from './core/deferred-variable';
+import { destructureVariable } from './core/destructure-variable';
 import { unexpectedType } from './core/errors';
-import getImportIdentifier from './core/get-import-identifier';
-import memoVariable from './core/memo-variable';
-import signalVariable from './core/signal-variable';
+import { getImportIdentifier } from './core/get-import-identifier';
+import { memoVariable } from './core/memo-variable';
+import { signalVariable } from './core/signal-variable';
 import type { State } from './core/types';
 
 const REACTIVE_LABEL = '$';
@@ -215,9 +215,6 @@ const LABEL_TRAVERSE: babel.Visitor<State> = {
   },
 };
 
-export default function transformLabels(
-  state: State,
-  path: babel.NodePath,
-): void {
+export function transformLabels(state: State, path: babel.NodePath): void {
   path.traverse(LABEL_TRAVERSE, state);
 }
diff --git a/packages/core/test/__snapshots__/ctf.test.ts.snap b/packages/core/test/__snapshots__/ctf.test.ts.snap

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-export default function assert<T extends Error>(`
`2`		`- cond: unknown,`
`3`		`- error: T,`
`4`		`-): asserts cond {`
	`1`	`+export function assert<T extends Error>(cond: unknown, error: T): asserts cond {`
`5`	`2`	`if (!cond) {`
`6`	`3`	`throw error;`
`7`	`4`	`}`