@postxl/generator 1.3.4 → 1.3.5

package/dist/utils/custom-blocks.d.ts

@@ -19,6 +19,11 @@
  * // @custom-start:myFeature
  * // your custom code here
  * // @custom-end:myFeature
+ *
+ * // The @ prefix is optional:
+ * // custom-start:myFeature
+ * // your custom code here
+ * // custom-end:myFeature
  * ```
  *
  * When the generator runs and would normally create merge conflicts,
@@ -33,6 +38,7 @@
  *
  * Supported formats:
  * - Line comments: // @custom-start or // @custom-start:name
+ * - Line comments (without @): // custom-start or // custom-start:name
  * - Block comments: Must be on a single line with both delimiters
  *
  * Note: Multi-line block comments are NOT supported. The opening and closing

package/dist/utils/custom-blocks.js

@@ -20,6 +20,11 @@
  * // @custom-start:myFeature
  * // your custom code here
  * // @custom-end:myFeature
+ *
+ * // The @ prefix is optional:
+ * // custom-start:myFeature
+ * // your custom code here
+ * // custom-end:myFeature
  * ```
  *
  * When the generator runs and would normally create merge conflicts,
@@ -41,6 +46,7 @@ exports.reconstructNonCustomContent = reconstructNonCustomContent;
  *
  * Supported formats:
  * - Line comments: // @custom-start or // @custom-start:name
+ * - Line comments (without @): // custom-start or // custom-start:name
  * - Block comments: Must be on a single line with both delimiters
  *
  * Note: Multi-line block comments are NOT supported. The opening and closing
@@ -48,12 +54,12 @@ exports.reconstructNonCustomContent = reconstructNonCustomContent;
  * and avoids ambiguity. See tests for examples.
  */
 exports.customBlockMarkers = {
-    // Matches: // @custom-start or // @custom-start:name
-    // Also supports: /* @custom-start */ or /* @custom-start:name */
-    startPattern: /^\s*(?:\/\/|\/\*)\s*@custom-start(?::([a-zA-Z0-9_-]+))?\s*(?:\*\/)?\s*$/,
-    // Matches: // @custom-end or // @custom-end:name
-    // Also supports: /* @custom-end */ or /* @custom-end:name */
-    endPattern: /^\s*(?:\/\/|\/\*)\s*@custom-end(?::([a-zA-Z0-9_-]+))?\s*(?:\*\/)?\s*$/,
+    // Matches: // @custom-start or // @custom-start:name or // custom-start or // custom-start:name
+    // Also supports: /* @custom-start */ or /* custom-start:name */
+    startPattern: /^\s*(?:\/\/|\/\*)\s*@?custom-start(?::([a-zA-Z0-9_-]+))?\s*(?:\*\/)?\s*$/,
+    // Matches: // @custom-end or // @custom-end:name or // custom-end or // custom-end:name
+    // Also supports: /* @custom-end */ or /* custom-end:name */
+    endPattern: /^\s*(?:\/\/|\/\*)\s*@?custom-end(?::([a-zA-Z0-9_-]+))?\s*(?:\*\/)?\s*$/,
 };
 /**
  * Number of non-empty lines to capture before/after a custom block for anchoring

package/dist/utils/sync-log-result.js

@@ -12,7 +12,7 @@ function logSyncResult(results, options = {}) {
         logger.log((0, utils_1.red)(results.error.message));
         logger.log('');
         logger.log((0, utils_1.bold)((0, utils_1.red)(`Files with unresolved merge conflicts (${results.error.filesWithConflicts.length}):`)));
-        for (const file of results.error.filesWithConflicts) {
+        for (const file of [...results.error.filesWithConflicts].sort()) {
             logger.log((0, utils_1.red)(` └── ${file}`));
         }
         logger.log('');
@@ -68,7 +68,8 @@ function logActionResult(action, paths, color, stateDescription, logger) {
     if (action === 'NoAction') {
         return;
     }
-    paths.forEach((path) => {
+    const sorted = [...paths].sort();
+    sorted.forEach((path) => {
         logger.log((0, utils_1.gray)(` └── ${path}`));
     });
 }
@@ -79,7 +80,7 @@ function logEjectedDiff({ ejectedFiles, showEjectedStats, files, logger, }) {
         }
     }
     else {
-        for (const path of ejectedFiles) {
+        for (const path of [...ejectedFiles].sort()) {
             logger.log((0, utils_1.bold)((0, utils_1.red)(`Ejected ${path}`)));
             const inputState = files[path].inputState;
             const contentSource = inputState.disk.state === 'hash' ? inputState.disk.content : '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "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.4.1",
-    "@postxl/utils": "^1.3.2"
+    "@postxl/schema": "^1.6.0",
+    "@postxl/utils": "^1.3.3"
   },
   "devDependencies": {
     "@types/diff": "8.0.0"