typesync 0.12.2 → 0.13.0

package/lib/type-syncer.js

@@ -1,108 +1,74 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
     }
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTypeSyncer = createTypeSyncer;
-var types_1 = require("./types");
-var util_1 = require("./util");
-var versioning_1 = require("./versioning");
+const path = __importStar(require("node:path"));
+const types_1 = require("./types");
+const util_1 = require("./util");
+const versioning_1 = require("./versioning");
 /**
  * Creates a type syncer.
  *
  * @param packageJSONservice
  * @param typeDefinitionSource
  */
-function createTypeSyncer(packageJSONService, packageSource, configService, globber) {
-    var fetchPackageInfo = (0, util_1.memoizeAsync)(packageSource.fetch);
+function createTypeSyncer(packageJSONService, workspaceResolverService, packageSource, configService, globber) {
+    const fetchPackageInfo = (0, util_1.memoizeAsync)(packageSource.fetch);
     return {
-        sync: sync,
+        sync,
     };
     /**
      * Syncs typings in the specified package.json.
      */
-    function sync(filePath, flags) {
-        return __awaiter(this, void 0, void 0, function () {
-            var dryRun, _a, file, syncOpts, subPackages, syncedFiles;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        dryRun = !!flags.dry;
-                        return [4 /*yield*/, Promise.all([
-                                packageJSONService.readPackageFile(filePath),
-                                configService.readConfig(filePath, flags),
-                            ])];
-                    case 1:
-                        _a = _b.sent(), file = _a[0], syncOpts = _a[1];
-                        return [4 /*yield*/, Promise.all(__spreadArray(__spreadArray([], (0, util_1.ensureWorkspacesArray)(file.packages), true), (0, util_1.ensureWorkspacesArray)(file.workspaces), true).map(globber.globPackageFiles))
-                                .then(util_1.flatten)
-                                .then(util_1.uniq)];
-                    case 2:
-                        subPackages = _b.sent();
-                        return [4 /*yield*/, Promise.all(__spreadArray([
-                                syncFile(filePath, file, syncOpts, dryRun)
-                            ], subPackages.map(function (p) { return syncFile(p, null, syncOpts, dryRun); }), true))];
-                    case 3:
-                        syncedFiles = _b.sent();
-                        return [2 /*return*/, {
-                                syncedFiles: syncedFiles,
-                            }];
-                }
-            });
-        });
+    async function sync(filePath, flags) {
+        const dryRun = !!flags.dry;
+        const [{ file, subPackages }, syncOpts] = await Promise.all([
+            getManifests(filePath, globber),
+            configService.readConfig(filePath, flags),
+        ]);
+        const syncedFiles = await Promise.all([
+            syncFile(filePath, file, syncOpts, dryRun),
+            ...subPackages.map((p) => syncFile(p, null, syncOpts, dryRun)),
+        ]);
+        return {
+            syncedFiles,
+        };
+    }
+    /**
+     * Get the `package.json` files and sub-packages.
+     *
+     * @param filePath
+     * @param globber
+     */
+    async function getManifests(filePath, globber) {
+        const file = await packageJSONService.readPackageFile(filePath);
+        const subPackages = await workspaceResolverService.getWorkspaces(file, path.dirname(filePath), globber);
+        return {
+            file,
+            subPackages,
+        };
     }
     /**
      * Syncs a single file.
@@ -112,87 +78,66 @@ function createTypeSyncer(packageJSONService, packageSource, configService, glob
      * @param allTypings
      * @param opts
      */
