chore: port to ts-for-gir

vixalien · vixalien · commit efb07903c372 · 2025-04-16T02:06:31.000Z
diff --git a/build-aux/flatpak/generated-sources.json b/build-aux/flatpak/generated-sources.json
diff --git a/gi-types b/gi-types
@@ -1 +1 @@
-Subproject commit a30f0bc9db3155dae9b630b44a6532aa6596d94f
+Subproject commit 689f364e13cd52e7f603c6eb464f553b98d6393f
diff --git a/lib/build.js b/lib/build.js
@@ -49,5 +49,6 @@ await build({
   // esm
   format: "esm",
   plugins: [externalPlugin(resolve(SOURCE_DIR, "src"))],
+  sourcemap: "inline",
 })
   .then(() => console.log("JS Build complete"));
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
   "license": "MIT",
   "dependencies": {
     "linkifyjs": "^4.1.1",
-    "typescript": "^4.7.4"
+    "typescript": "^5.8.3"
   },
   "type": "module",
   "devDependencies": {
@@ -26,6 +26,6 @@
   "scripts": {
     "build": "node lib/build.js",
     "css": "node lib/stylus.js",
-    "typecheck": "tsc --strict --noEmit"
+    "typecheck": "tsc --noEmit"
   }
 }
diff --git a/src/application.ts b/src/application.ts
@@ -368,7 +368,7 @@ export class Application extends Adw.Application {
   }
 
   show_about() {
-    const aboutParams: Partial<Adw.AboutWindow.ConstructorProperties> = {
+    const aboutParams: Partial<Adw.AboutWindow.ConstructorProps> = {
       transient_for: this.active_window,
       application_name: _("Sticky Notes"),
       application_icon: pkg.name,
diff --git a/src/card.ts b/src/card.ts
@@ -56,10 +56,10 @@ export class StickyNoteCard extends Gtk.Box {
     }, this);
   }
 
-  _scrolled!: Gtk.ScrolledWindow;
-  _modified_label!: Gtk.Label;
-  _view_image!: Gtk.Image;
-  _delete_button!: Gtk.Button;
+  declare _scrolled: Gtk.ScrolledWindow;
+  declare _modified_label: Gtk.Label;
+  declare _view_image: Gtk.Image;
+  declare _delete_button: Gtk.Button;
 
   private _note?: Note;
   view: ReadonlyStickyNote;
diff --git a/src/notes.ts b/src/notes.ts
@@ -62,14 +62,14 @@ export class StickyNotes extends Adw.ApplicationWindow {
     );
   }
 
-  _search!: Gtk.Box;
-  _search_entry!: Gtk.SearchEntry;
-  _notes_box!: Gtk.ListView;
-  _no_notes!: Adw.StatusPage;
-  _no_results!: Adw.StatusPage;
-  _scrolled!: Gtk.ScrolledWindow;
-  _menu_button!: Gtk.MenuButton;
-  _stack!: Gtk.Stack;
+  declare _search: Gtk.Box;
+  declare _search_entry: Gtk.SearchEntry;
+  declare _notes_box: Gtk.ListView;
+  declare _no_notes: Adw.StatusPage;
+  declare _no_results: Adw.StatusPage;
+  declare _scrolled: Gtk.ScrolledWindow;
+  declare _menu_button: Gtk.MenuButton;
+  declare _stack: Gtk.Stack;
 
   cards: StickyNoteCard[] = [];
 
