Sort prettier imports

Author: tobybessant

src/.prettierignore

@@ -6,4 +6,6 @@
 /tmp
 
 /.nx/cache
-/.nx/workspace-data
+/.nx/workspace-data
+
+pnpm-lock.yaml

src/.prettierrc.js

@@ -17,4 +17,5 @@ module.exports = {
   arrowParens: "avoid",
   singleQuote: false,
   trailingComma: "all",
+  plugins: ["prettier-plugin-organize-imports"],
 };

src/package-lock.json

@@ -48,7 +48,7 @@
     "jest-when": "^3.5.2",
     "nx": "19.3.1",
     "prettier": "^3.0.0",
-    "prettier-plugin-organize-imports": "^3.0.0",
+    "prettier-plugin-organize-imports": "^3.2.4",
     "ts-jest": "29.1.5",
     "ts-node": "10.9.2",
     "typescript": "~4.9.0"

src/package.json

@@ -1,12 +1,9 @@
 /* istanbul ignore file */
 export { generateLicenseFile } from "./lib/generateLicenseFile";
 export type { GenerateLicenseFileOptions } from "./lib/generateLicenseFile";
-
 export { getLicenseFileText } from "./lib/getLicenseFileText";
 export type { GetLicenseFileTextOptions } from "./lib/getLicenseFileText";
-
 export { getProjectLicenses } from "./lib/getProjectLicenses";
 export type { GetProjectLicensesOptions } from "./lib/getProjectLicenses";
-
 export type { LineEnding } from "./lib/lineEndings";
 export type { ILicense } from "./lib/models/license";

src/packages/generate-license-file/src/index.ts

@@ -1,6 +1,6 @@
 import { isLineEnding, LineEnding } from "../../lineEndings";
-import { Argument, MultipleChoiceOptions } from "./argument";
 import { CombinedConfig } from "../commands/main";
