@ts-for-gir/cli 3.0.0-beta.8 → 3.0.0

package/lib/utils.js

@@ -1,193 +1,12 @@
-/* eslint-disable @typescript-eslint/unbound-method */
-import lodash from 'lodash';
-import Path from 'path';
-import fs from 'fs';
+import { join, dirname, resolve } from 'path';
+import { existsSync } from 'fs';
 import { getTsconfig } from 'get-tsconfig';
-import { fileURLToPath } from 'url';
-import { inspect } from 'util';
-import { Logger } from './logger.js';
-import { COMMENT_REG_EXP, PARAM_REG_EXP, OPT_PARAM_REG_EXP } from './constants.js';
-export { inspect };
-export const isEqual = lodash.isEqual;
-export const map = lodash.map;
-export const find = lodash.find;
-export const merge = lodash.merge;
-export const clone = lodash.clone;
-export const cloneDeep = lodash.cloneDeep;
-export const splitModuleName = (packageName) => {
-    // There are modules that use multiple hyphens like 'GUPnP-DLNA-1.0'
-    const splits = packageName.split('-');
-    const version = splits.splice(-1, 1)[0];
-    const namespace = splits.join('');
-    return {
-        packageName,
-        namespace,
-        version,
-    };
-};
-/** Remove namespace prefix */
-export const removeNamespace = (type, namespace) => {
-    if (type.startsWith(namespace + '.')) {
-        type = type.substring(namespace.length + 1);
-    }
-    return type;
-};
-/** Remove class module name prefix */
-export const removeClassModule = removeNamespace;
-export const addNamespace = (type, namespace) => {
-    if (!type.startsWith(namespace + '.')) {
-        type = namespace + '.' + type;
-    }
-    return type;
-};
-/**
- * Checking whether some variable is iterable
- * see https://stackoverflow.com/a/32538867
- * @param obj Variable to check for iterable
- */
-export const isIterable = (obj) => {
-    return obj != null && typeof obj[Symbol.iterator] === 'function';
-};
-export const isNumeric = (str) => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return !isNaN(str - parseFloat(str));
-};
-export const getFirstChar = (str) => {
-    return str.charAt(0);
-};
-export const getLastChar = (str) => {
-    return str.charAt(str.length - 1);
-};
-export const isFirstCharNumeric = (str) => {
-    return isNumeric(getFirstChar(str));
-};
-export const camelCase = (str) => {
-    return str
-        .replace(/\s(.)|(\s|-|_|\.)(.)/g, (a) => {
-        return a.toUpperCase();
-    })
-        .replace(/(\s|-|_|\.)/g, '');
-};
-export const lowerCamelCase = (str) => {
-    str = camelCase(str);
-    str = getFirstChar(str).toLowerCase() + str.slice(1);
-    return str;
-};
-export const upperCamelCase = (str) => {
-    str = camelCase(str);
-    str = getFirstChar(str).toUpperCase() + str.slice(1);
-    return str;
-};
-export const findFileInDirs = (dirs, filename) => {
-    let exists = false;
-    for (const dir of dirs) {
-        const filePath = Path.join(dir, filename);
-        exists = fs.existsSync(filePath);
-        if (exists) {
-            return {
-                path: filePath,
-                exists,
-            };
-        }
-    }
-    return {
-        path: null,
-        exists,
-    };
-};
 /**
- * Union (a ∪ b): create a set that contains the elements of both set a and set b.
- * See https://2ality.com/2015/01/es6-set-operations.html#union
- * @param target
- * @param source
+ * Get a typescript or javascript config by path
+ * @param path The path to search for a tsconfig.json or jsconfig.json file
+ * @returns The config or null if not found
  */
