From ccd437a275e2faf5a0921e83b0a0e06a7dc98ad4 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Thu, 2 Jan 2025 01:26:38 -0500
Subject: [PATCH] feat(ags): improve types

---
 lib/pkgs/default.nix                 |  12 +++++++----
 lib/pkgs/mk-types/default.nix        |   6 +++++-
 modules/ags/config/default.nix       |   2 +-
 modules/ags/config/env.d.ts          |  16 ++++++--------
 modules/ags/config/package-lock.json | Bin 73416 -> 72637 bytes
 modules/ags/config/package.json      |   1 -
 modules/ags/gtk4/env.d.ts            |  30 +++++++++++++++-----------
 modules/ags/gtk4/package-lock.json   | Bin 73416 -> 27 bytes
 modules/ags/gtk4/package.json        |  16 +-------------
 modules/ags/packages.nix             |  31 ++++++++++++++++++---------
 10 files changed, 60 insertions(+), 54 deletions(-)
 mode change 100644 => 120000 modules/ags/gtk4/package-lock.json
 mode change 100644 => 120000 modules/ags/gtk4/package.json

diff --git a/lib/pkgs/default.nix b/lib/pkgs/default.nix
index 02b9d06d..d991c3fa 100644
--- a/lib/pkgs/default.nix
+++ b/lib/pkgs/default.nix
@@ -31,6 +31,7 @@ in {
     configPath,
     packages,
     pname,
+    delete ? [],
   }: let
     withGirNames =
       map (package: {
@@ -48,15 +49,18 @@ in {
           then "AstalPowerProfiles-0.1"
           else if package.pname == "gtk4"
           then "Gtk-4.0"
+          else if package.pname == "libadwaita"
+          then "Adw-1"
           else (concatMapStrings capitalise (splitString "-" package.pname)) + "-0.1";
       })
       packages;
   in {
-    "${configPath}${optionalString (length packages == 1) "/${toLower (elemAt withGirNames 0).girName}"}".source =
-      pkgs.callPackage
-      ./mk-types {
+    "${configPath}${optionalString (length packages == 1) "/${toLower (elemAt withGirNames 0).girName}"}" = {
+      force = true;
+      source = pkgs.callPackage ./mk-types {
         inherit (self.inputs) ts-for-gir-src;
-        inherit pname withGirNames;
+        inherit delete pname withGirNames;
       };
+    };
   };
 }
diff --git a/lib/pkgs/mk-types/default.nix b/lib/pkgs/mk-types/default.nix
index 2797c2d9..47a0913d 100644
--- a/lib/pkgs/mk-types/default.nix
+++ b/lib/pkgs/mk-types/default.nix
@@ -4,9 +4,10 @@
   withGirNames,
   buildNpmPackage,
   ts-for-gir-src,
+  delete ? [],
   ...
 }: let
-  inherit (lib) concatMapStringsSep;
+  inherit (lib) concatMapStringsSep optionalString;
 
   buildPhase = ''
     npx @ts-for-gir/cli generate ${concatMapStringsSep " " (p: p.girName) withGirNames} \
@@ -31,6 +32,9 @@ in
     '';
 
     installPhase = ''
+      ${optionalString (delete != []) (
+        "rm -f " + concatMapStringsSep " " (file: "./types/${file}.d.ts") delete
+      )}
       cp -r ./types $out
     '';
   }
diff --git a/modules/ags/config/default.nix b/modules/ags/config/default.nix
index f05eabea..21a9ca87 100644
--- a/modules/ags/config/default.nix
+++ b/modules/ags/config/default.nix
@@ -1,3 +1,3 @@
 {
-  npmDepsHash = "sha256-FzWSWDEqsJxhYOhfSvmZU+/hqw44wm60nM7l32ut1+Y=";
+  npmDepsHash = "sha256-qn1+dIo7p1+PYlR2qAmnCrR8xE93mYbwNCjDYISgnqU=";
 }
