Build all types without errors + migrate to ESM + type definition improvements

.eslintignore

@@ -3,11 +3,11 @@ node_modules/
 # don't lint build output (make sure it's set to your correct build folder name)
 lib/
 tmp/
-test/*.js
+test/
 # don't lint templates
 templates/
 # temporary ignore examples
-# examples/
+examples/
 # temporary ignore generated types, remove this if the heap out of memory bug is fixed 
 @types/
 *.js

.eslintrc.json

@@ -0,0 +1,26 @@
+{
+    "root": true,
+    "parser": "@typescript-eslint/parser",
+    "plugins": ["@typescript-eslint"],
+    "extends": [
+        "plugin:prettier/recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:@typescript-eslint/recommended-requiring-type-checking",
+        "prettier"
+    ],
+    "rules": {
+        "semi": ["error", "never"],
+        "no-debugger": "off",
+        "@typescript-eslint/triple-slash-reference": "off",
+        "camelcase": "off",
+        "@typescript-eslint/camelcase": "off"
+    },
+    "parserOptions": {
+        "requireConfigFile": false,
+        "files": ["*.ts", "*.tsx"],
+        "project": "./tsconfig.json"
+    },
+    "globals": {
+        "imports": true
+    }
+}

.github/workflows/node.js.yml

@@ -4,27 +4,40 @@
 name: Node.js CI
 
 on:
-  push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
-
+  push:
+    branches:
+      - "*"
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [14.x]
-
+        node-version: [16.x]
+        architecture:
+          - x64
     steps:
     - uses: actions/checkout@v2
+    - name: Checkout submodules
+      run: git submodule update --init --recursive
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v2
       with:
         node-version: ${{ matrix.node-version }}
     - run: sudo apt-get update
-    - run: sudo apt-get --yes install  libappindicator3-dev     libgda-5.0-dev     libgirepository1.0-dev     libgtk-3-dev     libgtksourceview-3.0-dev     libnotify-dev     libsoup2.4-dev     libwebkit2gtk-4.0-dev
+    - name: Install dependencies for regress test
+      run: sudo apt-get --yes install libappindicator3-dev libgda-5.0-dev libgirepository1.0-dev libgtk-3-dev libgtksourceview-3.0-dev libnotify-dev libsoup2.4-dev libwebkit2gtk-4.0-dev
     - run: npm install
     - run: npm run regress
+    - run: npm run test:ava
+    - run: npm run build:types:gjs
+    - run: npm run build:types:node
+    - run: npm run build
+    - run: npm run build:examples:gjs
+    # TODO fix build node-gtk on Github actions
+    # - name: Install dependencies for node-gtk
+    #   run: sudo apt-get --yes install build-essential gobject-introspection libgirepository1.0-dev libcairo2 libcairo2-dev
+    # - run: npm run install:examples:node
+    # - run: npm run build:examples:node

.gitignore

@@ -1,7 +1,8 @@
 *.lock
-*-lock*
 main.js
 node_modules/
 tmp/
 lib/
+examples/**/@types/
 @types/
+index.ts.bak

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "test/girs/vala-girs"]
-	path = test/girs/vala-girs
+	path = vala-girs
 	url = https://github.com/nemequ/vala-girs.git

.nvmrc

@@ -0,0 +1 @@
+16

.prettierrc.json

@@ -0,0 +1,7 @@
+{
+  "semi": false,
+  "trailingComma": "all",
+  "singleQuote": true,
+  "printWidth": 120,
+  "tabWidth": 4
+}

.ts-for-gir.all.rc.js

@@ -0,0 +1,10 @@
+export default {
+    modules: ['*'],
+    girDirectories: ['./vala-girs/gir-1.0', './girs'],
+    ignoreConflicts: true,
+    prettify: true,
+    ignore: [
+        'Colorhug-1.0', // Duplicate of ColorHug-1.0
+        'GUPnP-DLNA-1.0', // Same namespace as GUPnP-1.0.gir, is this a bug or should we merge the type definitions?
+    ]
+}

.ts-for-gir.gtk3.rc.js

@@ -0,0 +1,6 @@
+export default {
+    modules: ['Gtk-3.0'],
+    girDirectories: ['./vala-girs/gir-1.0'],
+    prettify: true,
+    ignore: [],
+}

.ts-for-gir.gtk4.rc.js

