@ts-for-gir/cli 3.0.0-beta.6 → 3.0.0-beta.7

package/lib/types/ts-method.d.ts

@@ -2,4 +2,4 @@ import { TsFunction } from './index.js';
 /**
  * Holds the data to generate a method in/for Typescript
  */
-export declare type TsMethod = TsFunction;
+export type TsMethod = TsFunction;

package/lib/types/ts-type-name.d.ts

@@ -1 +1 @@
-export declare type TsTypeName = 'function' | 'method' | 'static-function' | 'interface' | 'event-methods' | 'constructor';
+export type TsTypeName = 'function' | 'method' | 'static-function' | 'interface' | 'event-methods' | 'constructor';

package/lib/types/ts-type-separator.d.ts

@@ -1 +1 @@
-export declare type TsTypeSeparator = '&' | '|';
+export type TsTypeSeparator = '&' | '|';

package/lib/types/type-gir-alias.d.ts

@@ -1,2 +1,2 @@
 /** All gir elements which can be a typescript `type` */
-export declare type TypeGirAlias = 'alias';
+export type TypeGirAlias = 'alias';

package/lib/types/type-gir-class.d.ts

@@ -1,2 +1,2 @@
 /** All gir elements which can be a typescript class */
-export declare type TypeGirClass = 'class' | 'record' | 'interface' | 'union';
+export type TypeGirClass = 'class' | 'record' | 'interface' | 'union';

package/lib/types/type-gir-element.d.ts

@@ -1,3 +1,3 @@
 import { TypeGirClass, TypeGirMethod, TypeGirVariable, TypeGirAlias, TypeGirEnumeration, TypeGirEnumerationMember, TypeGirInterface, TypeGirParameter, TypeGirProperty, TypeGirFunction } from './index.js';
 /** Any gir element type */
-export declare type TypeGirElement = TypeGirClass | TypeGirMethod | TypeGirVariable | TypeGirAlias | TypeGirEnumeration | TypeGirEnumerationMember | TypeGirInterface | TypeGirParameter | TypeGirProperty | TypeGirFunction;
+export type TypeGirElement = TypeGirClass | TypeGirMethod | TypeGirVariable | TypeGirAlias | TypeGirEnumeration | TypeGirEnumerationMember | TypeGirInterface | TypeGirParameter | TypeGirProperty | TypeGirFunction;

package/lib/types/type-gir-enumeration-member.d.ts

@@ -1,2 +1,2 @@
 /** All gir elements which can be a typescript enumeration */
-export declare type TypeGirEnumerationMember = 'enum-member' | 'bitfield-member';
+export type TypeGirEnumerationMember = 'enum-member' | 'bitfield-member';

package/lib/types/type-gir-enumeration.d.ts

@@ -1,2 +1,2 @@
 /** All gir elements which can be a typescript enumeration */
-export declare type TypeGirEnumeration = 'enum' | 'bitfield';
+export type TypeGirEnumeration = 'enum' | 'bitfield';

package/lib/types/type-gir-function.d.ts

@@ -1 +1 @@
-export declare type TypeGirFunction = 'constructor' | 'function' | 'method' | 'static-function' | 'signal' | 'virtual' | 'callback';
+export type TypeGirFunction = 'constructor' | 'function' | 'method' | 'static-function' | 'signal' | 'virtual' | 'callback';

package/lib/types/type-gir-interface.d.ts

@@ -1,2 +1,2 @@
 /** All gir elements which can be a typescript interface */
-export declare type TypeGirInterface = 'callback';
+export type TypeGirInterface = 'callback';

package/lib/types/type-gir-method.d.ts

@@ -1,2 +1,2 @@
 /** All gir elements which can be a typescript method (or static function) of a class */
-export declare type TypeGirMethod = 'virtual' | 'signal' | 'method' | 'constructor' | 'function' | 'static';
+export type TypeGirMethod = 'virtual' | 'signal' | 'method' | 'constructor' | 'function' | 'static';

package/lib/types/type-gir-parameter.d.ts

@@ -1 +1 @@
-export declare type TypeGirParameter = 'callable-param';
+export type TypeGirParameter = 'callable-param';

package/lib/types/type-gir-property.d.ts

@@ -1,2 +1,2 @@
 /** All gir elements which can be a typescript field / property */
-export declare type TypeGirProperty = 'property' | 'field' | 'constant';
+export type TypeGirProperty = 'property' | 'field' | 'constant';

package/lib/types/type-gir-variable.d.ts