diff --git a/modules/ags/config/env.d.ts b/modules/ags/config/env.d.ts
index 2c93f116..9cdf81ce 100644
--- a/modules/ags/config/env.d.ts
+++ b/modules/ags/config/env.d.ts
@@ -1,6 +1,4 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-
-const SRC: string;
+declare const SRC: string;
 
 declare module 'inline:*' {
     const content: string;
@@ -8,18 +6,18 @@ declare module 'inline:*' {
     export default content;
 }
 
-declare module '*.sass' {
-    const content: string;
-
-    export default content;
-}
-
 declare module '*.scss' {
     const content: string;
 
     export default content;
 }
 
+declare module '*.blp' {
+    const content: string;
+
+    export default content;
+}
+
 declare module '*.css' {
     const content: string;
 
diff --git a/modules/ags/config/package-lock.json b/modules/ags/config/package-lock.json
index 2670ba31b6b01a0c483b7aface048c6e91149164..db2e211a9af912d8d2a5631e88a993f4c3d22f32 100644
GIT binary patch
delta 150
zcmV;H0BQfoy#&3t1h7Q`li&slvv~oVHnXfb4c7rTlM!P%m-7$-8UZ(x;jJoFX*F~<
zHd07<M0QqAG%!eJL}W2gb465WM^0{RO+!soGips$b#G`nFECVLaaUz_PH%2>VPkb}
zS9wk_GE6}^FJ?(%MOSQNNLpiOR7+wxQEy>PW|P5h9+NL68k0~-1h>f%0i6W5uNMIs
E2mK{9MF0Q*

delta 485
zcmdnHo#n({mJP0q(<cZqvhnHX<)@@7St%$P8R;1sOr9tzHhG>6*Jgjl*=8&txyg=`
z<yb&+lNn!FO^&l*69ntf*9B9$Aere4#Td22A}Wf^oScH39sL6{E6Vco{3}xpEz9$&
zDqS)|OF~i$b5i{MbF++{vs06D^7E3ClN}9>0^G`TO4G`MQi=+)A}R{=azhhSGeb>X
z{T;Q<i%nB9LjxxlIt7W8=A~pNXX=(z7Niz~oLXn5XEeDn+hnqVhw$R>=GP}L_+~ZT
zke^YC(QNWXcCFBitmI(B+>Er+%1o2+a0}1ylB@vpq#~ChccbJ|m#EV0%A&}k;Kb7W
z2zS5q3WH$ts^ruF1M|d`$ZW65WY;27GbjJh5Wj$`B+tD3{7gUNv^>MY$p<CnCg*WT
zO`gEUvYlOkaV`rd+*y-9M$5AR9c3_CA=pwL*}1@QLgwm%Tz>I~cBo&aSzwfrUskD+
zL0P$BaF9o;af)SDSgBdMm$pf&v9_;oL1C$RL7}UuM~GQ?aY%4Za;mnrdtk1&X=p^S
mMQ&A?g-dXxM^T`Mc0^H{QC3)Tskh(cjT>FIFBV~xVg~@nA*C4r

diff --git a/modules/ags/config/package.json b/modules/ags/config/package.json
index 3c89ae93..f5950673 100644
--- a/modules/ags/config/package.json
+++ b/modules/ags/config/package.json
@@ -5,7 +5,6 @@
     "dependencies": {
         "@eslint/js": "9.17.0",
         "@stylistic/eslint-plugin": "2.12.1",
-        "@types/node": "22.10.2",
         "eslint": "9.17.0",
         "eslint-plugin-jsdoc": "50.6.1",
         "fzf": "0.5.2",
diff --git a/modules/ags/gtk4/env.d.ts b/modules/ags/gtk4/env.d.ts
index 467c0a41..9cdf81ce 100644
--- a/modules/ags/gtk4/env.d.ts
+++ b/modules/ags/gtk4/env.d.ts
@@ -1,21 +1,25 @@
-declare const SRC: string
+declare const SRC: string;
 
-declare module "inline:*" {
-    const content: string
-    export default content
+declare module 'inline:*' {
+    const content: string;
+
+    export default content;
 }
 
-declare module "*.scss" {
-    const content: string
-    export default content
+declare module '*.scss' {
+    const content: string;
+
+    export default content;
 }
 
-declare module "*.blp" {
-    const content: string
-    export default content
+declare module '*.blp' {
+    const content: string;
+
+    export default content;
 }
 
-declare module "*.css" {
-    const content: string
-    export default content
+declare module '*.css' {
+    const content: string;
+
+    export default content;
 }
diff --git a/modules/ags/gtk4/package-lock.json b/modules/ags/gtk4/package-lock.json
deleted file mode 100644
index 2670ba31b6b01a0c483b7aface048c6e91149164..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 73416
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
B@!|jg

diff --git a/modules/ags/gtk4/package-lock.json b/modules/ags/gtk4/package-lock.json
new file mode 120000
index 00000000..a908665d
--- /dev/null
+++ b/modules/ags/gtk4/package-lock.json
@@ -0,0 +1 @@
+../config/package-lock.json
\ No newline at end of file
diff --git a/modules/ags/gtk4/package.json b/modules/ags/gtk4/package.json
deleted file mode 100644
index 3c89ae93..00000000
--- a/modules/ags/gtk4/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "name": "ags",
-    "version": "0.0.0",
-    "main": "app.ts",
-    "dependencies": {
-        "@eslint/js": "9.17.0",
-        "@stylistic/eslint-plugin": "2.12.1",
-        "@types/node": "22.10.2",
-        "eslint": "9.17.0",
-        "eslint-plugin-jsdoc": "50.6.1",
-        "fzf": "0.5.2",
-        "jiti": "2.4.2",
-        "typescript-eslint": "8.19.0"
-    }
-}
diff --git a/modules/ags/gtk4/package.json b/modules/ags/gtk4/package.json
new file mode 120000
index 00000000..f3ea5f3b
--- /dev/null
+++ b/modules/ags/gtk4/package.json
@@ -0,0 +1 @@
+../config/package.json
\ No newline at end of file
diff --git a/modules/ags/packages.nix b/modules/ags/packages.nix
index 7e8fb9a5..b91672f2 100644
--- a/modules/ags/packages.nix
+++ b/modules/ags/packages.nix
@@ -5,11 +5,11 @@ self: {
   pkgs,
   ...
 }: let
-  inherit (self.inputs) ags gtk-session-lock;
+  inherit (self.inputs) ags astal gtk-session-lock;
 
   gtkSessionLock = gtk-session-lock.packages.${pkgs.system}.default;
 
-  inherit (lib) attrValues boolToString getExe optionalAttrs optionals;
+  inherit (lib) attrValues boolToString filter getExe optionalAttrs optionals;
 
   inherit (osConfig.networking) hostName;
 
@@ -37,7 +37,7 @@ in {
       };
       astalLibs = attrValues {
         inherit
-          (ags.inputs.astal.packages.${pkgs.system})
+          (astal.packages.${pkgs.system})
           io
           astal3
           astal4
@@ -59,6 +59,7 @@ in {
 
         inherit
           (pkgs)
+          libadwaita
           gtk4 # Needed to build types
           ;
       };
@@ -118,7 +119,7 @@ in {
           ;
 
         mkTsConf = gtkVer: let
-          inherit (ags.packages.${pkgs.system}) gjs;
+          inherit (astal.packages.${pkgs.system}) gjs;
         in
           pkgs.writers.writeJSON "tsconfig.json" {
             "$schema" = "https://json.schemastore.org/tsconfig";
@@ -127,6 +128,7 @@ in {
               "strict" = true;
               "target" = "ES2022";
               "module" = "ES2022";
+              "lib" = ["ES2022"];
               "moduleResolution" = "Bundler";
               "noEmit" = true;
               "jsx" = "react-jsx";
@@ -141,19 +143,28 @@ in {
         (buildGirTypes {
           pname = "ags";
           configPath = "${cfg.configDir}/@girs";
-          packages = cfg.astalLibs;
+          packages = filter (x:
+            x.pname != "astal4" && x.pname != "libadwaita")
+          cfg.astalLibs;
+          delete = ["gdk-4.0" "gtk-4.0" "gsk-4.0"];
         })
         // (buildGirTypes {
           pname = "ags";
           configPath = "${gtk4ConfigDir}/@girs";
-          packages = cfg.astalLibs;
+          packages = filter (x:
+            x.pname != "astal3" && x.pname != "gtk-session-lock")
+          cfg.astalLibs;
         })
         // {
-          "${cfg.configDir}/node_modules".source =
-            buildNodeModules ./config (import ./config).npmDepsHash;
+          "${cfg.configDir}/node_modules" = {
+            force = true;
+            source = buildNodeModules ./config (import ./config).npmDepsHash;
+          };
 
-          "${gtk4ConfigDir}/node_modules".source =
-            buildNodeModules ./config (import ./config).npmDepsHash;
+          "${gtk4ConfigDir}/node_modules" = {
+            force = true;
+            source = buildNodeModules ./config (import ./config).npmDepsHash;
+          };
 
           "${cfg.configDir}/tsconfig.json".source = mkTsConf 3;