sandstone-cli 2.3.0 → 2.3.2

package/bun.lock

@@ -31,7 +31,7 @@
         "@types/semver": "^7.5.3",
         "bun-types": "^1.3.9",
         "node-pty": "^1.1.0",
-        "sandstone": "^1.0.0-beta.2",
+        "sandstone": "^1.0.0-beta.3",
         "typescript": "^5.2.2",
       },
     },
@@ -370,7 +370,7 @@
 
     "safer-buffer": ["safer-buffer@2.1.2", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="],
 
-    "sandstone": ["sandstone@1.0.0-beta.2", "", { "dependencies": { "@sinclair/typebox": "^0.31.21", "@smithed-mc/data-types": "^0.1.2", "@types/nearley": "^2.11.5", "@types/node": "24", "@typescript/analyze-trace": "^0.4.0", "adm-zip": "^0.5.10", "fs-extra": "^11.1.1", "lodash": "^4.17.21", "nanoid": "^3.3.6", "nearley": "^2.20.1", "node-fetch": "^3.3.2", "prismarine-nbt": "^2.2.1", "semver": "^7.5.4" } }, "sha512-8VBne5JcvcfPGP/LZRsd5G4ViGo6aWblgfr6xdWZP0k73k2nvZpgbCimT4EVBDyBAEuFCkMHTq5z9aoo/W4uYA=="],
+    "sandstone": ["sandstone@1.0.0-beta.3", "", { "dependencies": { "@sinclair/typebox": "^0.31.21", "@smithed-mc/data-types": "^0.1.2", "@types/nearley": "^2.11.5", "@types/node": "24", "@typescript/analyze-trace": "^0.4.0", "adm-zip": "^0.5.10", "fs-extra": "^11.1.1", "lodash": "^4.17.21", "nanoid": "^3.3.6", "nearley": "^2.20.1", "node-fetch": "^3.3.2", "prismarine-nbt": "^2.2.1", "semver": "^7.5.4" } }, "sha512-aQNz7uxBQW+B5mQshFiFnTt81ecc77KIih7jDvryM0kdhqtOuF5hwxR7vi3RXvTWkrLVGpnW/D3qClj3ufD0FQ=="],
 
     "scheduler": ["scheduler@0.27.0", "", {}, "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q=="],
 

package/lib/create.js

@@ -5680,7 +5680,7 @@ var {
 import figlet from "figlet";
 
 // src/version.ts
-var CLI_VERSION = "2.3.0";
+var CLI_VERSION = "2.3.2";
 
 // src/commands/create.ts
 var import_semver = __toESM(require_semver2(), 1);
@@ -6789,7 +6789,7 @@ async function createCommand2(_project, opts) {
     default: false
   }) === true ? "library" : "pack";
   const sv = (v) => new import_semver.SemVer(v);
-  const versions = [[sv("1.0.0-beta.2"), sv(CLI_VERSION)]];
+  const versions = [[sv("1.0.0-beta.3"), sv(CLI_VERSION)]];
   const version = await select({
     message: "Which version of Sandstone do you want to use? These are the only supported versions for new projects.",
     choices: versions.map((v) => {

package/lib/index.js

@@ -22574,7 +22574,7 @@ var {
 import figlet from "figlet";
 
 // src/version.ts
-var CLI_VERSION = "2.3.0";
+var CLI_VERSION = "2.3.2";
 
 // src/commands/build/index.ts
 var import_fs_extra4 = __toESM(require_lib(), 1);
@@ -23816,14 +23816,34 @@ ${e.message || e}`;
     }
   }
   if (cliOptions.dry !== true) {
+    const deletedDirs = new Set;
     for (const file of Object.keys(oldCache.files)) {
       if (!(file in newCache.files)) {
-        await import_fs_extra4.default.rm(path5.join(outputFolder, file));
+        const fileDir = path5.dirname(file);
+        if (deletedDirs.has(fileDir))
+          continue;
+        let skipFile = false;
+        for (const deletedDir of deletedDirs) {
+          if (fileDir.startsWith(deletedDir + path5.sep)) {
+            skipFile = true;
+            break;
+          }
+        }
+        if (skipFile)
+          continue;
+        try {
+          await import_fs_extra4.default.rm(path5.join(outputFolder, file));
+        } catch (e) {
+          if (e.code !== "ENOENT")
+            throw e;
+          log(source_default.yellow("Warning:"), `Cached file not found during cleanup: ${file}`);
+        }
         let dir = undefined;
-        for (const segment of $split(new RegExp(RegExp.escape(path5.sep)), path5.dirname(file))) {
+        for (const segment of $split(new RegExp(RegExp.escape(path5.sep)), fileDir)) {
           dir = dir === undefined ? segment : path5.join(dir, segment);
           if (!newDirs.has(dir)) {
             await import_fs_extra4.default.rm(path5.join(outputFolder, dir), { force: true, recursive: true });
+            deletedDirs.add(dir);
             break;
           }
         }
@@ -24476,7 +24496,7 @@ async function createCommand2(_project, opts) {
     default: false
   }) === true ? "library" : "pack";
   const sv = (v) => new import_semver.SemVer(v);
-  const versions = [[sv("1.0.0-beta.2"), sv(CLI_VERSION)]];
+  const versions = [[sv("1.0.0-beta.3"), sv(CLI_VERSION)]];
   const version = await select({
     message: "Which version of Sandstone do you want to use? These are the only supported versions for new projects.",
     choices: versions.map((v) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandstone-cli",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "The CLI for Sandstone - the minecraft pack creation library.",
   "type": "module",
   "exports": "./lib/index.js",
@@ -69,7 +69,7 @@
     "@types/semver": "^7.5.3",
     "bun-types": "^1.3.9",
     "node-pty": "^1.1.0",
-    "sandstone": "^1.0.0-beta.2",
+    "sandstone": "^1.0.0-beta.3",
     "typescript": "^5.2.2"
   },
   "trustedDependencies": [

package/src/commands/build/index.ts

@@ -320,7 +320,7 @@ async function _buildProject(
     dry: cliOptions.dry ?? false,
     verbose: cliOptions.verbose ?? false,
 
-    // TODO !: Remove this type cast after beta 2
+    // TODO: Implement `contentSummary` and remove this typecast
     fileHandler: (saveOptions.customFileHandler as ((relativePath: string, content: any) => Promise<void>) | undefined) ??
       (async (relativePath: string, content: any) => {
         let pathPass = true
@@ -426,16 +426,36 @@ async function _buildProject(
 
   // Clean up old files and directories
   if (cliOptions.dry !== true) {
+    const deletedDirs = new Set<string>()
+
     for (const file of Object.keys(oldCache.files)) {
       if (!(file in newCache.files)) {
-        await fs.rm(path.join(outputFolder, file))
+        // Skip files whose parent directory was already deleted
+        const fileDir = path.dirname(file)
+        if (deletedDirs.has(fileDir)) continue
+        let skipFile = false
+        for (const deletedDir of deletedDirs) {
+          if (fileDir.startsWith(deletedDir + path.sep)) {
+            skipFile = true
+            break
+          }
+        }
+        if (skipFile) continue
+
+        try {
+          await fs.rm(path.join(outputFolder, file))
+        } catch (e: any) {
+          if (e.code !== 'ENOENT') throw e
+          log(chalk.yellow('Warning:'), `Cached file not found during cleanup: ${file}`)
+        }
 
         let dir: string | undefined = undefined
-        for (const segment of split(new RegExp(RegExp.escape(path.sep)), path.dirname(file))) {
+        for (const segment of split(new RegExp(RegExp.escape(path.sep)), fileDir)) {
           dir = dir === undefined ? segment : path.join(dir, segment)
 
           if (!newDirs.has(dir)) {
             await fs.rm(path.join(outputFolder, dir), { force: true, recursive: true })
+            deletedDirs.add(dir)
             break
           }
         }

package/src/commands/create.ts

@@ -130,7 +130,7 @@ export async function createCommand(_project: string, opts: CreateOptions) {
 
   const sv = (v: string) => new SemVer(v)
 
-  const versions = [[sv('1.0.0-beta.2'), sv(CLI_VERSION)]] as const
+  const versions = [[sv('1.0.0-beta.3'), sv(CLI_VERSION)]] as const
 
   const version = await select({
     message: 'Which version of Sandstone do you want to use? These are the only supported versions for new projects.',

package/src/version.ts

@@ -1 +1 @@
-export const CLI_VERSION = '2.3.0'
+export const CLI_VERSION = '2.3.2'