@latticexyz/cli 2.0.0-alpha.2 → 2.0.0-alpha.3

package/dist/{chunk-ZSZDPSLH.js → chunk-KJTPZOUH.js}

@@ -3651,13 +3651,17 @@ var commandModule9 = {
         description: `Backup fails if a "${BACKUP_FILE}" file is found, unless --force is provided`
       },
       restore: { type: "boolean", description: `Restore the previous MUD versions from "${BACKUP_FILE}"` },
-      mudVersion: { alias: "v", type: "string", description: "The MUD version to install" }
+      mudVersion: { alias: "v", type: "string", description: "The MUD version to install" },
+      link: { alias: "l", type: "string", description: "Relative path to the local MUD root directory to link" }
     });
   },
   async handler(options) {
     try {
-      if (!options.mudVersion && !options.restore) {
-        throw new MUDError3(`Version parameter is required unless --restore is provided.`);
+      if (!options.mudVersion && !options.link && !options.restore) {
+        throw new MUDError3("`--mudVersion` or `--link` is required unless --restore is provided.");
+      }
+      if (options.link && options.mudVersion) {
+        throw new MUDError3("Options `--link` and `--mudVersion` are mutually exclusive");
       }
       options.mudVersion = options.mudVersion === "canary" ? await getCanaryVersion(package_default.name) : options.mudVersion;
       const rootPath = "./package.json";
@@ -3676,9 +3680,13 @@ var commandModule9 = {
   }
 };
 function updatePackageJson(filePath, options) {
-  const { backup, restore, force, mudVersion } = options;
+  const { restore, force, link } = options;
+  let { backup, mudVersion } = options;
   const backupFilePath = path6.join(path6.dirname(filePath), BACKUP_FILE);
-  if (backup && !force && existsSync(backupFilePath)) {
+  const backupFileExists = existsSync(backupFilePath);
+  if (link && !backupFileExists)
+    backup = true;
+  if (backup && !force && backupFileExists) {
     throw new MUDError3(
       `A backup file already exists at ${backupFilePath}.
 Use --force to overwrite it or --restore to restore it.`
@@ -3707,12 +3715,12 @@ Use --force to overwrite it or --restore to restore it.`
   }
   for (const key in packageJson.dependencies) {
     if (key.startsWith(MUD_PREFIX)) {
-      packageJson.dependencies[key] = restore && backupJson ? backupJson.dependencies[key] : mudVersion || packageJson.dependencies[key];
+      packageJson.dependencies[key] = resolveMudVersion(key, "dependencies");
     }
   }
   for (const key in packageJson.devDependencies) {
     if (key.startsWith(MUD_PREFIX)) {
-      packageJson.devDependencies[key] = restore && backupJson ? backupJson.devDependencies[key] : mudVersion || packageJson.devDependencies[key];
+      packageJson.devDependencies[key] = resolveMudVersion(key, "devDependencies");
     }
   }
   writeFileSync3(filePath, JSON.stringify(packageJson, null, 2) + "\n");
@@ -3724,6 +3732,15 @@ Use --force to overwrite it or --restore to restore it.`
     console.log(chalk4.green(`Cleaned up ${backupFilePath}`));
   }
   return packageJson;
+  function resolveMudVersion(key, type) {
+    if (restore && backupJson)
+      return backupJson[type][key];
+    if (link)
+      mudVersion = resolveLinkPath(filePath, link, key);
+    if (!mudVersion)
+      return packageJson[type][key];
+    return mudVersion;
+  }
 }
 function readPackageJson(path7) {
   try {
@@ -3751,6 +3768,12 @@ function logComparison(prev, curr) {
     }
   }
 }
+function resolveLinkPath(packageJsonPath, mudLinkPath, pkg) {
+  const pkgName = pkg.replace(MUD_PREFIX, "");
+  const packageJsonToRootPath = path6.relative(path6.dirname(packageJsonPath), process.cwd());
+  const linkPath = path6.join(packageJsonToRootPath, mudLinkPath, "packages", pkgName);
+  return "link:" + linkPath;
+}
 var set_version_default = commandModule9;
 
 // src/commands/test-v2.ts

package/dist/mud.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   commands
-} from "./chunk-ZSZDPSLH.js";
+} from "./chunk-KJTPZOUH.js";
 import {
   logError
 } from "./chunk-YL4GJLLL.js";

package/dist/mud2.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   commands
-} from "./chunk-ZSZDPSLH.js";
+} from "./chunk-KJTPZOUH.js";
 import {
   logError
 } from "./chunk-YL4GJLLL.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@latticexyz/cli",
-  "version": "2.0.0-alpha.2+3be1cb4d",
+  "version": "2.0.0-alpha.3+5fff6670",
   "description": "Command line interface for mud",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -39,13 +39,13 @@
     "@ethersproject/providers": "^5.7.2",
     "@improbable-eng/grpc-web": "^0.15.0",
     "@improbable-eng/grpc-web-node-http-transport": "^0.15.0",
