prettier 3.0.0-alpha.9-for-vscode → 3.0.1

package/internal/internal.mjs

@@ -16,7 +16,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 }) : x)(function(x) {
   if (typeof require !== "undefined")
     return require.apply(this, arguments);
-  throw new Error('Dynamic require of "' + x + '" is not supported');
+  throw Error('Dynamic require of "' + x + '" is not supported');
 });
 var __commonJS = (cb, mod) => function __require2() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
@@ -68,6 +68,29 @@ var require_cacheWrapper = __commonJS({
   }
 });
 
+// node_modules/cosmiconfig/dist/getPropertyByPath.js
+var require_getPropertyByPath = __commonJS({
+  "node_modules/cosmiconfig/dist/getPropertyByPath.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", {
+      value: true
+    });
+    exports.getPropertyByPath = getPropertyByPath;
+    function getPropertyByPath(source, path) {
+      if (typeof path === "string" && Object.prototype.hasOwnProperty.call(source, path)) {
+        return source[path];
+      }
+      const parsedPath = typeof path === "string" ? path.split(".") : path;
+      return parsedPath.reduce((previous, key) => {
+        if (previous === void 0) {
+          return previous;
+        }
+        return previous[key];
+      }, source);
+    }
+  }
+});
+
 // node_modules/import-fresh/node_modules/resolve-from/index.js
 var require_resolve_from = __commonJS({
   "node_modules/import-fresh/node_modules/resolve-from/index.js"(exports, module) {
@@ -5362,14 +5385,25 @@ var require_loaders = __commonJS({
       value: true
     });
     exports.loaders = void 0;
+    var _url = __require("url");
     var importFresh;
-    var loadJs = function loadJs2(filepath) {
+    var loadJsSync = function loadJsSync2(filepath) {
       if (importFresh === void 0) {
         importFresh = require_import_fresh();
       }
       const result = importFresh(filepath);
       return result;
     };
+    var loadJs = async function loadJs2(filepath) {
+      try {
+        const {
+          href
+        } = (0, _url.pathToFileURL)(filepath);
+        return (await import(href)).default;
+      } catch (error) {
+        return loadJsSync(filepath, "");
+      }
+    };
     var parseJson;
     var loadJson = function loadJson2(filepath, content) {
       if (parseJson === void 0) {
@@ -5400,6 +5434,7 @@ ${error.message}`;
     };
     var loaders = {
       loadJs,
+      loadJsSync,
       loadJson,
       loadYaml
     };
@@ -5407,29 +5442,6 @@ ${error.message}`;
   }
 });
 
-// node_modules/cosmiconfig/dist/getPropertyByPath.js
-var require_getPropertyByPath = __commonJS({
-  "node_modules/cosmiconfig/dist/getPropertyByPath.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", {
-      value: true
-    });
-    exports.getPropertyByPath = getPropertyByPath;
-    function getPropertyByPath(source, path) {
-      if (typeof path === "string" && Object.prototype.hasOwnProperty.call(source, path)) {
-        return source[path];
-      }
-      const parsedPath = typeof path === "string" ? path.split(".") : path;
-      return parsedPath.reduce((previous, key) => {
-        if (previous === void 0) {
-          return previous;
-        }
-        return previous[key];
-      }, source);
-    }
-  }
-});
-
 // node_modules/cosmiconfig/dist/ExplorerBase.js
 var require_ExplorerBase = __commonJS({
   "node_modules/cosmiconfig/dist/ExplorerBase.js"(exports) {
@@ -5440,14 +5452,14 @@ var require_ExplorerBase = __commonJS({
     exports.ExplorerBase = void 0;
     exports.getExtensionDescription = getExtensionDescription;
     var _path = _interopRequireDefault(__require("path"));
-    var _loaders = require_loaders();
     var _getPropertyByPath = require_getPropertyByPath();
+    var _loaders = require_loaders();
     function _interopRequireDefault(obj) {
       return obj && obj.__esModule ? obj : { default: obj };
     }
     var ExplorerBase = class {
       constructor(options) {
-        if (options.cache === true) {
+        if (options.cache) {
           this.loadCache = /* @__PURE__ */ new Map();
           this.searchCache = /* @__PURE__ */ new Map();
         }
@@ -5484,9 +5496,7 @@ var require_ExplorerBase = __commonJS({
       shouldSearchStopWithResult(result) {
         if (result === null)
           return false;
-        if (result.isEmpty && this.config.ignoreEmptySearchPlaces)
-          return false;
-        return true;
+        return !(result.isEmpty && this.config.ignoreEmptySearchPlaces);
       }
       nextDirectoryToSearch(currentDir, currentResult) {
         if (this.shouldSearchStopWithResult(currentResult)) {
@@ -5505,8 +5515,7 @@ var require_ExplorerBase = __commonJS({
       }
       getLoaderEntryForFile(filepath) {
         if (_path.default.basename(filepath) === "package.json") {
-          const loader2 = this.loadPackageProp.bind(this);
-          return loader2;
+          return this.loadPackageProp.bind(this);
         }
         const loaderKey = _path.default.extname(filepath) || "noExt";
         const loader = this.config.loaders[loaderKey];
@@ -5515,7 +5524,7 @@ var require_ExplorerBase = __commonJS({
         }
         return loader;
       }
-      loadedContentToCosmiconfigResult(filepath, loadedContent) {
+      loadedContentToCosmiconfigResult(filepath, loadedContent, forceProp) {
         if (loadedContent === null) {
           return null;
         }
@@ -5526,6 +5535,16 @@ var require_ExplorerBase = __commonJS({
             isEmpty: true
           };
         }
+        if (this.config.usePackagePropInConfigFiles || forceProp) {
+          loadedContent = (0, _getPropertyByPath.getPropertyByPath)(loadedContent, this.config.packageProp);
+        }
+        if (loadedContent === void 0) {
+          return {
+            filepath,
+            config: void 0,
+            isEmpty: true
+          };
+        }
         return {
           config: loadedContent,
           filepath
@@ -5695,9 +5714,13 @@ var require_Explorer = __commonJS({
         super(options);
       }
       async search(searchFrom = process.cwd()) {
-        const startDirectory = await (0, _getDirectory.getDirectory)(searchFrom);
-        const result = await this.searchFromDirectory(startDirectory);
-        return result;
+        if (this.config.metaConfigFilePath) {
+          const config = await this._loadFile(this.config.metaConfigFilePath, true);
+          if (config && !config.isEmpty) {
+            return config;
+          }
+        }
+        return await this.searchFromDirectory(await (0, _getDirectory.getDirectory)(searchFrom));
       }
       async searchFromDirectory(dir) {
         const absoluteDir = _path.default.resolve(process.cwd(), dir);
@@ -5707,8 +5730,7 @@ var require_Explorer = __commonJS({
           if (nextDir) {
             return this.searchFromDirectory(nextDir);
           }
-          const transformResult = await this.config.transform(result);
-          return transformResult;
+          return await this.config.transform(result);
         };
         if (this.searchCache) {
           return (0, _cacheWrapper.cacheWrapper)(this.searchCache, absoluteDir, run);
@@ -5718,7 +5740,7 @@ var require_Explorer = __commonJS({
       async searchDirectory(dir) {
         for await (const place of this.config.searchPlaces) {
           const placeResult = await this.loadSearchPlace(dir, place);
-          if (this.shouldSearchStopWithResult(placeResult) === true) {
+          if (this.shouldSearchStopWithResult(placeResult)) {
             return placeResult;
           }
         }
@@ -5727,8 +5749,7 @@ var require_Explorer = __commonJS({
       async loadSearchPlace(dir, place) {
         const filepath = _path.default.join(dir, place);
         const fileContents = await (0, _readFile.readFile)(filepath);
-        const result = await this.createCosmiconfigResult(filepath, fileContents);
-        return result;
+        return await this.createCosmiconfigResult(filepath, fileContents, false);
       }
       async loadFileContent(filepath, content) {
         if (content === null) {
@@ -5745,21 +5766,22 @@ var require_Explorer = __commonJS({
           throw e;
         }
       }
-      async createCosmiconfigResult(filepath, content) {
+      async createCosmiconfigResult(filepath, content, forceProp) {
         const fileContent = await this.loadFileContent(filepath, content);
-        const result = this.loadedContentToCosmiconfigResult(filepath, fileContent);
-        return result;
+        return this.loadedContentToCosmiconfigResult(filepath, fileContent, forceProp);
       }
       async load(filepath) {
+        return this._loadFile(filepath, false);
+      }
+      async _loadFile(filepath, forceProp) {
         this.validateFilePath(filepath);
         const absoluteFilePath = _path.default.resolve(process.cwd(), filepath);
         const runLoad = async () => {
           const fileContents = await (0, _readFile.readFile)(absoluteFilePath, {
             throwNotFound: true
           });
-          const result = await this.createCosmiconfigResult(absoluteFilePath, fileContents);
-          const transformResult = await this.config.transform(result);
-          return transformResult;
+          const result = await this.createCosmiconfigResult(absoluteFilePath, fileContents, forceProp);
+          return await this.config.transform(result);
         };
         if (this.loadCache) {
           return (0, _cacheWrapper.cacheWrapper)(this.loadCache, absoluteFilePath, runLoad);
@@ -5792,9 +5814,13 @@ var require_ExplorerSync = __commonJS({
         super(options);
       }
       searchSync(searchFrom = process.cwd()) {
-        const startDirectory = (0, _getDirectory.getDirectorySync)(searchFrom);
-        const result = this.searchFromDirectorySync(startDirectory);
-        return result;
+        if (this.config.metaConfigFilePath) {
+          const config = this._loadFileSync(this.config.metaConfigFilePath, true);
+          if (config && !config.isEmpty) {
+            return config;
+          }
+        }
+        return this.searchFromDirectorySync((0, _getDirectory.getDirectorySync)(searchFrom));
       }
       searchFromDirectorySync(dir) {
         const absoluteDir = _path.default.resolve(process.cwd(), dir);
@@ -5804,8 +5830,7 @@ var require_ExplorerSync = __commonJS({
           if (nextDir) {
             return this.searchFromDirectorySync(nextDir);
           }
-          const transformResult = this.config.transform(result);
-          return transformResult;
+          return this.config.transform(result);
         };
         if (this.searchCache) {
           return (0, _cacheWrapper.cacheWrapperSync)(this.searchCache, absoluteDir, run);
@@ -5815,7 +5840,7 @@ var require_ExplorerSync = __commonJS({
       searchDirectorySync(dir) {
         for (const place of this.config.searchPlaces) {
           const placeResult = this.loadSearchPlaceSync(dir, place);
-          if (this.shouldSearchStopWithResult(placeResult) === true) {
+          if (this.shouldSearchStopWithResult(placeResult)) {
             return placeResult;
           }
         }
@@ -5824,8 +5849,7 @@ var require_ExplorerSync = __commonJS({
       loadSearchPlaceSync(dir, place) {
         const filepath = _path.default.join(dir, place);
         const content = (0, _readFile.readFileSync)(filepath);
-        const result = this.createCosmiconfigResultSync(filepath, content);
-        return result;
+        return this.createCosmiconfigResultSync(filepath, content, false);
       }
       loadFileContentSync(filepath, content) {
         if (content === null) {
@@ -5842,21 +5866,22 @@ var require_ExplorerSync = __commonJS({
           throw e;
         }
       }
-      createCosmiconfigResultSync(filepath, content) {
+      createCosmiconfigResultSync(filepath, content, forceProp) {
         const fileContent = this.loadFileContentSync(filepath, content);
-        const result = this.loadedContentToCosmiconfigResult(filepath, fileContent);
-        return result;
+        return this.loadedContentToCosmiconfigResult(filepath, fileContent, forceProp);
       }
       loadSync(filepath) {
+        return this._loadFileSync(filepath, false);
+      }
+      _loadFileSync(filepath, forceProp) {
         this.validateFilePath(filepath);
         const absoluteFilePath = _path.default.resolve(process.cwd(), filepath);
         const runLoadSync = () => {
           const content = (0, _readFile.readFileSync)(absoluteFilePath, {
             throwNotFound: true
           });
-          const cosmiconfigResult = this.createCosmiconfigResultSync(absoluteFilePath, content);
-          const transformResult = this.config.transform(cosmiconfigResult);
-          return transformResult;
+          const cosmiconfigResult = this.createCosmiconfigResultSync(absoluteFilePath, content, forceProp);
+          return this.config.transform(cosmiconfigResult);
         };
         if (this.loadCache) {
           return (0, _cacheWrapper.cacheWrapperSync)(this.loadCache, absoluteFilePath, runLoadSync);
@@ -5887,7 +5912,7 @@ var require_dist = __commonJS({
     });
     exports.cosmiconfig = cosmiconfig2;
     exports.cosmiconfigSync = cosmiconfigSync;
-    exports.defaultLoaders = void 0;
+    exports.metaSearchPlaces = exports.defaultLoadersSync = exports.defaultLoaders = void 0;
     var _os = _interopRequireDefault(__require("os"));
     var _Explorer = require_Explorer();
     var _ExplorerSync = require_ExplorerSync();
@@ -5896,8 +5921,66 @@ var require_dist = __commonJS({
     function _interopRequireDefault(obj) {
       return obj && obj.__esModule ? obj : { default: obj };
     }
+    var metaSearchPlaces = ["package.json", ".config.json", ".config.yaml", ".config.yml", ".config.js", ".config.cjs", ".config.mjs"];
+    exports.metaSearchPlaces = metaSearchPlaces;
+    var defaultLoaders = Object.freeze({
+      ".mjs": _loaders.loaders.loadJs,
+      ".cjs": _loaders.loaders.loadJs,
+      ".js": _loaders.loaders.loadJs,
+      ".json": _loaders.loaders.loadJson,
+      ".yaml": _loaders.loaders.loadYaml,
+      ".yml": _loaders.loaders.loadYaml,
+      noExt: _loaders.loaders.loadYaml
+    });
+    exports.defaultLoaders = defaultLoaders;
+    var defaultLoadersSync = Object.freeze({
+      ".cjs": _loaders.loaders.loadJsSync,
+      ".js": _loaders.loaders.loadJsSync,
+      ".json": _loaders.loaders.loadJson,
+      ".yaml": _loaders.loaders.loadYaml,
+      ".yml": _loaders.loaders.loadYaml,
+      noExt: _loaders.loaders.loadYaml
+    });
+    exports.defaultLoadersSync = defaultLoadersSync;
+    var identity = function identity2(x) {
+      return x;
+    };
+    function replaceMetaPlaceholders(paths, moduleName) {
+      return paths.map((path) => path.replace("{name}", moduleName));
+    }
+    function getExplorerOptions(moduleName, options) {
+      var _metaConfig$config;
+      const metaExplorer = new _ExplorerSync.ExplorerSync({
+        packageProp: "cosmiconfig",
+        stopDir: process.cwd(),
+        searchPlaces: metaSearchPlaces,
+        ignoreEmptySearchPlaces: false,
+        usePackagePropInConfigFiles: true,
+        loaders: defaultLoaders,
+        transform: identity,
+        cache: true,
+        metaConfigFilePath: null
+      });
+      const metaConfig = metaExplorer.searchSync();
+      if (!metaConfig) {
+        return options;
+      }
+      if ((_metaConfig$config = metaConfig.config) !== null && _metaConfig$config !== void 0 && _metaConfig$config.loaders) {
+        throw new Error("Can not specify loaders in meta config file");
+      }
+      const overrideOptions = metaConfig.config ?? {};
+      if (overrideOptions.searchPlaces) {
+        overrideOptions.searchPlaces = replaceMetaPlaceholders(overrideOptions.searchPlaces, moduleName);
+      }
+      overrideOptions.metaConfigFilePath = metaConfig.filepath;
+      return {
+        ...options,
+        ...overrideOptions
+      };
+    }
     function cosmiconfig2(moduleName, options = {}) {
-      const normalizedOptions = normalizeOptions(moduleName, options);
+      const explorerOptions = getExplorerOptions(moduleName, options);
+      const normalizedOptions = normalizeOptions(moduleName, explorerOptions);
       const explorer = new _Explorer.Explorer(normalizedOptions);
       return {
         search: explorer.search.bind(explorer),
@@ -5908,7 +5991,8 @@ var require_dist = __commonJS({
       };
     }
     function cosmiconfigSync(moduleName, options = {}) {
-      const normalizedOptions = normalizeOptions(moduleName, options);
+      const explorerOptions = getExplorerOptions(moduleName, options);
+      const normalizedOptions = normalizeOptionsSync(moduleName, explorerOptions);
       const explorerSync = new _ExplorerSync.ExplorerSync(normalizedOptions);
       return {
         search: explorerSync.searchSync.bind(explorerSync),
@@ -5918,19 +6002,28 @@ var require_dist = __commonJS({
         clearCaches: explorerSync.clearCaches.bind(explorerSync)
       };
     }
-    var defaultLoaders = Object.freeze({
-      ".cjs": _loaders.loaders.loadJs,
-      ".js": _loaders.loaders.loadJs,
-      ".json": _loaders.loaders.loadJson,
-      ".yaml": _loaders.loaders.loadYaml,
-      ".yml": _loaders.loaders.loadYaml,
-      noExt: _loaders.loaders.loadYaml
-    });
-    exports.defaultLoaders = defaultLoaders;
-    var identity = function identity2(x) {
-      return x;
-    };
     function normalizeOptions(moduleName, options) {
+      const defaults = {
+        packageProp: moduleName,
+        searchPlaces: ["package.json", `.${moduleName}rc`, `.${moduleName}rc.json`, `.${moduleName}rc.yaml`, `.${moduleName}rc.yml`, `.${moduleName}rc.js`, `.${moduleName}rc.cjs`, `.${moduleName}rc.mjs`, `.config/${moduleName}rc`, `.config/${moduleName}rc.json`, `.config/${moduleName}rc.yaml`, `.config/${moduleName}rc.yml`, `.config/${moduleName}rc.js`, `.config/${moduleName}rc.cjs`, `.config/${moduleName}rc.mjs`, `${moduleName}.config.js`, `${moduleName}.config.cjs`, `${moduleName}.config.mjs`].filter(Boolean),
+        ignoreEmptySearchPlaces: true,
+        stopDir: _os.default.homedir(),
+        cache: true,
+        transform: identity,
+        loaders: defaultLoaders,
+        metaConfigFilePath: null
+      };
+      const normalizedOptions = {
+        ...defaults,
+        ...options,
+        loaders: {
+          ...defaults.loaders,
+          ...options.loaders
+        }
+      };
+      return normalizedOptions;
+    }
+    function normalizeOptionsSync(moduleName, options) {
       const defaults = {
         packageProp: moduleName,
         searchPlaces: ["package.json", `.${moduleName}rc`, `.${moduleName}rc.json`, `.${moduleName}rc.yaml`, `.${moduleName}rc.yml`, `.${moduleName}rc.js`, `.${moduleName}rc.cjs`, `.config/${moduleName}rc`, `.config/${moduleName}rc.json`, `.config/${moduleName}rc.yaml`, `.config/${moduleName}rc.yml`, `.config/${moduleName}rc.js`, `.config/${moduleName}rc.cjs`, `${moduleName}.config.js`, `${moduleName}.config.cjs`],
@@ -5938,7 +6031,8 @@ var require_dist = __commonJS({
         stopDir: _os.default.homedir(),
         cache: true,
         transform: identity,
-        loaders: defaultLoaders
+        loaders: defaultLoadersSync,
+        metaConfigFilePath: null
       };
       const normalizedOptions = {
         ...defaults,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "3.0.0-alpha.9-for-vscode",
+  "version": "3.0.1",
   "description": "Prettier is an opinionated code formatter",
   "bin": "./bin/prettier.cjs",
   "repository": "prettier/prettier",
@@ -143,9 +143,9 @@
     "doc.mjs",
     "index.cjs",
     "index.d.ts",
+    "index.d.ts",
     "index.mjs",
     "internal/cli.mjs",
-    "internal/internal.cjs",
     "internal/internal.mjs",
     "package.json",
     "plugins/acorn.d.ts",
@@ -190,8 +190,5 @@
     "standalone.d.ts",
     "standalone.js",
     "standalone.mjs"
-  ],
-  "scripts": {
-    "prepublishOnly": "node -e \"assert.equal(require('.').version, require('..').version)\""
-  }
-}
+  ]
+}