Merge pull request #264 from Microsoft/old_versions

Support multiple major versions of each package

Author: Andy

packages/types-publisher/src/check-parse-results.ts

@@ -3,7 +3,7 @@ import { settings } from "./lib/common";
 import { AllPackages, TypingsData } from "./lib/packages";
 import { Logger, logger, writeLog } from "./util/logging";
 import { fetchJson} from "./util/io";
-import { best, done, nAtATime } from "./util/util";
+import { best, done, multiMapAdd, nAtATime } from "./util/util";
 
 if (!module.parent) {
 	done(main(true));
@@ -17,33 +17,36 @@ export default async function main(includeNpmChecks: boolean): Promise<void> {
 	if (includeNpmChecks) {
 		await nAtATime(10, packages, pkg => checkNpm(pkg, log), {
 			name: "Checking for typed packages...",
-			flavor: pkg => pkg.typingsPackageName
+			flavor: pkg => pkg.desc
 		});
 	}
 	await writeLog("conflicts.md", logResult());
 }
 
 function check(infos: TypingsData[], func: (info: TypingsData) => string | undefined, key: string, log: Logger): void {
-	const lookup: { [libName: string]: string[] } = {};
-	infos.forEach(info => {
-		const name = func(info);
-		if (name !== undefined) {
-			(lookup[name] || (lookup[name] = [])).push(info.typingsPackageName);
+	const lookup = new Map<string, TypingsData[]>();
+	for (const info of infos) {
+		const libraryOrProjectName = func(info);
+		if (libraryOrProjectName !== undefined) {
+			multiMapAdd(lookup, libraryOrProjectName, info);
 		}
-	});
-	for (const k of Object.keys(lookup)) {
-		if (lookup[k].length > 1) {
-			log(` * Duplicate ${key} descriptions "${k}"`);
-			lookup[k].forEach(n => log(`   * ${n}`));
+	}
+
+	for (const [libName, values] of lookup) {
+		if (values.length > 1) {
+			log(` * Duplicate ${key} descriptions "${libName}"`);
+			for (const n of values) {
+				log(`   * ${n.desc}`);
+			}
 		}
 	}
 }
 
 async function checkNpm(pkg: TypingsData, log: Logger): Promise<void> {
-	const asOfVersion = await firstPackageVersionWithTypes(pkg.typingsPackageName);
+	const asOfVersion = await firstPackageVersionWithTypes(pkg.name);
 	if (asOfVersion) {
-		const ourVersion = `${pkg.libraryMajorVersion}.${pkg.libraryMinorVersion}`;
-		log(`Typings already defined for ${pkg.typingsPackageName} (${pkg.libraryName}) as of ${asOfVersion} (our version: ${ourVersion})`);
+		const ourVersion = `${pkg.major}.${pkg.minor}`;
+		log(`Typings already defined for ${pkg.name} (${pkg.libraryName}) as of ${asOfVersion} (our version: ${ourVersion})`);
 	}
 }
 

packages/types-publisher/src/create-search-index.ts

@@ -20,9 +20,7 @@ export default async function main(skipDownloads: boolean, full: boolean): Promi
 	const packages = await AllPackages.readTypings();
 	console.log(`Generating search index...`);
 
-	const records = await nAtATime(25, packages, pkg => createSearchRecord(pkg, skipDownloads), {
-		name: "Indexing...", flavor: pkg => pkg.typingsPackageName
-	});
+	const records = await nAtATime(25, packages, pkg => createSearchRecord(pkg, skipDownloads), { name: "Indexing...", flavor: pkg => pkg.desc });
 	// Most downloads first
 	records.sort((a, b) => b.d - a.d);
 

packages/types-publisher/src/generate-packages.ts

@@ -29,7 +29,7 @@ export default async function main(options: Options, all = false, tgz = false):
 	await nAtATime(10, packages, async pkg => {
 		const logs = await generateAnyPackage(pkg, allPackages, versions, options);
 		if (tgz) {
-			await writeTgz(pkg.getOutputPath(), pkg.getOutputPath() + ".tgz");
+			await writeTgz(pkg.outputDirectory, pkg.outputDirectory + ".tgz");
 		}
 		log(` * ${pkg.libraryName}`);
 		moveLogs(log, logs, line => `   * ${line}`);
@@ -40,7 +40,7 @@ export default async function main(options: Options, all = false, tgz = false):
 
 async function single(singleName: string, options: Options): Promise<void> {
 	const allPackages = await AllPackages.read(options);
-	const pkg = allPackages.getAnyPackage(singleName);
+	const pkg = allPackages.getLatestVersion(singleName);
 	const versions = await Versions.load();
 	const logs = await generateAnyPackage(pkg, allPackages, versions, options);
 	console.log(logs.join("\n"));

packages/types-publisher/src/lib/common.ts

@@ -49,3 +49,7 @@ const dataDir = path.join(home, "data");
 function dataFilePath(filename: string) {
 	return path.join(dataDir, filename);
 }
+
+export function isTypingDirectory(directoryName: string) {
+	return directoryName !== "node_modules" && directoryName !== "scripts";
+}