refactor!: import macro version from quansync/macro

Author: sxzz

package.json

@@ -70,7 +70,7 @@
     "prepublishOnly": "pnpm run build"
   },
   "peerDependencies": {
-    "quansync": ">=0.1.0"
+    "quansync": ">=0.2.0"
   },
   "dependencies": {
     "ast-kit": "^1.4.0",
@@ -88,7 +88,7 @@
     "eslint": "^9.21.0",
     "oxc-transform": "^0.52.0",
     "prettier": "^3.5.2",
-    "quansync": "^0.1.0",
+    "quansync": "^0.2.0",
     "tsdown": "^0.6.0",
     "tsx": "^4.19.3",
     "typescript": "^5.7.3",

pnpm-lock.yaml

@@ -32,7 +32,7 @@ export function transformQuansync(
   }
 
   const macroName = Object.values(imports).find(
-    (i) => i.source === 'quansync' && i.imported === 'quansyncMacro',
+    (i) => i.source === 'quansync/macro' && i.imported === 'quansync',
   )?.local
   if (!macroName) return
 

src/core/index.ts

@@ -2,10 +2,10 @@
 
 exports[`transform > ./fixtures/alias.js 1`] = `
 "// @ts-check
-import { quansync, quansyncMacro as x } from 'quansync'
+import { quansync as x } from 'quansync/macro'
 import { expect } from 'vitest'
 
-export const echo = quansync({
+export const echo = x({
   sync: /** @param {string} v */ (v) => v,
   async: (v) => Promise.resolve(v),
 })
@@ -31,49 +31,49 @@ export default async () => {
 
 exports[`transform > ./fixtures/basic.js 1`] = `
 "// @ts-check
-import { quansyncMacro } from 'quansync'
+import { quansync } from 'quansync/macro'
 import { expect } from 'vitest'
 
-export const getNumber = quansyncMacro({
+export const getNumber = quansync({
   sync: /** @param {number} id */ (id) => id,
   async: (id) => Promise.resolve(id),
 })
 
-const inc1 = quansyncMacro(function* (){
+const inc1 = quansync(function* (){
   const value = yield getNumber(1)
   return value + 1
 })
 
-const inc2 = quansyncMacro(function* (id) {
+const inc2 = quansync(function* (id) {
   const value = yield getNumber(1)
   return value + 1
 })
 
-const inc3 = quansyncMacro(function* named(){
+const inc3 = quansync(function* named(){
   const value = yield getNumber(1)
   return value + 1
 })
 
-const inc4 = quansyncMacro(function* named(id) {
+const inc4 = quansync(function* named(id) {
   const value = yield getNumber(1)
   return value + 1
 })
 
-const inc5 = quansyncMacro(() => {
+const inc5 = quansync(() => {
 return function* () {
   const value = yield getNumber(1)
   return value + 1
 }.call(this)
 })
 
-const inc6 = quansyncMacro((id) => {
+const inc6 = quansync((id) => {
 return function* () {
   const value = yield getNumber(1)
   return value + 1
 }.call(this)
 })
 
-export const fn7 = quansyncMacro(() => {
+export const fn7 = quansync(() => {
 return function* () {
   yield 1
   yield 2
@@ -107,15 +107,15 @@ export default async () => {
 
 exports[`transform > ./fixtures/inlined-arrow.js 1`] = `
 "// @ts-check
-import { quansyncMacro } from 'quansync'
+import { quansync } from 'quansync/macro'
 import { expect } from 'vitest'
 
-export const echo = quansyncMacro({
+export const echo = quansync({
   sync: /** @param {string} v */ (v) => v,
   async: (v) => Promise.resolve(v),
 })
 
-const echoNewLine = quansyncMacro(
+const echoNewLine = quansync(
   /** @param {string|Promise<string>} v */ (v) =>
     {
 return function* () {

tests/__snapshots__/transform.test.ts.snap

@@ -1,8 +1,8 @@
 // @ts-check
-import { quansync, quansyncMacro as x } from 'quansync'
+import { quansync as x } from 'quansync/macro'
 import { expect } from 'vitest'
 
-export const echo = quansync({
+export const echo = x({
   sync: /** @param {string} v */ (v) => v,
   async: (v) => Promise.resolve(v),
 })

tests/fixtures/alias.js

@@ -1,43 +1,43 @@
 // @ts-check
-import { quansyncMacro } from 'quansync'
+import { quansync } from 'quansync/macro'
 import { expect } from 'vitest'
 
-export const getNumber = quansyncMacro({
+export const getNumber = quansync({
   sync: /** @param {number} id */ (id) => id,
   async: (id) => Promise.resolve(id),
 })
 
-const inc1 = quansyncMacro(async function () {
+const inc1 = quansync(async function () {
   const value = await getNumber(1)
   return value + 1
 })
 
-const inc2 = quansyncMacro(async function (id) {
+const inc2 = quansync(async function (id) {
   const value = await getNumber(1)
   return value + 1
 })
 
-const inc3 = quansyncMacro(async function named() {
+const inc3 = quansync(async function named() {
   const value = await getNumber(1)
   return value + 1
 })
 
-const inc4 = quansyncMacro(async function named(id) {
+const inc4 = quansync(async function named(id) {
   const value = await getNumber(1)
   return value + 1
 })
 
-const inc5 = quansyncMacro(async () => {
+const inc5 = quansync(async () => {
   const value = await getNumber(1)
   return value + 1
 })
 
-const inc6 = quansyncMacro(async (id) => {
+const inc6 = quansync(async (id) => {
   const value = await getNumber(1)
   return value + 1
 })
 
-export const fn7 = quansyncMacro(async () => {
+export const fn7 = quansync(async () => {
   await 1
   await 2
   const fn = async () => {

tests/fixtures/basic.js

@@ -1,13 +1,13 @@
 // @ts-check
-import { quansyncMacro } from 'quansync'
+import { quansync } from 'quansync/macro'
 import { expect } from 'vitest'
 
-export const echo = quansyncMacro({
+export const echo = quansync({
   sync: /** @param {string} v */ (v) => v,
   async: (v) => Promise.resolve(v),
 })
 
-const echoNewLine = quansyncMacro(
+const echoNewLine = quansync(
   /** @param {string|Promise<string>} v */ async (v) =>
     (await echo(await v)) + '\n',
 )