@adinsure-ops/ops-cli 5.4.2 → 5.5.0-rc1

package/lib/commands/login.js

@@ -1,12 +1,12 @@
 import { __awaiter } from "tslib";
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
-import fs from 'fs';
-import http from 'http';
+import fs from 'node:fs';
+import http from 'node:http';
 import open from 'open';
-import path from 'path';
-import url from 'url';
-import { execSync } from 'child_process';
+import path from 'node:path';
+import url from 'node:url';
+import { execSync } from 'node:child_process';
 import CommandBase from '../command.base.js';
 import NpmRc from '../lib/npmrc.js';
 import YarnRc from '../lib/yarnrc.js';
@@ -33,7 +33,7 @@ class Login extends CommandBase {
                     for (const registry of this.npmRegistries) {
                         const registryUrl = new url.URL(registry);
                         npmRc.set(`//${registryUrl.hostname}${registryUrl.pathname}:_authToken`, token);
-                        yarnRc.set("npmAuthToken", token);
+                        yarnRc.set('npmAuthToken', token);
                     }
                     npmRc.save();
                     yarnRc.save();
@@ -60,15 +60,14 @@ class Login extends CommandBase {
             try {
                 execSync('docker --version', { stdio: 'ignore' });
             }
-            catch (err) {
+            catch (_a) {
                 this.error('Docker is not installed or not in PATH. Please install Docker first.', { exit: 1 });
             }
             // 2. Ensure the user is logged in (using your existing token retrieval logic)
             try {
                 yield this.security.getToken();
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
             }
-            catch (err) {
+            catch (_b) {
                 this.error('User is not logged in. Please run "ops login" without --docker first.', { exit: 1 });
             }
             // 3. generate token from `adinsure.azurecr.io`
@@ -93,6 +92,147 @@ class Login extends CommandBase {
             }
         });
     }
+    /**
+     * Opens the system browser with the given URL. Separate method so tests can stub it.
+     */
+    openBrowser(loginUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let reported = false;
+            const fallback = () => {
+                if (!reported) {
+                    reported = true;
+                    this.printLoginUrl(loginUrl);
+                }
+            };
+            let browser;
+            try {
+                // open 11 rejects when the opener cannot be spawned (e.g. no `open`/`xdg-open` on PATH).
+                browser = yield open(loginUrl);
+            }
+            catch (_a) {
+                fallback();
+                return;
+            }
+            // Later process errors arrive as an 'error' event; unhandled, they crash the CLI.
+            browser.once('error', fallback);
+            // The opener can also start but fail, e.g. `xdg-open` without a configured browser.
+            browser.once('exit', (code) => {
+                if (code)
+                    fallback();
+            });
+        });
+    }
+    printLoginUrl(loginUrl) {
+        this.log(`Could not open a browser. Open this URL to log in:\n${loginUrl}`);
+    }
+    /**
+     * Starts the local redirect server on port 3044.
+     * Resolves once the server is listening (rejects if it cannot bind, e.g. EADDRINUSE) with
+     * `authenticated`, which settles with the signed-in user's name or the code exchange error.
+     * The server is closed once the redirect has been handled or the server fails.
+     */
+    startAuthServer() {
+        return new Promise((listening, failed) => {
+            let resolve;
+            let reject;
+            const authenticated = new Promise((res, rej) => {
+                resolve = res;
+                reject = rej;
+            });
+            let handled = false;
+            const server = http.createServer((req, res) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                const requestUrl = new url.URL((_a = req.url) !== null && _a !== void 0 ? _a : '/', 'http://localhost:3044');
+                const query = requestUrl.searchParams;
+                // Only the AAD redirect counts; ignore e.g. favicon or duplicate requests.
+                if (handled || requestUrl.pathname !== '/' || !(query.has('code') || query.has('error'))) {
+                    res.writeHead(404);
+                    res.end();
+                    return;
+                }
+                handled = true;
+                this.log(`${chalk.yellow('Acquiring your access token...')}`);
+                let status = 200;
+                let page = Login.responsePageContent;
+                let settle;
+                try {
+                    const name = yield this.security.acquireToken(Object.fromEntries(Array.from(query.entries())));
+                    settle = () => resolve(name);
+                }
+                catch (error) {
+                    status = 400;
+                    page = Login.failurePageContent;
+                    settle = () => reject(error);
+                }
+                const finish = () => {
+                    server.close();
+                    server.closeAllConnections();
+                    settle();
+                };
+                // The browser may have hung up during the exchange; its 'close' event has then already fired.
+                if (res.destroyed) {
+                    finish();
+                    return;
+                }
+                // Shut down only after the page is delivered (or the browser hangs up), so it is never cut off.
+                res.once('close', finish);
+                res.writeHead(status, { 'Content-Type': 'text/html' });
+                res.end(page);
+            }));
+            const portInUse = 'Port 3044 is already in use, so the login redirect cannot be received. ' +
+                'Close the program using it (for example another `ops login`) and try again.';
+            const bindFailed = (error) => {
+                failed(error.code === 'EADDRINUSE' ? new Error(portInUse, { cause: error }) : error);
+            };
+            server.once('error', bindFailed);
+            server.listen(3044, () => {
+                server.off('error', bindFailed);
+                server.on('error', (error) => {
+                    server.close();
+                    server.closeAllConnections();
+                    reject(error);
+                });
+                listening({ authenticated });
+            });
+        });
+    }
+    /**
+     * Interactive browser login: opens the AAD sign-in page and redeems the redirected authorization code.
+     * Any failure is reported and exits with code 1.
+     */
+    loginWithBrowser(npm) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let name;
+            try {
+                const loginUrl = yield this.security.getLoginUrl();
+                const { authenticated } = yield this.startAuthServer();
+                // The redirect may arrive while the browser is still opening; it is awaited below.
+                authenticated.catch(() => undefined);
+                this.log(`${chalk.yellow('Note: Opening a browser for you to log in...')}`);
+                try {
+                    yield this.openBrowser(loginUrl);
+                }
+                catch (_a) {
+                    this.printLoginUrl(loginUrl);
+                }
+                name = yield authenticated;
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            }
+            catch (error) {
+                this.error(error, { exit: 1 });
+            }
+            this.log(name ? `Hello ${name}!` : `${chalk.green('Login Successful!')}`);
+            if (npm) {
+                try {
+                    yield this.setNPM();
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                }
+                catch (error) {
+                    this.error(error, { exit: 1 });
+                }
+            }
+        });
+    }
     run() {
         const _super = Object.create(null, {
             run: { get: () => super.run }
@@ -135,37 +275,7 @@ class Login extends CommandBase {
                 }
             }
             else {
-                this.log(`${chalk.yellow('Note: We have launched a browser for you to login.')}`);
-                const loginUrl = yield this.security.getLoginUrl();
-                yield open(loginUrl);
-                const server = http.createServer((req, res) => __awaiter(this, void 0, void 0, function* () {
-                    // First let the user know everything was OK
-                    res.writeHead(200, { 'Content-Type': 'text/html' });
-                    res.write(Login.responsePageContent);
-                    res.end();
-                    this.log(`${chalk.yellow('You have logged in successfully. Acquiring your access token...')}`);
-                    // Then let's acquire an authentication token from AAD
-                    try {
-                        const queryURL = new url.URL(req.url, 'http://localhost:3044').searchParams;
-                        const name = yield this.security.acquireToken(Object.fromEntries(Array.from(queryURL.entries())));
-                        this.log(`Hello ${name}!`);
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    }
-                    catch (error) {
-                        this.error(error, { exit: false });
-                    }
-                    if (flags.npm) {
-                        try {
-                            yield this.setNPM();
-                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        }
-                        catch (error) {
-                            this.error(error, { exit: false });
-                        }
-                    }
-                    server.close();
-                }));
-                server.listen(3044);
+                yield this.loginWithBrowser(flags.npm);
             }
         });
     }
