tabtab adjusts (#878)

Author: mshima

lib/cli.js

@@ -10,7 +10,7 @@ import rootCheck from 'root-check';
 import meow from 'meow';
 import list from 'cli-list';
 import {bootstrap} from 'global-agent';
-import tabtab from './completion/tabtab.cjs';
+import Tabtab from './completion/tabtab.cjs';
 import pkg from './utils/project-package.js';
 import Router from './router.js';
 import * as routes from './routes/index.js';
@@ -63,6 +63,13 @@ async function pre() {
   }
 
   if (cmd === 'completion') {
+    // eslint-disable-next-line new-cap
+    const tabtab = new Tabtab.Commands.default({
+      name: 'yo',
+      completer: 'yo-complete',
+      cache: false,
+    });
+
     return tabtab.install();
   }
 

lib/completion/completer.cjs lib/completion/completer.jslib/completion/completer.cjs renamed to lib/completion/completer.js

@@ -1,6 +1,7 @@
-const path = require('node:path');
-const {execFile} = require('node:child_process');
-const parseHelp = require('parse-help');
+import path from 'node:path';
+import {execFile} from 'node:child_process';
+import parseHelp from 'parse-help';
+import {getDirname} from '../utils/node-shims.js';
 
 /**
  * The Completer is in charge of handling `yo-complete` behavior.
@@ -38,7 +39,7 @@ class Completer {
    */
   generator(data, done) {
     const {last} = data;
-    const binary = path.resolve(__dirname, '../cli.js');
+    const binary = path.resolve(getDirname(import.meta.url), '../cli.js');
 
     execFile('node', [binary, last, '--help'], (error, out) => {
       if (error) {
@@ -102,4 +103,4 @@ class Completer {
   }
 }
 
-module.exports = Completer;
+export default Completer;

lib/completion/index.cjs

@@ -1,12 +1,12 @@
 #! /usr/bin/env node
-const tabtab = require('tabtab')({
+const tabtab = require('./tabtab.cjs')({
   name: 'yo',
   cache: !require('node:process').env.YO_TEST,
 });
-const Completer = require('./completer.cjs');
 
 (async () => {
   const {createEnv} = await import('yeoman-environment');
+  const {default: Completer} = await import('./completer.js');
   const completer = new Completer(createEnv());
 
   tabtab.completer = completer;

lib/completion/tabtab.cjs

@@ -1,10 +1,3 @@
-const Tabtab = require('tabtab');
-
-// eslint-disable-next-line new-cap
-const tabtab = new Tabtab.Commands.default({
-  name: 'yo',
-  completer: 'yo-complete',
-  cache: false,
-});
+const tabtab = require('tabtab');
 
 module.exports = tabtab;

test/completion.js

@@ -4,7 +4,7 @@ import events from 'node:events';
 import {execFileSync} from 'node:child_process';
 import os from 'node:os';
 import _ from 'lodash';
-import Completer from '../lib/completion/completer.cjs';
+import Completer from '../lib/completion/completer.js';
 import completion from '../lib/completion/index.cjs';
 import {getDirname} from '../lib/utils/node-shims.js';