fix(install): cannot install when workdir not name and version (#20)

Signed-off-by: Kevin Cui <[email protected]>

Author: BlackHole1

src/cmd/install.ts

@@ -7,6 +7,7 @@ import { env } from "../utils/misc";
 import {
     findLatestVersion,
     generatePackageJson,
+    getDependencies,
     initPackageJson,
     transformNodeModules,
     updateDependencies,
@@ -101,7 +102,7 @@ export async function installFile(options: InstallFileOptions): Promise<InstallF
 // oopm install foo
 // oopm install [email protected]
 export async function installPackage(options: InstallPackageOptions): Promise<InstallPackageResult> {
-    const libraryMeta = await generatePackageJson(options.workdir, false);
+    const dependencies = await getDependencies(options.workdir);
 
     const alreadyInstalled: Deps = [];
     const needInstall: Deps = [];
@@ -112,16 +113,16 @@ export async function installPackage(options: InstallPackageOptions): Promise<In
             let version = dep.version;
 
             if (!version) {
-                if (libraryMeta?.dependencies?.[dep.name]) {
-                    version = libraryMeta?.dependencies?.[dep.name] as string;
+                if (dependencies?.[dep.name]) {
+                    version = dependencies?.[dep.name] as string;
                 }
                 else {
                     version = await findLatestVersion(dep.name, options.registry, options.token);
                 }
             }
 
             const existsDisk = await exists(path.join(options.distDir, `${dep.name}-${version}`, ooPackageName));
-            if (existsDisk && libraryMeta?.dependencies?.[dep.name] === version) {
+            if (existsDisk && dependencies?.[dep.name] === version) {
                 alreadyInstalled.push({
                     name: dep.name,
                     version,
@@ -135,11 +136,11 @@ export async function installPackage(options: InstallPackageOptions): Promise<In
             }
         });
 
-        Object.keys(libraryMeta?.dependencies || {}).forEach((key) => {
+        Object.keys(dependencies).forEach((key) => {
             p.push((async (key) => {
                 const dep: Dep = {
                     name: key,
-                    version: libraryMeta.dependencies![key],
+                    version: dependencies![key],
                 };
 
                 const existsDisk = await exists(path.join(options.distDir, `${dep.name}-${dep.version}`, ooPackageName));
@@ -169,16 +170,16 @@ export async function installPackage(options: InstallPackageOptions): Promise<In
 
 // oopm install
 export async function installAll(options: InstallAllOptions): Promise<InstallAllResult> {
-    const libraryMeta = await generatePackageJson(options.workdir, false);
+    const dependencies = await getDependencies(options.workdir);
 
     const alreadyInstalled: Deps = [];
     const needInstall: Deps = [];
 
     {
-        const p = Object.keys(libraryMeta?.dependencies || {}).map(async (key) => {
+        const p = Object.keys(dependencies).map(async (key) => {
             const dep: Dep = {
                 name: key,
-                version: libraryMeta.dependencies![key],
+                version: dependencies![key],
             };
 
             const existsDisk = await exists(path.join(options.distDir, `${dep.name}-${dep.version}`, ooPackageName));

src/utils/npm.ts

@@ -6,6 +6,16 @@ import { ooPackageName } from "../const";
 import { exists, readFile, writeFile } from "./fs";
 import { nerfURL } from "./misc";
 
+export async function getDependencies(dir: string): Promise<Record<string, string>> {
+    const ooPackagePath = path.join(dir, ooPackageName);
+    if (!await exists(path.join(dir, ooPackageName))) {
+        return {};
+    }
+
+    const content = YAML.parse(await readFile(ooPackagePath)) as OOPackageSchema;
+    return content.dependencies ?? {};
+}
+
 export async function generatePackageJson(dir: string, stringify: true): Promise<string>;
 export async function generatePackageJson(dir: string): Promise<string>;
 export async function generatePackageJson(dir: string, stringify: false): Promise<OOPackageSchema>;
@@ -37,23 +47,20 @@ export async function generatePackageJson(dir: string, stringify = true): Promis
 }
 
 export async function updateDependencies(dir: string, deps: Deps) {
-    const meta = await generatePackageJson(dir, false);
-    if (!meta.dependencies) {
-        meta.dependencies = {};
-    }
+    const rawContent = await readFile(path.join(dir, ooPackageName));
+    const content = YAML.parse(rawContent) as OOPackageSchema;
 
-    for (const dep of deps) {
-        meta.dependencies[dep.name] = dep.version;
+    if (!content.dependencies) {
+        content.dependencies = {};
     }
-
-    if ("scripts" in meta) {
-        // eslint-disable-next-line ts/ban-ts-comment
-        // @ts-expect-error
-        delete meta.scripts;
+    else {
+        for (const dep of deps) {
+            content.dependencies[dep.name] = dep.version;
+        }
     }
 
-    const content = YAML.stringify(meta);
-    await writeFile(path.join(dir, ooPackageName), content);
+    const yamlContent = YAML.stringify(content);
+    await writeFile(path.join(dir, ooPackageName), yamlContent);
 }
 
 export async function findLatestVersion(name: string, registry: string, token?: string): Promise<string> {