Re-export cairo in override module

gjsify · Jul 24, 2024 · 0ca99da · 0ca99da
1 parent 8b3ec80
commit 0ca99da
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/packages/generator-typescript/templates/gjs/cairo-1.0.d.ts b/packages/generator-typescript/templates/gjs/cairo-1.0.d.ts
@@ -1,9 +0,0 @@
-// TODO
-// See
-// - https://gitlab.gnome.org/GNOME/gjs/-/blob/master/installed-tests/js/testCairoModule.js
-// - https://gitlab.gnome.org/GNOME/gjs/-/blob/master/installed-tests/js/testCairo.js
-// - https://gitlab.gnome.org/GNOME/gjs/-/blob/master/doc/cairo.md
-
-// image_surface_create -> ImageSurface
-// Context.constructor(surface: cairo.ImageSurface)
-// ...

diff --git a/packages/generator-typescript/templates/gjs/cairo.d.ts b/packages/generator-typescript/templates/gjs/cairo.d.ts
@@ -1,11 +1,25 @@
+<%_ const Cairo = await dep.get('cairo', '1.0') _%>
+
 <%_ if(!package){ -%>
 declare module 'cairo' {
 <% } -%>
 
-// TODO: See ./cairo-1.0.d.ts
-<%- package ? 'declare' : '' %> const Cairo: any;
+// Cairo 1.0
+<%- Cairo ? Cairo.importDef : '' %>
+
+// TODO: Add overrides here
+
+// See
+// - https://gitlab.gnome.org/GNOME/gjs/-/blob/master/installed-tests/js/testCairoModule.js
+// - https://gitlab.gnome.org/GNOME/gjs/-/blob/master/installed-tests/js/testCairo.js
+// - https://gitlab.gnome.org/GNOME/gjs/-/blob/master/doc/cairo.md
+
+// image_surface_create -> ImageSurface
+// Context.constructor(surface: cairo.ImageSurface)
+// ...
 
-export default Cairo;
+// Re-export Cairo 1.0
+export default <%- Cairo ? Cairo.importName : '' %>;
 
 <%_ if(!package){ -%>
 }