@postxl/generator 0.62.2 → 0.62.3

package/dist/generator.js

@@ -36,9 +36,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const generator_helper_1 = require("@prisma/generator-helper");
 const internals_1 = require("@prisma/internals");
-const prettier = __importStar(require("prettier"));
 const zod_1 = require("zod");
 const lock_1 = require("@postxl/lock");
+const prettier = __importStar(require("@postxl/prettier"));
 const react_generator_1 = require("./generators/enums/react.generator");
 const types_generator_1 = require("./generators/enums/types.generator");
 const businesslogic_actiontypes_generator_1 = require("./generators/indices/businesslogic-actiontypes.generator");
@@ -77,7 +77,6 @@ const stub_generator_1 = require("./generators/models/stub.generator");
 const types_generator_3 = require("./generators/models/types.generator");
 const meta_1 = require("./lib/meta");
 const types_1 = require("./lib/schema/types");
-const vfs_1 = require("./lib/vfs");
 const client_path_1 = require("./prisma/client-path");
 const parse_1 = require("./prisma/parse");
 // NOTE: This needs to match the constant used in the manager package.
@@ -165,15 +164,8 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
         if (root == undefined) {
             throw new Error(`Could not find lock file. Make sure you are running the generator in a project folder.`);
         }
-        const vfs = yield vfs_1.ExtendedVirtualFS.fromLockFile({
-            root,
-            namespace: GENERATOR_NAMESPACE,
-            // NOTE: We start with a clean slate every time we generate so we can detect
-            //       which files were not generated in the last run.
-            opts: { clean: true },
-        });
         const gitignore = lock_1.GitIgnoreUtils.getGitignore(root);
