Only use nodecg-types for new versions and nodecg for 0.1

Author: hlxid

package-lock.json

@@ -42,7 +42,7 @@ export async function genExtension(opts: GenerationOptions, install: ProductionI
     genImport(writer, "requireService", opts.corePackage.name, opts.language);
 
     if (opts.language === "typescript") {
-        genImport(writer, "NodeCG", "nodecg-types/types/server", opts.language);
+        genImport(writer, "NodeCG", `${opts.nodeeCGTypingsPackage}/types/server`, opts.language);
         // Service import statements
         services.forEach((svc) => {
             genImport(writer, svc.clientName, svc.packageName, opts.language);

src/generate/extension.ts

@@ -50,7 +50,7 @@ async function genDependencies(opts: GenerationOptions, serviceDeps: Dependency[
 
     if (opts.language === "typescript") {
         // For typescript we need core, all services (for typings) and special packages like ts itself or node typings.
-        const deps = [core, ...serviceDeps, ...(await genTypeScriptDependencies())];
+        const deps = [core, ...serviceDeps, ...(await genTypeScriptDependencies(opts))];
         deps.sort();
         return deps;
     } else {
@@ -64,16 +64,16 @@ async function genDependencies(opts: GenerationOptions, serviceDeps: Dependency[
  * and types for node.
  * @param nodecgDir the directory in which nodecg is installed. Used to get nodecg version which will be used by nodecg dependency.
  */
-async function genTypeScriptDependencies(): Promise<Dependency[]> {
-    logger.debug("Fetching latest nodecg-types, typescript and @types/node versions...");
+async function genTypeScriptDependencies(opts: GenerationOptions): Promise<Dependency[]> {
+    logger.debug(`Fetching latest ${opts.nodeeCGTypingsPackage}, typescript and @types/node versions...`);
     const [nodecgVersion, latestNodeTypes, latestTypeScript] = await Promise.all([
-        getLatestPackageVersion("nodecg-types"),
+        getLatestPackageVersion(opts.nodeeCGTypingsPackage),
         getLatestPackageVersion("@types/node"),
         getLatestPackageVersion("typescript"),
     ]);
 
     return [
-        ["nodecg-types", addSemverCaret(nodecgVersion)],
+        [opts.nodeeCGTypingsPackage, addSemverCaret(nodecgVersion)],
         ["@types/node", addSemverCaret(latestNodeTypes)],
         ["typescript", addSemverCaret(latestTypeScript)],
     ];

src/generate/packageJson.ts

@@ -28,6 +28,7 @@ export interface PromptedGenerationOptions {
 export interface GenerationOptions extends PromptedGenerationOptions {
     servicePackages: NpmPackage[];
     corePackage: NpmPackage;
+    nodeeCGTypingsPackage: "nodecg" | "nodecg-types";
     bundlePath: string;
 }
 
@@ -169,5 +170,6 @@ export function computeGenOptsFields(
             return svcPackage;
         }),
         bundlePath: path.join(opts.bundleDir, opts.bundleName),
+        nodeeCGTypingsPackage: install.version === "0.1" ? "nodecg" : "nodecg-types",
     };
 }

src/generate/prompt.ts

@@ -6,8 +6,8 @@ import * as installation from "../../src/utils/installation";
 import * as fsUtils from "../../src/utils/fs";
 import * as npm from "../../src/utils/npm";
 import { ensureValidInstallation, generateBundle } from "../../src/generate";
-import { GenerationOptions } from "../../src/generate/prompt";
-import { defaultOpts, jsOpts } from "./opts.util";
+import { computeGenOptsFields, GenerationOptions } from "../../src/generate/prompt";
+import { defaultOpts, defaultOptsPrompt, jsOpts } from "./opts.util";
 
 const nodecgPackageJsonPath = path.join(fsRoot, "package.json");
 const packageJsonPath = path.join(defaultOpts.bundlePath, "package.json");
@@ -109,6 +109,16 @@ describe("genPackageJson", () => {
         // These dependencies should always have the latest version which is fetched by the mocked getLatestPackageVersion
         expect(e).toEqual(expect.arrayContaining([["typescript", `^1.2.3`]]));
         expect(e).toEqual(expect.arrayContaining([["@types/node", `^1.2.3`]]));
+        expect(e).toEqual(expect.arrayContaining([["nodecg", `^1.2.3`]]));
+    });
+
+    test("should use nodecg-types for 0.2 or higher", async () => {
+        const opts = computeGenOptsFields(defaultOptsPrompt, { ...validProdInstall, version: "0.2" });
+        const deps = (await genPackageJSON(opts))["dependencies"];
+        const e = Object.entries(deps);
+        expect(e).toEqual(expect.arrayContaining([[twitchChatPkg.name, `^${twitchChatPkg.version}`]]));
+
+        // These dependencies should always have the latest version which is fetched by the mocked getLatestPackageVersion
         expect(e).toEqual(expect.arrayContaining([["nodecg-types", `^1.2.3`]]));
     });