@postxl/generator 1.3.1 → 1.3.3

package/dist/generator-manager.class.js

@@ -140,20 +140,35 @@ class GeneratorManager {
         this.checkCircularDependencies();
         const generatorsSorted = this.topologicalSort();
         for (const generator of generatorsSorted) {
-            // Not all generators extend the context and hence do not need to return it.
-            // Therefore, if the generator does not return the context, we use the original context.
-            context = (await generator.register(context)) ?? context;
+            try {
+                // Not all generators extend the context and hence do not need to return it.
+                // Therefore, if the generator does not return the context, we use the original context.
+                context = (await generator.register(context)) ?? context;
+            }
+            catch (error) {
+                throw new Error(`Generator ${(0, utils_1.yellow)(generator.id)} failed during register phase: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
+            }
         }
         for (const generator of generatorsSorted) {
             if (!generator.afterRegistrations) {
                 continue;
             }
-            await generator.afterRegistrations(context);
+            try {
+                await generator.afterRegistrations(context);
+            }
+            catch (error) {
+                throw new Error(`Generator ${(0, utils_1.yellow)(generator.id)} failed during afterRegistrations phase: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
+            }
         }
         for (const generator of generatorsSorted) {
-            // Not all generators extend the context and hence do not need to return it.
-            // Therefore, if the generator does not return the context, we use the original context.
-            context = (await generator.generate(context)) ?? context;
+            try {
+                // Not all generators extend the context and hence do not need to return it.
+                // Therefore, if the generator does not return the context, we use the original context.
+                context = (await generator.generate(context)) ?? context;
+            }
+            catch (error) {
+                throw new Error(`Generator ${(0, utils_1.yellow)(generator.id)} failed during generate phase: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
+            }
         }
         return context;
     }

package/dist/utils/sync.js

@@ -154,6 +154,9 @@ async function sync({ vfs, lockFilePath, diskFilePath, force }) {
     await Promise.all(tasks);
     return { success: true, ...result };
 }
+const validFilesWithMergeConflictMarkers = new Set([
+    '/CLAUDE.md', // Contains instructions for resolving merge conflicts
+]);
 /**
  * Finds all files in the disk that contain unresolved merge conflict markers.
  *
@@ -163,7 +166,9 @@ async function sync({ vfs, lockFilePath, diskFilePath, force }) {
 function findFilesWithMergeConflicts(files) {
     const filesWithConflicts = [];
     for (const [filePath, { disk }] of files) {
-        if (disk.state === 'hash' && (0, merge_conflict_1.hasMergeConflictMarkers)(disk.content)) {
+        if (disk.state === 'hash' &&
+            (0, merge_conflict_1.hasMergeConflictMarkers)(disk.content) &&
+            !validFilesWithMergeConflictMarkers.has(filePath)) {
             filesWithConflicts.push(filePath);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "Core package that orchestrates the code generation of a PXL project",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -46,8 +46,8 @@
     "jszip": "3.10.1",
     "minimatch": "^10.1.1",
     "p-limit": "3.1.0",
-    "@postxl/schema": "^1.2.0",
-    "@postxl/utils": "^1.3.0"
+    "@postxl/schema": "^1.3.0",
+    "@postxl/utils": "^1.3.1"
   },
   "devDependencies": {
     "@types/diff": "8.0.0"