@@ -124,7 +124,7 @@ export class StickyNotes extends Adw.ApplicationWindow {
   }
 
   constructor(
-    params: Partial<Gtk.Window.ConstructorProperties>,
+    params: Partial<Gtk.Window.ConstructorProps>,
   ) {
     super(params);
 
diff --git a/src/styleselector.ts b/src/styleselector.ts
@@ -31,6 +31,8 @@ import Gdk from "gi://Gdk?version=4.0";
 
 import { Style, StyleNames, styles } from "./util.js";
 
+const { vprintf } = imports.format;
+
 let provider: Gtk.CssProvider | null = null;
 
 class StyleButton extends Gtk.CheckButton {
@@ -42,7 +44,7 @@ class StyleButton extends Gtk.CheckButton {
 
     super({
       // focus_on_click: false,
-      tooltip_text: _("Switch to %s style").format(display_name),
+      tooltip_text: vprintf(_("Switch to %s style"), [display_name]),
       width_request: 44,
       height_request: 44,
       hexpand: true,
diff --git a/src/themeselector.ts b/src/themeselector.ts
@@ -29,9 +29,10 @@ export class ThemeSelector extends Gtk.Widget {
   }
 
   theme: string;
-  _follow!: Gtk.CheckButton;
 
-  style_manager!: Adw.StyleManager;
+  declare _follow: Gtk.CheckButton;
+
+  style_manager: Adw.StyleManager;
 
   constructor(params = {}) {
     super(params);
@@ -60,7 +61,9 @@ export class ThemeSelector extends Gtk.Widget {
   }
 
   _on_notify_system_supports_color_schemes() {
-    this._follow.set_visible(this.style_manager.get_system_supports_color_schemes());
+    this._follow.set_visible(
+      this.style_manager.get_system_supports_color_schemes(),
+    );
   }
 
   _on_notify_dark() {
diff --git a/src/util.ts b/src/util.ts
@@ -131,12 +131,12 @@ export class Tag extends GObject.Object {
 }
 
 export class Note extends GObject.Object {
-  private static tag_list_pspec = GObject.ParamSpec.object(
+  private static tag_list_pspec = GObject.param_spec_object(
     "tag_list",
     "Tags",
     "Tags of the note",
+    Gio.ListStore.$gtype,
     GObject.ParamFlags.READWRITE,
-    Gio.ListStore,
   );
 
   static $gtype: GObject.GType<Note>;
@@ -207,7 +207,6 @@ export class Note extends GObject.Object {
     this.height = note.height;
     this.open = note.open ?? false;
 
-    // @ts-expect-error incorrect types
     this.bind_property_full(
       "content",
       this,
diff --git a/src/view.ts b/src/view.ts
@@ -97,7 +97,7 @@ class AbstractStickyNote extends Gtk.TextView {
 
   remove_listeners() {}
 
-  style_manager!: Adw.StyleManager;
+  style_manager: Adw.StyleManager;
 
   constructor(
     note?: Note,
@@ -511,6 +511,7 @@ export class WriteableStickyNote extends AbstractStickyNote {
         search_limit.forward_chars(10);
 
         search_end.forward_find_char((ch) => {
+          console.log("forward char",ch);
           return ch === " ";
         }, search_limit);
         search_end.forward_char();
diff --git a/src/window.ts b/src/window.ts
@@ -36,16 +36,16 @@ import { find } from "linkifyjs";
 import { Application } from "./application.js";
 
 export class Window extends Adw.ApplicationWindow {
-  _container!: Gtk.Box;
-  _text!: Gtk.TextView;
-  _menu_button!: Gtk.MenuButton;
+  declare _container: Gtk.Box;
+  declare _text: Gtk.TextView;
+  declare _menu_button: Gtk.MenuButton;
 
-  _bold_button!: Gtk.ToggleButton;
-  _underline_button!: Gtk.ToggleButton;
-  _italic_button!: Gtk.ToggleButton;
-  _strikethrough_button!: Gtk.ToggleButton;
-  _action_button!: Gtk.ToggleButton;
-  _action_revealer!: Gtk.Revealer;
+  declare _bold_button: Gtk.ToggleButton;
+  declare _underline_button: Gtk.ToggleButton;
+  declare _italic_button: Gtk.ToggleButton;
+  declare _strikethrough_button: Gtk.ToggleButton;
+  declare _action_button: Gtk.ToggleButton;
+  declare _action_revealer: Gtk.Revealer;
 
   // buffer = new Gtk.TextBuffer();
 
@@ -87,7 +87,7 @@ export class Window extends Adw.ApplicationWindow {
   }
 
   constructor(
-    { note, ...params }: Partial<Gtk.TextView.ConstructorProperties> & {
+    { note, ...params }: Partial<Adw.ApplicationWindow.ConstructorProps> & {
       note: Note;
     },
   ) {
@@ -103,13 +103,13 @@ export class Window extends Adw.ApplicationWindow {
       this,
       "title",
       GObject.BindingFlags.SYNC_CREATE,
-      (binding, title) => {
+      (__, title) => {
         if (!title) {
           return [true, _("Sticky Note")];
         }
         return [true, title];
       },
-      null
+      null,
     );
 
     this.connect("close-request", () => {
@@ -192,7 +192,7 @@ export class Window extends Adw.ApplicationWindow {
           this._text,
           this._text.bottom_margin,
           60 +
-            ((selected) ? this._action_revealer.get_allocated_height() : 0),
+            (selected ? this._action_revealer.get_allocated_height() : 0),
           this._action_revealer.transition_duration,
           target,
         );
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,78 +1,22 @@
 {
   "compilerOptions": {
-    /* Visit https://aka.ms/tsconfig.json to read more about this file */
-    /* Basic Options */
-    // "incremental": true,                    /* Enable incremental compilation */
-    "target": "es2018", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
-    "module": "ESNext", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
+    "experimentalDecorators": true,
+    "strict": true,
+    "target": "ES2019",
+    "baseUrl": ".",
+    "moduleResolution": "bundler",
+    "module": "ES2022",
     "lib": [
-      "ES2017",
-    ], /* Specify library files to be included in the compilation. */
-    "allowJs": true, /* Allow javascript files to be compiled. */
-    "checkJs": true, /* Report errors in .js files. */
-    // "jsx": "preserve",                      /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-    // "declaration": true,                    /* Generates corresponding '.d.ts' file. */
-    // "declarationMap": true,                 /* Generates a sourcemap for each corresponding '.d.ts' file. */
-    // "sourceMap": true,                      /* Generates corresponding '.map' file. */
-    // "outFile": "./",                        /* Concatenate and emit output to single file. */
-    "outDir": "_build", /* Redirect output structure to the directory. */
-    // "rootDir": "./",                        /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-    // "composite": true,                      /* Enable project compilation */
-    // "tsBuildInfoFile": "./",                /* Specify file to store incremental compilation information */
-    // "removeComments": true,                 /* Do not emit comments to output. */
-    // "noEmit": true,                         /* Do not emit outputs. */
-    // "importHelpers": true,                  /* Import emit helpers from 'tslib'. */
-    // "downlevelIteration": true,             /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
-    // "isolatedModules": true,                /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-    /* Strict Type-Checking Options */
-    "strict": true, /* Enable all strict type-checking options. */
-    // "noImplicitAny": true,                  /* Raise error on expressions and declarations with an implied 'any' type. */
-    // "strictNullChecks": true,               /* Enable strict null checks. */
-    // "strictFunctionTypes": true,            /* Enable strict checking of function types. */
-    // "strictBindCallApply": true,            /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
-    // "strictPropertyInitialization": true,   /* Enable strict checking of property initialization in classes. */
-    // "noImplicitThis": true,                 /* Raise error on 'this' expressions with an implied 'any' type. */
-    // "alwaysStrict": true,                   /* Parse in strict mode and emit "use strict" for each source file. */
-    /* Additional Checks */
-    // "noUnusedLocals": true,                 /* Report errors on unused locals. */
-    // "noUnusedParameters": true,             /* Report errors on unused parameters. */
-    // "noImplicitReturns": true,              /* Report error when not all code paths in function return a value. */
-    // "noFallthroughCasesInSwitch": true,     /* Report errors for fallthrough cases in switch statement. */
-    // "noUncheckedIndexedAccess": true,       /* Include 'undefined' in index signature results */
-    /* Module Resolution Options */
-    "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    "baseUrl": ".", /* Base directory to resolve non-absolute module names. */
-    "paths": {
-      "*": [
-        "*",
-        "types/*",
-        "gi-types/*",
-      ]
-    }, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
-    "resolveJsonModule": true,
-    // "rootDirs": [],                         /* List of root folders whose combined content represents the structure of the project at runtime. */
-    "typeRoots": [
-      "gi-types",
-    ], /* List of folders to include type definitions from. */
-    // "types": [],                            /* Type declaration files to be included in compilation. */
-    // "allowSyntheticDefaultImports": true,   /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    // "preserveSymlinks": true,               /* Do not resolve the real path of symlinks. */
-    // "allowUmdGlobalAccess": true,           /* Allow accessing UMD globals from modules. */
-    /* Source Map Options */
-    // "sourceRoot": "",                       /* Specify the location where debugger should locate TypeScript files instead of source locations. */
-    // "mapRoot": "",                          /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSourceMap": true,                /* Emit a single file with source maps instead of having a separate file. */
-    // "inlineSources": true,                  /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
-    /* Experimental Options */
-    // "experimentalDecorators": true,         /* Enables experimental support for ES7 decorators. */
-    // "emitDecoratorMetadata": true,          /* Enables experimental support for emitting type metadata for decorators. */
-    /* Advanced Options */
-    "skipLibCheck": true, /* Skip type checking of declaration files. */
-    "forceConsistentCasingInFileNames": true, /* Disallow inconsistently-cased references to the same file. */
+      "ES2022"
+    ],
+    "allowJs": true,
+    "checkJs": true,
+    "skipLibCheck": true,
+    "inlineSourceMap": true
   },
   "include": [
-    "gi-types/gi.d.ts",
+    "gi-types/index.d.ts",
     "types/ambient.d.ts",
-    "src/*"
+    "src"
   ]
-}
+}
diff --git a/types/ambient.d.ts b/types/ambient.d.ts
@@ -1,44 +1,31 @@
 declare function _(
   id: string,
 ): string & { printf: (...reps: string[]) => string };
-declare function print(args: string): void;
-declare function log(obj: object, others?: object[]): void;
-declare function log(msg: string, subsitutions?: any[]): void;
 
 declare const pkg: {
   version: string;
   name: string;
 };
 
-declare module console {
-  export function error(...args: any[]): void;
-  export function debug(...args: any[]): void;
-  export function log(...args: any[]): void;
+declare module "gi://GObject?version=2.0" {
+  namespace GObject {
+    interface Object {
+      bind_property_full(
+        source_property: string,
+        target: Object,
+        target_property: string,
+        flags: BindingFlags | null,
+        transform_to: Closure | null,
+        transform_from: Closure | null,
+      ): Binding;
+    }
+  }
 }
 
-declare interface String {
-  format(...replacements: string[]): string;
-  format(...replacements: number[]): string;
-}
-declare interface Number {
-  toFixed(digits: number): number;
-}
-
-interface TextDecoderOptions {
-  fatal?: boolean;
-  ignoreBOM?: boolean;
-}
-
-declare class TextDecoder {
-  constructor(encoding?: string, options?: TextDecoderOptions);
-  decode(input?: ArrayBufferView, options?: TextDecodeOptions): string;
-}
-
-interface TextEncodeOptions {
-  stream?: boolean;
-}
-
-declare class TextEncoder {
-  constructor();
-  encode(input?: string, options?: TextEncodeOptions): Uint8Array;
+declare module "gi://Gtk?version=4.0" {
+  namespace Gtk {
+    interface TextCharPredicate {
+      (ch: string): boolean;
+    }
+  }
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ export class Application extends Adw.Application {`
`368`	`368`	`}`
`369`	`369`
`370`	`370`	`show_about() {`
`371`		`- const aboutParams: Partial<Adw.AboutWindow.ConstructorProperties> = {`
	`371`	`+ const aboutParams: Partial<Adw.AboutWindow.ConstructorProps> = {`
`372`	`372`	`transient_for: this.active_window,`
`373`	`373`	`application_name: _("Sticky Notes"),`
`374`	`374`	`application_icon: pkg.name,`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,10 @@ export class ThemeSelector extends Gtk.Widget {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`theme: string;`
`32`		`- _follow!: Gtk.CheckButton;`
`33`	`32`
`34`		`- style_manager!: Adw.StyleManager;`
	`33`	`+ declare _follow: Gtk.CheckButton;`
	`34`	`+`
	`35`	`+ style_manager: Adw.StyleManager;`
`35`	`36`
`36`	`37`	`constructor(params = {}) {`
`37`	`38`	`super(params);`
`@@ -60,7 +61,9 @@ export class ThemeSelector extends Gtk.Widget {`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`_on_notify_system_supports_color_schemes() {`
`63`		`- this._follow.set_visible(this.style_manager.get_system_supports_color_schemes());`
	`64`	`+ this._follow.set_visible(`
	`65`	`+ this.style_manager.get_system_supports_color_schemes(),`
	`66`	`+ );`
`64`	`67`	`}`
`65`	`68`
`66`	`69`	`_on_notify_dark() {`