🎉 NEW: should strip now (#593)

jycouet · Jan 8, 2024 · ae3353f · ae3353f
1 parent 87432e8
commit ae3353f
Show file tree

Hide file tree

Showing 13 changed files with 120 additions and 7 deletions.
diff --git a/.changeset/chilly-stingrays-drum.md b/.changeset/chilly-stingrays-drum.md
@@ -0,0 +1,5 @@
+---
+'vite-plugin-striper': minor
+---
+
+striper is now actually spripping things! (it was not updating the transformed code before)
diff --git a/packages/vite-plugin-striper/.env.local b/packages/vite-plugin-striper/.env.local
@@ -0,0 +1 @@
+AUTH_SECRET = 'top secret'
diff --git a/packages/vite-plugin-striper/package.json b/packages/vite-plugin-striper/package.json
@@ -33,6 +33,7 @@
     "@sveltejs/package": "2.2.2",
     "@sveltejs/vite-plugin-svelte": "^3.0.0",
     "publint": "0.2.4",
+    "remult": "^0.23.0",
     "svelte": "4.2.1",
     "svelte-check": "3.6.0",
     "tslib": "2.6.2",

diff --git a/packages/vite-plugin-striper/src/hooks.server.ts b/packages/vite-plugin-striper/src/hooks.server.ts
@@ -0,0 +1,5 @@
+import { sequence } from '@sveltejs/kit/hooks'
+
+import { handleRemult } from './hooks/handleRemult'
+
+export const handle = sequence(handleRemult)
diff --git a/packages/vite-plugin-striper/src/hooks/handleRemult.ts b/packages/vite-plugin-striper/src/hooks/handleRemult.ts
@@ -0,0 +1,7 @@
+import { remultSveltekit } from 'remult/remult-sveltekit'
+
+import { ActionsController } from '../shared/actionsController.js'
+
+export const handleRemult = remultSveltekit({
+  controllers: [ActionsController],
+})
diff --git a/packages/vite-plugin-striper/src/lib/plugin.ts b/packages/vite-plugin-striper/src/lib/plugin.ts
@@ -101,12 +101,16 @@ export function striper(options?: ViteStriperOptions): Plugin[] {
           return
         }
 
+        let infosNumber = 0
+
         if (options && options?.decorators && options.decorators.length > 0) {
           const { info, ...rest } = await transformDecorator(code, options.decorators)
 
           // Update the code for later transforms
           code = rest.code
 
+          infosNumber += info.length
+
           if (options?.debug && info.length > 0) {
             log.info(
               `` +
@@ -123,7 +127,7 @@ export function striper(options?: ViteStriperOptions): Plugin[] {
 
         if (options && options?.packages && options.packages.length > 0) {
           const { info, ...rest } = await removePackages(code, options.packages)
-
+          infosNumber += info.length
           if (options?.debug && info.length > 0) {
             log.info(
               `` +
@@ -138,6 +142,10 @@ export function striper(options?: ViteStriperOptions): Plugin[] {
           }
         }
 
+        if (infosNumber > 0) {
+          return { code, map: null }
+        }
+
         return
       },
     },

diff --git a/packages/vite-plugin-striper/src/lib/transformDecorator.spec.ts b/packages/vite-plugin-striper/src/lib/transformDecorator.spec.ts
@@ -50,12 +50,12 @@ export class TasksController {
           @BackendMethod({
               allowed: Allow.authenticated
           })
-          static async setAllCompleted(completed: boolean) {}
+          static async setAllCompleted(completed) {}
 
           @BackendMethod({
               allowed: Allow.authenticated
           })
-          static async Yop(completed: boolean) {}
+          static async Yop(completed) {}
       }",
         "info": [
           "Striped: 'BackendMethod'",
@@ -202,7 +202,7 @@ export class TasksController {
           @BackendMethod({
               allowed: false
           })
-          static async init(hello: string) {}
+          static async init(hello) {}
       }",
         "info": [
           "Striped: 'BackendMethod'",
@@ -415,4 +415,42 @@ export class TasksController {
       }
     `)
   })
+
+  it('should strip import types', async () => {
+    const code = `import { AUTH_SECRET } from '$env/static/private'
+    import { BackendMethod, type Allowed, remult } from 'remult'
+    
+    export class ActionsController {
+      @BackendMethod({
+        // Only unauthenticated users can call this method
+        allowed: () => remult.user === undefined,
+      })
+      static async read(info: Allowed) {
+        console.log('AUTH_SECRET', AUTH_SECRET)
+        return AUTH_SECRET + ' ' + info
+      }
+    }
+    
+	`
+
+    const transformed = await transformDecorator(code, ['BackendMethod'])
+
+    expect(transformed).toMatchInlineSnapshot(`
+      {
+        "code": "import { BackendMethod, remult } from "remult";
+
+      export class ActionsController {
+          @BackendMethod({
+              allowed: () => remult.user === undefined
+          })
+          static async read(info) {}
+      }",
+        "info": [
+          "Striped: 'BackendMethod'",
+          "Removed: 'AUTH_SECRET' from '$env/static/private'",
+          "Removed: 'Allowed' from 'remult'",
+        ],
+      }
+    `)
+  })
 })
diff --git a/packages/vite-plugin-striper/src/lib/transformDecorator.ts b/packages/vite-plugin-striper/src/lib/transformDecorator.ts
@@ -146,9 +146,23 @@ export const transformDecorator = async (code: string, decorators_to_strip: stri
           return true
         })
 
-        // If one of decorators was found, empty the function body
+        // If one of the decorators was found, empty the function body and remove types
         if (foundDecorator) {
           path.node.body.body = []
+
+          // Remove the return type of the function
+          if (path.node.returnType) {
+            delete path.node.returnType
+          }
+
+          // Remove the types of all parameters
+          path.node.params.forEach(param => {
+            // @ts-ignore
+            if (param.typeAnnotation) {
+              // @ts-ignore
+              delete param.typeAnnotation
+            }
+          })
         }
 
         this.traverse(path)

diff --git a/packages/vite-plugin-striper/src/routes/+page.svelte b/packages/vite-plugin-striper/src/routes/+page.svelte
@@ -2,3 +2,4 @@ Hello
 
 <a href="/demoThrowClass">ThrowClass</a>
 <a href="/demoThrowClass">ThrowRandom</a>
+<a href="/decorators">decorators</a>
diff --git a/packages/vite-plugin-striper/src/routes/decorators/+page.svelte b/packages/vite-plugin-striper/src/routes/decorators/+page.svelte
@@ -0,0 +1,13 @@
+<script lang="ts">
+  import { onMount } from 'svelte'
+  import { ActionsController } from '../../shared/actionsController.js'
+
+  let secretContent = '???'
+
+  onMount(async () => {
+    secretContent = await ActionsController.read(true)
+  })
+</script>
+
+<h2>Bye bye decorators</h2>
+secretContent: {secretContent}
diff --git a/packages/vite-plugin-striper/src/shared/actionsController.ts b/packages/vite-plugin-striper/src/shared/actionsController.ts
@@ -0,0 +1,13 @@
+import { AUTH_SECRET } from '$env/static/private'
+import { BackendMethod, type Allowed, remult } from 'remult'
+
+export class ActionsController {
+  @BackendMethod({
+    // Only unauthenticated users can call this method
+    allowed: () => remult.user === undefined,
+  })
+  static async read(info: Allowed) {
+    console.info('AUTH_SECRET', AUTH_SECRET)
+    return AUTH_SECRET + ' ' + info
+  }
+}
diff --git a/packages/vite-plugin-striper/vite.config.ts b/packages/vite-plugin-striper/vite.config.ts
@@ -5,7 +5,11 @@ import { striper } from './src/lib/plugin.js'
 
 export default defineConfig({
   plugins: [
-    striper({ log_on_throw_is_not_a_new_class: true }),
+    striper({
+      decorators: ['BackendMethod'],
+      debug: false,
+      log_on_throw_is_not_a_new_class: true,
+    }),
     //
     sveltekit(),
   ],

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml