sandstone-cli 2.0.5 → 2.0.7

package/lib/commands/build.js

@@ -116,23 +116,64 @@ function countResources(sandstonePack) {
     }
     return { functions, other };
 }
+function splitPath(split) {
+    let parts = [];
+    let current = split;
+    while (current !== 'C:') {
+        let dirname = path.dirname(current);
+        if (dirname.endsWith('\\')) {
+            dirname = dirname.slice(0, -1);
+        }
+        parts.unshift(current.replace(`${dirname}${path.sep}`, ''));
+        current = dirname;
+    }
+    parts.unshift('C:');
+    return parts;
+}
 async function handleSymlink(folder, packName, cache, minecraftPath, targetPath, linkPath) {
-    const allowPath = `[glob]${path.resolve(folder)}${path.sep}**${path.sep}*`;
+    let rawPath = path.resolve(path.join(folder));
+    let sep = path.sep;
+    if (os.platform() === 'win32') {
+        sep = `${path.sep}${path.sep}`;
+        rawPath = splitPath(rawPath).join(sep);
+    }
+    const allowPath = `[glob]${rawPath}${sep}**${sep}*`;
     const allowedList = path.join(minecraftPath, 'allowed_symlinks.txt');
     const comment = `# Sandstone Pack: ${packName}\n`;
     try {
-        const currentlyAllowed = await fs.readFile(allowedList);
+        const currentlyAllowed = await fs.readFile(allowedList, 'utf-8');
         if (!currentlyAllowed.includes(allowPath)) {
+            log('[handleSymlink] Adding workspace to allowed_symlinks.txt at minecraft path. If the game is running please restart it.');
             await fs.writeFile(allowedList, `${currentlyAllowed}\n#\n${comment}${allowPath}`);
         }
+        else {
+            log('[handleSymlink] Workspace is already in allowed_symlinks.txt at minecraft path, skipping...');
+        }
     }
     catch (e) {
+        log('[handleSymlink] Creating allowed_symlinks.txt at minecraft path. If the game is running please restart it.');
         await fs.writeFile(allowedList, `${comment}${allowPath}`);
     }
-    await fs.lstat(linkPath).then(() => {
-        throw new Error(`Tried to add a symlink at "${linkPath}", encountered an existing file.`);
-    }).catch(() => { });
-    await fs.symlink(path.resolve(targetPath), linkPath);
+    let skip = false;
+    let errored = false;
+    try {
+        const stats = await fs.lstat(linkPath);
+        if (stats.isSymbolicLink() && await fs.readlink(linkPath) === path.resolve(targetPath)) {
+            log('[handleSymlink] Symlink already created, skipping...');
+            skip = true;
+        }
+        else {
+            errored = true;
+        }
+    }
+    catch { }
+    if (errored) {
+        throw new Error(`Tried to add a symlink at "${linkPath}",\n encountered an existing FS entry.`);
+    }
+    if (!skip) {
+        log(`[handleSymlink] Creating symlink for ${targetPath.replace(`${path.dirname(targetPath)}${path.sep}`, '')}`);
+        await fs.symlink(path.resolve(targetPath), linkPath);
+    }
     cache.symlinks ??= [];
     cache.symlinks.push(linkPath);
 }
@@ -456,7 +497,7 @@ async function _buildProject(cliOptions, folder, silent = false, existingContext
                 }
                 else if (symlinksAvailable) {
                     if (cache.symlinks === undefined || !cache.symlinks.includes(fullClientPath)) {
-                        handleSymlink(folder, packName, newCache, clientPath, outputPath, fullClientPath);
+                        await handleSymlink(folder, packName, newCache, clientPath, outputPath, fullClientPath);
                     }
                 }
                 else {
@@ -473,7 +514,7 @@ async function _buildProject(cliOptions, folder, silent = false, existingContext
                 }
                 else if (symlinksAvailable) {
                     if (cache.symlinks === undefined || !cache.symlinks.includes(fullServerPath)) {
-                        handleSymlink(folder, packName, newCache, serverPath, outputPath, fullServerPath);
+                        await handleSymlink(folder, packName, newCache, serverPath, outputPath, fullServerPath);
                     }
                 }
                 else {

package/lib/commands/create.js

@@ -24,7 +24,7 @@ export async function createCommand(_project, opts) {
         default: false,
     })) === true ? 'library' : 'pack';
     const sv = (v) => new SemVer(v);
-    const versions = [[sv('1.0.0-beta.1'), sv('2.0.4')]];
+    const versions = [[sv('1.0.0-beta.1'), sv('2.0.7')]];
     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/create.js

@@ -6,7 +6,7 @@ import { BuildDeclares } from './shared.js';
 const commander = new Command();
 console.log(figlet.textSync('Sandstone'));
 const createCLI = commander
-    .version('2.0.5')
+    .version('2.0.7')
     .description('Create a new Sandstone project. ⛏')
     .action(createCommand)
     .addArgument(new Argument('<projectName>', 'Not the name of the output pack'));

package/lib/index.js

@@ -6,7 +6,7 @@ import { BuildDeclares } from './shared.js';
 const commander = new Command();
 console.log(figlet.textSync('Sandstone'));
 const CLI = commander