@@ -0,0 +1,6 @@
+export default {
+    modules: ['Gtk-4.0'],
+    girDirectories: ['./vala-girs/gir-1.0'],
+    prettify: true,
+    ignore: [],
+}

.ts-for-gir.regress.rc.js

@@ -1,5 +1,6 @@
-module.exports = {
+export default {
     modules: ['Gtk-3.0', 'Soup-2.4', 'GtkSource-3.0', 'WebKit2-4.0', 'AppIndicator3-0.1', 'Gda-5.0', 'Notify-0.7'],
+    ignoreConflicts: true,
     prettify: true,
     ignore: []
 }

.ts-for-gir.rygelcore24.rc.js

@@ -0,0 +1,5 @@
+export default {
+    modules: ['RygelCore-2.4', 'RygelRenderer-2.4'],
+    girDirectories: ['./vala-girs/gir-1.0'],
+    ignore: [],
+}

.vscode/launch.json

@@ -5,82 +5,76 @@
     "version": "0.2.0",
     "configurations": [
         {
+            "name": "build:types:gtk3",
             "type": "node",
             "request": "launch",
             "protocol": "inspector",
-            "name": "Generate Gtk for gjs",
-            "program": "${workspaceRoot}/bin/run",
+            "program": "./src/index.ts",
             "args": [
-                "generate", "Gtk-3.0", "-e", "gjs", "-o", "./tmp"
+                "generate", "--configName=.ts-for-gir.gtk3.rc.js", "-o", "./tmp"
             ],
-            "outFiles": [
-                "${workspaceRoot}/main.js"
-            ]
+            "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
+            "sourceMaps": true
         },
         {
+            "name": "build:types",
             "type": "node",
             "request": "launch",
             "protocol": "inspector",
-            "name": "Generate Gtk for node-gtk",
-            "program": "${workspaceRoot}/bin/run",
+            "program": "${workspaceRoot}/src/index.ts",
             "args": [
-                "generate", "Gtk-3.0", "-e", "node", "-o", "./tmp"
+                "generate", "--configName=.ts-for-gir.all.rc.js", "-o", "./tmp"
             ],
-            "outFiles": [
-                "${workspaceRoot}/main.js"
-            ]
+            "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
+            "sourceMaps": true,
         },
         {
+            "name": "build:types:gjs",
             "type": "node",
             "request": "launch",
             "protocol": "inspector",
-            "name": "Generate all locale installed for gjs",
-            "program": "${workspaceRoot}/bin/run",
+            "program": "${workspaceRoot}/src/index.ts",
             "args": [
-                "generate", "-e", "gjs", "-o", "./tmp"
+                "generate", "--configName=.ts-for-gir.all.rc.js", "--environments=gjs", "-o", "./tmp"
             ],
-            "outFiles": [
-                "${workspaceRoot}/main.js"
-            ]
+            "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
+            "sourceMaps": true,
         },
         {
+            "name": "build:types:node",
             "type": "node",
             "request": "launch",
             "protocol": "inspector",
-            "name": "Generate all locale installed for node-gtk",
-            "program": "${workspaceRoot}/bin/run",
+            "program": "${workspaceRoot}/src/index.ts",
             "args": [
-                "generate", "-e", "node", "-o", "./tmp"
+                "generate", "--configName=.ts-for-gir.all.rc.js", "--environments=node", "-o", "./tmp"
             ],
-            "outFiles": [
-                "${workspaceRoot}/main.js"
-            ]
+            "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
+            "sourceMaps": true,
         },
         {
+            "name": "regress",
             "type": "node",
             "request": "launch",
             "protocol": "inspector",
-            "name": "regress",
-            "program": "${workspaceRoot}/bin/run",
+            "program": "${workspaceRoot}/src/index.ts",
             "args": [
                 "generate", "--configName='.ts-for-gir.regress.rc.js", "-o", "./tmp"
             ],
-            "outFiles": [
-                "${workspaceRoot}/main.js"
-            ]
+            "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
+            "sourceMaps": true,
         },
         {
+            "name": "Launch Test",
             "type": "node",
             "request": "launch",
-            "name": "Launch Test",
             "program": "${workspaceRoot}/node_modules/ava/profile.js",
             "args": [
                 "${workspaceRoot}/test.js",
                 "--no-color"
             ],
-            "outFiles": [
-                "${workspaceRoot}/test.js"
-            ]
+            "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
+            "sourceMaps": true,
         }
     ]
 }