-    "@latticexyz/config": "2.0.0-alpha.2+3be1cb4d",
-    "@latticexyz/schema-type": "2.0.0-alpha.2+3be1cb4d",
-    "@latticexyz/services": "2.0.0-alpha.2+3be1cb4d",
-    "@latticexyz/solecs": "2.0.0-alpha.2+3be1cb4d",
-    "@latticexyz/std-contracts": "2.0.0-alpha.2+3be1cb4d",
-    "@latticexyz/store": "2.0.0-alpha.2+3be1cb4d",
-    "@latticexyz/world": "2.0.0-alpha.2+3be1cb4d",
+    "@latticexyz/config": "2.0.0-alpha.3+5fff6670",
+    "@latticexyz/schema-type": "2.0.0-alpha.3+5fff6670",
+    "@latticexyz/services": "2.0.0-alpha.3+5fff6670",
+    "@latticexyz/solecs": "2.0.0-alpha.3+5fff6670",
+    "@latticexyz/std-contracts": "2.0.0-alpha.3+5fff6670",
+    "@latticexyz/store": "2.0.0-alpha.3+5fff6670",
+    "@latticexyz/world": "2.0.0-alpha.3+5fff6670",
     "@solidity-parser/parser": "^0.16.0",
     "@typechain/ethers-v5": "^10.2.0",
     "chalk": "^5.0.1",
@@ -69,5 +69,5 @@
     "zod": "^3.21.4",
     "zod-validation-error": "^1.3.0"
   },
-  "gitHead": "3be1cb4d811f002e7f7b12cd9f4d4eef8aaf28eb"
+  "gitHead": "5fff6670e3dc3887a0af75355737e6874717ee25"
 }

package/src/commands/set-version.ts

@@ -11,6 +11,7 @@ type Options = {
   force?: boolean;
   restore?: boolean;
   mudVersion?: string;
+  link?: string;
 };
 
 const BACKUP_FILE = ".mudbackup";
@@ -30,13 +31,19 @@ const commandModule: CommandModule<Options, Options> = {
       },
       restore: { type: "boolean", description: `Restore the previous MUD versions from "${BACKUP_FILE}"` },
       mudVersion: { alias: "v", type: "string", description: "The MUD version to install" },
+      link: { alias: "l", type: "string", description: "Relative path to the local MUD root directory to link" },
     });
   },
 
   async handler(options) {
     try {
-      if (!options.mudVersion && !options.restore) {
-        throw new MUDError(`Version parameter is required unless --restore is provided.`);
+      if (!options.mudVersion && !options.link && !options.restore) {
+        throw new MUDError("`--mudVersion` or `--link` is required unless --restore is provided.");
+      }
+
+      // `link` and `mudVersion` are mutually exclusive
+      if (options.link && options.mudVersion) {
+        throw new MUDError("Options `--link` and `--mudVersion` are mutually exclusive");
       }
 
       // Resolve the `canary` version number if needed
@@ -63,11 +70,17 @@ const commandModule: CommandModule<Options, Options> = {
 };
 
 function updatePackageJson(filePath: string, options: Options): { workspaces?: string[] } {
-  const { backup, restore, force, mudVersion } = options;
+  const { restore, force, link } = options;
+  let { backup, mudVersion } = options;
+
   const backupFilePath = path.join(path.dirname(filePath), BACKUP_FILE);
+  const backupFileExists = existsSync(backupFilePath);
+
+  // Create a backup file for previous MUD versions by default if linking to local MUD
+  if (link && !backupFileExists) backup = true;
 
   // If `backup` is true and force not set, check if a backup file already exists and throw an error if it does
-  if (backup && !force && existsSync(backupFilePath)) {
+  if (backup && !force && backupFileExists) {
     throw new MUDError(
       `A backup file already exists at ${backupFilePath}.\nUse --force to overwrite it or --restore to restore it.`
     );
@@ -106,16 +119,14 @@ function updatePackageJson(filePath: string, options: Options): { workspaces?: s
   // Update the dependencies
   for (const key in packageJson.dependencies) {
     if (key.startsWith(MUD_PREFIX)) {
-      packageJson.dependencies[key] =
-        restore && backupJson ? backupJson.dependencies[key] : mudVersion || packageJson.dependencies[key];
+      packageJson.dependencies[key] = resolveMudVersion(key, "dependencies");
     }
   }
 
   // Update the devDependencies
   for (const key in packageJson.devDependencies) {
     if (key.startsWith(MUD_PREFIX)) {
-      packageJson.devDependencies[key] =
-        restore && backupJson ? backupJson.devDependencies[key] : mudVersion || packageJson.devDependencies[key];
+      packageJson.devDependencies[key] = resolveMudVersion(key, "devDependencies");
     }
   }
 
@@ -134,6 +145,13 @@ function updatePackageJson(filePath: string, options: Options): { workspaces?: s
   }
 
   return packageJson;
+
+  function resolveMudVersion(key: string, type: "dependencies" | "devDependencies") {
+    if (restore && backupJson) return backupJson[type][key];
+    if (link) mudVersion = resolveLinkPath(filePath, link, key);
+    if (!mudVersion) return packageJson[type][key];
+    return mudVersion;
+  }
 }
 
 function readPackageJson(path: string): {
@@ -169,4 +187,14 @@ function logComparison(prev: Record<string, string>, curr: Record<string, string
   }
 }
 
+/**
+ * Returns path of the package to link, given a path to a local MUD clone and a package
+ */
+function resolveLinkPath(packageJsonPath: string, mudLinkPath: string, pkg: string) {
+  const pkgName = pkg.replace(MUD_PREFIX, "");
+  const packageJsonToRootPath = path.relative(path.dirname(packageJsonPath), process.cwd());
+  const linkPath = path.join(packageJsonToRootPath, mudLinkPath, "packages", pkgName);
+  return "link:" + linkPath;
+}
+
 export default commandModule;