fix wally build

Author: jeparlefrancais

scripts/build-wally-package.sh

@@ -18,7 +18,7 @@ echo Process package
 mkdir -p $wally_package
 cp LICENSE $wally_package/LICENSE
 
-node ./scripts/npm-to-wally.js package.json $wally_package/wally.toml roblox/wally-package.project.json
+node ./scripts/npm-to-wally.js package.json $wally_package/wally.toml $wally_package/default.project.json roblox/wally-package.project.json
 
 cp .darklua-wally.json roblox
 cp -r node_modules/.luau-aliases/* roblox
@@ -27,5 +27,4 @@ rojo sourcemap roblox/wally-package.project.json --output roblox/sourcemap.json
 
 darklua process --config roblox/.darklua-wally.json roblox/src $wally_package/src
 
-cp default.project.json $wally_package
 wally package --project-path $wally_package --list

scripts/npm-to-wally.js

@@ -6,6 +6,11 @@ const fs = require("fs").promises;
 const path = require("path");
 const process = require("process");
 
+const extractPackageNameWhenScoped = (packageName) =>
+  packageName.startsWith("@")
+    ? packageName.substring(packageName.indexOf("/") + 1)
+    : packageName;
+
 const readPackageConfig = async (packagePath) => {
   const packageContent = await fs.readFile(packagePath).catch((err) => {
     console.error(`unable to read package.json at '${packagePath}': ${err}`);
@@ -24,26 +29,80 @@ const readPackageConfig = async (packagePath) => {
   return null;
 };
 
+const fileExists = async (filePath) => {
+  return await fs
+    .stat(filePath)
+    .then((stat) => stat.isFile())
+    .catch((err) => {
+      if (err.code === "ENOENT") {
+        return false;
+      }
+    });
+};
+
+const findPackagePath = async (workspacePath, packageName) => {
+  const trivialPath = path.join(
+    workspacePath,
+    extractPackageNameWhenScoped(packageName)
+  );
+
+  if (await fileExists(path.join(trivialPath, "package.json"))) {
+    return path.join(trivialPath);
+  }
+
+  const workspaceMembers = await fs.readdir(workspacePath);
+
+  for (const member of workspaceMembers) {
+    const memberPath = path.join(workspacePath, member);
+
+    const packageData = await fs
+      .readFile(path.join(memberPath, "package.json"))
+      .then((packageContent) => {
+        return JSON.parse(packageContent);
+      })
+      .catch(() => {
+        return null;
+      });
+
+    if (packageData?.name === packageName) {
+      return memberPath;
+    }
+  }
+
+  return null;
+};
+
 const main = async (
   packageJsonPath,
   wallyOutputPath,
+  wallyRojoConfigPath,
   rojoConfigPath,
   { workspacePath }
 ) => {
   const packageData = await readPackageConfig(packageJsonPath);
 
-  const { name: scopedName, version, license, dependencies = [] } = packageData;
+  const {
+    name: scopedName,
+    version,
+    license,
+    dependencies = [],
+    private,
+  } = packageData;
+
+  const tomlLines = ["[package]", `name = "${scopedName.substring(1)}"`];
+
+  if (private) {
+    tomlLines.push("private = true");
+  }
 
-  const tomlLines = [
-    "[package]",
-    `name = "${scopedName.substring(1)}"`,
+  tomlLines.push(
     `version = "${version}"`,
     'registry = "https://github.com/UpliftGames/wally-index"',
     'realm = "shared"',
     `license = "${license}"`,
     "",
-    "[dependencies]",
-  ];
+    "[dependencies]"
+  );
 
   const rojoConfig = {
     name: "WallyPackage",
@@ -58,9 +117,7 @@ const main = async (
   for (const [dependencyName, specifiedVersion] of Object.entries(
     dependencies
   )) {
-    const name = dependencyName.startsWith("@")
-      ? dependencyName.substring(dependencyName.indexOf("/") + 1)
-      : dependencyName;
+    const name = extractPackageNameWhenScoped(dependencyName);
 
     rojoConfig.tree[name] = {
       $path: dependencyName + ".luau",
@@ -69,11 +126,12 @@ const main = async (
     const wallyPackageName = name.indexOf("-") !== -1 ? `"${name}"` : name;
 
     if (specifiedVersion == "workspace:^") {
+      const packagePath =
+        workspacePath && (await findPackagePath(workspacePath, dependencyName));
+
       const dependentPackage =
-        workspacePath &&
-        (await readPackageConfig(
-          path.join(workspacePath, name, "package.json")
-        ));
+        packagePath &&
+        (await readPackageConfig(path.join(packagePath, "package.json")));
 
       if (dependentPackage) {
         tomlLines.push(
@@ -91,6 +149,13 @@ const main = async (
 
   tomlLines.push("");
 
+  const wallyRojoConfig = {
+    name: scopedName.substring(scopedName.indexOf("/") + 1),
+    tree: {
+      $path: "src",
+    },
+  };
+
   await Promise.all([
     fs.writeFile(wallyOutputPath, tomlLines.join("\n")).catch((err) => {
       console.error(
@@ -104,6 +169,13 @@ const main = async (
           `unable to write rojo config at '${rojoConfigPath}': ${err}`
         );
       }),
+    fs
+      .writeFile(wallyRojoConfigPath, JSON.stringify(wallyRojoConfig, null, 2))
+      .catch((err) => {
+        console.error(
+          `unable to write rojo config at '${wallyRojoConfigPath}': ${err}`
+        );
+      }),
   ]);
 };
 
@@ -115,17 +187,25 @@ const createCLI = () => {
     .description("a utility to convert npm packages to wally packages")
     .argument("<package-json>")
     .argument("<wally-toml>")
+    .argument("<wally-rojo-config>")
     .argument("<package-rojo-config>")
     .option(
       "--workspace-path <workspace>",
       "the path containing all workspace members"
     )
     .action(
-      async (packageJson, wallyToml, rojoConfig, { workspacePath = null }) => {
+      async (
+        packageJson,
+        wallyToml,
+        wallyRojoConfig,
+        rojoConfig,
+        { workspacePath = null }
+      ) => {
         const cwd = process.cwd();
-        main(
+        await main(
           path.join(cwd, packageJson),
           path.join(cwd, wallyToml),
+          path.join(cwd, wallyRojoConfig),
           path.join(cwd, rojoConfig),
           {
             workspacePath: workspacePath && path.join(cwd, workspacePath),