+import { Argument, MultipleChoiceOptions } from "./argument";
 
 export class Eol extends Argument<LineEnding | undefined> {
   private readonly choices: MultipleChoiceOptions<LineEnding | undefined> = {

src/packages/generate-license-file/src/lib/cli/args/eol.ts

@@ -1,7 +1,7 @@
 import { doesFileExist } from "../../utils/file.utils";
-import { Argument } from "./argument";
 import { CombinedConfig } from "../commands/main";
 import { spinner } from "../spinner";
+import { Argument } from "./argument";
 
 export class Inputs extends Argument<string[]> {
   private question = "Package.json location: ";

src/packages/generate-license-file/src/lib/cli/args/inputs.ts

@@ -1,6 +1,6 @@
 import { doesFileExist } from "../../utils/file.utils";
-import { Argument } from "./argument";
 import { CombinedConfig } from "../commands/main";
+import { Argument } from "./argument";
 
 export class Output extends Argument<string> {
   private question = "Output location: ";

src/packages/generate-license-file/src/lib/cli/args/output.ts

@@ -1,14 +1,14 @@
 import { Command } from "@commander-js/extra-typings";
-import { loadConfigFile } from "../config";
-import { Inputs } from "../args/inputs";
-import { Output } from "../args/output";
-import { Eol } from "../args/eol";
-import { LineEnding } from "../../lineEndings";
-import { generateLicenseFile } from "../../generateLicenseFile";
-import { spinner } from "../spinner";
 import { join } from "path";
+import { generateLicenseFile } from "../../generateLicenseFile";
+import { LineEnding } from "../../lineEndings";
 import logger from "../../utils/console.utils";
 import { readPackageJson } from "../../utils/packageJson.utils";
+import { Eol } from "../args/eol";
+import { Inputs } from "../args/inputs";
+import { Output } from "../args/output";
+import { loadConfigFile } from "../config";
+import { spinner } from "../spinner";
 
 export type CombinedConfig = {
   inputs?: string[];

src/packages/generate-license-file/src/lib/cli/commands/main.ts

@@ -1,4 +1,4 @@
-import { Options as CosmiconfigOptions, cosmiconfig } from "cosmiconfig";
+import { cosmiconfig, Options as CosmiconfigOptions } from "cosmiconfig";
 import { json5Parse } from "./parsers/json5";
 
 export type ConfigFile = { path: string; config: unknown };

src/packages/generate-license-file/src/lib/cli/config/configFile.ts

@@ -1,7 +1,7 @@
-import { ConfigSchema, parseSchema } from "./schema";
+import { dirname, isAbsolute, join } from "path";
 import { doesFileExist } from "../../utils/file.utils";
 import { ConfigFile, findConfig, loadConfig } from "./configFile";
-import { dirname, isAbsolute, join } from "path";
+import { ConfigSchema, parseSchema } from "./schema";
 
 export const loadConfigFile = async (path?: string): Promise<ConfigSchema> => {
   if (path && (await doesFileExist(path))) {

src/packages/generate-license-file/src/lib/cli/config/index.ts

@@ -1,8 +1,8 @@
 import { resolveLicenses } from "./internal/resolveLicenses";
 import { ILicense } from "./models/license";
 import { ExcludeOption } from "./options/exclude";
-import { IntersectionExpander } from "./options/optionsExpander";
 import { OmitVersionsOption } from "./options/omitVersions";
+import { IntersectionExpander } from "./options/optionsExpander";
 import { ReplaceOption } from "./options/replace";
 
 export type GetProjectLicensesOptions = IntersectionExpander<

src/packages/generate-license-file/src/lib/getProjectLicenses.ts

@@ -1,8 +1,8 @@
-import { resolveDependenciesForNpmProject } from "./resolveNpmDependencies";
-import { resolveDependenciesForPnpmProject } from "./resolvePnpmDependencies";
-import { dirname, join } from "path";
+import { dirname, join } from "path";
 import { doesFileExist } from "../../utils/file.utils";
 import { Dependency, LicenseContent } from "../resolveLicenses";
+import { resolveDependenciesForNpmProject } from "./resolveNpmDependencies";
+import { resolveDependenciesForPnpmProject } from "./resolvePnpmDependencies";
 
 type ResolveLicensesOptions = {
   replace?: Record<string, string>;

src/packages/generate-license-file/src/lib/internal/resolveDependencies/index.ts

@@ -1,9 +1,9 @@
 import Arborist, { Link, Node } from "@npmcli/arborist";
-import { resolveLicenseContent } from "../resolveLicenseContent";
 import { dirname, isAbsolute, join } from "path";
-import { Dependency, LicenseContent } from "../resolveLicenses";
-import { readPackageJson } from "../../utils/packageJson.utils";
 import logger from "../../utils/console.utils";
+import { readPackageJson } from "../../utils/packageJson.utils";
+import { resolveLicenseContent } from "../resolveLicenseContent";
+import { Dependency, LicenseContent } from "../resolveLicenses";
 
 type ResolveLicensesOptions = {
   replace?: Record<string, string>;

src/packages/generate-license-file/src/lib/internal/resolveDependencies/resolveNpmDependencies.ts

@@ -1,9 +1,9 @@
-import { resolveLicenseContent } from "../resolveLicenseContent";
-import { dirname, join } from "path";
+import { dirname, join } from "path";
+import logger from "../../utils/console.utils";
+import { readPackageJson } from "../../utils/packageJson.utils";
 import { getPnpmProjectDependencies, getPnpmVersion } from "../../utils/pnpmCli.utils";
+import { resolveLicenseContent } from "../resolveLicenseContent";
 import { Dependency, LicenseContent } from "../resolveLicenses";
-import { readPackageJson } from "../../utils/packageJson.utils";
-import logger from "../../utils/console.utils";
 
 type ResolveLicensesOptions = {
   replace?: Record<string, string>;

src/packages/generate-license-file/src/lib/internal/resolveDependencies/resolvePnpmDependencies.ts

@@ -1,9 +1,9 @@
 import { PackageJson } from "../../utils/packageJson.utils";
-import { packageJsonLicense } from "./packageJsonLicense";
 import { licenseFile } from "./licenseFile";
-import { spdxExpression } from "./spdxExpression";
+import { packageJsonLicense } from "./packageJsonLicense";
 import { replacementFile } from "./replacementFile";
 import { replacementHttp } from "./replacementHttp";
+import { spdxExpression } from "./spdxExpression";
 
 export interface ResolutionInputs {
   directory: string;

src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/index.ts

@@ -1,9 +1,8 @@
 import { glob } from "glob";
-import { relative } from "path";
-import { Resolution } from "./index";
+import { extname, relative } from "path";
 import logger from "../../utils/console.utils";
 import { readFile } from "../../utils/file.utils";
-import { extname } from "path";
+import { Resolution } from "./index";
 
 // This file specifically handles cases where we're able to find
 // a license file on disk that is a part of the package but it's

src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/licenseFile.ts

@@ -1,8 +1,8 @@
-import { doesFileExist, readFile } from "../../utils/file.utils";
-import logger from "../../utils/console.utils";
 import { join } from "path";
-import { Resolution } from "./index";
+import logger from "../../utils/console.utils";
+import { doesFileExist, readFile } from "../../utils/file.utils";
 import { PackageJson, PackageJsonLicense } from "../../utils/packageJson.utils";
+import { Resolution } from "./index";
 
 // This file specifically handles cases where the package.json links
 // to a license file that is on disk and is a part of the package.

src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/packageJsonLicense.ts

@@ -1,5 +1,5 @@
 import { ReplacementResolution } from ".";
-import { readFile, doesFileExist } from "../../utils/file.utils";
+import { doesFileExist, readFile } from "../../utils/file.utils";
 
 export const replacementFile: ReplacementResolution = async location => {
   if (!(await doesFileExist(location))) {

src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/replacementFile.ts

@@ -1,6 +1,6 @@
-import { Resolution } from "./index";
 import logger from "../../utils/console.utils";
 import { PackageJson, PackageJsonLicense } from "../../utils/packageJson.utils";
+import { Resolution } from "./index";
 
 // This file specifically handles cases where the package.json contains an SPDX license expression.
 

src/packages/generate-license-file/src/lib/internal/resolveLicenseContent/spdxExpression.ts

@@ -1,6 +1,6 @@
 // istanbul ignore file
 
-import { promisify } from "util";
 import { exec } from "child_process";
+import { promisify } from "util";
 
 export const execAsync = promisify(exec);

src/packages/generate-license-file/src/lib/utils/exec.utils.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
-import { execAsync } from "./exec.utils";
 import consoleUtils from "./console.utils";
+import { execAsync } from "./exec.utils";
 
 export type PnpmVersion = {
   major: number;

src/packages/generate-license-file/src/lib/utils/pnpmCli.utils.ts

@@ -1,7 +1,7 @@
 import { prompt } from "enquirer";
 import { Eol } from "../../../src/lib/cli/args/eol";
-import { lineEndings } from "../../../src/lib/lineEndings";
 import { CombinedConfig } from "../../../src/lib/cli/commands/main";
+import { lineEndings } from "../../../src/lib/lineEndings";
 
 jest.mock("enquirer", () => ({
   prompt: jest.fn(),

src/packages/generate-license-file/test/cli/args/eol.spec.ts

@@ -1,8 +1,8 @@
 import { prompt } from "enquirer";
 import { Inputs } from "../../../src/lib/cli/args/inputs";
+import { CombinedConfig } from "../../../src/lib/cli/commands/main";
 import { spinner } from "../../../src/lib/cli/spinner";
 import { doesFileExist } from "../../../src/lib/utils/file.utils";
-import { CombinedConfig } from "../../../src/lib/cli/commands/main";
 
 jest.mock("../../../src/lib/utils/file.utils", () => ({
   doesFileExist: jest.fn(),

src/packages/generate-license-file/test/cli/args/inputs.spec.ts

@@ -1,7 +1,7 @@
 import { prompt } from "enquirer";
 import { Output } from "../../../src/lib/cli/args/output";
-import { doesFileExist } from "../../../src/lib/utils/file.utils";
 import { CombinedConfig } from "../../../src/lib/cli/commands/main";
+import { doesFileExist } from "../../../src/lib/utils/file.utils";
 
 jest.mock("../../../src/lib/utils/file.utils", () => ({
   doesFileExist: jest.fn(),

src/packages/generate-license-file/test/cli/args/output.spec.ts

@@ -1,7 +1,7 @@
-import { GetLicenseFileTextOptions, getLicenseFileText } from "../src/lib/getLicenseFileText";
+import { when } from "jest-when";
+import { getLicenseFileText, GetLicenseFileTextOptions } from "../src/lib/getLicenseFileText";
 import { ResolvedLicense, resolveLicenses } from "../src/lib/internal/resolveLicenses";
 import { readFile } from "../src/lib/utils/file.utils";
-import { when } from "jest-when";
 
 jest.mock("../src/lib/internal/resolveLicenses", () => ({
   resolveLicenses: jest.fn(),

src/packages/generate-license-file/test/getLicenseFileText.spec.ts

@@ -1,4 +1,4 @@
-import { GetProjectLicensesOptions, getProjectLicenses } from "../src/lib/getProjectLicenses";
+import { getProjectLicenses, GetProjectLicensesOptions } from "../src/lib/getProjectLicenses";
 import { ResolvedLicense, resolveLicenses } from "../src/lib/internal/resolveLicenses";
 
 jest.mock("../src/lib/internal/resolveLicenses", () => ({

src/packages/generate-license-file/test/getProjectLicenses.spec.ts

@@ -1,9 +1,9 @@
-import { doesFileExist } from "../../../src/lib/utils/file.utils";
+import { when } from "jest-when";
+import { join } from "path";
+import { resolveDependencies } from "../../../src/lib/internal/resolveDependencies";
 import { resolveDependenciesForNpmProject } from "../../../src/lib/internal/resolveDependencies/resolveNpmDependencies";
 import { resolveDependenciesForPnpmProject } from "../../../src/lib/internal/resolveDependencies/resolvePnpmDependencies";
-import { when } from "jest-when";
-import { resolveDependencies } from "../../../src/lib/internal/resolveDependencies";
-import { join } from "path";
+import { doesFileExist } from "../../../src/lib/utils/file.utils";
 
 jest.mock("../../../src/lib/utils/file.utils", () => ({
   doesFileExist: jest.fn(),

src/packages/generate-license-file/test/internal/resolveDependencies/index.spec.ts

@@ -1,12 +1,12 @@
 import Arborist from "@npmcli/arborist";
+import { when } from "jest-when";
+import { join } from "path";
 import { resolveDependenciesForNpmProject } from "../../../src/lib/internal/resolveDependencies/resolveNpmDependencies";
 import { resolveLicenseContent } from "../../../src/lib/internal/resolveLicenseContent";
-import { when } from "jest-when";
 import { Dependency, LicenseContent } from "../../../src/lib/internal/resolveLicenses";
-import { PackageJson } from "../../../src/lib/utils/packageJson.utils";
-import { join } from "path";
-import { doesFileExist, readFile } from "../../../src/lib/utils/file.utils";
 import logger from "../../../src/lib/utils/console.utils";
+import { doesFileExist, readFile } from "../../../src/lib/utils/file.utils";
+import { PackageJson } from "../../../src/lib/utils/packageJson.utils";
 
 jest.mock("@npmcli/arborist", () => ({
   __esModule: true,

src/packages/generate-license-file/test/internal/resolveDependencies/resolveNpmDependencies.spec.ts

@@ -1,16 +1,16 @@
-import {
-  getPnpmVersion,
-  getPnpmProjectDependencies,
-  PnpmDependency,
-} from "../../../src/lib/utils/pnpmCli.utils";
+import { when } from "jest-when";
+import { join } from "path";
 import { resolveDependenciesForPnpmProject } from "../../../src/lib/internal/resolveDependencies/resolvePnpmDependencies";
 import { resolveLicenseContent } from "../../../src/lib/internal/resolveLicenseContent";
-import { when } from "jest-when";
+import { Dependency, LicenseContent } from "../../../src/lib/internal/resolveLicenses";
+import logger from "../../../src/lib/utils/console.utils";
 import { doesFileExist, readFile } from "../../../src/lib/utils/file.utils";
 import { PackageJson } from "../../../src/lib/utils/packageJson.utils";
-import logger from "../../../src/lib/utils/console.utils";
-import { join } from "path";
-import { Dependency, LicenseContent } from "../../../src/lib/internal/resolveLicenses";
+import {
+  getPnpmProjectDependencies,
+  getPnpmVersion,
+  PnpmDependency,
+} from "../../../src/lib/utils/pnpmCli.utils";
 
 jest.mock("../../../src/lib/utils/pnpmCli.utils", () => ({
   getPnpmVersion: jest.fn(),

src/packages/generate-license-file/test/internal/resolveDependencies/resolvePnpmDependencies.spec.ts

@@ -1,9 +1,9 @@
 import { when } from "jest-when";
 import { resolveLicenseContent } from "../../../src/lib/internal/resolveLicenseContent";
+import { licenseFile } from "../../../src/lib/internal/resolveLicenseContent/licenseFile";
+import { packageJsonLicense } from "../../../src/lib/internal/resolveLicenseContent/packageJsonLicense";
 import { replacementFile } from "../../../src/lib/internal/resolveLicenseContent/replacementFile";
 import { replacementHttp } from "../../../src/lib/internal/resolveLicenseContent/replacementHttp";
-import { packageJsonLicense } from "../../../src/lib/internal/resolveLicenseContent/packageJsonLicense";
-import { licenseFile } from "../../../src/lib/internal/resolveLicenseContent/licenseFile";
 import { spdxExpression } from "../../../src/lib/internal/resolveLicenseContent/spdxExpression";
 import { PackageJson } from "../../../src/lib/utils/packageJson.utils";
 

src/packages/generate-license-file/test/internal/resolveLicenseContent/index.spec.ts

@@ -1,11 +1,11 @@
 import { glob } from "glob";
+import { when } from "jest-when";
+import { ResolutionInputs } from "../../../src/lib/internal/resolveLicenseContent";
 import {
   extensionDenyList,
   licenseFile,
 } from "../../../src/lib/internal/resolveLicenseContent/licenseFile";
-import { when } from "jest-when";
 import { readFile } from "../../../src/lib/utils/file.utils";
-import { ResolutionInputs } from "../../../src/lib/internal/resolveLicenseContent";
 
 jest.mock("glob", () => ({
   glob: jest.fn(),

src/packages/generate-license-file/test/internal/resolveLicenseContent/licenseFile.spec.ts

@@ -1,9 +1,9 @@
+import { when } from "jest-when";
 import { join } from "path";
-import { packageJsonLicense } from "../../../src/lib/internal/resolveLicenseContent/packageJsonLicense";
 import { ResolutionInputs } from "../../../src/lib/internal/resolveLicenseContent";
-import { doesFileExist, readFile } from "../../../src/lib/utils/file.utils";
+import { packageJsonLicense } from "../../../src/lib/internal/resolveLicenseContent/packageJsonLicense";
 import logger from "../../../src/lib/utils/console.utils";
-import { when } from "jest-when";
+import { doesFileExist, readFile } from "../../../src/lib/utils/file.utils";
 
 jest.mock("../../../src/lib/utils/file.utils");
 jest.mock("../../../src/lib/utils/console.utils");

src/packages/generate-license-file/test/internal/resolveLicenseContent/packageJsonLicense.spec.ts

@@ -1,5 +1,5 @@
 import { replacementFile } from "../../../src/lib/internal/resolveLicenseContent/replacementFile";
-import { readFile, doesFileExist } from "../../../src/lib/utils/file.utils";
+import { doesFileExist, readFile } from "../../../src/lib/utils/file.utils";
 
 jest.mock("../../../src/lib/utils/file.utils");