@@ -214,4 +324,16 @@ Login.responsePageContent = `
         </script>
     </body>
 </html>`;
+Login.failurePageContent = `
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>ops-cli authenticate</title>
+        <link rel='icon' href='data:;base64,iVBORw0KGgo='>
+    </head>
+    <body>
+        <p><strong>Your login failed.</strong></p>
+        <p>See the ops-cli output in your terminal for details. You can close this page.</p>
+    </body>
+</html>`;
 export default Login;

package/lib/commands/login.ru.d.ts

@@ -5,8 +5,8 @@ export default class LoginRu extends CommandBase<typeof LoginRu> {
     static usage: string;
     static examples: string[];
     static flags: {
-        token: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        token: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/lib/commands/login.ru.js

@@ -1,7 +1,7 @@
 import { __awaiter } from "tslib";
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
-import fs from 'fs';
+import fs from 'node:fs';
 import CommandBase from '../command.base.js';
 class LoginRu extends CommandBase {
     run() {

package/lib/commands/npm/check-publish.d.ts

@@ -5,10 +5,10 @@ export default class NpmCheckPublish extends CommandBase<typeof NpmCheckPublish>
     static usage: string;
     static examples: string[];
     static flags: {
-        package: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        exclude: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        version: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        pat: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        package: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        exclude: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        version: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        pat: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     checkPackagesExists(packages: NpmPackage[], allPackages: AzurePackageArray, version: string): Promise<void>;
     run(): Promise<void>;

package/lib/commands/npm/check-publish.js

@@ -36,7 +36,7 @@ class NpmCheckPublish extends CommandBase {
             _super.run.call(this);
             try {
                 const { flags } = (yield this.parse(NpmCheckPublish));
-                const npmContext = new NpmContext();
+                const npmContext = new NpmContext(this.http);
                 ux.action.start('Parsing packages to check', undefined, { stdout: true });
                 const packages = yield npmContext.packageList(this, flags.package, flags.exclude);
                 ux.action.stop(`${chalk.green('done')}`);

package/lib/commands/npm/dependency-update.d.ts

@@ -5,12 +5,12 @@ export default class NpmDependencyUpdate extends CommandBase<typeof NpmDependenc
     static usage: string;
     static examples: string[];
     static args: {
-        version: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
+        version: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static flags: {
-        filter: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[], import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        exclude: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        filter: import("@oclif/core/interfaces").OptionFlag<string[], import("@oclif/core/interfaces").CustomOptions>;
+        exclude: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     /**
      * Update dependencies in package.json files for @adinsure packages
@@ -21,5 +21,18 @@ export default class NpmDependencyUpdate extends CommandBase<typeof NpmDependenc
      * @returns {Prmoise<void>} Void Promise
      */
     updateDependencies(newVersion: string, packages: NpmPackage[], force?: boolean, filter?: string[]): Promise<void>;
+    /**
+     * Serialize package.json data with the formatting of the original file,
+     * so only the updated versions show up in the diff
+     * @param data Package.json data
+     * @param original Original file content
+     * @returns {string} Formatted JSON
+     */
+    private formatJson;
+    /**
+     * Update versions of matching packages in a dependency group
+     * @returns {string[]} Names of updated packages
+     */
+    private updateDependencyGroup;
     run(): Promise<undefined>;
 }

package/lib/commands/npm/dependency-update.js

@@ -21,53 +21,76 @@ class NpmDependencyUpdate extends CommandBase {
             // Find all package.json files that are not in node modules
             for (const path of packages) {
                 try {
-                    const data = yield fs.readJSON(path.jsonPath);
-                    const updatedKeys = [];
-                    if (Object.prototype.hasOwnProperty.call(data, 'dependencies')) {
-                        for (const [key, value] of Object.entries(data.dependencies)) {
-                            const currentVersion = semver.valid(String(value));
-                            if (filter.some(pkg => minimatch(key, pkg))) {
-                                if (currentVersion && semver.gt(currentVersion, newVersion) && !force) {
-                                    this.warn(`Lower of same version for dependency ${key} updated in file ${path.jsonPath}: ${newVersion} vs. ${currentVersion} is ${semver.gt(newVersion, currentVersion)}`);
-                                }
-                                else {
-                                    data.dependencies[key] = newVersion;
-                                    updatedKeys.push(key);
-                                }
-                            }
-                        }
-                        fs.writeFileSync(path.jsonPath, JSON.stringify(data, null, 4));
-                        if (updatedKeys.length > 0) {
-                            this.log(`Dependencies ${updatedKeys} updated in file ${path.jsonPath}`);
-                        }
+                    const content = yield fs.readFile(path.jsonPath, 'utf8');
+                    const bom = content.startsWith('\uFEFF') ? '\uFEFF' : '';
+                    const data = JSON.parse(content.slice(bom.length));
+                    const updatedDependencies = this.updateDependencyGroup(data.dependencies, 'dependency', newVersion, path.jsonPath, force, filter);
+                    const updatedDevDependencies = this.updateDependencyGroup(data.devDependencies, 'devDependency', newVersion, path.jsonPath, force, filter);
+                    if (updatedDependencies.length === 0 && updatedDevDependencies.length === 0) {
+                        continue;
                     }
-                    if (Object.prototype.hasOwnProperty.call(data, 'devDependencies')) {
-                        for (const [key, value] of Object.entries(data.devDependencies)) {
-                            const currentVersion = semver.valid(String(value));
-                            if (filter.some(pkg => minimatch(key, pkg))) {
-                                if (currentVersion && semver.gt(currentVersion, newVersion) && !force) {
-                                    this.warn(`Lower of same version for devDependency ${key} updated in file ${path.jsonPath}: ${newVersion} vs. ${currentVersion} is ${semver.gt(newVersion, currentVersion)}`);
-                                }
-                                else {
-                                    data.devDependencies[key] = newVersion;
-                                    updatedKeys.push(key);
-                                }
-                            }
-                        }
-                        fs.writeFileSync(path.jsonPath, JSON.stringify(data, null, 4));
-                        if (updatedKeys.length > 0) {
-                            this.log(`devDependencies ${updatedKeys} updated in file ${path.jsonPath}`);
-                        }
+                    yield fs.writeFile(path.jsonPath, bom + this.formatJson(data, content));
+                    if (updatedDependencies.length > 0) {
+                        this.log(`Dependencies ${updatedDependencies} updated in file ${path.jsonPath}`);
+                    }
+                    if (updatedDevDependencies.length > 0) {
+                        this.log(`devDependencies ${updatedDevDependencies} updated in file ${path.jsonPath}`);
                     }
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 }
                 catch (error) {
-                    this.warn(error.message);
-                    break;
+                    this.warn(`Could not update ${path.jsonPath}: ${error.message}`);
                 }
             }
         });
     }
+    /**
+     * Serialize package.json data with the formatting of the original file,
+     * so only the updated versions show up in the diff
+     * @param data Package.json data
+     * @param original Original file content
+     * @returns {string} Formatted JSON
+     */
+    formatJson(data, original) {
+        var _a, _b;
+        const lines = original.split('\n').filter(line => line.trim().length > 0);
+        // A minified or single-line file is kept on a single line
+        const indent = lines.length > 1 ? ((_b = (_a = /^([ \t]+)\S/m.exec(original)) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : 4) : 0;
+        const newLine = original.endsWith('\n') ? (original.endsWith('\r\n') ? '\r\n' : '\n') : '';
+        let json = JSON.stringify(data, null, indent);
+        if (original.includes('\r\n')) {
+            json = json.replaceAll('\n', '\r\n');
+        }
+        return json + newLine;
+    }
+    /**
+     * Update versions of matching packages in a dependency group
+     * @returns {string[]} Names of updated packages
+     */
+    updateDependencyGroup(dependencies, type, newVersion, jsonPath, force, filter) {
+        const updatedKeys = [];
+        if (!dependencies) {
+            return updatedKeys;
+        }
+        for (const [key, value] of Object.entries(dependencies)) {
+            if (!filter.some(pkg => minimatch(key, pkg)) || value === newVersion) {
+                continue;
+            }
+            // Leave protocols such as workspace:, file:, link: or npm: aliases untouched
+            if (!semver.validRange(value)) {
+                this.warn(`Skipping ${type} ${key} in file ${jsonPath}: '${value}' is not a version or version range`);
+                continue;
+            }
+            const currentVersion = semver.minVersion(value);
+            if (currentVersion && semver.gt(currentVersion, newVersion) && !force) {
+                this.warn(`Skipping downgrade of ${type} ${key} in file ${jsonPath} from ${value} to ${newVersion}. Use --force to downgrade.`);
+                continue;
+            }
+            dependencies[key] = newVersion;
+            updatedKeys.push(key);
+        }
+        return updatedKeys;
+    }
     run() {
         const _super = Object.create(null, {
             run: { get: () => super.run }
@@ -76,13 +99,13 @@ class NpmDependencyUpdate extends CommandBase {
             _super.run.call(this);
             const { args, flags } = yield this.parse(NpmDependencyUpdate);
             const newVersion = semver.valid(args.version);
-            const npmContext = new NpmContext();
+            const npmContext = new NpmContext(this.http);
             const command = new ChildProcessCommand();
             // Stop if version invalid
             if (!newVersion) {
                 return this.error(`${chalk.red('Version in incorrect format')}`);
             }
-            const packages = yield npmContext.packageList(this);
+            const packages = yield npmContext.packageList(this, ['**/*'], flags.exclude, false);
             try {
                 yield this.updateDependencies(newVersion, packages, flags.force, flags.filter);
                 ux.action.start(`running 'yarn install'`, undefined, {
@@ -123,7 +146,7 @@ NpmDependencyUpdate.flags = {
         multiple: true,
     }),
     exclude: Flags.string({
-        description: 'exclude directories where to search for package.json',
+        description: 'names of packages whose package.json should not be updated',
         multiple: true,
     }),
     force: Flags.boolean({

package/lib/commands/npm/publish.d.ts

@@ -5,11 +5,11 @@ export default class NpmPublish extends CommandBase<typeof NpmPublish> {
     static usage: string;
     static examples: string[];
     static flags: {
-        package: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        exclude: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        version: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        pat: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        retry: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        package: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        exclude: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        version: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        pat: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        retry: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
     };
     private cp;
     publishPackage(pkg: NpmPackage, cmd?: string[]): Promise<{

package/lib/commands/npm/publish.js

@@ -1,7 +1,7 @@
 import { __asyncValues, __awaiter } from "tslib";
 import { Flags, ux } from '@oclif/core';
 import chalk from 'chalk';
-import { spawn } from 'child_process';
+import { spawn } from 'node:child_process';
 import CommandBase from '../../command.base.js';
 import NpmContext from '../../lib/npm.js';
 class NpmPublish extends CommandBase {
@@ -148,7 +148,7 @@ class NpmPublish extends CommandBase {
             _super.run.call(this);
             try {
                 const { flags } = yield this.parse(NpmPublish);
-                const npmContext = new NpmContext();
+                const npmContext = new NpmContext(this.http);
                 ux.action.start('Parsing packages to check', undefined, { stdout: true });
                 const packages = yield npmContext.packageList(this, flags.package, flags.exclude);
                 ux.action.stop(`${chalk.green('done')}`);

package/lib/commands/nuget/dependency-update.d.ts

@@ -4,11 +4,11 @@ export default class NuGetDependencyUpdate extends CommandBase<typeof NuGetDepen
     static usage: string;
     static examples: string[];
     static args: {
-        version: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;
+        version: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static flags: {
-        filter: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        exclude: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        filter: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        exclude: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     /**
      * Update dependencies in csproj files for @adinsure packages

package/lib/commands/prepare-content.d.ts

@@ -2,7 +2,7 @@ import CommandBase from '../command.base.js';
 interface Transformation {
     name: string;
     srcPath: string;
-    transform(): void;
+    transform(): void | Promise<void>;
 }
 interface DotfileLine {
     prefix: string;
@@ -15,8 +15,8 @@ export default class PrepareContent extends CommandBase<typeof PrepareContent> {
     static usage: string;
     static examples: string[];
     static flags: {
-        destination: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        source: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        destination: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        source: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };
     parseDotfileLine(line: string, sourceDirectory: string): Promise<DotfileLine>;
     readDotfile(sourceDirectory: string): Promise<DotfileLine[]>;