-        const generated = new vfs_1.ExtendedVirtualFS();
+        const generated = new prettier.ExtendedVirtualFS();
         // Generate Models
         for (const model of models) {
             const meta = (0, meta_1.getModelMetadata)({ model });
@@ -308,16 +300,15 @@ function generate({ models, enums, config, prismaClientPath, logger, }) {
         if (unfixedWarningCount === 0 && unfixableErrorCount === 0) {
             console.log(`LINT: All files linted successfully without warnings and errors!`);
         }
-        let prettierConfig = null;
-        const prettierConfigFilePath = yield prettier.resolveConfigFile(process.cwd());
-        if (prettierConfigFilePath) {
-            prettierConfig = yield prettier.resolveConfig(prettierConfigFilePath);
-        }
-        if (!prettierConfig) {
-            console.warn(`Could not find Prettier configuration! Formatting files with default config!`);
-        }
-        yield generated.formatUTF8Files(prettierConfig);
+        yield generated.formatUTF8Files(prettier.config);
         // -------------------------------------------------------------------------
+        const vfs = yield lock_1.VirtualFS.fromLockFile({
+            root,
+            namespace: GENERATOR_NAMESPACE,
+            // NOTE: We start with a clean slate every time we generate so we can detect
+            //       which files were not generated in the last run.
+            opts: { clean: true },
+        });
         // Merge with existing files.
         yield vfs.copy(generated, './');
         // Flush to disk.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.62.2",
+  "version": "0.62.3",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {
@@ -17,16 +17,12 @@
     "@faker-js/faker": "7.6.0",
     "@prisma/generator-helper": "5.8.1",
     "@prisma/internals": "5.8.1",
-    "@typescript-eslint/eslint-plugin": "6.10.0",
-    "@typescript-eslint/parser": "6.10.0",
-    "@typescript-eslint/utils": "6.10.0",
-    "eslint": "8.53.0",
-    "eslint-plugin-simple-import-sort": "10.0.0",
     "exceljs": "4.3.0",
     "fast-glob": "3.2.12",
     "remeda": "1.9.4",
     "zod": "3.21.4",
-    "@postxl/lock": "1.4.0"
+    "@postxl/lock": "1.4.1",
+    "@postxl/prettier": "0.0.1"
   },
   "devDependencies": {
     "@prisma/client": "5.8.1",
@@ -34,7 +30,6 @@
     "@types/jest": "29.5.0",
     "@types/node": "18.15.10",
     "jest": "29.7.0",
-    "prettier": "3.0.3",
     "prisma": "5.8.1",
     "ts-jest": "29.0.5",
     "ts-node": "10.9.1",
@@ -43,7 +38,6 @@
     "typescript": "5.2.2"
   },
   "peerDependencies": {
-    "prettier": "3.0.3",
     "prisma": "5.8.1"
   },
   "wallaby": {

package/dist/lib/vfs.d.ts

@@ -1,33 +0,0 @@
-import { ESLint } from 'eslint';
-import * as prettier from 'prettier';
-import { PathUtils, VirtualFS as BaseVirtualFS } from '@postxl/lock';
-type FileLintResult = {
-    fixableErrorCount: number;
-    errorCount: number;
-    fixableWarningCount: number;
-    warningCount: number;
-    message: string;
-};
-/**
- * A utility class that also contains formatting and linting functionality.
- */
-export declare class ExtendedVirtualFS extends BaseVirtualFS {
-    constructor();
-    /**
-     * Formats the file system using configuration in the given directory.
-     */
-    formatUTF8Files(options?: prettier.Options | null): Promise<void>;
-    /**
-     * Lints the file system using provided configuration and returns the result as a map.
-     *
-     * NOTE: If the `fix` option is set to `true` in `ESLint.Options`, the files will be modified in-place.
-     */
-    lintUTF8Files(options: ESLint.Options): Promise<{
-        totalFixableErrorCount: number;
-        totalErrorCount: number;
-        totalFixableWarningCount: number;
-        totalWarningCount: number;
-        results: Map<PathUtils.PosixPath, FileLintResult>;
-    }>;
-}
-export {};

package/dist/lib/vfs.js

@@ -1,157 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExtendedVirtualFS = void 0;
-const eslint_1 = require("eslint");
-const nodepath = __importStar(require("node:path"));
-const prettier = __importStar(require("prettier"));
-const lock_1 = require("@postxl/lock");
-/**
- * A utility class that also contains formatting and linting functionality.
- */
-class ExtendedVirtualFS extends lock_1.VirtualFS {
-    constructor() {
-        super();
-    }
-    /**
-     * Formats the file system using configuration in the given directory.
-     */
-    formatUTF8Files(options = null) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.transformUTF8Files((path, content) => __awaiter(this, void 0, void 0, function* () {
-                const ext = nodepath.extname(path);
-                let parser = undefined;
-                switch (ext) {
-                    case '.js':
-                    case '.jsx':
-                        parser = 'babel';
-                        break;
-                    case '.ts':
-                    case '.tsx':
-                        parser = 'typescript';
-                        break;
-                    case '.json':
-                        parser = 'json';
-                        break;
-                    case '.md':
-                        parser = 'markdown';
-                        break;
-                    case '.html':
-                        parser = 'html';
-                        break;
-                }
-                if (parser == null) {
-                    return content;
-                }
-                try {
-                    return yield prettier.format(content, Object.assign(Object.assign({}, options), { parser }));
-                }
-                catch (err) {
-                    console.error(`${content}\n\nFailed to format ${path}\n\n`);
-                    throw err;
-                }
-            }));
-        });
-    }
-    /**
-     * Lints the file system using provided configuration and returns the result as a map.
-     *
-     * NOTE: If the `fix` option is set to `true` in `ESLint.Options`, the files will be modified in-place.
-     */
-    lintUTF8Files(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const eslint = new eslint_1.ESLint(options);
-            const _results = new Map();
-            const formatter = yield eslint.loadFormatter('stylish');
-            yield this.transformUTF8Files((path, content) => __awaiter(this, void 0, void 0, function* () {
-                const ext = nodepath.extname(path);
-                switch (ext) {
-                    case '.js':
-                    case '.jsx':
-                    case '.ts':
-                    case '.tsx': {
-                        try {
-                            const results = yield eslint.lintText(content, { filePath: path });
-                            if (results.length !== 1) {
-                                // https://eslint.org/docs/latest/integrate/nodejs-api#return-value-1
-                                // NOTE: The docs explicitly state that "This is an array (despite there being
-                                //       only one lint result) in order to keep the interfaces between this and
-                                //       the eslint.lintFiles() method similar.".
-                                throw new Error(`Expected ESLint to return exactly one result, but got ${results.length} instead.`);
-                            }
-                            const message = yield formatter.format(results);
-                            const [result] = results;
-                            _results.set(path, {
-                                fixableErrorCount: result.fixableErrorCount,
-                                errorCount: result.errorCount,
-                                fixableWarningCount: result.fixableWarningCount,
-                                warningCount: result.warningCount,
-                                message,
-                            });
-                            if (result.output) {
-                                return result.output;
-                            }
-                            return content;
-                        }
-                        catch (err) {
-                            console.error(`${content}\n\nFailed to format ${path}\n\n`);
-                            throw err;
-                        }
-                    }
-                    default: {
-                        return content;
-                    }
-                }
-            }));
-            let totalFixableErrorCount = 0;
-            let totalErrorCount = 0;
-            let totalFixableWarningCount = 0;
-            let totalWarningCount = 0;
-            for (const result of _results.values()) {
-                totalFixableErrorCount += result.fixableErrorCount;
-                totalErrorCount += result.errorCount;
-                totalFixableWarningCount += result.fixableWarningCount;
-                totalWarningCount += result.warningCount;
-            }
-            return {
-                totalFixableErrorCount,
-                totalErrorCount,
-                totalFixableWarningCount,
-                totalWarningCount,
-                results: _results,
-            };
-        });
-    }
-}
-exports.ExtendedVirtualFS = ExtendedVirtualFS;