@langri-sha/projen-project 0.9.0 → 0.10.0

package/src/index.ts

@@ -1,9 +1,10 @@
+import * as path from 'node:path'
+
 import {
   Project as BaseProject,
   type ProjectOptions as BaseProjectOptions,
   IgnoreFile,
   IgnoreFileOptions,
-  YamlFile,
   javascript,
 } from 'projen'
 
@@ -30,8 +31,16 @@ import {
 import { Beachball, BeachballOptions } from '@langri-sha/projen-beachball'
 import { License } from '@langri-sha/projen-license'
 
-import { ProjenrcFile } from './lib/index.js'
+import { NodePackage, NodePackageOptions, ProjenrcFile } from './lib/index.js'
 import { JestConfig, JestConfigOptions } from '@langri-sha/projen-jest-config'
+import { Prettier, PrettierOptions } from '@langri-sha/projen-prettier'
+import { ESLint, ESLintOptions } from '@langri-sha/projen-eslint'
+import { LintStaged, LintStagedOptions } from '@langri-sha/projen-lint-staged'
+import { Babel, BabelOptions } from '@langri-sha/projen-babel'
+import {
+  PnpmWorkspace,
+  PnpmWorkspaceOptions,
+} from '@langri-sha/projen-pnpm-workspace'
 
 export * from '@langri-sha/projen-typescript-config'
 
@@ -40,32 +49,47 @@ export interface ProjectOptions
   /*
    * Pass in to set up Beachball.
    */
-  beachballOptions?: BeachballOptions
+  babel?: BabelOptions
+
+  /*
+   * Pass in to set up Beachball.
+   */
+  beachball?: BeachballOptions
 
   /*
    * Pass in to set up Beachball.
    */
-  codeownersOptions?: CodeownersOptions
+  codeowners?: CodeownersOptions
 
   /**
    * EditorConfig options.
    */
-  editorConfigOptions?: EditorConfigOptions
+  editorConfig?: EditorConfigOptions
+
+  /**
+   * Pass in to configure ESLint.
+   */
+  eslint?: ESLintOptions
 
   /**
    * Husky options.
    */
-  huskyOptions?: HuskyOptions
+  husky?: HuskyOptions
 
   /**
    * Configures Jest, when provided.
    */
-  jestConfigOptions?: JestConfigOptions
+  jestConfig?: JestConfigOptions
+
+  /**
+   * Configures `lint-staged`, when provided.
+   */
+  lintStaged?: LintStagedOptions
 
   /*
    * Options for the linting synthesized files.
    */
-  lintSynthesizedOptions?: LintSynthesizedOptions
+  lintSynthesized?: LintSynthesizedOptions
 
   /**
    * Package configuration options.
@@ -77,43 +101,53 @@ export interface ProjectOptions
      * @default "Current full year"
      */
     copyrightYear?: string
-  } & javascript.NodePackageOptions
+  } & NodePackageOptions
+
+  /*
+   * PNPM workspaces to generate, if provided.
+   */
+  pnpmWorkspace?: PnpmWorkspaceOptions
+
+  /**
+   * Pass in to configure Prettier.
+   */
+  prettier?: PrettierOptions
 
   /**
    * Pass in to configure NPM ignore options.
    */
-  npmIgnoreOptions?: IgnoreFileOptions
+  npmIgnore?: IgnoreFileOptions
 
   /*
    * Pass in to configure Renovate.
    */
-  renovateOptions?: RenovateOptions
+  renovate?: RenovateOptions
 
   /**
    * TypeScript configuration options.
    */
-  typeScriptConfigOptions?: TypeScriptConfigOptions
+  typeScriptConfig?: TypeScriptConfigOptions
 
   /*
    * Whether to use Terrafom.
    */
   withTerraform?: boolean
