updates

__fixtures__/decorators/src/class.ts

@@ -1,4 +1,4 @@
-import { admin, creator } from '@hyperweb/decorators';
+import { admin, creator, external, internal } from '@hyperweb/decorators';
 import { BigNumber } from 'jsd-std';
 
 export interface State {
@@ -13,11 +13,14 @@ export class Counter {
   }
 
   // Public by default (no decorator needed)
+  @external
+  @admin
   public getCount(): BigNumber {
     return this.state.count;
   }
-
+  
   // Only admin and creator can increment
+  @internal
   @admin
   public increment(amount: BigNumber): void {
     this.state.count = this.state.count.add(amount);

__fixtures__/decorators/src/index.ts

@@ -1,9 +1,12 @@
 export * from './class';
 export * from './object';
 class MyClass {
-  @log('debug')
+  @permission('debug', 'level')
   @performance
   async fetchData() {
     // ... method implementation
   }
-}
+}
+
+export default MyClass;
+export {MyClass};

__output__/decorators/decorators.json

@@ -1,32 +1,44 @@
 {
   "../../__fixtures__/decorators/src/index.ts": [
     {
-      "name": "log",
+      "name": "permission",
       "args": [
-        "debug"
+        "debug",
+        "level"
       ],
-      "targetName": "fetchData",
-      "targetType": "method"
+      "targetName": "fetchData"
     },
     {
       "name": "performance",
       "args": [],
-      "targetName": "fetchData",
-      "targetType": "method"
+      "targetName": "fetchData"
     }
   ],
   "../../__fixtures__/decorators/src/class.ts": [
+    {
+      "name": "external",
+      "args": [],
+      "targetName": "getCount"
+    },
+    {
+      "name": "admin",
+      "args": [],
+      "targetName": "getCount"
+    },
+    {
+      "name": "internal",
+      "args": [],
+      "targetName": "increment"
+    },
     {
       "name": "admin",
       "args": [],
-      "targetName": "increment",
-      "targetType": "method"
+      "targetName": "increment"
     },
     {
       "name": "creator",
       "args": [],
-      "targetName": "decrement",
-      "targetType": "method"
+      "targetName": "decrement"
     }
   ]
 }

packages/build/src/decorators.ts

@@ -11,7 +11,7 @@ interface DecoratorInfo {
   name: string;
   args: any[];
   targetName: string;
-  targetType: 'method' | 'function';
+  targetType?: 'method' | 'function';
   location?: {
     file: string;
     line: number;
@@ -102,7 +102,7 @@ export const createDecoratorExtractorPlugin = (
               ? (parent.key as t.Identifier).name
               : (parent as t.FunctionDeclaration).id?.name || 'anonymous',
             // @ts-ignore
-            targetType: t.isClassMethod(parent) ? 'method' : 'function',
+            // targetType: t.isClassMethod(parent) ? 'method' : 'function',
 
             // location: {
             //   file: normalizedPath,