@latticexyz/world 2.2.22-a3645c819959efe97ff2e50f6f5b88ebe77fa980 → 2.2.22-ab837ceb49fa77cc29487bb9df0c487975b37afe

package/dist/node.js

@@ -557,7 +557,7 @@ function renderWorldInterface({
 }
 
 // ts/node/render-solidity/worldgen.ts
-import fs from "node:fs/promises";
+import fs2 from "node:fs/promises";
 import path4 from "node:path";
 import { formatAndWriteSolidity, contractToInterface } from "@latticexyz/common/codegen";
 
@@ -566,6 +566,7 @@ import { isHex } from "viem";
 
 // ts/node/getSystemContracts.ts
 import path3 from "node:path";
+import fs from "node:fs/promises";
 
 // ts/node/findSolidityFiles.ts
 import path2 from "node:path";
@@ -5274,8 +5275,8 @@ var PathScurryBase = class {
    *
    * @internal
    */
-  constructor(cwd = process.cwd(), pathImpl, sep2, { nocase, childrenCacheSize = 16 * 1024, fs: fs3 = defaultFS } = {}) {
-    this.#fs = fsFromOption(fs3);
+  constructor(cwd = process.cwd(), pathImpl, sep2, { nocase, childrenCacheSize = 16 * 1024, fs: fs4 = defaultFS } = {}) {
+    this.#fs = fsFromOption(fs4);
     if (cwd instanceof URL || cwd.startsWith("file://")) {
       cwd = fileURLToPath(cwd);
     }
@@ -5833,8 +5834,8 @@ var PathScurryWin32 = class extends PathScurryBase {
   /**
    * @internal
    */
-  newRoot(fs3) {
-    return new PathWin32(this.rootPath, IFDIR, void 0, this.roots, this.nocase, this.childrenCache(), { fs: fs3 });
+  newRoot(fs4) {
+    return new PathWin32(this.rootPath, IFDIR, void 0, this.roots, this.nocase, this.childrenCache(), { fs: fs4 });
   }
   /**
    * Return true if the provided path string is an absolute path
@@ -5862,8 +5863,8 @@ var PathScurryPosix = class extends PathScurryBase {
   /**
    * @internal
    */
-  newRoot(fs3) {
-    return new PathPosix(this.rootPath, IFDIR, void 0, this.roots, this.nocase, this.childrenCache(), { fs: fs3 });
+  newRoot(fs4) {
+    return new PathPosix(this.rootPath, IFDIR, void 0, this.roots, this.nocase, this.childrenCache(), { fs: fs4 });
   }
   /**
    * Return true if the provided path string is an absolute path
@@ -6951,19 +6952,25 @@ async function findSolidityFiles({ cwd, pattern = "**" }) {
 }
 
 // ts/node/getSystemContracts.ts
+import { parseSystem } from "@latticexyz/common/codegen";
+import { isDefined } from "@latticexyz/common/utils";
 async function getSystemContracts({
   rootDir,
   config
 }) {
-  const solidityFiles = await findSolidityFiles({
+  const filePaths = await findSolidityFiles({
     cwd: rootDir,
     pattern: path3.join(config.sourceDirectory, "**")
   });
-  return solidityFiles.filter(
-    (file) => file.basename.endsWith("System") && // exclude the base System contract
-    file.basename !== "System" && // exclude interfaces
-    !/^I[A-Z]/.test(file.basename)
-  ).map((file) => {
+  const files = await Promise.all(
+    filePaths.map(async (file) => {
+      const source = await fs.readFile(path3.join(rootDir, file.filename), "utf-8");
+      return { ...file, source };
+    })
+  );
+  return files.map((file) => {
+    const parsedSystem = parseSystem(file.source, file.basename);
+    if (!parsedSystem) return;
     const namespaceLabel = (() => {
       if (!config.multipleNamespaces && config.namespace != null) return config.namespace;
       const relativePath = path3.relative(path3.join(rootDir, config.sourceDirectory), file.filename);
@@ -6980,7 +6987,7 @@ async function getSystemContracts({
       namespaceLabel,
       systemLabel: file.basename
     };
-  });
+  }).filter(isDefined);
 }
 
 // ts/node/resolveSystems.ts
@@ -7058,8 +7065,8 @@ async function worldgen({
   if (clean) {
     const libraryDirs = [...new Set(systems.map(({ libraryPath }) => path4.dirname(libraryPath)))];
     await Promise.all([
-      fs.rm(worldgenOutDir, { recursive: true, force: true }),
-      ...libraryDirs.map((dir) => fs.rm(dir, { recursive: true, force: true }))
+      fs2.rm(worldgenOutDir, { recursive: true, force: true }),
+      ...libraryDirs.map((dir) => fs2.rm(dir, { recursive: true, force: true }))
     ]);
   }
   const outputPath = path4.join(worldgenOutDir, config.codegen.worldInterfaceName + ".sol");
@@ -7073,7 +7080,7 @@ async function worldgen({
   const worldImportPath = config.codegen.worldImportPath.startsWith(".") ? "./" + path4.relative(path4.dirname(outputPath), path4.join(rootDir, config.codegen.worldImportPath)) : config.codegen.worldImportPath;
   await Promise.all(
     systems.map(async (system) => {
-      const source = await fs.readFile(path4.join(rootDir, system.sourcePath), "utf8");
+      const source = await fs2.readFile(path4.join(rootDir, system.sourcePath), "utf8");
       const { functions, errors, symbolImports } = contractToInterface(source, system.label);
       const interfaceImports = symbolImports.map(
         ({ symbol, path: importPath }) => ({
@@ -7133,7 +7140,7 @@ async function worldgen({
 import path5 from "node:path";
 import { readFile } from "node:fs/promises";
 import { type as type2 } from "arktype";
-import { indent, isDefined } from "@latticexyz/common/utils";
+import { indent, isDefined as isDefined2 } from "@latticexyz/common/utils";
 import { size, sliceHex } from "viem";
 
 // ts/node/common.ts
@@ -7211,7 +7218,7 @@ ${indent(artifact.message)}`);
       return;
     }
     return artifact;
-  }).filter(isDefined).filter(hasMetadata).map((artifact) => {
+  }).filter(isDefined2).filter(hasMetadata).map((artifact) => {
     artifact;
     const sourcePath = Object.keys(artifact.metadata.settings.compilationTarget)[0];
     const name = artifact.metadata.settings.compilationTarget[sourcePath];
@@ -7320,7 +7327,7 @@ async function buildSystemsManifest(opts) {
 }
 
 // ts/node/loadSystemsManifest.ts
-import fs2 from "node:fs/promises";
+import fs3 from "node:fs/promises";
 import path7 from "node:path";
 import { type as type4 } from "arktype";
 import { indent as indent2 } from "@latticexyz/common/utils";
@@ -7328,13 +7335,13 @@ var parseManifest = type4("string").pipe.try((s) => JSON.parse(s), SystemsManife
 async function loadSystemsManifest(opts) {
   const outFile = path7.join(opts.rootDir, systemsManifestFilename);
   try {
-    await fs2.access(outFile, fs2.constants.F_OK | fs2.constants.R_OK);
+    await fs3.access(outFile, fs3.constants.F_OK | fs3.constants.R_OK);
   } catch (error2) {
     throw new Error(
       `Systems manifest at "${systemsManifestFilename}" not found or not readable. Run \`mud build\` before trying again.`
     );
   }
-  const json = await fs2.readFile(outFile, "utf8");
+  const json = await fs3.readFile(outFile, "utf8");
   const manifest = parseManifest(json);
   if (manifest instanceof type4.errors) {
     throw new Error(