experimenting wiht types

jonerer · Oct 31, 2024 · a4a9ba0 · a4a9ba0
1 parent ce68064
commit a4a9ba0
Show file tree

Hide file tree

Showing 36 changed files with 1,049 additions and 76 deletions.
diff --git a/.github/workflows/yarn-semla-workflow.yml b/.github/workflows/yarn-semla-workflow.yml
@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 22
       - name: Yarn deps and test
         run: |
           cd semla &&

diff --git a/semla/app/controllers/ApiUsersController.js b/semla/app/controllers/ApiUsersController.js
@@ -1,6 +1,6 @@
 import { BaseController } from './BaseController.js'
-import { registerController } from '../../fw/fw.js'
-import { jsifyBody } from '../../fw/middlewares'
+import { registerController } from '../../lib.js'
+//import { jsifyBody } from '../../fw/middlewares'
 
 class ApiUsersController extends BaseController {
     showMiddle() {
@@ -12,7 +12,7 @@ class ApiUsersController extends BaseController {
     }
 
     static setup(m) {
-        m.before(jsifyBody)
+        //m.before(jsifyBody)
         m.before(this.checkAuth)
         m.before(['me'], this.requireAuth)
         m.before(['show'], this.showMiddle)

diff --git a/semla/app/controllers/AuthController.js b/semla/app/controllers/AuthController.js
@@ -1,5 +1,5 @@
 import { BaseController } from './BaseController.js'
-import { registerController } from '../../fw/fw.js'
+import { registerController } from '../../lib.js'
 
 class AuthController extends BaseController {
     async login() {

diff --git a/semla/app/controllers/AuthTesterController.js b/semla/app/controllers/AuthTesterController.js
@@ -1,5 +1,5 @@
-import { BaseController } from './BaseController'
-import { registerController } from '../../fw/fw'
+import { BaseController } from './BaseController.js'
+import { registerController } from '../../lib.js'
 
 class AuthTesterController extends BaseController {
     static setup(m) {

diff --git a/semla/app/controllers/CatsController.js b/semla/app/controllers/CatsController.js
@@ -1,7 +1,8 @@
 import { BaseController } from './BaseController.js'
-import { registerController } from '../../fw/fw.js'
+import { registerController } from '../../lib.js'
+import { CatsControllerBase } from './Generated.js'
 
-class CatsController extends BaseController {
+class CatsController extends CatsControllerBase {
     static setup() {}
 
     async create({ params }) {
@@ -12,7 +13,10 @@ class CatsController extends BaseController {
         await this.json(c)
     }
 
-    async update({ cat, params }) {
+    /**
+     * @override
+     */
+    async update(ctx) {
         cat.fill(params)
         await cat.save()
 
@@ -35,3 +39,35 @@ class CatsController extends BaseController {
 }
 
 registerController(CatsController)
+
+class Base {
+    /** @param {string} thing */
+    hej(thing) {
+        return 'weo'
+    }
+}
+
+/** @typedef {import('./Imported.js').MyController} MyController */
+class MyController {
+    /** Generated
+     * @property {import('./Imported.js').JsonThing} json
+     */
+    json
+
+    hej(thing) {
+        return 'weo2'
+    }
+
+    thing(ctx) {
+        return 'weo2'
+    }
+
+    /** @param {import('./Imported.js').MyOtherCtx} ctx  */
+    thing2(ctx) {
+        return 'weo2'
+    }
+
+    show(ctx) {
+        return 'weo2'
+    }
+}
diff --git a/semla/app/controllers/CsrfTesterController.js b/semla/app/controllers/CsrfTesterController.js
@@ -1,5 +1,5 @@
-import { BaseController } from './BaseController'
-import { registerController } from '../../fw/fw'
+import { BaseController } from './BaseController.js'
+import { registerController } from '../../lib.js'
 
 class CsrfTesterController extends BaseController {
     async show() {