@@ -1 +1 @@
-export declare type TypeGirVariable = 'constant';
+export type TypeGirVariable = 'constant';

package/lib/types/type-ts-element.d.ts

@@ -1,3 +1,3 @@
 import { TypeTsFunction, TypeTsProperty } from './index.js';
 /** Any typescript element type */
-export declare type TypeTsElement = 'class' | 'interface' | 'enum' | 'enum-member' | 'constant' | 'event-methods' | 'type' | TypeTsFunction | TypeTsProperty;
+export type TypeTsElement = 'class' | 'interface' | 'enum' | 'enum-member' | 'constant' | 'event-methods' | 'type' | TypeTsFunction | TypeTsProperty;

package/lib/types/type-ts-enumeration-member.d.ts

@@ -1,2 +1,2 @@
 /** All gir elements which can be a typescript enumeration */
-export declare type TypeTsEnumerationMember = 'enum-member';
+export type TypeTsEnumerationMember = 'enum-member';

package/lib/types/type-ts-function.d.ts

@@ -1 +1 @@
-export declare type TypeTsFunction = 'static-function' | 'constructor' | 'function' | 'method' | 'event-methods' | 'interface';
+export type TypeTsFunction = 'static-function' | 'constructor' | 'function' | 'method' | 'event-methods' | 'interface';

package/lib/types/type-ts-property.d.ts

@@ -1 +1 @@
-export declare type TypeTsProperty = 'static-property' | 'property' | 'constructor-property';
+export type TypeTsProperty = 'static-property' | 'property' | 'constructor-property';

package/lib/utils.d.ts