-    .version('2.0.5', '-v, --version')
+    .version('2.0.7', '-v, --version')
     .description('The CLI for Sandstone - the minecraft pack creation library.');
 const build = CLI
     .command('build')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandstone-cli",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "The CLI for Sandstone - the minecraft pack creation library.",
   "type": "module",
   "exports": "./lib/index.js",

package/src/commands/build.ts

@@ -187,26 +187,68 @@ function countResources(sandstonePack: { core: { resourceNodes: Iterable<{ resou
   return { functions, other }
 }
 
+function splitPath(split: string) {
+  let parts: string[] = []
+  let current = split
+
+  while (current !== 'C:') {
+    let dirname = path.dirname(current)
+    if (dirname.endsWith('\\')) {
+      dirname = dirname.slice(0, -1)
+    }
+    parts.unshift(current.replace(`${dirname}${path.sep}`, ''))
+    current = dirname
+  }
+  parts.unshift('C:')
+  return parts
+}
+
 async function handleSymlink(folder: string, packName: string, cache: SandstoneCache, minecraftPath: string, targetPath: string, linkPath: string) {
-  const allowPath = `[glob]${path.resolve(folder)}${path.sep}**${path.sep}*`
+  let rawPath = path.resolve(path.join(folder))
+  let sep: string = path.sep
+  if (os.platform() === 'win32') {
+    sep = `${path.sep}${path.sep}`
+
+    rawPath = splitPath(rawPath).join(sep)
+  }
+  const allowPath = `[glob]${rawPath}${sep}**${sep}*`
 
   const allowedList = path.join(minecraftPath, 'allowed_symlinks.txt')
 
   const comment = `# Sandstone Pack: ${packName}\n`
   try {
-    const currentlyAllowed = await fs.readFile(allowedList)
+    const currentlyAllowed = await fs.readFile(allowedList, 'utf-8')
 
     if (!currentlyAllowed.includes(allowPath)) {
+      log('[handleSymlink] Adding workspace to allowed_symlinks.txt at minecraft path. If the game is running please restart it.')
       await fs.writeFile(allowedList, `${currentlyAllowed}\n#\n${comment}${allowPath}`)
+    } else {
+      log('[handleSymlink] Workspace is already in allowed_symlinks.txt at minecraft path, skipping...')
     }
   } catch (e) {
+    log('[handleSymlink] Creating allowed_symlinks.txt at minecraft path. If the game is running please restart it.')
     await fs.writeFile(allowedList, `${comment}${allowPath}`)
   }
 
-  await fs.lstat(linkPath).then(() => {
-    throw new Error(`Tried to add a symlink at "${linkPath}", encountered an existing file.`)
-  }).catch(() => {})
-  await fs.symlink(path.resolve(targetPath), linkPath)
+  let skip = false
+  let errored = false
+  try {
+    const stats = await fs.lstat(linkPath)
+    if (stats.isSymbolicLink() && await fs.readlink(linkPath) === path.resolve(targetPath)) {
+      log('[handleSymlink] Symlink already created, skipping...')
+      skip = true
+    } else {
+      errored = true
+    }
+  } catch {}
+  if (errored) {
+    throw new Error(`Tried to add a symlink at "${linkPath}",\n encountered an existing FS entry.`)
+  }
+
+  if (!skip) {
+    log(`[handleSymlink] Creating symlink for ${targetPath.replace(`${path.dirname(targetPath)}${path.sep}`, '')}`)
+    await fs.symlink(path.resolve(targetPath), linkPath)
+  }
   cache.symlinks ??= []
   cache.symlinks.push(linkPath)
 }
@@ -609,7 +651,7 @@ async function _buildProject(
           await fs.copyFile(archivePath, `${fullClientPath}.zip`)
         } else if (symlinksAvailable) {
           if (cache.symlinks === undefined || !cache.symlinks.includes(fullClientPath)) {
-            handleSymlink(
+            await handleSymlink(
               folder,
               packName,
               newCache,
@@ -633,7 +675,7 @@ async function _buildProject(
           await fs.copyFile(archivePath, `${fullServerPath}.zip`)
         } else if (symlinksAvailable) {
           if (cache.symlinks === undefined || !cache.symlinks.includes(fullServerPath)) {
-            handleSymlink(
+            await handleSymlink(
               folder,
               packName,
               newCache,

package/src/commands/create.ts

@@ -42,7 +42,7 @@ export async function createCommand(_project: string, opts: CreateOptions) {
 
   const sv = (v: string) => new SemVer(v)
 
-  const versions = [[sv('1.0.0-beta.1'), sv('2.0.4')]] as const
+  const versions = [[sv('1.0.0-beta.1'), sv('2.0.7')]] 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/create.ts

@@ -9,7 +9,7 @@ const commander = new Command()
 console.log(figlet.textSync('Sandstone'));
 
 const createCLI = commander
-  .version('2.0.5')
+  .version('2.0.7')
   .description('Create a new Sandstone project. ⛏')
   .action(createCommand)
   .addArgument(new Argument('<projectName>', 'Not the name of the output pack'))

package/src/index.ts

@@ -9,7 +9,7 @@ const commander = new Command()
 console.log(figlet.textSync('Sandstone'));
 
 const CLI = commander
-  .version('2.0.5', '-v, --version')
+  .version('2.0.7', '-v, --version')
   .description('The CLI for Sandstone - the minecraft pack creation library.')
 
 const build = CLI