@rtorcato/js-tooling 2.12.0 → 2.14.0

package/dist/cli/commands/doctor.js

@@ -661,7 +661,7 @@ async function checkGitLabCI(dir) {
         check: 'GitLab CI',
         status: 'optional-missing',
         detail: 'no .gitlab-ci.yml',
-        hint: 'Add a .gitlab-ci.yml if this repo is hosted on GitLab',
+        hint: 'Run `npx @rtorcato/js-tooling fix gitlab-ci` to scaffold a starter GitLab pipeline',
     };
 }
 export async function runDoctor(dir) {

package/dist/cli/commands/fix-targets.js

@@ -21,6 +21,7 @@ export const FIX_TARGETS = {
     Dependabot: 'dependabot',
     CodeQL: 'codeql',
     CODEOWNERS: 'codeowners',
+    'GitLab CI': 'gitlab-ci',
     lockfile: 'lockfile',
     '.js-tooling.json': 'lockfile',
 };

package/dist/cli/commands/fix.js

@@ -5,8 +5,10 @@ import inquirer from 'inquirer';
 import { generateSemanticReleaseConfig } from '../generators/build.js';
 import { generateCommitlintConfig, generateHuskyConfig, generatePrePushHook, } from '../generators/git.js';
 import { generateGitHubActions } from '../generators/github-actions.js';
+import { generateGitLabCI } from '../generators/gitlab-ci.js';
 import { generateESLintConfig, generatePrettierConfig } from '../generators/linting.js';
 import { ensureEnginesNode, generateCodeowners, generateEditorConfig, generateKnipConfig, generateNvmrc, generateSizeLimitConfig, } from '../generators/misc.js';
+import { generateConfigs } from '../generators/index.js';
 import { composeVerifyScriptFromPkg } from '../generators/package-json.js';
 import { generateCodeQLWorkflow, generateDependabotConfig } from '../generators/security.js';
 import { generateVitestConfig } from '../generators/testing.js';
@@ -15,6 +17,7 @@ import { copyPreset } from '../utils/copy-preset.js';
 import { LOCKFILE_NAME, readLockfile, updateLockfileConfig, writeLockfile, } from '../utils/lockfile.js';
 import { runDoctor } from './doctor.js';
 import { declinedInLock, lockfilePatchForTarget } from './fix-targets.js';
+import { computeFileList } from './setup-presets.js';
 function inferProjectConfig(pkg) {
     const deps = {
         ...(pkg?.dependencies ?? {}),
@@ -241,6 +244,17 @@ const FIXERS = [
             return { filesWritten: [written] };
         },
     },
+    {
+        target: 'gitlab-ci',
+        description: 'Scaffold .gitlab-ci.yml (lint/typecheck/test/build mirrored from GitHub Actions)',
+        appliesTo: ['GitLab CI'],
+        outputs: ['.gitlab-ci.yml'],
+        canFixDrift: true,
+        async run({ targetDir, pkg }) {
+            const written = await generateGitLabCI(inferProjectConfig(pkg), targetDir);
+            return { filesWritten: [written] };
+        },
+    },
     {
         target: 'editorconfig',
         description: 'Scaffold .editorconfig (UTF-8, LF, tab indent)',
@@ -479,6 +493,60 @@ export async function fixCommand(target, options = {}) {
         console.log();
         return;
     }
+    if (options.resync) {
+        if (target) {
+            console.error(chalk.red('\n❌ --resync cannot be combined with a [target] argument\n'));
+            process.exit(1);
+        }
+        const resyncLock = await readLockfile(targetDir);
+        if (!resyncLock) {
+            if (json) {
+                console.log(JSON.stringify({ directory: targetDir, error: 'no-lockfile', hint: 'run `fix lockfile` first' }, null, 2));
+            }
+            else {
+                console.error(chalk.red(`\n❌ No ${LOCKFILE_NAME} found — run \`fix lockfile\` first to record choices\n`));
+            }
+            process.exit(1);
+        }
+        const files = computeFileList(resyncLock.config);
+        if (!silent) {
+            console.log(chalk.cyan(`\n🔄 Resync from ${LOCKFILE_NAME} (${files.length} files in scope)\n`));
+        }
+        if (dryRun) {
+            if (json) {
+                console.log(JSON.stringify({ directory: targetDir, mode: 'resync', dryRun: true, files }, null, 2));
+            }
+            else {
+                for (const f of files)
+                    console.log(chalk.cyan(`  [dry-run] would write: ${f}`));
+                console.log();
+            }
+            return;
+        }
+        if (!assumeYes) {
+            const { confirm } = await inquirer.prompt([
+                {
+                    type: 'confirm',
+                    name: 'confirm',
+                    message: `Re-scaffold ${files.length} file(s) from ${LOCKFILE_NAME}? Generators preserve existing customizations where possible, but README.md will be rewritten.`,
+                    default: false,
+                },
+            ]);
+            if (!confirm) {
+                console.log(chalk.gray('   skipped\n'));
+                return;
+            }
+        }
+        await generateConfigs(resyncLock.config, targetDir);
+        await writeLockfile(targetDir, resyncLock.config);
+        if (json) {
+            console.log(JSON.stringify({ directory: targetDir, mode: 'resync', dryRun: false, files }, null, 2));
+        }
+        else {
+            console.log(chalk.green(`  ✅ resynced ${files.length} file(s)\n`));
+        }
+        return;
+    }
     const pkg = await readPackageJson(targetDir);
     const lock = await readLockfile(targetDir);
     const results = await runDoctor(targetDir);

package/dist/cli/generators/gitlab-ci.js

@@ -0,0 +1,87 @@
+import path from 'node:path';
+import fs from 'fs-extra';
+export async function generateGitLabCI(config, targetDir) {
+    const yamlPath = path.join(targetDir, '.gitlab-ci.yml');
+    await fs.writeFile(yamlPath, renderGitLabCI(config));
+    return '.gitlab-ci.yml';
+}
+function lintCommand(config) {
+    if (config.linting.tool === 'biome' || config.linting.tool === 'both')
+        return 'pnpm check';
+    return 'pnpm lint';
+}
+function renderGitLabCI(config) {
+    const hasTypeScript = config.typescript.enabled;
+    const hasTests = config.testing.framework !== 'none';
+    const hasLint = config.linting.tool !== 'none';
+    const hasBuild = config.bundler !== 'none';
+    const stages = [];
+    if (hasLint || hasTypeScript || hasTests)
+        stages.push('test');
+    if (hasBuild)
+        stages.push('build');
+    if (stages.length === 0)
+        stages.push('test');
+    const jobs = [];
+    if (hasLint) {
+        jobs.push(`lint:
+  stage: test
+  script:
+    - ${lintCommand(config)}`);
+    }
+    if (hasTypeScript) {
+        jobs.push(`typecheck:
+  stage: test
+  script:
+    - pnpm typecheck`);
+    }
+    if (hasTests) {
+        const testCmd = config.testing.framework === 'vitest'
+            ? 'pnpm exec vitest run'
+            : config.testing.framework === 'playwright'
+                ? 'pnpm test:e2e'
+                : 'pnpm test';
+        jobs.push(`test:
+  stage: test
+  script:
+    - ${testCmd}`);
+    }
+    if (hasBuild) {
+        jobs.push(`build:
+  stage: build
+  script:
+    - pnpm build
+  artifacts:
+    paths:
+      - dist/
+    expire_in: 1 week`);
+    }
+    return `# .gitlab-ci.yml — generated by @rtorcato/js-tooling
+# Customize stages and jobs to fit your pipeline.
+
+image: node:20
+
+stages:
+${stages.map((s) => `  - ${s}`).join('\n')}
+
+variables:
+  PNPM_CACHE_FOLDER: .pnpm-store
+
+cache:
+  key:
+    files:
+      - pnpm-lock.yaml
+  paths:
+    - .pnpm-store
+    - node_modules
+
+default:
+  before_script:
+    - corepack enable
+    - corepack prepare pnpm@latest --activate
+    - pnpm config set store-dir "$PNPM_CACHE_FOLDER"
+    - pnpm install --frozen-lockfile
+
+${jobs.join('\n\n')}
+`;
+}

package/dist/cli/index.js

@@ -222,12 +222,14 @@ program
     .option('--dry-run', 'Print what would change without writing files')
     .option('--json', 'Emit machine-readable JSON output (implies --yes)')
     .option('--list', 'List all registered fix targets and exit')
+    .option('--resync', 'Re-scaffold every file recorded in .js-tooling.json')
     .action((target, options) => fixCommand(target, {
     directory: options.directory,
     yes: options.yes,
     dryRun: options.dryRun,
     json: options.json,
     list: options.list,
+    resync: options.resync,
 }));
 program.hook('preAction', async (_, actionCommand) => {
     const name = actionCommand.name();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rtorcato/js-tooling",
-	"version": "2.12.0",
+	"version": "2.14.0",
 	"description": "JavaScript and TypeScript tooling for Node.js, React, Next.js, and Vitest.",
 	"type": "module",
 	"keywords": [