@@ -88,9 +88,16 @@ export declare const girElementIsIntrospectable: (girElement?: {
 export declare const typeIsOptional: (types: TsType[]) => boolean;
 /**
  * Given an directory path search for a tsconfig.json or jsconfig.json file in it or any of its parent directories, then read the file and parse it as json.
- * @see {@link https://github.com/microsoft/TypeScript/blob/5f9c9a6ccf61fa131849797248438e292e7b496a/src/harness/compilerImpl.ts#L11-L35}
- * @see {@link https://github.com/microsoft/TypeScript/blob/3fd8a6e44341f14681aa9d303dc380020ccb2147/src/harness/vfsUtil.ts#L286-L316}
  *
  * @param path - The directory path to search for a tsconfig.json or jsconfig.json file
  */
-export declare function readTsJsConfig(path: string): Record<PropertyKey, unknown> | null;
+export declare function readTsJsConfig(path: string): {
+    compilerOptions?: import("get-tsconfig").TsConfigJson.CompilerOptions | undefined;
+    watchOptions?: import("get-tsconfig").TsConfigJson.WatchOptions | undefined;
+    typeAcquisition?: import("get-tsconfig").TsConfigJson.TypeAcquisition | undefined;
+    compileOnSave?: boolean | undefined;
+    files?: string[] | undefined;
+    exclude?: string[] | undefined;
+    include?: string[] | undefined;
+    references?: import("get-tsconfig").TsConfigJson.References[] | undefined;
+} | null;

package/lib/utils.js

@@ -2,7 +2,7 @@
 import lodash from 'lodash';
 import Path from 'path';
 import fs from 'fs';
-import ts from 'typescript';
+import { getTsconfig } from 'get-tsconfig';
 import { fileURLToPath } from 'url';
 import { inspect } from 'util';
 import { Logger } from './logger.js';
@@ -189,8 +189,8 @@ export const typeIsOptional = (types) => {
 };
 function convertTsJsConfigToObject(path) {
     try {
-        const config = ts.parseConfigFileTextToJson(Path.basename(path), fs.readFileSync(path, 'utf8').trim()).config;
-        if (typeof config === 'object' && !Array.isArray(config))
+        const config = getTsconfig(path)?.config;
+        if (config)
             return config;
     }
     catch {
@@ -200,8 +200,6 @@ function convertTsJsConfigToObject(path) {
 }
 /**
  * Given an directory path search for a tsconfig.json or jsconfig.json file in it or any of its parent directories, then read the file and parse it as json.
- * @see {@link https://github.com/microsoft/TypeScript/blob/5f9c9a6ccf61fa131849797248438e292e7b496a/src/harness/compilerImpl.ts#L11-L35}
- * @see {@link https://github.com/microsoft/TypeScript/blob/3fd8a6e44341f14681aa9d303dc380020ccb2147/src/harness/vfsUtil.ts#L286-L316}
  *
  * @param path - The directory path to search for a tsconfig.json or jsconfig.json file
  */
@@ -218,6 +216,6 @@ export function readTsJsConfig(path) {
         lastPath = currentPath;
         currentPath = Path.dirname(currentPath);
     }
-    return config === false ? null : config;
+    return config || null;
 }
 //# sourceMappingURL=utils.js.map

package/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-for-gir/cli",
-  "version": "3.0.0-beta.6",
+  "version": "3.0.0-beta.7",
   "description": "Typescript .d.ts generator from GIR for gjs and node-gtk",
   "module": "lib/index.js",
   "type": "module",
@@ -12,7 +12,7 @@
   },
   "scripts": {
     "start": "yarn node --max_old_space_size=9216 lib/start.js",
-    "build": "yarn run clear:build && yarn run lint && yarn run build:ts && yarn run chmod",
+    "build": "yarn run lint && yarn run build:ts && yarn run chmod",
     "chmod": "chmod +x ./lib/start.js",
     "build:ts": "tsc",
     "clear": "yarn run clear:build",
@@ -40,33 +40,34 @@
     "@types/change-case": "^2.3.1",
     "@types/columnify": "^1.5.1",
     "@types/ejs": "^3.1.1",
-    "@types/eslint": "8.4.6",
-    "@types/inquirer": "^9.0.1",
-    "@types/lodash": "^4.14.185",
-    "@types/node": "^18.7.21",
-    "@types/prettier": "^2.7.1",
+    "@types/eslint": "8.4.10",
+    "@types/inquirer": "^9.0.3",
+    "@types/lodash": "^4.14.191",
+    "@types/node": "^18.11.18",
+    "@types/prettier": "^2.7.2",
     "@types/xml2js": "^0.4.11",
-    "@types/yargs": "^17.0.13",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^5.38.0",
-    "eslint": "^8.24.0",
-    "eslint-config-prettier": "^8.5.0",
+    "@types/yargs": "^17.0.19",
+    "@typescript-eslint/eslint-plugin": "^5.48.2",
+    "@typescript-eslint/parser": "^5.48.2",
+    "eslint": "^8.32.0",
+    "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "rimraf": "^3.0.2"
+    "rimraf": "^4.1.0",
+    "typescript": "^4.9.4"
   },
   "dependencies": {
     "colorette": "^2.0.19",
     "columnify": "^1.6.0",
-    "cosmiconfig": "^7.0.1",
+    "cosmiconfig": "^8.0.0",
     "ejs": "^3.1.8",
     "events": "^3.3.0",
-    "globby": "^13.1.2",
-    "inquirer": "^9.1.2",
+    "get-tsconfig": "^4.3.0",
+    "globby": "^13.1.3",
+    "inquirer": "^9.1.4",
     "lodash": "^4.17.21",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.3",
     "tiny-glob": "^0.2.9",
-    "typescript": "^4.8.3",
     "xml2js": "^0.4.23",
-    "yargs": "^17.5.1"
+    "yargs": "^17.6.2"
   }
 }

package/src/config.ts

@@ -35,7 +35,7 @@ export class Config {
         girDirectories: OS.platform() === 'darwin' ? ['/usr/local/share/gir-1.0'] : ['/usr/share/gir-1.0'],
         modules: ['*'],
         ignore: [],
-        verbose: true,
+        verbose: false,
         ignoreVersionConflicts: false,
         useNamespace: false,
         buildType: 'lib',
@@ -295,23 +295,12 @@ export class Config {
     }
 
     protected static async validateTsConfig(config: UserConfig): Promise<UserConfig> {
-        const tsConfig = config.outdir ? readTsJsConfig(config.outdir) : null
-
-        const tsCompilerOptions = (
-            tsConfig &&
-            'compilerOptions' in tsConfig &&
-            typeof tsConfig.compilerOptions === 'object' &&
-            tsConfig.compilerOptions != null
-                ? tsConfig.compilerOptions
-                : {}
-        ) as Record<PropertyKey, unknown>
-
-        const tsConfigHasDOMLib =
-            'noLib' in tsCompilerOptions && tsCompilerOptions.noLib
-                ? false // NoLib makes typescript to ignore the lib property
-                : 'lib' in tsCompilerOptions && Array.isArray(tsCompilerOptions.lib)
-                ? tsCompilerOptions.lib.some((lib) => String(lib).toLowerCase().startsWith('dom'))
-                : true // Typescript icludes DOM lib by default
+        const tsCompilerOptions = (config.outdir && readTsJsConfig(config.outdir)?.compilerOptions) || {}
+        const tsConfigHasDOMLib = tsCompilerOptions.noLib
+            ? false // NoLib makes typescript to ignore the lib property
+            : Array.isArray(tsCompilerOptions.lib)
+            ? tsCompilerOptions.lib.some((lib) => lib.toLowerCase().startsWith('dom'))
+            : true // Typescript icludes DOM lib by default
 
         if (config.environments.includes('gjs') && tsConfigHasDOMLib && !config.noDOMLib) {
             const answer = (
@@ -358,7 +347,7 @@ export class Config {
      * @param options
      */
     public static async load(options: ConfigFlags): Promise<UserConfig> {
-        const configFile = await this.loadConfigFile(options.configName)
+        const configFile = (await this.loadConfigFile(options.configName))?.config || {}
 
         const config: UserConfig = {
             environments: options.environments,
@@ -382,96 +371,90 @@ export class Config {
 
         if (configFile) {
             // environments
-            if (isEqual(config.environments, Config.defaults.environments) && configFile.config.environments) {
-                config.environments = configFile.config.environments
+            if (isEqual(config.environments, Config.defaults.environments) && configFile.environments) {
+                config.environments = configFile.environments
             }
             // buildType
-            if (config.buildType === Config.options.buildType.default && configFile.config.buildType) {
-                config.buildType = configFile.config.buildType
+            if (config.buildType === Config.options.buildType.default && configFile.buildType) {
+                config.buildType = configFile.buildType
             }
             // moduleType
-            if (config.moduleType === Config.options.moduleType.default && configFile.config.moduleType) {
-                config.moduleType = configFile.config.moduleType
+            if (config.moduleType === Config.options.moduleType.default && configFile.moduleType) {
+                config.moduleType = configFile.moduleType
             }
             // verbose
-            if (config.verbose === Config.options.verbose.default && typeof configFile.config.verbose === 'boolean') {
-                config.verbose = configFile.config.verbose
+            if (config.verbose === Config.options.verbose.default && typeof configFile.verbose === 'boolean') {
+                config.verbose = configFile.verbose
             }
             // ignoreVersionConflicts
             if (
                 config.ignoreVersionConflicts === Config.options.ignoreVersionConflicts.default &&
-                typeof configFile.config.ignoreVersionConflicts === 'boolean'
+                typeof configFile.ignoreVersionConflicts === 'boolean'
             ) {
-                config.ignoreVersionConflicts = configFile.config.ignoreVersionConflicts
+                config.ignoreVersionConflicts = configFile.ignoreVersionConflicts
             }
             // pretty
-            if (config.pretty === Config.options.pretty.default && typeof configFile.config.pretty === 'boolean') {
-                config.pretty = configFile.config.pretty
+            if (config.pretty === Config.options.pretty.default && typeof configFile.pretty === 'boolean') {
+                config.pretty = configFile.pretty
             }
             // print
-            if (config.print === Config.options.print.default && typeof configFile.config.print === 'boolean') {
-                config.print = configFile.config.print
+            if (config.print === Config.options.print.default && typeof configFile.print === 'boolean') {
+                config.print = configFile.print
             }
             // outdir
-            if (config.outdir === Config.options.outdir.default && configFile.config.outdir) {
-                config.outdir = config.print ? null : configFile.config.outdir
+            if (config.outdir === Config.options.outdir.default && configFile.outdir) {
+                config.outdir = config.print ? null : configFile.outdir
             }
             // girDirectories
-            if (config.girDirectories === Config.options.girDirectories.default && configFile.config.girDirectories) {
-                config.girDirectories = configFile.config.girDirectories
+            if (config.girDirectories === Config.options.girDirectories.default && configFile.girDirectories) {
+                config.girDirectories = configFile.girDirectories
             }
             // ignore
             if (
                 (!config.ignore || config.ignore.length <= 0 || isEqual(config.ignore, Config.defaults.ignore)) &&
-                configFile.config.ignore
+                configFile.ignore
             ) {
-                config.ignore = configFile.config.ignore
+                config.ignore = configFile.ignore
             }
             // modules
             if (
                 (config.modules.length <= 0 || isEqual(config.modules, Config.defaults.modules)) &&
-                configFile.config.modules
+                configFile.modules
             ) {
-                config.modules = configFile.config.modules
+                config.modules = configFile.modules
             }
             // useNamespace
             if (
                 config.useNamespace === Config.options.useNamespace.default &&
-                typeof configFile.config.useNamespace === 'boolean'
+                typeof configFile.useNamespace === 'boolean'
             ) {
-                config.useNamespace = configFile.config.useNamespace
+                config.useNamespace = configFile.useNamespace
             }
             // noComments
-            if (
-                config.noComments === Config.options.noComments.default &&
-                typeof configFile.config.noComments === 'boolean'
-            ) {
-                config.noComments = configFile.config.noComments
+            if (config.noComments === Config.options.noComments.default && typeof configFile.noComments === 'boolean') {
+                config.noComments = configFile.noComments
             }
             // noDebugComments
             if (
                 config.noDebugComments === Config.options.noDebugComments.default &&
-                typeof configFile.config.noDebugComments === 'boolean'
+                typeof configFile.noDebugComments === 'boolean'
             ) {
-                config.noDebugComments = configFile.config.noDebugComments
+                config.noDebugComments = configFile.noDebugComments
             }
             // noCheck
-            if (config.noCheck === Config.options.noCheck.default && typeof configFile.config.noCheck === 'boolean') {
-                config.noCheck = configFile.config.noCheck
+            if (config.noCheck === Config.options.noCheck.default && typeof configFile.noCheck === 'boolean') {
+                config.noCheck = configFile.noCheck
             }
             // fixConflicts
             if (
                 config.fixConflicts === Config.options.fixConflicts.default &&
-                typeof configFile.config.fixConflicts === 'boolean'
+                typeof configFile.fixConflicts === 'boolean'
             ) {
-                config.fixConflicts = configFile.config.fixConflicts
+                config.fixConflicts = configFile.fixConflicts
             }
             // noDOMLib
-            if (
-                config.noDOMLib === Config.options.noDOMLib.default &&
-                typeof configFile.config.noDOMLib === 'boolean'
-            ) {
-                config.noDOMLib = configFile.config.noDOMLib
+            if (config.noDOMLib === Config.options.noDOMLib.default && typeof configFile.noDOMLib === 'boolean') {
+                config.noDOMLib = configFile.noDOMLib
             }
         }
 

package/src/template-processor.ts

@@ -69,7 +69,7 @@ export class TemplateProcessor {
         const destPath = getDestPath(this.config.environment, outputDir, outputFilename)
 
         // write template result file
-        mkdirSync(outputDir, { recursive: true })
+        mkdirSync(Path.dirname(destPath), { recursive: true })
         writeFileSync(destPath, content, { encoding: 'utf8', flag: 'w' })
 
         return Promise.resolve(destPath)

package/src/type-definition-generator.ts

@@ -57,8 +57,8 @@ export default class TypeDefinitionGenerator implements Generator {
      */
     private generateModuleDependenciesImport(namespace: string, packageName: string, asExternType = false): string[] {
         const def: string[] = []
+        const sas = this.config.useNamespace && packageName !== 'Gjs' ? '' : '* as '
         if (this.config.buildType === 'lib') {
-            const sas = this.config.useNamespace && packageName !== 'Gjs' ? '' : '* as '
             def.push(`import type ${sas}${namespace} from './${packageName}.js';`)
         } else if (this.config.buildType === 'types') {
             if (asExternType) {
@@ -66,7 +66,7 @@ export default class TypeDefinitionGenerator implements Generator {
                 def.push(`import ${namespace} from "${packageName}.js"`)
             } else {
                 def.push(`/// <reference path="${packageName}.d.ts" />`)
-                def.push(`import type ${namespace} from './${packageName}.js';`)
+                def.push(`import type ${sas}${namespace} from './${packageName}.js';`)
             }
         }
         return def
@@ -1357,7 +1357,7 @@ export default class TypeDefinitionGenerator implements Generator {
             out.push(`}`)
         }
 
-        if (this.config.buildType !== 'types' && this.config.useNamespace) {
+        if (this.config.useNamespace) {
             out.push(`export default ${girModule.namespace};`)
         }
 
@@ -1406,24 +1406,19 @@ export default class TypeDefinitionGenerator implements Generator {
 
         // Types
         await templateProcessor.create('Gjs.d.ts', this.config.outdir, 'Gjs.d.ts')
+        await templateProcessor.create('GnomeShell.d.ts', this.config.outdir, 'GnomeShell.d.ts')
+        await templateProcessor.create('misc/extensionUtils.d.ts', this.config.outdir, 'misc/extensionUtils.d.ts')
         await templateProcessor.create('index.d.ts', this.config.outdir, 'index.d.ts')
 
         // Lib
         if (this.config.buildType === 'lib') {
+            await templateProcessor.create('Gjs.js', this.config.outdir, 'Gjs.js')
+            await templateProcessor.create('GnomeShell.js', this.config.outdir, 'GnomeShell.js')
+            await templateProcessor.create('misc/extensionUtils.js', this.config.outdir, 'misc/extensionUtils.js')
             await templateProcessor.create('index.js', this.config.outdir, 'index.js')
-            const template = 'Gjs.js'
-            await templateProcessor.create(template, this.config.outdir, 'Gjs.js')
         }
     }
 
-    private async exportGjsCastLib(inheritanceTable: InheritanceTable) {
-        if (!this.config.outdir) return
-
-        const inheritanceTableKeys = Object.keys(inheritanceTable)
-        const templateProcessor = new TemplateProcessor({ inheritanceTableKeys, inheritanceTable }, 'gjs', this.config)
-        await templateProcessor.create('cast.ts', this.config.outdir, 'cast.ts')
-    }
-
     private async exportNodeGtk(girModules: GirModule[], girModulesGrouped: GirModulesGrouped[]) {
         if (!this.config.outdir) return
 
@@ -1452,7 +1447,6 @@ export default class TypeDefinitionGenerator implements Generator {
         if (this.config.environment === 'gjs' && girModulesGrouped && inheritanceTable) {
             // GJS internal stuff
             await this.exportGjs(girModules, girModulesGrouped)
-            await this.exportGjsCastLib(inheritanceTable)
         }
     }
 }

package/src/utils.ts

@@ -2,7 +2,7 @@
 import lodash from 'lodash'
 import Path from 'path'
 import fs from 'fs'
-import ts from 'typescript'
+import { getTsconfig, TsConfigJsonResolved } from 'get-tsconfig'
 import { fileURLToPath } from 'url'
 import { Environment, GirInfoAttrs, TsType } from './types/index.js'
 import { inspect } from 'util'
@@ -219,11 +219,8 @@ export const typeIsOptional = (types: TsType[]) => {
 
 function convertTsJsConfigToObject(path: string) {
     try {
-        const config: unknown = ts.parseConfigFileTextToJson(
-            Path.basename(path),
-            fs.readFileSync(path, 'utf8').trim(),
-        ).config
-        if (typeof config === 'object' && !Array.isArray(config)) return config as Record<PropertyKey, unknown>
+        const config = getTsconfig(path)?.config
+        if (config) return config
     } catch {
         // ignored
     }
@@ -232,13 +229,11 @@ function convertTsJsConfigToObject(path: string) {
 
 /**
  * Given an directory path search for a tsconfig.json or jsconfig.json file in it or any of its parent directories, then read the file and parse it as json.
- * @see {@link https://github.com/microsoft/TypeScript/blob/5f9c9a6ccf61fa131849797248438e292e7b496a/src/harness/compilerImpl.ts#L11-L35}
- * @see {@link https://github.com/microsoft/TypeScript/blob/3fd8a6e44341f14681aa9d303dc380020ccb2147/src/harness/vfsUtil.ts#L286-L316}
  *
  * @param path - The directory path to search for a tsconfig.json or jsconfig.json file
  */
 export function readTsJsConfig(path: string) {
-    let config: null | false | Record<PropertyKey, unknown> = null
+    let config: null | false | TsConfigJsonResolved = null
     let lastPath = ''
     let currentPath = Path.resolve(path)
     while (!config && currentPath !== lastPath) {
@@ -251,5 +246,5 @@ export function readTsJsConfig(path: string) {
         currentPath = Path.dirname(currentPath)
     }
 
-    return config === false ? null : config
+    return config || null
 }

package/templates/Gjs/Gjs.d.ts

@@ -93,10 +93,12 @@ export namespace gettext {
     export function dcgettext(domainname: string | null, msgid: string, category: number): string
     export function ngettext(msgid: string, msgid_plural: string, n: number): string
     export function dngettext(domainname: string, msgid: string, msgid_plural: string, n: number): string
+    export function pgettext(context: string, msgid: string): string
+    export function dpgettext(dom: string | null, context: string, msgid: string): string
     export function domain(domainName: string): {
         gettext: (msgid: string) => string
         ngettext: (msgid: string, msgid_plural: string, n: number) => string
-        pgettext: (context: any, msgid: string) => any
+        pgettext: (context: string, msgid: string) => string
     }
 }