Merge pull request #10 from ef4/inter-version-compat

Fix inter-version compatibility
ef4 · Jan 4, 2024 · 1e24344 · 1e24344
2 parents f47940e + 6857db4
commit 1e24344
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -166,7 +166,7 @@ export default function legacyDecoratorCompat(
           path.insertBefore(
             t.staticBlock([
               t.expressionStatement(
-                t.callExpression(state.runtime(path, "f"), args)
+                t.callExpression(state.runtime(path, "g"), args)
               ),
             ])
           );
@@ -206,7 +206,7 @@ export default function legacyDecoratorCompat(
           path.insertAfter(
             t.staticBlock([
               t.expressionStatement(
-                t.callExpression(state.runtime(path, "m"), [
+                t.callExpression(state.runtime(path, "n"), [
                   prototype,
                   valueForFieldKey(t, path.node.key),
                   t.arrayExpression(

diff --git a/src/runtime.ts b/src/runtime.ts
@@ -50,8 +50,18 @@ function findDeferredDecorator(
   }
 }
 
-// decorateField
+// decorateField v1
 export function f(
+  target: { prototype: object },
+  prop: string | number | symbol,
+  decorators: LegacyDecorator[],
+  initializer?: () => any
+): void {
+  return g(target.prototype, prop, decorators, initializer);
+}
+
+// decorateField v2
+export function g(
   prototype: object,
   prop: string | number | symbol,
   decorators: LegacyDecorator[],
@@ -76,8 +86,17 @@ export function f(
   }
 }
 
-// decorateMethod
+// decorateMethod v1
 export function m(
+  { prototype }: { prototype: object },
+  prop: string | number | symbol,
+  decorators: LegacyDecorator[]
+): void {
+  return n(prototype, prop, decorators);
+}
+
+// decorateMethod v2
+export function n(
   prototype: object,
   prop: string | number | symbol,
   decorators: LegacyDecorator[]