build: use types from npm. closes #51

package.json

@@ -5,11 +5,8 @@
  "private": true,
  "license": "MIT",
  "scripts": {
- "build": "yarn run lock:types && yarn run build:types && yarn run build:ts && yarn run build:extension",
- "clean": "yarn run clean:ts && yarn run build:types",
- "lock:types": "cross-env XDG_DATA_DIRS=$XDG_DATA_DIRS:/usr/share/gnome-shell:/usr/lib/mutter-10 yarn run gi-ts config --lock",
- "build:types": "yarn run clean:types && gi-ts generate",
- "clean:types": "rm -rf ./@types",
+ "build": "yarn run build:ts && yarn run build:extension",
+ "clean": "yarn run clean:ts",
  "build:ts": "yarn run clean:ts && rollup -c",
  "clean:ts": "rm -rf ./dist",
  "build:extension": "yarn run build:schema",
@@ -34,6 +31,16 @@
  "devDependencies": {
  "@commitlint/cli": "^13.2.1",
  "@commitlint/config-conventional": "^13.2.0",
+ "@gi-types/gdk4": "^4.0.1",
+ "@gi-types/gdkpixbuf2": "^2.0.2",
+ "@gi-types/gio2": "^2.72.1",
+ "@gi-types/glib2": "^2.72.1",
+ "@gi-types/gobject2": "^2.72.1",
+ "@gi-types/gtk4": "^4.6.1",
+ "@gi-types/meta10": "^10.0.1",
+ "@gi-types/shell0": "^0.1.1",
+ "@gi-types/soup2": "^2.74.1",
+ "@gi-types/st1": "^1.0.1",
  "@gi.ts/cli": "^1.5.7",
  "@gi.ts/lib": "^1.5.9",
  "@gi.ts/parser": "^1.5.3",

rollup.config.js

@@ -8,16 +8,16 @@ import cleanup from 'rollup-plugin-cleanup';
 const buildPath = 'dist';
 
 const globals = {
- '@imports/gio2': 'imports.gi.Gio',
- '@imports/gdk4': 'imports.gi.Gdk',
- '@imports/gtk4': 'imports.gi.Gtk',
- '@imports/gdkpixbuf2': 'imports.gi.GdkPixbuf',
- '@imports/glib2': 'imports.gi.GLib',
- '@imports/st1': 'imports.gi.St',
- '@imports/shell0': 'imports.gi.Shell',
- '@imports/meta10': 'imports.gi.Meta',
- '@imports/soup2': 'imports.gi.Soup',
- '@imports/gobject2': 'imports.gi.GObject',
+ '@gi-types/gio2': 'imports.gi.Gio',
+ '@gi-types/gdk4': 'imports.gi.Gdk',
+ '@gi-types/gtk4': 'imports.gi.Gtk',
+ '@gi-types/gdkpixbuf2': 'imports.gi.GdkPixbuf',
+ '@gi-types/glib2': 'imports.gi.GLib',
+ '@gi-types/st1': 'imports.gi.St',
+ '@gi-types/shell0': 'imports.gi.Shell',
+ '@gi-types/meta10': 'imports.gi.Meta',
+ '@gi-types/soup2': 'imports.gi.Soup',
+ '@gi-types/gobject2': 'imports.gi.GObject',
 };
 
 const external = Object.keys(globals);

src/api/index.ts

@@ -3,10 +3,10 @@ import { Gitlab } from '@esync/api/providers/gitlab';
 import { Data, SyncData } from '@esync/data';
 import { getCurrentExtensionSettings, notify } from '@esync/shell';
 import { logger } from '@esync/utils';
-import { Settings } from '@imports/gio2';
+import { Settings } from '@gi-types/gio2';
 import { EventEmitter } from 'events';
-import { Local } from './providers/local';
-import { SyncProvider, SyncEvent, SyncOperationStatus, SyncProviderType } from './types';
+import { Local } from '@esync/api/providers/local';
+import { SyncProvider, SyncEvent, SyncOperationStatus, SyncProviderType } from '@esync/api/types';
 
 const debug = logger('api');
 

src/api/providers/local.ts

@@ -1,5 +1,5 @@
 import { SyncData } from '@esync/data';
-import { File, FileCreateFlags } from '@imports/gio2';
+import { File, FileCreateFlags } from '@gi-types/gio2';
 import { SyncOperationStatus, SyncProvider } from '../types';
 
 export class Local implements SyncProvider {

src/data/index.ts

@@ -3,7 +3,7 @@ import { KeyBindingsData, KeyBindingsDataProvider } from '@esync/data/providers/
 import { TweaksData, TweaksDataProvider } from '@esync/data/providers/tweaks';
 import { getCurrentExtensionSettings } from '@esync/shell';
 import { logger, settingsFlagsToEnumList } from '@esync/utils';
-import { Settings } from '@imports/gio2';
+import { Settings } from '@gi-types/gio2';
 
 const debug = logger('data');
 

src/data/providers/extensions/utils.ts

@@ -1,6 +1,6 @@
 import { ExtensionType, getCurrentExtension, readDconfData, ShellExtension } from '@esync/shell';
 import { execute, logger } from '@esync/utils';
-import { File } from '@imports/gio2';
+import { File } from '@gi-types/gio2';
 import {
  build_filenamev,
  ByteArray,
@@ -11,8 +11,8 @@ import {
  SpawnFlags,
  spawn_async,
  spawn_close_pid,
-} from '@imports/glib2';
-import { form_encode_hash, Message, Session, Status, status_get_phrase, URI } from '@imports/soup2';
+} from '@gi-types/glib2';
+import { form_encode_hash, Message, Session, Status, status_get_phrase, URI } from '@gi-types/soup2';
 import { parse } from 'fast-xml-parser';
 
 const debug = logger('extension-utils');
@@ -145,7 +145,7 @@ export const extractExtensionArchive = (bytes: ByteArray, dir: File, callback: a
 
  const [file, stream] = File.new_tmp('XXXXXX.shell-extension.zip');
 
- stream.output_stream.write_bytes(bytes, null);
+ stream.output_stream.write_bytes(bytes as any, null);
  stream.close(null);
  const [success, pid] = spawn_async(
  null,
@@ -174,7 +174,7 @@ export const extractExtensionArchive = (bytes: ByteArray, dir: File, callback: a
 export const installExtension = async (extensionId: string): Promise<void> => {
  return new Promise((resolve) => {
  const params = { shell_version: imports.misc.config.PACKAGE_VERSION };
- const soupUri = new URI(`https://extensions.gnome.org/download-extension/${extensionId}.shell-extension.zip`);
+ const soupUri = URI.new(`https://extensions.gnome.org/download-extension/${extensionId}.shell-extension.zip`);
  soupUri.set_query(form_encode_hash(params));
 
  const message = Message.new_from_uri('GET', soupUri);
@@ -190,7 +190,7 @@ export const installExtension = async (extensionId: string): Promise<void> => {
  throw new Error(`Unexpected response: ${phrase}`);
  }
  const bytes = message.response_body.flatten().get_as_bytes();
- extractExtensionArchive(bytes, dir, () => {
+ extractExtensionArchive(bytes as any, dir, () => {
  const extension = getExtensionManager().createExtensionObject(extensionId, dir, ExtensionType.PER_USER);
  getExtensionManager().loadExtension(extension);
  if (!getExtensionManager().enableExtension(extensionId)) {

src/extension.ts

@@ -4,9 +4,9 @@ import { StatusMenu } from '@esync/panel/statusMenu';
 import { loadInterfaceXML } from '@esync/shell';
 import { Sync } from '@esync/sync';
 import { logger } from '@esync/utils';
-import { DBus, DBusExportedObject } from '@imports/gio2';
+import { DBus, DBusExportedObject } from '@gi-types/gio2';
 import { EventEmitter } from 'events';
-import { SyncEvent } from './api/types';
+import { SyncEvent } from '@esync/api/types';
 import './styles/stylesheet.css';
 
 const debug = logger('extension');

src/panel/statusMenu.ts

@@ -1,8 +1,8 @@
 import { SyncEvent } from '@esync/api/types';
 import { getCurrentExtension, getCurrentExtensionSettings, ShellExtension } from '@esync/shell';
 import { execute, logger } from '@esync/utils';
-import { icon_new_for_string, Settings } from '@imports/gio2';
-import { Icon } from '@imports/st1';
+import { icon_new_for_string, Settings } from '@gi-types/gio2';
+import { Icon } from '@gi-types/st1';
 import { EventEmitter } from 'events';
 
 const { Button } = imports.ui.panelMenu;

src/prefs/otherPrefs.ts

@@ -1,6 +1,6 @@
-import { registerClass } from '@imports/gobject2';
-import { Align, Box, Label, ListBoxRow, Orientation, Switch } from '@imports/gtk4';
-import { PrefsTab } from './prefsTab';
+import { registerClass } from '@gi-types/gobject2';
+import { Align, Box, Label, ListBoxRow, Orientation, Switch } from '@gi-types/gtk4';
+import { PrefsTab } from '@esync/prefs/prefsTab';
 
 export const OtherPrefs = registerClass(
  {},

src/prefs/prefs.ts

@@ -1,9 +1,9 @@
 import { logger } from '@esync/utils';
-import { registerClass } from '@imports/gobject2';
-import { BaselinePosition, Box, Notebook, Orientation } from '@imports/gtk4';
-import { OtherPrefs } from './otherPrefs';
-import { ProviderPrefs } from './providerPrefs';
-import { SyncedDataPrefs } from './syncedDataPrefs';
+import { registerClass } from '@gi-types/gobject2';
+import { BaselinePosition, Box, Notebook, Orientation } from '@gi-types/gtk4';
+import { OtherPrefs } from '@esync/prefs/otherPrefs';
+import { ProviderPrefs } from '@esync/prefs/providerPrefs';
+import { SyncedDataPrefs } from '@esync/prefs/syncedDataPrefs';
 
 const debug = logger('prefs');
 

src/prefs/prefsTab.ts

@@ -1,7 +1,7 @@
 import { getCurrentExtension, getCurrentExtensionSettings, ShellExtension } from '@esync/shell';
-import { Settings } from '@imports/gio2';
-import { registerClass } from '@imports/gobject2';
-import { Box, Label, Notebook } from '@imports/gtk4';
+import { Settings } from '@gi-types/gio2';
+import { registerClass } from '@gi-types/gobject2';
+import { Box, Label, Notebook } from '@gi-types/gtk4';
 
 export const PrefsTab = registerClass(
  {},

src/prefs/providerPrefs.ts

@@ -1,7 +1,7 @@
 import { SyncProviderType } from '@esync/api/types';
-import { File, FileCreateFlags } from '@imports/gio2';
-import { get_user_config_dir } from '@imports/glib2';
-import { registerClass } from '@imports/gobject2';
+import { File, FileCreateFlags, FilePrototype } from '@gi-types/gio2';
+import { get_user_config_dir } from '@gi-types/glib2';
+import { registerClass } from '@gi-types/gobject2';
 import {
  Align,
  Box,
@@ -15,8 +15,8 @@ import {
  Orientation,
  ResponseType,
  Window,
-} from '@imports/gtk4';
-import { PrefsTab } from './prefsTab';
+} from '@gi-types/gtk4';
+import { PrefsTab } from '@esync/prefs/prefsTab';
 
 export const ProviderPrefs = registerClass(
  {},
@@ -232,12 +232,14 @@ export const ProviderPrefs = registerClass(
  dialog.set_transient_for(this.get_root() as any as Window);
  dialog.connect('response', (_, response) => {
  if (response === ResponseType.OK) {
- const backupFile: File = dialog.get_file();
- if (!backupFile.query_exists(null)) {
- backupFile.create(FileCreateFlags.PRIVATE, null);
+ const backupFile: FilePrototype | null = dialog.get_file();
+ if (backupFile) {
+ if (!backupFile.query_exists(null)) {
+ backupFile.create(FileCreateFlags.PRIVATE, null);
+ }
+ locationButton.label = backupFile.get_uri();
+ this.settings.set_string('backup-file-location', backupFile.get_uri());
  }
- locationButton.label = backupFile.get_uri();
- this.settings.set_string('backup-file-location', backupFile.get_uri());
  }
 
  dialog.destroy();

src/prefs/syncedDataPrefs.ts

@@ -1,8 +1,8 @@
 import { DataProviderType } from '@esync/data';
 import { settingsFlagsToEnumList } from '@esync/utils';
-import { registerClass } from '@imports/gobject2';
-import { Align, Box, Label, ListBoxRow, Orientation, Switch } from '@imports/gtk4';
-import { PrefsTab } from './prefsTab';
+import { registerClass } from '@gi-types/gobject2';
+import { Align, Box, Label, ListBoxRow, Orientation, Switch } from '@gi-types/gtk4';
+import { PrefsTab } from '@esync/prefs/prefsTab';
 
 export const SyncedDataPrefs = registerClass(
  {},