@teambit/prettier 1.0.108 → 1.0.110

package/artifacts/preview/teambit_defender_prettier-preview.js

@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["teambit.defender/prettier-preview"]=t():e["teambit.defender/prettier-preview"]=t()}(self,(()=>(()=>{"use strict";var e={10133:(e,t,o)=>{var r={id:"teambit.defender/prettier@1.0.110",homepage:"https://bit.cloud/teambit/defender/prettier",exported:!0};function i(){const e=n(o(87363));return i=function(){return e},e}function n(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.Logo=void 0,i.__bit_component=r,n.__bit_component=r;const d=()=>i().default.createElement("div",{style:{height:"100%",display:"flex",justifyContent:"center"}},i().default.createElement("img",{style:{width:70},src:"https://static.bit.dev/brands/logo-prettier.svg"}));d.__bit_component=r,t.Logo=d},87363:e=>{e.exports=React}},t={};function o(r){var i=t[r];if(void 0!==i)return i.exports;var n=t[r]={exports:{}};return e[r](n,n.exports,o),n.exports}o.d=(e,t)=>{for(var r in t)o.o(t,r)&&!o.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},o.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var r={};return(()=>{o.r(r),o.d(r,{compositions:()=>e,compositions_metadata:()=>i,overview:()=>t});const e=[o(10133)],t=[],i={compositions:[{displayName:"Logo",identifier:"Logo"}]}})(),r})()));

package/dist/{preview-1703647408454.js → preview-1703733956734.js}

@@ -1,4 +1,4 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.defender_prettier@1.0.108/dist/prettier.composition.js';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.defender_prettier@1.0.110/dist/prettier.composition.js';
 ;
 
 export const compositions = [compositions_0];

package/package.json

@@ -1,30 +1,30 @@
 {
   "name": "@teambit/prettier",
-  "version": "1.0.108",
+  "version": "1.0.110",
   "homepage": "https://bit.cloud/teambit/defender/prettier",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.defender",
     "name": "prettier",
-    "version": "1.0.108"
+    "version": "1.0.110"
   },
   "dependencies": {
     "p-map-series": "2.1.0",
     "prettier": "2.3.2",
     "@teambit/harmony": "0.4.6",
-    "@teambit/envs": "1.0.108",
-    "@teambit/formatter": "1.0.108",
-    "@teambit/logger": "0.0.933",
-    "@teambit/cli": "0.0.840",
+    "@teambit/envs": "1.0.110",
+    "@teambit/formatter": "1.0.110",
+    "@teambit/logger": "0.0.935",
+    "@teambit/cli": "0.0.842",
     "@teambit/defender.prettier.config-mutator": "0.0.94",
-    "@teambit/workspace-config-files": "1.0.108"
+    "@teambit/workspace-config-files": "1.0.110"
   },
   "devDependencies": {
     "@types/prettier": "2.3.2",
     "@types/mocha": "9.1.0",
     "@types/jest": "^29.2.2",
     "@types/testing-library__jest-dom": "^5.9.5",
-    "@teambit/harmony.envs.core-aspect-env": "0.0.13"
+    "@teambit/harmony.envs.core-aspect-env": "0.0.15"
   },
   "peerDependencies": {
     "react": "^17.0.0 || ^18.0.0",
@@ -35,11 +35,15 @@
   "optionalDependencies": {},
   "peerDependenciesMeta": {},
   "exports": {
-    "node": {
-      "require": "./dist/index.js",
-      "import": "./dist/esm.mjs"
+    ".": {
+      "node": {
+        "require": "./dist/index.js",
+        "import": "./dist/esm.mjs"
+      },
+      "default": "./dist/index.js"
     },
-    "default": "./dist/index.js"
+    "./dist/*": "./dist/*",
+    "./artifacts/*": "./artifacts/*"
   },
   "private": false,
   "engines": {

package/index.ts

@@ -1,10 +0,0 @@
-import { PrettierAspect } from './prettier.aspect';
-
-export { PrettierAspect };
-export type {
-  PrettierMain,
-  PrettierOptions,
-  PrettierConfigTransformer,
-  PrettierConfigTransformContext,
-} from './prettier.main.runtime';
-export default PrettierAspect;

package/prettier.aspect.ts

@@ -1,5 +0,0 @@
-import { Aspect } from '@teambit/harmony';
-
-export const PrettierAspect = Aspect.create({
-  id: 'teambit.defender/prettier',
-});

package/prettier.formatter.ts

@@ -1,120 +0,0 @@
-import { AbstractVinyl } from '@teambit/legacy/dist/consumer/component/sources';
-import {
-  Formatter,
-  FormatterContext,
-  FormatResults,
-  FileFormatResult,
-  ComponentFormatResult,
-} from '@teambit/formatter';
-import PrettierLib, { Options as PrettierModuleOptions } from 'prettier';
-import mapSeries from 'p-map-series';
-import { Logger } from '@teambit/logger';
-import { ExecutionContext } from '@teambit/envs';
-// import { PrettierOptions } from './prettier.main.runtime';
-
-export class PrettierFormatter implements Formatter {
-  constructor(
-    private logger: Logger,
-
-    private options: PrettierModuleOptions,
-
-    /**
-     * reference to the prettier module.
-     */
-    private prettierModule = PrettierLib
-  ) {}
-
-  id = 'prettier-formatter';
-  displayName = 'Prettier';
-
-  displayConfig() {
-    return JSON.stringify(this.options, null, 2);
-  }
-
-  async format(context: FormatterContext): Promise<FormatResults> {
-    return this.run(context);
-  }
-
-  async formatSnippet(snippet: string, filePath?: string): Promise<string> {
-    let parser;
-
-    if (filePath) {
-      const ext = filePath.split('.').pop();
-      const supportInfo = this.prettierModule.getSupportInfo();
-      const language = supportInfo.languages.find((lang) => lang.extensions && lang.extensions.includes(`.${ext}`));
-
-      if (language) {
-        parser = language.parsers[0];
-      }
-    }
-
-    parser = parser || 'babel';
-
-    const optsWithFilePath = Object.assign({}, this.options, { filepath: filePath, parser });
-
-    return this.prettierModule.format(snippet, optsWithFilePath);
-  }
-
-  async check(context: FormatterContext): Promise<FormatResults> {
-    return this.run(context);
-  }
-
-  private async run(context: FormatterContext & ExecutionContext): Promise<FormatResults> {
-    const check = !!context.check;
-    const longProcessLogger = this.logger.createLongProcessLogger('formatting components', context.components.length);
-    const resultsP = mapSeries(context.components, async (component): Promise<ComponentFormatResult> => {
-      longProcessLogger.logProgress(component.id.toString());
-      const mergedOpts = this.getOptions(this.options, context);
-      const filesP = component.filesystem.files.map(async (file): Promise<FileFormatResult> => {
-        const sourceCode = file.contents.toString('utf8');
-        const optsWithFilePath = this.addFilePathToOpts(mergedOpts, file);
-        const checkFormatResults = await this.prettierModule.check(sourceCode, optsWithFilePath);
-        const formatResults = await this.prettierModule.format(sourceCode, optsWithFilePath);
-
-        const hasIssues = !checkFormatResults;
-        const newContent = typeof formatResults === 'string' && hasIssues ? formatResults : undefined;
-
-        if (!check && newContent) {
-          file.contents = Buffer.from(newContent);
-          await file.write(undefined, true);
-        }
-
-        return {
-          filePath: file.relative,
-          hasIssues,
-          newContent,
-        };
-      });
-
-      const files = await Promise.all(filesP);
-
-      return {
-        component,
-        results: files,
-      };
-    });
-
-    const results = await resultsP;
-
-    return {
-      results,
-      errors: [],
-    };
-  }
-
-  /**
-   * get options for eslint.
-   */
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  private getOptions(options: PrettierModuleOptions, context: FormatterContext): PrettierModuleOptions {
-    return options;
-  }
-
-  private addFilePathToOpts(options: PrettierModuleOptions, file: AbstractVinyl): PrettierModuleOptions {
-    return Object.assign({}, options, { filepath: file.path });
-  }
-
-  version() {
-    return this.prettierModule.version;
-  }
-}

package/prettier.main.runtime.ts

@@ -1,67 +0,0 @@
-import { MainRuntime } from '@teambit/cli';
-import { Options as PrettierModuleOptions } from 'prettier';
-import { Formatter, FormatterMain, FormatterOptions } from '@teambit/formatter';
-import { Logger, LoggerAspect, LoggerMain } from '@teambit/logger';
-import { PrettierConfigMutator } from '@teambit/defender.prettier.config-mutator';
-import { WorkspaceConfigFilesMain } from '@teambit/workspace-config-files';
-import { PrettierAspect } from './prettier.aspect';
-import { PrettierFormatter } from './prettier.formatter';
-
-export type PrettierOptions = {
-  /**
-   * formatter config for prettier.
-   */
-  config: PrettierModuleOptions;
-};
-
-export type PrettierConfigTransformContext = {
-  check: boolean;
-};
-
-export type PrettierConfigTransformer = (
-  config: PrettierConfigMutator,
-  context: PrettierConfigTransformContext
-) => PrettierConfigMutator;
-
-export class PrettierMain {
-  constructor(private logger: Logger) {}
-  /**
-   * create a prettier formatter instance.
-   * @param options prettier options.
-   * @param PrettierModule reference to an `prettier` module.
-   */
-  createFormatter(
-    formatterOptions: FormatterOptions = {},
-    options: PrettierOptions,
-    transformers: PrettierConfigTransformer[] = [],
-    PrettierModule?: any
-  ): Formatter {
-    const configMutator = new PrettierConfigMutator(options.config);
-    const transformerContext: PrettierConfigTransformContext = { check: !!formatterOptions.check };
-    const afterMutation = runTransformersWithContext(configMutator.clone(), transformers, transformerContext);
-    return new PrettierFormatter(this.logger, afterMutation.raw, PrettierModule);
-  }
-
-  static runtime = MainRuntime;
-
-  static dependencies = [LoggerAspect];
-
-  static async provider([loggerExt]: [LoggerMain, FormatterMain, WorkspaceConfigFilesMain]): Promise<PrettierMain> {
-    const logger = loggerExt.createLogger(PrettierAspect.id);
-    return new PrettierMain(logger);
-  }
-}
-
-PrettierAspect.addRuntime(PrettierMain);
-
-export function runTransformersWithContext(
-  config: PrettierConfigMutator,
-  transformers: PrettierConfigTransformer[] = [],
-  context: PrettierConfigTransformContext
-): PrettierConfigMutator {
-  if (!Array.isArray(transformers)) return config;
-  const newConfig = transformers.reduce((acc, transformer) => {
-    return transformer(acc, context);
-  }, config);
-  return newConfig;
-}