-    function syncFile(filePath, file, opts, dryRun) {
-        return __awaiter(this, void 0, void 0, function () {
-            var ignoreDeps, ignorePackages, packageFile, _a, allLocalPackages, allPackageNames, potentiallyUntypedPackages, used, devDepsToAdd, devDeps;
-            var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        ignoreDeps = opts.ignoreDeps, ignorePackages = opts.ignorePackages;
-                        _a = file;
-                        if (_a) return [3 /*break*/, 2];
-                        return [4 /*yield*/, packageJSONService.readPackageFile(filePath)];
-                    case 1:
-                        _a = (_b.sent());
-                        _b.label = 2;
-                    case 2:
-                        packageFile = _a;
-                        allLocalPackages = (0, util_1.flatten)(Object.values(types_1.IDependencySection).map(function (dep) {
-                            var section = getDependenciesBySection(packageFile, dep);
-                            var ignoredSection = ignoreDeps === null || ignoreDeps === void 0 ? void 0 : ignoreDeps.includes(dep);
-                            return getPackagesFromSection(section, ignoredSection, ignorePackages);
-                        }));
-                        allPackageNames = (0, util_1.uniq)(allLocalPackages.map(function (p) { return p.name; }));
-                        potentiallyUntypedPackages = getPotentiallyUntypedPackages(allPackageNames);
-                        used = [];
-                        return [4 /*yield*/, Promise.all(potentiallyUntypedPackages.map(function (t) { return __awaiter(_this, void 0, void 0, function () {
-                                var typePackageInfoPromise, codePackageInfo, localCodePackage, closestMatchingCodeVersion, typePackageInfo, closestMatchingTypingsVersion, version, semverRangeSpecifier;
-                                var _a;
-                                return __generator(this, function (_b) {
-                                    switch (_b.label) {
-                                        case 0:
-                                            typePackageInfoPromise = fetchPackageInfo(t.typesPackageName);
-                                            return [4 /*yield*/, fetchPackageInfo(t.codePackageName)
-                                                // If the code package was not found, there's nothing else to do.
-                                            ];
-                                        case 1:
-                                            codePackageInfo = _b.sent();
-                                            // If the code package was not found, there's nothing else to do.
-                                            if (!codePackageInfo) {
-                                                return [2 /*return*/, {}];
-                                            }
-                                            localCodePackage = allLocalPackages.find(function (p) { return p.name === t.codePackageName; });
-                                            closestMatchingCodeVersion = (0, versioning_1.getClosestMatchingVersion)(codePackageInfo.versions, localCodePackage.version);
-                                            // If the closest matching version contains internal typings, don't include it.
-                                            if (closestMatchingCodeVersion.containsInternalTypings) {
-                                                return [2 /*return*/, {}];
-                                            }
-                                            return [4 /*yield*/, typePackageInfoPromise
-                                                // If the types package was not found, or if it was deprecated, there's nothing else to do.
-                                            ];
-                                        case 2:
-                                            typePackageInfo = _b.sent();
-                                            // If the types package was not found, or if it was deprecated, there's nothing else to do.
-                                            if (!typePackageInfo || typePackageInfo.deprecated) {
-                                                return [2 /*return*/, {}];
-                                            }
-                                            closestMatchingTypingsVersion = (0, versioning_1.getClosestMatchingVersion)(typePackageInfo.versions, localCodePackage.version);
-                                            version = closestMatchingTypingsVersion.version;
-                                            semverRangeSpecifier = '~';
-                                            used.push(t);
-                                            return [2 /*return*/, (_a = {},
-                                                    _a[t.typesPackageName] = semverRangeSpecifier + version,
-                                                    _a)];
-                                    }
-                                });
-                            }); })).then(util_1.mergeObjects)];
-                    case 3:
-                        devDepsToAdd = _b.sent();
-                        devDeps = packageFile.devDependencies;
-                        if (!!dryRun) return [3 /*break*/, 5];
-                        return [4 /*yield*/, packageJSONService.writePackageFile(filePath, __assign(__assign({}, packageFile), { devDependencies: (0, util_1.orderObject)(__assign(__assign({}, devDepsToAdd), devDeps)) }))];
-                    case 4:
-                        _b.sent();
-                        _b.label = 5;
-                    case 5: return [2 /*return*/, {
-                            filePath: filePath,
-                            newTypings: used,
-                            package: packageFile,
-                        }];
-                }
+    async function syncFile(filePath, file, opts, dryRun) {
+        const { ignoreDeps, ignorePackages } = opts;
+        const packageFile = file ?? (await packageJSONService.readPackageFile(filePath));
+        const allLocalPackages = Object.values(types_1.IDependencySection)
+            .map((dep) => {
+            const section = getDependenciesBySection(packageFile, dep);
+            const ignoredSection = ignoreDeps?.includes(dep);
+            return getPackagesFromSection(section, ignoredSection, ignorePackages);
+        })
+            .flat();
+        const allPackageNames = (0, util_1.uniq)(allLocalPackages.map((p) => p.name));
+        const potentiallyUntypedPackages = getPotentiallyUntypedPackages(allPackageNames);
+        // This is pushed to in the inner `map`, because packages that have DT-typings
+        // *as well* as internal typings should be excluded.
+        const used = [];
+        const devDepsToAdd = await Promise.all(potentiallyUntypedPackages.map(async (t) => {
+            // Fetch the code package from the source.
+            const typePackageInfoPromise = fetchPackageInfo(t.typesPackageName);
+            const codePackageInfo = await fetchPackageInfo(t.codePackageName);
+            // If the code package was not found, there's nothing else to do.
+            if (!codePackageInfo) {
+                return {};
+            }
+            const localCodePackage = allLocalPackages.find((p) => p.name === t.codePackageName);
+            // Find the closest matching code package version relative to what's in our package.json
+            const closestMatchingCodeVersion = (0, versioning_1.getClosestMatchingVersion)(codePackageInfo.versions, localCodePackage.version);
+            // If the closest matching version contains internal typings, don't include it.
+            if (closestMatchingCodeVersion.containsInternalTypings) {
+                return {};
+            }
+            // Look for the closest matching typings package.
+            const typePackageInfo = await typePackageInfoPromise;
+            // If the types package was not found, or if it was deprecated, there's nothing else to do.
+            if (!typePackageInfo || typePackageInfo.deprecated) {
+                return {};
+            }
+            // Gets the closest matching typings version, or the newest one.
+            const closestMatchingTypingsVersion = (0, versioning_1.getClosestMatchingVersion)(typePackageInfo.versions, localCodePackage.version);
+            const version = closestMatchingTypingsVersion.version;
+            const semverRangeSpecifier = '~';
+            used.push(t);
+            return {
+                [t.typesPackageName]: semverRangeSpecifier + version,
+            };
+        })).then(util_1.mergeObjects);
+        const devDeps = packageFile.devDependencies;
+        if (!dryRun) {
+            await packageJSONService.writePackageFile(filePath, {
+                ...packageFile,
+                devDependencies: (0, util_1.orderObject)({
+                    ...devDepsToAdd,
+                    ...devDeps,
+                }),
             });
-        });
+        }
+        return {
+            filePath,
+            newTypings: used,
+            package: packageFile,
+        };
     }
 }
 /**
@@ -202,15 +147,15 @@ function createTypeSyncer(packageJSONService, packageSource, configService, glob
  * @param allTypings All typings available
  */
 function getPotentiallyUntypedPackages(allPackageNames) {
-    var existingTypings = allPackageNames.filter(function (x) { return x.startsWith('@types/'); });
-    return (0, util_1.filterMap)(allPackageNames, function (p) {
+    const existingTypings = allPackageNames.filter((x) => x.startsWith('@types/'));
+    return (0, util_1.filterMap)(allPackageNames, (p) => {
         // Ignore typings packages themselves.
         if (p.startsWith('@types/')) {
             return false;
         }
-        var typingsName = getTypingsName(p);
-        var fullTypingsPackage = (0, util_1.typed)(p);
-        var alreadyHasTyping = existingTypings.some(function (t) { return t === fullTypingsPackage; });
+        const typingsName = getTypingsName(p);
+        const fullTypingsPackage = (0, util_1.typed)(p);
+        const alreadyHasTyping = existingTypings.some((t) => t === fullTypingsPackage);
         if (alreadyHasTyping) {
             return false;
         }
@@ -228,10 +173,10 @@ function getPotentiallyUntypedPackages(allPackageNames) {
  * @param packageName the package name to generate the typings name for
  */
 function getTypingsName(packageName) {
-    var scopeInfo = getPackageScope(packageName);
-    var typingsName = packageName;
+    const scopeInfo = getPackageScope(packageName);
+    let typingsName = packageName;
     if (scopeInfo && scopeInfo[0] !== 'types') {
-        typingsName = "".concat(scopeInfo[0], "__").concat(scopeInfo[1]);
+        typingsName = `${scopeInfo[0]}__${scopeInfo[1]}`;
     }
     return typingsName;
 }
@@ -241,8 +186,8 @@ function getTypingsName(packageName) {
  * @param packageName Package name to check scope for.
  */
 function getPackageScope(packageName) {
-    var EXPR = /^@([^/]+)\/(.*)$/i;
-    var matches = EXPR.exec(packageName);
+    const EXPR = /^@([^/]+)\/(.*)$/i;
+    const matches = EXPR.exec(packageName);
     if (!matches) {
         return null;
     }
@@ -256,16 +201,17 @@ function getPackageScope(packageName) {
  * @param ignorePackages
  */
 function getPackagesFromSection(section, ignoredSection, ignorePackages) {
-    return (0, util_1.filterMap)(Object.keys(section), function (name) {
-        var isTyping = name.startsWith('@types/');
+    return (0, util_1.filterMap)(Object.keys(section), (name) => {
+        const isTyping = name.startsWith('@types/');
         // Never ignore `@types` packages.
         if (!isTyping) {
             // If it's not a `@types` package, check whether the section or package is ignored.
-            if (ignoredSection || (ignorePackages === null || ignorePackages === void 0 ? void 0 : ignorePackages.includes(name))) {
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- We want to check for false as well.
+            if (ignoredSection || ignorePackages?.includes(name)) {
                 return false;
             }
         }
-        return { name: name, version: section[name] };
+        return { name, version: section[name] };
     });
 }
 /**
@@ -275,7 +221,7 @@ function getPackagesFromSection(section, ignoredSection, ignorePackages) {
  * @param section Package section, eg: dev, peer
  */
 function getDependenciesBySection(file, section) {
-    var dependenciesSection = (function () {
+    const dependenciesSection = (() => {
         switch (section) {
             case types_1.IDependencySection.deps:
                 return file.dependencies;
@@ -287,6 +233,6 @@ function getDependenciesBySection(file, section) {
                 return file.peerDependencies;
         }
     })();
-    return dependenciesSection !== null && dependenciesSection !== void 0 ? dependenciesSection : {};
+    return dependenciesSection ?? {};
 }
 //# sourceMappingURL=type-syncer.js.map

package/lib/type-syncer.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-syncer.js","sourceRoot":"","sources":["../src/type-syncer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"type-syncer.js","sourceRoot":"","sources":["../src/type-syncer.ts"],"names":[],"mappings":"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"}

package/lib/types.d.ts

@@ -1,3 +1,4 @@
+import type { IWorkspacesSection } from './workspace-resolver';
 /**
  * The guts of the program.
  */
@@ -11,60 +12,11 @@ export interface ISyncOptions {
     /**
      * Ignore certain deps.
      */
-    ignoreDeps?: IDependencySection[];
+    ignoreDeps?: Array<IDependencySection>;
     /**
      * Ignore certain packages.
      */
-    ignorePackages?: string[];
-}
-/**
- * Config Service.
- */
-export interface IConfigService {
-    /**
-     * Get typesync config.
-     */
-    readConfig(filePath: string, flags: ICLIArguments['flags']): Promise<ISyncOptions>;
-}
-/**
- * Fetches info about a package.
- */
-export interface IPackageSource {
-    /**
-     * Fetches package info from an external source.
-     *
-     * @param packageName
-     */
-    fetch(packageName: string): Promise<IPackageInfo | null>;
-}
-/**
- * File service.
- */
-export interface IPackageJSONService {
-    /**
-     * Reads and parses JSON from the specified file. Path is relative to the current working directory.
-     */
-    readPackageFile(filePath: string): Promise<IPackageFile>;
-    /**
-     * Writes the JSON to the specified file.
-     */
-    writePackageFile(filePath: string, fileContents: IPackageFile): Promise<void>;
-}
-/**
- * Interface for the Package Info structure.
- */
-export interface IPackageInfo {
-    name: string;
-    latestVersion: string;
-    deprecated: boolean;
-    versions: Array<IPackageVersionInfo>;
-}
-/**
- * Version descriptor for versions returned in remote package info.
- */
-export interface IPackageVersionInfo {
-    version: string;
-    containsInternalTypings: boolean;
+    ignorePackages?: Array<string>;
 }
 /**
  * Package.json file.
@@ -75,26 +27,13 @@ export interface IPackageFile {
     devDependencies?: IDependenciesSection;
     peerDependencies?: IDependenciesSection;
     optionalDependencies?: IDependenciesSection;
-    packages?: IWorkspacesSection;
-    workspaces?: IWorkspacesSection | IYarnWorkspacesConfig;
-    [key: string]: any;
+    workspaces?: IWorkspacesSection;
+    [key: string]: unknown;
 }
 /**
  * Section in package.json representing dependencies.
  */
-export interface IDependenciesSection {
-    [packageName: string]: string;
-}
-/**
- * Section in package.json representing workspaces (yarn/lerna).
- */
-export type IWorkspacesSection = Array<string>;
-/**
- * Yarn is a special snowflake.
- */
-export interface IYarnWorkspacesConfig {
-    packages: IWorkspacesSection;
-}
+export type IDependenciesSection = Record<string, string>;
 /**
  * Package + version record, collected from the {"package": "^1.2.3"} sections.
  */
@@ -155,8 +94,6 @@ export declare enum IDependencySection {
  * CLI arguments.
  */
 export interface ICLIArguments {
-    flags: {
-        [key: string]: boolean | string | undefined;
-    };
+    flags: Record<string, boolean | string | undefined>;
     args: Array<string>;
 }

package/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAmKA;;GAEG;AACH,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,iCAAW,CAAA;IACX,mCAAa,CAAA;IACb,2CAAqB,CAAA;IACrB,mCAAa,CAAA;AACf,CAAC,EALW,kBAAkB,kCAAlB,kBAAkB,QAK7B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AA6FA;;GAEG;AACH,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,iCAAW,CAAA;IACX,mCAAa,CAAA;IACb,2CAAqB,CAAA;IACrB,mCAAa,CAAA;AACf,CAAC,EALW,kBAAkB,kCAAlB,kBAAkB,QAK7B"}

package/lib/util.d.ts

@@ -1,4 +1,4 @@
-import { IWorkspacesSection, IYarnWorkspacesConfig } from './types';
+import type { IWorkspacesArray, IWorkspacesSection } from './workspace-resolver';
 /**
  * Returns unique items.
  *
@@ -38,28 +38,16 @@ export declare function untyped(name: string): string;
  * Orders an object.
  * @param source
  */
-export declare function orderObject<T extends Record<string | number | symbol, unknown>>(source: T, comparer?: (a: string, b: string) => number): T;
-/**
- * Promisifies the specified function.
- *
- * @param fn
- */
-export declare function promisify(fn: (...args: any[]) => void): (...args: any[]) => Promise<any>;
-/**
- * Flattens a 2-dimensional array.
- *
- * @param source
- */
-export declare function flatten<T>(source: Array<Array<T>>): Array<T>;
+export declare function orderObject<T extends Record<string | number | symbol, U>, U>(source: T, comparer?: (a: string, b: string) => number): T;
 /**
  * Async memoize.
  *
  * @param fn
  */
-export declare function memoizeAsync<U extends any[], V>(fn: (...args: U) => Promise<V>): (...args: U) => Promise<V>;
+export declare function memoizeAsync<U extends Array<W>, V, W>(fn: (...args: U) => Promise<V>): (...args: U) => Promise<V>;
 /**
  * Ensures that we have a valid workspaces array.
  *
  * @param data
  */
-export declare function ensureWorkspacesArray(data?: IWorkspacesSection | IYarnWorkspacesConfig): IWorkspacesSection;
+export declare function ensureWorkspacesArray(data?: IWorkspacesSection): IWorkspacesArray;