-
-  /*
-   * PNPM workspaces to generate.
-   */
-  workspaces?: string[]
 }
 
 export class Project extends BaseProject {
+  babel?: Babel
   beachball?: Beachball
   codeowners?: Codeowners
   editorConfig?: EditorConfig
+  eslint?: ESLint
   husky?: Husky
   jestConfig?: JestConfig
   license?: License
+  lintStaged?: LintStaged
   npmIgnore?: IgnoreFile
-  package?: javascript.NodePackage
+  package?: NodePackage
+  pnpmWorkspace?: PnpmWorkspace
+  prettier?: Prettier
   projenrc?: ProjenrcFile
   renovate?: Renovate
   typeScriptConfig?: TypeScriptConfig
@@ -133,9 +167,9 @@ export class Project extends BaseProject {
     this.tasks.removeTask('pre-compile')
     this.tasks.removeTask('watch')
 
-    this.#configureProjenrc()
     this.#configurePackage(options)
     this.#configureTypeScript(options)
+    this.#configureProjenrc()
 
     if (this.parent) {
       this.tasks.tryFind('default')?.reset()
@@ -143,61 +177,90 @@ export class Project extends BaseProject {
       this.tasks.tryFind('install:ci')?.reset()
     }
 
+    this.#configureESLint(options)
+    this.#configurePrettier(options)
+
+    this.#configureBabel(options)
     this.#configureBeachball(options)
     this.#configureCodeowners(options)
     this.#configureEditorConfig(options)
     this.#configureHusky(options)
     this.#configureJestConfig(options)
     this.#configureLicense(options)
+    this.#configureLintStaged(options)
     this.#configureLintSynthesized(options)
     this.#configureNpmIgnore(options)
+    this.#configurePnpmWorkspace(options)
     this.#configureRenovate(options)
-    this.#createPnpmWorkspaces(options)
+  }
+
+  override preSynthesize(): void {
+    super.preSynthesize()
+
+    this.#populateTypeScriptProjectReferencesFromDependencies()
+  }
+
+  get allSubprojects(): BaseProject[] {
+    return this.root.node
+      .findAll(0)
+      .filter((node) => node !== this.root)
+      .filter((node): node is BaseProject => node instanceof BaseProject)
+  }
+
+  get allSubprojectsKind(): Project[] {
+    return this.allSubprojects.filter(
+      (project): project is Project => project instanceof Project,
+    )
   }
 
   /**
    * Add a subproject.
    */
-  addSubproject(projectOptions: ProjectOptions) {
-    return new Project({
+  addSubproject(
+    projectOptions: ProjectOptions,
+    ...compose: Array<(project: Project) => void>
+  ) {
+    const project = new Project({
       parent: this,
       ...projectOptions,
     })
+
+    for (const callback of compose) {
+      callback(project)
+    }
+
+    return project
   }
 
   /**
    * Find a project by it's name, e.g. `@acme/some`.
    */
-  findSubproject(name: string): Project {
-    const subprojects: Array<BaseProject> = []
-
-    const addSubproject = (project: BaseProject) => {
-      for (const subproject of project.subprojects) {
-        subprojects.push(subproject)
+  findSubproject(name: string): Project | undefined {
+    return this.allSubprojectsKind.find((project) => project.name === name)
+  }
 
-        if (subproject.subprojects.length) {
-          addSubproject(subproject)
-        }
-      }
+  #configureBabel({ babel }: ProjectOptions) {
+    if (!babel) {
+      return
     }
 
-    addSubproject(this.root)
-
-    const result = subprojects.find((subproject) => subproject.name === name)
-
-    if (result instanceof Project) {
-      return result
+    const defaults: BabelOptions = {
+      options: {
+        presets: ['@langri-sha/babel-preset'],
+      },
     }
 
-    throw new Error(`Cannot find subproject ${name}`)
+    this.babel = new Babel(this, deepMerge(defaults, babel))
+
+    this.typeScriptConfig?.addFile(this.babel.path)
   }
 
-  #configureBeachball({ beachballOptions }: ProjectOptions) {
-    if (!beachballOptions || this.parent) {
+  #configureBeachball({ beachball }: ProjectOptions) {
+    if (!beachball || this.parent) {
       return
     }
 
-    const options = deepMerge(beachballOptions, {
+    const options = deepMerge(beachball, {
       branch: 'origin/main',
       gitTags: false,
       ignorePatterns: [
@@ -211,11 +274,12 @@ export class Project extends BaseProject {
 
     this.beachball = new Beachball(this, options)
 
+    this.prettier?.ignore.addPatterns('CHANGELOG.md')
     this.package?.addDevDeps('beachball@2.43.1')
     this.typeScriptConfig?.addFile('beachball.config.js')
   }
 
-  #configureCodeowners({ codeownersOptions }: ProjectOptions) {
+  #configureCodeowners({ codeowners: codeownersOptions }: ProjectOptions) {
     if (!codeownersOptions) {
       return
     }
@@ -223,7 +287,9 @@ export class Project extends BaseProject {
     this.codeowners = new Codeowners(this, codeownersOptions)
   }
 
-  #configureEditorConfig({ editorConfigOptions }: ProjectOptions) {
+  #configureEditorConfig({
+    editorConfig: editorConfigOptions,
+  }: ProjectOptions) {
     if (!editorConfigOptions || this.parent) {
       return
     }
@@ -246,9 +312,31 @@ export class Project extends BaseProject {
       this,
       deepMerge(editorConfigOptions ?? {}, defaults),
     )
+
+    this.prettier?.ignore.addPatterns('!.editorconfig')
+  }
+
+  #configureESLint({ eslint: eslintOptions }: ProjectOptions) {
+    if (!eslintOptions) {
+      return
+    }
+
+    const defaults: ESLintOptions = {
+      filename: 'eslint.config.mjs',
+      ignorePatterns: ['.*'],
+      extends: '@langri-sha/eslint-config',
+    }
+
+    this.eslint = new ESLint(this, deepMerge(defaults, eslintOptions))
+
+    if (this.projenrc?.filePath) {
+      this.eslint.ignorePatterns.push(`!${this.projenrc.filePath}`)
+    }
+
+    this.typeScriptConfig?.addFile(this.eslint.path)
   }
 
-  #configureHusky({ huskyOptions }: ProjectOptions) {
+  #configureHusky({ husky: huskyOptions }: ProjectOptions) {
     if (!huskyOptions || this.parent) {
       return
     }
@@ -260,12 +348,14 @@ export class Project extends BaseProject {
     this.tryFindObjectFile('package.json')?.addDeletionOverride('pnpm')
   }
 
-  #configureJestConfig({ jestConfigOptions }: ProjectOptions) {
+  #configureJestConfig({ jestConfig: jestConfigOptions }: ProjectOptions) {
     if (!jestConfigOptions || this.parent) {
       return
     }
 
     this.jestConfig = new JestConfig(this, jestConfigOptions)
+
+    this.typeScriptConfig?.addFile(this.jestConfig.path)
   }
 
   #configureLicense({ package: pkg }: ProjectOptions) {
@@ -292,33 +382,59 @@ export class Project extends BaseProject {
     })
   }
 
-  #configureLintSynthesized({ lintSynthesizedOptions }: ProjectOptions) {
-    new LintSynthesized(
+  #configureLintStaged({ lintStaged: lintStagedOptions }: ProjectOptions) {
+    if (!lintStagedOptions) {
+      return
+    }
+
+    const defaults: LintStagedOptions = {
+      filename: 'lint-staged.config.mjs',
+      extends: '@langri-sha/lint-staged',
+    }
+
+    this.lintStaged = new LintStaged(
       this,
-      lintSynthesizedOptions ?? {
-        'package.json': 'pnpx sort-package-json',
-        '*.{js,jsx,ts,tsx}': 'pnpm eslint --fix',
-        '*': 'pnpm prettier --write --ignore-unknown',
-      },
+      deepMerge(defaults, lintStagedOptions),
     )
+
+    this.typeScriptConfig?.addFile(this.lintStaged!.path)
   }
 
-  #configureNpmIgnore({ jestConfigOptions, npmIgnoreOptions }: ProjectOptions) {
-    if (!npmIgnoreOptions) {
+  #configureLintSynthesized({ lintSynthesized }: ProjectOptions) {
+    if (!lintSynthesized) {
+      return
+    }
+
+    const defaults: LintSynthesizedOptions = {
+      'package.json': 'pnpx sort-package-json',
+      '*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}': 'pnpm eslint --fix',
+      '*': 'pnpm prettier --write --ignore-unknown',
+    }
+
+    new LintSynthesized(this, deepMerge(defaults, lintSynthesized))
+  }
+
+  #configureNpmIgnore({
+    typeScriptConfig,
+    jestConfig,
+    npmIgnore,
+  }: ProjectOptions) {
+    if (!npmIgnore) {
       return
     }
 
     const defaults: IgnoreFileOptions = {
       ignorePatterns: [
-        ...(jestConfigOptions ? ['*.test.*', '.*', '__snapshots__/'] : []),
-        'tsconfig*.json',
+        '.*',
+        ...(jestConfig ? ['*.test.*', '__snapshots__/'] : []),
+        ...(typeScriptConfig ? ['tsconfig*.json'] : []),
       ],
     }
 
     this.npmIgnore = new IgnoreFile(
       this,
       '.npmignore',
-      deepMerge(defaults, npmIgnoreOptions),
+      deepMerge(defaults, npmIgnore),
     )
   }
 
@@ -327,17 +443,16 @@ export class Project extends BaseProject {
       return
     }
 
-    const defaults: javascript.NodePackageOptions = {
+    const defaults: NodePackageOptions = {
       entrypoint: 'src/index.ts',
       packageManager: javascript.NodePackageManager.PNPM,
-      minNodeVersion: '20.12.0',
     }
 
-    this.package = new javascript.NodePackage(this, deepMerge(defaults, pkg))
+    this.package = new NodePackage(this, deepMerge(defaults, pkg))
 
     if (!this.parent) {
       this.package.addDevDeps('@langri-sha/projen-project@*')
-      this.package.addDevDeps('projen@0.81.15')
+      this.package.addDevDeps('projen@0.82.4')
     }
 
     this.package.removeScript('start')
@@ -348,11 +463,52 @@ export class Project extends BaseProject {
     }
   }
 
+  #configurePnpmWorkspace({ pnpmWorkspace }: ProjectOptions) {
+    if (!pnpmWorkspace) {
+      return
+    }
+
+    this.pnpmWorkspace = new PnpmWorkspace(this, pnpmWorkspace)
+
+    for (const workspace of pnpmWorkspace.packages ?? []) {
+      this.prettier?.ignore.exclude(`${workspace}/lib/`)
+      this.eslint?.ignorePatterns.push(`${workspace}/lib/`)
+    }
+  }
+
+  #configurePrettier({ prettier: prettierOptions }: ProjectOptions) {
+    if (!prettierOptions || this.parent) {
+      return
+    }
+
+    const defaults: PrettierOptions = {
+      filename: 'prettier.config.mjs',
+      extends: '@langri-sha/prettier',
+      ignorePatterns: ['.*'],
+    }
+
+    this.prettier = new Prettier(this, deepMerge(defaults, prettierOptions))
+
+    if (this.projenrc?.filePath) {
+      this.prettier.ignore.include(this.projenrc.filePath)
+    }
+
+    if (this.package?.packageManager === javascript.NodePackageManager.PNPM) {
+      this.prettier.ignore.addPatterns('pnpm-lock.yaml')
+    }
+
+    this.typeScriptConfig?.addFile(this.prettier!.path)
+  }
+
   #configureProjenrc() {
     this.projenrc = new ProjenrcFile(this, {})
+
+    if (!this.parent) {
+      this.typeScriptConfig?.addFile(this.projenrc.filePath)
+    }
   }
 
-  #configureRenovate({ renovateOptions }: ProjectOptions) {
+  #configureRenovate({ renovate: renovateOptions }: ProjectOptions) {
     if (!renovateOptions || this.parent) {
       return
     }
@@ -362,7 +518,19 @@ export class Project extends BaseProject {
       extends: ['config:recommended'],
       labels: ['dependencies'],
       reviewersFromCodeOwners: true,
+      lockFileMaintenance: {
+        enabled: true,
+      },
       customManagers: [
+        {
+          customType: 'regex',
+          datasourceTemplate: 'node',
+          depNameTemplate: 'node',
+          versioningTemplate: 'node',
+          currentValueTemplate: '>= {{currentValue}}',
+          fileMatch: ['\\.?projen.*.(js|cjs|mjs|ts|mts|cts)$'],
+          matchStrings: ["minNodeVersion:\\s*'(?<currentValue>[^']+)'"],
+        },
         {
           customType: 'regex',
           datasourceTemplate: 'npm',
@@ -370,7 +538,7 @@ export class Project extends BaseProject {
           matchStringsStrategy: 'recursive',
           matchStrings: [
             '\\.(?<depType>addDeps|addDevDeps|addPeerDeps)\\([^)]*\\)',
-            "'(?<depName>[a-zA-Z0-9-]+)@(?<currentValue>[^']+)'",
+            "'(?<depName>@?[\\w-\\/]+)@(?<currentValue>[^']+)'",
           ],
           depTypeTemplate:
             "{{#if (equals depType 'addDeps')}}dependencies{{else if (equals depType 'addDevDeps')}}devDependencies{{else}}peerDependencies{{/if}}",
@@ -382,7 +550,7 @@ export class Project extends BaseProject {
           matchStringsStrategy: 'recursive',
           matchStrings: [
             '(?<depType>deps|devDeps|peerDeps):\\s*\\[[^\\]]*\\]',
-            "'(?<depName>[a-zA-Z0-9-]+)@(?<currentValue>[^']+)'",
+            "'(?<depName>@?[\\w-\\/]+)@(?<currentValue>[^']+)'",
           ],
           depTypeTemplate:
             "{{#if (equals depType 'deps')}}dependencies{{else if (equals depType 'devDeps')}}devDependencies{{else}}peerDependencies{{/if}}",
@@ -398,10 +566,18 @@ export class Project extends BaseProject {
       ],
     }
 
+    this.addTask('renovate', {
+      description: 'Run Renovate locally for debugging',
+      exec: 'pnpx renovate --platform=local --repository-cache=reset --dry-run=full',
+    })
+
     this.renovate = new Renovate(this, deepMerge(defaults, renovateOptions))
   }
 
-  #configureTypeScript({ parent, typeScriptConfigOptions }: ProjectOptions) {
+  #configureTypeScript({
+    parent,
+    typeScriptConfig: typeScriptConfigOptions,
+  }: ProjectOptions) {
     if (!typeScriptConfigOptions) {
       return
     }
@@ -432,29 +608,49 @@ export class Project extends BaseProject {
       this.package?.addDevDeps('ts-node@10.9.2')
     }
 
-    this.package?.addDevDeps('@langri-sha/tsconfig@*')
+    if (this.name !== '@langri-sha/tsconfig') {
+      this.package?.addDevDeps('@langri-sha/tsconfig@*')
+    }
   }
 
-  #createPnpmWorkspaces({ workspaces }: ProjectOptions) {
-    if (!workspaces) {
+  #populateTypeScriptProjectReferencesFromDependencies() {
+    if (this.parent || !this.package || !this.typeScriptConfig) {
       return
     }
 
-    new YamlFile(this, 'pnpm-workspace.yaml', {
-      readonly: true,
-      marker: true,
-      obj: {
-        packages: workspaces,
-      },
-    })
+    const subprojects = this.allSubprojectsKind.filter(
+      (project) => project.package && project.typeScriptConfig,
+    )
+
+    const root = path.dirname(this.package!.file.absolutePath)
+
+    for (const project of subprojects) {
+      const from = path.dirname(project.package!.file.absolutePath)
+
+      if (project.name !== '@langri-sha/tsconfig') {
+        this.typeScriptConfig!.addReference(path.relative(root, from))
+      }
+
+      for (const dep of project.deps.all) {
+        const reference = subprojects.find(({ name }) => name === dep.name)
+
+        if (!reference) {
+          continue
+        }
+
+        const to = path.dirname(reference.package!.file.absolutePath)
+
+        project.typeScriptConfig!.addReference(path.relative(from, to))
+      }
+    }
   }
 }
 
 const getGitIgnoreOptions = ({
   gitIgnoreOptions,
-  huskyOptions,
+  husky: huskyOptions,
   parent,
-  typeScriptConfigOptions,
+  typeScriptConfig: typeScriptConfigOptions,
   withTerraform,
   ...options
 }: ProjectOptions): ProjectOptions['gitIgnoreOptions'] =>
@@ -481,7 +677,8 @@ const getGitIgnoreOptions = ({
     !.github/
     ${huskyOptions ? '!.husky/' : ''}
     !.projen/
-    ${options.workspaces?.map((workspace) => `${workspace}/lib/`).join('\n') ?? ''}
+    dist/
+    ${options.pnpmWorkspace?.packages?.map((workspace) => `${workspace}/lib/`).join('\n') ?? ''}
     node_modules/
     `
             .split('\n')
@@ -491,4 +688,11 @@ const getGitIgnoreOptions = ({
         ],
       }
 
-const deepMerge = R.mergeDeepWith(R.concat)
+const deepMerge = R.mergeDeepWith(
+  R.cond([
+    // When both arguments are strings, use the right string.
+    [R.allPass([R.is(String), R.is(String)]), R.nthArg(1)],
+    // Otherwise, concatenate.
+    [R.T, R.concat],
+  ]),
+)

package/src/lib/index.ts

@@ -1 +1,2 @@
+export * from './node-package.js'
 export * from './projenrc.js'

package/src/lib/node-package.ts

@@ -0,0 +1,50 @@
+import * as fs from 'node:fs'
+import { Project, javascript } from 'projen'
+
+/**
+ * Options for configuring Node.js packages.
+ */
+export interface NodePackageOptions extends javascript.NodePackageOptions {
+  peerDependenciesMeta?: Record<string, { optional?: boolean }>
+  type?: 'commonjs' | 'module'
+}
+
+/**
+ * Custom Node.js package manager that preserves package.
+ */
+export class NodePackage extends javascript.NodePackage {
+  constructor(project: Project, options?: NodePackageOptions) {
+    super(project, options)
+
+    this.addVersion(this.#getPackageJson()?.version ?? '0.0.0')
+
+    if (options?.type) {
+      this.addField('type', options.type)
+    }
+
+    if (options?.peerDependenciesMeta) {
+      this.addField('peerDependenciesMeta', options.peerDependenciesMeta)
+    }
+
+    // Reset, so we can run `pnpx projen` on CI after Renovate upgrades.
+    this.project.tasks
+      .tryFind('install:ci')
+      ?.reset(this.project.tasks.tryFind('install')?.steps[0]?.exec)
+  }
+
+  #getPackageJson() {
+    try {
+      return JSON.parse(fs.readFileSync(this.file.absolutePath, 'utf-8'))
+    } catch (_) {
+      return undefined
+    }
+  }
+
+  override postSynthesize(): void {
+    if (this.project.parent) {
+      return
+    }
+
+    super.postSynthesize()
+  }
+}