@ts-for-gir/generator-typescript 4.0.0-beta.25 → 4.0.0-beta.26

package/package.json

@@ -1,26 +1,18 @@
 {
   "name": "@ts-for-gir/generator-typescript",
-  "version": "4.0.0-beta.25",
+  "version": "4.0.0-beta.26",
   "description": "TypeScript type definition generator for ts-for-gir",
-  "module": "lib/index.js",
-  "main": "lib/index.js",
+  "main": "src/index.ts",
+  "module": "src/index.ts",
   "type": "module",
   "engines": {
     "node": ">=18"
   },
   "exports": {
-    ".": {
-      "types": "./lib/index.d.ts",
-      "import": "./lib/index.js"
-    }
+    ".": "./src/index.ts"
   },
   "scripts": {
-    "build": "yarn lint && yarn build:ts",
-    "build:ts": "tsc",
-    "clear": "yarn clear:build",
-    "clear:build": "rimraf ./lib",
-    "watch": "yarn build:ts --watch",
-    "lint": "eslint . --fix"
+    "check": "tsc --noEmit"
   },
   "repository": {
     "type": "git",
@@ -28,9 +20,7 @@
   },
   "author": "Pascal Garber <pascal@artandcode.studio>",
   "files": [
-    "lib",
-    "templates",
-    "packages.xml"
+    "src"
   ],
   "license": "Apache-2.0",
   "bugs": {
@@ -42,20 +32,15 @@
   ],
   "devDependencies": {
     "@types/ejs": "^3.1.5",
-    "@types/node": "^24.0.1",
+    "@types/node": "^24.2.1",
     "@types/xml2js": "^0.4.14",
-    "@typescript-eslint/eslint-plugin": "^8.34.0",
-    "@typescript-eslint/parser": "^8.34.0",
-    "eslint": "^9.29.0",
-    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-prettier": "^5.4.1",
-    "prettier": "^3.5.3",
-    "rimraf": "^6.0.1",
-    "typescript": "^5.8.3"
+    "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@ts-for-gir/generator-base": "^4.0.0-beta.25",
-    "@ts-for-gir/lib": "^4.0.0-beta.25",
+    "@gi.ts/parser": "^4.0.0-beta.26",
+    "@ts-for-gir/generator-base": "^4.0.0-beta.26",
+    "@ts-for-gir/lib": "^4.0.0-beta.26",
+    "@ts-for-gir/templates": "^4.0.0-beta.26",
     "ejs": "^3.1.10",
     "xml2js": "^0.6.2"
   }

package/src/index.ts

@@ -0,0 +1,4 @@
+export { ModuleGenerator, ModuleGeneratorFormat } from "./module-generator.ts";
+export { NpmPackage } from "./npm-package.ts";
+export { TemplateProcessor } from "./template-processor.ts";
+export { TypeDefinitionGenerator } from "./type-definition-generator.ts";

package/src/module-generator-example.ts

@@ -0,0 +1,68 @@
+/**
+ * Example usage of the refactored ModuleGenerator
+ *
+ * This demonstrates how the unified ModuleGenerator now incorporates
+ * functionality from DtsGenerator and DtsModuleGenerator
+ */
+
+import type { GirModule, NSRegistry, OptionsGeneration } from "@ts-for-gir/lib";
+import { ModuleGenerator } from "./module-generator.ts";
+
+// Example: Using ModuleGenerator with different output formats
+async function generateTypeDefinitions(girModule: GirModule, config: OptionsGeneration, registry: NSRegistry) {
+	// Create a ModuleGenerator instance
+	const generator = new ModuleGenerator(girModule, config, registry);
+
+	// 1. Generate as string array (default behavior)
+	const arrayOutput = await generator.generateModule(girModule);
+	console.log("String array output:", arrayOutput);
+
+	// 2. Generate as single string (DtsGenerator compatibility)
+	const stringOutput = await generator.generateModuleString(girModule);
+	console.log("String output:", stringOutput);
+
+	// 3. Generate as module declaration (DtsModuleGenerator compatibility)
+	const moduleDeclaration = await generator.generateModuleDeclaration(girModule);
+	console.log("Module declaration output:", moduleDeclaration);
+
+	// 4. Generate namespace as string
+	const namespaceString = await generator.generateNamespaceAsString(girModule);
+	console.log("Namespace string output:", namespaceString);
+
+	// 5. The AdvancedVariants feature is automatically applied
+	// when generating GLib or GObject modules (unless disabled with noAdvancedVariants option)
+	if (girModule.namespace === "GLib" && !config.noAdvancedVariants) {
+		console.log("GLib module will include advanced variant type definitions");
+	}
+	if (girModule.namespace === "GObject") {
+		console.log("GObject module will include registerClass overrides");
+	}
+}
+
+// Example: Migrating from DtsGenerator
+function migrateFromDtsGenerator(girModule: GirModule, config: OptionsGeneration, registry: NSRegistry) {
+	// Before (using DtsGenerator):
+	// const generator = new DtsGenerator(girModule, config);
+	// const output = await generator.generateNamespace(girModule);
+
+	// After (using ModuleGenerator):
+	const generator = new ModuleGenerator(girModule, config, registry);
+	const output = generator.generateNamespaceAsString(girModule);
+
+	return output;
+}
+
+// Example: Migrating from DtsModuleGenerator
+function migrateFromDtsModuleGenerator(girModule: GirModule, config: OptionsGeneration, registry: NSRegistry) {
+	// Before (using DtsModuleGenerator):
+	// const generator = new DtsModuleGenerator(girModule, config);
+	// const output = await generator.generateNamespace(girModule);
+
+	// After (using ModuleGenerator):
+	const generator = new ModuleGenerator(girModule, config, registry);
+	const output = generator.generateModuleDeclaration(girModule);
+
+	return output;
+}
+
+export { generateTypeDefinitions, migrateFromDtsGenerator, migrateFromDtsModuleGenerator };