-export const union = (target, source) => {
-    return (target = new Set([...target, ...source]));
-};
-export const stripParamNames = (func, ignoreTail = false) => {
-    const g = func;
-    func = func.replace(COMMENT_REG_EXP, '');
-    const lb = func.split('(', 2);
-    if (lb.length < 2)
-        Logger.error(`Bad function definition ${g}`);
-    const rb = lb[1].split(')');
-    const tail = ignoreTail ? '' : rb[rb.length - 1];
-    let params = rb.slice(0, rb.length - 1).join(')');
-    params = params.replace(PARAM_REG_EXP, ':');
-    params = params.replace(OPT_PARAM_REG_EXP, '?:');
-    return `${lb[0]}(${params})${tail}`;
-};
-export const isCommentLine = (line) => {
-    const lineTrim = line.trim();
-    return lineTrim.startsWith('//') || (lineTrim.startsWith('/*') && lineTrim.endsWith('*/'));
-};
-export const generateIndent = (indents = 1, spaceForIndent = 4) => {
-    return ' '.repeat(indents * spaceForIndent);
-};
-// Get __dirname on ESM
-export const __filename = fileURLToPath(import.meta.url);
-export const __dirname = Path.dirname(__filename);
-export const getEnvironmentDir = (environment, baseDir) => {
-    if (!baseDir.endsWith(environment))
-        if (environment === 'gjs' && !baseDir.endsWith('/Gjs')) {
-            return Path.join(baseDir, 'Gjs');
-        }
-    if (environment === 'node' && !baseDir.endsWith('/node-gtk')) {
-        return Path.join(baseDir, 'node-gtk');
-    }
-    return baseDir;
-};
-export const getDestPath = (environment, outputDir, ...parts) => {
-    const outputEnvDir = getEnvironmentDir(environment, outputDir);
-    const destPath = Path.join(outputEnvDir, ...parts);
-    return destPath;
-};
-export const girBool = (boolStr, defaultVal = false) => {
-    if (boolStr) {
-        if (parseInt(boolStr) === 0)
-            return false;
-        return true;
-    }
-    return defaultVal;
-};
-/**
- * Returns `true` if the definitions in `d1` and `d2` have equivalent signatures
- * @param d1
- * @param d2
- */
-export const signaturesMatch = (d1, d2) => {
-    if (isCommentLine(d1) || isCommentLine(d2))
-        return false;
-    return stripParamNames(d1) == stripParamNames(d2);
-};
-/**
- * GirElements contains an attribute `introspectable`, which is a GirBoolean.
- * If this is attribute is falsy the element is not introspectable,
- * this means doesn't exist in the bindings, due in general to missing information in the annotations in the original C code
- */
-export const girElementIsIntrospectable = (girElement, name) => {
-    if (!girElement) {
-        return false;
-    }
-    name = name || girElement?.$?.name;
-    if (!name) {
-        return false;
-    }
-    // Handle introspectable only if the attribute is also present...
-    if (girElement.$.hasOwnProperty('introspectable') && girElement.$.introspectable !== undefined) {
-        return girBool(girElement.$.introspectable, true);
-    }
-    // ...otherwise we assume that it is introspectable
-    return true;
-};
-export const typeIsOptional = (types) => {
-    for (const type of types) {
-        if (type.optional)
-            return true;
-    }
-    return false;
-};
-function convertTsJsConfigToObject(path) {
+export const getTsJsConfigByPath = (path) => {
     try {
         const config = getTsconfig(path)?.config;
         if (config)
@@ -197,7 +16,7 @@ function convertTsJsConfigToObject(path) {
         // ignored
     }
     return null;
-}
+};
 /**
  * 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.
  *
@@ -206,15 +25,15 @@ function convertTsJsConfigToObject(path) {
 export function readTsJsConfig(path) {
     let config = null;
     let lastPath = '';
-    let currentPath = Path.resolve(path);
+    let currentPath = resolve(path);
     while (!config && currentPath !== lastPath) {
-        const tsConfigPath = Path.join(currentPath, 'tsconfig.json');
-        const jsConfigPath = Path.join(currentPath, 'jsconfig.json');
+        const tsConfigPath = join(currentPath, 'tsconfig.json');
+        const jsConfigPath = join(currentPath, 'jsconfig.json');
         config =
-            (fs.existsSync(tsConfigPath) && convertTsJsConfigToObject(tsConfigPath)) ||
-                (fs.existsSync(jsConfigPath) && convertTsJsConfigToObject(jsConfigPath));
+            (existsSync(tsConfigPath) && getTsJsConfigByPath(tsConfigPath)) ||
+                (existsSync(jsConfigPath) && getTsJsConfigByPath(jsConfigPath));
         lastPath = currentPath;
-        currentPath = Path.dirname(currentPath);
+        currentPath = dirname(currentPath);
     }
     return config || null;
 }

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":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAA;AAC/B,OAAO,EAAE,WAAW,EAAwB,MAAM,cAAc,CAAA;AAEhE;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAE,EAAE;IAChD,IAAI;QACA,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;QACxC,IAAI,MAAM;YAAE,OAAO,MAAM,CAAA;KAC5B;IAAC,MAAM;QACJ,UAAU;KACb;IACD,OAAO,IAAI,CAAA;AACf,CAAC,CAAA;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,IAAY;IACvC,IAAI,MAAM,GAAwC,IAAI,CAAA;IACtD,IAAI,QAAQ,GAAG,EAAE,CAAA;IACjB,IAAI,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/B,OAAO,CAAC,MAAM,IAAI,WAAW,KAAK,QAAQ,EAAE;QACxC,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAA;QACvD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAA;QACvD,MAAM;YACF,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,mBAAmB,CAAC,YAAY,CAAC,CAAC;gBAC/D,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAAA;QACnE,QAAQ,GAAG,WAAW,CAAA;QACtB,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;KACrC;IAED,OAAO,MAAM,IAAI,IAAI,CAAA;AACzB,CAAC"}

package/package.json

@@ -1,28 +1,30 @@
 {
   "name": "@ts-for-gir/cli",
-  "version": "3.0.0-beta.8",
-  "description": "Typescript .d.ts generator from GIR for gjs and node-gtk",
+  "version": "3.0.0",
+  "description": "TypeScript type definition generator for GObject introspection GIR files",
   "module": "lib/index.js",
+  "main": "lib/index.js",
   "type": "module",
   "bin": {
     "ts-for-gir": "./lib/start.js"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "scripts": {
     "start": "yarn node --max_old_space_size=9216 lib/start.js",
-    "build": "yarn run lint && yarn run build:ts && yarn run chmod",
+    "start:dev": "yarn node --max_old_space_size=9216 --loader ts-node/esm src/start.ts",
+    "build": "yarn lint && yarn build:ts && yarn chmod",
     "chmod": "chmod +x ./lib/start.js",
     "build:ts": "tsc",
-    "clear": "yarn run clear:build",
+    "clear": "yarn clear:build",
     "clear:build": "rimraf ./lib",
-    "watch": "yarn run build:ts -- --watch",
+    "watch": "yarn build:ts --watch",
     "lint": "eslint . --ext .ts,.tsx --fix"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/sammydre/ts-for-gjs.git"
+    "url": "git+https://github.com/gjsify/ts-for-gir.git"
   },
   "author": "Pascal Garber <pascal@artandcode.studio>",
   "files": [
@@ -33,9 +35,9 @@
   ],
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/sammydre/ts-for-gjs/issues"
+    "url": "https://github.com/gjsify/ts-for-gir/issues"
   },
-  "homepage": "https://github.com/sammydre/ts-for-gjs#readme",
+  "homepage": "https://github.com/gjsify/ts-for-gir#readme",
   "keywords": [
     "gjs",
     "typescript",
@@ -48,40 +50,33 @@
     "glib",
     "gobject",
     "dts",
-    "type definitions"
+    "type definitions",
+    "cli"
   ],
   "devDependencies": {
-    "@types/change-case": "^2.3.1",
-    "@types/columnify": "^1.5.1",
-    "@types/ejs": "^3.1.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.19",
-    "@typescript-eslint/eslint-plugin": "^5.48.2",
-    "@typescript-eslint/parser": "^5.48.2",
-    "eslint": "^8.32.0",
-    "eslint-config-prettier": "^8.6.0",
+    "@types/node": "^18.16.14",
+    "@types/yargs": "^17.0.24",
+    "@typescript-eslint/eslint-plugin": "^5.59.6",
+    "@typescript-eslint/parser": "^5.59.6",
+    "eslint": "^8.41.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "rimraf": "^4.1.0",
-    "typescript": "^4.9.4"
+    "prettier": "^2.8.8",
+    "rimraf": "^5.0.1",
+    "ts-node": "^10.9.1",
+    "typescript": "^5.0.4"
   },
   "dependencies": {
-    "colorette": "^2.0.19",
-    "columnify": "^1.6.0",
-    "cosmiconfig": "^8.0.0",
-    "ejs": "^3.1.8",
-    "events": "^3.3.0",
-    "get-tsconfig": "^4.3.0",
-    "globby": "^13.1.3",
-    "inquirer": "^9.1.4",
-    "lodash": "^4.17.21",
-    "prettier": "^2.8.3",
+    "@ts-for-gir/generator-base": "^3.0.0",
+    "@ts-for-gir/generator-html-doc": "^3.0.0",
+    "@ts-for-gir/generator-typescript": "^3.0.0",
+    "@ts-for-gir/lib": "^3.0.0",
+    "colorette": "^2.0.20",
+    "cosmiconfig": "^8.1.3",
+    "get-tsconfig": "^4.5.0",
+    "inquirer": "^9.2.6",
     "tiny-glob": "^0.2.9",
-    "xml2js": "^0.4.23",
-    "yargs": "^17.6.2"
+    "yargs": "^17.7.2"
   }
 }

package/src/commands/doc.ts

@@ -3,29 +3,24 @@
  */
 
 import { Argv } from 'yargs'
-
+import { Logger, ERROR_NO_MODULES_FOUND } from '@ts-for-gir/lib'
+import { GeneratorType } from '@ts-for-gir/generator-base'
 import { GenerationHandler } from '../generation-handler.js'
 import { Config } from '../config.js'
 import { ModuleLoader } from '../module-loader.js'
-import { ConfigFlags, GeneratorType } from '../types/index.js'
-import { Logger } from '../logger.js'
-import { ERROR_NO_MODULES_FOUND } from '../messages.js'
+
+import type { ConfigFlags } from '@ts-for-gir/lib'
 
 const command = 'doc [modules..]'
 
 const description = 'The HTML documentation generator is not yet implemented, but feel free to implement it 🤗'
 
 const builder = (yargs: Argv) => {
-    return yargs
-        .option('modules', Config.generateOptions.modules)
-        .option('girDirectories', Config.generateOptions.girDirectories)
-        .option('outdir', Config.generateOptions.outdir)
-        .option('environments', Config.generateOptions.environments)
-        .option('ignore', Config.generateOptions.ignore)
-        .option('verbose', Config.generateOptions.verbose)
-        .option('ignoreVersionConflicts', Config.generateOptions.ignoreVersionConflicts)
-        .option('configName', Config.generateOptions.configName)
-        .example(examples)
+    const optionNames = Object.keys(Config.docOptions)
+    for (const optionName of optionNames) {
+        yargs = yargs.option(optionName, Config.docOptions[optionName])
+    }
+    return yargs.example(examples)
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/commands/generate.ts

@@ -4,39 +4,24 @@
 
 import { Argv } from 'yargs'
 
+import { ERROR_NO_MODULES_FOUND, Logger } from '@ts-for-gir/lib'
+import { GeneratorType } from '@ts-for-gir/generator-base'
 import { GenerationHandler } from '../generation-handler.js'
 import { Config } from '../config.js'
 import { ModuleLoader } from '../module-loader.js'
-import { ConfigFlags, GeneratorType } from '../types/index.js'
-import { Logger } from '../logger.js'
-import { ERROR_NO_MODULES_FOUND } from '../messages.js'
+
+import type { ConfigFlags } from '@ts-for-gir/lib'
 
 const command = 'generate [modules..]'
 
-const description = 'Generates .d.ts files from GIR for gjs or node-gtk'
+const description = 'Generates .d.ts files from GIR for GJS or node-gtk'
 
 const builder = (yargs: Argv) => {
-    return yargs
-        .option('modules', Config.generateOptions.modules)
-        .option('girDirectories', Config.generateOptions.girDirectories)
-        .option('outdir', Config.generateOptions.outdir)
-        .option('environments', Config.generateOptions.environments)
-        .option('ignore', Config.generateOptions.ignore)
-        .option('buildType', Config.generateOptions.buildType)
-        .option('moduleType', Config.generateOptions.moduleType)
-        .option('pretty', Config.generateOptions.pretty)
-        .option('verbose', Config.generateOptions.verbose)
-        .option('ignoreVersionConflicts', Config.generateOptions.ignoreVersionConflicts)
-        .option('print', Config.generateOptions.print)
-        .option('configName', Config.generateOptions.configName)
-        .option('useNamespace', Config.generateOptions.useNamespace)
-        .option('noComments', Config.generateOptions.noComments)
-        .option('noDebugComments', Config.generateOptions.noDebugComments)
-        .option('noCheck', Config.generateOptions.noCheck)
-        .option('noDOMLib', Config.generateOptions.noDOMLib)
-        .option('fixConflicts', Config.generateOptions.fixConflicts)
-        .option('gnomeShellTypes', Config.generateOptions.gnomeShellTypes)
-        .example(examples)
+    const optionNames = Object.keys(Config.generateOptions)
+    for (const optionName of optionNames) {
+        yargs = yargs.option(optionName, Config.generateOptions[optionName])
+    }
+    return yargs.example(examples)
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/commands/list.ts

@@ -6,22 +6,20 @@ import { Argv } from 'yargs'
 
 import { ModuleLoader } from '../module-loader.js'
 import { Config } from '../config.js'
-import { ResolveType, ConfigFlags } from '../types/index.js'
-import { Logger } from '../logger.js'
-import { ERROR_NO_MODULES_FOUND } from '../messages.js'
+import { Logger, ERROR_NO_MODULES_FOUND, ResolveType } from '@ts-for-gir/lib'
+
+import type { ConfigFlags } from '@ts-for-gir/lib'
 
 const command = 'list [modules..]'
 
 const description = 'Lists all available GIR modules'
 
 const builder = (yargs: Argv) => {
-    return yargs
-        .option('modules', Config.listOptions.modules)
-        .option('girDirectories', Config.listOptions.girDirectories)
-        .option('ignore', Config.listOptions.ignore)
-        .option('verbose', Config.listOptions.verbose)
-        .option('configName', Config.listOptions.configName)
-        .example(examples)
+    const optionNames = Object.keys(Config.listOptions)
+    for (const optionName of optionNames) {
+        yargs = yargs.option(optionName, Config.listOptions[optionName])
+    }
+    return yargs.example(examples)
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any