@postxl/generator 1.0.11 → 1.1.1

package/dist/utils/sync.js

@@ -123,7 +123,7 @@ async function sync({ vfs, lockFilePath, diskFilePath, force }) {
     const files = await getFilesStates({ vfs, lockFilePath, diskFilePath });
     // Check for unresolved merge conflicts before writing any files
     const filesWithConflicts = findFilesWithMergeConflicts(files);
-    if (filesWithConflicts.length > 0) {
+    if (filesWithConflicts.length > 0 && !force) {
         return {
             success: false,
             error: {

package/dist/utils/vfs.class.js

@@ -34,8 +34,8 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VirtualFileSystem = void 0;
-const fs = __importStar(require("fs/promises"));
 const minimatch_1 = require("minimatch");
+const fs = __importStar(require("node:fs/promises"));
 const utils_1 = require("@postxl/utils");
 const fs_utils_1 = require("./fs-utils");
 const Path = __importStar(require("./path"));
@@ -186,33 +186,54 @@ class VirtualFileSystem {
         this.#files.set(basePath, content.unwrap());
     }
     async #readDirectory({ diskPath, targetPath, filter, recursive, }) {
-        const entries = await utils_1.Result.fromPromise(() => fs.readdir(diskPath, { withFileTypes: true }), () => `Folder "${diskPath}" does not exist`);
-        if (entries.isErr()) {
-            throw new Error(entries.unwrapErr());
-        }
-        for (const entry of entries.unwrap()) {
+        const entries = await this.#readDirEntries(diskPath);
+        for (const entry of entries) {
             const entryName = Path.normalize(entry.name);
             const entryPath = Path.join(diskPath, entryName);
             const relativePath = Path.join(targetPath, entryName);
-            if (filter && !filter(relativePath)) {
+            if (this.#shouldSkipEntry(relativePath, filter)) {
                 continue;
             }
             if (recursive && entry.isDirectory()) {
-                await this.#readDirectory({ diskPath: entryPath, targetPath: relativePath, filter, recursive });
+                await this.#processDirectory(entryPath, relativePath, filter, recursive);
             }
             else if (entry.isFile()) {
-                // Skip files that don't match the pattern
-                if (!this.matchesPattern(relativePath)) {
-                    continue;
-                }
-                const content = await (0, fs_utils_1.readFile)(entryPath);
-                if (content.isErr()) {
-                    throw content.unwrapErr();
-                }
-                this.#files.set(relativePath, content.unwrap());
+                await this.#processFile(entryPath, relativePath);
             }
         }
     }
+    async #readDirEntries(diskPath) {
+        const entries = await utils_1.Result.fromPromise(() => fs.readdir(diskPath, { withFileTypes: true }), () => `Folder "${diskPath}" does not exist`);
+        if (entries.isErr()) {
+            throw new Error(entries.unwrapErr());
+        }
+        return entries.unwrap();
+    }
+    #shouldSkipEntry(relativePath, filter) {
+        return filter ? !filter(relativePath) : false;
+    }
+    async #processDirectory(diskPath, relativePath, filter, recursive) {
+        await this.#readDirectory({ diskPath, targetPath: relativePath, filter, recursive });
+    }
+    async #processFile(entryPath, relativePath) {
+        if (!this.matchesPattern(relativePath)) {
+            return;
+        }
+        const content = await (0, fs_utils_1.readFile)(entryPath);
+        if (content.isErr()) {
+            throw content.unwrapErr();
+        }
+        const finalPath = this.#resolveFinalPath(relativePath);
+        this.#files.set(finalPath, content.unwrap());
+    }
+    #resolveFinalPath(relativePath) {
+        // Handle .gitignore.template files: rename them to .gitignore
+        // This is necessary because npm/pnpm exclude .gitignore files from published packages
+        if (relativePath.endsWith('.gitignore.template')) {
+            return relativePath.replace(/\.gitignore\.template$/, '.gitignore');
+        }
+        return relativePath;
+    }
     /**
      * Transforms the content of all files using the provided function.
      * An optional filter function can be provided to select specific files.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "1.0.11",
+  "version": "1.1.1",
   "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.0.3",
-    "@postxl/utils": "^1.0.1"
+    "@postxl/schema": "^1.1.1",
+    "@postxl/utils": "^1.1.0"
   },
   "devDependencies": {
     "@types/diff": "8.0.0"