fix typing (#70)

patricklx · Jul 5, 2024 · ddf7504 · ddf7504
1 parent 9ccd017
commit ddf7504
Show file tree

Hide file tree

Showing 15 changed files with 271 additions and 501 deletions.
diff --git a/ember-routable-component/src/index.ts b/ember-routable-component/src/index.ts
@@ -1,11 +1,14 @@
 import Route from '@ember/routing/route';
 import Component from '@glimmer/component';
 import type { TemplateOnlyComponent } from '@ember/component/template-only';
-import Controller from '@ember/controller';
+import type Controller from '@ember/controller';
 
-export interface Signature<T, Controller extends typeof Controller<T>> {
+export interface Signature<
+  T = unknown,
+  C extends Controller<T> | unknown = Controller<T>,
+> {
   Args: {
-    controller: Controller;
+    controller: C;
     model: T;
   };
   Blocks: {
@@ -14,17 +17,26 @@ export interface Signature<T, Controller extends typeof Controller<T>> {
   };
 }
 
-export default function RoutableComponentRoute<
-  Model = unknown,
-  Controller extends typeof Controller<Model> = typeof Controller<Model>,
->(
-  Component: TemplateOnlyComponent<Signature<Model, Controller>>,
-): typeof Route<Model>;
+type GetModel<T> = T extends Controller<infer Model> ? Model : T;
+type GetController<T> = T extends Controller ? T : Controller<T>;
+
+type GetSignature<T> = Signature<GetModel<T>, GetController<T>>;
+
+export default function RoutableComponentRoute<T>(
+  Component: TemplateOnlyComponent<GetSignature<T>>,
+): typeof Route<GetModel<T>>;
+
+export default function RoutableComponentRoute<T>(
+  component: typeof Component<GetSignature<T>>,
+): typeof Route<GetModel<T>>;
 
-export default function RoutableComponentRoute<
-  Model = unknown,
-  Controller extends typeof Controller<Model> = typeof Controller<Model>,
->(Component: Component<Signature<Model, Controller>>): typeof Route<Model>;
+export default function RoutableComponentRoute(
+  component: Component,
+): typeof Route<any>;
+
+export default function RoutableComponentRoute(
+  component: TemplateOnlyComponent,
+): typeof Route<any>;
 
 export default function RoutableComponentRoute(Component: any) {
   return class Rout extends Route {
@@ -43,7 +55,8 @@ export default function RoutableComponentRoute(Component: any) {
   };
 }
 
-export class RoutableComponent<
-  T = unknown,
-  Controller extends typeof Controller<T> = typeof Controller<T>,
-> extends Component<Signature<T, Controller>> {}
+export class RoutableComponent<T = unknown> extends Component<
+  GetSignature<T>
+> {}
+
+export type RTOC<T> = TemplateOnlyComponent<GetSignature<T>>;
diff --git a/ember-routable-component/tsconfig.json b/ember-routable-component/tsconfig.json
@@ -7,6 +7,9 @@
   "compilerOptions": {
     "allowJs": true,
     "allowImportingTsExtensions": true,
-    "declarationDir": "declarations"
+    "declarationDir": "declarations",
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "noEmit": false
   }
 }
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "author": "Patrick Pircher",
   "scripts": {
     "build": "pnpm --filter ember-routable-component run build",
-    "lint": "pnpm --filter * run lint",
+    "lint": "pnpm --filter ember-routable-component --filter test-app run lint",
     "lint:fix": "pnpm --filter * run lint:fix",
     "prepare": "pnpm build",
     "start": "concurrently 'npm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
@@ -19,13 +19,25 @@
   },
   "devDependencies": {
     "@glint/core": "^1.4.0",
-    "@glint/environment-ember-loose": "^1.3.0",
-    "@glint/environment-ember-template-imports": "^1.3.0",
+    "@glint/environment-ember-loose": "^1.4.0",
+    "@glint/environment-ember-template-imports": "^1.4.0",
     "@glint/template": "^1.4.0",
     "concurrently": "^8.2.2",
     "prettier": "^3.3.2",
     "prettier-plugin-ember-template-tag": "^2.0.1",
     "release-plan": "^0.9.0",
     "typescript": "^5.5.3"
+  },
+  "workspaces": [
+    "ember-routable-component",
+    "test-app"
+  ],
+  "pnpm": {
+    "overrides": {
+      "@glint/core": "^1.4.1-unstable.e8d1c9a",
+      "@glint/environment-ember-loose": "^1.4.1-unstable.e8d1c9a",
+      "@glint/environment-ember-template-imports": "^1.4.1-unstable.e8d1c9a",
+      "ember-eslint-parser": "^0.4.0"
+    }
   }
 }